Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Website (only HTML) #34

Merged
merged 20 commits into from
Jan 14, 2020
Merged

Website (only HTML) #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e9936cd
Started with HomeEN.html and index.html
Oct 6, 2019
82bb971
First pages
Oct 25, 2019
b7a3a7c
Menu
Nov 13, 2019
180612e
First prototype for Device
Nov 13, 2019
d7c4b01
Deleted .DS-Store
maximiliani Nov 13, 2019
c787abb
Deleted .DS-Store
maximiliani Nov 13, 2019
20359af
Deleted .DS-Store
maximiliani Nov 13, 2019
3bef514
Deleted .DS-Store
maximiliani Nov 13, 2019
9cbefdf
Deleted .DS-Store
maximiliani Nov 13, 2019
d0f0db8
Deleted .DS-Store
maximiliani Nov 13, 2019
1aaee20
Deleted .DS-Store
maximiliani Nov 13, 2019
b85fc26
Added button design
Nov 14, 2019
79a034d
Merge branch 'feature/23-typesOfWebsites' of https://github.com/RaHon…
Nov 14, 2019
f0c2d91
Improved button and menu
Nov 25, 2019
4a541dd
Improved multi button design
Nov 25, 2019
a595ab9
Fixed menu bug
Nov 25, 2019
7e57012
removed things ...
Dec 9, 2019
c39f876
Merge remote-tracking branch 'origin/feature/23-typesOfWebsites' into…
Dec 9, 2019
9e0a6c6
Improved Webpages
Jan 14, 2020
d6caf02
Merge branch 'Dev' into feature/23-typesOfWebsites
RaHoni Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ target
build.properties
/.directory
/project/target/
.DS_Store
49 changes: 49 additions & 0 deletions src/main/scala/PrivateHome/GUI/Website/CSS/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
.switch {
border-radius: 10px;
border-color: green;
background-color: green;
/*width: 18%;
height: 5%;
max-height: 15%;
max-width: 20%;*/
width: 100%;
height: 10%;
text-decoration-line: none;
text-decoration: none;
text-align: right;
margin: 10px;
float: left;
}

.button {
float: left;
margin: 10px;
background: transparent;
border-style: none;
}

img {
height: 60px;
width: 60px;
padding-top: 5%;
border-style: none;
border-width: 0px;
vertical-align: middle;
}

p {
color: white;
padding-bottom: 5%;
padding-top: 5%;
padding-right: 5%;
text-overflow: clip;
}

table, td {
padding: 10px;
margin: 10px;
}

th{
visibility: hidden;
}
54 changes: 54 additions & 0 deletions src/main/scala/PrivateHome/GUI/Website/CSS/menu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
body {
font-family: sans-serif;
font: "Futura";
clear: both;
overflow: auto;
padding-left: 0%;
}

#content {
font-family: sans-serif;
clear: both;
overflow: auto;
padding-left: 0%;
}

.sidenav {
height: 100%;
width: 30%;
position: fixed;
z-index: 1;
top: 0;
left: 0;
background-color: darkslategray;
overflow-x: hidden;
transition: 0.5s;
padding-top: 60px;
text-align:left;
}

.sidenav a {
padding: 8px 8px 8px 32px;
text-decoration: none;
font-size: 25px;
color: #818181;
display: block;
transition: 0.3s;
}

.sidenav a:hover{
color: #f1f1f1;
}

.sidenav .closebtn {
position: absolute;
top: 0;
right: 25px;
font-size: 36px;
margin-left: 50px;
}

@media screen and (max-height: 450px) {
.sidenav {padding-top: 15px;}
.sidenav a {font-size: 18px;}
}
358 changes: 358 additions & 0 deletions src/main/scala/PrivateHome/GUI/Website/Devices.html
View file
Open in desktop

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions src/main/scala/PrivateHome/GUI/Website/HomeEN.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>PrivateHome - Home</title>
<meta name="author" content="maximiliani & RaHoni">
<meta name="description" content="The best PrivateHome solution! For everyone! For free!">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="icon" type="image/x-icon" href="" alt="icon" />

