Skip to content

Commit 3691aaf

Browse files
DoctorModDoctorMod
authored
Updated Page According to Requirements
- Change menu clickers - Add “Air Tutor” to the logo - Add a “Sign up to be a tutor page” – //TODO Google Form - Change text on the index page to be inline - Add //TODO photo of a tutoring session on the index page - Change colouring on filters - Add “FAQ’s” page - Change text on the about us page introducing team - Make the contact page for the tutors
1 parent 4fb01ed commit 3691aaf

File tree

7 files changed

+160
-31
lines changed

7 files changed

+160
-31
lines changed

‎Temp/AirTutor/about.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
1111
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
1212
<style>
13-
.hiddenA {
13+
.hiddenA {
1414
color:white;
1515
transition: 0.3s color;
16-
background-color: gray;
1716
}
1817

1918
.hiddenA.active {
20-
background-color: darkgray !important;
19+
color: #333;
20+
background-color:#8DD4DD !important;
2121
}
2222

2323
.hiddenA:hover {
@@ -46,6 +46,10 @@
4646
<li class="nav-item">
4747
<a class="nav-link hiddenA" href="contact.html">Contact</a>
4848
</li>
49+
<li class="nav-item">
50+
<a class="nav-link hiddenA" href="signup.html">Sign Up</a>
51+
</li>
52+
4953
</ul>
5054
</nav>
5155
<div class="text-center container">
@@ -64,7 +68,7 @@ <h1>ABOUT US</h1>
6468

6569
To keep up to date with everything Air Tutor, feel free to contact the creators individually by going on to our 'contact us' page :)</p>
6670
<br/><br/><br/>
67-
<p>This company is created by our wonderful team filled with four Carmel year 9 students</p>
71+
<p>The company is created by a team of the four year 9’s listed below:</p>
6872
<br/>
6973
<div class="row">
7074
<div class="col">

‎Temp/AirTutor/contact.html‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
.hiddenA {
1515
color:white;
1616
transition: 0.3s color;
17-
background-color: gray;
1817
}
1918

2019
.hiddenA.active {
21-
background-color: darkgray !important;
20+
background-color:#8DD4DD !important;
21+
color: #333;
2222
}
2323

2424
.hiddenA:hover {
@@ -39,7 +39,7 @@
3939
<ul class="nav nav-pills nav-fill" style="color:#000;background-color:rgb(3, 50, 73);height:100px;">
4040
<img src="img/logo.png" height=100px>
4141
<li class="nav-item">
42-
<a class="nav-link active hiddenA" href="index.html">Home</a>
42+
<a class="nav-link hiddenA" href="index.html">Home</a>
4343
</li>
4444
<li class="nav-item">
4545
<a class="nav-link hiddenA" href="about.html">About</a>
@@ -48,7 +48,10 @@
4848
<a class="nav-link hiddenA" href="find.html">Services</a>
4949
</li>
5050
<li class="nav-item">
51-
<a class="nav-link hiddenA" href="contact.html">Contact</a>
51+
<a class="nav-link active hiddenA" href="contact.html">Contact</a>
52+
</li>
53+
<li class="nav-item">
54+
<a class="nav-link hiddenA" href="signup.html">Sign Up</a>
5255
</li>
5356
</ul>
5457
</nav>

‎Temp/AirTutor/find.html‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
}
5151

5252
#sidebar {
53-
background: #909090;
53+
background: rgb(3, 50, 73);
5454
color: #fff;
5555
transition: all 0.3s;
5656
min-width: 250px;
@@ -89,8 +89,18 @@
8989

9090
#sidebar .sidebar-header {
9191
padding: 20px;
92-
background: #909090;
9392
}
93+
94+
::placeholder {
95+
color:#333;
96+
}
97+
98+
input[type=button],input[type=submit], input, button {
99+
background-color:#8DD4DD;
100+
border:none;
101+
color:#333;
102+
border-radius:2px;
103+
}
94104

95105
#sidebar ul.components {
96106
padding: 20px 0;
@@ -109,11 +119,10 @@
109119
.hiddenA {
110120
color:white;
111121
transition: 0.3s color;
112-
background-color: gray;
113122
}
114123

115124
.hiddenA.active {
116-
background-color: darkgray !important;
125+
background-color:#8DD4DD !important;
117126
}
118127

