From 57763503a60a8c998c0d54c94db5debaa4785d48 Mon Sep 17 00:00:00 2001 From: Hassan Olakunle Date: Wed, 23 Oct 2019 12:26:00 +0100 Subject: [PATCH 001/121] adding a settings-payment page --- settings-payment.html | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 settings-payment.html diff --git a/settings-payment.html b/settings-payment.html new file mode 100644 index 0000000..da3842f --- /dev/null +++ b/settings-payment.html @@ -0,0 +1,69 @@ + + + + + + + + + + + Settings-Payment + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateRefference NumberDescriptionAmountPayment Method
2/2/2020ID2712JJJGPark FeeN20.00Visa
2/2/2020ID2712JJJGPark FeeN20.00Visa
2/2/2020ID2712JJJGPark FeeN20.00Visa
2/2/2020ID2712JJJGPark FeeN20.00Visa
2/2/2020ID2712JJJGPark FeeN20.00Visa
+
+ + + \ No newline at end of file From 5ebe9995da6a155b95c849bf67caa24f9ded4877 Mon Sep 17 00:00:00 2001 From: benjamin-bala Date: Wed, 23 Oct 2019 13:12:27 +0100 Subject: [PATCH 002/121] Added Navigation Bar and Search Menu to the Car Park Admin Page --- nav.html | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 nav.html diff --git a/nav.html b/nav.html new file mode 100644 index 0000000..a171bd3 --- /dev/null +++ b/nav.html @@ -0,0 +1,194 @@ + + + + + + + Car Park Admin + + + + + + +
+
+ + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
+
+ +
+
+ + + + + + + \ No newline at end of file From 08f9528b5e78a1ce878c584c4cbd95c9e2b95c3d Mon Sep 17 00:00:00 2001 From: "[dekiller_j]" <[iwaloyeo@gmail.com]> Date: Wed, 23 Oct 2019 15:29:39 +0100 Subject: [PATCH 003/121] settings payment page in progress --- css/main.css | 52 +++++++++++++++++++++++++++++++++++++++++++ settings-payment.html | 25 +++++++++++++++++---- 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/css/main.css b/css/main.css index 8b13789..1b5be8c 100644 --- a/css/main.css +++ b/css/main.css @@ -1 +1,53 @@ +/* .container{ + margin-top: 3rem; + border: 2px solid #ccc !important; + border-radius: 5px; +} */ +.payment-header{ + margin: 1.5rem 0 !important; +} +.desc{ + font-size: 0.8rem !important; + color: #66788A !important; + padding-left: 1.5rem; +} +.has-search .form-control { + padding-left: 2.375rem; +} +.form-control{ + width: 70% !important; +} +.has-search .form-control-feedback { + position: absolute; + z-index: 2; + display: block; + width: 2.375rem; + height: 2.375rem; + line-height: 2.375rem; + text-align: center; + pointer-events: none; + color: #aaa; +} +.searchbtn{ + height: 40px !important; +} +.search{ + width: 100% !important; + margin: 2rem 0; + float: right !important; +} +@media (max-width: 380px){ + .search{ + margin-top: 0; + width: 100% !important; + } + .searchText{ + text-align: center !important; + } + .btn-group{ + text-align: center !important; + display: block !important; + padding-bottom: 2rem !important; + } +} diff --git a/settings-payment.html b/settings-payment.html index da3842f..8bdcefe 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -8,14 +8,31 @@ + Settings-Payment - +
- - - +
+

Payment History

+

Every payment details are made available here

+
+
+
+ + + +
+
+
+

Search for people by

+
+ + +
+
+
From 9769c1d3a8b5be2525373f63c330abdc98fe48b0 Mon Sep 17 00:00:00 2001 From: "[dekiller_j]" <[iwaloyeo@gmail.com]> Date: Wed, 23 Oct 2019 17:06:55 +0100 Subject: [PATCH 004/121] added the page navbar and some parts of the body --- css/main.css | 65 +++++++++++++++++++++++++++++++++++++++---- settings-payment.html | 13 +++++++-- 2 files changed, 70 insertions(+), 8 deletions(-) diff --git a/css/main.css b/css/main.css index 1b5be8c..7ee78e2 100644 --- a/css/main.css +++ b/css/main.css @@ -1,10 +1,43 @@ -/* .container{ +*{ + box-sizing: border-box; +} +html{ + height: 100%; +} +.container{ margin-top: 3rem; border: 2px solid #ccc !important; border-radius: 5px; -} */ +} +.header{ + width: 100%; + background: #FFFFFF; + height: 45px; + border-bottom: 2px solid #ccc; +} +.nav-items{ + width: 50%; + list-style: none; + display: flex; + padding: 0 5rem; + align-items: flex-start; + /* justify-content: space-around; */ +} +.nav-item{ + padding: 0.5rem 0rem; +} +.nav-item a{ + text-decoration: none; + color: #777777; +} +.nav-item a:hover{ + color: #1A73E8; +} +.active{ + border-bottom: 2px solid #1A73E8; +} .payment-header{ - margin: 1.5rem 0 !important; + margin: 1rem 0 !important; } .desc{ font-size: 0.8rem !important; @@ -32,12 +65,16 @@ height: 40px !important; } .search{ - width: 100% !important; - margin: 2rem 0; - float: right !important; + margin: 0.8rem 0 1rem 30rem!important; + float: right !important; } @media (max-width: 380px){ + .container{ + margin-top: 3rem ; + border: 0px !important; + border-radius: 0px !important; + } .search{ margin-top: 0; width: 100% !important; @@ -50,4 +87,20 @@ display: block !important; padding-bottom: 2rem !important; } + form-group{ + margin-bottom: 0rem; + } +} +@media(max-width:768px){ + .search{ + width: 100vw !important; + text-align: center; + margin-top: 1.2rem !important; + width: 80% !important; + padding: 0px !important; + margin-left:200px ; + } + .btn-group{ + padding: 1rem 0; + } } diff --git a/settings-payment.html b/settings-payment.html index 8bdcefe..de9a76c 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -12,7 +12,16 @@ Settings-Payment - +
+ +

Payment History

@@ -26,7 +35,7 @@

Payment History


-

Search for people by

+

Search for people by

From a1dd8737e1b62f1d5110709b78f1f49eb996453e Mon Sep 17 00:00:00 2001 From: "[dekiller_j]" <[iwaloyeo@gmail.com]> Date: Wed, 23 Oct 2019 17:13:41 +0100 Subject: [PATCH 005/121] just uncommented a line --- css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 7ee78e2..786caaa 100644 --- a/css/main.css +++ b/css/main.css @@ -21,7 +21,7 @@ html{ display: flex; padding: 0 5rem; align-items: flex-start; - /* justify-content: space-around; */ + justify-content: space-around; } .nav-item{ padding: 0.5rem 0rem; From fdb847aebf2a029989fe20d39a5df7109af681ab Mon Sep 17 00:00:00 2001 From: Hassan Olakunle Date: Wed, 23 Oct 2019 17:28:33 +0100 Subject: [PATCH 006/121] table completion --- settings-payment.html | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/settings-payment.html b/settings-payment.html index da3842f..0370980 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -10,6 +10,23 @@ Settings-Payment + +
@@ -31,35 +48,35 @@
- + - + - + - + - +
Date ID2712JJJG Park Fee N20.00VisaVisa :
2/2/2020 ID2712JJJG Park Fee N20.00VisaVisa :
2/2/2020 ID2712JJJG Park Fee N20.00VisaVisa :
2/2/2020 ID2712JJJG Park Fee N20.00VisaVisa :
2/2/2020 ID2712JJJG Park Fee N20.00VisaVisa :
From 4a0617cd72570488f27ab3b920d062fdac70ee7a Mon Sep 17 00:00:00 2001 From: Hassan Olakunle Date: Wed, 23 Oct 2019 17:49:51 +0100 Subject: [PATCH 007/121] table completion --- settings-payment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings-payment.html b/settings-payment.html index f160543..06e598c 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -55,7 +55,7 @@

Payment History

Search for people by

- +
From 0d35bbd0d8974e5863b041dc731894120ac0842b Mon Sep 17 00:00:00 2001 From: "[dekiller_j]" <[iwaloyeo@gmail.com]> Date: Wed, 23 Oct 2019 19:00:22 +0100 Subject: [PATCH 008/121] responsiveness fixed... --- css/main.css | 9 +++++++-- settings-payment.html | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/css/main.css b/css/main.css index 786caaa..c17c6df 100644 --- a/css/main.css +++ b/css/main.css @@ -11,6 +11,7 @@ html{ } .header{ width: 100%; + height: 100%; background: #FFFFFF; height: 45px; border-bottom: 2px solid #ccc; @@ -70,6 +71,12 @@ html{ } @media (max-width: 380px){ + body{ + position: absolute; + } + .nav-items{ + width: 100%; + } .container{ margin-top: 3rem ; border: 0px !important; @@ -83,8 +90,6 @@ html{ text-align: center !important; } .btn-group{ - text-align: center !important; - display: block !important; padding-bottom: 2rem !important; } form-group{ diff --git a/settings-payment.html b/settings-payment.html index 06e598c..3019b2f 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -12,7 +12,7 @@ Settings-Payment + + +
+
+ + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
+
+ +
+
+
+
+
+
New Users
+

20

+
+
+
+
+
+
Exisiting Users
+

8

+
+
+
+
+
+
Issues
+

8

+
+
+
+
+
+
Car Park
+

20

+
+
+
+
+ +
+
+

Car Park Locations

+
+
+ +
+
+ +
+
+
+ +
+
+
+ + + + + + + \ No newline at end of file From 3220a777120b1cfc8eb22d20b6148d37254b9b00 Mon Sep 17 00:00:00 2001 From: Hassan Olakunle Date: Wed, 23 Oct 2019 20:39:31 +0100 Subject: [PATCH 011/121] build a payment setting page --- settings-payment.html | 211 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 188 insertions(+), 23 deletions(-) diff --git a/settings-payment.html b/settings-payment.html index 06e598c..caa0b3d 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -4,32 +4,165 @@ + Car Park Admin + + + - Settings-Payment + - + + + Apps + Apps + + + + + + Mail + Mail + + + + + + Users + Users + + + + + + Settings + Settings + + + + + + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
- -
+
  • Accounts
    • @@ -58,6 +191,7 @@

    Payment History

+
@@ -74,39 +208,70 @@

Payment History

- + - + - + - + - +
ID2712JJJG Park Fee N20.00Visa : Visa :
2/2/2020 ID2712JJJG Park Fee N20.00Visa : Visa :
2/2/2020 ID2712JJJG Park Fee N20.00Visa : Visa :
2/2/2020 ID2712JJJG Park Fee N20.00Visa : Visa :
2/2/2020 ID2712JJJG Park Fee N20.00Visa : Visa :
+ + + + + + + + + + + \ No newline at end of file From 60d65833fb2cc97f0764317f12207724824c9c1f Mon Sep 17 00:00:00 2001 From: benjamin-bala Date: Wed, 23 Oct 2019 20:43:13 +0100 Subject: [PATCH 012/121] added link to card, fixed minimal width issues --- admin.html | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/admin.html b/admin.html index 98948ab..f89746c 100644 --- a/admin.html +++ b/admin.html @@ -140,7 +140,7 @@ -
+
+
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Users - Your users are made available here - Add New Member -
NameEmail AddressRoleLast Login
Anthony Joshuaanthonyjo@gmail.comUser2/2/2020
Anthony Joshuaanthonyjo@gmail.comUser2/2/2020
-
- -
-
- - - -
- - - - - - - - +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Users + Your users are made available here + Add New Member +
NameEmail AddressRoleLast Login
Anthony Joshuaanthonyjo@gmail.comUser2/2/2020
Anthony Joshuaanthonyjo@gmail.comUser2/2/2020
+
+
+ + + + + - From 692b0561ce80ac4af89d1688c11b5dfd0979d580 Mon Sep 17 00:00:00 2001 From: faruq2 Date: Thu, 24 Oct 2019 12:09:25 +0100 Subject: [PATCH 026/121] New navbar added --- newUsers.html | 304 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 217 insertions(+), 87 deletions(-) diff --git a/newUsers.html b/newUsers.html index ba18f81..d1042ed 100644 --- a/newUsers.html +++ b/newUsers.html @@ -105,99 +105,84 @@ margin-bottom: 0; } - /* MAP */ - /*.map-row { - display: flex; - flex-direction: row; + .city-list-container { + border: 1px solid rgba(119, 119, 119, 0.2); } - .map-header { + .city-list li { + list-style-type: none; - text-align: justify; - align-items: center; - font-style: normal; - font-weight: 500; - font-size: 1rem; - line-height: 23px; - color: #777777; - background-color: #fff; - margin-top: 0.8rem; - margin-left: 1.5rem; - width: 96.5%; - p adding: 0.3rem; - border-bottom: 1px solid #f6f6f6; } - #Row2 { - height: 350px; - margin-top: 15px; + #body-row { + margin-left: 0; + margin-right: 0; } - .map { + #sidebar-container { + min-height: 100vh; + background-color: #0049B5; + padding: 0; + } - gap: 1.2rem; - height: 58vh; - width: 96.5%; - margin-left: 1.5rem; - background-color: #fff; + /* Sidebar sizes when expanded and expanded */ + .sidebar-expanded { + width: 230px; } - .map1 { - margin-left: 0.5rem; + .sidebar-collapsed { + width: 60px; } - .list2 { - height: 100%; - margin-top: 1rem; - width: 90%; - border: 2px solid #f6f6f6; - padding: 1rem; - position: relative; + /* Menu item*/ + #sidebar-container .list-group a { + height: 50px; + color: white; } - .list2 h4 { - background-color: #fdfdfd; - padding: 0.4rem; - margin-top: -1rem; - margin-bottom: 0.5rem; - border: 1px solid #f6f6f6; - width: 100%; - display: inline-block; + /* Submenu item*/ + #sidebar-container .list-group .sidebar-submenu a { + height: 45px; + padding-left: 30px; } - .list-header { - border-top: 1px solid rgba(119, 119, 119, 0.2); - padding-top: 0.5rem; + .sidebar-submenu { + font-size: 0.9rem; } - .list2 li { - list-style-type: none; - padding: 0.4rem; - width: 110%; - margin-left: -1.1rem; - margin-bottom: 1rem; - margin-right: -1rem; - border-bottom: 1px solid rgba(119, 119, 119, 0.2); - } - - .list2::after { - content: ""; - width: 1px; - height: 17rem; - background-color: #1A73E8; - border: 2px solid #1A73E8; - border-radius: 101px; - top: 3rem; - left: 18rem; - }*/ - .city-list-container { - border: 1px solid rgba(119, 119, 119, 0.2); + /* Separators */ + .sidebar-separator-title { + background-color: #0049B5; + height: 35px; } - .city-list li { - list-style-type: none; + .sidebar-separator { + background-color: #0049B5; + height: 25px; + } + .logo-separator { + background-color: #0049B5; + height: 60px; + } + + /* Closed submenu icon */ + #sidebar-container .list-group .list-group-item[aria-expanded="false"] .submenu-icon::after { + content: " \f0d7"; + font-family: FontAwesome; + display: inline; + text-align: right; + padding-left: 10px; + } + + /* Opened submenu icon */ + #sidebar-container .list-group .list-group-item[aria-expanded="true"] .submenu-icon::after { + content: " \f0da"; + font-family: FontAwesome; + display: inline; + text-align: right; + padding-left: 10px; } @@ -207,18 +192,119 @@
-
- + -
-
- - search -
+
+
@@ -493,7 +579,7 @@

CAR PARK APPLICATION

-
+

Car Park Locations

@@ -535,10 +621,7 @@

Car Park Locations

-

-
    -
@@ -556,7 +639,54 @@

- + + + \ No newline at end of file From eb9e9e3a4733ee4be880eed0119aba14c225444f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Oct 2019 12:09:59 +0100 Subject: [PATCH 027/121] meerging --- css/Desktop5.css | 40 +++++++++-- demographics.html | 66 +++++++++--------- js/desktop5.js | 172 ++++++++++++++++++++++++---------------------- 3 files changed, 157 insertions(+), 121 deletions(-) diff --git a/css/Desktop5.css b/css/Desktop5.css index 504ee74..e6612da 100644 --- a/css/Desktop5.css +++ b/css/Desktop5.css @@ -94,13 +94,26 @@ body { padding-bottom: 14px; } +a:hover { + text-decoration: none; +} .options { font-size: 20px; line-height: 23px; color: #777777; margin-left: 75px; - margin-bottom: 0; + margin-bottom: -14px; + padding-bottom: 14px; +} + +.options:hover { + border-bottom: 4px solid #1A73E8; +} + +.options1 { + border-bottom: 4px solid #1A73E8; + padding-bottom: 10px; } .desktop5-charts { @@ -121,7 +134,10 @@ body { box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); height: 100%; width: 100%; - margin-left: 8px; +} + +.top-padding { + padding-left: 8px; } .container-fluid { @@ -180,8 +196,8 @@ body { } .first-icons { - padding-left: 82px; - padding-right: 82px; + padding-left: 62px; + padding-right: 62px; display: flex; justify-content: space-between; margin-top: 41px; @@ -196,7 +212,7 @@ body { } .fa-instagram { - color: rgb(146, 54, 105) + color: #C21975; } .fa-facebook-square { @@ -207,15 +223,20 @@ body { color: red; } +.fa-reddit { + color: orangered; +} + .coll { - background-color: #F6F6F6; + /* background-color: #F6F6F6; */ + padding-left: 0; + padding-right: 0; } .card { background: #FEFEFE; } - .card .card-header { border-bottom: solid 1px #ccc; text-align: left; @@ -254,6 +275,11 @@ body { margin-right: 20px; } + .options { + margin-bottom: 0px; + padding-bottom: 0px; + } + .first-icons { margin-left: 20px; margin-right: 20px; diff --git a/demographics.html b/demographics.html index 02dede2..c2c8045 100644 --- a/demographics.html +++ b/demographics.html @@ -124,7 +124,7 @@
CAR PARK APPLICATION
-

New Users

+

New Users

Existing Users

@@ -178,7 +178,7 @@
CAR PARK APPLICATION
- +
@@ -188,41 +188,43 @@
CAR PARK APPLICATION
-
- -
-
-
-
Car Park Locations
-
-
-
-
+
+
+
+
Car Park Locations
-
-
- - List - - Maryland, Lagos - Lekki, Lagos - Gwarimpa, Abuja - Wuse, Abuja - Maitama, Abuja - wuse 2, Abuja - Oshodi, Lagos - Apapa, Lagos - Ikeja, Lagos +
+
+
+
+
+
+ + List + + Maryland, Lagos + Lekki, Lagos + Gwarimpa, Abuja + Wuse, Abuja + Maitama, Abuja + wuse 2, Abuja + Oshodi, Lagos + Apapa, Lagos + Ikeja, Lagos +
+
- + + +
- -
+ +
@@ -257,7 +259,7 @@
Car Park Locations
}); - diff --git a/js/desktop5.js b/js/desktop5.js index b60165b..96a4fb9 100644 --- a/js/desktop5.js +++ b/js/desktop5.js @@ -1,84 +1,92 @@ -// Load google charts -google.charts.load('current', {'packages':['corechart']}); -google.charts.setOnLoadCallback(drawChart); - -// Draw the chart and set the chart values -function drawChart() { - var data = google.visualization.arrayToDataTable([ - ['Task', 'Hours per Day'], - ['Male', 9], - ['Female', 27], -]); - - // Optional; add a title and set the width and height of the chart - var options = {'title':'Gender', 'width':150, 'height':106, colors: ['#F0C419', '#71C285']}; - - // Display the chart inside the
element with id="piechart" - var chart = new google.visualization.PieChart(document.getElementById('piechart1')); - chart.draw(data, options); +// // Load google charts +// google.charts.load('current', {'packages':['corechart']}); +// google.charts.setOnLoadCallback(drawChart); + +// // Draw the chart and set the chart values +// function drawChart() { +// var data = google.visualization.arrayToDataTable([ +// ['Task', 'Hours per Day'], +// ['Male', 9], +// ['Female', 27], +// ]); + +// // Optional; add a title and set the width and height of the chart +// var options = {'title':'Gender', 'width':150, 'height':106, colors: ['#F0C419', '#71C285']}; + +// // Display the chart inside the
element with id="piechart" +// var chart = new google.visualization.PieChart(document.getElementById('piechart1')); +// chart.draw(data, options); +// } + + +// // chart 2 +// google.charts.load('current', {'packages':['corechart']}); +// google.charts.setOnLoadCallback(drawChart2); + +// // Draw the chart and set the chart values +// function drawChart2() { +// var data = google.visualization.arrayToDataTable([ +// ['Task', 'Hours per Day'], +// ['Abuja', 9], +// ['Lagos', 5], +// ['Jos', 22] +// ]); + +// // Optional; add a title and set the width and height of the chart +// var options = {'title':'Location', 'width':150, 'height':106, colors: ['#F0C419', '#71C285', '#556080']}; + +// // Display the chart inside the
element with id="piechart" +// var chart = new google.visualization.PieChart(document.getElementById('piechart2')); +// chart.draw(data, options); +// } + +// // chart 3 +// google.charts.load('current', {'packages':['corechart']}); +// google.charts.setOnLoadCallback(drawChart3); + +// // Draw the chart and set the chart values +// function drawChart3() { +// var data = google.visualization.arrayToDataTable([ +// ['Task', 'Hours per Day'], +// ['Airtel', 4], +// ['MTN', 32], +// ]); + +// // Optional; add a title and set the width and height of the chart +// var options = {'title':'Mobile Network', 'width':150, 'height':106, colors: ['#F0C419', '#F0785A']}; + +// // Display the chart inside the
element with id="piechart" +// var chart = new google.visualization.PieChart(document.getElementById('piechart3')); +// chart.draw(data, options); +// } + + +// // chart 4 +// google.charts.load('current', {'packages':['corechart']}); +// google.charts.setOnLoadCallback(drawChart4); + +// // Draw the chart and set the chart values +// function drawChart4() { +// var data = google.visualization.arrayToDataTable([ +// ['Task', 'Hours per Day'], +// ['IOS', 8], +// ['Android', 28], +// ]); + +// // Optional; add a title and set the width and height of the chart +// var options = {'title':'Phone', 'width':150, 'height':106, colors: ['#B771C2', '#19F0F0']}; + +// // Display the chart inside the
element with id="piechart" +// var chart = new google.visualization.PieChart(document.getElementById('piechart4')); +// chart.draw(data, options); +// } + + +const options = document.querySelectorAll('.options') + +function put() { + options.forEach(cur => cur.classList.remove('options1')) + this.classList.add('options1') } - -// chart 2 -google.charts.load('current', {'packages':['corechart']}); -google.charts.setOnLoadCallback(drawChart2); - -// Draw the chart and set the chart values -function drawChart2() { - var data = google.visualization.arrayToDataTable([ - ['Task', 'Hours per Day'], - ['Abuja', 9], - ['Lagos', 5], - ['Jos', 22] -]); - - // Optional; add a title and set the width and height of the chart - var options = {'title':'Location', 'width':150, 'height':106, colors: ['#F0C419', '#71C285', '#556080']}; - - // Display the chart inside the
element with id="piechart" - var chart = new google.visualization.PieChart(document.getElementById('piechart2')); - chart.draw(data, options); -} - -// chart 3 -google.charts.load('current', {'packages':['corechart']}); -google.charts.setOnLoadCallback(drawChart3); - -// Draw the chart and set the chart values -function drawChart3() { - var data = google.visualization.arrayToDataTable([ - ['Task', 'Hours per Day'], - ['Airtel', 4], - ['MTN', 32], -]); - - // Optional; add a title and set the width and height of the chart - var options = {'title':'Mobile Network', 'width':150, 'height':106, colors: ['#F0C419', '#F0785A']}; - - // Display the chart inside the
element with id="piechart" - var chart = new google.visualization.PieChart(document.getElementById('piechart3')); - chart.draw(data, options); -} - - -// chart 4 -google.charts.load('current', {'packages':['corechart']}); -google.charts.setOnLoadCallback(drawChart4); - -// Draw the chart and set the chart values -function drawChart4() { - var data = google.visualization.arrayToDataTable([ - ['Task', 'Hours per Day'], - ['IOS', 8], - ['Android', 28], -]); - - // Optional; add a title and set the width and height of the chart - var options = {'title':'Phone', 'width':150, 'height':106, colors: ['#B771C2', '#19F0F0']}; - - // Display the chart inside the
element with id="piechart" - var chart = new google.visualization.PieChart(document.getElementById('piechart4')); - chart.draw(data, options); -} - - +options.forEach(cur => cur.addEventListener('click', put)) \ No newline at end of file From 8bfe31254fe120f67081b38cbbf06623e78d8afa Mon Sep 17 00:00:00 2001 From: Faruq Date: Thu, 24 Oct 2019 12:18:39 +0100 Subject: [PATCH 028/121] Rename index.html to newUsers.html --- index.html => newUsers.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename index.html => newUsers.html (100%) diff --git a/index.html b/newUsers.html similarity index 100% rename from index.html rename to newUsers.html From 248c9e3f3a5d412c7894452807f7651abfff22a3 Mon Sep 17 00:00:00 2001 From: Faruq Date: Thu, 24 Oct 2019 12:22:29 +0100 Subject: [PATCH 029/121] Delete newUsers.html --- newUsers.html | 758 -------------------------------------------------- 1 file changed, 758 deletions(-) delete mode 100644 newUsers.html diff --git a/newUsers.html b/newUsers.html deleted file mode 100644 index 2527028..0000000 --- a/newUsers.html +++ /dev/null @@ -1,758 +0,0 @@ - - - - - - - - - - - Car Park - New Users - - - - - - -
- -
-
- -
-
- - -
-
- -
-
-

