Skip to content
This repository was archived by the owner on Sep 8, 2019. It is now read-only.

Commit 5061b89

Browse files
timothyhollabaughtimothyhollabaugh
committed
Merge remote-tracking branch 'nick/master' into docker
2 parents 8888e62 + d119ca1 commit 5061b89

File tree

11 files changed

+215
-37
lines changed

11 files changed

+215
-37
lines changed

‎frontend/www/header.html‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<div class="header">
2+
<div id=logo >
3+
<img src="/images/A-Team-Logo-White.png" alt="logo" height=100px >
4+
<img src="/images/A-Team-Logo.png" alt="logo" height=100px class=logo onclick="location.href='/index'">
5+
</div>
6+
<div class="headerText">
7+
<div height=30px;>
8+
<a class="site" href="/index">A-Team Web Server</a>
9+
</div>
10+
<div class="nav">
11+
<div class="dropdown">
12+
<button class="dropbtn"onclick="location.href='/users'">Users <i class="arrow_down"></i>
13+
</button>
14+
<div class="dropdown-content">
15+
<a href="/users/search">Search</a>
16+
<a href="/users/add">Add</a>
17+
</div>
18+
</div>
19+
</div>
20+
</div>
21+
</div>

‎frontend/www/images/A-Team-Logo-White.png‎

216 KB
Loading

‎frontend/www/images/A-Team-Logo.png‎

224 KB
Loading

‎frontend/www/index.html‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
<html>
22
<head>
3-
<title>Kluzy</title>
4-
<script type="text/javascript" src="hello_world.js"></script>
5-
<script type="text/javascript" src="get_users.js"></script>
3+
<link rel="icon" type="image/png" href="/images/A-Team-Logo.png">
4+
<title>A-Team</title>
5+
<link rel="stylesheet" href="style.css">
6+
<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
7+
<link href='https://fonts.googleapis.com/css?family=Oswald' rel='stylesheet'>
8+
<script type="text/javascript" src="/hello_world.js"></script>
9+
<script type="text/javascript" src="/settings.js"></script>
610
</head>
711
<body>
8-
<h1> Kluzy-Test-Server </h1>
9-
<p> Note: Searches are exact only!</p>
12+
<div id ="navbar" onload="/load_header()"> </div>
13+
<h1 class="pagename"> Home </h1>
14+
<p> Welcome to the A-Team Web Server. The following actions are ready for use!</p>
15+
<ul><li> Navigation bar </li>
16+
<li> Search and edit Users</li>
17+
<li> Add new Users</li></ul>
1018
<input type="button" onclick="hello_world()" value="Say hello to JavaScript"/>
1119
<ul id="JsHi"></ul>
1220
<input type="button" onclick="location.href='/users/index'" value="Users database"/><br>
13-
<!--
14-
<form name="search_terms">
15-
First name:<br>
16-
<input type="text" id="firstname" value=""><br>
17-
Last name:<br>
18-
<input type="text" id="lastname" value=""><br><br>
19-
<input type="button" onclick="get_users()" value="Search"/><br>
20-
</form>
21-
22-
<table id="user"></table>
23-
-->
21+
<img src="/images/A-Team-Logo.png" alt="logo" height=60px>
2422
</body>
2523
</html>

‎frontend/www/settings.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1-
var baseip="http://192.168.176.129";
1+
var baseip="http://192.168.176.129";
2+
3+
function load_header() {
4+
console.log("Loading Header");
5+
var xhttp = new XMLHttpRequest();
6+
xhttp.open('GET', '/header.html');
7+
xhttp.onreadystatechange = function() {
8+
document.getElementById("navbar").innerHTML=xhttp.responseText;
9+
}
10+
xhttp.send();
11+
}
12+
window.onload = load_header;

‎frontend/www/style.css‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
*{
2+
font-family:Roboto;
3+
}
4+
h1,h2,h3,h4,h5,h6 {
5+
font-family:Oswald;
6+
}
7+
th, tr {
8+
width = 50px;
9+
}
10+
.pagename {
11+
background-color:#550000;
12+
color:#FFCC00;
13+
padding-top:0px;
14+
margin-top:0px;
15+
text-align:center;
16+
}
17+
18+
.header {
19+
background-color: #333;
20+
display:flex;
21+
}
22+
.headerText {
23+
display: flex;
24+
flex-direction:column;
25+
margin: 5px;
26+
padding: 5px;
27+
border: 5px;
28+
}
29+
30+
.headerText .site {
31+
float: left;
32+
font-size: 24px;
33+
color: white;
34+
text-align: center;
35+
text-decoration: none;
36+
}
37+
.headerText .site:hover {
38+
color: #ffcf44;
39+
}
40+
41+
.header a {
42+
float: left;
43+
font-size: 16px;
44+
color: white;
45+
text-align: center;
46+
padding-right: 16px;
47+
padding-left: 16px;
48+
text-decoration: none;
49+
}
50+
51+
.header a:hover{
52+
color: #ffcf44;
53+
border-color:#ffcf44;
54+
}
55+
.dropdown {
56+
float: left;
57+
overflow: hidden;
58+
}
59+
.dropdown .dropbtn {
60+
font-size: 16px;
61+
border: none;
62+
outline: none;
63+
color: white;
64+
padding: 10px 16px;
65+
background-color: inherit;
66+
font-family: inherit;
67+
margin: 0;
68+
}
69+
70+
.header .dropdown:hover .dropbtn {
71+
color: #ffcf44;
72+
cursor:pointer;
73+
}
74+
75+
.dropdown-content {
76+
display: none;
77+
position: absolute;
78+
background-color: #ddd;
79+
min-width: 160px;
80+
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
81+
z-index: 1;
82+
}
83+
84+
.dropdown-content a {
85+
float: none;
86+
color: black;
87+
padding: 12px 16px;
88+
text-decoration: none;
89+
display: block;
90+
text-align: left;
91+
}
92+
.header .dropdown-content a:hover {
93+
background-color: #ffcf44;
94+
color: black;
95+
}
96+
97+
.dropdown:hover .dropdown-content {
98+
display: block;
99+
}
100+
.arrow_down {
101+
border: solid black;
102+
border-width: 0 2px 2px 0;
103+
display: inline-block;
104+
padding: 2px;
105+
transform: rotate(45deg) translate(0px,-5px);
106+
-webkit-transform: rotate(45deg) translate(0px,-5px);
107+
108+
border-color: white;
109+
}
110+
.arrow_down: hover {
111+
border-color:#ffcf44;
112+
}
113+
#logo {
114+
height: 100px;
115+
display: inline-block;
116+
position: relative;
117+
float:left;
118+
cursor:pointer;
119+
}
120+
#logo .logo {
121+
height = 100px;
122+
top:0;
123+
left:0;
124+
display: none;
125+
position: absolute;
126+
z-index: 99;
127+
}
128+
#logo:hover .logo{
129+
display: inline;
130+
}