119128
.hiddenA:hover {
@@ -139,6 +148,9 @@
139148
<li class="nav-item">
140149
<a class="nav-link hiddenA" href="contact.html">Contact</a>
141150
</li>
151+
<li class="nav-item">
152+
<a class="nav-link hiddenA" href="signup.html">Sign Up</a>
153+
</li>
142154
</ul>
143155
</nav>
144156

@@ -154,7 +166,7 @@ <h3>Filters</h3>
154166
<h5>Gender</h5>
155167
<li><label><input id="gMale" type="radio" name="gender" value="Male"> Male</label></li>
156168
<li><label><input id="gFemale" type="radio" name="gender" value="Female"> Female</label></li>
157-
<li><button type="submit" name="gender" value="">Clear</button><input type="submit" value="Go"></li>
169+
<li><button type="submit" name="gender" value="">Clear</button> <input type="submit" value="Go"></li>
158170
</ul>
159171
<ul class="list-unstyled components">
160172
<h5>Age</h5>
@@ -174,7 +186,7 @@ <h5>Qualification</h5>
174186
<li><label><input id="qUniversity" type="radio" name="qualification" value="University"> University</label></li>
175187
<li><label><input id="qTeacher" type="radio" name="qualification" value="Teacher"> Teacher</label></li>
176188
<li><label><input id="qOther" type="radio" name="qualification" value="Other"> Other</label></li>
177-
<li><button type="submit" name="qualification" value="">Clear</button><input type="submit" value="Go"></li>
189+
<li><button type="submit" name="qualification" value="">Clear</button> <input type="submit" value="Go"></li>
178190
</ul>
179191
<ul class="list-unstyled components">
180192
<h5>Avaliability</h5>

‎Temp/AirTutor/index.html‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,24 @@
1111
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
1212
<style>
1313

14-
.hiddenA {
14+
.hiddenA {
1515
color:white;
1616
transition: 0.3s color;
17-
background-color: gray;
1817
}
1918

2019
.hiddenA.active {
21-
background-color: darkgray !important;
20+
background-color:#8DD4DD !important;
21+
color: #333;
2222
}
2323

2424
.hiddenA:hover {
2525
color:darkgray;
2626
}
27-
* {
27+
28+
* {
2829
font-family: montserrat,sans-serif;
2930
}
31+
3032
.mainPart {
3133
height:90vh;
3234
}
@@ -50,14 +52,19 @@
5052
<li class="nav-item">
5153
<a class="nav-link hiddenA" href="contact.html">Contact</a>
5254
</li>
55+
<li class="nav-item">
56+
<a class="nav-link hiddenA" href="signup.html">Sign Up</a>
57+
</li>
58+
5359
</ul>
5460
</nav>
5561
<div class="text-center container mainPart">
5662
<br/>
5763
<h1>THE FUTURE OF TUTORING IS HERE</h1>
58-
<h2>Discover the most efficient and easiest way to a find tutor - success WILL be yours with Air Tutor</h2>
64+
<h2>Discover the most efficient and easiest way to a find tutor</h2>
65+
<h2>success WILL be yours with Air Tutor</h2>
5966
<br/>
60-
67+
IMAGE
6168
</div>
6269
<footer class="text-center text-lg-start bg-light text-muted">
6370
<div class="text-center p-4" style="background-color: rgba(0, 0, 0, 0.05);">

‎Temp/AirTutor/script.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function itemtemplate(user) {
2424
<li>
2525
<div class="ItemBox border text-center">
2626
<div class="imgContainer">
27-
<img alt="Image of Tutor" class="smallImage" src="img/${user.image}">
27+
<a href="mailto:${user.email}"><img alt="Image of Tutor" class="smallImage" src="img/${user.image}"></a>
2828
</div>
2929
<span class="Title">${user.name.last}</span>
3030
<br />
@@ -102,10 +102,10 @@ window.addEventListener('scroll', function() {
102102
});
103103

104104
function filterSave() {
105-
filter.agemin != '' && filter.agemin != null ? document.getElementById("agemin").value = filter.agemin : '';
106-
filter.agemax != '' && filter.agemax != null ? document.getElementById("agemax").value = filter.agemax : '';
107-
filter.subject != '' && filter.subject != null ? document.getElementById("subject").value = filter.subject : '';
108-
filter.area != '' && filter.area != null ? document.getElementById("area").value = filter.area : '';
105+
filter.agemin != null ? document.getElementById("agemin").value = filter.agemin : '';
106+
filter.agemax != null ? document.getElementById("agemax").value = filter.agemax : '';
107+
filter.subject != null ? document.getElementById("subject").value = filter.subject : '';
108+
filter.area != null ? document.getElementById("area").value = filter.area : '';
109109
filter.gender != null && filter.gender != '' ? document.getElementById("g"+filter.gender).checked = true : '';
110110
filter.qualification != null && filter.qualification != '' ? document.getElementById("q"+filter.qualification).checked = true : '';
111111
filter.drive != null & filter.drive != '' ? document.getElementById("customSwitches").checked = true : '';
@@ -114,4 +114,4 @@ function filterSave() {
114114
});
115115
}
116116

117-
setTimeout(filterSave, 300);
117+
setTimeout(filterSave, 300);

‎Temp/AirTutor/signup.html‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="UTF-8">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
8+
<link rel="preconnect" href="https://fonts.googleapis.com">
9+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
10+
<link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
11+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
12+
<style>
13+
14+
.hiddenA {
15+
color:white;
16+
transition: 0.3s color;
17+
}
18+
19+
.hiddenA.active {
20+
background-color:#8DD4DD !important;
21+
color: #333;
22+
}
23+
24+
.hiddenA:hover {
25+
color:darkgray;
26+
}
27+
28+
* {
29+
font-family: montserrat,sans-serif;
30+
}
31+
32+
.mainPart {
33+
height:90vh;
34+
}
35+
</style>
36+
<title>Find your Tutor</title>
37+
</head>
38+
39+
<body>
40+
<nav>
41+
<ul class="nav nav-pills nav-fill" style="color:#000;background-color:rgb(3, 50, 73);height:100px;">
42+
<img src="img/logo.png" height=100px>
43+
<li class="nav-item">
44+
<a class="nav-link hiddenA" href="index.html">Home</a>
45+
</li>
46+
<li class="nav-item">
47+
<a class="nav-link hiddenA" href="about.html">About</a>
48+
</li>
49+
<li class="nav-item">
50+
<a class="nav-link hiddenA" href="find.html">Services</a>
51+
</li>
52+
<li class="nav-item">
53+
<a class="nav-link hiddenA" href="contact.html">Contact</a>
54+
</li>
55+
<li class="nav-item">
56+
<a class="nav-link active hiddenA" href="signup.html">Sign Up</a>
57+
</li>
58+
59+
</ul>
60+
</nav>
61+
<div class="text-center container mainPart">
62+
<br/>
63+
<h1>Sign Up</h1>
64+
FORMS EMBED GOES HERE
65+
<br/>
66+
67+
</div>
68+
<footer class="text-center text-lg-start bg-light text-muted">
69+
<div class="text-center p-4" style="background-color: rgba(0, 0, 0, 0.05);">
70+
© 2021 Copyright:
71+
<a class="text-reset fw-bold" href="https://doctormod.sytes.net/">David Golding</a>
72+
</div>
73+
</footer>
74+
</body>
75+
</html>

‎Temp/AirTutor/tutors.js‎

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ var users = [{
1414
display: "Friday-Sunday",
1515
value: ["Friday", "Saturday", "Sunday"]
1616
},
17-
area: "Noranda"
17+
area: "Noranda",
18+
email: "bigshaq@example.com"
1819
},
1920
{
2021
image: "Maya.jpg",
@@ -32,7 +33,8 @@ var users = [{
3233
display: "Monday-Wednesday, Friday",
3334
value: ["Monday", "Tuesday", "Wednesday", "Friday"]
3435
},
35-
area: "Online"
36+
area: "Online",
37+
email: "MayaPatel@example.com"
3638
},
3739
{
3840
image: "James.jpg",
@@ -50,7 +52,8 @@ var users = [{
5052
display: "Saturday-Sunday",
5153
value: ["Saturday", "Sunday"]
5254
},
53-
area: "Yokine"
55+
area: "Yokine",
56+
email: "JamesCarter@example.com"
5457
},
5558
{
5659
image: "Liz.jpg",
@@ -68,6 +71,31 @@ var users = [{
6871
display: "Monday-Tuesday, Friday-Saturday",
6972
value: ["Monday", "Tuesday", "Friday", "Saturday"]
7073
},
71-
area: "Dianella"
74+
area: "Dianella",
75+
email: "lizchan@example.com"
7276
}
73-
]
77+
]
78+
/*
79+
80+
81+
format = {
82+
image: 'IMAGENAME',
83+
name : {
84+
first: "FIRSTNAME",
85+
last: "LASTNAME"
86+
},
87+
gender: "GENDER",
88+
age: age,
89+
year: schoolyear,
90+
subject: ["Subject1","Subject2"],
91+
qualification: "qualification",
92+
drive: true/false,
93+
availability: {
94+
display: "How the availability is displayed to the viewer",
95+
value: ["Day","Day","Day"]
96+
},
97+
area: "SUBURB",
98+
email: "EMAIL"
99+
}
100+
101+
*/

0 commit comments

Comments
 (0)