Skip to content
Snippets Groups Projects
Commit cb0860f3 authored by binh.pham's avatar binh.pham Committed by Philipp Jonas Krieg
Browse files

Navigation Bar, Logo und generell neues Design

parent 2e2814aa
No related branches found
No related tags found
1 merge request!8neue Routes und neue html-Dateien (über NavigationBar erreichbar) + Symbole...
Hide whitespace changes
Inline Side-by-side
Showing
with 139 additions and 15 deletions
.idea/.gitignore 0 → 100644
+ 8
− 0
View file @ cb0860f3
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
.idea/cyber-physical-systems.iml 0 → 100644
+ 23
− 0
View file @ cb0860f3
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="Flask">
<option name="enabled" value="true" />
</component>
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PyDocumentationSettings">
<option name="format" value="PLAIN" />
<option name="myDocStringFormat" value="Plain" />
</component>
<component name="TemplatesService">
<option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
<option name="TEMPLATE_FOLDERS">
<list>
<option value="$MODULE_DIR$/templates" />
</list>
</option>
</component>
</module>
\ No newline at end of file
.idea/inspectionProfiles/profiles_settings.xml 0 → 100644
+ 6
− 0
View file @ cb0860f3
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>
\ No newline at end of file
.idea/misc.xml 0 → 100644
+ 4
− 0
View file @ cb0860f3
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
.idea/modules.xml 0 → 100644
+ 8
− 0
View file @ cb0860f3
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/cyber-physical-systems.iml" filepath="$PROJECT_DIR$/.idea/cyber-physical-systems.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
+ 6
− 0
View file @ cb0860f3
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
__pycache__/app.cpython-39.pyc
+ 0
− 0
View file @ cb0860f3
No preview for this file type
static/robot01.png 0 → 100644
+ 0
− 0
View file @ cb0860f3
static/robot01.png

9.93 KiB

static/robot02.png 0 → 100644
+ 0
− 0
View file @ cb0860f3
static/robot02.png

6.19 KiB

static/style.css
+ 55
− 2
View file @ cb0860f3
*{
list-style: none;
box-sizing: border-box;
text-decoration: none;
}
input[type=text], input[type=password], select {
width: 100%;
padding: 12px 20px;
margin: 8px 0;
display: inline-block;
border: 1px solid white;
border-radius: 4px;
box-sizing: border-box;
background-color: transparent;
color: white;
}
input[type=submit] {
width: 100%;
background-color: transparent;
color: white;
padding: 14px 20px;
margin: 8px 0;
border: 1px solid white;
border-radius: 4px;
cursor: pointer;
}
input[type=submit]:hover {
background-color: white;
color: black;
}
nav ul{
float: right;
margin-right: 20px;
}
nav ul li{
display: inline-block;
line-height: 30px;
margin: 0 5px;
}
nav ul li a{
color: white;
font-size: 17px;
padding: 7px 13px;
border-radius: 3px;
text-transform: uppercase;
}
a.active,a:hover{
background: white;
color: black;
border-color: black;
transition: .5s;
}
body {
color: #CCFFCC;
background-color: #006633;
color: white;
background-color: #9CADCE;
}
.button {
......
templates/index.html
+ 15
− 5
View file @ cb0860f3
......@@ -4,15 +4,25 @@
<title>{{ title }}</title>
<link rel="stylesheet" href="../static/style.css/">
</head>
<body style="font-family: Helvetica;">
<body style="font-family: 'Courier New';">
<!--Uhrzeit und Titel-->
<h1 align="right"><font size="4">{{ time }}</font></h1>
<h2 align="center"><font size="8">Growbot</font></h2>
<img src="../static/ivy.png" style="width:100%">
<!--<h2 align="center"><font size="8">GROWBOT</font></h2>-->
<nav>
<img src="../static/robot01.png" style="width:60px; height: auto" align="left">
<name align="left"><font size="8"><b>GROWBOT</b></font></name>
<ul>
<li><a class="active" href="#">Messwerte</a></li>
<li><a href="#">Steuerung</a></li>
<li><a href="#">Analyse</a></li>
<li><a href="#">Logout</a></li>
</ul>
<hr color=white>
</nav>
<div align="right"><font size="4">{{ time }}</font></div>
</br></br></br></br></br></br>
<!--manuelle Steuerung von Licht und Wasser-->
<h3 style="margin-left: 200px;"><font size="6">Steuerung:</font></h3>
<h3 style="margin-left: 200px"><font size="6">Steuerung:</font></h3>
</br>
<button id="btn2" class="button button2 move-right" style="margin-left: 200px;">Pumpe an</button>
<button id="btn1" class="button button1 move-right" style="margin-left: 200px;">Licht an</button>
......
templates/login.html
+ 14
− 8
View file @ cb0860f3
......@@ -4,16 +4,22 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" charset="UTF-8">
<link href="../static/style.css" rel="stylesheet" media="screen">
</head>
<body style="font-family: Helvetica;">
<body style="font-family: Courier New;">
<div class="container">
<h1 style="margin-top: 300px;"align="center">Please login</h1>
<br>
<form align="center" action="" method="post">
<input type="text" placeholder="Username" name="username" value="{{
request.form.username }}">
<input type="password" placeholder="Password" name="password" value="{{
<img src="../static/robot01.png" style="width:60px; height: auto" align="left">
<name align="left"><font size="8"><b>GROWBOT</b></font></name>
<form style="padding-left: 38%; padding-right: 38%" action="" method="post">
<h1 style="margin-top: 120px;"align="left">LOGIN</h1>
<p> <label for="fname">BENUTZERNAME</label>
<input type="text" name="username" value="{{
request.form.username }}">
</p>
<p> <label for="fpasword">PASSWORT</label>
<input type="password" name="password" value="{{
request.form.password }}">
<input class="btn btn-default" type="submit" value="Login">
</p>
<p><input class="btn btn-default" type="submit" value="ANMELDEN"></p>
</form>
{% if error %}
<p class="error"><strong>Error:</strong> {{ error }}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment