commit cdc54f9efef31c60b062d347b41fb859b414092e
parent 6714e845d22d8ec5c53768ddaffd07c9881112cb
Author: Friedel Schön <[email protected]>
Date: Tue, 28 Jun 2022 15:38:00 +0200
second merge
Diffstat:
7 files changed, 116 insertions(+), 177 deletions(-)
diff --git a/server/routes.py b/server/routes.py
@@ -24,16 +24,7 @@ def validate_mac(mac):
@app.route("/")
def index():
- form = LoginForm()
- return render_template('index.html', form=form)
-
-
-""" about.html route """
-
-
[email protected]("/about")
-def about():
- return render_template('about.html', title='Over ons')
+ return render_template('index.html')
""" home.html route """
diff --git a/server/static/main.css b/server/static/main.css
@@ -1,49 +1,27 @@
-
-body{
- background: #eee;
-}
-
#side_nav{
background: #000;
- width: 250px;
- min-height: 1024px;
-}
-
-nav{
- margin-bottom: 10px;
-
-
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+ width: 20%;
+ position: fixed;
+ height: 100%;
}
.content{
- min-height: 100vh;
- width: 100%;
-}
-hr.h-color{
- background:#eee
-
-}
-
-.col-7 {
-
- padding-top: 15px;
-
-}
-.sidebar li.active{
- background:#eee;
- border-radius: 8px;
-
+ margin-left: 20%;
+ width:80%;
}
-.sidebar li.active a, .sidebar li.active a:hover {
-color:#000
+.carousel .carousel-item {
+ max-height: 700px;
}
-.sidebar li a{
-color:#fff;
+.carousel-item img {
+ height: 50%;
+ width: 50%;
}
-
.content-section {
background: #ffffff;
padding: 10px 20px;
@@ -52,8 +30,9 @@ color:#fff;
margin-bottom: 20px;
}
-
-
+#kutcss{
+ width: 50%;
+}
.account-img {
height: 125px;
width: 125px;
@@ -74,15 +53,5 @@ color:#fff;
border: #aaa solid 1px;
}
-@media(max-width: 767px){
- #side_nav{
- margin-left: -250px;
- position: fixed;
- min-height: 100vh;
- z-index: 1;
- }
- #side_nav.active{
- margin-left: 0;
- }
- }
+
diff --git a/server/static/product_pics/Benni.jpg b/server/static/product_pics/Benni.jpg
Binary files differ.
diff --git a/server/static/product_pics/Benni.png b/server/static/product_pics/Benni.png
Binary files differ.
diff --git a/server/static/product_pics/Dashboard.jpg b/server/static/product_pics/Dashboard.jpg
Binary files differ.
diff --git a/server/templates/index.html b/server/templates/index.html
@@ -1,70 +1,60 @@
{% extends "layout.html" %}
{% block content %}
-<article class="media content-section">
-
- <div class="media-body">
- <h2> Muizenvallen</h2>
-
- <p>Kies hier uit de meerdere artikelen die we ter beschikking hebben.</p>
-
- </div>
-
-</article>
-
-<!DOCTYPE html>
-<html>
-
-<head>
- <style>
- div.gallery {
- margin: 5px;
- border: 1px solid #ccc;
- float: left;
- width: 220px;
- }
-
- div.gallery:hover {
- border: 1.5px solid #777;
- }
-
- div.gallery img {
- width: 100%;
- height: auto;
- }
-
- div.title {
- padding: 5px;
- text-align: center;
- font-size: 20px;
-
- font-weight: bold;
- }
-
- div.desc {
- padding: 7px;
- text-align: center;
- font-size: 12px;
-
- }
- </style>
-
-
-</head>
-
-<body>
- <div class="gallery">
- <!---- <a target="_blank" href=""> -->
- <img src="../static/product_pics/muizenval1.jpg" alt="Cinque Terre" width="800" height="600">
+<div id="carouseldiv">
+ <div id="carouselExampleControls" class="carousel slide" data-ride="carousel">
+ <div class="carousel-inner">
+ <div class="carousel-item active">
+ <img class="d-block w-100" src="{{url_for('static', filename='product_pics/Benni.jpg')}}" alt="First slide">
+ </div>
+ <div class="carousel-item">
+ <img class="d-block w-100" src="{{url_for('static', filename='product_pics/Dashboard.jpg')}}" alt="Second slide">
+ </div>
+ </div>
+ <a class="carousel-control-prev" href="#carouselExampleControls" role="button" data-slide="prev">
+ <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+ <span class="sr-only">Previous</span>
+ </a>
+ <a class="carousel-control-next" href="#carouselExampleControls" role="button" data-slide="next">
+ <span class="carousel-control-next-icon" aria-hidden="true"></span>
+ <span class="sr-only">Next</span>
</a>
- <div class="title">slimme muizenval 3000</div>
- <div class="desc">De gekste muizenval ter wereld!! (source: trust me bro)</div>
-
</div>
-
-
-
-</body>
-
-</html>
+</div>
+<div class="d-flex flex-column">
+ <div class="p-2">
+ <article>
+ Benni is de grote hulp voor Groninger boeren om inzicht te krijgen in de ongedierte op hun erf. Een netwerk van slimme vallen verdeeld over het erf geven aan een online dashboard door wat er gebeurd en dat alles via 5G. Benni verstuurt via 5G een melding naar de boer met de naam en de plaats.
+ </article>
+ </div>
+ <div class="p-2">
+ <div class="d-flex flex-row">
+ <div class="p-2" id="kutcss">Flex item 1</div>
+ <div class="p-2" id="kutcss">
+ Functionaliteiten:</br>
+ </br>
+ GPS</br>
+ Werkt op batterij</br>
+ Dashboard met actuele informatie</br>
+ Statistieken</br>
+ U krijgt een mailtje als er een ongedierte gevangen is.</br>
+ Goedkoop</br>
+ Energiezuinig</br>
+
+ </div>
+ </div>
+ </div>
+ <div class="p-2">
+ <div class="d-flex flex-row">
+ <div class="p-2" id="kutcss">
+ Er zijn twee mogelijkheden:</br>
+ </br>
+ - U huurt de vallen, waarbij uw vallen in bruikleen heeft en service krijgt</br>
+ </br>
+ - U koopt vallen
+ </div>
+ <div class="p-2" id="kutcss">Flex item 2</div>
+ </div>
+ </div>
+</div>
{% endblock content %}
\ No newline at end of file
diff --git a/server/templates/layout.html b/server/templates/layout.html
@@ -61,64 +61,53 @@
</head>
<body>
-
-
- <div class="main-container d-flex">
- <div class="sidebar" id="side_nav">
- <div class="header-box px-2 pt-3 pb-4">
- <h1 class="fs-4"><span class="bg-white text-dark rounded shadow px-2 me-2">B</span> <span
- class="text-white">BENNI</span></h1>
-
- </div>
-
- <ul class="list-unstyled px-2">
- <li class=""><a href="{{ url_for('index') }}" class="text-decoration-none px-3 py-2 d-block"><i
- class="far fa-map-marker-question"></i>Home</a></li>
- <li class=""><a href="{{ url_for('about') }}" class="text-decoration-none px-3 py-2 d-block"><i
- class="far fa-map-marker-question"></i>Over ons</a></li>
-
- {% if current_user.is_authenticated %}
- <li class=""><a href="{{ url_for('traps') }}" class="text-decoration-none px-3 py-2 d-block"><i
- class="far fa-tachometer-alt"></i>Dashboard</a></li>
- <li class=""><a href="#" class="text-decoration-none px-3 py-2 d-block"><i
- class="far fa-plug"></i>Koppel een val</a></li>
- <li class=""><a href="{{ url_for('contact') }}" class="text-decoration-none px-3 py-2 d-block"><i
- class="far fa-address-book"></i>Contact opnemen</a></li>
- {% endif %}
- </ul>
- <hr class="h-color mx-2">
-
- <ul class="list-unstyled px-2">
- {% if current_user.is_authenticated %}
- <li class=""><a href="{{ url_for('account') }}" class="text-decoration-none px-3 py-2 d-block"><i
- class="far fa-cogs"></i>Instellingen</a></li>
- <li class=""><a href="{{ url_for('logout') }}" class="text-decoration-none px-3 py-2 d-block"><i
- class="fas fa-sign-out"></i>Uitloggen</a></li>
- {% else %}
- <li class=""><a href="{{ url_for('login') }}" class="text-decoration-none px-3 py-2 d-block"><i
- class="fas fa-sign-out"></i>Inloggen</a></li>
- <li class=""><a href="{{ url_for('register') }}" class="text-decoration-none px-3 py-2 d-block"><i
- class="fas fa-sign-out"></i>Registeren</a></li>
- {% endif %}
- </ul>
- <hr class="h-color mx-2">
-
- </div>
- <!-- content-->
- <div class="col-7">
- {% for category, message in get_flashed_messages(with_categories=true) %}
- <div class="alert alert-{{ category }}">
- {{ message }}
- </div>
- {% endfor %}
- {% block content %}{% endblock %}
+ <div class="sidebar" id="side_nav">
+ <div class="header-box px-2 pt-3 pb-4">
+ <h1 class="fs-4"><span class="bg-white text-dark rounded shadow px-2 me-2">B</span> <span
+ class="text-white">BENNI</span></h1>
</div>
+ <ul class="list-unstyled px-2">
+ <li class=""><a href="{{ url_for('index') }}" class="text-decoration-none px-3 py-2 d-block"><i
+ class="far fa-map-marker-question"></i>Home</a></li>
+ {% if current_user.is_authenticated %}
+ <li class=""><a href="{{ url_for('traps') }}" class="text-decoration-none px-3 py-2 d-block"><i
+ class="far fa-tachometer-alt"></i>Dashboard</a></li>
+ <li class=""><a href="#" class="text-decoration-none px-3 py-2 d-block"><i class="far fa-plug"></i>Koppel
+ een val</a></li>
+ <li class=""><a href="{{ url_for('contact') }}" class="text-decoration-none px-3 py-2 d-block"><i
+ class="far fa-address-book"></i>Contact opnemen</a></li>
+ {% endif %}
+ <li class=""><a href="#" class="text-decoration-none px-3 py-2 d-block"><i
+ class="far fa-map-marker-question"></i>Over ons</a></li>
+ </ul>
+ <hr class="h-color mx-2">
+
+ <ul class="list-unstyled px-2">
+ {% if current_user.is_authenticated %}
+ <li class=""><a href="{{ url_for('account') }}" class="text-decoration-none px-3 py-2 d-block"><i
+ class="far fa-cogs"></i>Instellingen</a></li>
+ <li class=""><a href="{{ url_for('logout') }}" class="text-decoration-none px-3 py-2 d-block"><i
+ class="fas fa-sign-out"></i>Uitloggen</a></li>
+ {% else %}
+ <li class=""><a href="{{ url_for('login') }}" class="text-decoration-none px-3 py-2 d-block"><i
+ class="fas fa-sign-out"></i>Inloggen</a></li>
+ <li class=""><a href="{{ url_for('register') }}" class="text-decoration-none px-3 py-2 d-block"><i
+ class="fas fa-sign-out"></i>Registeren</a></li>
+ {% endif %}
+ </ul>
+ <hr class="h-color mx-2">
+ </div>
+ <div class="content">
+ {% for category, message in get_flashed_messages(with_categories=true) %}
+ <div class="alert alert-{{ category }}">
+ {{ message }}
+ </div>
+ {% endfor %}
+ {% block content %}
- <script> src = "https:://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"</script>
- <script> src = "https://ajax/googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"</script>
-
-
+ {% endblock %}
+ </div>
</body>
</html>
\ No newline at end of file