<link rel="stylesheet" href="/CSS/menu.css">

<span style="font-size:30px;float:left;cursor:pointer" onclick="openNav()">&#9776;</span>
<div id="mySidenav" class="sidenav">
<a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a>
<a href="HomeEN.html" style="background-color: green; color: ghostwhite">Home</a>
<a href="Devices.html">Devices</a>
<a href="Rooms.html">Rooms</a>
<a href="Sensors.html">Sensors</a>
<a href="Settings.html">Settings</a>
<a href="Setup.html">Setup</a>
</div>
<div class="content" id="content">
<h1>PrivateHome</h1>
</div>
<script>
var sidebar = false;
closeNav();
function openNav() {
if(sidebar == true){
closeNav();
}
else{
sidebar = true;
document.getElementById("mySidenav").style.width = "30%";
document.getElementById("content").style.paddingLeft = "31%";
}
}
function closeNav() {
sidebar=false;
document.getElementById("mySidenav").style.width = "0%";
setTimeout(function(){document.getElementById("content").style.paddingLeft = "0%";},500)

}
</script>
</head>
<body>

</body>
</html>
Binary file added src/main/scala/PrivateHome/GUI/Website/Pictures/off.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/scala/PrivateHome/GUI/Website/Pictures/on.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions src/main/scala/PrivateHome/GUI/Website/Rooms.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>PrivateHome - Rooms</title>
<meta name="author" content="maximiliani & RaHoni">
<meta name="description" content="The best PrivateHome solution! For everyone! For free!">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="icon" type="image/x-icon" href="" alt="icon" />

<link rel="stylesheet" href="/CSS/menu.css">

<span style="font-size:30px;cursor:pointer" onclick="openNav()">&#9776;</span>
<div id="mySidenav" class="sidenav">
<a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a>
<a href="HomeEN.html">Home</a>
<a href="Devices.html">Devices</a>
<a href="Rooms.html" style="background-color: green; color: ghostwhite">Rooms</a>
<a href="Sensors.html">Sensors</a>
<a href="Settings.html">Settings</a>
<a href="Setup.html">Setup</a>
</div>
<div class="content" id="content">
<h1>Rooms</h1>
</div>
<script>
var sidebar = false;
closeNav();
function openNav() {
if(sidebar == true){
closeNav();
}
else{
sidebar = true;
document.getElementById("mySidenav").style.width = "30%";
document.getElementById("content").style.paddingLeft = "31%";
}
}
function closeNav() {
sidebar=false;
document.getElementById("mySidenav").style.width = "0%";
setTimeout(function(){document.getElementById("content").style.paddingLeft = "0%";},500)

}
</script>
</head>
<body class="content">

</body>
</html>
Empty file added src/main/scala/PrivateHome/GUI/Website/Scripts/sidebar.js
View file
Open in desktop
Empty file.
51 changes: 51 additions & 0 deletions src/main/scala/PrivateHome/GUI/Website/Sensors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>PrivateHome - Sensors</title>
<meta name="author" content="maximiliani & RaHoni">
<meta name="description" content="The best PrivateHome solution! For everyone! For free!">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="icon" type="image/x-icon" href="" alt="icon" />

<link rel="stylesheet" href="/CSS/menu.css">

