From fd8caf98a6e15f339449b4ce67627cbb1e22796c Mon Sep 17 00:00:00 2001 From: Melora Hugues Date: Sat, 21 Oct 2023 23:46:06 +0200 Subject: [PATCH 1/4] feat #6: Add logo to all page headers --- polyculeconnect/static/style/index.css | 14 ++++++++++++++ polyculeconnect/templates/header.html | 11 ++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 polyculeconnect/static/style/index.css diff --git a/polyculeconnect/static/style/index.css b/polyculeconnect/static/style/index.css new file mode 100644 index 0000000..461d07c --- /dev/null +++ b/polyculeconnect/static/style/index.css @@ -0,0 +1,14 @@ +body { + margin: 0; +} + +.site-header { + width: 100%; + display: flex; + padding: 10px; + margin-bottom: 40px; + + .site-logo img { + height: 100px; + } +} diff --git a/polyculeconnect/templates/header.html b/polyculeconnect/templates/header.html index b1d2e1d..a1b9f04 100644 --- a/polyculeconnect/templates/header.html +++ b/polyculeconnect/templates/header.html @@ -7,6 +7,8 @@ PolyculeConnect + + @@ -16,4 +18,11 @@ - \ No newline at end of file + + +
+ + +
\ No newline at end of file -- 2.45.2 From 008362420497d19fb8131c35fb0131498302a62e Mon Sep 17 00:00:00 2001 From: Melora Hugues Date: Sat, 21 Oct 2023 23:46:26 +0200 Subject: [PATCH 2/4] feat #6: Add style for auth page --- polyculeconnect/static/style/index.css | 80 ++++++++++++++++++++++++++ polyculeconnect/templates/login.html | 22 +++++-- 2 files changed, 96 insertions(+), 6 deletions(-) diff --git a/polyculeconnect/static/style/index.css b/polyculeconnect/static/style/index.css index 461d07c..80586bf 100644 --- a/polyculeconnect/static/style/index.css +++ b/polyculeconnect/static/style/index.css @@ -1,4 +1,26 @@ +:root { + --crust: #dce0e8; + --mantle: #e6e9ef; + --base: #eff1f5; + --surface-0: #ccd0da; + --surface-1: #bcc0cc; + --surface-2: #acb0be; + --overlay-0: #9ca0b0; + --overlay-1: #8c8fa1; + --overlay-2: #7c7f93; + --subtext-0: #6c6f85; + --subtext-1: #5c5f77; + --text: #4c4f69; + + --logo-purple: #340c46; + --logo-yellow: #fcbf00; + --logo-pink: #e50051; + --logo-blue: #009fe3; +} + body { + background-color: var(--base); + color: var(--text); margin: 0; } @@ -12,3 +34,61 @@ body { height: 100px; } } + +.container { + background-color: var(--mantle); + display: grid; + grid-template-columns: 1; + row-gap: 20px; + padding: 15px 50px; + max-width: 50%; + width: fit-content; + margin: auto; + border: 1px solid var(--surface-0); + border-radius: 5px; +} + +.container-content { + margin-bottom: 10px; + margin-top: 10px; +} + +.form-elements { + display: grid; + grid-template-columns: 1; + row-gap: 10px; + margin-bottom: 15px; + padding: 0 10px; +} + +.form-buttons { + display: flex; + justify-content: center; +} + +.form-input { + width: 100%; + padding: 5px; + box-sizing: border-box; +} + +.form-input::placeholder { + color: var(--subtext-1); +} + +.button { + border: none; + color: var(--mantle); + padding: 5px 20px; + border-radius: 3px; + text-align: center; + vertical-align: middle; + text-decoration: none; + display: inline-block; + font-size: medium; + cursor: pointer; +} + +.button-accept { + background-color: var(--logo-blue); +} \ No newline at end of file diff --git a/polyculeconnect/templates/login.html b/polyculeconnect/templates/login.html index cdb858e..094f7b2 100644 --- a/polyculeconnect/templates/login.html +++ b/polyculeconnect/templates/login.html @@ -2,12 +2,22 @@ -
-
- - - -
+
+
+ Enter the service to use for login. +
+ +
+
+
+ +
+
+ +
+
+
{{ template "footer.html" . }} \ No newline at end of file -- 2.45.2 From d18c91da23780c9c74a853befcc7636a510f1ad5 Mon Sep 17 00:00:00 2001 From: Melora Hugues Date: Sat, 4 Nov 2023 09:14:41 +0100 Subject: [PATCH 3/4] feat #32: improve approval UI --- polyculeconnect/static/style/index.css | 6 +++- polyculeconnect/templates/approval.html | 48 +++++++++++-------------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/polyculeconnect/static/style/index.css b/polyculeconnect/static/style/index.css index 80586bf..feb6197 100644 --- a/polyculeconnect/static/style/index.css +++ b/polyculeconnect/static/style/index.css @@ -63,7 +63,7 @@ body { .form-buttons { display: flex; - justify-content: center; + justify-content: space-between; } .form-input { @@ -91,4 +91,8 @@ body { .button-accept { background-color: var(--logo-blue); +} + +.button-cancel { + background-color: var(--logo-pink); } \ No newline at end of file diff --git a/polyculeconnect/templates/approval.html b/polyculeconnect/templates/approval.html index df734fc..f0097ad 100644 --- a/polyculeconnect/templates/approval.html +++ b/polyculeconnect/templates/approval.html @@ -1,42 +1,34 @@ {{ template "header.html" . }} -
-

Grant Access

- -
-
+
+
{{ if .Scopes }} -
{{ .Client }} would like to:
-
    +
    {{ .Client }} would like to:
    +
      {{ range $scope := .Scopes }}
    • {{ $scope }}
      • {{ end }}
    {{ else }} -
    {{ .Client }} has not requested any personal information
    +
    {{ .Client }} has not requested any personal information
    {{ end }}
-
-
-
-
- - - -
-
-
-
- - - -
-
+
+
+ + + +
+
+ + + +
-- 2.45.2 From 673eaeb10d84c81de03a0d854440281da208c81d Mon Sep 17 00:00:00 2001 From: Melora Hugues Date: Sat, 4 Nov 2023 09:31:29 +0100 Subject: [PATCH 4/4] feat #34: add error UI --- polyculeconnect/templates/error.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/polyculeconnect/templates/error.html b/polyculeconnect/templates/error.html index 4a9acbe..db78f4a 100644 --- a/polyculeconnect/templates/error.html +++ b/polyculeconnect/templates/error.html @@ -1,8 +1,10 @@ {{ template "header.html" . }} -
-

{{ .ErrType }}

-

{{ .ErrMsg }}

+
+
+

{{ .ErrType }}

+

{{ .ErrMsg }}

+
{{ template "footer.html" . }} \ No newline at end of file -- 2.45.2