From b1791b8e8dbcbae0a19ec76d8f323d220409662a Mon Sep 17 00:00:00 2001 From: Jianger Date: Mon, 17 Apr 2023 03:16:05 +0200 Subject: [PATCH 1/5] /attend-event styled --- src/pages/AttendEvent/AttendEvent.js | 14 ++++-- src/pages/AttendEvent/AttendEvent.scss | 62 ++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/src/pages/AttendEvent/AttendEvent.js b/src/pages/AttendEvent/AttendEvent.js index 4e79130..e301ded 100644 --- a/src/pages/AttendEvent/AttendEvent.js +++ b/src/pages/AttendEvent/AttendEvent.js @@ -3,6 +3,8 @@ import "./AttendEvent.scss"; import { attendEvent } from "../../util/ServerInterfaceEvents"; import { Navigate } from "react-router"; +import Logo from "../../assets/mission-safe-logo.png"; + class AttendEvent extends React.Component { constructor(props) { super(props) @@ -53,15 +55,19 @@ class AttendEvent extends React.Component { return } else { return ( -
-

Event Attendance

+
+
-

Email

+

Email

-

Event Code

+

Event Code

diff --git a/src/pages/AttendEvent/AttendEvent.scss b/src/pages/AttendEvent/AttendEvent.scss index e69de29..fd40533 100644 --- a/src/pages/AttendEvent/AttendEvent.scss +++ b/src/pages/AttendEvent/AttendEvent.scss @@ -0,0 +1,62 @@ +#attendance-page { + img { + height: 110px; + width: 110px; + } +} + +#header { + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: flex-start; + margin-top: 36px; + + img { + margin-bottom: 25px; + } +} + +#title { + font-size: 38px; + font-weight: 400; + margin-top: 0; + margin-bottom: 8px; + letter-spacing: 2px; +} + +#subtitle { + margin-top: 0; + font-size: 14px; + font-weight: 400; + color: #5A5A5A +} + +.attendance-form { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + margin-top: 25px; +} + + +.attendance-input input { + margin-top: 0; + background-color: #F4F4F4; + border: 1px solid #D9D9D9; + border-radius: 5px; + color: black; + padding: 6px; + color:#5A5A5A; + font-size: 14px; + width: 320px; +} + +.form-label { + margin-bottom: 1px; + color:#5A5A5A; + font-size: 14px; + letter-spacing: 1px; +} \ No newline at end of file From d03e62410048f44f8d050614911e2bb033b72ad2 Mon Sep 17 00:00:00 2001 From: Jianger Date: Mon, 17 Apr 2023 03:30:12 +0200 Subject: [PATCH 2/5] /create-form styling --- src/pages/AttendEvent/AttendEvent.js | 16 ++--- src/pages/AttendEvent/AttendEvent.scss | 4 +- src/pages/CreateForm/CreateForm.js | 49 ++++++++------- src/pages/CreateForm/CreateForm.scss | 86 +++++++++++++++----------- src/pages/LoginPage/LoginPage.js | 16 ++--- src/pages/LoginPage/LoginPage.scss | 7 +-- 6 files changed, 97 insertions(+), 81 deletions(-) diff --git a/src/pages/AttendEvent/AttendEvent.js b/src/pages/AttendEvent/AttendEvent.js index e301ded..59af1df 100644 --- a/src/pages/AttendEvent/AttendEvent.js +++ b/src/pages/AttendEvent/AttendEvent.js @@ -31,17 +31,17 @@ class AttendEvent extends React.Component { async handleSubmit(event) { event.preventDefault(); console.log(this.state); - if(this.state.code.length === 5 && this.state.email.length > 0) { + if (this.state.code.length === 5 && this.state.email.length > 0) { try { let attendanceResult = await attendEvent(this.state.code, { email: this.state.email }); - if(attendanceResult) { + if (attendanceResult) { this.setState({ redirect: true, }) } - } catch(err) { + } catch (err) { this.setState({ errorMessage: "Failed to register attendance. Please try again." }) @@ -51,24 +51,24 @@ class AttendEvent extends React.Component { } render() { - if(this.state.redirect) { - return + if (this.state.redirect) { + return } else { return (

Email

- +

Event Code

- +

{this.state.errorMessage}

diff --git a/src/pages/AttendEvent/AttendEvent.scss b/src/pages/AttendEvent/AttendEvent.scss index fd40533..1a5bf1d 100644 --- a/src/pages/AttendEvent/AttendEvent.scss +++ b/src/pages/AttendEvent/AttendEvent.scss @@ -49,14 +49,14 @@ border-radius: 5px; color: black; padding: 6px; - color:#5A5A5A; + color: #5A5A5A; font-size: 14px; width: 320px; } .form-label { margin-bottom: 1px; - color:#5A5A5A; + color: #5A5A5A; font-size: 14px; letter-spacing: 1px; } \ No newline at end of file diff --git a/src/pages/CreateForm/CreateForm.js b/src/pages/CreateForm/CreateForm.js index e01750b..4bdf146 100644 --- a/src/pages/CreateForm/CreateForm.js +++ b/src/pages/CreateForm/CreateForm.js @@ -4,6 +4,8 @@ import { createYouthForm } from "../../util/ServerInterfaceYouth"; import { Navigate } from "react-router"; import "./CreateForm.scss" +import Logo from "../../assets/mission-safe-logo.png"; + class CreateForm extends React.Component { constructor(props) { super(props); @@ -31,14 +33,14 @@ class CreateForm extends React.Component { async handleSubmit(event) { event.preventDefault(); - if(this.state.program.length > 0 && this.state.content.length > 0) { + if (this.state.program.length > 0 && this.state.content.length > 0) { try { - if(this.state.type === "event") { + if (this.state.type === "event") { let form = await createEventForm(this.state.id, { programs: [this.state.program], content: this.state.content }); - if(form.ok) { + if (form.ok) { this.setState({ redirect: true, }) @@ -47,12 +49,12 @@ class CreateForm extends React.Component { errorMessage: "Something went wrong. Please try again." }) } - } else if(this.state.type === "youth") { + } else if (this.state.type === "youth") { let form = await createYouthForm(this.state.id, { programs: [this.state.program], content: this.state.content }); - if(form.ok) { + if (form.ok) { this.setState({ redirect: true, }) @@ -62,7 +64,7 @@ class CreateForm extends React.Component { }) } } - } catch(err) { + } catch (err) { this.setState({ errorMessage: "Failed to create form. Please try again." }) @@ -77,25 +79,28 @@ class CreateForm extends React.Component { } else if(this.state.redirect) { return } else { - return ( -
-

Form Creation

-
-
-

What program is this form associated with?

- -
-
-

Content

-