-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from 9I0xDeepankar/master
enhanced UI for dashboard,blog,compose,achievements
- Loading branch information
Showing
5 changed files
with
134 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +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> | ||
| <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 »</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 »</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 »</a></p> | ||
| </div><!-- /.col-lg-4 --> | ||
| </div><!-- /.row --> | ||
|
|
||
|
|
||
|
|
||
| <footer class="container"> | ||
| <p class="float-right"><a href="#">Back to top</a></p> | ||
| <p>© 2017-2019 Company, Inc. · <a href="#">Privacy</a> · <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 »</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 »</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 »</a></p> | ||
| </div><!-- /.col-lg-4 --> | ||
| </div><!-- /.row --> | ||
|
|
||
|
|
||
|
|
||
| <footer class="container"> | ||
| <p class="float-right"><a href="#">Back to top</a></p> | ||
| <p>© 2017-2019 Company, Inc. · <a href="#">Privacy</a> · <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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"); -%> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"); -%> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters