Skip to content

Commit

Permalink
Merge branch 'working' of https://github.com/Oshanath/WebApp into wor…
Browse files Browse the repository at this point in the history 
…king
  • Loading branch information
@Oshanath
Oshanath committed Mar 20, 2021
2 parents cbe3988 + 358abac commit 334747f
Show file tree
Hide file tree
Showing 27 changed files with 240 additions and 999 deletions.
Binary file added profilePics/66cdcf95-b7a4-456d-a36b-0afd1ef056f2-Prof.JPG
View file
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 profilePics/c0c92081-70de-423e-b7ae-84f299cad4ef-scarecrow.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions public/SignUp.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@

<div class="form-control">
<input type="text" name="name" class="nonEmpty signUp fullName" placeholder="Enter your full name" id="username">
<label class="form-label" onclick="focusLabel(this)">Full Name :</label>
<label class="form-label" for="username">Full Name :</label>
<i class="fa fa-check-circle"></i>
<i class="fa fa-exclamation-circle"></i>
<small>Error message</small>
</div>

<div class="form-control">
<input type="text" name="index" class="index signUp" placeholder="Enter your index number" id="index">
<label class="form-label" onclick="focusLabel(this)">Index Number : </label>
<label class="form-label" for="index">Index Number : </label>
<i class="fa fa-check-circle"></i>
<i class="fa fa-exclamation-circle"></i>
<small>Error message</small>
</div>

<div class="form-control">
<input type="email" name="email" class="newEmail signUp" placeholder="Enter your email" id="email">
<label class="form-label" onclick="focusLabel(this)">Email Address : </label>
<label class="form-label" for="email">Email Address : </label>
<i class="fa fa-check-circle"></i>
<i class="fa fa-exclamation-circle"></i>
<small>Error message</small>
Expand All @@ -66,15 +66,15 @@

<div class="form-control">
<input type="text" name="phone" class="nonEmpty signUp phone" placeholder="Add your Telephone number" id="phone">
<label class="form-label" onclick="focusLabel(this)">Telephone Number : </label>
<label class="form-label" for="phone">Telephone Number : </label>
<i class="fa fa-check-circle"></i>
<i class="fa fa-exclamation-circle"></i>
<small>Error message</small>
</div>

<div class="form-control">
<input type="password" name="password" class="newPsw signUp psw" id="password" placeholder="Enter your password">
<label class="form-label" onclick="focusLabel(this)">Password :</label>
<label class="form-label" for="password">Password :</label>
<i class="far fa-eye" id="togglePassword"></i>
<i class="fa fa-check-circle"></i>
<i class="fa fa-exclamation-circle"></i>
Expand All @@ -83,7 +83,7 @@

<div class="form-control">
<input type="password" name="confirmPsw" class="newPsw signUp confirm" id="c_psw" placeholder="Confirm your password">
<label class="form-label" onclick="focusLabel(this)">Confirm Password : </label>
<label class="form-label" for="c_psw">Confirm Password : </label>
<i class="far fa-eye" id="toggleConfirmPassword"></i>
<i class="fa fa-check-circle"></i>
<i class="fa fa-exclamation-circle"></i>
Expand Down
11 changes: 0 additions & 11 deletions public/assets/css/changePsw_styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,4 @@ body{

.buttonText{
transition: all 0.2s;
}

.forgotPswQuestion{
border-style: none;
border-collapse: collapse;
outline: none;
font-size: 14px;
color: #666666;
border-radius: 6px;
padding: 10px;
width: 100%
}
183 changes: 146 additions & 37 deletions public/assets/css/contact.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,55 +8,104 @@ body{
justify-content: center;
min-height: 100vh;
margin: 0;
background-image: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0.2)),url(/resources/cassie-boca-gFyy2Po7T-k-unsplash.jpg);
background-size: cover;
width: 100%;
height: 100%;
font-family: 'Ubuntu', sans-serif;
}

.container{
background-color:rgba(207,224,195,0.5);
background-color:rgba(255,255,255,0.5);
border-radius: 40px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
width: 450px;
width: 35%;
max-width: 100%;
opacity: 0.8;
position: relative;
padding: 20px;
}

