+
+ Paikka: {event.location_fi}
+
+
+ Alkaa: {date_start}
+
+
+ Päättyy: {date_end}
+
{/* We may have multiple signup forms. Generate own Button for each one */}
{event.signupForm.map((sf) => (
diff --git a/src/views/FrontPage/FrontPageView.tsx b/src/views/FrontPage/FrontPageView.tsx
index 05d859a..87444f8 100644
--- a/src/views/FrontPage/FrontPageView.tsx
+++ b/src/views/FrontPage/FrontPageView.tsx
@@ -18,14 +18,14 @@ import noop from "@utils/noop";
import FrontPageHero from "./FrontPageHero";
// Corporate logos import
-const ABB = "/img/corporate_logos/abb.png";
-const Caruna = "/img/corporate_logos/caruna.jpg";
-const Eaton = "/img/corporate_logos/eaton.png";
-const Ensto = "/img/corporate_logos/ensto.jpg";
-const eSett = "/img/corporate_logos/esett.png";
-const Fingrid = "/img/corporate_logos/fingrid.jpg";
-const NRCGroup = "/img/corporate_logos/nrcgroup.png";
-const Okmetic = "/img/corporate_logos/okmetic.png";
+const ABB = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/abb.jpg";
+const Caruna = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/caruna.jpg";
+const Eaton = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/eaton.jpg";
+const Ensto = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/ensto.jpg";
+const eSett = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/esett.jpg";
+const Fingrid = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/fingrid.jpg";
+const NRCGroup = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/nrcgroup.jpg";
+const Okmetic = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/okmetic.jpg";
interface FrontPageViewProps {
events: Event[];
diff --git a/src/views/InEnglishPage/InEnglishPageView.tsx b/src/views/InEnglishPage/InEnglishPageView.tsx
index d61a045..3fc4d5f 100644
--- a/src/views/InEnglishPage/InEnglishPageView.tsx
+++ b/src/views/InEnglishPage/InEnglishPageView.tsx
@@ -80,13 +80,10 @@ const InEnglishPageView: React.FC = ({ events, feed }) =
presentationTime={5}
fadeTime={1}
images={[
-
- "/img/carousel_images/in_english/ulkoexcursio1-kiia-einola-3.jpg",
- "/img/carousel_images/in_english/international-sitsit-jani-mannonen-8.jpg",
- "/img/carousel_images/in_english/ulkoexcursio-kiia-einola-16.jpg",
- "/img/carousel_images/in_english/haalarigaala-jani-mannonen-1.jpg",
- "/img/carousel_images/in_english/Kaukkarit-2020-Elias-Hirvonen-44.jpg",
- "/img/carousel_images/in_english/koydenveto-jani-mannonen-miika-koskela-4.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/elecyykka-jani-mannonen-6.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/koydenveto-jani-mannonen-miika-koskela-17.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/koydenveto-jani-mannonen-miika-koskela-28.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/koydenveto-jani-mannonen-miika-koskela-78.jpg",
]}
width={400}
height={400}
@@ -95,12 +92,10 @@ const InEnglishPageView: React.FC = ({ events, feed }) =
presentationTime={5}
fadeTime={1}
images={[
- "/img/carousel_images/in_english/international-sitsit-jani-mannonen-8.jpg",
- "/img/carousel_images/in_english/Kaukkarit-2020-Elias-Hirvonen-44.jpg",
- "/img/carousel_images/in_english/koydenveto-jani-mannonen-miika-koskela-4.jpg",
- "/img/carousel_images/in_english/ulkoexcursio-kiia-einola-16.jpg",
- "/img/carousel_images/in_english/haalarigaala-jani-mannonen-1.jpg",
- "/img/carousel_images/in_english/ulkoexcursio1-kiia-einola-3.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/koydenveto-mikko-haapamaki-33.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/Varaslahto2020-AinoSuomi-73.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/varauksenpurku_2020_timitiira-80.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/otatarhan-ajot-timi-tiira-172.jpg",
]}
width={400}
height={400}
@@ -109,12 +104,10 @@ const InEnglishPageView: React.FC = ({ events, feed }) =
presentationTime={5}
fadeTime={1}
images={[
- "/img/carousel_images/in_english/haalarigaala-jani-mannonen-1.jpg",
- "/img/carousel_images/in_english/ulkoexcursio1-kiia-einola-3.jpg",
- "/img/carousel_images/in_english/international-sitsit-jani-mannonen-8.jpg",
- "/img/carousel_images/in_english/Kaukkarit-2020-Elias-Hirvonen-44.jpg",
- "/img/carousel_images/in_english/koydenveto-jani-mannonen-miika-koskela-4.jpg",
- "/img/carousel_images/in_english/ulkoexcursio-kiia-einola-16.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/kokkarit_kiia_einola-0631.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/pota-jatkot-essi-jukkala-29.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/pota99-paajuhla-oskari-lahti-171.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/carousel_images/wappusitsit-jani-mannonen-29.jpg",
]}
width={400}
height={400}
@@ -145,8 +138,8 @@ const InEnglishPageView: React.FC = ({ events, feed }) =
presentationTime={5}
fadeTime={1}
images={[
- "/img/carousel_images/in_english/tour/qtour1.jpg",
- "/img/carousel_images/in_english/tour/qtour2.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/tour/qtour1.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/tour/qtour2.jpg",
]}
width={400}
height={400}
@@ -155,8 +148,8 @@ const InEnglishPageView: React.FC = ({ events, feed }) =
presentationTime={5}
fadeTime={1}
images={[
- "/img/carousel_images/in_english/tour/qtour3.jpg",
- "/img/carousel_images/in_english/tour/qtour4.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/tour/qtour3.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/tour/qtour4.jpg",
]}
width={400}
height={400}
@@ -165,8 +158,8 @@ const InEnglishPageView: React.FC = ({ events, feed }) =
presentationTime={5}
fadeTime={1}
images={[
- "/img/carousel_images/in_english/tour/qtour5.jpg",
- "/img/carousel_images/in_english/tour/qtour1.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/tour/qtour5.jpg",
+ "https://static.sahkoinsinoorikilta.fi/img/tour/qtour1.jpg",
]}
width={400}
height={400}
diff --git a/src/views/SignUpPage/SignUpPageView.tsx b/src/views/SignUpPage/SignUpPageView.tsx
index 51f6165..6ad2e53 100644
--- a/src/views/SignUpPage/SignUpPageView.tsx
+++ b/src/views/SignUpPage/SignUpPageView.tsx
@@ -18,22 +18,23 @@ const customWidgets = {
interface SignUpPageViewProps {
signUpForm: SignupForm;
formData: any;
- statusMessage: string;
onChange: (e: IChangeEvent, es?: ErrorSchema) => unknown;
onSubmit: (e: ISubmitEvent) => unknown;
}
const renderList = (signUpForm: SignupForm) => (
- <>
-
- Ilmoittautuneet{signUpForm.quota > 0 && (` (${signUpForm.signups.length}/${signUpForm.quota})`)}:
-
-
- {signUpForm.signups.map((s, idx) => (
- signUpForm.quota ? "reserved" : ""}>{s}
- ))}
-
- >
+
+
+
+ Ilmoittautuneet{signUpForm.quota > 0 && (` (${signUpForm.signups.length}/${signUpForm.quota})`)}:
+
+
+ {signUpForm.signups.map((s, idx) => (
+ signUpForm.quota ? "reserved" : ""}>{s}
+ ))}
+
+
+
);
const StyledSection = styled(TextSection)`
@@ -62,7 +63,6 @@ const StyledSection = styled(TextSection)`
const SignUpPageView: React.FC = ({
signUpForm,
formData,
- statusMessage,
onChange,
onSubmit,
}) => {
@@ -83,11 +83,34 @@ const SignUpPageView: React.FC = ({
);
};
- const form = signUpForm ? renderForm() : (
-
- );
+ let form: JSX.Element;
+ let signups: JSX.Element = null;
+ const startTime = new Date(signUpForm?.start_time);
+ const endTime = new Date(signUpForm?.end_time);
+
+ if (!signUpForm) {
+ // Show loader if in edit mode and form has not yet loaded.
+ // For normal signup page, form is always defined on this level.
+ form = (
+
+ );
+ } else if (startTime > new Date()) {
+ form = (
+ <>
+ Ilmoittauminen ei ole vielä auennut!
+ Se aukeaa {startTime.toLocaleString("fi-FI")}.
+ >
+ );
+ } else if (new Date() > endTime) {
+ form = (
+ Ilmoittauminen on umpeutunut!
+ );
+ signups = renderList(signUpForm);
+ } else {
+ form = renderForm();
+ signups = renderList(signUpForm);
+ }
- const signups = signUpForm && signUpForm.signups ? renderList(signUpForm) : null;
return (
@@ -97,16 +120,9 @@ const SignUpPageView: React.FC = ({
-
- {statusMessage}
-
{form}
-
+ {signups}
);
};
diff --git a/src/views/admin/AdminCreateCommon.tsx b/src/views/admin/AdminCreateCommon.tsx
index a7d4c21..e05b673 100644
--- a/src/views/admin/AdminCreateCommon.tsx
+++ b/src/views/admin/AdminCreateCommon.tsx
@@ -16,14 +16,6 @@ const Common = styled.div`
}
`;
-const SuccessMsg = styled.p`
- margin-bottom: 0.5rem;
- border: 1px solid ${colors.green1};
- padding: 8px 16px;
- color: ${colors.green1};
- display: inline-block;
-`;
-
const ErrorMsg = styled.p`
margin-bottom: 0.5rem;
border: 1px solid ${colors.orange2};
@@ -44,9 +36,8 @@ type AdminCreateCommonProps = {
[name: string]: unknown;
};
onChange?: (e: IChangeEvent, es?: ErrorSchema) => unknown;
- onFocus: (id: string, value: string | number | boolean) => void;
+ onFocus?: (id: string, value: string | number | boolean) => void;
onSubmit: (e: ISubmitEvent) => unknown;
- statusMessage: string;
error: string;
widgets: {
[name: string]: any;
@@ -61,7 +52,6 @@ const AdminCreateCommon: React.FC = ({
onChange,
onFocus,
onSubmit,
- statusMessage,
error,
widgets,
}) => {
@@ -74,9 +64,6 @@ const AdminCreateCommon: React.FC = ({
{title}
- {statusMessage && (
- {statusMessage}
- )}
{
// eslint-disable-next-line no-param-reassign
t.fixtureCtx.eventId = parsed.id;
- const statusMessage = Selector("[data-e2e=\"admin-form-status-message\"]");
+ const statusMessage = Selector(".Toastify__toast-body");
await t
.hover(statusMessage)
.expect(
statusMessage.innerText,
- ).eql("Event created successfully");
+ ).eql("Event created successfully 😎");
});
diff --git a/tests/testcafe/admin/create-signup.test.ts b/tests/testcafe/admin/create-signup.test.ts
index fef1d5c..93be0ba 100644
--- a/tests/testcafe/admin/create-signup.test.ts
+++ b/tests/testcafe/admin/create-signup.test.ts
@@ -86,10 +86,10 @@ test("Logged in user can create signup", async (t) => {
// eslint-disable-next-line no-param-reassign
t.fixtureCtx.formId = parsed.id;
- const statusMessage = Selector("[data-e2e=\"admin-form-status-message\"]");
+ const statusMessage = Selector(".Toastify__toast-body");
await t
.hover(statusMessage)
.expect(
statusMessage.innerText,
- ).eql("Sign-up created successfully");
+ ).eql("Sign-up created successfully 😎");
});
diff --git a/tests/testcafe/signupToEvent.test.ts b/tests/testcafe/signupToEvent.test.ts
index 6b46274..78615a8 100644
--- a/tests/testcafe/signupToEvent.test.ts
+++ b/tests/testcafe/signupToEvent.test.ts
@@ -52,10 +52,10 @@ test("User signups to event from front page", async (t) => {
await t.click(Selector("button").nth(-1));
- const statusMessage = Selector(".sign-up-statusmessage");
+ const statusMessage = Selector(".Toastify__toast-body");
await t
.hover(statusMessage)
.expect(
statusMessage.innerText,
- ).eql("Sign-up submitted successfully");
+ ).eql("Sign-up submitted successfully 😎");
});