From defe5a09982d1af300e8300ed7593642d40bd9d7 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 2 May 2020 17:09:56 -0600 Subject: [PATCH] Update license headers, implement "fancy" API support --- config.xml | 6 ++ nbproject/project.properties | 1 + scripts/generate_credits.sh | 4 + scripts/npm_prepare.sh | 4 + scripts/remove_bloat.sh | 5 ++ scripts/www_npm_install.sh | 4 + www/assets/css/app.css | 9 ++- www/assets/css/backdrop.css | 1 + www/assets/css/oled.css | 1 + www/assets/css/profiles.css | 35 +++++++++ www/assets/css/tablet.css | 9 ++- www/assets/css/web-barcode.css | 9 ++- www/assets/iframeloading.html | 1 + www/assets/js/autofill.js | 1 + www/assets/js/discover.js | 1 + www/assets/js/location.js | 26 +++---- www/assets/js/login.js | 1 + www/assets/js/main.js | 9 ++- www/assets/js/map.js | 1 + www/assets/js/map_leaflet.js | 1 + www/assets/js/map_mapbox.js | 7 +- www/assets/js/maptab.js | 1 + www/assets/js/platform.js | 26 ++++++- www/assets/js/settings.js | 2 +- www/assets/js/storage.js | 4 +- www/assets/js/sync.js | 2 +- www/assets/js/util.js | 39 ++++++++++ www/index.html | 11 ++- www/pages/credits.html | 75 ++++++++++--------- www/pages/credits.template.html | 9 ++- www/pages/discover.html | 10 ++- www/pages/login.html | 10 ++- www/pages/main.html | 27 ++++--- www/pages/parts/ballot.html | 6 ++ www/pages/profile.html | 9 ++- www/pages/settings.html | 9 ++- .../tabs/{ranking.html => discover.html} | 29 +++++-- www/pages/tabs/map.html | 6 ++ www/pages/tabs/myprofile.html | 18 +++++ www/pages/welcome.html | 9 ++- www/routes.js | 5 +- www/settings.js | 5 +- 42 files changed, 327 insertions(+), 121 deletions(-) create mode 100644 www/assets/css/profiles.css rename www/pages/tabs/{ranking.html => discover.html} (64%) diff --git a/config.xml b/config.xml index e4f19db..b55423a 100644 --- a/config.xml +++ b/config.xml @@ -1,4 +1,10 @@ + Lecte diff --git a/nbproject/project.properties b/nbproject/project.properties index d396bab..60fe758 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -3,4 +3,5 @@ auxiliary.org-netbeans-modules-cordova.phonegap=true file.reference.Lecte-test=test file.reference.Lecte-www=www files.encoding=UTF-8 +project.license=mpl site.root.folder=${file.reference.Lecte-www} diff --git a/scripts/generate_credits.sh b/scripts/generate_credits.sh index 68f5f69..9c937b6 100755 --- a/scripts/generate_credits.sh +++ b/scripts/generate_credits.sh @@ -1,4 +1,8 @@ #!/bin/bash +# Copyright 2020 Netsyms Technologies. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. echo "Generating credits files..." diff --git a/scripts/npm_prepare.sh b/scripts/npm_prepare.sh index f5e85a1..6f53ab1 100755 --- a/scripts/npm_prepare.sh +++ b/scripts/npm_prepare.sh @@ -1,4 +1,8 @@ #!/bin/sh +# Copyright 2020 Netsyms Technologies. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. ./scripts/www_npm_install.sh ./scripts/generate_credits.sh diff --git a/scripts/remove_bloat.sh b/scripts/remove_bloat.sh index 6b831e0..986628e 100755 --- a/scripts/remove_bloat.sh +++ b/scripts/remove_bloat.sh @@ -1,4 +1,9 @@ #!/bin/bash +# Copyright 2020 Netsyms Technologies. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# # This script removes some stuff in `www/node_modules` that the app doesn't need to run. # It removes about 6MB from the build size. diff --git a/scripts/www_npm_install.sh b/scripts/www_npm_install.sh index 6e6aefe..d47f7d2 100755 --- a/scripts/www_npm_install.sh +++ b/scripts/www_npm_install.sh @@ -1,4 +1,8 @@ #!/bin/bash +# Copyright 2020 Netsyms Technologies. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. echo "Installing node modules in www/..." diff --git a/www/assets/css/app.css b/www/assets/css/app.css index 642ac64..f40de01 100644 --- a/www/assets/css/app.css +++ b/www/assets/css/app.css @@ -1,8 +1,9 @@ /* -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. -*/ + * Copyright 2020 Netsyms Technologies. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ /* Framework7 and FontAwesome both have a .fab class diff --git a/www/assets/css/backdrop.css b/www/assets/css/backdrop.css index 0da3d9c..d21c215 100644 --- a/www/assets/css/backdrop.css +++ b/www/assets/css/backdrop.css @@ -1,4 +1,5 @@ /* + * Copyright 2020 Netsyms Technologies. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/www/assets/css/oled.css b/www/assets/css/oled.css index f24fcb8..369a7a4 100644 --- a/www/assets/css/oled.css +++ b/www/assets/css/oled.css @@ -1,4 +1,5 @@ /* + * Copyright 2020 Netsyms Technologies. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/www/assets/css/profiles.css b/www/assets/css/profiles.css new file mode 100644 index 0000000..010285e --- /dev/null +++ b/www/assets/css/profiles.css @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Netsyms Technologies. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + Created on : Apr 29, 2020, 9:29:20 PM + Author : Skylar Ittner +*/ + +.profile-card .card-header { + display: block; +} + +.profile-card .profile-image { + float: left; + width: 80px; + max-width: 25%; + position: relative; + margin-right: 2rem; +} + +.profile-card .profile-image img { + width: 100%; +} + +.profile-card .profile-name { + +} + +.profile-card .profile-location { + color: #8e8e93; + font-size: 90%; +} \ No newline at end of file diff --git a/www/assets/css/tablet.css b/www/assets/css/tablet.css index 51fa052..881c5b8 100644 --- a/www/assets/css/tablet.css +++ b/www/assets/css/tablet.css @@ -1,8 +1,9 @@ /* -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. -*/ + * Copyright 2020 Netsyms Technologies. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ /* Created on : Apr 3, 2020, 11:55:50 AM Author : Skylar Ittner diff --git a/www/assets/css/web-barcode.css b/www/assets/css/web-barcode.css index 35f563b..def219d 100644 --- a/www/assets/css/web-barcode.css +++ b/www/assets/css/web-barcode.css @@ -1,8 +1,9 @@ /* -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. -*/ + * Copyright 2020 Netsyms Technologies. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #web-barcode-ui { diff --git a/www/assets/iframeloading.html b/www/assets/iframeloading.html index 5eabc55..f263877 100644 --- a/www/assets/iframeloading.html +++ b/www/assets/iframeloading.html @@ -1,5 +1,6 @@ + Lecte @@ -22,6 +25,8 @@ + +
diff --git a/www/pages/credits.html b/www/pages/credits.html index 0d34162..8a3527a 100644 --- a/www/pages/credits.html +++ b/www/pages/credits.html @@ -1,6 +1,9 @@ - +
@@ -367,7 +370,7 @@ SOFTWARE. The following software may be included in this product: ansicolors. A copy of the source code may be downloaded from git://github.com/thlorenz/ansicolors.git. This software contains the following license and notice below: -Copyright 2013 Thorsten Lorenz. +Copyright 2013 Thorsten Lorenz. All rights reserved. Permission is hereby granted, free of charge, to any person @@ -449,7 +452,7 @@ THE SOFTWARE. The following software may be included in this product: cardinal, redeyed. A copy of the source code may be downloaded from git://github.com/thlorenz/cardinal.git (cardinal), git://github.com/thlorenz/redeyed.git (redeyed). This software contains the following license and notice below: -Copyright 2012 Thorsten Lorenz. +Copyright 2012 Thorsten Lorenz. All rights reserved. Permission is hereby granted, free of charge, to any person @@ -481,25 +484,25 @@ The MIT License Copyright (c) 2013 Max Ogden -Permission is hereby granted, free of charge, -to any person obtaining a copy of this software and -associated documentation files (the "Software"), to -deal in the Software without restriction, including -without limitation the rights to use, copy, modify, -merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom -the Software is furnished to do so, +Permission is hereby granted, free of charge, +to any person obtaining a copy of this software and +associated documentation files (the "Software"), to +deal in the Software without restriction, including +without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom +the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ----- @@ -2684,15 +2687,15 @@ modification, are permitted provided that the following conditions are met: names of the contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ARTUR ADIB BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ @@ -3768,19 +3771,19 @@ The following software may be included in this product: debug. A copy of the sou Copyright (c) 2014 TJ Holowaychuk -Permission is hereby granted, free of charge, to any person obtaining a copy of this software -and associated documentation files (the 'Software'), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +Permission is hereby granted, free of charge, to any person obtaining a copy of this software +and associated documentation files (the 'Software'), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ----- @@ -5171,15 +5174,15 @@ modification, are permitted provided that the following conditions are met: names of the contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ARTUR ADIB BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----- diff --git a/www/pages/credits.template.html b/www/pages/credits.template.html index d9a6e76..b94a1b5 100644 --- a/www/pages/credits.template.html +++ b/www/pages/credits.template.html @@ -1,6 +1,9 @@ - +
diff --git a/www/pages/discover.html b/www/pages/discover.html index 1379024..06c7380 100644 --- a/www/pages/discover.html +++ b/www/pages/discover.html @@ -1,7 +1,9 @@ - - +
diff --git a/www/pages/login.html b/www/pages/login.html index 608853f..367bc84 100644 --- a/www/pages/login.html +++ b/www/pages/login.html @@ -1,7 +1,9 @@ - - +
diff --git a/www/pages/main.html b/www/pages/main.html index 7c5c2af..6732cb0 100644 --- a/www/pages/main.html +++ b/www/pages/main.html @@ -1,6 +1,9 @@ - +
@@ -13,27 +16,27 @@
- - list_number - poll + + search + search - Ranking + Find - location - near_me + location + near_me Map - person_circle - account_circle + person_circle + account_circle Profile
-
+
diff --git a/www/pages/parts/ballot.html b/www/pages/parts/ballot.html index 3871ae8..5b7d6e8 100644 --- a/www/pages/parts/ballot.html +++ b/www/pages/parts/ballot.html @@ -1,3 +1,9 @@ +
\ No newline at end of file diff --git a/www/pages/profile.html b/www/pages/profile.html index aedc603..bc384dd 100644 --- a/www/pages/profile.html +++ b/www/pages/profile.html @@ -1,6 +1,9 @@ - +
diff --git a/www/pages/settings.html b/www/pages/settings.html index badd291..e87630e 100644 --- a/www/pages/settings.html +++ b/www/pages/settings.html @@ -1,6 +1,9 @@ - +
diff --git a/www/pages/tabs/ranking.html b/www/pages/tabs/discover.html similarity index 64% rename from www/pages/tabs/ranking.html rename to www/pages/tabs/discover.html index b1df347..e984736 100644 --- a/www/pages/tabs/ranking.html +++ b/www/pages/tabs/discover.html @@ -1,8 +1,10 @@ - - -
+ +
@@ -32,12 +34,23 @@
-
+230
+
+197
- John Doe + Jane Doe
- Honest +
+
+ +
+
Honest
+
+
+
+ +
+
Auto Mechanic
+
diff --git a/www/pages/tabs/map.html b/www/pages/tabs/map.html index 46f3ae6..645ebd5 100644 --- a/www/pages/tabs/map.html +++ b/www/pages/tabs/map.html @@ -1,3 +1,9 @@ +