.header h1{
.header{
background-color: #70a9a1;
border-bottom: 1px solid #f0f0f0;
padding: 20px 40px;
border-radius: 20px;
text-align: center;
color:black;
opacity:0.95;
}

.header h2{
margin: 0px;
}

.form{
padding: 30px 40px;
padding: 20px 40px;
opacity: 0.78;
}

.form-control{
margin-bottom: 8px;
padding-bottom: 20px;
margin-bottom: 4px;
padding: 14.5px;
position: relative;
color: white;
color: black;
font-size: 17px;
border-radius: 20px;
font-weight: bold;
}

.form-control input{
/*border: 2px solid #f0f0f0;*/
border:none;
color: #373636;
font-weight: 520;
display: block;
font-size: 14.7px;
padding: 7px;
width: 100%;
outline: none;
background: transparent;
border-bottom: 2.3px solid black;
transition: all .3s;
}
.form-control input:-webkit-autofill {
-webkit-background-clip: text;
}
.form-control input:focus{
box-shadow: none;
outline: none;
border-color: #4E8975;
}
.form-control select:focus{
box-shadow: none;
outline: none;

border-color:#4E8975;
}
.form-control input::placeholder{
color: transparent;
}

.form-control label{
display: inline-block;
margin-bottom: 10px;
color: black;
.form-control .form-label{
position: absolute;
transform: translateY(-1.6em);
transform-origin: 0 0;
transition: all .3s;
}

.form-control input,
.form-control textarea{
border:none;
border-radius: 6px;
display: block;
font-size: 14px;
padding: 10px;
width: 100%;
outline: none;
.form-control input:focus + .form-label,
.form-control input:not(:placeholder-shown) + .form-label,
.form-control input:-webkit-autofill + .form-label{
transform: translateY(-2.9em) scale(0.8);
}

#fileItem{
border-bottom: none;
}

.form-control select{
background-color: transparent;
border-bottom: 2px solid black;
transition: all .3s;
}

.form-control input[name="gender"], input[name="type"]{
display: inline-block;
width: 20px;
}

.form-control.success input{
Expand Down Expand Up @@ -88,6 +137,13 @@ body{
color: #e74c3c;
}

.form-control i.far{
z-index: 10;
color: black;
cursor: pointer;
visibility: visible;
}

.form-control small{
visibility: hidden;
position: absolute;
Expand All @@ -100,34 +156,87 @@ body{
visibility: visible;
}

.button{
border: 1px solid #49798c;


.button.signUp{
border: none;
border-radius: 10px;
display: block;
font-size: 18px;
padding: 15px;
width: 80%;
cursor: pointer;
margin: auto;
background-color:#1f363d;
background-color:#70a9a1;
opacity: 2;
color: white;
outline-style: none;
position: relative;

}

.button:hover{
background-color: #70a9a1;
.button.signUp:hover{
background-color: #40798c;
}

.button:active{
.button.signUp:active{
background-color: #2d4642 ;
}
.button.edit:active{
color: white;
}

.buttonText{
transition: all 0.2s;
}

.main-body{
background-image: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0.2)),url(../resources/pexels-min-an-1353938.jpg);
background-size: cover;
width: 100%;
height: 100%;
}

.faculty,.question{
border-style: none;
border-collapse: collapse;
outline: none;
font-size: 14px;
color: #666666;

padding: 10px;
width: 100%
}

h1{
text-align: center;
color:black;
}
@media only screen and (max-width: 1100px){
.container{
width:55%;
border-radius: 35px;

}
.form{
padding: 20px 30px;
}
}

@media only screen and (max-width: 780px){
.container{
width:70%;
border-radius: 35px;

}
.form{
padding: 20px 30px;
}
}

@media only screen and (max-width: 450px){

.container{
width:90%;
border-radius: 30px;
}
.form{
padding: 10px 20px;
}
}
16 changes: 9 additions & 7 deletions public/assets/css/deleteAcc_styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body{
justify-content: center;
min-height: 100vh;
margin: 0;
background-image: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0.2)),url(../resources/1567799.jpg);
background-image: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0.2)),url(../resources/watercolour-1325656_1920.jpg);
background-size: cover;
width: 100%;
height: 100%;
Expand Down Expand Up @@ -98,9 +98,9 @@ body{
}

.form-control input:focus + .form-label,
.form-control input:not(:placeholder-shown) + .form-label{
.form-control input:not(:placeholder-shown) + .form-label,
.form-control input:-webkit-autofill + .form-label{
transform: translateY(-2.9em) scale(0.8);

}

#fileItem{
Expand Down Expand Up @@ -177,21 +177,23 @@ body{
width: 80%;
cursor: pointer;
margin: auto;
background-color:#60918a;
background-color:#2d4642;
opacity: 2;
color: white;
outline-style: none;
position: relative;
margin-top: 15%
margin-top: 15%;
transition: all 0.3s;


}

.button:hover{
background-color: #40798c;
background-color: #1f363d;
}

.button:active{
background-color: #2d4642 ;
background-color: #49798c ;
}
.button.edit:active{
color: white;
Expand Down
Loading

0 comments on commit 334747f

Please sign in to comment.