Welcome back Admin

-

CAR PARK APPLICATION

-
-
-
-
- -
-
- Overview - Analytics - Demographics -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-

New Users

- 250 -
- - 		-
- - Print -
- - 		-
- - Download -
- - 		-
- <Go back -
- -
-

1. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
-

2. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
-

3. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
-

4. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
-

5. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
-
- -
-
- - -
-
-
-

Car Park Locations

-
-
-
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
List View
Maryland, Lagos
Lekki, Lagos
Gwarimpa, Abuja
Wuse, Abuja
Maitama, Abuja
Wuse, Abuja -
-

-
    - -
-
-
-
- - - - - - - -
-
- -
- -
- - - - - - - - - From b74d6e55bced50311e60095f5dd6114fdfef6f0f Mon Sep 17 00:00:00 2001 From: faruq2 Date: Thu, 24 Oct 2019 12:29:01 +0100 Subject: [PATCH 030/121] Added new nav --- newUsers.html | 692 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 692 insertions(+) create mode 100644 newUsers.html diff --git a/newUsers.html b/newUsers.html new file mode 100644 index 0000000..d1042ed --- /dev/null +++ b/newUsers.html @@ -0,0 +1,692 @@ + + + + + + + + + + + Car Park - New Users + + + + + + +
+
+ + +
+ +
+ +
+
+

Welcome back Admin

+

CAR PARK APPLICATION

+
+
+
+
+ +
+
+ Overview + Analytics + Demographics +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

New Users

+ 250 +
+ + 		+
+ + Print +
+ + 		+
+ + Download +
+ + 		+
+ <Go back +
+ +
+

1. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+

2. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+

3. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+

4. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+

5. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+
+ +
+
+ + +
+
+
+

Car Park Locations

+
+
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
List View
Maryland, Lagos
Lekki, Lagos
Gwarimpa, Abuja
Wuse, Abuja
Maitama, Abuja
Wuse, Abuja +
+ +
+
+
+ + + + + + + +
+
+ +
+ + + + + + + \ No newline at end of file From c5a6c8975cda2885f19fc9c4eece0d510b6895d9 Mon Sep 17 00:00:00 2001 From: Taofeeq-deru <54284970+Taofeeq-deru@users.noreply.github.com> Date: Thu, 24 Oct 2019 12:44:07 +0100 Subject: [PATCH 031/121] added new nav --- desktop9.html | 787 +++++++++++++++++++++++++------------------------- 1 file changed, 399 insertions(+), 388 deletions(-) diff --git a/desktop9.html b/desktop9.html index 68a3ff0..8afb713 100644 --- a/desktop9.html +++ b/desktop9.html @@ -1,388 +1,399 @@ - - - - - - - - - - - Car Park Admin - - -
-
- - - -
- - -
-
-

Welcome back Admin

-
CAR PARK APPLICATION
-
-
- - -
-
- -
-
- -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Issues - - - - Print - print Download - Go Back -
1. Wale Johnson - - -  

23rd October, 2019

 - - - - - -

Samsung S7

 - - -

Lekki, Lagos

2. Wale Johnson - - -  

23rd October, 2019

 - - - - - -

Samsung S7

 - - -

Ikeja, Lagos

3. Wale Johnson - - -  

23rd October, 2019

 - - - - - -

Samsung S7

 - - -

MaryLand, Lagos

4. Wale Johnson - - -  

23rd October, 2019

 - - - - - -

Samsung S7

 - - -

Mile 2, Lagos

-
-
-
- -
-
-
- - -
-

car park locations

- -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - -
-

list view

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- -
-
- -
-
-
- -
-
-
- - - - - - - - - - + + + + + + + Car Park Admin + + + + + + +
+
+ + + +
+ + +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
+ +
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Issues + + + Printprint Download Go Back
1. Wale Johnson + + +  

23rd October, 2019

 + + + + + +

Samsung S7

 + + +

Lekki, Lagos

2. Wale Johnson + + +  

23rd October, 2019

 + + + + + +

Samsung S7

 + + +

Ikeja, Lagos

3. Wale Johnson + + +  

23rd October, 2019

 + + + + + +

Samsung S7

 + + +

MaryLand, Lagos

4. Wale Johnson + + +  

23rd October, 2019

 + + + + + +

Samsung S7

 + + +

Mile 2, Lagos

+
+
+
+ +
+

car park locations

+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+

list view

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+
+ + +
+
+
+
+ + + + + + + \ No newline at end of file From 9170d097c4e7ddd1efeb479ae463a33b081aadb7 Mon Sep 17 00:00:00 2001 From: Taofeeq-deru <54284970+Taofeeq-deru@users.noreply.github.com> Date: Thu, 24 Oct 2019 12:44:40 +0100 Subject: [PATCH 032/121] styles for new nav --- css/desktop-9.css | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/css/desktop-9.css b/css/desktop-9.css index e980f1d..c33bcbe 100644 --- a/css/desktop-9.css +++ b/css/desktop-9.css @@ -7,7 +7,7 @@ body{ } #body-row { margin-left:0; - margin-right: 0; + margin-right:0; } #sidebar-container { min-height: 100vh; @@ -68,7 +68,7 @@ display: inline; text-align: right; padding-left: 10px; } -section #overviewTabs .nav-border { +/* section #overviewTabs .nav-border { border-bottom: 1px solid #ccc; box-shadow: 0 1px #ccc; background: #fff; @@ -90,7 +90,7 @@ section #overviewTabs .nav-pills .nav-text.active, .nav-pills .show>.nav-text { section #overviewTabs .nav-pills .nav-text { border-radius: 0px; -} +} */ .container { background: #fff; /* margin: 15px 15px 15px 15px; */ @@ -98,21 +98,25 @@ section #overviewTabs .nav-pills .nav-text { overflow-y: auto; } -section #overviewTabs thead, time, .fa-calendar { +#overviewTabs thead, time, .fa-calendar { color: #777777; } -section #overviewTabs .badge-primary { +#overviewTabs .badge-primary { border-radius: 50px; } -section #overviewTabs td img, .fa-calendar{ +#overviewTabs td img, .fa-calendar{ width: 15px; height: 15px; } -section #overviewTabs td{ +#overviewTabs td{ color: #777777; } +#overviewTabs thead td{ + color: rgba(119, 119, 119, 0.5); + font-weight: 500; +} .makeFlex{ display: flex; flex-flow: row wrap; @@ -133,6 +137,7 @@ section #overviewTabs td{ #carParks{ background: #fff; max-width: 95%; + /* margin-bottom: 1em; */ } #carParks h1{ text-transform: capitalize; @@ -141,6 +146,7 @@ section #overviewTabs td{ padding: 0.3em; margin-left: 0.5px; color: #777777; + font-weight: 500; } #listView h2{ background: #f7f7f7; @@ -149,6 +155,7 @@ section #overviewTabs td{ border: 1px solid #c7c6c6; padding: 0.3em; color: #777777; + font-weight: 500; } #listTable table td{ border: 1px solid #c7c6c6; @@ -183,9 +190,9 @@ section #overviewTabs td{ #listTable::-webkit-scrollbar-thumb:hover { background: rgb(23, 23, 253); } -#demo{ +/* #demo{ height: 0.5em; -} +} */ @media screen and (max-width: 49em){ .city{ margin: 0; From 10329839c026bfa4fc639ed2493cd0124d6d490d Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Oct 2019 12:46:49 +0100 Subject: [PATCH 033/121] renamed-file --- css/Desktop5.css | 42 +++---- demographics.html | 288 ++++++++++++++++++++++++++-------------------- js/desktop5.js | 164 +++++++++++++------------- navNew.html | 235 ------------------------------------- 4 files changed, 268 insertions(+), 461 deletions(-) delete mode 100644 navNew.html diff --git a/css/Desktop5.css b/css/Desktop5.css index e6612da..65368f8 100644 --- a/css/Desktop5.css +++ b/css/Desktop5.css @@ -1,10 +1,9 @@ #body-row { - margin-left: 0; - margin-right: 0; + margin-left:0; + margin-right:0; } - #sidebar-container { - min-height: 100vh; + min-height: 100vh; background-color: #0049B5; padding: 0; } @@ -13,7 +12,6 @@ .sidebar-expanded { width: 230px; } - .sidebar-collapsed { width: 60px; } @@ -29,7 +27,6 @@ height: 45px; padding-left: 30px; } - .sidebar-submenu { font-size: 0.9rem; } @@ -39,33 +36,30 @@ background-color: #0049B5; height: 35px; } - .sidebar-separator { background-color: #0049B5; height: 25px; } - .logo-separator { - background-color: #0049B5; + background-color: #0049B5; height: 60px; } /* Closed submenu icon */ #sidebar-container .list-group .list-group-item[aria-expanded="false"] .submenu-icon::after { - content: " \f0d7"; - font-family: FontAwesome; - display: inline; - text-align: right; - padding-left: 10px; +content: " \f0d7"; +font-family: FontAwesome; +display: inline; +text-align: right; +padding-left: 10px; } - /* Opened submenu icon */ #sidebar-container .list-group .list-group-item[aria-expanded="true"] .submenu-icon::after { - content: " \f0da"; - font-family: FontAwesome; - display: inline; - text-align: right; - padding-left: 10px; +content: " \f0da"; +font-family: FontAwesome; +display: inline; +text-align: right; +padding-left: 10px; } * { @@ -256,6 +250,10 @@ a:hover { margin-left: 0; } + .top-padding { + padding-left: 0; + } + .first-icons { margin-left: 69px; @@ -275,6 +273,8 @@ a:hover { margin-right: 20px; } + + .options { margin-bottom: 0px; padding-bottom: 0px; @@ -319,7 +319,7 @@ a:hover { } } -@media only screen and (max-width: 848px) { +@media only screen and (max-width: 664px) { .chart-section { justify-content: space-around; } diff --git a/demographics.html b/demographics.html index c2c8045..cc77a13 100644 --- a/demographics.html +++ b/demographics.html @@ -10,11 +10,12 @@ + -
-
+
+
- @@ -84,11 +84,26 @@ + + + Settings + Cancelation Policy + + +
-
+
- -
-
- -

New Users

- - -

Existing Users

- - -

Issues

- - -

CarPark

- -
- -
-
-
-
-
-

October, 2019

- -
- -
-
-
-
-
-
-
-
-
+
+ +
+
+
+
+ +

New Users

+ + +

Existing Users

+ + +

Issues

+ + +

CarPark

+ +
+ +
+
+
+
+
+

October, 2019

