Merge branch 'master' into 'production'
add picture of hallitus to hallitus page See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!204
This commit is contained in:
@@ -51,5 +51,7 @@ module.exports = {
|
|||||||
"no-mixed-spaces-and-tabs": "warn",
|
"no-mixed-spaces-and-tabs": "warn",
|
||||||
"no-tabs": "warn",
|
"no-tabs": "warn",
|
||||||
"react/jsx-indent": "warn",
|
"react/jsx-indent": "warn",
|
||||||
|
"padded-blocks": "warn",
|
||||||
|
"spaced-comment": "warn",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -46,17 +46,24 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const onSubmit = async ({ formData }: ISubmitEvent<string>) => {
|
const onSubmit = async ({ formData }: ISubmitEvent<any>) => {
|
||||||
|
|
||||||
|
//for bot detection
|
||||||
|
|
||||||
if (honeypot !== "") {
|
if (honeypot !== "") {
|
||||||
console.log("bot cought in honeypot cought lacking");
|
console.log("bot cought in honeypot cought lacking");
|
||||||
toast.success("Sign-up submitted successfully 😎");
|
toast.success("Sign-up submitted successfully 😎");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const trackedForm = {
|
||||||
|
...formData,
|
||||||
|
_source: "from the webs submit",
|
||||||
|
};
|
||||||
|
|
||||||
const payload: Signup = {
|
const payload: Signup = {
|
||||||
submit_id: SUBMIT_ID, // This is for preventing duplicate requests; NOT RELATED TO THE SIGNUP ID IN DATABASE
|
submit_id: SUBMIT_ID, // This is for preventing duplicate requests; NOT RELATED TO THE SIGNUP ID IN DATABASE
|
||||||
signupForm_id: signupForm.id,
|
signupForm_id: signupForm.id,
|
||||||
answer: formData,
|
answer: trackedForm,
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -38,10 +38,17 @@ const Container = styled.div`
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 950px) {
|
@media (max-width: 950px) {
|
||||||
width: 100vw;
|
width: 80vw;
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const BoardImage = styled.img`
|
||||||
|
width: 100%;
|
||||||
|
height: auto;
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
border-radius: 8px;
|
||||||
|
`;
|
||||||
|
|
||||||
const ContactContainer = styled.div`
|
const ContactContainer = styled.div`
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
@media (max-width: 950px) {
|
@media (max-width: 950px) {
|
||||||
@@ -54,6 +61,12 @@ const CommitteeContainer: React.FC<{
|
|||||||
children: React.ReactNode;
|
children: React.ReactNode;
|
||||||
}> = ({ committee, children }) => (
|
}> = ({ committee, children }) => (
|
||||||
<Container>
|
<Container>
|
||||||
|
{committee.slug === "board" && (
|
||||||
|
<BoardImage
|
||||||
|
src="https://static.sahkoinsinoorikilta.fi/img/board/2026/Pota105_sikh26_webiin.jpg"
|
||||||
|
alt="Hallitus 2026"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<div>
|
<div>
|
||||||
{committee.roles.map((role) => (
|
{committee.roles.map((role) => (
|
||||||
role.representatives.map((representative) => (
|
role.representatives.map((representative) => (
|
||||||
@@ -74,6 +87,7 @@ const CommitteeContainer: React.FC<{
|
|||||||
);
|
);
|
||||||
|
|
||||||
interface Committee {
|
interface Committee {
|
||||||
|
slug: string;
|
||||||
name_fi: string;
|
name_fi: string;
|
||||||
name_en: string;
|
name_en: string;
|
||||||
roles: Array<Role>;
|
roles: Array<Role>;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"slug": "board",
|
"slug": "board",
|
||||||
"name_fi": "Hallitus 2024",
|
"name_fi": "Hallitus 2026",
|
||||||
"name_en": "Board",
|
"name_en": "Board",
|
||||||
"roles": [
|
"roles": [
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user