Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: AtulSingh-Emyre/prevelec
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: oss2019/prevelec
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 13 commits
  • 7 files changed
  • 4 contributors

Commits on Oct 31, 2021

  1. Fixed error in 'Read more' functionality in About page.

    @arunkone07
    arunkone07 committed Oct 31, 2021
    Copy the full SHA
    e945e7c View commit details

  2. Fixed error in 'Read more' functionality in About page.

    @arunkone07
    arunkone07 committed Oct 31, 2021
    Copy the full SHA
    0b5909f View commit details

  3. Merge branch 'oss2019:master' into master

    @arunkone07
    arunkone07 authored Oct 31, 2021
    Copy the full SHA
    76093ab View commit details

  4. Merge pull request #12 from arunkone07/master 

    Fixed issues in 'Read More' functionality in About page.
    @AtulSingh-Emyre
    AtulSingh-Emyre authored Oct 31, 2021
    Copy the full SHA
    c98ab1e View commit details

  5. made navbar more attractive

    @9I0xDeepankar
    9I0xDeepankar committed Oct 31, 2021
    Copy the full SHA
    fe435cd View commit details

  6. Merge pull request #13 from 9I0xDeepankar/master 

    made navbar more attractive
    @AtulSingh-Emyre
    AtulSingh-Emyre authored Oct 31, 2021
    Copy the full SHA
    4e414a8 View commit details

  7. enhanced UI for dashboard,blog,compose,achievements

    @9I0xDeepankar
    9I0xDeepankar committed Oct 31, 2021
    Copy the full SHA
    dee00b3 View commit details

  8. Enhanced content and design of homepage.

    @arunkone07
    arunkone07 committed Oct 31, 2021
    Copy the full SHA
    23439d1 View commit details

  9. Merge branch 'master' of https://github.com/arunkone07/prevelec

    @arunkone07
    arunkone07 committed Oct 31, 2021
    Copy the full SHA
    efc5fbd View commit details

  10. Merge branch 'oss2019:master' into master

    @arunkone07
    arunkone07 authored Oct 31, 2021
    Copy the full SHA
    d197bd4 View commit details

  11. Merge pull request #15 from arunkone07/master 

    Enhanced contents and styling of home page
    @AtulSingh-Emyre
    AtulSingh-Emyre authored Oct 31, 2021
    Copy the full SHA
    1fa621e View commit details

  12. Merge branch 'master' into master

    @AtulSingh-Emyre
    AtulSingh-Emyre authored Oct 31, 2021
    Copy the full SHA
    4a6eb48 View commit details

  13. Merge pull request #14 from 9I0xDeepankar/master 

    enhanced UI for dashboard,blog,compose,achievements
    @AtulSingh-Emyre
    AtulSingh-Emyre authored Oct 31, 2021
    Copy the full SHA
    624da6b View commit details
Showing with 384 additions and 367 deletions.
  1. +95 −99 app.js
  2. +70 −64 views/achievements.ejs
  3. +29 −20 views/blog.ejs
  4. +27 −22 views/compose.ejs
  5. +7 −7 views/dash.ejs
  6. +16 −10 views/home.ejs
  7. +140 −145 views/partials/header.ejs
194 changes: 95 additions & 99 deletions app.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//jshint esversion:6

const express = require('express');
const bodyParser = require('body-parser');
const ejs = require('ejs');
const _ = require('lodash');
const express = require("express");
const bodyParser = require("body-parser");
const ejs = require("ejs");
const _ = require("lodash");

const User = require('./models/user');
const connectDB = require('./config/connectDb');
const User = require("./models/user");
const connectDB = require("./config/connectDb");

const homeStartingContent = "In this modern era, sources of non-renewable energy are depleting rapidly due to excess use. Hence, Energy conservation has become prominent. To create awareness about this, we created this website. This page is for sharing various techniques and updates related to energy conservation. It is public and hence visible to every registered user. Go green... Happy conserving!";
const aboutContent = "Hac habitasse platea dictumst vestibulum rhoncus est pellentesque. Dictumst vestibulum rhoncus est pellentesque elit ullamcorper. Non diam phasellus vestibulum lorem sed. Platea dictumst quisque sagittis purus sit. Egestas sed sed risus pretium quam vulputate dignissim suspendisse. Mauris in aliquam sem fringilla. Semper risus in hendrerit gravida rutrum quisque non tellus orci. Amet massa vitae tortor condimentum lacinia quis vel eros. Enim ut tellus elementum sagittis vitae. Mauris ultrices eros in cursus turpis massa tincidunt dui.";
@@ -16,152 +16,148 @@ const app = express();

