Skip to content

Commit

Permalink
merge commit 2 kumaran
Browse files Browse the repository at this point in the history
  • Loading branch information
kumaran-14 committed Aug 11, 2018
2 parents bde98a9 + 8ca9ee6 commit 2b9e557
Show file tree
Hide file tree
Showing 10 changed files with 410 additions and 200 deletions.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
60 changes: 60 additions & 0 deletions public/css/home.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
html,body{
margin: 0;
padding: 0;
background-color: rgb(249,249,249);
font-family: 'sans-serif';
}

.title{
text-align: center;
font-size: 4.5em;
padding: 5px;
margin-top: 6vh;
letter-spacing: 0.2em;
}

.jumbo-container{
margin-top: 5vh;
}

.welcomehead{
font-size: 3em;
}

.first-scholarship{
margin-top: 3vh;
}

.scholarship-name{
font-size: 1.7em;
}

.scholarship-details{
margin-left: 2vw;
margin-top: 2vh;
font-size: 1.1em;
}

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

.title{
font-size: 2.5em;
}

.jumbo-container{
margin-top: 2vh;
}

.welcomehead{
font-size: 2em;
}

.scholarship-name{
font-size: 1.46em;
}

.scholarship-details{
font-size: 1em;
}

}
Empty file modified public/css/login.css
100644 → 100755
Empty file.
45 changes: 42 additions & 3 deletions public/css/register.css
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,19 @@ html,body{
padding: 0;
background-color: rgb(249,249,249);
font-family: 'sans-serif';
min-height:100vh;
}

.container-custom{
width: 100vw;
}

.heading{
margin-top: 12vh;
margin-top: 7vh;
}

.main{
margin-top: 8vh;
}

.input-container{
Expand Down Expand Up @@ -40,10 +45,36 @@ table td input{
margin-top: 8vh;
}

.flex{
padding: 0px 5px;
display:flex;
align-items:center;
}

.flex-left{
margin-left:auto;
}

.fa-caret-down,.fa-caret-up{
color:#545454;
}

.hide{
display:none;
}

.custom-submit{
font-size:20px !important;
}

.dropdown-head{
font-size: 0.7em;
}

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

.title{
font-size: 1.7em;
font-size: 2em;
font-weight: 500;
}

Expand All @@ -54,7 +85,15 @@ table td input{

.heading{
margin-top: 7vh;
font-size: 1.6em;
font-size: 1.3em;
}

.dropdown-head{
font-size: 0.8em;
}

.custom-submit{
font-size: 15px !important;
}

}
26 changes: 26 additions & 0 deletions public/js/register.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
const part_1 = document.querySelector('.part-1');
const part_2 = document.querySelector('.part-2');
const part_3 = document.querySelector('.part-3');
const main = document.querySelector('.main');

main.addEventListener('click',hideContent);

function hideContent(e){
let val;
if(e.target.tagName != 'I') return
val = e.target.getAttribute('data-id')
switch(val){
case '1': part_1.classList.toggle("hide")
e.target.classList.toggle('fa-caret-down');
e.target.classList.toggle('fa-caret-up');
break;
case '2': part_2.classList.toggle("hide")
e.target.classList.toggle('fa-caret-down');
e.target.classList.toggle('fa-caret-up');
break;
case '3': part_3.classList.toggle("hide")
e.target.classList.toggle('fa-caret-down');
e.target.classList.toggle('fa-caret-up');
break;
}
}
2 changes: 1 addition & 1 deletion server.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ app.get('*',(req,res,next) => {

//Home Route
app.get('/',(req,res)=>{
res.redirect('/login')
res.render('home.pug');
})
//login Route
app.get('/login',(req,res)=>{
Expand Down
42 changes: 42 additions & 0 deletions views/home.pug
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
extends ./layout.pug

block append head
title Home | Scholarship Portal
link(rel='stylesheet', href='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css', integrity='sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u', crossorigin='anonymous')
link(rel="stylesheet", href="/css/home.css")

block content
h1.title Scholarship Portal
.container.jumbo-container
.jumbotron.jumbo-class
h3(class="welcomehead") Welcome to NITT Scholarship Portal
div
.row
.col-md-1
.col-md-9
div(class="scholarship-name first-scholarship") Abundant Cauvery Delta Education Fund Scholarship
div(class="scholarship-details") Abundant Cauvery Delta Education Fund Scholarship Scholarship is awarded by Abundant Cauvery Delta Foundation (a Trust run by 1980 RECT Batch of Alumni). The scholarship amount is Rs.75,000/- per student, per academic year.
hr.mt-auto.mb-0(style='background: #bbb; height: 1px; width: 100%; border: 0')
.col-md-2
.row
.col-md-1
.col-md-9
div(class="scholarship-name") RECAL Scholarships to the Students
div(class="scholarship-details") Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eligendi non quis exercitationem culpa nesciunt nihil aut nostrum explicabo reprehenderit optio amet ab temporibus asperiores quasi cupiditate. Voluptatum ducimus voluptates voluptas?
hr.mt-auto.mb-0(style='background: #bbb; height: 1px; width: 100%; border: 0')
.col-md-2
.row
.col-md-1
.col-md-9
div(class="scholarship-name") Student Aid Fund
div(class="scholarship-details") Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eligendi non quis exercitationem culpa nesciunt nihil aut nostrum explicabo reprehenderit optio amet ab temporibus asperiores quasi cupiditate. Voluptatum ducimus voluptates voluptas?
hr.mt-auto.mb-0(style='background: #bbb; height: 1px; width: 100%; border: 0')
.col-md-2
.row
.col-md-1
.col-md-9
div(class="scholarship-name") Silver 72
div(class="scholarship-details") Silver 72 Scholarship is Instituted by 1972 batch of Alumni. NITT Students are awarded merit / need-based scholarship every year.
.col-md-2
div(style="text-align: center;")
button(class="btn btn-success") Register
Empty file modified views/login.pug
100644 → 100755
Empty file.
Loading

0 comments on commit 2b9e557

Please sign in to comment.