+
-
-
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
- -
-
-
-
- -
-
- -
- - - +
+
+
+
-
- - - +
+ +
+ + + +
+
+ + + +
+
-
-
- -
-
-
-
Car Park Locations
-
-
-
-
+ +
+
+
+
Car Park Locations
-
-
- - List - - Maryland, Lagos - Lekki, Lagos - Gwarimpa, Abuja - Wuse, Abuja - Maitama, Abuja - wuse 2, Abuja - Oshodi, Lagos - Apapa, Lagos - Ikeja, Lagos +
+
+
+
+
+
+ + List + + Maryland, Lagos + Lekki, Lagos + Gwarimpa, Abuja + Wuse, Abuja + Maitama, Abuja + wuse 2, Abuja + Oshodi, Lagos + Apapa, Lagos + Ikeja, Lagos +
+
- + + +
- -
-
- -
-
-
- - - - + + + + - - - + + + + + \ No newline at end of file diff --git a/js/desktop5.js b/js/desktop5.js index 96a4fb9..8822493 100644 --- a/js/desktop5.js +++ b/js/desktop5.js @@ -1,85 +1,85 @@ -// // Load google charts -// google.charts.load('current', {'packages':['corechart']}); -// google.charts.setOnLoadCallback(drawChart); - -// // Draw the chart and set the chart values -// function drawChart() { -// var data = google.visualization.arrayToDataTable([ -// ['Task', 'Hours per Day'], -// ['Male', 9], -// ['Female', 27], -// ]); - -// // Optional; add a title and set the width and height of the chart -// var options = {'title':'Gender', 'width':150, 'height':106, colors: ['#F0C419', '#71C285']}; - -// // Display the chart inside the
element with id="piechart" -// var chart = new google.visualization.PieChart(document.getElementById('piechart1')); -// chart.draw(data, options); -// } - - -// // chart 2 -// google.charts.load('current', {'packages':['corechart']}); -// google.charts.setOnLoadCallback(drawChart2); - -// // Draw the chart and set the chart values -// function drawChart2() { -// var data = google.visualization.arrayToDataTable([ -// ['Task', 'Hours per Day'], -// ['Abuja', 9], -// ['Lagos', 5], -// ['Jos', 22] -// ]); - -// // Optional; add a title and set the width and height of the chart -// var options = {'title':'Location', 'width':150, 'height':106, colors: ['#F0C419', '#71C285', '#556080']}; - -// // Display the chart inside the
element with id="piechart" -// var chart = new google.visualization.PieChart(document.getElementById('piechart2')); -// chart.draw(data, options); -// } - -// // chart 3 -// google.charts.load('current', {'packages':['corechart']}); -// google.charts.setOnLoadCallback(drawChart3); - -// // Draw the chart and set the chart values -// function drawChart3() { -// var data = google.visualization.arrayToDataTable([ -// ['Task', 'Hours per Day'], -// ['Airtel', 4], -// ['MTN', 32], -// ]); - -// // Optional; add a title and set the width and height of the chart -// var options = {'title':'Mobile Network', 'width':150, 'height':106, colors: ['#F0C419', '#F0785A']}; - -// // Display the chart inside the
element with id="piechart" -// var chart = new google.visualization.PieChart(document.getElementById('piechart3')); -// chart.draw(data, options); -// } - - -// // chart 4 -// google.charts.load('current', {'packages':['corechart']}); -// google.charts.setOnLoadCallback(drawChart4); - -// // Draw the chart and set the chart values -// function drawChart4() { -// var data = google.visualization.arrayToDataTable([ -// ['Task', 'Hours per Day'], -// ['IOS', 8], -// ['Android', 28], -// ]); - -// // Optional; add a title and set the width and height of the chart -// var options = {'title':'Phone', 'width':150, 'height':106, colors: ['#B771C2', '#19F0F0']}; - -// // Display the chart inside the
element with id="piechart" -// var chart = new google.visualization.PieChart(document.getElementById('piechart4')); -// chart.draw(data, options); -// } +// Load google charts +google.charts.load('current', {'packages':['corechart']}); +google.charts.setOnLoadCallback(drawChart); + +// Draw the chart and set the chart values +function drawChart() { + var data = google.visualization.arrayToDataTable([ + ['Task', 'Hours per Day'], + ['Male', 9], + ['Female', 27], +]); + + // Optional; add a title and set the width and height of the chart + var options = {'title':'Gender', 'width':150, 'height':106, colors: ['#F0C419', '#71C285']}; + + // Display the chart inside the
element with id="piechart" + var chart = new google.visualization.PieChart(document.getElementById('piechart1')); + chart.draw(data, options); +} + + +// chart 2 +google.charts.load('current', {'packages':['corechart']}); +google.charts.setOnLoadCallback(drawChart2); + +// Draw the chart and set the chart values +function drawChart2() { + var data = google.visualization.arrayToDataTable([ + ['Task', 'Hours per Day'], + ['Abuja', 9], + ['Lagos', 5], + ['Jos', 22] +]); + + // Optional; add a title and set the width and height of the chart + var options = {'title':'Location', 'width':150, 'height':106, colors: ['#F0C419', '#71C285', '#556080']}; + + // Display the chart inside the
element with id="piechart" + var chart = new google.visualization.PieChart(document.getElementById('piechart2')); + chart.draw(data, options); +} + +// chart 3 +google.charts.load('current', {'packages':['corechart']}); +google.charts.setOnLoadCallback(drawChart3); + +// Draw the chart and set the chart values +function drawChart3() { + var data = google.visualization.arrayToDataTable([ + ['Task', 'Hours per Day'], + ['Airtel', 4], + ['MTN', 32], +]); + + // Optional; add a title and set the width and height of the chart + var options = {'title':'Mobile Network', 'width':150, 'height':106, colors: ['#F0C419', '#F0785A']}; + + // Display the chart inside the
element with id="piechart" + var chart = new google.visualization.PieChart(document.getElementById('piechart3')); + chart.draw(data, options); +} + + +// chart 4 +google.charts.load('current', {'packages':['corechart']}); +google.charts.setOnLoadCallback(drawChart4); + +// Draw the chart and set the chart values +function drawChart4() { + var data = google.visualization.arrayToDataTable([ + ['Task', 'Hours per Day'], + ['IOS', 8], + ['Android', 28], +]); + + // Optional; add a title and set the width and height of the chart + var options = {'title':'Phone', 'width':150, 'height':106, colors: ['#B771C2', '#19F0F0']}; + + // Display the chart inside the
element with id="piechart" + var chart = new google.visualization.PieChart(document.getElementById('piechart4')); + chart.draw(data, options); +} const options = document.querySelectorAll('.options') diff --git a/navNew.html b/navNew.html deleted file mode 100644 index 60743e2..0000000 --- a/navNew.html +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - Car Park Admin - - - - - - -
-
- - -
- -
-
-

Welcome back Admin

-
CAR PARK APPLICATION
-
-
-
- -
-
-

ADD CONTENTS HERE!!!

-
-
-
- - - - - - - \ No newline at end of file From e8a2e84fc268caff2f782cdf2a1ec79910177036 Mon Sep 17 00:00:00 2001 From: Hassan Olakunle Date: Thu, 24 Oct 2019 12:49:28 +0100 Subject: [PATCH 034/121] merging navbar with settings-payment history --- settings-payment.html | 138 ++++++++++++++++++++++++++---------------- 1 file changed, 87 insertions(+), 51 deletions(-) diff --git a/settings-payment.html b/settings-payment.html index 87661b8..9e19ba7 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -8,10 +8,6 @@ - - - - -
-
+
+
- Dashboard @@ -101,9 +96,11 @@ + Apps Apps - + + @@ -126,11 +123,21 @@ + + + Settings + Cancelation Policy + + +
-
+
- - @@ -255,7 +267,8 @@

Payment History

// Hide submenus $('#body-row .collapse').collapse('hide'); // Collapse/Expand icon -$('#collapse-icon').addClass('fa-angle-double-left'); +$('#collapse-icon').addClass('fa-angle-double-left'); +$('#collapse-menu').addClass('fa-angle-double-right'); // Collapse click $('[data-toggle=sidebar-colapse]').click(function() { SidebarCollapse(); @@ -267,9 +280,32 @@

Payment History

$('#sidebar-container').toggleClass('sidebar-expanded sidebar-collapsed'); // Collapse/Expand icon - $('#collapse-icon').toggleClass('fa-angle-double-left fa-angle-double-right'); + $('#collapse-icon').toggleClass('fa-angle-double-right fa-angle-double-left'); } }); +// Collapse click +$('[data-toggle=sidebar-container]').click(function() { + SidemenuCollapse(); +}); +//Collapse Side Menu +function SidemenuCollapse () { + $('#sidebar-container').toggleClass('d-none'); + // Collapse/Expand icon + $('#collapse-menu').toggleClass('fa-angle-double-right fa-angle-double-left'); +} +//Hide Menu on Load +$(document).ready(function(){ + $('#sidebar-container').toggleClass('d-none'); +}) +$(document).ready(function(){ + $('.menu-collapsed').toggleClass('d-none'); + $('.sidebar-submenu').toggleClass('d-none'); + $('.submenu-icon').toggleClass('d-none'); + $('#sidebar-container').toggleClass('sidebar-expanded sidebar-collapsed'); + + // Collapse/Expand icon + $('#collapse-icon').toggleClass('fa-angle-double-left fa-angle-double-right'); +}) - \ No newline at end of file + \ No newline at end of file From 0945da6cb36c4bae40ac40be01fd5b22b05b1b13 Mon Sep 17 00:00:00 2001 From: TechieTee Date: Thu, 24 Oct 2019 13:29:21 +0100 Subject: [PATCH 035/121] modification of fonts, images and buttons by Dennis --- logo.png => images/login-logo.png | Bin map.JPG => images/login-map.JPG | Bin login.html | 108 ++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+) rename logo.png => images/login-logo.png (100%) rename map.JPG => images/login-map.JPG (100%) create mode 100644 login.html diff --git a/logo.png b/images/login-logo.png similarity index 100% rename from logo.png rename to images/login-logo.png diff --git a/map.JPG b/images/login-map.JPG similarity index 100% rename from map.JPG rename to images/login-map.JPG diff --git a/login.html b/login.html new file mode 100644 index 0000000..a45d4ee --- /dev/null +++ b/login.html @@ -0,0 +1,108 @@ + + + + + + + + + + Signin Page + + + +
+ +

Admin Login

