diff --git a/www/assets/css/tablet.css b/www/assets/css/tablet.css index b005b98..51fa052 100644 --- a/www/assets/css/tablet.css +++ b/www/assets/css/tablet.css @@ -19,19 +19,20 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. .no-tablet { display: none; } +/* .page.tabbed .tabbar { - /* Remove tab switcher at bottom of page */ + Remove tab switcher at bottom of page display: none; height: 0; } .page.tabbed .tabs { - /* Put tabs next to each other */ + Put tabs next to each other display: flex; } .page.tabbed .tabs .tab { - /* un-hide "non-active" tabs */ + un-hide "non-active" tabs display: block; - /* Make FABs stay where they should */ + Make FABs stay where they should position: relative; } .page.tabbed .tabs .tab.tab-67 { @@ -43,33 +44,33 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. .page.tabbed .page-content { padding-top: 0; padding-bottom: 0; - } + }*/ .elevation-tablet { /* .elevation-3 */ box-shadow: var(--f7-elevation-3)!important; } - +/* .page.tabbed .tabs .tab:not(:first-child) { - /*box-shadow: inset 5px 0 9px -5px rgba(0,0,0,0.3);*/ + box-shadow: inset 5px 0 9px -5px rgba(0,0,0,0.3); border-left: 1px solid rgba(0,0,0,0.1); - } - + }*/ +/* .page.tabbed .fab { margin-bottom: 0; } .sheet-backdrop.backdrop-in { visibility: hidden; - } + }*/ .padding-bottom-tablet { padding-bottom: 3rem !important; } - +/* #mapbox { height: calc(100% - var(--f7-navbar-height)); - } + }*/ } @media all and (min-width: 768px) and (min-height: 700px) { diff --git a/www/assets/js/main.js b/www/assets/js/main.js index 142dc65..a9dc224 100644 --- a/www/assets/js/main.js +++ b/www/assets/js/main.js @@ -12,7 +12,7 @@ var app = new Framework7({ root: "#app", name: "Lecte", id: "vote.lecte.Lecte", - theme: "md", + theme: "ios", card: { swipeToClose: false }, @@ -159,4 +159,4 @@ function setAnimations(enabled) { applyColorTheme(); setAnimations(); -router.navigate("/discover"); \ No newline at end of file +router.navigate("/ranking"); \ No newline at end of file diff --git a/www/assets/js/maptab.js b/www/assets/js/maptab.js new file mode 100644 index 0000000..731f535 --- /dev/null +++ b/www/assets/js/maptab.js @@ -0,0 +1,27 @@ +/* + * 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/. + */ + +function setTabSwipable() { + var page = $(".page[data-name=discover]"); + + // If the page has grown larger, refresh to disable swiping tabs + if (page.width() >= 768 && $(".tabs-swipeable-wrap")[0]) { + router.refreshPage(); + } else if (page.width() < 768 && !$(".tabs-swipeable-wrap")[0]) { + router.refreshPage(); + } +} + +$(window).on('resize', setTabSwipable); + +setTabSwipable(); + +// Adjust the map when opening its tab +$(".view-main").on("click", ".tab-link#map-tab-link", function () { + var center = map.getCenter(); + map.resize(); + map.setCenter(center); +}); \ No newline at end of file diff --git a/www/index.html b/www/index.html index 39efbc1..f81d917 100644 --- a/www/index.html +++ b/www/index.html @@ -15,6 +15,7 @@ + @@ -24,9 +25,7 @@
-
-
diff --git a/www/pages/discover.html b/www/pages/discover.html index b169d80..1379024 100644 --- a/www/pages/discover.html +++ b/www/pages/discover.html @@ -7,23 +7,45 @@
-
+ +
Lecte
-
+
- Ranking + Top Map
+
+
+ + + list_number + poll + + Rankings + + + today_fill5 + today5 + Calendar + + + cloud_fill + file_upload + Upload + +
+
+ {{#if nottablet}}
{{/if}} diff --git a/www/pages/main.html b/www/pages/main.html new file mode 100644 index 0000000..7c5c2af --- /dev/null +++ b/www/pages/main.html @@ -0,0 +1,47 @@ + + +
+ +
+
+
+
Lecte
+
+
+ +
+
+ + list_number + poll + + Ranking + + + location + near_me + Map + + + person_circle + account_circle + Profile + +
+
+ +
+
+
+
+
+ + + +
\ No newline at end of file diff --git a/www/pages/parts/ballot.html b/www/pages/parts/ballot.html new file mode 100644 index 0000000..3871ae8 --- /dev/null +++ b/www/pages/parts/ballot.html @@ -0,0 +1,3 @@ +
+
+
\ No newline at end of file diff --git a/www/pages/tabs/map.html b/www/pages/tabs/map.html new file mode 100644 index 0000000..46f3ae6 --- /dev/null +++ b/www/pages/tabs/map.html @@ -0,0 +1,4 @@ +
+ \ No newline at end of file diff --git a/www/pages/tabs/myprofile.html b/www/pages/tabs/myprofile.html new file mode 100644 index 0000000..138a667 --- /dev/null +++ b/www/pages/tabs/myprofile.html @@ -0,0 +1,131 @@ +
+
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+ +
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+ +
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+ +
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+ +
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+ +
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+ +
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+ +
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+ +
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+ +
+
+
+
+
+1
+
+
+ wre ghre iog +
+
+
+
+
\ No newline at end of file diff --git a/www/pages/tabs/ranking.html b/www/pages/tabs/ranking.html new file mode 100644 index 0000000..c8cd51e --- /dev/null +++ b/www/pages/tabs/ranking.html @@ -0,0 +1,9 @@ + + +
+
    +
  • grfklg renkgjedn gkerth
    • +
+
\ No newline at end of file diff --git a/www/routes.js b/www/routes.js index e5036ac..4583cbf 100644 --- a/www/routes.js +++ b/www/routes.js @@ -5,6 +5,28 @@ */ var routes = [ + { + path: "/", + name: "main", + url: "pages/main.html", + tabs: [ + { + path: '/', + id: 'ranking-tab', + url: "pages/tabs/ranking.html" + }, + { + path: '/map', + id: 'map-tab', + url: "pages/tabs/map.html" + }, + { + path: '/myprofile', + id: 'myprofile-tab', + url: "pages/tabs/myprofile.html" + } + ] + }, { path: '/welcome', name: 'welcome', @@ -15,25 +37,6 @@ var routes = [ name: 'profile', templateUrl: "pages/profile.html" }, - { - path: '/discover', - name: 'discover', - async: function (routeTo, routeFrom, resolve, reject) { - let tablet = $(window).width() >= 768; - resolve({ - templateUrl: "pages/discover.html" - }, { - context: { - nottablet: !tablet - } - }) - }, - on: { - pageAfterIn: function () { - reloadMap(); - } - } - }, { path: '/settings', name: 'settings', diff --git a/www/settings.js b/www/settings.js index 60917b8..47453bc 100644 --- a/www/settings.js +++ b/www/settings.js @@ -36,7 +36,10 @@ var SETTINGS = { "user_latitude", "user_longitude", "lastsync", "lastchange" ], - geocodeapi: "https://api.lecte.vote/geocode.php", + + geocodeapi: "http://localhost/lecteapi/geocode.php", geoipapi: "https://api.lecte.vote/geoip.php", loginurl: "https://auth.lecte.vote/login/" +// geocodeapi: "https://api.lecte.vote/geocode.php", +// loginurl: "https://auth.lecte.vote/login/" }