Skip to content

Adde Home Page #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xCipher-max wants to merge 5 commits into
base: development
Choose a base branch
from
Open

Adde Home Page #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3f7290
Update viewController.js
0xCipher-max Jun 17, 2021
b25e441
Update Style.css
0xCipher-max Jun 17, 2021
409f07a
Update viewRoute.js
0xCipher-max Jun 17, 2021
d584257
Added home.pug file
0xCipher-max Jun 17, 2021
90b4ce0
Merge branch 'development' into development
Creatoon Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions controllers/viewController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,8 @@ exports.getSignupPage = (req, res, next) => {
title: 'Sign up'
});
};
exports.getHomePage = (req, res, next) => {
res.status(200).render('home', {
title: 'Home'
});
};
85 changes: 81 additions & 4 deletions public/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ Blue-Secondary = #7d5fff
padding: 0;
box-sizing: border-box;
}
:root{
--outer-shadow: 3px 3px 3px #7158e2, -3px -3px #7158e2;
--inner-shadow: inset 3px 3px 3px #7158e2, inset -3px -3px #7158e2;
--outer-shadow-0:0 0 0 #7158e2, 0 0 0 #7158e2;
}

html,
body {
Expand Down Expand Up @@ -148,8 +153,9 @@ a {
.btn {
text-decoration: none;
margin-right: 2.2rem;
color: #7158e2;
color: white;
Copy link
Owner

@Creatoon Creatoon Jun 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why ?

display: block;
border-radius: 30%;
background-color: #1f1f1f;
margin-top: 1.5rem;
border-radius: 20rem;
Expand All @@ -164,11 +170,33 @@ a {
transform: translateY(-0.3rem);
transition: all 0.3s;
}
/* .btn{
padding: 10px 25px;
font-size: 16;
font-weight: 500;
text-decoration: none;
color: avr();
background-color: transparent;
line-height: 1.5;
cursor: pointer;
border-radius: 30px;
color: #7158e2;
/* border: 2px solid red; */
/* transition: all 0.5s ease;;
display: inline-block
}*/
.btn:after{
border-radius: 30px;
/* color: var(--skin-color) */
}
Copy link
Owner

@Creatoon Creatoon Jun 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused css code

Copy link
Author

@0xCipher-max 0xCipher-max Jun 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is for the effects after hovering the button


.btn:active {
transform: translateY(0) scale(0.95);
}

.btn:after{
border-radius: 30px;
/* color: var(--skin-color) */
}
.btn:active,
.btn:hover,
.btn {
Expand Down Expand Up @@ -209,9 +237,9 @@ a {

/* Section AppContainer */

.main {
/* .main {
height: 100vh;
}
} */

.appContainer {
background-color: #3d3d3d;
Expand Down Expand Up @@ -1006,3 +1034,52 @@ a {
font-size: 1.2rem;
display: inline-block;
}
.footer{
border-top: 4px solid #161616;
background-color: #292929;
height:100px;
border-bottom-left-radius: 1.3rem;
border-bottom-right-radius: 1.3rem;
text-align: center;
font-size: 20px;
font-weight: 600;
color: #7158e2;
padding: 10px;

}
.footer a{
text-decoration: none;
color: #7158e2;
}
.appContainer {
background-color: #3d3d3d;
width: 100%;
height: 85vh;
margin: 0 auto;
display: flex;
border-top: 3px solid #161616;
}
.outer-shadow{
box-shadow: var(--outer-shadow);
}
.hover-in-shadow
{
position: relative;
z-index: 1;
}
.hover-in-shadow:hover{
box-shadow: var(--outer-shadow-0);
}
.hover-in-shadow:after{
content: '';
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
transition: all 0.3s ease;
}
.hover-in-shadow:hover:after
{
box-shadow: var(--inner-shadow);
}
2 changes: 2 additions & 0 deletions routes/viewRoute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ router.get(
viewController.getCreateRoomPage
);

router.get('/home', viewController.getHomePage);
Copy link
Owner

@Creatoon Creatoon Jun 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Read the issue properly, I said, add a home or landing page on "/" URI, not on "/home" URI

router.get(
'/login',
authController.isLoggedIn,
authController.redirectIfLoggedIn,
viewController.getLogin
);

router.get('/logout', authController.logOut);
router.get(
'/signup',
Expand Down
26 changes: 26 additions & 0 deletions views/home.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
head
meta(charset='UTF-8')
meta(http-equiv='X-UA-Compatible' content='IE=edge')
meta(name='viewport' content='width=<>, initial-scale=1.0')
title Jar | #{title}
link(rel='stylesheet', type='text/css', href='/css/style.css')
link(rel='stylesheet', type='text/css', href='/css/styleButton.css')
.loader-bg
.loader-p
header.header
.row.clearfix
.header__logoBox
img.header__logo(src='/img/utils/origLogo.png' alt='Logo')
.header__contentBox
a.btn.hover-in-shadow.header__contentBox--(href='') Home
a.btn.hover-in-shadow.header__contentBox--(href='#') About
a.btn.hover-in-shadow.header__contentBox--(href='#') Contact Us
a.btn.hover-in-shadow.header__contentBox--(href='/login') Log-In
a.btn.hover-in-shadow.header__contentBox--(href='/signup') Sign-Up
main.main
section.appContainer
footer.footer
| &copy; JAARR | All Rights Reserved
br
a(href='/contactUs') Contact Us