diff --git a/About.html b/About.html
deleted file mode 100644
index cb4a5c7768c891c9479276997ee0b899d7e75eb8..0000000000000000000000000000000000000000
--- a/About.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, intial-scale=1.0">
- <meta http-equiv="X-UA-Compatible" content="ie=edge">
- <link rel="stylesheet" href="style/main.css">
- <title>Travel Elect</title>
-</head>
-
-<body>
- <h1>About</h1>
- <p1>
- Many large organisations have many employees that go on
- regular business trips across the world. These business
- trips are quite essential for these companies to do, but
- it also creates a large carbon footprint and the organisations
- spend a lot of money that could be allocated elsewhere. Travel
- Elect is a software designed to help companies lower their carbon
- footprint and save money. Some of the reasons for these business
- trips can be done using technology developed to help companies
- for these reasons such as conducting a conferencing over
- video conferencing rather than traveling abroad. Travel
- Elect can help these companies decide which trips are necessary
- and which ones are not and help the company to keep
- track of their carbon footprint and remain on budget.
- </p1>
-</body>
-</html>
\ No newline at end of file
diff --git a/Admin.html b/Admin.html
index b7e53bce9a1edfc42f5736842f16ee94fb6e92bc..dcd22707b4a679a2ee9f069974fc27492310e98f 100644
--- a/Admin.html
+++ b/Admin.html
@@ -9,8 +9,9 @@
</head>
<body>
+
<header>
- <h1>Travel Elect</h1>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
</header>
<div class="sidenav">
diff --git a/Carbon Levels.html b/Carbon Levels.html
index db23c07e36cb51fc4fe1d3b584bf06b57ce5c986..d856c81f48316234dc9c7226ef25d3000ea9c235 100644
--- a/Carbon Levels.html
+++ b/Carbon Levels.html
@@ -11,7 +11,7 @@
<body>
<header>
- <h1>Travel Elect</h1>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
</header>
<div class="sidenav">
diff --git a/Homepage.html b/Homepage.html
index 6acb9cd9bcf276bde93c0f5bb3042d8fb0a1a2d9..2e97664b23fa03a20eb0302ae80d94003c8c1142 100644
--- a/Homepage.html
+++ b/Homepage.html
@@ -9,18 +9,33 @@
</head>
<body>
- <title>Travel Elect</title>
- <button>Login</button>
- <button>Register</button>
+
+ <header>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
+ </header>
+
+ <button class="btn" onclick="document.location='Login.html'">Login</button>
+ <button class="btn1" onclick="document.location='Register.html'">Register</button>
- <p1>
- Plan your business trips efficiently and save your company money by
- only taking trips that are necessary. Recieve alternative trip options.
+ <p1 class="about">
+ Travel Elect is a software designed to help companies lower their carbon
+ footprint and save money. You are able to plan business trips efficiently
+ and save your company money by only taking trips that are necessary.
+ You will recieve alternative trip options when planning your trips.
+ Some of the reasons for these business trips can be done using technology
+ developed to help companies for these reasons such as conducting a conferencing over
+ video conferencing rather than traveling abroad.
</p1>
- <p2>
+ <p2 class="about1">
+ Travel Elect can help these companies decide which trips are necessary
+ and which ones are not and help the company to keep
+ track of their carbon footprint and remain on budget.
Help your company go carbon neutral and save our planet. Our software helps
- your company go carbon nuetral by stopping unnecessary business trips.
+ your company go carbon nuetral by stopping unnecessary travels. And displays your
+ companies carbon footprint overall.
</p2>
+
+ <button class="btn2" onclick="document.location='Register.html'">Start Planning</button>
</body>
</html>
\ No newline at end of file
diff --git a/Login.html b/Login.html
index fbb10eef0847fde6d7bf9e6fcf8e913da7932cc9..456f00bf6850f82f2826b917b66c922c760ea568 100644
--- a/Login.html
+++ b/Login.html
@@ -10,13 +10,28 @@
<body>
<header>
- <h1>Travel Elect<h1></h1>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
</header>
<form action="/action_page.php">
- <h2><label for="login">Login</label><br></h2>
- <input type="text" id="login" name="login">
- <h2><label for="password">Password</label><br></h2>
- <input type="text" id="password" name="password">
+ <div class=user>
+ <h2><label for="uname">Username</label><br></h2>
+ <input type="text" placeholder="Enter Username" name="uname" required>
+ </div>
+
+ <div class=psw>
+ <h2><label for="password">Password</label><br></h2>
+ <input type="text" placeholder="Enter Password" name="psw" required>
+ </div>
+
+ <button type="submit">Login</button>
+ <label>
+ <input type="checkbox" checked="checked" name="remember"> Remember me
+ </label>
+
+ <div class="container">
+ <button type="button" class="cancelbtn">Cancel</button>
+ <span class="psw">Forgot <a href="#">password?</a></span>
+ </div>
</form>
</body>
</html>
\ No newline at end of file
diff --git a/Logo.png b/Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2908a2f47ce625112c94e0860070ef7ef59b94d
Binary files /dev/null and b/Logo.png differ
diff --git a/Notes.html b/Notes.html
index b7e53bce9a1edfc42f5736842f16ee94fb6e92bc..49b5136952d9d19ec18eb9e145848ed069fa0dfc 100644
--- a/Notes.html
+++ b/Notes.html
@@ -10,7 +10,7 @@
<body>
<header>
- <h1>Travel Elect</h1>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
</header>
<div class="sidenav">
diff --git a/Plan Trips.html b/Plan Trips.html
index b7e53bce9a1edfc42f5736842f16ee94fb6e92bc..49b5136952d9d19ec18eb9e145848ed069fa0dfc 100644
--- a/Plan Trips.html
+++ b/Plan Trips.html
@@ -10,7 +10,7 @@
<body>
<header>
- <h1>Travel Elect</h1>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
</header>
<div class="sidenav">
diff --git a/Profile.html b/Profile.html
index 99daac6a8fe395cbbfad796069e148e71ff8b957..1540928070764206570e4e1e05587db7d2df53a2 100644
--- a/Profile.html
+++ b/Profile.html
@@ -11,7 +11,7 @@
<body>
<header>
- <h1>Travel Elect</h1>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
</header>
<div class="sidenav">
@@ -25,13 +25,17 @@
</div>
- <h2>Employee Profile</h2>
+ <h2>Employee Profiles</h2>
+ <p>Employee ID</p>
<p>First Name</p>
<p>Last Name</p>
<p>Occupation</p>
+ <p>Department</p>
<p>Number of Trips</p>
<p>Averge Money Spent</p>
+ <p>Contact Number</p>
+ <p>Email</p>
</body>
</html>
\ No newline at end of file
diff --git a/Register pt 2.html b/Register pt 2.html
index e491581e774493665d59b2775b088839d21fa379..414728238032a8e8677e6e1d2843640023d06272 100644
--- a/Register pt 2.html
+++ b/Register pt 2.html
@@ -10,5 +10,9 @@
<body>
+ <header>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
+ </header>
+
</body>
</html>
\ No newline at end of file
diff --git a/Register pt 3.html b/Register pt 3.html
index e00e71685ff1005dce8301527df7066a9ddaafc9..ec5d73acdc909aee6c352ea0fe5ba16e3e54df90 100644
--- a/Register pt 3.html
+++ b/Register pt 3.html
@@ -11,7 +11,7 @@
<body>
<body>
<header>
- <h1>Travel Elect<h1></h1>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
</header>
<h2>Payment Details</h2>
<form action="/action_page.php">
diff --git a/Register.html b/Register.html
index 492c9da35b3da357917f2c00d165d81f0476e641..acd627a737b5ca6f31f7552dcd0c4b8881b5c2f7 100644
--- a/Register.html
+++ b/Register.html
@@ -9,32 +9,45 @@
</head>
<body>
- <body>
- <header>
- <h1>Travel Elect<h1></h1>
- </header>
- <h2>Register</h2>
+ <header>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
+ </header>
+
<form action="/action_page.php">
- <label for="cname">Company Name:</label><br>
- <input type="text" id="cname" name="cname"><br><br>
- <label for="address">Address:</label><br>
- <input type="text" id="address" name="address"><br><br>
- <input type="text" id="address" name="address"><br><br>
- <input type="text" id="address" name="address"><br><br>
- <label for="pcode">Postcode:</label><br>
- <input type="text" id="pcode" name="pcode"><br><br>
- <label for="region">Country/Region:</label><br>
- <input type="text" id="region" name="region"><br><br>
- <label for="email">Email Address:</label><br>
- <input type="text" id="email" name="email"><br><br>
- <label for="contact">Contact Number:</label><br>
- <input type="text" id="contact" name="contact"><br><br>
- <p1>Agree with Terms & Conditions</p1><br>
- <p2>Agree with Privacy Terms</p2><br><br>
-
- <input type="next" value="next">
+
+ <fieldset>
+
+ <legend>Register</legend>
+
+ <div class="register">
+
+ <label for="cname">Company Name:</label><br>
+ <input type="text" id="cname" name="cname"><br><br>
+ <label for="address">Address:</label><br>
+ <input type="text" id="address" name="address"><br><br>
+ <input type="text" id="address" name="address"><br><br>
+ <input type="text" id="address" name="address"><br><br>
+ <label for="pcode">Postcode:</label><br>
+ <input type="text" id="pcode" name="pcode"><br><br>
+ <label for="region">Country/Region:</label><br>
+ <input type="text" id="region" name="region"><br><br>
+ <label for="email">Email Address:</label><br>
+ <input type="text" id="email" name="email"><br><br>
+ <label for="contact">Contact Number:</label><br>
+ <input type="text" id="contact" name="contact"><br><br>
+ <label>
+ <input class="regcheck" type="checkbox" name="t/c"> Agree with Terms & Conditions
+ </label>
+ <label>
+ <input class="regcheck" type="checkbox" name="privacy"> Agree with Privacy Terms
+ </label>
+ <button class="next" onclick="document.location='Register pt 2.html'">Next</button>
+
+ </div>
+
+ </fieldset>
+
</form>
- </body>
</body>
</html>
\ No newline at end of file
diff --git a/Reports.html b/Reports.html
index b7e53bce9a1edfc42f5736842f16ee94fb6e92bc..49b5136952d9d19ec18eb9e145848ed069fa0dfc 100644
--- a/Reports.html
+++ b/Reports.html
@@ -10,7 +10,7 @@
<body>
<header>
- <h1>Travel Elect</h1>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
</header>
<div class="sidenav">
diff --git a/Style/main.css b/Style/main.css
index 9f0276253b0349a9825c07a175d9c34d8aecc4db..40b8a1295715f46f4a0b74348ce4f7fee3a30ebb 100644
--- a/Style/main.css
+++ b/Style/main.css
@@ -1,17 +1,25 @@
/*Global*/
body {
- display:grid;
- grid-template-columns: 1fr 2fr 2fr 1fr;
- grid-template-rows: auto auto 1fr 1fr;
+ display:grid;
+ grid-template-columns: 2fr 1fr 1fr 1fr;
+ grid-template-rows: auto auto 1fr 1fr 1fr 1fr;
}
-header {
+
+header{
grid-column: 1/6;
grid-row: 1;
color: darkblue;
font-size: 25px;
+ position: relative;
+ }
+.logo{
+ width: 70px;
+ height: 70px;
+ grid-row: 1;
+ grid-column: 1/6;
+ float: left;
}
-
.sidenav {
width: 230px;
z-index: 1;
@@ -51,4 +59,152 @@ header {
width: 100%;
}
-
\ No newline at end of file
+ /*Homepage*/
+
+ .btn {
+ border: none;
+ background-color: inherit;
+ padding: 14px 28px;
+ font-size: 20px;
+ cursor: pointer;
+ display: inline-block;
+ width: 50%;
+ grid-column: 1/3;
+ grid-row: 3;
+ color: darkblue;
+ }
+ .btn:hover {
+ background: #eee;
+ }
+ .btn1 {
+ border: none;
+ background-color: white;
+ padding: 14px 28px;
+ font-size: 20px;
+ cursor: pointer;
+ display: inline-block;
+ width: 50%;
+ grid-column: 1/3;
+ grid-row: 4;
+ color: darkblue;
+ }
+ .btn1:hover {
+ background: #eee;
+ }
+
+ .about {
+ grid-column: 1/6;
+ grid-row: 6;
+ font-size: 20px;
+ text-align: center;
+ }
+ .about1 {
+ grid-column: 1/6;
+ grid-row: 10;
+ font-size: 20px;
+ text-align: center;
+ }
+ .btn2 {
+ border: none;
+ background-color: white;
+ padding: 14px 28px;
+ font-size: 20px;
+ cursor: pointer;
+ display: inline-block;
+ width: 50%;
+ grid-column: 2/4;
+ grid-row: 11;
+ color: darkblue;
+ }
+ .btn2:hover {
+ background: #eee;
+ }
+
+ /*Login*/
+ button {
+ background-color: darkblue;
+ color: white;
+ padding: 14px 20px;
+ margin: 8px 0;
+ border: none;
+ cursor: pointer;
+ width: 100%;
+ }
+
+ button:hover {
+ background-color: #4CAF50;
+ }
+
+ .cancelbtn {
+ width: auto;
+ padding: 10px 18px;
+ background-color: #f44336;
+ }
+ input[type=text], input[type=password] {
+ width: 100%;
+ padding: 12px 20px;
+ margin: 8px 0;
+ display: inline-block;
+ border: 1px solid #ccc;
+ box-sizing: content-box;
+ }
+ span.psw {
+ float: right;
+ padding-top: 16px;
+ }
+ .container {
+ padding: 16px;
+ }
+
+ /*Register 1*/
+
+ .register {
+ grid-template-columns: 1/3;
+ grid-template-rows: 2;
+ }
+ input[type=text] {
+ width: 100%;
+ padding: 12px 100px;
+ margin: 8px 0;
+ display: inline-block;
+ border: 1px solid #ccc;
+ box-sizing: content-box;
+ font-size: 16;
+ }
+ label {
+ float: left;
+ width: 100%;
+ text-align: left;
+ padding: 5px 1px 1px 1px;
+ font-size: 16px;
+ }
+ fieldset {
+ max-width: 40px;
+ padding: 20px;
+ margin: 2px auto;
+ border: 0 none;
+ }
+ legend {
+ font-size: 30px;
+ width: 100%;
+ border-bottom: 5px dotted darkblue;
+ color: darkblue;
+ }
+ label {
+ box-sizing: border-box;
+ user-select: none;
+ cursor: pointer;
+ }
+ .next {
+ width: 100%;
+ background-color: darkblue;
+ color: white;
+ padding: 14px 20px;
+ margin: 8px 0;
+ border: none;
+ border-radius: 4px;
+ cursor: pointer;
+ }
+ .next:hover {
+ background-color: #4CAF50;
+ }
\ No newline at end of file
diff --git a/Upcoming Trips.html b/Upcoming Trips.html
index f200ec148369b84c2fbed6669dc5fd32dffead42..dcd22707b4a679a2ee9f069974fc27492310e98f 100644
--- a/Upcoming Trips.html
+++ b/Upcoming Trips.html
@@ -11,7 +11,7 @@
<body>
<header>
- <h1>Travel Elect</h1>
+ <h1><img class= "logo" src="logo.png" alt="company logo"/>Travel Elect</h1>
</header>
<div class="sidenav">