From 7d465289970e94aa24bbb5475070e92b003f167d Mon Sep 17 00:00:00 2001 From: bekeplar Date: Wed, 12 Dec 2018 04:27:42 -0800 Subject: [PATCH 01/21] Add signin page [Delivers-#162602003] --- UI/static/main.css | 60 ++++++++++++++++++++++++++++++++++++++++ UI/templates/signup.html | 45 ++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 UI/static/main.css create mode 100644 UI/templates/signup.html diff --git a/UI/static/main.css b/UI/static/main.css new file mode 100644 index 0000000..a56789f --- /dev/null +++ b/UI/static/main.css @@ -0,0 +1,60 @@ +body{ + margin: 0px; + background-size: cover; + padding: 0; +} +h1{ + color: #d5d5d8; + font-size: 2em; + font-family: Arial, Helvetica, sans-serif; + margin-left: 5%; +} + +h3 { + text-align: center; + font-size: 30px; + color: rgb(42, 42, 110); +} +.top{ + margin: 2%; + font-size: 2em; + float: right; + +} +.top a{ + color: aqua; + text-decoration: none; +} +a:hover { + color: rgb(191, 255, 0); +} + +.dare { + padding-left: 20%; + padding-right: 30%; + padding-bottom: 5%; + padding-top: 0%; +} + input { + display: block; + width: 100%; + padding: 12px 20px; + display: inline-block; + border: 1px solid #ccc; + border-radius: 4px; + box-sizing: border-box; + display: block; + margin: 20px 25px 20px 25px; + } + button{ + border-radius: 15px; + padding: 5% 5%; + text-align: center; + width: 50%; + font-size: 60%; + + } + +.omega{ + background-color: green; +} \ No newline at end of file diff --git a/UI/templates/signup.html b/UI/templates/signup.html new file mode 100644 index 0000000..d6dfb53 --- /dev/null +++ b/UI/templates/signup.html @@ -0,0 +1,45 @@ + + + + + + iReporter signup! + + + + + +
+

iReporter

+ +
+ home + signin +
+ +
+

For corruption free systems.

+
+
+
+ +
+ +
+ +
+ + +
+
+
+ + \ No newline at end of file From 4aeeefd4d218a9ae43942d8614d30c9e2e3076fa Mon Sep 17 00:00:00 2001 From: bekeplar Date: Wed, 12 Dec 2018 05:27:57 -0800 Subject: [PATCH 02/21] Add signin page [Delivers-#162602040] --- UI/static/main.css | 3 +++ UI/templates/signin.html | 36 ++++++++++++++++++++++++++++++++++++ UI/templates/signup.html | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 UI/templates/signin.html diff --git a/UI/static/main.css b/UI/static/main.css index a56789f..56b5e15 100644 --- a/UI/static/main.css +++ b/UI/static/main.css @@ -57,4 +57,7 @@ a:hover { .omega{ background-color: green; +} +#flex{ + background-color: fuchsia; } \ No newline at end of file diff --git a/UI/templates/signin.html b/UI/templates/signin.html new file mode 100644 index 0000000..fb8c063 --- /dev/null +++ b/UI/templates/signin.html @@ -0,0 +1,36 @@ + + + + + + iReporter signin + + + + +
+

iReporter

+ +
+ home + signup +
+ +
+

For corruption free systems.

+
+
+
+ +
+ + +
+
+ + + \ No newline at end of file diff --git a/UI/templates/signup.html b/UI/templates/signup.html index d6dfb53..c4a7838 100644 --- a/UI/templates/signup.html +++ b/UI/templates/signup.html @@ -14,7 +14,7 @@

iReporter

From 8c257bd12dbdbff6794a1b8c208e47627947c328 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Wed, 12 Dec 2018 23:29:18 -0800 Subject: [PATCH 03/21] Add create red flag [Delivers-#162630386] --- UI/templates/incident.html | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 UI/templates/incident.html diff --git a/UI/templates/incident.html b/UI/templates/incident.html new file mode 100644 index 0000000..b2a1820 --- /dev/null +++ b/UI/templates/incident.html @@ -0,0 +1,33 @@ + + + + + + iReporter incident! + + + + +
+

iReporter

+ +
+ signout + signup +
+ +
+

For corruption free systems.

+
+
+
+ +

+
+
+
+ + \ No newline at end of file From c90cadd735d46c66bb42a1e4522d138266b081d6 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Wed, 12 Dec 2018 23:30:46 -0800 Subject: [PATCH 04/21] Add create intervention record [Delivers-#162630412] --- UI/templates/incident.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/UI/templates/incident.html b/UI/templates/incident.html index b2a1820..a6b9602 100644 --- a/UI/templates/incident.html +++ b/UI/templates/incident.html @@ -14,8 +14,7 @@

iReporter

- +

For corruption free systems.

From 96f00aa7990ccb3cc4f2377a9683a55e785c459d Mon Sep 17 00:00:00 2001 From: bekeplar Date: Wed, 12 Dec 2018 23:36:23 -0800 Subject: [PATCH 05/21] Add user add image/video file [Delivers-#162630467] --- UI/templates/incident.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UI/templates/incident.html b/UI/templates/incident.html index a6b9602..6576470 100644 --- a/UI/templates/incident.html +++ b/UI/templates/incident.html @@ -25,6 +25,10 @@

For corruption free systems.



+
+
From 036ae5caf7b9d9cf96aa0b0b374cae2b4ee24aba Mon Sep 17 00:00:00 2001 From: bekeplar Date: Wed, 12 Dec 2018 23:42:55 -0800 Subject: [PATCH 06/21] Add user add Geolocation [Delivers-#162630500] --- UI/templates/incident.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/UI/templates/incident.html b/UI/templates/incident.html index 6576470..76463fe 100644 --- a/UI/templates/incident.html +++ b/UI/templates/incident.html @@ -26,9 +26,19 @@

For corruption free systems.





+
+
+ +
+ + From 34fcb4dce8c99109d0248ba3c1f81e2fd079dbe8 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Wed, 12 Dec 2018 23:51:54 -0800 Subject: [PATCH 07/21] Add user add image file [Delivers-#162630438] --- UI/templates/incident.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/UI/templates/incident.html b/UI/templates/incident.html index 76463fe..a40634e 100644 --- a/UI/templates/incident.html +++ b/UI/templates/incident.html @@ -13,7 +13,7 @@

iReporter

For corruption free systems.

@@ -36,8 +36,7 @@

For corruption free systems.

Add geolocation:
-
- +
From b0029b32d1a377fa9c72ff552cb4cc33ff6ba543 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Fri, 14 Dec 2018 14:18:58 -0800 Subject: [PATCH 08/21] Add records page[Delivers-#162631442] --- UI/templates/index.html | 35 +++++++++++++++++++++++++++ UI/templates/records.html | 51 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 UI/templates/index.html create mode 100644 UI/templates/records.html diff --git a/UI/templates/index.html b/UI/templates/index.html new file mode 100644 index 0000000..04e535b --- /dev/null +++ b/UI/templates/index.html @@ -0,0 +1,35 @@ + + + + + + iReporter! + + + + +
+

iReporter

+ +
+
+ signup + signin +


+
+

Building corruption free systems.

+
+

iReporter enables any/every citizen to bring any form of corruption to
the notice of appropriate authorities and the general public.

Users can also report on things that need government intervention.

+
+ +
+ Copyright iReporter. All Rights Reserved. +
+
+ + \ No newline at end of file diff --git a/UI/templates/records.html b/UI/templates/records.html new file mode 100644 index 0000000..0ab68b3 --- /dev/null +++ b/UI/templates/records.html @@ -0,0 +1,51 @@ + + + + + + View iReports + + + + +
+

iReporter

+ +
+ signout + Report +
+
+

Building corruption free systems.

+
+ +
+
+

my iReports

+ + +
+
+ + \ No newline at end of file From 64fc1472bbd9a4098e2c257f9015097f71c05cec Mon Sep 17 00:00:00 2001 From: bekeplar Date: Fri, 14 Dec 2018 14:21:03 -0800 Subject: [PATCH 09/21] Add landing page[Delivers-#162602318] --- UI/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/templates/index.html b/UI/templates/index.html index 04e535b..b200ade 100644 --- a/UI/templates/index.html +++ b/UI/templates/index.html @@ -4,7 +4,7 @@ iReporter! - + From ebd40564b1765475edfe23901ca2fd04f6c83266 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Fri, 14 Dec 2018 18:54:44 -0800 Subject: [PATCH 10/21] Add admin login page --- UI/templates/admin.html | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 UI/templates/admin.html diff --git a/UI/templates/admin.html b/UI/templates/admin.html new file mode 100644 index 0000000..59000e5 --- /dev/null +++ b/UI/templates/admin.html @@ -0,0 +1,41 @@ + + + + + + iReporter signin + + + + +
+

iReporter

+ +
+ home + signup +
+
+

Building corruption free systems.

+
+
+ +

Admin signin

+


+
+ +
+ + +
+
+

Copyright iReporter. All Rights Reserved.

+
+
+
+ + \ No newline at end of file From de19a380d5e2f301db61f542a05abcade327f612 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Sat, 15 Dec 2018 11:07:59 -0800 Subject: [PATCH 11/21] Add user profile page [Delivers-#162631884] --- UI/templates/profile.html | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 UI/templates/profile.html diff --git a/UI/templates/profile.html b/UI/templates/profile.html new file mode 100644 index 0000000..a337d00 --- /dev/null +++ b/UI/templates/profile.html @@ -0,0 +1,72 @@ + + + + + + Page Title + + + + +
+

iReporter

+

+

Building corruption free systems.

+
+ + +
+

Name: Bekalaze

+

Location: Mukono

+

Email: bekeplar@gmail.com

+

contact: +256772787777

+ +
+
+

My iReporter Status

+ + + + + + + + + + + + + + + + + + + +
iReporterUnder invesigationResolvedRejected
Red flag542
Intervention305
+
+ + +
+
+ + \ No newline at end of file From 51c35c0a546245bd7797ff50ba001f9a4efd5381 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Sat, 15 Dec 2018 11:09:46 -0800 Subject: [PATCH 12/21] Add user profile page [Delivers-#162631910] --- UI/templates/profile.html | 1 - 1 file changed, 1 deletion(-) diff --git a/UI/templates/profile.html b/UI/templates/profile.html index a337d00..e58c426 100644 --- a/UI/templates/profile.html +++ b/UI/templates/profile.html @@ -24,7 +24,6 @@

Building corruption free systems.

Location: Mukono

Email: bekeplar@gmail.com

contact: +256772787777

-

My iReporter Status

From b6eae31a320792f053d5e66f00bfbd4b0e86d243 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Sat, 15 Dec 2018 11:16:04 -0800 Subject: [PATCH 13/21] Add user profile page [Delivers-#162631925] --- UI/templates/profile.html | 131 +++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 66 deletions(-) diff --git a/UI/templates/profile.html b/UI/templates/profile.html index e58c426..dc88d1b 100644 --- a/UI/templates/profile.html +++ b/UI/templates/profile.html @@ -1,71 +1,70 @@ - - - - Page Title - - - - -
-

iReporter

-

-

Building corruption free systems.

-
- - -
-

Name: Bekalaze

-

Location: Mukono

-

Email: bekeplar@gmail.com

-

contact: +256772787777

-
-
-

My iReporter Status

- - - - - - - - - - - - - - - - - - - -
iReporterUnder invesigationResolvedRejected
Red flag542
Intervention305
+ + + + iReporter profile + + + + +
+

iReporter

+

+

Building corruption free systems.

+
+ + +
+

Name: Bekalaze

+

Location: Mukono

+

Email: bekeplar@gmail.com

+

contact: +256772787777

- - -
- +

Status: resolved

+
+
+
+ \ No newline at end of file From bddf94f404f721d34ab5f7c2f20f8ee6761c9792 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Sat, 15 Dec 2018 11:26:53 -0800 Subject: [PATCH 14/21] Add user profile page [Delivers-#162631953] --- UI/templates/profile.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UI/templates/profile.html b/UI/templates/profile.html index dc88d1b..be22743 100644 --- a/UI/templates/profile.html +++ b/UI/templates/profile.html @@ -49,7 +49,7 @@

My iReporter Status

diff --git a/UI/templates/records.html b/UI/templates/records.html index 0ab68b3..beb4d0d 100644 --- a/UI/templates/records.html +++ b/UI/templates/records.html @@ -1,5 +1,5 @@ - + @@ -13,18 +13,20 @@

iReporter

- +

Building corruption free systems.

-
- -
+

my iReports

+ + + -

Status: rejected

+

Status: under investigation

bekeplar

intervention

@@ -43,7 +45,7 @@

my iReports

Geolocation

Lat 0.11229 Long 0.4237

-

Status: rejected

+

Status: resolved

diff --git a/UI/templates/signin.html b/UI/templates/signin.html index fb8c063..0356450 100644 --- a/UI/templates/signin.html +++ b/UI/templates/signin.html @@ -8,18 +8,17 @@ -
+

iReporter

- - -

For corruption free systems.

+
+ >

+

Building corruption free systems.

-
+
@@ -28,9 +27,16 @@

For corruption free systems.

Password
- +

+
-
+
+

Copyright iReporter. All Rights Reserved.

+
+
+ \ No newline at end of file diff --git a/UI/templates/signup.html b/UI/templates/signup.html index c4a7838..f2a864c 100644 --- a/UI/templates/signup.html +++ b/UI/templates/signup.html @@ -1,5 +1,5 @@ - + @@ -15,11 +15,17 @@

iReporter

- - -

For corruption free systems.

+ + >

+

Building corruption free systems.

+

+

\ No newline at end of file From e8c048d782a96c7b7cd2465dae4af7c6f1f864d7 Mon Sep 17 00:00:00 2001 From: bekeplar Date: Sat, 15 Dec 2018 19:04:42 -0800 Subject: [PATCH 20/21] Add changes to signin page --- UI/templates/signin.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/UI/templates/signin.html b/UI/templates/signin.html index 0356450..cac073c 100644 --- a/UI/templates/signin.html +++ b/UI/templates/signin.html @@ -33,10 +33,9 @@

Building corruption free systems.

-

Copyright iReporter. All Rights Reserved.

-
+

Copyright iReporter. All Rights Reserved.

+ - \ No newline at end of file From 84aa411fc8328d4a808a1a911be880fd315f0afc Mon Sep 17 00:00:00 2001 From: bekeplar Date: Mon, 17 Dec 2018 10:22:52 -0800 Subject: [PATCH 21/21] Add changes to Admin,profile and signup pages --- UI/static/main.css | 27 +++++++++++++++++++-------- UI/templates/admin_dashboard.html | 7 ++++--- UI/templates/profile.html | 2 +- UI/templates/signup.html | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/UI/static/main.css b/UI/static/main.css index f613e77..40ac87a 100644 --- a/UI/static/main.css +++ b/UI/static/main.css @@ -1,7 +1,7 @@ body{ margin: 0px; background-size: cover; - padding: 0; + padding-right: 0; } h1{ color: #d5d5d8; @@ -95,37 +95,48 @@ a:hover { } .flex{ background-color: rgb(243, 25, 243); - color: rgb(13, 255, 0) + color: rgb(13, 255, 0); + margin-right: 0%; + } -table{ +table +{ border: 1px solid white; border-collapse: collapse; padding-bottom: 20%; padding-right: 50%; + padding-left: 50%; + padding-right: 50%; + overflow-x: auto; + width: 50%; } table th{ border: 1px solid white; text-align: center; - height: 50px; + height: 50%; } table td{ border: 1px solid white; text-align: center; - height: 70px; + height: 70%; } th { background-color: #4CAF50; color: white; } -tr:nth-child(even) { +/*tr:nth-child(even) { background-color: #f2f2f2; -} -tr:hover { +}*/ + +tr:hover background-color: #f5e72c; } th:hover { background-color: #4f52ff; +} +label{ + padding-left: 30%; } \ No newline at end of file diff --git a/UI/templates/admin_dashboard.html b/UI/templates/admin_dashboard.html index a1034a0..e6d8ad9 100644 --- a/UI/templates/admin_dashboard.html +++ b/UI/templates/admin_dashboard.html @@ -8,20 +8,21 @@ -
+

iReporter



Building corruption free systems.

+

Admin dashboard

All iReports

- +
diff --git a/UI/templates/profile.html b/UI/templates/profile.html index 306053d..499a43b 100644 --- a/UI/templates/profile.html +++ b/UI/templates/profile.html @@ -11,7 +11,7 @@

iReporter



diff --git a/UI/templates/signup.html b/UI/templates/signup.html index f2a864c..1939fee 100644 --- a/UI/templates/signup.html +++ b/UI/templates/signup.html @@ -40,7 +40,7 @@

Building corruption free systems.



category