diff --git a/public/CCashLogo2.png b/public/CCashLogo2.png index e8e8f05..796100c 100644 Binary files a/public/CCashLogo2.png and b/public/CCashLogo2.png differ diff --git a/public/css/style.css b/public/css/style.css index 859895e..bda4004 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -5,10 +5,13 @@ height: 100vh; } body{ - background: #f4da46; + background: rgb(182,151,255); + background: linear-gradient(180deg, rgba(182,151,255,1) 0%, rgba(113,63,230,1) 100%); + height:100vh } .navbarrr{ - background: #bc5b0b; + background: rgb(38,9,108); + background: linear-gradient(180deg, rgba(38,9,108,1) 0%, rgba(14,3,40,1) 100%);; } .blue{ background: #46cff2; @@ -59,66 +62,13 @@ body{ p{ font-size: 14px; } -/* The sidepanel menu */ -.sidepanel { - height: 100%; /* Specify a height */ - width: 0; /* 0 width - change this with JavaScript */ - position: fixed; /* Stay in place */ - z-index: 1; /* Stay on top */ - top: 0; - left: 0; - background-color: #111; /* Black*/ - overflow-x: hidden; /* Disable horizontal scroll */ - padding-top: 60px; /* Place content 60px from the top */ - transition: 0.5s; /* 0.5 second transition effect to slide in the sidepanel */ -} -/* The sidepanel links */ -.sidepanel a { - padding: 8px 8px 8px 32px; - text-decoration: none; - font-size: 25px; - color: #818181; - display: block; - transition: 0.3s; -} - -/* When you mouse over the navigation links, change their color */ -.sidepanel a:hover { - color: #f1f1f1; -} - -/* Position and style the close button (top right corner) */ -.sidepanel .closebtn { - position: absolute; - top: 0; - right: 25px; - font-size: 36px; - margin-left: 50px; -} - -/* Style the button that is used to open the sidepanel */ -.openbtn { - font-size: 20px; - cursor: pointer; - background-color: #111; - color: white; - padding: 10px 15px; - border: none; -} - -.openbtn:hover { - background-color: #444; -} - -.reveal-if-active { - opacity: 0; - max-height: 0; - overflow: hidden; -} .text-black{ color:black; } +.text-white{ + color:white; +} .form-check-input{ margin-left:0; padding:inherit; @@ -130,14 +80,18 @@ input[type="checkbox"]:checked ~ .reveal-if-active { max-height: 100px; /* little bit of a magic number :( */ overflow: visible; } -@font-face {font-family: "PapyrusW01"; src: url("//db.onlinewebfonts.com/t/a0e1b1883c0cf520e9c50d0cd91cd0d0.eot"); src: url("//db.onlinewebfonts.com/t/a0e1b1883c0cf520e9c50d0cd91cd0d0.eot?#iefix") format("embedded-opentype"), url("//db.onlinewebfonts.com/t/a0e1b1883c0cf520e9c50d0cd91cd0d0.woff2") format("woff2"), url("//db.onlinewebfonts.com/t/a0e1b1883c0cf520e9c50d0cd91cd0d0.woff") format("woff"), url("//db.onlinewebfonts.com/t/a0e1b1883c0cf520e9c50d0cd91cd0d0.ttf") format("truetype"), url("//db.onlinewebfonts.com/t/a0e1b1883c0cf520e9c50d0cd91cd0d0.svg#PapyrusW01") format("svg"); } h1, h2, h3, h4, h5, h6, p, label{ - font-family: PapyrusW01; + font-family: 'Montserrat', sans-serif; + color } + h1{ color: white; } +.shadow{ + box-shadow: 5px 10px #888888; +} diff --git a/views/adminsettings.pug b/views/adminsettings.pug index eb442c8..fda251a 100644 --- a/views/adminsettings.pug +++ b/views/adminsettings.pug @@ -6,11 +6,11 @@ block content h1 Settings, logged in as: #{user} if admin == true br - .card + .card.shadow-lg center h4 here are your settings king br - .card + .card.shadow-lg h4 Add User form(method='POST', action='/admin/user') #form-group @@ -25,7 +25,7 @@ block content br input.btn.btn-primary(type='submit',value='Submit') br - .card + .card.shadow-lg h4 Check User Balance form(method='POST', action='/admin/baluser') #form-group @@ -34,7 +34,7 @@ block content br input.btn.btn-primary(type='submit',value='Submit') br - .card + .card.shadow-lg h4 Change Balance of User form(method='POST', action='/admin/bal') #form-group @@ -45,7 +45,7 @@ block content br input.btn.btn-primary(type='submit',value='Submit') br - .card + .card.shadow-lg h4 Delete user p This will permanently delete user make sure you get it right form(method='POST', action='/admin/userdelete') @@ -57,7 +57,7 @@ block content br input.btn.btn-primary(type='submit',value='Submit') br - .card + .card.shadow-lg h4 Close Server form(method='POST', action='/admin/close') #form-group diff --git a/views/bankf.pug b/views/bankf.pug index ddb63f8..b689f38 100644 --- a/views/bankf.pug +++ b/views/bankf.pug @@ -4,25 +4,29 @@ extends layout block content .container h1 Welcome to the bank interface #{user} - .card - h2 Send Funds - - h4 Balance: #{balance} - + .card.shadow-lg + .row + .col + h2 Send Funds + .col + h4 Balance: #{balance} + hr form(method='POST', action='/sendfunds') - #form-group - label amount to send: - input(type="number" min="0" max=balance name="amount") - br - #form-group - label reciever: - input(name='name', type='text') - br - #form-group - label Your Password: - input(name='senderpass', type='password') - br - br + label amount to send: + br + input.form-control-lg.shadow(type="number" min="0" max=balance name="amount") + br + br + label reciever: + br + input.form-control-lg.shadow(name='name', type='text') + br + br + label Your Password: + br + input.form-control-lg.shadow(name='senderpass', type='password') + br + br input.btn.btn-primary(type='submit', value='Submit') diff --git a/views/index.pug b/views/index.pug index 7298863..fbfdf1c 100644 --- a/views/index.pug +++ b/views/index.pug @@ -4,7 +4,7 @@ extends layout block content .container h1 Welcome to CCashBank Front End - .card + .card.shadow-lg center h4 Is the server online? if alive diff --git a/views/layout.pug b/views/layout.pug index bd3108f..b583c7b 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -4,10 +4,13 @@ html title CCashBank link(href="https://fonts.googleapis.com/css2?family=Josefin+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap" rel="stylesheet") link(rel="stylesheet", href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css", integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z", crossorigin="anonymous") + link(rel="preconnect" href="https://fonts.gstatic.com") + link(href="https://fonts.googleapis.com/css2?family=Lato&family=Montserrat&display=swap" rel="stylesheet") + link(rel='stylesheet' href='/css/style.css') meta(name='viewport', content='width=device-width, initial-scale=1.0') body - nav.navbar.navbar-expand-lg.navbar-light.navbarrr + nav.navbar.navbar-expand-lg.navbar-light.navbarrr.shadow-lg .container a.navbar-brand(href='/') img(src="../CCashLogo2.png" style="width:75px") @@ -16,22 +19,22 @@ html #navbars.collapse.navbar-collapse ul.navbar-nav.mr-auto - ul.navbar-nav.mr-right + ul.navbar-nav.mr-right.text-white if user == undefined li.nav-item - a.nav-link(href='/login') Login + a.nav-link(href='/login').text-white Login li.nav-item - a.nav-link(href='/register') Register + a.nav-link(href='/register').text-white Register if user li.nav-item - a.nav-link(href='/logout') Log out + a.nav-link(href='/logout').text-white Log out li.nav-item - a.nav-link(href='/BankF') Bank Dashboard + a.nav-link(href='/BankF').text-white Bank Dashboard li.nav-item - a.nav-link(href='/settings') Settings + a.nav-link(href='/settings').text-white Settings if admin == true li.nav-item - a.nav-link(href='/admin') Admin + a.nav-link(href='/admin').text-white Admin .container != messages('message', locals) if errors diff --git a/views/login.pug b/views/login.pug index e8ed60f..c5f3e24 100644 --- a/views/login.pug +++ b/views/login.pug @@ -2,19 +2,24 @@ extends layout block content .container - h1 Login - hr - p - form(method='POST', action='/login') - #form-group - label Username: - input.form-control(name='name', type='text') - br - #form-group - label Password: - input.form-control(name='password', type='password') - br + .row + .col-sm + .col + .card.shadow-lg + h1.text-black Login + hr + p + form(method='POST', action='/login') + #form-group + label Username: + input.form-control(name='name', type='text') + br + #form-group + label Password: + input.form-control(name='password', type='password') + br - input.btn.btn-primary(type='submit', value='Submit') - + input.btn.btn-primary(type='submit', value='Submit') + .col-sm +