‎frontend/www/users/.htaccess‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DirectoryIndex index.html

‎frontend/www/users/add.html‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<html>
22
<head>
3-
<title>Kluzy-Users</title>
4-
<script type="text/javascript" src="/../settings.js"></script>
5-
<script type="text/javascript" src="add_user.js"></script>
3+
<title>Users</title>
4+
<link rel="stylesheet" href="/style.css">
5+
<link rel="icon" type="image/png" href="/images/A-Team-Logo.png">
6+
<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
7+
<link href='https://fonts.googleapis.com/css?family=Oswald' rel='stylesheet'>
8+
<script type="text/javascript" src="/settings.js"></script>
9+
<script type="text/javascript" src="/users/add_user.js"></script>
610
</head>
711
<body>
8-
<h1> Add Users </h1>
12+
<div id ="navbar" onload="/load_header()"> </div>
13+
<h1 class="pagename"> Users Database (Add)</h1>
914
<p> To add a user, fill out the textboxes and hit submit.</p>
1015
<form name="add_data">
1116
First name:<br>
@@ -17,7 +22,7 @@ <h1> Add Users </h1>
1722
Banner ID:<br>
1823
<input type="text" id="banner_id" value=""><br>
1924
<br>
20-
<input type="button" onclick="add_user()" value="Add"/><br>
25+
<input type="submit" onclick="add_user()" value="Add"/><br>
2126
</form>
2227
<p id = "result"></p>
2328
</body>

‎frontend/www/users/edit.html‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<html>
22
<head>
3-
<title>Kluzy-Users</title>
4-
<script type="text/javascript" src="/../settings.js"></script>
5-
<script type="text/javascript" src="update_user.js"></script>
3+
<title>Users</title>
4+
<link rel="stylesheet" href="/style.css">
5+
<link rel="icon" type="image/png" href="/images/A-Team-Logo.png">
6+
<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
7+
<link href='https://fonts.googleapis.com/css?family=Oswald' rel='stylesheet'>
8+
<script type="text/javascript" src="/settings.js"></script>
9+
<script type="text/javascript" src="/users/update_user.js"></script>
610
</head>
7-
<body onload="get_user_from_url();">
8-
<h1> Edit User </h1>
11+
<body onload="load_header();get_user_from_url();">
12+
<div id ="navbar"> </div>
13+
<h1 class="pagename"> Users Database (Edit) </h1>
914
<p> Edit the user selected from your search.</p>
1015
<div>
1116
<h2> Current User Data </h2>
@@ -23,7 +28,7 @@ <h2> Updated User Data </h2>
2328
Banner ID:<br>
2429
<input type="text" id="banner_id" value=""><br>
2530
<br>
26-
<input type="button" onclick="update_user()" value="Edit"/><br>
31+
<input type="submit" onclick="update_user()" value="Edit"/><br>
2732
</form>
2833
</div>
2934
<p id = "result"></p>

‎frontend/www/users/index.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<html>
22
<head>
33
<title>Kluzy-Users</title>
4-
<!--
5-
<script type="text/javascript" src="hello_world.js"></script>
6-
<script type="text/javascript" src="get_users.js"></script>
7-
-->
4+
<link rel="stylesheet" href="/style.css">
5+
<link rel="icon" type="image/png" href="/images/A-Team-Logo.png">
6+
<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
7+
<link href='https://fonts.googleapis.com/css?family=Oswald' rel='stylesheet'>
8+
<script type="text/javascript" src="/settings.js"></script>
89
</head>
910
<body>
10-
<h1> Users-Test-Server </h1>
11+
<div id ="navbar" onload="/load_header()"> </div>
12+
<h1 class="pagename"> Users Database</h1>
1113
<p> Welcome to the users database. Please select a function.</p>
1214
<input type="button" onclick="location.href='/users/search'" value="Search"/><br>
1315
<input type="button" onclick="location.href='/users/add'" value="Add"/><br>

0 commit comments

Comments
 (0)