Compare commits

..

No commits in common. "14670ae871e17eb9f3e7929fc7f99c7f7bbf16c9" and "4a8ac522012fe5ea3b26b657cf9f489fe78096dd" have entirely different histories.

9 changed files with 11 additions and 79 deletions

BIN
app.db

Binary file not shown.

@ -1 +1 @@
Subproject commit 060e506547778df6914f848e6e21d719a47a9446 Subproject commit ba912de7f312f130e6916f067c15585143dfd6c2

Binary file not shown.

View File

@ -2,6 +2,9 @@
cd /home/calendarwatch cd /home/calendarwatch
# uwsgi --http-socket 0.0.0.0:8084 -w wsgi --protocol=https # uwsgi --http-socket 0.0.0.0:8084 -w wsgi --protocol=https
python3 routine.py &
echo "routine has been started"
python3 server.py python3 server.py
echo "server has been started" echo "server has been started"

View File

@ -12,61 +12,6 @@
width: 200px; 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 */ /* The sidebar menu */
.sidenav { .sidenav {
height: 100%; /* Full-height: remove this if you want "auto" height */ height: 100%; /* Full-height: remove this if you want "auto" height */
@ -170,4 +115,4 @@
.slider.round:before { .slider.round:before {
border-radius: 50%; border-radius: 50%;
} }

View File

@ -1,9 +0,0 @@
/* 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";
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -6,8 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" type="text/css" href="/static/css/main.css"> <link rel="stylesheet" type="text/css" href="/static/css/main.css">
<link rel="shortcut icon" type="image/jpg" href="/static/res/favicon.ico"/> <title>Index</title>
<title>Longitude</title>
</head> </head>
<body> <body>
@ -15,4 +14,4 @@
{% block content %}{% endblock %} {% block content %}{% endblock %}
</body> </body>
</html> </html>

View File

@ -5,33 +5,27 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="shortcut icon" type="image/jpg" href="/static/res/favicon.ico"/>
<link rel="stylesheet" type="text/css" href="/static/css/main.css"> <link rel="stylesheet" type="text/css" href="/static/css/main.css">
<script src="static/js/jquery-3.5.0.min.js"></script> <script src="static/js/jquery-3.5.0.min.js"></script>
<script type="text/javascript" src="static/js/index.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="static/css/colorPick.css"> <link rel="stylesheet" href="static/css/colorPick.css">
<!-- OPTIONAL DARK THEME --> <!-- OPTIONAL DARK THEME -->
<link rel="stylesheet" href="static/css/colorPick.dark.theme.css"> <link rel="stylesheet" href="static/css/colorPick.dark.theme.css">
<script src="static/js/colorPick.js"></script> <script src="static/js/colorPick.js"></script>
<title>Logitude</title> <title>Index</title>
</head> </head>
<body> <body>
<!-- Side navigation --> <!-- Side navigation -->
<div class="topnav" id="myTopnav"> <div class="sidenav">
<a href="/view">View</a> <a href="/view">View</a>
<a href="/calendar">Calendar</a> <a href="/calendar">Calendar</a>
<a href="/account">Account</a> <a href="/account">Account</a>
<a href="/devices">Devices</a> <a href="/devices">Devices</a>
<a href="javascript:void(0);" class="icon" onclick="menuBars()"> </div>
<i class="fa fa-bars"></i>
</a>
</div>
<!-- Page content --> <!-- Page content -->
<div class="main"> <div class="main">