+
+ + + +
+ + +
+
+ + Forgot Password? +
+
+
+
+ +
+ +
+ map-background +
+ car-park-logo +
+
+ + + From 335d3886f5c3100e9735f0cf46b199f0b982e931 Mon Sep 17 00:00:00 2001 From: Hassan Olakunle Date: Thu, 24 Oct 2019 13:41:03 +0100 Subject: [PATCH 036/121] merging navbar with setting-payment-history page --- css/main.css | 139 ---------------------------------------- settings-payment.html | 146 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 145 insertions(+), 140 deletions(-) delete mode 100644 css/main.css diff --git a/css/main.css b/css/main.css deleted file mode 100644 index ae36ae2..0000000 --- a/css/main.css +++ /dev/null @@ -1,139 +0,0 @@ -*{ - box-sizing: border-box; -} -html{ - height: 100%; -} -.container{ - margin-top: 3rem; - border: 2px solid #ccc !important; - border-radius: 5px; -} -.header{ - width: 100%; - height: 100%; - background: #FFFFFF; - height: 45px; - border-bottom: 2px solid #ccc; -} -.nav-items{ - width: 50%; - list-style: none; - display: flex; - padding: 0 5rem; - align-items: flex-start; - justify-content: space-around; -} -.nav-item{ - padding: 0.5rem 0rem; -} -.nav-item a{ - text-decoration: none; - color: #777777; -} -.nav-item a:hover{ - color: #1A73E8; -} -.active{ - border-bottom: 2px solid #1A73E8; -} -.payment-header{ - margin: 1rem 0 !important; -} -.desc{ - font-size: 0.8rem !important; - color: #66788A !important; - padding-left: 1.5rem; -} -.has-search .form-control { - padding-left: 2.375rem; -} -.form-control{ - width: 70% !important; -} -.has-search .form-control-feedback { - position: absolute; - z-index: 2; - display: block; - width: 2.375rem; - height: 2.375rem; - line-height: 2.375rem; - text-align: center; - pointer-events: none; - color: #aaa; -} -.searchbtn{ - height: 40px !important; -} -.search{ - margin: 0.8rem 0 1rem 30rem!important; - float: right !important; -} - -@media (max-width: 380px){ - body{ - position: absolute; - } - .w-100{ - width: 20% !important; - } - .nav-items{ - width: 70%; - } - .container{ - margin-top: 3rem ; - border: 0px !important; - border-radius: 0px !important; - } - .search{ - margin-top: 0; - width: 100% !important; - } - .searchText{ - text-align: center !important; - } - .btn-group{ - padding-bottom: 2rem !important; - } - form-group{ - margin-bottom: 0rem; - } -} -@media (max-width: 414px){ - body{ - position: absolute; - } - .nav-items{ - width: 100%; - } - .container{ - margin-top: 3rem ; - border: 0px !important; - border-radius: 0px !important; - } - .search{ - margin-top: 0; - width: 100% !important; - } - .searchText{ - text-align: center !important; - } - .btn-group{ - padding-bottom: 2rem !important; - } - form-group{ - margin-bottom: 0rem; - } -} -@media(max-width:768px){ - .search{ - width: 50%; - text-align: center; - margin-top: 1.2rem !important; - padding: 0px !important; - margin-left:200px ; - } - .btn-group{ - padding: 1rem 0; - } -} diff --git a/settings-payment.html b/settings-payment.html index 9e19ba7..518ca3b 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -8,7 +8,7 @@ - + + + +
+
+ + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
+
+ +
+
+

CANCELLATION AND MODIFICATION POLICY

+
    +
  • CARPARK provides the Client with two options (set out below) to cancel or modify a + reservation and how to get a refund.
    • + +
  • Cancellations and refunds vary according to the car park and type of reservation, + as the User will have seen in the terms and conditions for that car park and type + of reservation when making the reservation for that parking space.
    • + +
  • The cancellation and modification policy applicable to each reservation is detailed + in the legal conditions, in the confirmation email that the Client receives following + the completion of the purchasing process, and on the reservation receipt, which the + Client should validate on arrival at the car park.
    • +
+

Products with a policy of cancellation and modification before 23:59h (local time at the car park) + on the day before the date of arrival confirmed on the reservation or receipt:

+
    +
  • Clients may cancel or modify their stay before 23:59h on the day before their arrival. + Should the Client fail to show up at the car park, wish to cancel or modify the reservation + after 23:59h on the day before their arrival, or after the arrival time confirmed on the reservation, + they would not, in any such cases, be able to modify, cancel or claim a partial or total refund for + the purchase made.
    • +
+ +

Products with a flexible cancellation and modification policy, up to 1 hour before the arrival time + confirmed on the reservation or receipt:

+
    +
  • The Client may cancel or modify their reservation up to 1 hour before the time given at the + time of purchase and shown on the reservation receipt. Should the Client fail to show up at the car park, + wish to cancel or modify their reservation after the period permitted by the flexible cancellation policy, + which is only applicable to certain products, or after the arrival time shown on the receipt, + they would not be able to modify, cancel or claim a full or partial refund for the purchase made.
    • +
+ +

Products classified as monthly, quarterly, biannual and annual tickets:

+
    +
  • The Client may modify their monthly, quarterly, biannual or annual ticket reservation for free up until + 23:59h the day before their arrival at the car park.
    • + +
  • The Client may cancel their monthly, quarterly, biannual or annual ticket reservation up until 23:59h + the day following their arrival at the car park.
    • + +
  • By purchasing a monthly ticket with CARPARK with the car park determined by the length of stay – + the Client enjoys a discount on the usual price. Should the Client decide to cancel their monthly, + quarterly, biannual or annual ticket within the indicated time period, the Client understands and + accepts that they must pay the difference between the discounted price and the usual price for each + month of using the car park.
    • +
+
+
+
+ + + + + + + \ No newline at end of file From 9a84964840bd0959fa85f5c4063d9420ef86e5d0 Mon Sep 17 00:00:00 2001 From: "[dekiller_j]" <[iwaloyeo@gmail.com]> Date: Thu, 24 Oct 2019 18:16:02 +0100 Subject: [PATCH 038/121] Fixed page issues as regarding the table --- settings-payment.html | 175 +++++++++++++++++++++--------------------- 1 file changed, 87 insertions(+), 88 deletions(-) diff --git a/settings-payment.html b/settings-payment.html index 518ca3b..f239a5e 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -3,7 +3,8 @@ - + + Car Park Admin @@ -70,15 +71,16 @@ } /* css styling for the table */ - - *{ - box-sizing: border-box; +body{ + overflow-x: hidden !important; } html{ height: 100%; } .container{ - margin-top: 3rem; + margin-top: 2rem; + padding-left: 0; + padding-right: 0; border: 2px solid #ccc !important; border-radius: 5px; } @@ -91,11 +93,13 @@ } .nav-items{ width: 50%; + min-width: auto; + min-width: 345px; list-style: none; display: flex; - padding: 0 5rem; + padding: 0 3rem; align-items: flex-start; - justify-content: space-around; + justify-content: space-between; } .nav-item{ padding: 0.5rem 0rem; @@ -112,6 +116,7 @@ } .payment-header{ margin: 1rem 0 !important; + padding: 0rem 2rem; } .desc{ font-size: 0.8rem !important; @@ -139,82 +144,37 @@ height: 40px !important; } .search{ - margin: 0.8rem 0 1rem 30rem!important; - float: right !important; -} - -@media (max-width: 380px){ - body{ - position: absolute; - } - .w-100{ - width: 20% !important; - } - .nav-items{ - width: 70%; - } - .container{ - margin-top: 3rem ; - border: 0px !important; - border-radius: 0px !important; - } - .search{ - margin-top: 0; - width: 100% !important; - } - .searchText{ - text-align: center !important; - } - .btn-group{ - padding-bottom: 2rem !important; - } - form-group{ - margin-bottom: 0rem; - } + margin: 1rem; + clear: right; } -@media (max-width: 414px){ - body{ - position: absolute; - } - .nav-items{ - width: 100%; - } - .container{ - margin-top: 3rem ; - border: 0px !important; - border-radius: 0px !important; - } - .search{ - margin-top: 0; - width: 100% !important; - } - .searchText{ - text-align: center !important; - } - .btn-group{ - padding-bottom: 2rem !important; - } - form-group{ - margin-bottom: 0rem; - } +.table{ + padding: 0.8rem 1.2rem; + display: flex; + flex-direction: row; + justify-content: space-between; + flex-wrap: wrap; + width: 100%; + border-bottom: 2px solid #E4E7EB; + overflow-x: auto; } -@media(max-width:768px){ - .search{ - width: 50%; - text-align: center; - margin-top: 1.2rem !important; - padding: 0px !important; - margin-left:200px ; - } - .btn-group{ - padding: 1rem 0; - } +.table li, .table-header li{ + list-style: none; } - - - #pencil{ +#pencil{ margin-left:30px; color:gray; +} +@media only screen and (max-width: 375px) { + .search{ + margin: 1rem; + float: none !important; + } + .column { + display: flex; + flex-direction: column; + flex-basis: 100%; + flex: 1; +} } @@ -306,7 +266,7 @@
-

Welcome back Admin

+

Welcome back Admin

CAR PARK APPLICATION
@@ -329,7 +289,7 @@
CAR PARK APPLICATION
-
+

Payment History

Every payment details are made available here

@@ -341,15 +301,53 @@

Payment History


-
-

Search for people by

-
- - -
+
+

Search for people by

+
+ + +
+
+
+
    +
  • Date
    • +
  • Reference Number
    • +
  • Description
    • +
  • Amount
    • +
  • Payment Method
    • +
+
    +
  • 2/2/2/2020
    • +
  • ID2712JJJG
    • +
  • Park Fee
    • +
  • N20.00
    • +
  • Visa :
    • +
+
    +
  • 2/2/2/2020
    • +
  • ID2712JJJG
    • +
  • Park Fee
    • +
  • N20.00
    • +
  • Visa :
    • +
+
    +
  • 2/2/2/2020
    • +
  • ID2712JJJG
    • +
  • Park Fee
    • +
  • N20.00
    • +
  • Visa :
    • +
+
    +
  • 2/2/2/2020
    • +
  • ID2712JJJG
    • +
  • Park Fee
    • +
  • N20.00
    • +
  • Visa :
    • +
+ - + + From 12bbe558b17e74c6ba1532912d8523a743a3c97c Mon Sep 17 00:00:00 2001 From: faruq2 Date: Thu, 24 Oct 2019 18:30:28 +0100 Subject: [PATCH 039/121] Fixed sidebar issues --- newUsers.html | 883 ++++++++++++++++++++++++++------------------------ 1 file changed, 458 insertions(+), 425 deletions(-) diff --git a/newUsers.html b/newUsers.html index d1042ed..ef3f732 100644 --- a/newUsers.html +++ b/newUsers.html @@ -124,6 +124,7 @@ min-height: 100vh; background-color: #0049B5; padding: 0; + } /* Sidebar sizes when expanded and expanded */ @@ -184,469 +185,497 @@ text-align: right; padding-left: 10px; } + + @media (max-width: 768px) { + #sidebar-container { + position: fixed; + top: 0; + left: 0; + z-index: 2; + width:80%; + + } + #cancel{ + font-size: 2em; + cursor: pointer; + color: #fff; + } + .cancel-container{ + position: absolute; + top:0; + left:0; + } + + } -
-
- - -
- +
+ +
+
+

Welcome back Admin

+

CAR PARK APPLICATION

+
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-

New Users

- 250 -
- - 		-
- - Print -
- - 		-
- - Download -
- - 		-
- <Go back -
- -
-

1. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
-

2. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
-

3. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
-

4. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
-

5. Wale Johnson

- 		-
- -

23rd October,2019

-
- - 		-
- -

12:00:00

-
- - 		-
- -

Samsung S7

-
- - 		-
- - Ikeja, Lagos -
- -
+
+ +
+
+ Overview + Analytics + Demographics +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

New Users

+ 250 +
+ + 		+
+ + Print +
+ + 		+
+ + Download +
+ + 		+
+ <Go back +
+ +
+

1. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+

2. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+

3. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+

4. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+

5. Wale Johnson

+ 		+
+ +

23rd October,2019

+
+ + 		+
+ +

12:00:00

+
+ + 		+
+ +

Samsung S7

+
+ + 		+
+ + Ikeja, Lagos +
+ +
+
+
-
- -
-
-
-

Car Park Locations

+ +
+
+
+

Car Park Locations

+
-
-
-
- +
+
+ +
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
List View
Maryland, Lagos
Lekki, Lagos
Gwarimpa, Abuja
Wuse, Abuja
Maitama, Abuja
Wuse, Abuja -
- +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
List View
Maryland, Lagos
Lekki, Lagos
Gwarimpa, Abuja
Wuse, Abuja
Maitama, Abuja
Wuse, Abuja +
+ +
-
- + +
-
+
+ - + - + diff --git a/js/desktop5.js b/js/desktop5.js index 8822493..14561bf 100644 --- a/js/desktop5.js +++ b/js/desktop5.js @@ -1,92 +1,135 @@ -// Load google charts -google.charts.load('current', {'packages':['corechart']}); -google.charts.setOnLoadCallback(drawChart); - -// Draw the chart and set the chart values -function drawChart() { - var data = google.visualization.arrayToDataTable([ - ['Task', 'Hours per Day'], - ['Male', 9], - ['Female', 27], -]); - - // Optional; add a title and set the width and height of the chart - var options = {'title':'Gender', 'width':150, 'height':106, colors: ['#F0C419', '#71C285']}; - - // Display the chart inside the
element with id="piechart" - var chart = new google.visualization.PieChart(document.getElementById('piechart1')); - chart.draw(data, options); +const options = document.querySelectorAll('.options') + +function put() { + options.forEach(cur => cur.classList.remove('options1')) + this.classList.add('options1') } +options.forEach(cur => cur.addEventListener('click', put)) -// chart 2 -google.charts.load('current', {'packages':['corechart']}); -google.charts.setOnLoadCallback(drawChart2); - -// Draw the chart and set the chart values -function drawChart2() { - var data = google.visualization.arrayToDataTable([ - ['Task', 'Hours per Day'], - ['Abuja', 9], - ['Lagos', 5], - ['Jos', 22] -]); - - // Optional; add a title and set the width and height of the chart - var options = {'title':'Location', 'width':150, 'height':106, colors: ['#F0C419', '#71C285', '#556080']}; - - // Display the chart inside the
element with id="piechart" - var chart = new google.visualization.PieChart(document.getElementById('piechart2')); - chart.draw(data, options); -} -// chart 3 -google.charts.load('current', {'packages':['corechart']}); -google.charts.setOnLoadCallback(drawChart3); - -// Draw the chart and set the chart values -function drawChart3() { - var data = google.visualization.arrayToDataTable([ - ['Task', 'Hours per Day'], - ['Airtel', 4], - ['MTN', 32], -]); - - // Optional; add a title and set the width and height of the chart - var options = {'title':'Mobile Network', 'width':150, 'height':106, colors: ['#F0C419', '#F0785A']}; - - // Display the chart inside the
element with id="piechart" - var chart = new google.visualization.PieChart(document.getElementById('piechart3')); - chart.draw(data, options); -} -// chart 4 -google.charts.load('current', {'packages':['corechart']}); -google.charts.setOnLoadCallback(drawChart4); - -// Draw the chart and set the chart values -function drawChart4() { - var data = google.visualization.arrayToDataTable([ - ['Task', 'Hours per Day'], - ['IOS', 8], - ['Android', 28], -]); - - // Optional; add a title and set the width and height of the chart - var options = {'title':'Phone', 'width':150, 'height':106, colors: ['#B771C2', '#19F0F0']}; - - // Display the chart inside the
element with id="piechart" - var chart = new google.visualization.PieChart(document.getElementById('piechart4')); - chart.draw(data, options); -} -const options = document.querySelectorAll('.options') -function put() { - options.forEach(cur => cur.classList.remove('options1')) - this.classList.add('options1') -} +var ctx = document.getElementById('myChart').getContext('2d'); +var ctx2 = document.getElementById('myChart2').getContext('2d'); +var ctx3 = document.getElementById('myChart3').getContext('2d'); +var ctx4 = document.getElementById('myChart4').getContext('2d'); + + +var myChart = new Chart(ctx, { + type: 'pie', + data: { + labels: ['Male ', 'Female'], + datasets: [{ + label: '# of Votes', + data: [9, 27], + backgroundColor: [ + '#F0C419', + '#71C285' + ], + borderWidth: 1 + }] + }, + options: { + title: { + display: true, + text: 'Gender', + position: 'top' + }, + legend: { + display: true, + position: 'bottom', + } + } +}); + +// chart 2 + +var myChart2 = new Chart(ctx2, { + type: 'pie', + data: { + labels: ['Abuja', 'Lagos', 'Jos '], + datasets: [{ + label: '# of Votes', + data: [9, 5, 22], + backgroundColor: [ + '#F0C419', + '#71C285', + '#556080' + ], + borderWidth: 1 + }] + }, + options: { + title: { + display: true, + text: 'Location', + position: 'top' + }, + legend: { + display: true, + position: 'bottom', + } + } +}); + +// chart 3 + +var myChart3 = new Chart(ctx3, { + type: 'pie', + data: { + labels: ['Airtel', 'MTN'], + datasets: [{ + label: '# of Votes', + data: [4, 32], + backgroundColor: [ + '#F0C419', + '#F0785A' + ], + borderWidth: 1 + }] + }, + options: { + title: { + display: true, + text: 'Mobile Networks', + position: 'top' + }, + legend: { + display: true, + position: 'bottom', + } + } +}); + +// chart 4 -options.forEach(cur => cur.addEventListener('click', put)) \ No newline at end of file +var myChart4 = new Chart(ctx4, { + type: 'pie', + data: { + labels: ['IOS ', 'Android'], + datasets: [{ + label: '# of Votes', + data: [8, 28], + backgroundColor: [ + '#B771C2', + '#19F0F0' + ], + borderWidth: 1 + }] + }, + options: { + title: { + display: true, + text: 'Phone', + position: 'top' + }, + legend: { + display: true, + position: 'bottom', + } + } +}); \ No newline at end of file From 89d92e1ba7b22d2891f62a0966263cf2ec0dcde1 Mon Sep 17 00:00:00 2001 From: Kayode Gabriel Date: Thu, 24 Oct 2019 21:09:34 +0100 Subject: [PATCH 041/121] integrate new navbar --- mail_campaign.html | 115 +++++++++++++++++++++++++++++++-------------- 1 file changed, 80 insertions(+), 35 deletions(-) diff --git a/mail_campaign.html b/mail_campaign.html index 4d949e7..b9df25f 100644 --- a/mail_campaign.html +++ b/mail_campaign.html @@ -4,13 +4,14 @@ + + - - Mail -Campaign + Mail-Campaign + .max-width { + max-width: 98.5%; + } + .ml-reset { + margin-left: 0px; + } + .campaign { + margin-bottom: 3px; + } + -
-
+
+
- Dashboard @@ -253,19 +265,27 @@ + + + Settings + Cancelation Policy + + +
-
+
-
- -
-
+
+
+ +
+
+ +
+
    @@ -325,8 +352,7 @@
    CAR PARK APPLICATION

    Promo Code for App Download - October, 21 2019 - 21:00 + October, 21 2019 21:00

    1215 Recipient @@ -341,8 +367,7 @@

    CAR PARK APPLICATION

    Promo Code for App Download - October, 21 2019 - 21:00 + October, 21 2019 21:00

    1215 Recipient @@ -408,17 +433,12 @@

    Integrate with best Email Marketting Softwares
-
- -
+ +
- - - - - @@ -428,13 +448,13 @@
Integrate with best Email Marketting Softwares
$('#body-row .collapse').collapse('hide'); // Collapse/Expand icon -$('#collapse-icon').addClass('fa-angle-double-left'); +$('#collapse-icon').addClass('fa-angle-double-left'); +$('#collapse-menu').addClass('fa-angle-double-right'); // Collapse click $('[data-toggle=sidebar-colapse]').click(function() { SidebarCollapse(); }); - function SidebarCollapse () { $('.menu-collapsed').toggleClass('d-none'); $('.sidebar-submenu').toggleClass('d-none'); @@ -442,9 +462,34 @@
Integrate with best Email Marketting Softwares
$('#sidebar-container').toggleClass('sidebar-expanded sidebar-collapsed'); // Collapse/Expand icon - $('#collapse-icon').toggleClass('fa-angle-double-left fa-angle-double-right'); + $('#collapse-icon').toggleClass('fa-angle-double-right fa-angle-double-left'); } }); +// Collapse click +$('[data-toggle=sidebar-container]').click(function() { + SidemenuCollapse(); +}); +//Collapse Side Menu +function SidemenuCollapse () { + $('#sidebar-container').toggleClass('d-none'); + // Collapse/Expand icon + $('#collapse-menu').toggleClass('fa-angle-double-right fa-angle-double-left'); +} + +//Hide Menu on Load +$(document).ready(function(){ + $('#sidebar-container').toggleClass('d-none'); +}) +$(document).ready(function(){ + $('.menu-collapsed').toggleClass('d-none'); + $('.sidebar-submenu').toggleClass('d-none'); + $('.submenu-icon').toggleClass('d-none'); + $('#sidebar-container').toggleClass('sidebar-expanded sidebar-collapsed'); + + // Collapse/Expand icon + $('#collapse-icon').toggleClass('fa-angle-double-left fa-angle-double-right'); +}) + \ No newline at end of file From 98071e63cf9502f44f08b8d63d0008c10ab27e47 Mon Sep 17 00:00:00 2001 From: "[dekiller_j]" <[iwaloyeo@gmail.com]> Date: Thu, 24 Oct 2019 22:05:10 +0100 Subject: [PATCH 042/121] Page is completed and fully responsive --- settings-payment.html | 158 +++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 101 deletions(-) diff --git a/settings-payment.html b/settings-payment.html index f239a5e..8f88d3f 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -147,19 +147,6 @@ margin: 1rem; clear: right; } -.table{ - padding: 0.8rem 1.2rem; - display: flex; - flex-direction: row; - justify-content: space-between; - flex-wrap: wrap; - width: 100%; - border-bottom: 2px solid #E4E7EB; - overflow-x: auto; -} -.table li, .table-header li{ - list-style: none; -} #pencil{ margin-left:30px; color:gray; @@ -169,12 +156,25 @@ margin: 1rem; float: none !important; } + .desc{ + display: block !important; + padding: 1rem 0; + } + .form-group{ + margin-left: 2rem !important; + } + .searchText{ + padding: 2rem; + } + .btn-group{ + display: block !important; + } .column { display: flex; flex-direction: column; flex-basis: 100%; flex: 1; -} + } } @@ -308,93 +308,49 @@

Payment History

-
-
    -
  • Date
    • -
  • Reference Number
    • -
  • Description
    • -
  • Amount
    • -
  • Payment Method
    • -
-
    -
  • 2/2/2/2020
    • -
  • ID2712JJJG
    • -
  • Park Fee
    • -
  • N20.00
    • -
  • Visa :
    • -
-
    -
  • 2/2/2/2020
    • -
  • ID2712JJJG
    • -
  • Park Fee
    • -
  • N20.00
    • -
  • Visa :
    • -
-
    -
  • 2/2/2/2020
    • -
  • ID2712JJJG
    • -
  • Park Fee
    • -
  • N20.00
    • -
  • Visa :
    • -
-
    -
  • 2/2/2/2020
    • -
  • ID2712JJJG
    • -
  • Park Fee
    • -
  • N20.00
    • -
  • Visa :
    • -
-
- - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateReference NumberDescriptionAmountPayment Method
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
+
From d03d41365ac804b87e24795b479caa3716603bb8 Mon Sep 17 00:00:00 2001 From: Jonah Oluwapelumi Ifeoma Date: Thu, 24 Oct 2019 22:07:40 +0100 Subject: [PATCH 043/121] added work with us page --- work.html | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 327 insertions(+) create mode 100644 work.html diff --git a/work.html b/work.html new file mode 100644 index 0000000..d3eb17d --- /dev/null +++ b/work.html @@ -0,0 +1,327 @@ + + + + + + + Car Park Admin + + + + + + +
+
+ + +
+ +
+
+

Work with Us