<span style="font-size:30px;cursor:pointer" onclick="openNav()">&#9776;</span>
<div id="mySidenav" class="sidenav">
<a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a>
<a href="HomeEN.html">Home</a>
<a href="Devices.html">Devices</a>
<a href="Rooms.html">Rooms</a>
<a href="Sensors.html" style="background-color: green; color: ghostwhite">Sensors</a>
<a href="Settings.html">Settings</a>
<a href="Setup.html">Setup</a>
</div>
<div class="content" id="content">
<h1>Sensors</h1>
</div>
<script>
var sidebar = false;
closeNav();
function openNav() {
if(sidebar == true){
closeNav();
}
else{
sidebar = true;
document.getElementById("mySidenav").style.width = "30%";
document.getElementById("content").style.paddingLeft = "31%";
}
}
function closeNav() {
sidebar=false;
document.getElementById("mySidenav").style.width = "0%";
setTimeout(function(){document.getElementById("content").style.paddingLeft = "0%";},500)

}
</script>
</head>
<body class="content">

</body>
</html>
51 changes: 51 additions & 0 deletions src/main/scala/PrivateHome/GUI/Website/Settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>PrivateHome - Settings</title>
<meta name="author" content="maximiliani & RaHoni">
<meta name="description" content="The best PrivateHome solution! For everyone! For free!">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="icon" type="image/x-icon" href="" alt="icon" />

<link rel="stylesheet" href="/CSS/menu.css">

<span style="font-size:30px;cursor:pointer" onclick="openNav()">&#9776;</span>
<div id="mySidenav" class="sidenav">
<a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a>
<a href="HomeEN.html">Home</a>
<a href="Devices.html">Devices</a>
<a href="Rooms.html">Rooms</a>
<a href="Sensors.html">Sensors</a>
<a href="Settings.html" style="background-color: green; color: ghostwhite">Settings</a>
<a href="Setup.html">Setup</a>
</div>
<div class="content" id="content">
<h1>Devices</h1>
</div>
<script>
var sidebar = false;
closeNav();
function openNav() {
if(sidebar == true){
closeNav();
}
else{
sidebar = true;
document.getElementById("mySidenav").style.width = "30%";
document.getElementById("content").style.paddingLeft = "31%";
}
}
function closeNav() {
sidebar=false;
document.getElementById("mySidenav").style.width = "0%";
setTimeout(function(){document.getElementById("content").style.paddingLeft = "0%";},500)

}
</script>
</head>
<body class="content">

</body>
</html>
61 changes: 61 additions & 0 deletions src/main/scala/PrivateHome/GUI/Website/Settings/masterID.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>PrivateHome - Settings</title>
<meta name="author" content="maximiliani & RaHoni">
<meta name="description" content="The best PrivateHome solution! For everyone! For free!">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="icon" type="image/x-icon" href="" alt="icon" />

<link rel="stylesheet" href="/CSS/menu.css">

<meta charset="UTF-8">
<title>PrivateHome - Setup</title>
<meta name="author" content="maximiliani & RaHoni">
<meta name="description" content="The best PrivateHome solution! For everyone! For free!">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="icon" type="image/x-icon" href="" alt="icon" />

<link rel="stylesheet" href="/CSS/menu.css">

<span style="font-size:30px;cursor:pointer" onclick="openNav()">&#9776;</span>
<div id="mySidenav" class="sidenav">
<a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a>
<a href="HomeEN.html">Home</a>
<a href="Devices.html" style="background-color: green; color: ghostwhite">Settings: Name</a>
<a href="Rooms.html">Rooms</a>
<a href="Sensors.html">Sensors</a>
<a href="Settings.html">Settings</a>
<a href="Setup.html">Setup</a>
</div>
<div class="content" id="content">
<h1>Devices</h1>
</div>
<script>
var sidebar = false;
closeNav();
function openNav() {
if(sidebar == true){
closeNav();
}
else{
sidebar = true;
document.getElementById("mySidenav").style.width = "30%";
document.getElementById("content").style.paddingLeft = "31%";
}
}
function closeNav() {
sidebar=false;
document.getElementById("mySidenav").style.width = "0%";
setTimeout(function(){document.getElementById("content").style.paddingLeft = "0%";},500)

}
</script>
</head>
<body class="content">

</body>
</html>
Loading