Merge pull request #230 from mantis1262/feature/register

Author: MarekSax

src/Zustand/api.ts

@@ -17,15 +17,16 @@ export interface raceParticipantUserData {
   phone: string;
   email: string;
   language: string;
-  shirt: string;
+  team?: string;
   km: string;
-  shirtGender: ShirtGender;
+  adult: Age;
   agreementStatements: boolean;
-  raceID?: string;
+  raceID?: Race[];
   userId?: string;
 }
 
-export type ShirtGender = 'Damska' | 'Męska' | 'Dziecięca';
+export type Age = 'Pełnoletni' | 'Niepełnoletni';
+export type Race = 'Kapcie' | 'MatkaIDziecko' | 'Bieg1KM' | 'Bieg5KM' | 'Spacer'
 
 export interface UserUpdateData {
   name?: string;
@@ -74,8 +75,7 @@ const getConfig = () => {
 
 export const register = async (userData: UserData) => {
   try {
-    const response = await axios.post(`${apiUrl}/users/signup`, userData);
-    return response;
+    return await axios.post(`${apiUrl}/users/signup`, userData);
   } catch (error) {
     const err = error as AxiosError;
     console.error('Error registering user:', err);
@@ -139,15 +139,14 @@ export const userParticipation = async (
   participantData: raceParticipantUserData
 ) => {
   try {
-    const response = await axios.post(
+    return await axios.post(
       `${apiUrl}/payment/participate`,
       {
         amount,
         participant: participantData,
       },
       getConfig()
     );
-    return response;
   } catch (error) {
     console.error('Error with user participation:', error);
     throw error;
@@ -156,11 +155,10 @@ export const userParticipation = async (
 
 export const getUserParticipation = async () => {
   try {
-    const response = await axios.get(
+    return await axios.get(
       `${apiUrl}/users/participant`,
       getConfig()
     );
-    return response;
   } catch (error) {
     console.error('Error getting participant:', error);
     throw error;
@@ -198,11 +196,10 @@ export const resetPassword = async (email: string) => {
 
 export const registerForDonation = async (amount: number, email: string) => {
   try {
-    const response = await axios.post(`${apiUrl}/payment/donation`, {
+    return await axios.post(`${apiUrl}/payment/donation`, {
       amount,
       email,
     });
-    return response;
   } catch (error) {
     console.error('Error with user participation:', error);
     throw error;

src/components/RegistrationForRunAll/RegistrationForRun/RegistrationForRun.module.scss

@@ -1,4 +1,7 @@
 @import '../../../stylesheets/mixins.scss';
+.form {
+  display: contents;
+}
 
 .registration {
   width: 100%;
@@ -96,15 +99,25 @@
   }
 
   &__radioList {
-    display: inline-flex;
-    align-items: flex-start;
-    text-align: center;
-    gap: 48px;
+    display: flex;
+    flex-direction: column;
+    text-align: left;
+    width: 100%;
+    gap: 10px;
     line-height: 24px;
     letter-spacing: 0.019px;
     padding: 24px 0 8px 0;
   }
 
+  &__checkboxList {
+    display: flex;
+    flex-direction: column;
+    text-align: left;
+    width: 100%;
+    gap: 10px;
+
+  }
+
   &__label {
     display: flex;
     flex-direction: column;
@@ -223,8 +236,17 @@
   }
 }
 
+.formikMessage2 {
+  color: red;
+  font-size: 14px;
+  font-weight: 400;
+
+  @include desktop-screen {
+    font-size: 16px;
+  }
+}
+
 .formikMessageStatement {
-  top: 85px;
   color: red;
   font-size: 12px;
   font-weight: 400;
@@ -242,6 +264,10 @@ input[type='radio'] {
   margin-right: 12px;
 }
 
+input[type='checkbox'] {
+  margin-right: 12px;
+}
+
 .buttonContainer {
   display: flex;
   justify-content: center;