diff --git a/site/Dockerfile b/site/Dockerfile old mode 100644 new mode 100755 diff --git a/site/Layout/Site layout.sketch b/site/Layout/Site layout.sketch old mode 100644 new mode 100755 index ae991e3..1400b5a Binary files a/site/Layout/Site layout.sketch and b/site/Layout/Site layout.sketch differ diff --git a/site/package-lock.json b/site/package-lock.json old mode 100644 new mode 100755 diff --git a/site/package.json b/site/package.json old mode 100644 new mode 100755 diff --git a/site/server.js b/site/server.js old mode 100644 new mode 100755 diff --git a/site/views/404.ejs b/site/views/404.ejs old mode 100644 new mode 100755 diff --git a/site/views/css/style.css b/site/views/css/style.css old mode 100644 new mode 100755 index be827a8..18d21ae --- a/site/views/css/style.css +++ b/site/views/css/style.css @@ -14,22 +14,35 @@ src: url(../fonts/opsl.ttf); } +@font-face{ + font-family: osb; + src: url(../fonts/opsb.ttf); +} + :root { --background: whitesmoke; + --cell_background: transparent; + --cp_color: grey; + --title-color: #333333; } body { background: var(--background); margin-left: auto; margin-right: auto; - font-family: os; - /* max-width: 1200px; */ + font-family: osl; + max-width: 1300px; padding: 1rem; } +.page-container { + display: block; + +} + .container { - background-color: dodgerblue; - color: white; + background-color: var(--cell_background); + color: var(--title-color); padding: 1rem; height: 400px; } @@ -45,6 +58,62 @@ body { height: 400px; } + .container-title { + font-family: osb; + font-size: 30px; + color: var(--title-color); + } + + .copyright-container { + position: absolute; + max-width: 1300px; + width: 100%; + height: 40px; + } + + .copyright { + display: inline-flex; + float: right; + } + + .copyright img { + height: 30px; + padding-top: 3px;; + } + + .copyright-text { + font-size: 25px; + padding-left: 10px; + color: var(--cp_color); + } + + .title { + font-family: osb; + text-align: center; + font-size: 45px; + color: var(--title-color); + padding-bottom: 20px; + padding-top: 10px; + } + + .first-row { + height: 600px; + } + + .title-row { + height: 10px; + } + + .in-development { + height: 70px; + width: 100%; + background-color: red; + color: white; + text-align: center; + font-size: 50px; + font-family: osb; + } + @media (min-width: 900px) { .containers { grid-template-columns: repeat(2, 1fr); } } diff --git a/site/views/fonts/ops.ttf b/site/views/fonts/ops.ttf old mode 100644 new mode 100755 diff --git a/site/views/fonts/opsb.ttf b/site/views/fonts/opsb.ttf new file mode 100644 index 0000000..54e7059 Binary files /dev/null and b/site/views/fonts/opsb.ttf differ diff --git a/site/views/fonts/opsl.ttf b/site/views/fonts/opsl.ttf old mode 100644 new mode 100755 diff --git a/site/views/index.ejs b/site/views/index.ejs deleted file mode 100644 index cea57bd..0000000 --- a/site/views/index.ejs +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - IoT plant watering project - - - - -
-
ONE
-
TWO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
EIGHT
-
NINE
-
TEN
-
ELEVEN
-
TWELVE
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - diff --git a/site/views/index.html b/site/views/index.html new file mode 100755 index 0000000..c73b8e2 --- /dev/null +++ b/site/views/index.html @@ -0,0 +1,183 @@ + + + + + + + + + + + + IoT plant watering project + + + + +
+
PREVIEW - IN DEVELOPMENT
+
+
+
+
+ +
+ © Max Hunt 2020 +
+
+
+
+ IoT Plant Watering Predictor +
+
+
+
+ Aims +
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. + Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. + Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. + Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. + Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. + Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. + Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. + Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. + Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. + Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +

+
+
+
+ How it works +
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. + Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. + Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. + Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. + Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. + Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. + Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. + Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. + Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. + Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +

+
+
+
+ Real time collected data +
+
+
+
+
+
+
+
+ Data overview +
+

+ Some important numbers... +

+ TBD +

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The plant watering index +
+
+
+
+ Predicted watering pattern +
+
+
+

+ Info on the plant watering index... +

+ TBR +

+
+
+

+ Another chart with predicted watering pattern +

+ TBC +

+
+
+
+ + + + + diff --git a/site/views/js/fInit.js b/site/views/js/fInit.js old mode 100644 new mode 100755 diff --git a/site/views/js/main.js b/site/views/js/main.js old mode 100644 new mode 100755 index 9582c56..92dbef4 --- a/site/views/js/main.js +++ b/site/views/js/main.js @@ -35,7 +35,8 @@ function draw_graph(ySeries, names, colors, div_name) { y: ySeries.data, x: formatted_datetimes, text: names.title, - marker: { color: colors.trace, line: { width: 5 } } + // marker: { color: colors.trace, line: { width: 3 } } + marker: { color: colors.trace, line: { color: colors.trace, width: 3 } } } var data = [trace] @@ -82,8 +83,8 @@ async function plot_graphs() { 'rain_chart' ) draw_graph( - {data: clouds, type: 'line'}, - {title: "Cloudiness",yaxis: "Cloud coverage in %"}, + {data: clouds, type: 'bar'}, + {title: "Cloud cover",yaxis: "Cloud coverage in %"}, {trace: '#FFFFFF'}, 'cloud_chart' ) diff --git a/site/views/media/logo.png b/site/views/media/logo.png new file mode 100755 index 0000000..2f6b576 Binary files /dev/null and b/site/views/media/logo.png differ