[ORG-117] See restrictions in event page (#94)

* correct typo in login screen * correct typo * refactor in URLs * Added more information in the event card
carlotacb · Jan 10, 2024 · 5c4ddb1 · 5c4ddb1
1 parent af8b989
commit 5c4ddb1
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 11 deletions.
diff --git a/organizator/app/(tabs)/(home)/[id].tsx b/organizator/app/(tabs)/(home)/[id].tsx
@@ -64,6 +64,17 @@ const BasicInfoContainer = styled.View`
   gap: 20px;
 `;
 
+const RestrictionContainer = styled.View`
+  margin-top: 30px;
+  background-color: rgba(138, 159, 243, 0.2);
+  border: 2px solid rgb(138, 159, 243);
+  border-radius: 20px;
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+`;
+
 const TextLine = styled.View`
   display: flex;
   flex-direction: row;
@@ -531,7 +542,7 @@ export default function EventPage() {
                         }}
                         color="dimgray"
                         iconName="edit"
-                        title="Open for participants to aply"
+                        title="Open for participants to apply"
                         active={inputs.openForParticipants}
                       />
 
@@ -587,6 +598,21 @@ export default function EventPage() {
                           </Text>
                         </TextLine>
                       </BasicInfoContainer>
+                      <RestrictionContainer>
+                        <TextLine>
+                          <Text>
+                            The minimum age to participate is: {events?.minAge}
+                          </Text>
+                        </TextLine>
+                        <TextLine>
+                          <Text>
+                            The event is open for{" "}
+                            {events?.onlyForStudents
+                              ? "only students"
+                              : "everyone"}
+                          </Text>
+                        </TextLine>
+                      </RestrictionContainer>
                       <ButtonsContainer>
                         {(isOrganizer || isOrganizerAdmin) && (
                           <Button

diff --git a/organizator/app/(tabs)/(home)/create.tsx b/organizator/app/(tabs)/(home)/create.tsx
@@ -370,7 +370,7 @@ export default function CreatePage() {
               }}
               color="dimgray"
               iconName="edit"
-              title="Open for participants to aply"
+              title="Open for participants to apply"
               active={inputs.openForParticipants}
             />
 

diff --git a/organizator/app/login.tsx b/organizator/app/login.tsx
@@ -10,6 +10,7 @@ import Button from "../components/ButtonWithIcon";
 import { loginUser } from "../utils/api/axiosUsers";
 import { LoginResponse } from "../utils/interfaces/Users";
 import { getToken, storeToken } from "../utils/sessionCalls";
+import FilterButton from "../components/FilterButtons";
 
 const Container = styled(SafeAreaView)`
   padding: 50px 40px;
@@ -173,11 +174,14 @@ export default function LoginPage() {
               </Link>
             </RegisterTextContainer>
             <RegisterTextContainer>
-              <RegisterText>You don't to register now? </RegisterText>
               <Link href="/" asChild>
-                <Pressable>
-                  <RegisterButton>HomePage</RegisterButton>
-                </Pressable>
+                <FilterButton
+                  title="Go to homepage"
+                  onPress={() => {}}
+                  iconName="home"
+                  color="#040240"
+                  active
+                />
               </Link>
             </RegisterTextContainer>
           </>

diff --git a/organizator/utils/api/axiosApplications.ts b/organizator/utils/api/axiosApplications.ts
@@ -3,8 +3,7 @@ import {
   CreateNewApplicationResponse,
   GetMyApplicationsResponse,
 } from "../interfaces/Applications";
-
-const applicationsAPI = "http://0.0.0.0:8000/organizator-api/applications";
+import { applicationsAPI } from "./constants";
 
 export async function createNewApplication(
   eventId: string,

diff --git a/organizator/utils/api/axiosEvents.ts b/organizator/utils/api/axiosEvents.ts
@@ -9,8 +9,7 @@ import {
   UpdateEventProps,
   updateEventResponse,
 } from "../interfaces/Events";
-
-const eventsAPI = "http://0.0.0.0:8000/organizator-api/events";
+import { eventsAPI } from "./constants";
 
 export async function getAllUpcomingEvents(): Promise<getAllEventResponse> {
   try {

diff --git a/organizator/utils/api/axiosUsers.ts b/organizator/utils/api/axiosUsers.ts
@@ -11,8 +11,8 @@ import {
   UpdateRoleResponse,
   UserInformationResponse,
 } from "../interfaces/Users";
+import { usersAPI } from "./constants";
 
-const usersAPI = "http://0.0.0.0:8000/organizator-api/users";
 const baseImage =
   "https://media.istockphoto.com/id/1087531642/vector/male-face-silhouette-or-icon-man-avatar-profile-unknown-or-anonymous-person-vector.jpg?s=612x612&w=0&k=20&c=FEppaMMfyIYV2HJ6Ty8tLmPL1GX6Tz9u9Y8SCRrkD-o%3D";
 

diff --git a/organizator/utils/api/constants.ts b/organizator/utils/api/constants.ts
@@ -0,0 +1,8 @@
+const baseURLdevelopment = "http://0.0.0.0:8000/organizator-api";
+// const baseURLproduction = "https://event-organizator-api-c6wz5mj4uq-ew.a.run.app/organizator-api";
+
+const usingURL = baseURLdevelopment;
+
+export const usersAPI = `${usingURL}/users`;
+export const eventsAPI = `${usingURL}/events`;
+export const applicationsAPI = `${usingURL}/applications`;