app.set('view engine', 'ejs');

app.use(bodyParser.urlencoded({ extended: true }));
app.use(express.static('public'));
app.use(bodyParser.urlencoded({extended: true}));
app.use(express.static("public"));
connectDB();

let posts = [];

app.get('/', function (req, res) {
res.render('login2');

app.get("/",function(req,res){
res.render("login2");
});
app.post('/', async function (req, res) {
try {
var result = await User.find({
email: req.body.em,
password: req.body.pass,
});
if (!result) res.send('Try again!');
res.render('dash');
} catch (err) {
app.post("/",async function(req,res){
try{
var result = await User.find({email:req.body.em, password:req.body.pass});
if(!result) res.send('Try again!');
res.render("dash");
}
catch(err) {
console.log(err);
}
});
app.get('/home', function (req, res) {
res.render('home');

app.get("/home",function(req,res){
res.render("home");
});
app.get('/achievements', function (req, res) {
res.render('achievements');

app.get("/achievements",function(req,res){
res.render("achievements");

});

app.get('/blog', function (req, res) {
res.render('blog', {
app.get("/blog", function(req, res){
res.render("blog", {
startingContent: homeStartingContent,
posts: posts,
});
posts: posts
});
});

app.get('/about', function (req, res) {
res.render('about', { aboutContent: aboutContent });
app.get("/about", function(req, res){
res.render("about", {aboutContent: aboutContent});
});

app.get('/contact', function (req, res) {
res.render('contact', { contactContent: contactContent });
app.get("/contact", function(req, res){
res.render("contact", {contactContent: contactContent});
});

app.get('/compose', function (req, res) {
res.render('compose');
app.get("/compose", function(req, res){
res.render("compose");
});

app.post('/compose', function (req, res) {
app.post("/compose", function(req, res){
const post = {
title: req.body.postTitle,
content: req.body.postBody,
content: req.body.postBody
};

posts.push(post);

res.redirect('/');
res.redirect("/");

});

app.get('/login', function (req, res) {
res.redirect('/');
app.get("/login",function(req,res){
res.render("login2");
});

let creds = [];

var count = 0;
app.post('/login', function (req, res) {
var count=0;
app.post("/login", function(req, res){
const cred = {
uid: req.body.em,
content: req.body.pass,
content: req.body.pass
};
console.log(req.body.em);
creds.forEach(function (pred) {
if (pred.uid == cred.uid && pred.content == cred.content) {
res.render('dash');
count++;
creds.forEach(function(pred){
if(pred.uid==cred.uid && pred.content==cred.content)
{ res.render("dash");
count++;
}
});
if (count == 0) res.send('/');
});
if(count==0)
res.send("/");


});

app.get('/register', function (req, res) {
res.render('register');
app.get("/register",function(req,res){
res.render("register");
});
app.post('/register', function (req, res) {
var cred = {
name: req.body.name,
uid: req.body.email,
content: req.body.password,
};
const newUser = new User({
name: cred.name,
email: cred.uid,
password: cred.content,
});
newUser
.save()
.then(() => {
res.render('login2');
})
.catch((err) => {
console.log(err);
});
app.post("/register",function(req,res){
var cred = {
name: req.body.name,
uid: req.body.email,
content: req.body.password
};
const newUser = new User({
name: cred.name,
email: cred.uid,
password: cred.content
});
newUser.save().then(() => {
res.render("login2");
}).catch((err) => {
console.log(err);
});
});

var img=0;
var year=["January","February","March","April","May","June","July","August","September","October","November","December"];

var img = 0;
var year = [
'January',
'February',
'March',
'April',
'May',
'June',
'July',
'August',
'September',
'October',
'November',
'December',
];

app.get('/dash', function (req, res) {
res.render('dash');
});
app.get('/posts', function (req, res) {
res.render('blog');
});
app.get('/posts/:postName', function (req, res) {
app.get("/dash",function(req,res){
res.render("dash");
});
app.get("/posts",function(req,res){
res.render("blog", {
startingContent: homeStartingContent,
posts: posts
});

});
app.get("/posts/:postName", function(req, res){
const requestedTitle = _.lowerCase(req.params.postName);

posts.forEach(function (post) {
posts.forEach(function(post){
const storedTitle = _.lowerCase(post.title);

if (storedTitle === requestedTitle) {
res.render('post', {
res.render("post", {
title: post.title,
content: post.content,
content: post.content
});
}
});

});

var i = 6;
app.post('/dash', function (req, res) {
res.render('dash');
var i=6;
app.post("/dash",function(req,res){
res.render("dash");
});

app.listen(3000, function () {
console.log('Server started on port 3000');

app.listen(3000, function() {
console.log("Server started on port 3000");
});
134 changes: 70 additions & 64 deletions views/achievements.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,70 @@
<%- include("partials/header")-%>

<main role="main">

<div id="myCarousel" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
<li data-target="#myCarousel" data-slide-to="1"></li>
<li data-target="#myCarousel" data-slide-to="2"></li>
</ol>

</div>
<script>
jQuery(function () {
jQuery(".jtable-command-button.jtable-edit-command-button").click(function () {
alert("Points collected!");
});
});
</script>

<!-- Marketing messaging and featurettes
================================================== -->
<!-- Wrap the rest of the page in another container to center all the content. -->

<div class="container marketing">

<!-- Three columns of text below the carousel -->
<div class="row">
<div class="col-lg-4">
<svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: 140x140"><title>Placeholder</title><rect width="100%" height="100%" fill="#777"/><text x="50%" y="50%" fill="#777" dy=".3em">140x140</text></svg>
<h2>GOLD</h2>
<p>Congratulations... <br> You've done a great job! <br> you have been placed among 20 least electricity consumers.</p>
<p>Points:50</p>
<p><a class="btn btn-secondary" href="#" role="button" class=".jtable-command-button.jtable-edit-command-button">Collect Points &raquo;</a></p>
</div><!-- /.col-lg-4 -->

<div class="col-lg-4">
<svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: 140x140"><title>Placeholder</title><rect width="100%" height="100%" fill="#777"/><text x="50%" y="50%" fill="#777" dy=".3em">140x140</text></svg>
<h2>SILVER</h2>
<p>Congratulations... <br> You've done a great job! <br> your current month electricity consumption is less than the average of all previous month's electricity consumption.</p>
<p>Points:50</p>
<p class=".jtable-command-button.jtable-edit-command-button"><a class="btn btn-secondary" href="#" role="button" >Collect Points &raquo;</a></p>
</div><!-- /.col-lg-4 -->

<div class="col-lg-4">
<svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: 140x140"><title>Placeholder</title><rect width="100%" height="100%" fill="#777"/><text x="50%" y="50%" fill="#777" dy=".3em">140x140</text></svg>
<h2>BRONZE</h2>
<p>Congratulations...<br> You've done a great job! <br> your current month electricity consumption is less than the previous month's electricity consumption. </p>
<p> Points:50 </p>
<p><a class="btn btn-secondary" class=".jtable-command-button.jtable-edit-command-button" href="#" role="button">Collect Points &raquo;</a></p>
</div><!-- /.col-lg-4 -->
</div><!-- /.row -->



<footer class="container">
<p class="float-right"><a href="#">Back to top</a></p>
<p>&copy; 2017-2019 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
</footer>
</main>
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script>window.jQuery || document.write('<script src="/docs/4.4/assets/js/vendor/jquery.slim.min.js"><\/script>')</script><script src="/docs/4.4/dist/js/bootstrap.bundle.min.js" integrity="sha384-6khuMg9gaYr5AxOqhkVIODVIvm9ynTT5J4V1cfthmT+emCG6yVmEZsRHdxlotUnm" crossorigin="anonymous"></script></body>
</html>
<%- include("partials/header")-%>

<main role="main">

<div id="myCarousel" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
<li data-target="#myCarousel" data-slide-to="1"></li>
<li data-target="#myCarousel" data-slide-to="2"></li>
</ol>

</div>
<style type="text/css">
body {
background-color: rgba(233, 215, 112, 0.219);
margin-top: 100px;
}
</style>
<script>
jQuery(function() {
jQuery(".jtable-command-button.jtable-edit-command-button").click(function() {
alert("Points collected!");
});
});
</script>

<!-- Marketing messaging and featurettes
================================================== -->
<!-- Wrap the rest of the page in another container to center all the content. -->

<div class="container marketing">

<!-- Three columns of text below the carousel -->
<div class="row">
<div class="col-lg-4">
<svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: 140x140"><title>Placeholder</title><rect width="100%" height="100%" fill="#777"/><text x="50%" y="50%" fill="#777" dy=".3em">140x140</text></svg>
<img class="gold-image"></div>img>
<h2>GOLD</h2>
<p>Congratulations... <br> You've done a great job! <br> you have been placed among 20 least electricity consumers.</p>
<p>Points:50</p>
<p><a class="btn btn-secondary" href="#" role="button" class=".jtable-command-button.jtable-edit-command-button">Collect Points &raquo;</a></p>
</div><!-- /.col-lg-4 -->

<div class="col-lg-4">
<svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: 140x140"><title>Placeholder</title><rect width="100%" height="100%" fill="#777"/><text x="50%" y="50%" fill="#777" dy=".3em">140x140</text></svg>
<h2>SILVER</h2>
<p>Congratulations... <br> You've done a great job! <br> your current month electricity consumption is less than the average of all previous month's electricity consumption.</p>
<p>Points:50</p>
<p class=".jtable-command-button.jtable-edit-command-button"><a class="btn btn-secondary" href="#" role="button" >Collect Points &raquo;</a></p>
</div><!-- /.col-lg-4 -->

<div class="col-lg-4">
<svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: 140x140"><title>Placeholder</title><rect width="100%" height="100%" fill="#777"/><text x="50%" y="50%" fill="#777" dy=".3em">140x140</text></svg>
<h2>BRONZE</h2>
<p>Congratulations...<br> You've done a great job! <br> your current month electricity consumption is less than the previous month's electricity consumption. </p>
<p> Points:50 </p>
<p><a class="btn btn-secondary" class=".jtable-command-button.jtable-edit-command-button" href="#" role="button">Collect Points &raquo;</a></p>
</div><!-- /.col-lg-4 -->
</div><!-- /.row -->



<footer class="container">
<p class="float-right"><a href="#">Back to top</a></p>
<p>&copy; 2017-2019 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
</footer>
</main>
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script>window.jQuery || document.write('<script src="/docs/4.4/assets/js/vendor/jquery.slim.min.js"><\/script>')</script><script src="/docs/4.4/dist/js/bootstrap.bundle.min.js" integrity="sha384-6khuMg9gaYr5AxOqhkVIODVIvm9ynTT5J4V1cfthmT+emCG6yVmEZsRHdxlotUnm" crossorigin="anonymous"></script></body>
</html>
49 changes: 29 additions & 20 deletions views/blog.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,36 @@

<%- include("partials/header"); -%>
<style type="text/css">
#ghj{
padding-top: 100px;
}
</style>
<script>
</script>
<div class="container" id="ghj">
<h1>About</h1>
<p> <%= startingContent %> </p>
<style type="text/css">
#ghj {
padding-top: 100px;
}
body {
background-color: rgba(233, 215, 112, 0.219);
}
</style>
<script>
</script>

<body>
<div class="container" id="ghj">
<h1>About</h1>
<p>
<%= startingContent %>
</p>

<% posts.forEach(function(post){ %>

<h1><%=post.title%></h1>
<p>
<%=post.content.substring(0, 100) + " ..."%>
<a href="/posts/<%=post.title%>">Read More</a>
</p>
<% posts.forEach(function(post){ %>
<h1>
<%=post.title%>
</h1>
<p>
<%=post.content.substring(0, 100) + " ..."%>
<a href="/posts/<%=post.title%>">Read More</a>
</p>
<% }) %>
</div>
<%- include("partials/footer"); -%>
<% }) %>
</div>
</body>
<%- include("partials/footer"); -%>
49 changes: 27 additions & 22 deletions views/compose.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@

<%- include("partials/header"); -%>
<style type="text/css">
#ghj{
padding-top: 100px;
}
</style>
<script>
<style type="text/css">
#ghj {
padding-top: 100px;
}
body {
background-color: rgba(233, 215, 112, 0.219);
}
</style>
<script>
</script>

<body>
<div class="container" id="ghj">
<h1>Compose</h1>
<form class="" action="/compose" method="post" id='compose'>
<div class="form-group">
<label>Title</label>
<input class="form-control" type="text" name="postTitle">
<label>Post</label>
<textarea class="form-control" name="postBody" rows="5" cols="30"></textarea>
</div>
<button class="btn btn-primary" id="sub" type="submit" name="button">Publish</button>

</script>
<div class="container" id="ghj">
<h1>Compose</h1>
<form class="" action="/compose" method="post" id='compose'>
<div class="form-group">
<label>Title</label>
<input class="form-control" type="text" name="postTitle">
<label>Post</label>
<textarea class="form-control" name="postBody" rows="5" cols="30"></textarea>
</div>
<button class="btn btn-primary" id="sub" type="submit" name="button">Publish</button>

</form>
</div>
<%- include("partials/footer"); -%>
</form>
</div>
</body>>
<%- include("partials/footer"); -%>
14 changes: 7 additions & 7 deletions views/dash.ejs
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<h2>Leaderboard</h2>
<div class="table-responsive">
<table class="table table-striped table-sm">
<thead>
<thead class="thead-dark">
<tr>
<th>Rank</th>
<th>Name</th>
@@ -29,37 +29,37 @@
</tr>
</thead>
<tbody>
<tr>
<tr class="table-primary">
<td>1</td>
<td>Lorem</td>
<td>1000</td>

</tr>
<tr>
<tr class="table-success">
<td>2</td>
<td>amet</td>
<td>1100</td>

</tr>
<tr>
<tr class="table-primary">
<td>3</td>
<td>Integer</td>
<td>1200</td>

</tr>
<tr>
<tr class="table-success">
<td>4</td>
<td>libero</td>
<td>1300</td>

</tr>
<tr>
<tr class="table-primary">
<td>5</td>
<td>dapibus</td>
<td>1400</td>
</tr>

<tr>
<tr class="table-success">
<td>1000</td>
<td>ligula</td>
<td>5690</td>
26 changes: 16 additions & 10 deletions views/home.ejs
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ img{
margin-top: 50px;
}</style>

<main role="main">
<main role="main" style="background-color: greenyellow;">

<div id="myCarousel" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
@@ -44,7 +44,7 @@ img{
<div class="container">
<div class="carousel-caption text-left">
<a href="https://cooltext.com"><img id="kannoj" src="https://images.cooltext.com/5382104.png" width="100%" height="100%" alt="PREVELEC" /></a>
<h5 align="center"> -A step towards conservation.</h5>
<h5 align="right"> -A step towards conservation.</h5>
</div>
</div>
</div>
@@ -62,7 +62,7 @@ img{
<div class="carousel-item" width="100%" height="100%">
<svg class="bd-placeholder-img" width="100%" height="100%" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img"><rect width="100%" height="100%" fill="#777"/></svg>
<div class="container">
<div class="carousel-caption text-right">
<div class="carousel-caption">
<h1>One more for good measure.</h1>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p><a class="btn btn-lg btn-primary" href="#" role="button">Browse gallery</a></p>
@@ -93,32 +93,38 @@ background: linear-gradient(to right, #89fffd, #ef32d9); /* W3C, IE 10+/ Edge, F
}
</style>

<hr class="featurette-divider">
<hr class="featurette-divider">
<div class="block1 aim">
<p align="center"><font size="150px"></font></p>
<h5 align="center"> <font color="black"><b>[ We aim to minimise the use of energy(currently electricity) through analytical ways ]</b></font></h5>
<h5 align="center"> <font color="black"><b>We aim to minimise the use of energy (currently electricity) through analytical ways</b></font></h5>
<hr class="featurette-divider">

</div>
</div>

<div class="container">
<div class="block1">
<div class="row featurette">
<div class="col-md-7">
<div class="row featurette" style="background-color: skyblue;" >
<div class="col-md-7" >
<h2 class="featurette-heading"><span class="text-muted">Consumption rate:</span></h2>
<br/> <br/>
<p class="lead"> There are currently many states in India where the electricity consumption rate is more than the production rate.Jharkhand,Karnataka,Uttar Pradesh and Delhi etc.. regions face electricity problems.Currently 60% of electricity is being imported from other regions to Karnataka. Due to this, there are long-time, frequent power-cuts in many villages and ,at the time of droughts, in coastal regions.Due to laziness or unawareness about the importance of electricity a good amount of electricity is being wasted. </p>
<p class="lead"> There are currently many states in India where the electricity consumption rate is higher than the production rate.
Jharkhand, Karnataka, Uttar Pradesh, Delhi etc.. regions face electricity problems. Currently 60% of electricity is being imported
from other regions to Karnataka. Due to this, there are long-time, frequent power-cuts in many villages and, even in major cities sometimes.
Due to laziness or unawareness about the importance of electricity significant amount of electricity is being wasted. We can observe from the adjacent
graph that the increasing production rate is not able to satisfy the huge increase in consumption rate every year. Hence, conservation becomes the key.</p>
</div>
<div class="col-md-5">
<img src="https://i2.wp.com/greencleanguide.com/wp-content/uploads/2013/03/Actual-Power-Supply-Position-of-the-State-of-Karnataka.jpg?fit=1410%2C847&ssl=1" width="100%" height="100%">
<img src="https://i2.wp.com/greencleanguide.com/wp-content/uploads/2013/03/Actual-Power-Supply-Position-of-the-State-of-Karnataka.jpg?fit=1410%2C847&ssl=1" width="100%" height="80%">
</div>
</div>

<hr class="featurette-divider">

<div class="row featurette">
<div class="row featurette" style="background-color: skyblue;">
<div class="col-md-7 order-md-2">
<h2 class="featurette-heading"><span class="text-muted">The hack:</span></h2>
<br/> <br/>
<p class="lead">Achivements, which takes into account the electricity used by an induvidual, is added.
Rankings will be given based on your usage of electricity. These rankings will be made public.
The metre readings is to be provided by the electricity board of the particular region.
285 changes: 140 additions & 145 deletions views/partials/header.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<!doctype html>
<html lang="en">
<head>


<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
@@ -12,169 +14,162 @@

<!-- Bootstrap core CSS -->

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>

<!-- Favicons -->
<link rel="apple-touch-icon" href="/docs/4.4/assets/img/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="/docs/4.4/assets/img/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="/docs/4.4/assets/img/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
<link rel="manifest" href="/docs/4.4/assets/img/favicons/manifest.json">
<link rel="mask-icon" href="/docs/4.4/assets/img/favicons/safari-pinned-tab.svg" color="#563d7c">
<link rel="icon" href="/docs/4.4/assets/img/favicons/favicon.ico">
<meta name="msapplication-config" content="/docs/4.4/assets/img/favicons/browserconfig.xml">
<meta name="theme-color" content="#563d7c">

<link rel="apple-touch-icon" href="/docs/4.4/assets/img/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="/docs/4.4/assets/img/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="/docs/4.4/assets/img/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
<link rel="manifest" href="/docs/4.4/assets/img/favicons/manifest.json">
<link rel="mask-icon" href="/docs/4.4/assets/img/favicons/safari-pinned-tab.svg" color="#563d7c">
<link rel="icon" href="/docs/4.4/assets/img/favicons/favicon.ico">
<meta name="msapplication-config" content="/docs/4.4/assets/img/favicons/browserconfig.xml">
<meta name="theme-color" content="#563d7c">

<style>
.bd-placeholder-img {
font-size: 1.125rem;
text-anchor: middle;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

@media (min-width: 768px) {
.bd-placeholder-img-lg {
font-size: 3.5rem;
<style>
.bd-placeholder-img {
font-size: 1.125rem;
text-anchor: middle;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
@media (min-width: 768px) {
.bd-placeholder-img-lg {
font-size: 3.5rem;
}
}
}
</style>
<!-- Custom styles for this template -->
<style type="text/css">
/* GLOBAL STYLES
/* GLOBAL STYLES
-------------------------------------------------- */
/* Padding below the footer and lighter body text */
body {
padding-top: 3rem;
padding-bottom: 3rem;
color: #5a5a5a;
}
/* CUSTOMIZE THE CAROUSEL
/* Padding below the footer and lighter body text */
body {
padding-top: 3rem;
padding-bottom: 3rem;
color: #5a5a5a;
}
.btn-warning {
color: #212529;
background-color: #e3f117;
border-radius: 35px;
border: 1px solid rgba(19, 21, 187, 0.75);
}
}
/* CUSTOMIZE THE CAROUSEL
-------------------------------------------------- */
/* Carousel base class */
.carousel {
margin-bottom: 4rem;
}
/* Since positioning the image, we need to help out the caption */
.carousel-caption {
bottom: 3rem;
z-index: 10;
}
/* Declare heights because of positioning of img element */
.carousel-item {
height: 32rem;
}
.carousel-item > img {
position: absolute;
top: 0;
left: 0;
min-width: 100%;
height: 32rem;
}
/* MARKETING CONTENT
/* Carousel base class */
.carousel {
margin-bottom: 4rem;
}
/* Since positioning the image, we need to help out the caption */
.carousel-caption {
bottom: 3rem;
z-index: 10;
}
/* Declare heights because of positioning of img element */
.carousel-item {
height: 32rem;
}
.carousel-item>img {
position: absolute;
top: 0;
left: 0;
min-width: 100%;
height: 32rem;
}
/* MARKETING CONTENT
-------------------------------------------------- */
/* Center align the text within the three columns below the carousel */
.marketing .col-lg-4 {
margin-bottom: 1.5rem;
text-align: center;
}
.marketing h2 {
font-weight: 400;
}
.marketing .col-lg-4 p {
margin-right: .75rem;
margin-left: .75rem;
}
/* Featurettes
/* Center align the text within the three columns below the carousel */
.marketing .col-lg-4 {
margin-bottom: 1.5rem;
text-align: center;
}
.marketing h2 {
font-weight: 400;
}
.marketing .col-lg-4 p {
margin-right: .75rem;
margin-left: .75rem;
}
/* Featurettes
------------------------- */
.featurette-divider {
margin: 5rem 0; /* Space out the Bootstrap <hr> more */
}
/* Thin out the marketing headings */
.featurette-heading {
font-weight: 300;
line-height: 1;
letter-spacing: -.05rem;
}
/* RESPONSIVE CSS
.featurette-divider {
margin: 5rem 0;
/* Space out the Bootstrap <hr> more */
}
/* Thin out the marketing headings */
.featurette-heading {
font-weight: 300;
line-height: 1;
letter-spacing: -.05rem;
}
/* RESPONSIVE CSS
-------------------------------------------------- */
@media (min-width: 40em) {
/* Bump up size of carousel content */
.carousel-caption p {
margin-bottom: 1.25rem;
font-size: 1.25rem;
line-height: 1.4;
}
.featurette-heading {
font-size: 50px;
}
}
@media (min-width: 62em) {
.featurette-heading {
margin-top: 7rem;
}
}
</style>

@media (min-width: 40em) {
/* Bump up size of carousel content */
.carousel-caption p {
margin-bottom: 1.25rem;
font-size: 1.25rem;
line-height: 1.4;
}
.featurette-heading {
font-size: 50px;
}
}
@media (min-width: 62em) {
.featurette-heading {
margin-top: 7rem;
}
}
</style>

</head>

</head>
<body>
<body>
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark static">
<a class="navbar-brand" href="home">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark static">
<a class="navbar-brand" href="home">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="dash">Dashboard</a>
</li>
<li class="nav-item">
<a class="nav-link" href="blog">Blog</a>
</li>
<li class="nav-item">
<a class="nav-link" href="compose">compose</a>
</li>
<li class="nav-item">
<a class="nav-link" href="achievements">Accomplishments</a>
</li>
<!-- <li class="nav-item">
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="dash">Dashboard</a>
</li>
<li class="nav-item">
<a class="nav-link" href="blog">Blog</a>
</li>
<li class="nav-item">
<a class="nav-link" href="compose">compose</a>
</li>
<li class="nav-item">
<a class="nav-link" href="achievements">Achievements</a>
</li>

<!-- <li class="nav-item">
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li> -->
</ul>
<form class="form-inline mt-2 mt-md-0">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit"><a class="nav-link" href="login">Logout</a></button>
</form>
</div>
</nav>
</header>

<body>

</ul>
<form class="form-inline mt-2 mt-md-0">
<button class="btn-warning" type="submit"><a class="nav-link" href="login">Logout</a></button>
</form>
</div>
</nav>
</header>

<body>