+
JOB VACANCY APPLICATION
+
+
+
+ +
+
+
+
+
+ Job Application Form +
+
+
+
+ + +
+
+ + +
+ +
+
+
+
+
+ + + + + + + \ No newline at end of file From 89fb41e21a0453d93b823eb1823f841470539a9e Mon Sep 17 00:00:00 2001 From: Hassan Olakunle Date: Thu, 24 Oct 2019 22:39:17 +0100 Subject: [PATCH 044/121] merging navbar and settings-payment fully responsive page --- settings-payment.html | 228 +++++++++++++++++------------------------- 1 file changed, 91 insertions(+), 137 deletions(-) diff --git a/settings-payment.html b/settings-payment.html index 518ca3b..b2fe342 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -3,7 +3,8 @@ - + + Car Park Admin @@ -68,17 +69,17 @@ text-align: right; padding-left: 10px; } - /* css styling for the table */ - - *{ - box-sizing: border-box; +body{ + overflow-x: hidden !important; } html{ height: 100%; } .container{ - margin-top: 3rem; + margin-top: 2rem; + padding-left: 0; + padding-right: 0; border: 2px solid #ccc !important; border-radius: 5px; } @@ -91,11 +92,13 @@ } .nav-items{ width: 50%; + min-width: auto; + min-width: 345px; list-style: none; display: flex; - padding: 0 5rem; + padding: 0 3rem; align-items: flex-start; - justify-content: space-around; + justify-content: space-between; } .nav-item{ padding: 0.5rem 0rem; @@ -112,6 +115,7 @@ } .payment-header{ margin: 1rem 0 !important; + padding: 0rem 2rem; } .desc{ font-size: 0.8rem !important; @@ -139,83 +143,38 @@ height: 40px !important; } .search{ - margin: 0.8rem 0 1rem 30rem!important; - float: right !important; + margin: 1rem; + clear: right; } - -@media (max-width: 380px){ - body{ - position: absolute; - } - .w-100{ - width: 20% !important; - } - .nav-items{ - width: 70%; - } - .container{ - margin-top: 3rem ; - border: 0px !important; - border-radius: 0px !important; - } - .search{ - margin-top: 0; - width: 100% !important; - } - .searchText{ - text-align: center !important; - } - .btn-group{ - padding-bottom: 2rem !important; - } - form-group{ - margin-bottom: 0rem; - } -} -@media (max-width: 414px){ - body{ - position: absolute; - } - .nav-items{ - width: 100%; - } - .container{ - margin-top: 3rem ; - border: 0px !important; - border-radius: 0px !important; - } - .search{ - margin-top: 0; - width: 100% !important; - } - .searchText{ - text-align: center !important; - } - .btn-group{ - padding-bottom: 2rem !important; - } - form-group{ - margin-bottom: 0rem; - } +#pencil{ + margin-left:30px; + color:gray; } -@media(max-width:768px){ +@media only screen and (max-width: 375px) { .search{ - width: 50%; - text-align: center; - margin-top: 1.2rem !important; - padding: 0px !important; - margin-left:200px ; - } - .btn-group{ - padding: 1rem 0; + margin: 1rem; + float: none !important; + } + .desc{ + display: block !important; + padding: 1rem 0; + } + .form-group{ + margin-left: 2rem !important; + } + .searchText{ + padding: 2rem; + } + .btn-group{ + display: block !important; + } + .column { + display: flex; + flex-direction: column; + flex-basis: 100%; + flex: 1; } } - - - #pencil{ - margin-left:30px; - color:gray; -} @@ -306,7 +265,7 @@
-

Welcome back Admin

+

Welcome back Admin

CAR PARK APPLICATION
@@ -329,7 +288,7 @@
CAR PARK APPLICATION
-
+

Payment History

Every payment details are made available here

@@ -341,66 +300,61 @@

Payment History


-
-

Search for people by

-
- - -
+
+

Search for people by

+
+ + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DateRefference NumberDescriptionAmountPayment Method
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateReference NumberDescriptionAmountPayment Method
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
+
+
From 10a37b6fff4c57ed6b6d432e185f7fd8fd241108 Mon Sep 17 00:00:00 2001 From: SamuelPhases <52789789+SamuelPhases@users.noreply.github.com> Date: Fri, 25 Oct 2019 02:39:32 +0100 Subject: [PATCH 045/121] Add files via upload --- admin-analytics.html | 781 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 781 insertions(+) create mode 100644 admin-analytics.html diff --git a/admin-analytics.html b/admin-analytics.html new file mode 100644 index 0000000..4e78d4d --- /dev/null +++ b/admin-analytics.html @@ -0,0 +1,781 @@ + + + + + + + + Car Park Admin + + + + + + + + +
+
+ + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
+ + + +
+
+ Overview + Analytics + Demographics +
+
+ +
+
+ New Users + Existing Users + Issues + CarPark +
+
+
+
+ +
+
+ +
+
+
+ +
+

Car Park Locations

+
+ +
+
+ +
+
+

List View

+
    +
  • Maryland, Lagos
    • +
  • Lekki, Lagos
    • +
  • Gwarimpa, Abuja
    • +
  • Wuse, Abuja
    • +
  • Maitama, Abuja
    • +
  • Wuse, Abuja
    • +
+
+
+
+
+ + + + + + + + + \ No newline at end of file From b6f0047a879fb14aae2a3a913d001fcedcc75237 Mon Sep 17 00:00:00 2001 From: Praise Inua <52843516+praiseey@users.noreply.github.com> Date: Fri, 25 Oct 2019 07:06:57 +0100 Subject: [PATCH 046/121] Desktop 10 --- index.html | 556 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 556 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000..fc17d01 --- /dev/null +++ b/index.html @@ -0,0 +1,556 @@ + + + + + + + + + + + + + + Car Park Admin + + + + + + + + + + + + + +
+ +
+ + + + + +
+ + + +
+ +
+ +

Welcome back Admin

+ +
CAR PARK APPLICATION
+ +
+
+ + + + +
+
+
+ +
+
Overview
+
Analytics
+
Demographics
+
+ +
+
+
New Users
+
Print
+
Download
+
Go Back
+
+ +
    +
  1. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    2. +
  2. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    3. +
  3. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    4. +
  4. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    5. +
  5. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    6. +
+ +
 
+
+
+
+
+ + + +
+

Car Park Locations

+
+
+
+
    +
  • +

    List View

    +
    • +
  • Maryland, Lagos
    • +
  • Lekki,Lagos
    • +
  • Gwarimpa,Abuja
    • +
  • Wuse, Abuja
    • +
  • Maitamma, Abuja
    • +
  • Ikeja, Lagos
    • +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + From 0e8740bbdb5cd28b271540316a3776044f4acc7c Mon Sep 17 00:00:00 2001 From: Fatimah Date: Fri, 25 Oct 2019 06:40:50 -0700 Subject: [PATCH 047/121] added destop 13 (mail support )as index.html --- index.html | 528 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 528 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000..a50b898 --- /dev/null +++ b/index.html @@ -0,0 +1,528 @@ + + + + + + + Car Park Admin + + + + + + +
+
+ + +
+ + +
+ +
+
+
+
+ + + +
+
+
+

J

+

My account debited but payme... October 21, 2019 + 21:00

+

John Utaka

+

Hi, my account was debited but payment for park space was + not processed...

+
+
+

M

+

My account debited but payme... October 21, 2019 + 21:00

+

John Utaka

+

Hi, my account was debited but payment for park space was + not processed...

+
+ +
+
+
+

J

+

John Utaka
john_u@gmail.com

+

Print

 +

Download

 +
My Account debited but payment not processed
+

Hi Admin,

+ +

my account was debited but payment for park space was not processed accordingly.

+ +

I have proof of invoice sent to me after payment was made, but when i checked + the car space i wanted to book, it’s saying that payment has not been process therefore park space cannot be booked.

+ +

I dont know what to do.

+ +

Kindly look into the situation and get back to me ASAP.

+ + +

Eagerly awaiting your response.

+ +

Thank you.

+ +
+ + +
+
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file From fb848cee36b4d093af3184102ced0e710e9822de Mon Sep 17 00:00:00 2001 From: devifymatt Date: Thu, 24 Oct 2019 23:34:15 -0700 Subject: [PATCH 048/121] added mail support page --- mailSupport.html | 376 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 376 insertions(+) create mode 100644 mailSupport.html diff --git a/mailSupport.html b/mailSupport.html new file mode 100644 index 0000000..b93b4b9 --- /dev/null +++ b/mailSupport.html @@ -0,0 +1,376 @@ + + + + + + + Mail Campaign + + + + + + +
+
+ + +
+ + +
+ +
+
+ + + + +
+
+
+ +
    +
  • +
  • + Inbox + Inbox +
    • +
  • + Drafts + Drafts +
    • +
  • + Starred + Starred +
    • +
  • + Sent + Sent +
    • +
  • + Spam + Spam +
    • +
  • + Trash + Trash +
    • +
+
+ + + + +
+ +
+ +

J

+

My account debited but payme... 21:00 + October 21, 2019

+

John Utaka

+

Hi, my account was debited but payment for park space was + not processed...

+
+ +
+ +
+

M

+

App is slow + 21:00 + October 21, 2019 +

+

Mallam Grey Joy

+

Hi, my account was debited but payment for park space was + not processed...

+
+ +
+ +
+ +

J

+ +
+

John Utaka +

john_u@gmail.com + + + +

+
+ +
+

My Account debited but payment not processed

+

Hi Admin,

+ my account was debited but payment for park space was not processed accordingly.

+

I have proof of invoice sent to me after payment was made, but when i checked the car space + i wanted to book, it’s saying that payment has not been process therefore park space cannot + be booked.

+

I dont know what to do

+

Kindly look into the situation and get back to me ASAP.

+

Eagerly awaiting your response.

+ Thank you. + + +
+ + +
+
+ + +
+
+
+ +
+ + + + + + +
+
+
+ + + + + + + \ No newline at end of file From bd50da34688d1fa18b0c381442183420c5763374 Mon Sep 17 00:00:00 2001 From: Fatimah Date: Fri, 25 Oct 2019 08:17:37 -0700 Subject: [PATCH 049/121] mailSupport update --- mailSupport.html | 464 +++++++++++++++++++++++++++++++---------------- 1 file changed, 308 insertions(+), 156 deletions(-) diff --git a/mailSupport.html b/mailSupport.html index b93b4b9..be93cf0 100644 --- a/mailSupport.html +++ b/mailSupport.html @@ -4,48 +4,13 @@ - Mail Campaign + Car Park Admin -
+
- +
-
- - - - -
-
-
- -
    -
  • -
  • - Inbox - Inbox -
    • -
  • - Drafts - Drafts -
    • -
  • - Starred - Starred -
    • -
  • - Sent - Sent -
    • -
  • - Spam - Spam -
    • -
  • - Trash - Trash -
    • -
-
- +
+
+
+ - - -
- -
- -

J

-

My account debited but payme... 21:00 - October 21, 2019

-

John Utaka

+ +
+
+
+

J

+

My account debited but payme... October 21, 2019 + 21:00

+

John Utaka

Hi, my account was debited but payment for park space was - not processed...

+ not processed...

- -
- -
-

M

-

App is slow - 21:00 - October 21, 2019 -

-

Mallam Grey Joy

-

Hi, my account was debited but payment for park space was - not processed...

-
- -
- -
- -

J

- -
-

John Utaka -

john_u@gmail.com - - - -

-
- -
-

My Account debited but payment not processed

-

Hi Admin,

- my account was debited but payment for park space was not processed accordingly.

-

I have proof of invoice sent to me after payment was made, but when i checked the car space - i wanted to book, it’s saying that payment has not been process therefore park space cannot - be booked.

-

I dont know what to do

-

Kindly look into the situation and get back to me ASAP.

-

Eagerly awaiting your response.

- Thank you. - - -
- - -
-
- - -
+
+

M

+

My account debited but payme... October 21, 2019 + 21:00

+

John Utaka

+

Hi, my account was debited but payment for park space was + not processed...

-
- +
+
+
+

J

+

John Utaka
john_u@gmail.com

+

Print

 +

Download

 +
My Account debited but payment not processed
+

Hi Admin,

- - - - - +

my account was debited but payment for park space was not processed accordingly.

+ +

I have proof of invoice sent to me after payment was made, but when i checked + the car space i wanted to book, it’s saying that payment has not been process therefore park space cannot be booked.

+ +

I dont know what to do.

+ +

Kindly look into the situation and get back to me ASAP.

+ + +

Eagerly awaiting your response.

+ +

Thank you.

+ +
+ + +
+
+
+
+
From 0405689469183b39a3ca1fb614214021f7d775a7 Mon Sep 17 00:00:00 2001 From: devifymatt Date: Fri, 25 Oct 2019 08:37:30 +0100 Subject: [PATCH 050/121] Delete index.html --- index.html | 528 ----------------------------------------------------- 1 file changed, 528 deletions(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index a50b898..0000000 --- a/index.html +++ /dev/null @@ -1,528 +0,0 @@ - - - - - - - Car Park Admin - - - - - - -
-
- - -
- - -
- -
-
-
-
- - - -
-
-
-

J

-

My account debited but payme... October 21, 2019 - 21:00

-

John Utaka

-

Hi, my account was debited but payment for park space was - not processed...

-
-
-

M

-

My account debited but payme... October 21, 2019 - 21:00

-

John Utaka

-

Hi, my account was debited but payment for park space was - not processed...

-
- -
-
-
-

J

-

John Utaka
john_u@gmail.com

-

Print

 -

Download

 -
My Account debited but payment not processed
-

Hi Admin,

- -

my account was debited but payment for park space was not processed accordingly.

- -

I have proof of invoice sent to me after payment was made, but when i checked - the car space i wanted to book, it’s saying that payment has not been process therefore park space cannot be booked.

- -

I dont know what to do.

- -

Kindly look into the situation and get back to me ASAP.

- - -

Eagerly awaiting your response.

- -

Thank you.

- -
- - -
-
-
-
-
-
-
-
- - - - - - - \ No newline at end of file From 75e066a97dfb1bfb93b2ffa264a126419964f313 Mon Sep 17 00:00:00 2001 From: Caleb Chukwudi Uzor Date: Fri, 25 Oct 2019 10:22:51 +0100 Subject: [PATCH 051/121] Add files via upload Add responsiveness and navbar --- admin-analytics.html | 820 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 820 insertions(+) create mode 100644 admin-analytics.html diff --git a/admin-analytics.html b/admin-analytics.html new file mode 100644 index 0000000..f44926a --- /dev/null +++ b/admin-analytics.html @@ -0,0 +1,820 @@ + + + + + + + Car Park Admin + + + + + + + + +
+
+ + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
+ + + +
+
+ Overview + Analytics + Demographics +
+
+ +
+
+ New Users + Existing Users + Issues + CarPark +
+
+
+
+ +
+
+ +
+
+
+
+ +
+

Car Park Locations

+
+ +
+
+ +
+
+

List View

+
    +
  • Maryland, Lagos
    • +
  • Lekki, Lagos
    • +
  • Gwarimpa, Abuja
    • +
  • Wuse, Abuja
    • +
  • Maitama, Abuja
    • +
  • Wuse, Abuja
    • +
+
+
+
+
+ + + + + + + + \ No newline at end of file From 5826db8c46e9b8aa803ac5c9b0df4168d6c9d3df Mon Sep 17 00:00:00 2001 From: Caleb Chukwudi Uzor Date: Fri, 25 Oct 2019 10:24:10 +0100 Subject: [PATCH 052/121] Delete main.css To avoid merge conflict --- css/main.css | 1 - 1 file changed, 1 deletion(-) delete mode 100644 css/main.css diff --git a/css/main.css b/css/main.css deleted file mode 100644 index 8b13789..0000000 --- a/css/main.css +++ /dev/null @@ -1 +0,0 @@ - From fed723d6d7e05a9edf0d922d5784c084ec02c772 Mon Sep 17 00:00:00 2001 From: Caleb Chukwudi Uzor Date: Fri, 25 Oct 2019 10:25:21 +0100 Subject: [PATCH 053/121] Delete main.js Avoid merge conflict --- js/main.js | 1 - 1 file changed, 1 deletion(-) delete mode 100644 js/main.js diff --git a/js/main.js b/js/main.js deleted file mode 100644 index 8b13789..0000000 --- a/js/main.js +++ /dev/null @@ -1 +0,0 @@ - From d90a749c7870e0f4c02ea90e6661bda99fa0c5a7 Mon Sep 17 00:00:00 2001 From: Faruq Date: Fri, 25 Oct 2019 10:37:07 +0100 Subject: [PATCH 054/121] Delete cancellation.html --- cancellation.html | 277 ---------------------------------------------- 1 file changed, 277 deletions(-) delete mode 100644 cancellation.html diff --git a/cancellation.html b/cancellation.html deleted file mode 100644 index d2c7fca..0000000 --- a/cancellation.html +++ /dev/null @@ -1,277 +0,0 @@ - - - - - - - Car Park Admin - - - - - - -
-
- - -
- -
-
-

Welcome back Admin

-
CAR PARK APPLICATION
-
-
-
- -
-
-

CANCELLATION AND MODIFICATION POLICY

-
    -
  • CARPARK provides the Client with two options (set out below) to cancel or modify a - reservation and how to get a refund.
    • - -
  • Cancellations and refunds vary according to the car park and type of reservation, - as the User will have seen in the terms and conditions for that car park and type - of reservation when making the reservation for that parking space.
    • - -
  • The cancellation and modification policy applicable to each reservation is detailed - in the legal conditions, in the confirmation email that the Client receives following - the completion of the purchasing process, and on the reservation receipt, which the - Client should validate on arrival at the car park.
    • -
-

Products with a policy of cancellation and modification before 23:59h (local time at the car park) - on the day before the date of arrival confirmed on the reservation or receipt:

-
    -
  • Clients may cancel or modify their stay before 23:59h on the day before their arrival. - Should the Client fail to show up at the car park, wish to cancel or modify the reservation - after 23:59h on the day before their arrival, or after the arrival time confirmed on the reservation, - they would not, in any such cases, be able to modify, cancel or claim a partial or total refund for - the purchase made.
    • -
- -

Products with a flexible cancellation and modification policy, up to 1 hour before the arrival time - confirmed on the reservation or receipt:

-
    -
  • The Client may cancel or modify their reservation up to 1 hour before the time given at the - time of purchase and shown on the reservation receipt. Should the Client fail to show up at the car park, - wish to cancel or modify their reservation after the period permitted by the flexible cancellation policy, - which is only applicable to certain products, or after the arrival time shown on the receipt, - they would not be able to modify, cancel or claim a full or partial refund for the purchase made.
    • -
- -

Products classified as monthly, quarterly, biannual and annual tickets:

-
    -
  • The Client may modify their monthly, quarterly, biannual or annual ticket reservation for free up until - 23:59h the day before their arrival at the car park.
    • - -
  • The Client may cancel their monthly, quarterly, biannual or annual ticket reservation up until 23:59h - the day following their arrival at the car park.
    • - -
  • By purchasing a monthly ticket with CARPARK with the car park determined by the length of stay – - the Client enjoys a discount on the usual price. Should the Client decide to cancel their monthly, - quarterly, biannual or annual ticket within the indicated time period, the Client understands and - accepts that they must pay the difference between the discounted price and the usual price for each - month of using the car park.
    • -
-
-
-
- - - - - - - \ No newline at end of file From 29899a33566ff3571715c029ac7e2a9409538793 Mon Sep 17 00:00:00 2001 From: Faruq Date: Fri, 25 Oct 2019 10:39:34 +0100 Subject: [PATCH 055/121] Delete index1.html --- index1.html | 108 ---------------------------------------------------- 1 file changed, 108 deletions(-) delete mode 100644 index1.html diff --git a/index1.html b/index1.html deleted file mode 100644 index 293dfa0..0000000 --- a/index1.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - Signin Page - - - -
-
-

Admin Login

-
- - - -
- - -
-
- - Forgot Password? -
-
-
-
- -
-
-
- map-background -
- car-park-logo -
-
- - - From 60085d52eabc061abce9b65346e6cd7b4b9239d1 Mon Sep 17 00:00:00 2001 From: Faruq Date: Fri, 25 Oct 2019 11:10:00 +0100 Subject: [PATCH 056/121] Revert "Desktop 10" --- index.html | 556 ----------------------------------------------------- 1 file changed, 556 deletions(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index fc17d01..0000000 --- a/index.html +++ /dev/null @@ -1,556 +0,0 @@ - - - - - - - - - - - - - - Car Park Admin - - - - - - - - - - - - - -
- -
- - - - - -
- - - -
- -
- -

Welcome back Admin

- -
CAR PARK APPLICATION
- -
-
- - - - -
-
-
- -
-
Overview
-
Analytics
-
Demographics
-
- -
-
-
New Users
-
Print
-
Download
-
Go Back
-
- -
    -
  1. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    2. -
  2. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    3. -
  3. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    4. -
  4. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    5. -
  5. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    6. -
- -
 
-
-
-
-
- - - -
-

Car Park Locations

-
-
-
-
    -
  • -

    List View

    -
    • -
  • Maryland, Lagos
    • -
  • Lekki,Lagos
    • -
  • Gwarimpa,Abuja
    • -
  • Wuse, Abuja
    • -
  • Maitamma, Abuja
    • -
  • Ikeja, Lagos
    • -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - From 9022ec5e776cac785be92b688d9cd2db49323b19 Mon Sep 17 00:00:00 2001 From: Praise Inua <52843516+praiseey@users.noreply.github.com> Date: Fri, 25 Oct 2019 11:21:14 +0100 Subject: [PATCH 057/121] Desktop 10 --- desktop10.html | 556 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 556 insertions(+) create mode 100644 desktop10.html diff --git a/desktop10.html b/desktop10.html new file mode 100644 index 0000000..891d15f --- /dev/null +++ b/desktop10.html @@ -0,0 +1,556 @@ + + + + + + + + + + + + + + Car Park Admin + + + + + + + + + + + + + +
+ +
+ + + + + +
+ + + +
+ +
+ +

Welcome back Admin

+ +
CAR PARK APPLICATION
+ +
+
+ + + + +
+
+
+ +
+
Overview
+
Analytics
+
Demographics
+
+ +
+
+
Existing Users
+
Print
+
Download
+
Go Back
+
+ +
    +
  1. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    2. +
  2. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    3. +
  3. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    4. +
  4. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    5. +
  5. +
    +
    Wale Johnson
    +
    23rd October, 2019
    +
    12:00:00
    +
    Samsung S7
    +
    Ikeja, Lagos
    +
    +
    6. +
+ +
 
+
+
+
+
+ + + +
+

Car Park Locations

+
+
+
+
    +
  • +

    List View

    +
    • +
  • Maryland, Lagos
    • +
  • Lekki,Lagos
    • +
  • Gwarimpa,Abuja
    • +
  • Wuse, Abuja
    • +
  • Maitamma, Abuja
    • +
  • Ikeja, Lagos
    • +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + From 834395a9fb40d92b12cd8e09e362d64dab0bfdf6 Mon Sep 17 00:00:00 2001 From: Praise Inua <52843516+praiseey@users.noreply.github.com> Date: Fri, 25 Oct 2019 11:22:26 +0100 Subject: [PATCH 058/121] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index fc17d01..891d15f 100644 --- a/index.html +++ b/index.html @@ -395,7 +395,7 @@
CAR PARK APPLICATION
-
New Users
+
Existing Users
Print
Download
Go Back
From 8ab3a542eb3a74dffab964660d571760a69a0efc Mon Sep 17 00:00:00 2001 From: Praise Inua <52843516+praiseey@users.noreply.github.com> Date: Fri, 25 Oct 2019 11:27:36 +0100 Subject: [PATCH 059/121] Delete index.html --- index.html | 556 ----------------------------------------------------- 1 file changed, 556 deletions(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index 891d15f..0000000 --- a/index.html +++ /dev/null @@ -1,556 +0,0 @@ - - - - - - - - - - - - - - Car Park Admin - - - - - - - - - - - - - -
- -
- - - - - -
- - - -
- -
- -

Welcome back Admin

- -
CAR PARK APPLICATION
- -
-
- - - - -
-
-
- -
-
Overview
-
Analytics
-
Demographics
-
- -
-
-
Existing Users
-
Print
-
Download
-
Go Back
-
- -
    -
  1. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    2. -
  2. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    3. -
  3. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    4. -
  4. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    5. -
  5. -
    -
    Wale Johnson
    -
    23rd October, 2019
    -
    12:00:00
    -
    Samsung S7
    -
    Ikeja, Lagos
    -
    -
    6. -
- -
 
-
-
-
-
- - - -
-

Car Park Locations

-
-
-
-
    -
  • -

    List View

    -
    • -
  • Maryland, Lagos
    • -
  • Lekki,Lagos
    • -
  • Gwarimpa,Abuja
    • -
  • Wuse, Abuja
    • -
  • Maitamma, Abuja
    • -
  • Ikeja, Lagos
    • -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - From 5c1bed5d0dad2fa80dd34219809a91c2d8f2353e Mon Sep 17 00:00:00 2001 From: emmysoft123 <47819331+emmysoft123@users.noreply.github.com> Date: Fri, 25 Oct 2019 12:21:38 +0100 Subject: [PATCH 060/121] we added the desktop11 page https://nkeenendu.github.io/desk/ that is the test repo --- desktop11,.html | 493 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 493 insertions(+) create mode 100644 desktop11,.html diff --git a/desktop11,.html b/desktop11,.html new file mode 100644 index 0000000..f212627 --- /dev/null +++ b/desktop11,.html @@ -0,0 +1,493 @@ + + + + + + + Car Park Admin + + + + + + +
+
+ + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Car Park 18 Print Download Go Back +
Lekki Gardens Park p 23rd October, 2019 12:00:00 Lekki, Lagos
Ikeja Mall Park p + 23rd October, 2019 12:00:00 Ikeja, Lagos
MaryLand Park p + 23rd October, 2019 12:00:00 MaryLand, Lagos
Mile 2 Park p + 23rd October 2019 12:00:00 Mile 2, Lagos
+
+ + +
+
+
+

Car Park Location

+
+ +
+
+
+
embedgooglemap.net
+
+
+
+
+ +

List View

+
+
+

MaryLand, Lagos

+
+

Lekki, Lagos

+
+

Gwarimpa, Abuja

+
+

Wuse, Abuja

+
+

Maittama, Abuja

+
+

Wuse, Abuja

+
+ +
+ +
+
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file From 3521644c675772e9a187f4be41e8c2dade8c496b Mon Sep 17 00:00:00 2001 From: musa-bello <39606727+musa-bello@users.noreply.github.com> Date: Fri, 25 Oct 2019 12:42:02 +0100 Subject: [PATCH 061/121] Delete admin.html --- admin.html | 304 ----------------------------------------------------- 1 file changed, 304 deletions(-) delete mode 100644 admin.html diff --git a/admin.html b/admin.html deleted file mode 100644 index 0963a9a..0000000 --- a/admin.html +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - Car Park Admin - - - - - - -
-
- - -
- -
-
-

Welcome back Admin

-
CAR PARK APPLICATION
-
-
-
- -
-
-
- -
-
New Users
-

20

-
-
- - -
-
Exisiting Users
-

8

-
-
- - -
-
Issues
-

8

-
-
- - -
-
Car Park
-

20

-
-
- -
- -
-
-

Car Park Locations

-
-
- -
-
- -
-
-
- -
-
-
- - - - - - - \ No newline at end of file From eb79bb95c2a758d383eadee675a9065372d9f06b Mon Sep 17 00:00:00 2001 From: musa-bello <39606727+musa-bello@users.noreply.github.com> Date: Fri, 25 Oct 2019 12:42:13 +0100 Subject: [PATCH 062/121] Delete nav.html --- nav.html | 235 ------------------------------------------------------- 1 file changed, 235 deletions(-) delete mode 100644 nav.html diff --git a/nav.html b/nav.html deleted file mode 100644 index 60743e2..0000000 --- a/nav.html +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - Car Park Admin - - - - - - -
-
- - -
- -
-
-

Welcome back Admin

-
CAR PARK APPLICATION
-
-
-
- -
-
-

ADD CONTENTS HERE!!!

-
-
-
- - - - - - - \ No newline at end of file From 1f38d86e76a6830b642e7b087e85a13be901bec4 Mon Sep 17 00:00:00 2001 From: musa-bello <39606727+musa-bello@users.noreply.github.com> Date: Fri, 25 Oct 2019 12:45:17 +0100 Subject: [PATCH 063/121] Add files via upload --- overview.html | 482 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 482 insertions(+) create mode 100644 overview.html diff --git a/overview.html b/overview.html new file mode 100644 index 0000000..5bb4d86 --- /dev/null +++ b/overview.html @@ -0,0 +1,482 @@ + + + + + + + Car Park Admin + + + + + + +
+
+ + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
+
+ +
+
+ +
+
+
+
+
New Users
+
+
+
+ + +
+
+

20

+
+
+
+
+ +
+
+
+
+
Exisiting Users
+
+
+
+ + +
+
+

8

+
+
+
+
+ +
+
+
+
+
Issues
+
+
+
+ + +
+
+

15

+
+
+
+
+ +
+
+
+
+
Car Park
+
+
+
+ + +
+
+

20

+
+
+
+
+
+

Car Park Locations

+
+
+ +
+
+

List View

+
    +
  • Maryland, Lagos +
    • +
  • Maryland, Lagos +
    • +
  • Maryland, Lagos +
    • +
  • Maryland, Lagos +
    • +
  • Maryland, Lagos +
    • +
  • Maryland, Lagos +
    • +
  • Maryland, Lagos +
    • +
  • Maryland, Lagos +
    • +
  • Maryland, Lagos +
    • + +
+
+
+
+ +
+
+
+ + + + + + + From f64ab446a0289799933f6e69a55a55cd4f46d2f7 Mon Sep 17 00:00:00 2001 From: "[dekiller_j]" <[iwaloyeo@gmail.com]> Date: Fri, 25 Oct 2019 14:18:02 +0100 Subject: [PATCH 064/121] repo update --- settings-payment.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/settings-payment.html b/settings-payment.html index ad32dde..8f88d3f 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -69,6 +69,7 @@ text-align: right; padding-left: 10px; } + /* css styling for the table */ body{ overflow-x: hidden !important; @@ -356,7 +357,8 @@

Payment History

- + - Document - - - - - -
-

Personal information

-
- -
- This information can be edited from your profile page - -
-
-
-
-
- - -
-
- -
- - -
-
- -
-
-
- - - - We will use this email if we need to contact you about your - account - -
-
- -
-
- - -
-
- - \ No newline at end of file From 56a16a9a98dbf10ba571f741d8f79ae4bfc58783 Mon Sep 17 00:00:00 2001 From: Faruq Date: Fri, 25 Oct 2019 19:25:50 +0100 Subject: [PATCH 082/121] Delete navNew.html --- navNew.html | 235 ---------------------------------------------------- 1 file changed, 235 deletions(-) delete mode 100644 navNew.html diff --git a/navNew.html b/navNew.html deleted file mode 100644 index 60743e2..0000000 --- a/navNew.html +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - Car Park Admin - - - - - - -
-
- - -
- -
-
-

Welcome back Admin

-
CAR PARK APPLICATION
-
-
-
- -
-
-

ADD CONTENTS HERE!!!

-
-
-
- - - - - - - \ No newline at end of file From d3a7919632905e7f8b943347f187bf4ef690496a Mon Sep 17 00:00:00 2001 From: Omidiora Emmanuel <45630269+omidiora@users.noreply.github.com> Date: Fri, 25 Oct 2019 19:39:50 +0100 Subject: [PATCH 083/121] file added --- style/css/Desktop5.css | 366 ++++++++++++++++++++++++++++++++++++++++ style/css/desktop-9.css | 200 ++++++++++++++++++++++ style/css/login.css | 162 ++++++++++++++++++ style/js/desktop5.js | 135 +++++++++++++++ style/js/main.js | 1 + 5 files changed, 864 insertions(+) create mode 100644 style/css/Desktop5.css create mode 100644 style/css/desktop-9.css create mode 100644 style/css/login.css create mode 100644 style/js/desktop5.js create mode 100644 style/js/main.js diff --git a/style/css/Desktop5.css b/style/css/Desktop5.css new file mode 100644 index 0000000..65368f8 --- /dev/null +++ b/style/css/Desktop5.css @@ -0,0 +1,366 @@ +#body-row { + margin-left:0; + margin-right:0; +} +#sidebar-container { + min-height: 100vh; + background-color: #0049B5; + padding: 0; +} + +/* Sidebar sizes when expanded and expanded */ +.sidebar-expanded { + width: 230px; +} +.sidebar-collapsed { + width: 60px; +} + +/* Menu item*/ +#sidebar-container .list-group a { + height: 50px; + color: white; +} + +/* Submenu item*/ +#sidebar-container .list-group .sidebar-submenu a { + height: 45px; + padding-left: 30px; +} +.sidebar-submenu { + font-size: 0.9rem; +} + +/* Separators */ +.sidebar-separator-title { + background-color: #0049B5; + height: 35px; +} +.sidebar-separator { + background-color: #0049B5; + height: 25px; +} +.logo-separator { + background-color: #0049B5; + height: 60px; +} + +/* Closed submenu icon */ +#sidebar-container .list-group .list-group-item[aria-expanded="false"] .submenu-icon::after { +content: " \f0d7"; +font-family: FontAwesome; +display: inline; +text-align: right; +padding-left: 10px; +} +/* Opened submenu icon */ +#sidebar-container .list-group .list-group-item[aria-expanded="true"] .submenu-icon::after { +content: " \f0da"; +font-family: FontAwesome; +display: inline; +text-align: right; +padding-left: 10px; +} + +* { + box-sizing: border-box; +} + +body { + font-family: 'Roboto', sans-serif; +} + +.desktop5-container { + background-color: #F6F6F6; + padding-left: 20px; + padding-right: 20px; + padding-bottom: 30px; + height: auto; +} + +.desktop5-options { + display: flex; + justify-content: flex-end; + align-items: flex-end; + height: 67px; + border-bottom: 1px solid rgba(119, 119, 119, 0.2); + padding-right: 69px; + padding-bottom: 14px; +} + +a:hover { + text-decoration: none; +} + +.options { + font-size: 20px; + line-height: 23px; + color: #777777; + margin-left: 75px; + margin-bottom: -14px; + padding-bottom: 14px; +} + +.options:hover { + border-bottom: 4px solid #1A73E8; +} + +.options1 { + border-bottom: 4px solid #1A73E8; + padding-bottom: 10px; +} + +.desktop5-charts { + height: 284px; + padding: 0; +} + +.desktop5-padding { + background: #FFFFFF; + box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); + height: 100%; + width: 100%; + margin-right: 8px; +} + +.ad-section { + background: #FFFFFF; + box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); + height: 100%; + width: 100%; +} + +.top-padding { + padding-left: 8px; +} + +.container-fluid { + margin: 10px 0 0 0; + margin-right: 0; +} + +.desktop5-date { + display: flex; + justify-content: flex-end; + align-items: center; + height: 39px; + border-bottom: 1px solid rgba(26, 115, 232, 0.1); + ; +} + +.desktop5-date p { + font-size: 15px; + line-height: 18px; + color: #777777; + margin-right: 12px; + margin-bottom: 0; +} + +.fa-angle-down { + color: rgba(119, 119, 119, 0.5); + margin-right: 10px; +} + +.chart { + border: 1px solid rgba(119, 119, 119, 0.05); + width: 152px; + padding-top: 8px; + margin-bottom: 10px; +} + +.chart-section { + padding: 6px 12px 10px 12px; + display: flex; + flex-wrap: wrap; + justify-content: space-between; +} + +#advertise { + margin-right: 28px; +} + +.advert-text { + font-weight: 500; + font-size: 20px; + line-height: 23px; + color: #777777; + text-align: center; + margin-top: 36px; + margin-bottom: 0; +} + +.first-icons { + padding-left: 62px; + padding-right: 62px; + display: flex; + justify-content: space-between; + margin-top: 41px; +} + +.first-icons i { + font-size: 25px; +} + +.fa-twitter { + color: #76A9EA; +} + +.fa-instagram { + color: #C21975; +} + +.fa-facebook-square { + color: #475993 +} + +.fa-youtube { + color: red; +} + +.fa-reddit { + color: orangered; +} + +.coll { + /* background-color: #F6F6F6; */ + padding-left: 0; + padding-right: 0; +} + +.card { + background: #FEFEFE; + } + + .card .card-header { + border-bottom: solid 1px #ccc; + text-align: left; + background: #FEFEFE; + } + +@media only screen and (max-width: 991px) { + .top-padding { + margin-top: 20px; + } + + #charts { + height: auto; + } + + .ad-section { + margin-left: 0; + } + + .top-padding { + padding-left: 0; + } + + + .first-icons { + margin-left: 69px; + margin-right: 69px; + } +} + +@media only screen and (max-width: 750px) { + + .desktop5-options { + flex-direction: column; + justify-content: flex-end; + height: auto; + border-bottom: 1px solid rgba(119, 119, 119, 0.2); + padding-top: 20px; + padding-right: 30px; + margin-right: 20px; + } + + + + .options { + margin-bottom: 0px; + padding-bottom: 0px; + } + + .first-icons { + margin-left: 20px; + margin-right: 20px; + } +} + +@media only screen and (max-width: 500px) { + + .chart-section { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } + + /* .first-icons { + padding-left: 60px; + padding-right: 60px; + } */ + +} + +@media only screen and (max-width: 933px) { + .options { + margin-left: 30px; + } + + .options { + margin-top: 10px; + } +} + +@media only screen and (max-width: 400px) { + .first-icons { + padding-left: 20px; + padding-right: 20px; + } +} + +@media only screen and (max-width: 664px) { + .chart-section { + justify-content: space-around; + } +} + + + + + +@media only screen and (max-width: 1157px) { + #charts { + height: auto; + } + + #social-icons { + height: 310px; + } +} + +@media only screen and (max-width: 1123px) { + /* .first-icons { + padding-left: 40px; + padding-right: 40px; + } */ + + .advert-text { + margin-left: 10px; + margin-right: 10px; + } +} + +@media only screen and (max-width: 1200px) { + .first-icons { + padding-left: 40px; + padding-right: 40px; + } +} + +@media only screen and (max-width: 1100px) { + .first-icons { + padding-left: 30px; + padding-right: 30px; + } +} \ No newline at end of file diff --git a/style/css/desktop-9.css b/style/css/desktop-9.css new file mode 100644 index 0000000..c33bcbe --- /dev/null +++ b/style/css/desktop-9.css @@ -0,0 +1,200 @@ +/* NAV TAB */ +body{ + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-size: 100%; + background: #E5E5E5; + margin: 0; +} +#body-row { + margin-left:0; + margin-right:0; +} +#sidebar-container { + min-height: 100vh; + background-color: #0049B5; + padding: 0; +} + +/* Sidebar sizes when expanded and expanded */ +.sidebar-expanded { + width: 230px; +} +.sidebar-collapsed { + width: 60px; +} + +/* Menu item*/ +#sidebar-container .list-group a { + height: 50px; + color: white; +} + +/* Submenu item*/ +#sidebar-container .list-group .sidebar-submenu a { + height: 45px; + padding-left: 30px; +} +.sidebar-submenu { + font-size: 0.9rem; +} + +/* Separators */ +.sidebar-separator-title { + background-color: #0049B5; + height: 35px; +} +.sidebar-separator { + background-color: #0049B5; + height: 25px; +} +.logo-separator { + background-color: #0049B5; + height: 60px; +} + +/* Closed submenu icon */ +#sidebar-container .list-group .list-group-item[aria-expanded="false"] .submenu-icon::after { +content: " \f0d7"; +font-family: FontAwesome; +display: inline; +text-align: right; +padding-left: 10px; +} +/* Opened submenu icon */ +#sidebar-container .list-group .list-group-item[aria-expanded="true"] .submenu-icon::after { +content: " \f0da"; +font-family: FontAwesome; +display: inline; +text-align: right; +padding-left: 10px; +} +/* section #overviewTabs .nav-border { + border-bottom: 1px solid #ccc; + box-shadow: 0 1px #ccc; + background: #fff; +} + +section #overviewTabs .nav-text{ + color: #777777; + background-color: none; + font-size: 1.25em; + display: block; + padding: .5rem 2rem; +} + +section #overviewTabs .nav-pills .nav-text.active, .nav-pills .show>.nav-text { + color: #777777; + background-color: #fff; + border-bottom: 3px solid blue; +} + +section #overviewTabs .nav-pills .nav-text { + border-radius: 0px; +} */ +.container { + background: #fff; + /* margin: 15px 15px 15px 15px; */ + max-width: 95%; + overflow-y: auto; +} + +#overviewTabs thead, time, .fa-calendar { + color: #777777; +} + +#overviewTabs .badge-primary { + border-radius: 50px; +} +#overviewTabs td img, .fa-calendar{ + width: 15px; + height: 15px; +} + +#overviewTabs td{ + color: #777777; +} +#overviewTabs thead td{ + color: rgba(119, 119, 119, 0.5); + font-weight: 500; +} +.makeFlex{ + display: flex; + flex-flow: row wrap; +} +.city{ + margin: -1.4em 0 -1em 1em; +} +/* +.aside{ + width: 20%; +} +.main{ + margin-left: 20%; +} */ +/* header{ + height: 20vh; +} */ +#carParks{ + background: #fff; + max-width: 95%; + /* margin-bottom: 1em; */ +} +#carParks h1{ + text-transform: capitalize; + font-size: 1.25em; + border-bottom: 1px solid #c7c6c6; + padding: 0.3em; + margin-left: 0.5px; + color: #777777; + font-weight: 500; +} +#listView h2{ + background: #f7f7f7; + text-transform: capitalize; + font-size: 1.25em; + border: 1px solid #c7c6c6; + padding: 0.3em; + color: #777777; + font-weight: 500; +} +#listTable table td{ + border: 1px solid #c7c6c6; + border-collapse: collapse; + font-size: 0.9em; +} +#listTable table td:hover{ + cursor: pointer; +} +#listTable table #first{ + border-top: none; +} +#listTable{ + overflow: scroll; + height: 360px; + background: #ffffff; + margin-top: -7px; +} +#listTable::-webkit-scrollbar { + width: 8px; + /* padding: 1px; */ +} +#listTable::-webkit-scrollbar-track { + background: #f1f1f1; + border-radius: 10px; +} +#listTable::-webkit-scrollbar-thumb { + background: rgb(70, 70, 241); + border-radius: 10px; + /* width: 5px; */ +} +#listTable::-webkit-scrollbar-thumb:hover { + background: rgb(23, 23, 253); +} +/* #demo{ + height: 0.5em; +} */ +@media screen and (max-width: 49em){ + .city{ + margin: 0; + } +} diff --git a/style/css/login.css b/style/css/login.css new file mode 100644 index 0000000..2c7243d --- /dev/null +++ b/style/css/login.css @@ -0,0 +1,162 @@ +* { + margin: 0px; + padding: 0px; +} + +body { + font-family: roboto, sans-serif; + font-style: normal; + background-color: #f1f1f1e7; + color: #4f4f4f; +} + +.container { + display: grid; + width: 1000px; + margin: 30px auto; + grid-template-columns: 450px 450px; + grid-template-rows: 600px; + justify-content: center; + align-content: center; +} + +.form { + background: #0049b5; + padding: 30px; + display: flex; + flex-direction: column; + flex-wrap: nowrap; + justify-content: center; + box-shadow: -12px 2px 26px -17px rgba(0, 0, 0, 0.75); +} + +input { + margin: 10px 0; + border: 1px solid #fff; + background: #0049b5; + height: 30px; + padding: 2px 2px 2px 10px; + color: #fff; + border-radius: 5px; +} +input:focus { + font-family: roboto, sans-serif; +} +.placeicon { + font-family: fontawesome; +} +input[type="email"]::placeholder { + /* Firefox, Chrome, Opera */ + text-align: right; + color: #fff; +} +input[type="email"]::-ms-input-placeholder { + /* Microsoft Edge */ + text-align: right; + color: #fff; +} + +input[type="password"]::placeholder { + /* Firefox, Chrome, Opera */ + text-align: right; + color: #fff; +} +input[type="password"]::-ms-input-placeholder { + /* Microsoft Edge */ + text-align: right; + color: #fff; +} +button { + color: darkgreen; + font-weight: bolder; +} + +div.div-2 a#forgot-password { + text-decoration: none; + color: #fff; + font-size: 12px; +} + +#checkitems { + display: flex; + flex-direction: row; + align-items: baseline; + margin-bottom: 40px; + padding: 0; + justify-content: flex-end; +} + +form.form h1 { + color: #fff; + margin-bottom: 40px; +} + +form.form label { + padding-top: 10px; + color: #fff; +} + +form.form div#btns { + display: flex; + flex-direction: column; + align-items: center; +} + +form.form div#btns button.btn.login { + align-self: stretch; + padding-top: 10px; + padding-bottom: 10px; + background: #f9cd40; + color: #0049b5; + font-size: 14px; + border-radius: 5px; + /* border: none; */ +} + +/* form.form div#btns button.btn.login:hover { +} */ + +.side2 { + background: gray; + position: relative; + top: 0; + left: 0; +} + +.img1 { + position: relative; + top: 0; + left: 0; + height: 600px; + width: 450px; +} +div.overlay { + position: absolute; + top: 0; + left: 0; + height: 600px; + width: 450px; + background: rgba(255, 255, 255, 0.74); +} +.img2 { + position: absolute; + top: 200px; + left: 30px; + width: 400px; + height: 80px; +} + +@media screen and (max-width: 700px) { + .container { + width: 400px; + margin: 30px auto; + grid-template-columns: 1fr; + grid-template-rows: 600px; + justify-content: center; + align-content: center; + } + + .side2 { + display: none; + } +} diff --git a/style/js/desktop5.js b/style/js/desktop5.js new file mode 100644 index 0000000..14561bf --- /dev/null +++ b/style/js/desktop5.js @@ -0,0 +1,135 @@ +const options = document.querySelectorAll('.options') + +function put() { + options.forEach(cur => cur.classList.remove('options1')) + this.classList.add('options1') +} + +options.forEach(cur => cur.addEventListener('click', put)) + + + + + + + +var ctx = document.getElementById('myChart').getContext('2d'); +var ctx2 = document.getElementById('myChart2').getContext('2d'); +var ctx3 = document.getElementById('myChart3').getContext('2d'); +var ctx4 = document.getElementById('myChart4').getContext('2d'); + + +var myChart = new Chart(ctx, { + type: 'pie', + data: { + labels: ['Male ', 'Female'], + datasets: [{ + label: '# of Votes', + data: [9, 27], + backgroundColor: [ + '#F0C419', + '#71C285' + ], + borderWidth: 1 + }] + }, + options: { + title: { + display: true, + text: 'Gender', + position: 'top' + }, + legend: { + display: true, + position: 'bottom', + } + } +}); + +// chart 2 + +var myChart2 = new Chart(ctx2, { + type: 'pie', + data: { + labels: ['Abuja', 'Lagos', 'Jos '], + datasets: [{ + label: '# of Votes', + data: [9, 5, 22], + backgroundColor: [ + '#F0C419', + '#71C285', + '#556080' + ], + borderWidth: 1 + }] + }, + options: { + title: { + display: true, + text: 'Location', + position: 'top' + }, + legend: { + display: true, + position: 'bottom', + } + } +}); + +// chart 3 + +var myChart3 = new Chart(ctx3, { + type: 'pie', + data: { + labels: ['Airtel', 'MTN'], + datasets: [{ + label: '# of Votes', + data: [4, 32], + backgroundColor: [ + '#F0C419', + '#F0785A' + ], + borderWidth: 1 + }] + }, + options: { + title: { + display: true, + text: 'Mobile Networks', + position: 'top' + }, + legend: { + display: true, + position: 'bottom', + } + } +}); + +// chart 4 + +var myChart4 = new Chart(ctx4, { + type: 'pie', + data: { + labels: ['IOS ', 'Android'], + datasets: [{ + label: '# of Votes', + data: [8, 28], + backgroundColor: [ + '#B771C2', + '#19F0F0' + ], + borderWidth: 1 + }] + }, + options: { + title: { + display: true, + text: 'Phone', + position: 'top' + }, + legend: { + display: true, + position: 'bottom', + } + } +}); \ No newline at end of file diff --git a/style/js/main.js b/style/js/main.js new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/style/js/main.js @@ -0,0 +1 @@ + From d0ba866d1c04259df998cde91e866e6ef91246e3 Mon Sep 17 00:00:00 2001 From: Olaniyi Oshunbote Date: Sat, 26 Oct 2019 01:53:15 +0100 Subject: [PATCH 084/121] working on setting account/payment and prepping deployment --- Setting_account.html | 343 +++++++++++---------- car-park-users.html | 272 ++++++++++------- overview.html => index.html | 0 search.php | 39 +++ settings-payment.html | 589 ++++++++++++++++++++---------------- 5 files changed, 714 insertions(+), 529 deletions(-) rename overview.html => index.html (100%) create mode 100644 search.php diff --git a/Setting_account.html b/Setting_account.html index 507ae35..ec22d0c 100644 --- a/Setting_account.html +++ b/Setting_account.html @@ -1,5 +1,6 @@ + @@ -10,11 +11,12 @@ +
@@ -155,110 +185,119 @@
CAR PARK APPLICATION
- +
-
-
-
- -
-
-
Personal inforation The information can be edited from your profile page. - Save
-

-
-
-
- First Name - -
-
- Last Name - -
-
-
-
- Email - -
-
-
-
we will use this email if we need to contact you about your account



-
-
- -
-
-
- -
-
- -
-
- -
-
+
+
+
+ +
+
+
Personal inforation + The + information can be edited from your profile page. + Save
+
+

+
+
+
+ First Name + +
+
+ Last Name + +
+
+
+
+ Email + +
+
+
+
we will use this email if we need to contact + you about your account



+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
-
- - - - + + + + // Collapse/Expand icon + $('#collapse-icon').toggleClass('fa-angle-double-right fa-angle-double-left'); + } + }); + // Collapse click + $('[data-toggle=sidebar-container]').click(function () { + SidemenuCollapse(); + }); + //Collapse Side Menu + function SidemenuCollapse() { + $('#sidebar-container').toggleClass('d-none'); + // Collapse/Expand icon + $('#collapse-menu').toggleClass('fa-angle-double-right fa-angle-double-left'); + } + + //Hide Menu on Load + $(document).ready(function () { + $('#sidebar-container').toggleClass('d-none'); + }) + $(document).ready(function () { + $('.menu-collapsed').toggleClass('d-none'); + $('.sidebar-submenu').toggleClass('d-none'); + $('.submenu-icon').toggleClass('d-none'); + $('#sidebar-container').toggleClass('sidebar-expanded sidebar-collapsed'); + + // Collapse/Expand icon + $('#collapse-icon').toggleClass('fa-angle-double-left fa-angle-double-right'); + }) + + \ No newline at end of file diff --git a/car-park-users.html b/car-park-users.html index 731bc77..413d3e6 100644 --- a/car-park-users.html +++ b/car-park-users.html @@ -1,5 +1,6 @@ + @@ -10,115 +11,145 @@ +
-
+
+ + + + + - - - + // Collapse/Expand icon + $('#collapse-icon').toggleClass('fa-angle-double-right fa-angle-double-left'); + } + }); + // Collapse click + $('[data-toggle=sidebar-container]').click(function () { + SidemenuCollapse(); + }); + //Collapse Side Menu + function SidemenuCollapse() { + $('#sidebar-container').toggleClass('d-none'); + // Collapse/Expand icon + $('#collapse-menu').toggleClass('fa-angle-double-right fa-angle-double-left'); + } + //Hide Menu on Load + $(document).ready(function () { + $('#sidebar-container').toggleClass('d-none'); + }) + $(document).ready(function () { + $('.menu-collapsed').toggleClass('d-none'); + $('.sidebar-submenu').toggleClass('d-none'); + $('.submenu-icon').toggleClass('d-none'); + $('#sidebar-container').toggleClass('sidebar-expanded sidebar-collapsed'); + + // Collapse/Expand icon + $('#collapse-icon').toggleClass('fa-angle-double-left fa-angle-double-right'); + }) + - + + \ No newline at end of file diff --git a/overview.html b/index.html similarity index 100% rename from overview.html rename to index.html diff --git a/search.php b/search.php new file mode 100644 index 0000000..f22afb8 --- /dev/null +++ b/search.php @@ -0,0 +1,39 @@ + + + + + + + Search results + + + + + + = $min_length) { + $query = htmlspecialchars($query); + $query = mysql_real_escape_string($query); + $raw_results = mysql_query("SELECT * FROM carparks + WHERE (`title` LIKE '%" . $query . "%') OR (`text` LIKE '%" . $query . "%')") or die(mysql_error()); + + if (mysql_num_rows($raw_results) > 0) { + while ($results = mysql_fetch_array($raw_results)) { + echo "

" . $results['title'] . "

" . $results['text'] . "

"; + } + } else { + echo "No results"; + } + } else { + echo "Minimum length is " . $min_length; + } + ?> + + + \ No newline at end of file diff --git a/settings-payment.html b/settings-payment.html index 2ddb756..b39fcee 100644 --- a/settings-payment.html +++ b/settings-payment.html @@ -1,5 +1,6 @@ + @@ -9,243 +10,299 @@ - + +
@@ -256,136 +313,146 @@
CAR PARK APPLICATION
- +
-
-
-

Payment History

-

Every payment details are made available here

+
+
+

Payment History

+

Every payment details are made available here

- - - +
+ + + +

-

Search for people by

-
- - -
+

Search for people by

+
+ + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateReference NumberDescriptionAmountPayment Method
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
DateReference NumberDescriptionAmountPayment Method
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
2/2/2020ID2712JJJGPark FeeN20.00Visa :
-
+
+
-
+
-
- \ No newline at end of file + + \ No newline at end of file From d72249f6b53b2bc44e4ddb06a215cf4791fa4cba Mon Sep 17 00:00:00 2001 From: Olaniyi Oshunbote Date: Sat, 26 Oct 2019 02:08:12 +0100 Subject: [PATCH 085/121] testing auto-deployment --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 1c7ff1f..4ea6382 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - Car Park Admin + Ce0la Park Admin From bf25c651f0cb763da54b5eed87ac4a6229680056 Mon Sep 17 00:00:00 2001 From: Olaniyi Oshunbote Date: Sat, 26 Oct 2019 02:15:28 +0100 Subject: [PATCH 086/121] testing auto-deployment --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 4ea6382..9718425 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - Ce0la Park Admin + Adedoyin Park Admin From 74bf489907a724eeddc647a633d109f8581a0c7b Mon Sep 17 00:00:00 2001 From: Olaniyi Oshunbote Date: Sat, 26 Oct 2019 02:26:08 +0100 Subject: [PATCH 087/121] auto-deployment now functional --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 9718425..1c7ff1f 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - Adedoyin Park Admin + Car Park Admin From de68a7b9e561c1f6930dcb64af371683ab6367c6 Mon Sep 17 00:00:00 2001 From: Olaniyi Oshunbote Date: Sat, 26 Oct 2019 02:49:54 +0100 Subject: [PATCH 088/121] updating db details --- search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/search.php b/search.php index f22afb8..013e68c 100644 --- a/search.php +++ b/search.php @@ -1,5 +1,5 @@ @@ -22,7 +22,7 @@ $query = mysql_real_escape_string($query); $raw_results = mysql_query("SELECT * FROM carparks WHERE (`title` LIKE '%" . $query . "%') OR (`text` LIKE '%" . $query . "%')") or die(mysql_error()); - + if (mysql_num_rows($raw_results) > 0) { while ($results = mysql_fetch_array($raw_results)) { echo "

" . $results['title'] . "

" . $results['text'] . "

"; From f8d3b821dad41b31a2705f7e1d8a489b8fcf55be Mon Sep 17 00:00:00 2001 From: Olaniyi Oshunbote Date: Sat, 26 Oct 2019 03:27:49 +0100 Subject: [PATCH 089/121] tweaking files under task assigned; pay-history and add-account --- Setting_account.html => add-account.html | 12 +++---- add-user.php | 39 +++++++++++++++++++++++ settings-payment.html => pay-history.html | 0 3 files changed, 45 insertions(+), 6 deletions(-) rename Setting_account.html => add-account.html (95%) create mode 100644 add-user.php rename settings-payment.html => pay-history.html (100%) diff --git a/Setting_account.html b/add-account.html similarity index 95% rename from Setting_account.html rename to add-account.html index ec22d0c..7e8304e 100644 --- a/Setting_account.html +++ b/add-account.html @@ -197,30 +197,30 @@
CAR PARK APPLICATION
-
+
Personal inforation The information can be edited from your profile page. - Save
+


First Name - +
Last Name - +
Email - +
diff --git a/add-user.php b/add-user.php new file mode 100644 index 0000000..ce2517a --- /dev/null +++ b/add-user.php @@ -0,0 +1,39 @@ + \ No newline at end of file diff --git a/settings-payment.html b/pay-history.html similarity index 100% rename from settings-payment.html rename to pay-history.html From 0f32b9955459da5db4360f442aa6bd066e7062b3 Mon Sep 17 00:00:00 2001 From: Olaniyi Oshunbote Date: Sat, 26 Oct 2019 03:51:50 +0100 Subject: [PATCH 090/121] tweaking files under task assigned; pay-history and add-account --- add-user.php | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/add-user.php b/add-user.php index ce2517a..27cfb21 100644 --- a/add-user.php +++ b/add-user.php @@ -1,18 +1,16 @@ \ No newline at end of file From 2684f1f7455821a266186f002f63da84e99db740 Mon Sep 17 00:00:00 2001 From: Olaniyi Oshunbote Date: Sat, 26 Oct 2019 04:09:38 +0100 Subject: [PATCH 091/121] tweaking files under task assigned; pay-history and add-account --- add-account.html | 12 ++++++------ admin-analytics.html | 6 +++--- car-park-users.html | 10 +++++----- demographics.html | 6 +++--- desktop10.html | 6 +++--- desktop11,.html | 6 +++--- desktop9.html | 6 +++--- index.html | 6 +++--- mailSupport.html | 4 ++-- mail_campaign.html | 4 ++-- newUsers.html | 8 ++++---- pay-history.html | 8 ++++---- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/add-account.html b/add-account.html index 7e8304e..a2e5857 100644 --- a/add-account.html +++ b/add-account.html @@ -98,7 +98,7 @@ Menu
- @@ -132,7 +132,7 @@ - @@ -187,9 +187,9 @@
CAR PARK APPLICATION
@@ -210,11 +210,11 @@
CAR PARK APPLICATION
First Name - +
Last Name - +
diff --git a/admin-analytics.html b/admin-analytics.html index 6bbc94e..2e41092 100644 --- a/admin-analytics.html +++ b/admin-analytics.html @@ -500,7 +500,7 @@ Menu
- + Dashboard Dashboard @@ -521,7 +521,7 @@ - + Settings Settings @@ -572,7 +572,7 @@
CAR PARK APPLICATION
- Overview + Overview Analytics Demographics
diff --git a/car-park-users.html b/car-park-users.html index 413d3e6..2afa54d 100644 --- a/car-park-users.html +++ b/car-park-users.html @@ -98,7 +98,7 @@ Menu
- @@ -138,7 +138,7 @@ - @@ -199,10 +199,10 @@
CAR PARK APPLICATION
@@ -214,7 +214,7 @@
CAR PARK APPLICATION
Users Your users are made available here - Add New Member diff --git a/demographics.html b/demographics.html index b8701e1..8d19a0b 100644 --- a/demographics.html +++ b/demographics.html @@ -29,7 +29,7 @@ Menu
- @@ -61,7 +61,7 @@ - @@ -114,7 +114,7 @@
CAR PARK APPLICATION
diff --git a/desktop10.html b/desktop10.html index b2aa91b..655fc25 100644 --- a/desktop10.html +++ b/desktop10.html @@ -222,7 +222,7 @@ - @@ -278,7 +278,7 @@ - @@ -371,7 +371,7 @@
CAR PARK APPLICATION
-
Overview
+
Overview
Analytics
Demographics
diff --git a/desktop11,.html b/desktop11,.html index 9cf0667..f228ca0 100644 --- a/desktop11,.html +++ b/desktop11,.html @@ -272,7 +272,7 @@ Menu
- + Dashboard Dashboard @@ -296,7 +296,7 @@ - + Settings Settings @@ -342,7 +342,7 @@
CAR PARK APPLICATION
diff --git a/desktop9.html b/desktop9.html index f5aa088..2e0b157 100644 --- a/desktop9.html +++ b/desktop9.html @@ -24,7 +24,7 @@ Menu
- + Dashboard Dashboard @@ -53,7 +53,7 @@ - + Settings Settings @@ -125,7 +125,7 @@
CAR PARK APPLICATION
Print print Download -  Go Back +  Go Back diff --git a/index.html b/index.html index 1c7ff1f..eee1586 100644 --- a/index.html +++ b/index.html @@ -216,7 +216,7 @@ Menu
- + Dashboard Dashboard @@ -239,7 +239,7 @@ - + Settings Settings @@ -285,7 +285,7 @@
CAR PARK APPLICATION
diff --git a/mailSupport.html b/mailSupport.html index 04a62ef..ce00f45 100644 --- a/mailSupport.html +++ b/mailSupport.html @@ -276,7 +276,7 @@ Menu
- + Dashboard Dashboard @@ -300,7 +300,7 @@ - + Settings Settings diff --git a/mail_campaign.html b/mail_campaign.html index 1a4af51..b5ff7a8 100644 --- a/mail_campaign.html +++ b/mail_campaign.html @@ -229,7 +229,7 @@ Menu
- + Dashboard Dashboard @@ -252,7 +252,7 @@ - + Settings Settings diff --git a/newUsers.html b/newUsers.html index cbaa19f..a675198 100644 --- a/newUsers.html +++ b/newUsers.html @@ -227,7 +227,7 @@ Menu
- @@ -261,7 +261,7 @@ - @@ -321,7 +321,7 @@

CAR PARK APPLICATION

- Overview + Overview Analytics Demographics
@@ -359,7 +359,7 @@

CAR PARK APPLICATION

diff --git a/pay-history.html b/pay-history.html index b39fcee..2f088c9 100644 --- a/pay-history.html +++ b/pay-history.html @@ -229,7 +229,7 @@ Menu
- @@ -315,7 +315,7 @@
CAR PARK APPLICATION
@@ -323,10 +323,10 @@
CAR PARK APPLICATION
From b1cf65732279fda7e6d865a4386aaf19e0eef267 Mon Sep 17 00:00:00 2001 From: Nene-Esther <54372282+Nene-Esther@users.noreply.github.com> Date: Sat, 26 Oct 2019 10:39:46 +0100 Subject: [PATCH 092/121] index.html UwemEsther Added a feature that logs out inactive user. Can be tested using this url https://nene-esther.github.io/Car-Park-App-Web/ --- index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/index.html b/index.html index eee1586..4ff5fcf 100644 --- a/index.html +++ b/index.html @@ -1,3 +1,18 @@ + + + + From 9afb58395d0e80e3b601dae23a97911856231ce2 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 26 Oct 2019 18:33:50 +0100 Subject: [PATCH 093/121] sidebar-for-mobile --- css/Desktop5.css | 17 +++++++++++++++++ demographics.html | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/css/Desktop5.css b/css/Desktop5.css index 59e5f36..8fc60a0 100644 --- a/css/Desktop5.css +++ b/css/Desktop5.css @@ -308,6 +308,23 @@ a:hover { padding-right: 60px; } */ + .move { + position: relative; + left: 45px; + } + + .relative { + position: absolute !important; + left: 0 !important; + z-index: 1 !important; + width: 100% !important; + } + + .relate { + position: absolute; + z-index: 2 + } + } @media only screen and (max-width: 933px) { diff --git a/demographics.html b/demographics.html index b8701e1..e319222 100644 --- a/demographics.html +++ b/demographics.html @@ -75,7 +75,7 @@
-
+
-
-
-

Welcome back Admin

-
CAR PARK APPLICATION
+
+
+

Welcome back Admin

+
CAR PARK APPLICATION
-
-
-<<<<<<< HEAD:settings_account.html -

Welcome back Admin

-=======

Welcome back Admin

->>>>>>> 8da137838eef6e55d6d741bc95716180254b7aaf:manageparks.html
CAR PARK APPLICATION
-======= - Add Car Parks - Manage Car Parks - Car Park Status - -
-
-
-
-

Car Parks

-

All Car Parks appears here

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name Of Car Park
Name Of Car Park's Owner
Address
Phone Number
Active
Deactivate
Delete
Lekki Garden's
Mr Charles
Lekki Phase 1
08176253638
✔
✖
delete
MKO Park
Mr. MKO
Jakande Ajah
07013878921
✔
✖
delete
-
-
- - - ->>>>>>> 8da137838eef6e55d6d741bc95716180254b7aaf:manageparks.html
-<<<<<<< HEAD:settings_account.html -======= - ->>>>>>> 8da137838eef6e55d6d741bc95716180254b7aaf:manageparks.html @@ -572,8 +470,4 @@

Car Parks

}) -<<<<<<< HEAD:settings_account.html - -======= ->>>>>>> 8da137838eef6e55d6d741bc95716180254b7aaf:manageparks.html From b5ea0b24f83ea6ff26b30d0fad102125b06931b7 Mon Sep 17 00:00:00 2001 From: emmypuch Date: Tue, 29 Oct 2019 20:46:34 +0100 Subject: [PATCH 109/121] Updated account settings page --- settings_account.html | 712 +++++++++++++++++------------------------- 1 file changed, 280 insertions(+), 432 deletions(-) diff --git a/settings_account.html b/settings_account.html index 2c7194e..0e94f46 100644 --- a/settings_account.html +++ b/settings_account.html @@ -1,473 +1,321 @@ - - - - - Car Park Admin - - - - - + -.scrollbar{ - margin: 0 auto; - flex: 0 0 100%; -} - -.col-8{ - flex: 0 0 50%; -} - -.col-4{ - position: absolute; - top: 57%; - left: 20%; -} -.text-muted p{ - line-height: .5rem; -} -} - -@media (max-width: 768px){ - - -.col-10{ - flex: 0 0 100%; - max-width: 100%; -} - -.scrollbar{ - margin: 0 auto; - flex: 0 0 60%; -} -} - -@media (max-width: 1240px){ - -.col-10{ - flex: 0 0 100%; - max-width: 100%; -} - -.scrollbar{ - margin: 0 auto; - flex: 0 0 50%; -} -} -.container { - margin-top: 2rem; - padding-left: 0; - padding-right: 0; - border: 2px solid #ccc !important; - border-radius: 20px; - padding-bottom:2rem; - } - - .header { - width: 100%; - height: 100%; - background: #FFFFFF; - height: 45px; - border-bottom: 2px solid #ccc; - } - - .nav-items { - width: 50%; - min-width: auto; - min-width: 345px; - list-style: none; - display: flex; - padding: 0 3rem; - align-items: flex-start; - justify-content: space-between; - } - - .nav-item { - padding: 0.5rem 0rem; - } - - .nav-item:active { - border-bottom: 2px solid #1A73E8; - } - - .nav-item a { - text-decoration: none; - color: #777777; - } - - .nav-item a:hover { - color: #1A73E8; - } - - .park-header { - margin: 1rem 0 !important; - padding: 0rem 2rem; - } - - .desc { - font-size: 0.8rem !important; - color: #66788A !important; - padding-left: 1.5rem; - } - #pencil { - margin-left: 30px; - color: gray; - } - #cancel { - margin-right: 0 !important; - padding-left: 22px; - margin-bottom: 10px; -} -.fa-times { - color: white; -} - -a:hover { - text-decoration: none; -} - - - -
-
- + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
- -
-
-

Welcome back Admin

-
CAR PARK APPLICATION
-
-
-
+
-
-
+
+
-
-
- -
-
-
Personal inforation The information can be edited from your profile page. - Save
-

-
-
-
- First Name - -
-
- Last Name - -
-
-
-
- Email - -
-
-
-
we will use this email if we need to contact you about your account



-
-
- -
-
-
- -
-
- -
-
- -
-
-
-
+
+
+ +
+
+
Personal + information + The + information can be edited from your profile page. + Save +
+
+
+
+
+
+
+ First Name + +
+
+ Last Name + +
+
+
+
+ Email + +
+
+
+
we will use this email if we need to + contact you + about your account +
+


+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ + + + + - - - + -//Hide Menu on Load -$(document).ready(function(){ - $('#sidebar-container').toggleClass('d-none'); -}) -$(document).ready(function(){ - $('.menu-collapsed').toggleClass('d-none'); - $('.sidebar-submenu').toggleClass('d-none'); - $('.submenu-icon').toggleClass('d-none'); - $('#sidebar-container').toggleClass('sidebar-expanded sidebar-collapsed'); - - // Collapse/Expand icon - $('#collapse-icon').toggleClass('fa-angle-double-left fa-angle-double-right'); -}) - - From c54b6614e7a81c072c50eb808430bac6e5d16a2d Mon Sep 17 00:00:00 2001 From: Olaniyi Oshunbote Date: Tue, 29 Oct 2019 21:09:19 +0100 Subject: [PATCH 110/121] resolved broken links --- add-account.html | 6 +++--- admin_analytic.html => admin-analytics.html | 0 dashboard_demographics.html => demographics.html | 0 index.html | 4 ++-- mail_support.html => mail-support.html | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename admin_analytic.html => admin-analytics.html (100%) rename dashboard_demographics.html => demographics.html (100%) rename mail_support.html => mail-support.html (100%) diff --git a/add-account.html b/add-account.html index a2e5857..cf33563 100644 --- a/add-account.html +++ b/add-account.html @@ -111,7 +111,7 @@ - @@ -122,7 +122,7 @@ - @@ -188,7 +188,7 @@
CAR PARK APPLICATION
diff --git a/admin_analytic.html b/admin-analytics.html similarity index 100% rename from admin_analytic.html rename to admin-analytics.html diff --git a/dashboard_demographics.html b/demographics.html similarity index 100% rename from dashboard_demographics.html rename to demographics.html diff --git a/index.html b/index.html index 2a120cd..75785be 100644 --- a/index.html +++ b/index.html @@ -240,14 +240,14 @@ - + Mail Mail - + Users Users diff --git a/mail_support.html b/mail-support.html similarity index 100% rename from mail_support.html rename to mail-support.html From f80078a1547debb907cc89e6918c481e34b519b0 Mon Sep 17 00:00:00 2001 From: BRENDAN DEVELOPS <54499726+brendandevelops@users.noreply.github.com> Date: Tue, 29 Oct 2019 21:18:36 +0100 Subject: [PATCH 111/121] Add files via upload test url https://testbrendan.000webhostapp.com/desktop8.html --- desktop8 update.html | 820 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 820 insertions(+) create mode 100644 desktop8 update.html diff --git a/desktop8 update.html b/desktop8 update.html new file mode 100644 index 0000000..6a68fb6 --- /dev/null +++ b/desktop8 update.html @@ -0,0 +1,820 @@ + + + + + + + Car Park Admin + + + + + + +
+
+ + +
+ +
+
+

Welcome back Admin

+
CAR PARK APPLICATION
+
+
+
+ +
+
+ +
+
+
+
+
New Users
+
+
+
+ + +
+
+

16

+
+
+
+
+ +
+
+
+
+
Exisiting Users
+
+
+
+ + +
+
+

250

+
+
+
+
+ +
+
+
+
+
Issues
+
+
+
+ + +
+
+

4

+
+
+
+
+ +
+
+
+
+
Car Park
+
+
+
+ + +
+
+

18

+
+
+
+
+
+

Car Park Locations

+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ Add Park +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + +
+
+ Add Park +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + + + +
+
+ Add Park +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ Add Park +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ Add Park +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ Add Park +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ Add Park +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ Add Park +
+
+
+
+ +
+
+
+ + + + + + + \ No newline at end of file From 383f75844b0893cb31df8d126f7d02115477648a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Oct 2019 21:19:26 +0100 Subject: [PATCH 112/121] update --- css/Desktop5.css | 19 + dashboard_demographics.html | 14 +- desktop11,.html => desktop11.html | 962 +++++++++++++++--------------- 3 files changed, 508 insertions(+), 487 deletions(-) rename desktop11,.html => desktop11.html (97%) diff --git a/css/Desktop5.css b/css/Desktop5.css index 372fcea..305435e 100644 --- a/css/Desktop5.css +++ b/css/Desktop5.css @@ -1,3 +1,7 @@ +.html { + margin-top: 0 !important; +} + #body-row { margin-left:0; margin-right:0; @@ -106,6 +110,21 @@ body { color: white; } +.john { + font-size: 25px; + line-height: 29px; + font-weight: normal; + color: #777777; + margin-bottom: 0; +} + +.en { + font-size: 25px; + line-height: 29px; + color: #777777; + font-weight: normal; +} + a:hover { text-decoration: none; } diff --git a/dashboard_demographics.html b/dashboard_demographics.html index dbf5d04..df7f783 100644 --- a/dashboard_demographics.html +++ b/dashboard_demographics.html @@ -14,7 +14,7 @@ -
+
@@ -369,7 +319,7 @@
-
+
@@ -379,87 +329,31 @@ -<<<<<<< HEAD:settings_account.html - -======= ->>>>>>> 8da137838eef6e55d6d741bc95716180254b7aaf:manageparks.html
-<<<<<<< HEAD:settings_account.html -======= ->>>>>>> 8da137838eef6e55d6d741bc95716180254b7aaf:manageparks.html @@ -572,8 +462,4 @@

Car Parks

}) -<<<<<<< HEAD:settings_account.html - -======= ->>>>>>> 8da137838eef6e55d6d741bc95716180254b7aaf:manageparks.html From b4df926c2d199309daf7eb592c87d92143d8948e Mon Sep 17 00:00:00 2001 From: BRENDAN DEVELOPS <54499726+brendandevelops@users.noreply.github.com> Date: Thu, 31 Oct 2019 21:25:32 +0100 Subject: [PATCH 119/121] Add files via upload i corrected the side nav bar and also realigned the print and download icons as observed by @xyluz during presentation https://testbrendan.000webhostapp.com/mail-support-update.html --- mail-support-update.html | 533 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 533 insertions(+) create mode 100644 mail-support-update.html diff --git a/mail-support-update.html b/mail-support-update.html new file mode 100644 index 0000000..066e227 --- /dev/null +++ b/mail-support-update.html @@ -0,0 +1,533 @@ + + + + + + + Car Park Admin + + + + + + +
+
+ + +
+ + +
+ +
+
+
+
+ + + +
+
+ + +
+

J

+

My account debited but payme... October 21, 2019 + 21:00

+

John Utaka

+

Hi, my account was debited but payment for park space was + not processed...

+
+
+

M

+

My account debited but payme... October 21, 2019 + 21:00

+

John Utaka

+

Hi, my account was debited but payment for park space was + not processed...

+
+ +
+
+
+

J

+

John Utaka
john_u@gmail.com

+

Print

 +

Download

 +
My Account debited but payment not processed
+

Hi Admin,

+ +

my account was debited but payment for park space was not processed accordingly.

+ +

I have proof of invoice sent to me after payment was made, but when i checked + the car space i wanted to book, it’s saying that payment has not been process therefore park space cannot be booked.

+ +

I dont know what to do.

+ +

Kindly look into the situation and get back to me ASAP.

+ + +

Eagerly awaiting your response.

+ +

Thank you.

+ +
+ + +
+
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file From b2e69ad28e74e4bb5b8e9db9f54b48090827ed8e Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 1 Nov 2019 16:02:32 +0100 Subject: [PATCH 120/121] renaming-links --- demographics.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demographics.html b/demographics.html index 4ac363f..28c6a4e 100644 --- a/demographics.html +++ b/demographics.html @@ -42,7 +42,7 @@ - @@ -119,7 +119,7 @@
From 6c3783bf1d6d39dd4879cf4051f44db6a282e082 Mon Sep 17 00:00:00 2001 From: gthankgod <49327514+gthankgod@users.noreply.github.com> Date: Sat, 2 Nov 2019 09:23:04 +0100 Subject: [PATCH 121/121] Update desktop10.html --- desktop10.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop10.html b/desktop10.html index 9f423f8..7614765 100644 --- a/desktop10.html +++ b/desktop10.html @@ -10,6 +10,9 @@ + @@ -269,4 +272,4 @@
CAR PARK APPLICATION
- \ No newline at end of file +