diff --git a/app.db b/app.db index c834ba8..24e1da5 100644 Binary files a/app.db and b/app.db differ diff --git a/docker/calendarwatch/.docker-entrypoint.sh.swp b/docker/calendarwatch/.docker-entrypoint.sh.swp deleted file mode 100644 index 4719bf2..0000000 Binary files a/docker/calendarwatch/.docker-entrypoint.sh.swp and /dev/null differ diff --git a/docker/calendarwatch/docker-entrypoint.sh b/docker/calendarwatch/docker-entrypoint.sh index 8d96ba4..a6a7281 100755 --- a/docker/calendarwatch/docker-entrypoint.sh +++ b/docker/calendarwatch/docker-entrypoint.sh @@ -2,9 +2,6 @@ cd /home/calendarwatch # uwsgi --http-socket 0.0.0.0:8084 -w wsgi --protocol=https -python3 routine.py & -echo "routine has been started" - python3 server.py echo "server has been started" diff --git a/server/static/css/main.css b/server/static/css/main.css index 01fd5f4..e72f121 100644 --- a/server/static/css/main.css +++ b/server/static/css/main.css @@ -12,6 +12,61 @@ width: 200px; } +/* top navigation */ +.topnav { + background-color: #333; + overflow: hidden; +} + +.topnav a { + float: left; + display: flex; + color: #f2f2f2; + text-align: center; + padding: 14px 16px; + text-decoration: none; + font-size: 17px; +} + +.topnav a:hover { + background-color: #ddd; + color: black; +} + +/* Add an active class to highlight the current page */ +.topnav a.active { + background-color: #4CAF50; + color: white; +} + +/* Hide the link that should open and close the topnav on small screens */ +.topnav .icon { + display: none; +} + + /* When the screen is less than 600 pixels wide, hide all links, except for the first one ("Home"). Show the link that contains should open and close the topnav (.icon) */ +@media screen and (max-width: 600px) { + .topnav a:not(:first-child) {display: none;} + .topnav a.icon { + float: right; + display: block; + } +} + +/* The "responsive" class is added to the topnav with JavaScript when the user clicks on the icon. This class makes the topnav look good on small screens (display the links vertically instead of horizontally) */ +@media screen and (max-width: 600px) { + .topnav.responsive {position: relative;} + .topnav.responsive a.icon { + position: absolute; + right: 0; + top: 0; + } + .topnav.responsive a { + float: none; + display: block; + text-align: left; + } +} /* The sidebar menu */ .sidenav { height: 100%; /* Full-height: remove this if you want "auto" height */ @@ -115,4 +170,4 @@ .slider.round:before { border-radius: 50%; - } \ No newline at end of file + } diff --git a/server/static/js/index.js b/server/static/js/index.js index e69de29..412db9d 100644 --- a/server/static/js/index.js +++ b/server/static/js/index.js @@ -0,0 +1,9 @@ +/* Toggle between adding and removing the "responsive" class to topnav when the user clicks on the icon */ +function menuBars() { + var x = document.getElementById("myTopnav"); + if (x.className === "topnav") { + x.className += " responsive"; + } else { + x.className = "topnav"; + } +} diff --git a/server/static/res/favicon.ico b/server/static/res/favicon.ico new file mode 100755 index 0000000..d825241 Binary files /dev/null and b/server/static/res/favicon.ico differ diff --git a/server/template/base.html b/server/template/base.html index f110dd4..1c0e4f4 100644 --- a/server/template/base.html +++ b/server/template/base.html @@ -6,7 +6,8 @@ - Index + + Longitude @@ -14,4 +15,4 @@ {% block content %}{% endblock %} - \ No newline at end of file + diff --git a/server/template/sidebar.html b/server/template/sidebar.html index 2d8fc66..aafab18 100644 --- a/server/template/sidebar.html +++ b/server/template/sidebar.html @@ -5,27 +5,33 @@ + - + + + - Index + Logitude -
+
View Calendar Account Devices -
+ + + +