From a3f7290175268275005e73ef2d1f93a6ef2fd2c8 Mon Sep 17 00:00:00 2001 From: 0xCipher <64740712+0xCipher-max@users.noreply.github.com> Date: Thu, 17 Jun 2021 13:56:23 +0530 Subject: [PATCH 1/4] Update viewController.js Added Home Page --- controllers/viewController.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controllers/viewController.js b/controllers/viewController.js index eff9405..7d77781 100644 --- a/controllers/viewController.js +++ b/controllers/viewController.js @@ -39,3 +39,8 @@ exports.getSignupPage = (req, res, next) => { title: 'Sign up' }); }; +exports.getHomePage = (req, res, next) => { + res.status(200).render('home', { + title: 'Home' + }); +}; From b25e4410f36185763a7c51d04f32f21fb0b02134 Mon Sep 17 00:00:00 2001 From: 0xCipher <64740712+0xCipher-max@users.noreply.github.com> Date: Thu, 17 Jun 2021 14:02:04 +0530 Subject: [PATCH 2/4] Update Style.css Added Button hover Effect and Home page template style --- public/css/style.css | 85 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 4 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 4c0f1ad..663e366 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -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 { @@ -148,8 +153,9 @@ a { .btn { text-decoration: none; margin-right: 2.2rem; - color: #7158e2; + color: white; display: block; + border-radius: 30%; background-color: #1f1f1f; margin-top: 1.5rem; border-radius: 20rem; @@ -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) */ + } .btn:active { transform: translateY(0) scale(0.95); } - +.btn:after{ + border-radius: 30px; + /* color: var(--skin-color) */ +} .btn:active, .btn:hover, .btn { @@ -209,9 +237,9 @@ a { /* Section AppContainer */ -.main { +/* .main { height: 100vh; -} +} */ .appContainer { background-color: #3d3d3d; @@ -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); +} From 409f07a8fcee34a28148c16234d2007dab9e9fa3 Mon Sep 17 00:00:00 2001 From: 0xCipher <64740712+0xCipher-max@users.noreply.github.com> Date: Thu, 17 Jun 2021 14:04:44 +0530 Subject: [PATCH 3/4] Update viewRoute.js Added route to home.js --- routes/viewRoute.js | 1 + 1 file changed, 1 insertion(+) diff --git a/routes/viewRoute.js b/routes/viewRoute.js index 234b313..6271cbb 100644 --- a/routes/viewRoute.js +++ b/routes/viewRoute.js @@ -39,6 +39,7 @@ router.get( viewController.getCreateRoomPage ); +router.get('/home', viewController.getHomePage); router.get('/login', authController.isLoggedIn, viewController.getLogin); router.get('/logout', authController.logOut); router.get('/signup', authController.isLoggedIn, viewController.getSignupPage); From d5842572740c994edbb2aeedfa224b29e828454d Mon Sep 17 00:00:00 2001 From: 0xCipher <64740712+0xCipher-max@users.noreply.github.com> Date: Thu, 17 Jun 2021 14:06:03 +0530 Subject: [PATCH 4/4] Added home.pug file --- views/home.pug | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 views/home.pug diff --git a/views/home.pug b/views/home.pug new file mode 100644 index 0000000..742e97f --- /dev/null +++ b/views/home.pug @@ -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 + | © JAARR | All Rights Reserved + br + a(href='/contactUs') Contact Us +