Skip to content

Commit

Permalink
UI changes, updated readMe + footer
Browse files Browse the repository at this point in the history
  • Loading branch information
@neilrathi17
neilrathi17 committed Sep 5, 2020
1 parent 89a33a6 commit 5c1905e
Show file tree
Hide file tree
Showing 9 changed files with 258 additions and 77 deletions.
23 changes: 17 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<p align="center"><a href="http://www.codechefvit.com" target="_blank"><img src="https://s3.amazonaws.com/codechef_shared/sites/all/themes/abessive/logo-3.png" title="CodeChef-VIT" alt="Codechef-VIT"></a>
</p>

# Project Title
# Stocker

> <Subtitle>
> Include project description here.
> Stocker is a Website that serves you the latest stock information on all Companies. Using Web scraping stock from various companies can be compared using the chatbot feature.

---
[![DOCS](https://img.shields.io/badge/Documentation-see%20docs-green?style=flat-square&logo=appveyor)](INSERT_LINK_FOR_DOCS_HERE)
Expand All @@ -15,12 +16,17 @@

## Features
- Insert list of features here
- Latest information on company stocks
- Mutual fund returns calculator
- Chatbot with various functionality




## Screenshots
<img src="https://github.com/akshatvg/common-entry-test/raw/master/static/img/header.png" alt="Project Screenshots">
<img src="https://i.ibb.co/LCqgtcK/project-Screenshot1.png" alt="Project Screenshots">
<img src="https://i.ibb.co/WxD39YP/project-Screenshot2.png" alt="Project Screenshots">
<img src="https://i.ibb.co/T2y8YT1/project-Screenshot3.png" alt="Project Screenshots">

## Instructions to run

Expand All @@ -32,13 +38,18 @@ $ python3 manage.py runserver
```

## Contributors
- <a href="https://github.com/<Contributor>">Contributor Name</a>
- <a href="https://github.com/<Contributor>">Contributor Name</a>

- <a href="https://github.com/<neilrathi17">Neil Rathi</a>
- <a href="https://github.com/<Bhard27">Pranjal Bhardwaj</a>
- <a href="https://github.com/<hpb1">Hari Prashant</a>

## License

[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://badges.mit-license.org)

<p align="center">
With :heart: by <a href="http://www.codechefvit.com" target="_blank">CodeChef-VIT</a>
</p>



<a href="https://ibb.co/B3kZcPG"><img src="https://i.ibb.co/T2y8YT1/project-Screenshot3.png" alt="project-Screenshot3" border="0"></a>
99 changes: 73 additions & 26 deletions assets/allstyles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,23 @@ background: -webkit-linear-gradient(to right, #2C5364, #203A43, #0F2027); */
.navbar-light .navbar-nav .nav-link {
color: rgb(239, 232, 232);
}
.navbar-light .navbar-nav .nav-link:hover
{

color:white;
}
.navbar-brand
{
font-family: 'Cinzel', serif;

}
.navbar-toggler-icon {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%280, 0, 0, 0.5%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
}
.nodisplay
{
display: none;
}
.reg
{
background-color: black;
Expand All @@ -34,20 +48,22 @@ background: -webkit-linear-gradient(to right, #2C5364, #203A43, #0F2027); */
margin:20px;
background-color: inherit;
color: #04a14e;
border-top: none;
border-left: none;
border-right:none;

}
.form-control:hover
{
border:2px solid#046331;
border: 2px solid #00863f;


}
.form-control:focus
{
border:4px solid #00863f;
background-color: black;
outline: none!important;

background-color: black;
color: white;
border: 4px solid #00863f;

}

.outer
Expand Down Expand Up @@ -111,8 +127,6 @@ footer
height: fit-content; bottom: 0;

}


/* hover effects--------------------------------------- */
.hvr-float {
display: inline-block;
Expand Down Expand Up @@ -213,7 +227,6 @@ footer




.fa-plus
{
color:darkred;
Expand Down Expand Up @@ -329,8 +342,18 @@ footer
margin: 0;
padding-right: 20px;
width: 85%;
color: #444; }
textarea:focus:-webkit-placeholder {
line-height: 9x 0%;
color: #444;

}
.message-input::-webkit-scrollbar-thumb {
background: teal;
}
.message-input::-webkit-scrollbar {
width: 1px;
}
textarea:focus:-webkit-placeholder
{
color: transparent;
}
.message-submit {
Expand Down Expand Up @@ -462,6 +485,45 @@ footer
border: 1px solid #046331;
}

/* -----------------------footer------------------------------------- */
.footer-links
{
margin: 20px;
color: white;

}
.footer-links:hover
{
color: white;
text-decoration: none;

}
.social-links
{
list-style-type: none;
display: inline-block;
padding-left: 0;
}
.social-list{

display: inline-block;
}
.social-list a {
display: inline-block;
height: 30px;
width: 30px;
margin-right: 6px;
border-radius: 100%;;
background-color: black;
color: white;
padding: 0;
text-align: center;
}
.social-list a:hover
{
background-color: white;
color: black;
}
/* -------------------------------- media query-------------------------------- */
@media(max-width:700px)
{
Expand Down Expand Up @@ -509,19 +571,4 @@ footer



/* .fade-in {
opacity: 1;
animation-name: fadeInOpacity;
animation-iteration-count: 1;
animation-timing-function: ease-in;
animation-duration: 0.5s;
}

@keyframes fadeInOpacity {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
} */
22 changes: 22 additions & 0 deletions assets/js/calculator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,26 @@ function calculate()
var total=p*Math.pow((1+(r/100)),t);
total=Math.ceil(total);
final.innerHTML=total;
}
var logged=false;
if(logged)
{
var list=document.getElementsByClassName('loggedout-nav')
console.log(list)
for(var i=0;i<list.length;++i)
{
list[i].classList.toggle('nodisplay')
list[i].classList.toggle('hvr-underline-from-center')

}
}
else
{
var list=document.querySelectorAll('.loggedin-nav')
for(var i=0;i<list.length;++i)
{
list[i].classList.toggle('nodisplay')
list[i].classList.toggle('hvr-underline-from-center')

}
}
23 changes: 22 additions & 1 deletion assets/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ function chatbotToggle()

function insertMessage() {
msg = $('.message-input').val();
console.log(msg)
if ($.trim(msg) == '') {
return false;
}
Expand Down Expand Up @@ -90,3 +89,25 @@ function chatbotToggle()
});


var logged=false;
if(logged)
{
var list=document.getElementsByClassName('loggedout-nav')
console.log(list)
for(var i=0;i<list.length;++i)
{
list[i].classList.toggle('nodisplay')
list[i].classList.toggle('hvr-underline-from-center')

}
}
else
{
var list=document.querySelectorAll('.loggedin-nav')
for(var i=0;i<list.length;++i)
{
list[i].classList.toggle('nodisplay')
list[i].classList.toggle('hvr-underline-from-center')

}
}
66 changes: 52 additions & 14 deletions calculator.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<link rel="stylesheet" href="assets/allstyles.css">

<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.0.0/animate.min.css"/>
<link href="https://fonts.googleapis.com/css2?family=Cinzel:wght@700&display=swap" rel="stylesheet">

<title>Stocker Calculator</title>
</head>
<body>
Expand All @@ -27,19 +29,23 @@
<li class="nav-item ">
<a class="nav-link hvr-underline-from-center" href="#">Categories<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link hvr-underline-from-center" href="#">Graphical analysis</a>
</li>

<li class="nav-item">
<a class="nav-link hvr-underline-from-center" href="#">Mutual fund caluclator</a>
</li>
</ul>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link hvr-underline-from-center" href="profile.html">UserName</a>
<a class="nav-link hvr-underline-from-center loggedout-nav" href="login.html">Login</a>
</li>
<li class="nav-item">
<a class="nav-link hvr-underline-from-center loggedout-nav" href="signup.html">Register</a>
</li>
<li class="nav-item" >
<a class="nav-link hvr-underline-from-center loggedin-nav" href="profile.html">UserName</a>
</li>
<li class="nav-item">
<a class="nav-link hvr-underline-from-center" onclick="logout()" href="">Logout</a>
<a class="nav-link hvr-underline-from-center loggedin-nav" onclick="logout()" href="">Logout</a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -94,16 +100,48 @@ <h3 id="result-calculator">
</div>
</div>

<footer>
<div class="container" >
<p>
<img src="assets/img/ccwhite.png" alt="" style="width: 180px; height: 100px; margin: 50px;">
<h5 style="color: white; display: inline;">Desgined and developed by codechef-VIT</h5>

</p>
<!-- ----------------------------------footer---------------------------------------------------- -->
<footer class="container-fluid">
<div class="container-fluid" >
<div class="row">
<div class="col-sm-12 col-md-4" style=" margin: 15px 0 15px 0;">
<img src="assets/img/ccwhite.png" alt="" style="width: 150px; height: 90px; margin: 50px;">
<h6 style="color: white; display: block;">Desgined and developed by codechef-VIT</h6s>
</div>
<div class="col-sm-12 col-md-7">
<div class="container" style="margin-top:50px;border-bottom: 1px solid white;">
<p><a class="footer-links hvr-underline-from-center" href="/signup.html">Signup</a>
<a class="footer-links hvr-underline-from-center" href="login.html">Login</a>
<a class="footer-links hvr-underline-from-center" href="calculator.html">Mutual fund calculator</a>
<a class="footer-links hvr-underline-from-center" href="index.html">home</a>
</p>
</div>
<div class="container" style="margin-top:10px;">
<p style="color: white;">© Copyright 2020 | CodeChef-VIT | All rights reserved.</p>
<ul class="social-links">
<li class="social-list"><a href="https://www.youtube.com/channel/UCzFltCrQSB1CKmX440yqTKw"><i
class="fab fa-youtube footer-icon"></i></a></li>
<li class="social-list"><a href="https://www.facebook.com/codechefvit" ><i
class="fab fa-facebook-f footer-icon"></i></a></li>
<li class="social-list"><a href="https://github.com/CodeChefVIT" target="_blank"><i class="fab fa-github footer-icon"></i></a></li>
<li class="social-list"><a href="https://www.instagram.com/codechefvit/" target="_blank"><i
class="fab fa-instagram footer-icon"></i></a></li>
<li class="social-list"><a href="https://medium.com/@codechefvit" target="_blank"><i
class="fab fa-medium-m footer-icon"></i></a></li>
<li class="social-list"><a href="https://twitter.com/codechefvit" target="_blank"><i
class="fab fa-twitter footer-icon"></i></a></li>
<li class="social-list"><a href="https://www.linkedin.com/company/codechef-vit-chapter" target="_blank"><i
class="fab fa-linkedin-in footer-icon"></i></a></li>
</ul>

</div>
</div>



</div>
</footer>

</div>
</footer>



Expand Down
Loading

0 comments on commit 5c1905e

Please sign in to comment.