From 9ed4a6d3f0704a3e4782fd844d55044c829ec857 Mon Sep 17 00:00:00 2001 From: Guryash Date: Wed, 25 Dec 2024 00:44:59 +1300 Subject: [PATCH] feat: config update --- ...ion_content_types##api##answer.answer.json | 32 ++-- ...pes##api##event-gallery.event-gallery.json | 16 +- ...ation_content_types##api##event.event.json | 72 +++++---- ...uration_content_types##api##exec.exec.json | 36 +++-- ...types##api##introduction.introduction.json | 40 ++--- ...n_content_types##api##partner.partner.json | 40 ++--- ...ion_content_types##api##people.people.json | 84 ++++++----- ...pes##api##previous-team.previous-team.json | 22 +-- ...ble-membership.purchasable-membership.json | 58 +++---- ...content_types##api##question.question.json | 44 +++--- ...ent_types##api##some-photo.some-photo.json | 26 ++-- ...ion_content_types##api##ticket.ticket.json | 142 ++++++++++-------- ...t_types##api##user-ticket.user-ticket.json | 80 +++++----- ...ation_content_types##api##value.value.json | 22 +-- web/src/screens/AboutUsScreen.tsx | 9 +- 15 files changed, 399 insertions(+), 324 deletions(-) diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##answer.answer.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##answer.answer.json index 79ba596..d3e4a64 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##answer.answer.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##answer.answer.json @@ -22,7 +22,7 @@ "Answer": { "edit": { "label": "Answer", - "description": "", + "description": "The answer provided by someone for a particular question", "placeholder": "", "visible": true, "editable": true @@ -35,8 +35,8 @@ }, "People_Ticket": { "edit": { - "label": "People_Ticket", - "description": "", + "label": "Ticket Purchased by Members", + "description": "The ticket the answer is linked to", "placeholder": "", "visible": true, "editable": true, @@ -50,8 +50,8 @@ }, "Question_ID": { "edit": { - "label": "Question_ID", - "description": "", + "label": "Question", + "description": "Question being answered on the ticket", "placeholder": "", "visible": true, "editable": true, @@ -123,29 +123,29 @@ } }, "layouts": { - "list": [ - "id", - "Answer", - "People_Ticket", - "Question_ID" - ], "edit": [ [ { "name": "Answer", - "size": 6 - }, - { - "name": "People_Ticket", - "size": 6 + "size": 12 } ], [ + { + "name": "People_Ticket", + "size": 6 + }, { "name": "Question_ID", "size": 6 } ] + ], + "list": [ + "id", + "Answer", + "People_Ticket", + "Question_ID" ] }, "uid": "api::answer.answer" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##event-gallery.event-gallery.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##event-gallery.event-gallery.json index 9d28b6f..fc7e07f 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##event-gallery.event-gallery.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##event-gallery.event-gallery.json @@ -22,7 +22,7 @@ "Image": { "edit": { "label": "Image", - "description": "", + "description": "This is displayed on the event screen at the bottom of the page", "placeholder": "", "visible": true, "editable": true @@ -93,19 +93,19 @@ } }, "layouts": { - "list": [ - "id", - "Image", - "createdAt", - "updatedAt" - ], "edit": [ [ { "name": "Image", - "size": 6 + "size": 12 } ] + ], + "list": [ + "id", + "Image", + "createdAt", + "updatedAt" ] }, "uid": "api::event-gallery.event-gallery" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##event.event.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##event.event.json index f9ae415..dd3afa9 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##event.event.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##event.event.json @@ -22,7 +22,7 @@ "Title": { "edit": { "label": "Title", - "description": "this is description", + "description": "Title for event", "placeholder": "", "visible": true, "editable": true @@ -50,7 +50,7 @@ "Location": { "edit": { "label": "Location", - "description": "", + "description": "Enter the address (NOT link), e.g. 20 Symonds Street, Auckland CBD, Auckland 1010", "placeholder": "", "visible": true, "editable": true @@ -63,7 +63,7 @@ }, "Event_Date_Start": { "edit": { - "label": "Event_Date_Start", + "label": "Start Date and Time of Event", "description": "", "placeholder": "", "visible": true, @@ -77,7 +77,7 @@ }, "Event_Date_End": { "edit": { - "label": "Event_Date_End", + "label": "End Date and Time of Event", "description": "", "placeholder": "", "visible": true, @@ -91,8 +91,8 @@ }, "Event_Capacity": { "edit": { - "label": "Event_Capacity", - "description": "", + "label": "Event Capacity", + "description": "Total amount of tickets that can be sold. E.g. We have 5 member tickets, and 5 non-member tickets for sale. Event capacity is 7. This means that we can sell a maximum of 7 tickets (could be 2 member 5 non-member, or 3 member 4 non-member etc,)", "placeholder": "", "visible": true, "editable": true @@ -105,8 +105,8 @@ }, "Is_Live": { "edit": { - "label": "Is_Live", - "description": "", + "label": "Is Live", + "description": "If you make this true it will manually place this event in \"Past Events\" and stop all ticket sales", "placeholder": "", "visible": true, "editable": true @@ -120,7 +120,7 @@ "Image": { "edit": { "label": "Image", - "description": "", + "description": "Use same size as Instagram 1:1 image", "placeholder": "", "visible": true, "editable": true @@ -133,8 +133,8 @@ }, "Terms_And_Conditions": { "edit": { - "label": "Terms_And_Conditions", - "description": "", + "label": "Terms and Conditions", + "description": "Copy paste the Terms and Conditions and modify as required", "placeholder": "", "visible": true, "editable": true @@ -147,8 +147,8 @@ }, "Event_Capacity_Remaining": { "edit": { - "label": "Event_Capacity_Remaining", - "description": "", + "label": "Event Capacity Remaining", + "description": "Number of tickets LEFT. Set this to the same as Event Capacity when making an event, do not touch it after that unless you want to reduce the amount of tickets left. ", "placeholder": "", "visible": true, "editable": true @@ -162,11 +162,11 @@ "Ticket_ID": { "edit": { "label": "Ticket_ID", - "description": "", + "description": "Select the tickets that you want to show for sale for the event. Match the ID of the TICKET to ensure they are correct", "placeholder": "", "visible": true, "editable": true, - "mainField": "Name" + "mainField": "id" }, "list": { "label": "Ticket_ID", @@ -264,52 +264,60 @@ [ { "name": "Location", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Event_Date_Start", - "size": 6 + "size": 12 } ], [ { "name": "Event_Date_End", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Event_Capacity", - "size": 4 + "size": 12 + } + ], + [ + { + "name": "Event_Capacity_Remaining", + "size": 12 } ], [ { "name": "Is_Live", - "size": 4 - }, + "size": 12 + } + ], + [ { "name": "Image", - "size": 6 + "size": 12 } ], [ { "name": "Terms_And_Conditions", - "size": 6 - }, - { - "name": "Event_Capacity_Remaining", - "size": 4 + "size": 12 } ], [ { - "name": "Ticket_ID", - "size": 6 + "name": "Description", + "size": 12 } ], [ { - "name": "Description", + "name": "Ticket_ID", "size": 12 } ] diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##exec.exec.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##exec.exec.json index ef0a172..5eac7aa 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##exec.exec.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##exec.exec.json @@ -36,7 +36,7 @@ "Description": { "edit": { "label": "Description", - "description": "", + "description": "Shown when a user hovers on the Exec. Keep fairly brief ", "placeholder": "", "visible": true, "editable": true @@ -50,7 +50,7 @@ "Position": { "edit": { "label": "Position", - "description": "", + "description": "11 characters maximum", "placeholder": "", "visible": true, "editable": true @@ -64,7 +64,7 @@ "Image": { "edit": { "label": "Image", - "description": "", + "description": "1:1 Image, same as instagram", "placeholder": "", "visible": true, "editable": true @@ -149,39 +149,43 @@ } }, "layouts": { - "list": [ - "id", - "Name", - "Description", - "Position" - ], "edit": [ [ { "name": "Name", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Description", - "size": 6 + "size": 12 } ], [ { "name": "Position", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Image", - "size": 6 + "size": 12 } ], [ { "name": "Role", - "size": 6 + "size": 12 } ] + ], + "list": [ + "id", + "Name", + "Description", + "Position" ] }, "uid": "api::exec.exec" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##introduction.introduction.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##introduction.introduction.json index 82076e8..5ecefa6 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##introduction.introduction.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##introduction.introduction.json @@ -6,7 +6,7 @@ "filterable": true, "searchable": true, "pageSize": 10, - "mainField": "Events", + "mainField": "id", "defaultSortBy": "Events", "defaultSortOrder": "ASC" }, @@ -22,7 +22,7 @@ "Description": { "edit": { "label": "Description", - "description": "", + "description": "About us page main introduction", "placeholder": "", "visible": true, "editable": true @@ -36,7 +36,7 @@ "Events": { "edit": { "label": "Events", - "description": "", + "description": "Number of events we have had in the previous year", "placeholder": "", "visible": true, "editable": true @@ -50,7 +50,7 @@ "Members": { "edit": { "label": "Members", - "description": "", + "description": "Number of PAID member we have had in the previous year", "placeholder": "", "visible": true, "editable": true @@ -64,7 +64,7 @@ "Followers": { "edit": { "label": "Followers", - "description": "", + "description": "Number of followers we have had in the previous year", "placeholder": "", "visible": true, "editable": true @@ -135,35 +135,37 @@ } }, "layouts": { - "list": [ - "id", - "Events", - "Members", - "Followers" - ], "edit": [ [ { - "name": "Description", - "size": 12 + "name": "Members", + "size": 8 } ], [ { "name": "Events", - "size": 6 - }, - { - "name": "Members", - "size": 6 + "size": 8 } ], [ { "name": "Followers", - "size": 6 + "size": 8 + } + ], + [ + { + "name": "Description", + "size": 12 } ] + ], + "list": [ + "id", + "Events", + "Members", + "Followers" ] }, "uid": "api::introduction.introduction" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##partner.partner.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##partner.partner.json index de8bf1a..0bfba0b 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##partner.partner.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##partner.partner.json @@ -36,7 +36,7 @@ "Image": { "edit": { "label": "Image", - "description": "", + "description": "Preferably 1:1 image, other sizes will work but not look as nice", "placeholder": "", "visible": true, "editable": true @@ -64,7 +64,7 @@ "Location": { "edit": { "label": "Location", - "description": "", + "description": "Enter the address (NOT link), e.g. 20 Symonds Street, Auckland CBD, Auckland 1010", "placeholder": "", "visible": true, "editable": true @@ -78,7 +78,7 @@ "Description": { "edit": { "label": "Description", - "description": "", + "description": "Keep it brief, this is where you put the benefits E.g. 10% off burgers ", "placeholder": "", "visible": true, "editable": true @@ -149,39 +149,43 @@ } }, "layouts": { - "list": [ - "id", - "Type", - "Image", - "Name" - ], "edit": [ [ { "name": "Type", - "size": 6 - }, - { - "name": "Image", - "size": 6 + "size": 12 } ], [ { "name": "Name", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Location", - "size": 6 + "size": 12 } ], [ { "name": "Description", - "size": 6 + "size": 12 + } + ], + [ + { + "name": "Image", + "size": 12 } ] + ], + "list": [ + "id", + "Type", + "Image", + "Name" ] }, "uid": "api::partner.partner" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##people.people.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##people.people.json index ae76cda..df30e80 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##people.people.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##people.people.json @@ -49,7 +49,7 @@ }, "University_ID": { "edit": { - "label": "University_ID", + "label": "University ID Number", "description": "", "placeholder": "", "visible": true, @@ -77,7 +77,7 @@ }, "Study_Field": { "edit": { - "label": "Study_Field", + "label": "Field of Study", "description": "", "placeholder": "", "visible": true, @@ -91,8 +91,8 @@ }, "Is_Member": { "edit": { - "label": "Is_Member", - "description": "", + "label": "Membership Active", + "description": "TODO: needs to be removed, as membership expiry can be used instead", "placeholder": "", "visible": true, "editable": true @@ -119,8 +119,8 @@ }, "Member_Expiry_Date": { "edit": { - "label": "Member_Expiry_Date", - "description": "", + "label": "Paid Membership Expiry Date", + "description": "This will be blank when a user uses the website to sign up, its only added once they purchase a membership", "placeholder": "", "visible": true, "editable": true @@ -133,12 +133,12 @@ }, "People_Ticket_ID": { "edit": { - "label": "People_Ticket_ID", - "description": "", + "label": "Tickets Purchased", + "description": "The tickets the user has purchased", "placeholder": "", "visible": true, "editable": true, - "mainField": "Name" + "mainField": "People_Ticket_Code" }, "list": { "label": "People_Ticket_ID", @@ -162,7 +162,7 @@ }, "Year_Of_Study": { "edit": { - "label": "Year_Of_Study", + "label": "Year of Study", "description": "", "placeholder": "", "visible": true, @@ -234,69 +234,79 @@ } }, "layouts": { - "list": [ - "id", - "Name", - "Email", - "University_ID" - ], "edit": [ [ { "name": "Name", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Email", - "size": 6 + "size": 12 } ], [ { "name": "University_ID", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "UPI", - "size": 6 + "size": 12 } ], [ { "name": "Study_Field", - "size": 6 - }, + "size": 12 + } + ], + [ { - "name": "Status", - "size": 6 + "name": "Year_Of_Study", + "size": 12 } ], [ { - "name": "Member_Expiry_Date", - "size": 4 - }, + "name": "Institution", + "size": 12 + } + ], + [ { - "name": "People_Ticket_ID", - "size": 6 + "name": "Status", + "size": 12 } ], [ { - "name": "Institution", - "size": 6 - }, + "name": "Member_Expiry_Date", + "size": 12 + } + ], + [ { - "name": "Year_Of_Study", - "size": 6 + "name": "People_Ticket_ID", + "size": 12 } ], [ { "name": "Is_Member", - "size": 4 + "size": 12 } ] + ], + "list": [ + "id", + "Name", + "Email", + "University_ID" ] }, "uid": "api::people.people" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##previous-team.previous-team.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##previous-team.previous-team.json index 4dd24f4..82ed5a7 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##previous-team.previous-team.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##previous-team.previous-team.json @@ -121,29 +121,31 @@ } }, "layouts": { - "list": [ - "id", - "Name", - "Role", - "Year" - ], "edit": [ [ { "name": "Name", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Role", - "size": 6 + "size": 12 } ], [ { "name": "Year", - "size": 6 + "size": 12 } ] + ], + "list": [ + "id", + "Name", + "Role", + "Year" ] }, "uid": "api::previous-team.previous-team" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##purchasable-membership.purchasable-membership.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##purchasable-membership.purchasable-membership.json index 8fc16d0..77c1e62 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##purchasable-membership.purchasable-membership.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##purchasable-membership.purchasable-membership.json @@ -22,7 +22,7 @@ "Title": { "edit": { "label": "Title", - "description": "", + "description": "E.g. Semester 1 Membership, or Semester 2 Membership, or Semester 1 & 2 Membership", "placeholder": "", "visible": true, "editable": true @@ -36,7 +36,7 @@ "Expiry": { "edit": { "label": "Expiry", - "description": "", + "description": "When a user purchases a membership this would be the date their membership ends, ensure it lines up correctly with UoA semester dates", "placeholder": "", "visible": true, "editable": true @@ -50,7 +50,7 @@ "Price": { "edit": { "label": "Price", - "description": "", + "description": "Ensure this matches the Stripe Payment", "placeholder": "", "visible": true, "editable": true @@ -63,8 +63,8 @@ }, "Stripe_Link": { "edit": { - "label": "Stripe_Link", - "description": "", + "label": "Stripe Code", + "description": "COPY THE STRIPE CODE EXACTLY. E.g price_1PSHXPP464csY2Up4aKoSw6r", "placeholder": "", "visible": true, "editable": true @@ -78,7 +78,7 @@ "Description": { "edit": { "label": "Description", - "description": "", + "description": "Description for the membership. keep it brief", "placeholder": "", "visible": true, "editable": true @@ -91,8 +91,8 @@ }, "Membership_Link_Bypass": { "edit": { - "label": "Membership_Link_Bypass", - "description": "", + "label": "Redirect to external link", + "description": "Set this to true if you want the user to be taken to an external website (google form etc.). Use this ONLY if the payments are NOT working on the website as this would make everything manual for ticketing", "placeholder": "", "visible": true, "editable": true @@ -105,8 +105,8 @@ }, "Bypass_Membership_Link": { "edit": { - "label": "Bypass_Membership_Link", - "description": "", + "label": "External Website Redirect Link", + "description": "Link for the website you want to redirect to. LEAVE THIS BLANK IF REDIRECT TO EXTERNAL LINK IS FALSE", "placeholder": "", "visible": true, "editable": true @@ -177,49 +177,55 @@ } }, "layouts": { - "list": [ - "id", - "Title", - "Expiry", - "Price" - ], "edit": [ [ { "name": "Title", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Expiry", - "size": 6 + "size": 12 } ], [ { "name": "Price", - "size": 4 - }, + "size": 12 + } + ], + [ { "name": "Stripe_Link", - "size": 6 + "size": 12 } ], [ { "name": "Description", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Membership_Link_Bypass", - "size": 4 + "size": 12 } ], [ { "name": "Bypass_Membership_Link", - "size": 6 + "size": 12 } ] + ], + "list": [ + "id", + "Title", + "Expiry", + "Price" ] }, "uid": "api::purchasable-membership.purchasable-membership" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##question.question.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##question.question.json index 4304648..550af71 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##question.question.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##question.question.json @@ -22,7 +22,7 @@ "Question": { "edit": { "label": "Question", - "description": "", + "description": "Type the question you want displayed for a particular ticket. E.g. Dietary requirements. FOR A DOUBLE/COUPLE TICKET, one of the questions MUST be Enter partner/couple email", "placeholder": "", "visible": true, "editable": true @@ -35,8 +35,8 @@ }, "Check_For_Member_Email": { "edit": { - "label": "Check_For_Member_Email", - "description": "", + "label": "Check For Member Email", + "description": "Leave this false UNLESS the question is what is your partner/couple's email. Then set this to true. What this does is checks to make sure the email entered is a valid paid member and won't let the user purchase the ticket if it isn't", "placeholder": "", "visible": true, "editable": true @@ -49,12 +49,12 @@ }, "Ticket_ID": { "edit": { - "label": "Ticket_ID", - "description": "", + "label": "ID of Ticket", + "description": "Select the ticket that you want this question displayed under. Make sure the ticket ID is correct", "placeholder": "", "visible": true, "editable": true, - "mainField": "Name" + "mainField": "id" }, "list": { "label": "Ticket_ID", @@ -64,8 +64,8 @@ }, "Answer_ID": { "edit": { - "label": "Answer_ID", - "description": "", + "label": "Answers to Question", + "description": "This is automatically filled and shows all answers to this particular question", "placeholder": "", "visible": true, "editable": true, @@ -137,33 +137,37 @@ } }, "layouts": { - "list": [ - "id", - "Question", - "Check_For_Member_Email", - "Ticket_ID" - ], "edit": [ [ { "name": "Question", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Check_For_Member_Email", - "size": 4 + "size": 12 } ], [ { "name": "Ticket_ID", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Answer_ID", - "size": 6 + "size": 12 } ] + ], + "list": [ + "id", + "Question", + "Check_For_Member_Email", + "Ticket_ID" ] }, "uid": "api::question.question" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##some-photo.some-photo.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##some-photo.some-photo.json index 5d7e142..2ebfb57 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##some-photo.some-photo.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##some-photo.some-photo.json @@ -121,29 +121,31 @@ } }, "layouts": { - "list": [ - "id", - "Image", - "Title", - "Year" - ], "edit": [ [ - { - "name": "Image", - "size": 6 - }, { "name": "Title", - "size": 6 + "size": 12 } ], [ { "name": "Year", - "size": 6 + "size": 12 + } + ], + [ + { + "name": "Image", + "size": 12 } ] + ], + "list": [ + "id", + "Image", + "Title", + "Year" ] }, "uid": "api::some-photo.some-photo" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##ticket.ticket.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##ticket.ticket.json index 65d4925..811d65c 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##ticket.ticket.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##ticket.ticket.json @@ -22,7 +22,7 @@ "Name": { "edit": { "label": "Name", - "description": "", + "description": "Name of the ticket. E.g Member Ticket", "placeholder": "", "visible": true, "editable": true @@ -36,7 +36,7 @@ "Price": { "edit": { "label": "Price", - "description": "", + "description": "Make sure the price matches the correct stripe price", "placeholder": "", "visible": true, "editable": true @@ -49,8 +49,8 @@ }, "Is_Member_Only": { "edit": { - "label": "Is_Member_Only", - "description": "", + "label": "Member Only", + "description": "If this is true, it will show a hint in the events page with \"This ticket is only available for paid members\" and ONLY allow paid members to purchase a SINGLE member ticket", "placeholder": "", "visible": true, "editable": true @@ -63,8 +63,8 @@ }, "Is_Double": { "edit": { - "label": "Is_Double", - "description": "", + "label": "Double/Couple Ticket", + "description": "Leave this False unless this is for a couple/double ticket. Make sure you link a question asking for the partner's email", "placeholder": "", "visible": true, "editable": true @@ -77,8 +77,8 @@ }, "Max_Number_Tickets": { "edit": { - "label": "Max_Number_Tickets", - "description": "", + "label": "Number of Tickets", + "description": "The maximum number of this type of ticket. E.g if you want only 50 member tickets to be sold, put 50. If there is no limit just type 9999", "placeholder": "", "visible": true, "editable": true @@ -91,8 +91,8 @@ }, "Number_Tickets_Left": { "edit": { - "label": "Number_Tickets_Left", - "description": "", + "label": "Number of Tickets Left", + "description": "Set this to the same as the Maximum Number Of Tickets when creating a ticket, it will automatically count down when a ticket is sold.", "placeholder": "", "visible": true, "editable": true @@ -105,8 +105,8 @@ }, "Ticket_Description": { "edit": { - "label": "Ticket_Description", - "description": "", + "label": "Ticket Description", + "description": "This is shown as a small hint under the ticket title. Leave blank if not required, keep brief if required.", "placeholder": "", "visible": true, "editable": true @@ -119,8 +119,8 @@ }, "Start_Date_Ticket_Sales": { "edit": { - "label": "Start_Date_Ticket_Sales", - "description": "", + "label": "Start Date of Ticket Sale", + "description": "Ticket sales end automatically when the event has started", "placeholder": "", "visible": true, "editable": true @@ -133,8 +133,8 @@ }, "Is_Ticket_Live": { "edit": { - "label": "Is_Ticket_Live", - "description": "", + "label": "Ticket is Live", + "description": "Set to false if you want to stop sales of this ticket", "placeholder": "", "visible": true, "editable": true @@ -147,12 +147,12 @@ }, "Question_ID": { "edit": { - "label": "Question_ID", - "description": "", + "label": "Question IDs", + "description": "Link all the questions that you want asked when a user purchases this ticket. Name, email, phone number, are automatically asked.", "placeholder": "", "visible": true, "editable": true, - "mainField": "Question" + "mainField": "id" }, "list": { "label": "Question_ID", @@ -162,8 +162,8 @@ }, "Event_ID": { "edit": { - "label": "Event_ID", - "description": "", + "label": "Event ", + "description": "Link the event the ticket is to be sold for", "placeholder": "", "visible": true, "editable": true, @@ -177,8 +177,8 @@ }, "People_Ticket_ID": { "edit": { - "label": "People_Ticket_ID", - "description": "", + "label": "Member Tickets", + "description": "All the members (paid and unpaid) that have purchased this ticket", "placeholder": "", "visible": true, "editable": true, @@ -192,8 +192,8 @@ }, "Ticket_Link_Bypass": { "edit": { - "label": "Ticket_Link_Bypass", - "description": "", + "label": "Redirect to External Link", + "description": "Set this to true if you want the user to be taken to an external website (Humanitix etc.). Use this ONLY if the payments are NOT working on the website as this would make everything manual for ticketing", "placeholder": "", "visible": true, "editable": true @@ -206,8 +206,8 @@ }, "Bypass_Ticket_Link": { "edit": { - "label": "Bypass_Ticket_Link", - "description": "", + "label": "External Website Redirect Link", + "description": "Leave this blank unless External Website Redirect is true. Add the link you want to redirect to e.g. Https://www.google.co.nz", "placeholder": "", "visible": true, "editable": true @@ -220,8 +220,8 @@ }, "Stripe_Link": { "edit": { - "label": "Stripe_Link", - "description": "", + "label": "Stripe Code", + "description": "COPY THE STRIPE CODE EXACTLY. E.g price_1PSHXPP464csY2Up4aKoSw6r", "placeholder": "", "visible": true, "editable": true @@ -292,87 +292,103 @@ } }, "layouts": { - "list": [ - "id", - "Name", - "Price", - "Is_Member_Only" - ], "edit": [ + [ + { + "name": "Event_ID", + "size": 12 + } + ], [ { "name": "Name", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Price", - "size": 4 + "size": 12 + } + ], + [ + { + "name": "Stripe_Link", + "size": 12 } ], [ { "name": "Is_Member_Only", - "size": 4 - }, + "size": 12 + } + ], + [ { "name": "Is_Double", - "size": 4 - }, + "size": 12 + } + ], + [ { "name": "Max_Number_Tickets", - "size": 4 + "size": 12 } ], [ { "name": "Number_Tickets_Left", - "size": 4 - }, + "size": 12 + } + ], + [ { "name": "Ticket_Description", - "size": 6 + "size": 12 } ], [ { "name": "Start_Date_Ticket_Sales", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Is_Ticket_Live", - "size": 4 + "size": 12 } ], [ { "name": "Question_ID", - "size": 6 - }, - { - "name": "Event_ID", - "size": 6 + "size": 12 } ], [ - { - "name": "People_Ticket_ID", - "size": 6 - }, { "name": "Ticket_Link_Bypass", - "size": 4 + "size": 12 } ], [ { "name": "Bypass_Ticket_Link", - "size": 6 - }, + "size": 12 + } + ], + [ { - "name": "Stripe_Link", - "size": 6 + "name": "People_Ticket_ID", + "size": 12 } ] + ], + "list": [ + "id", + "Name", + "Price", + "Is_Member_Only" ] }, "uid": "api::ticket.ticket" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##user-ticket.user-ticket.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##user-ticket.user-ticket.json index e66cc92..93bfdec 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##user-ticket.user-ticket.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##user-ticket.user-ticket.json @@ -21,8 +21,8 @@ }, "People_ID": { "edit": { - "label": "People_ID", - "description": "", + "label": "Member ID", + "description": "If the user was logged in when purchasing the ticket the user's account will be linked, otherwise it won't be linked", "placeholder": "", "visible": true, "editable": true, @@ -36,12 +36,12 @@ }, "Ticket_ID": { "edit": { - "label": "Ticket_ID", - "description": "", + "label": "Ticket ID", + "description": "Ticket the user purhcased, E.g Member ticket, Non-member ticket, or Couple Ticket.", "placeholder": "", "visible": true, "editable": true, - "mainField": "Name" + "mainField": "id" }, "list": { "label": "Ticket_ID", @@ -79,7 +79,7 @@ }, "Phone_Number": { "edit": { - "label": "Phone_Number", + "label": "Phone Number", "description": "", "placeholder": "", "visible": true, @@ -94,7 +94,7 @@ "Answers": { "edit": { "label": "Answers", - "description": "", + "description": "Answers to the questions in the ticket", "placeholder": "", "visible": true, "editable": true, @@ -108,8 +108,8 @@ }, "People_Ticket_Code": { "edit": { - "label": "People_Ticket_Code", - "description": "", + "label": "Ticket Code", + "description": "Ticket code that is automatically generated when a ticket is purchased. If it is blank this ticket is invalid, because the payment did NOT get completed", "placeholder": "", "visible": true, "editable": true @@ -123,7 +123,7 @@ "Attendance": { "edit": { "label": "Attendance", - "description": "", + "description": "If the member attended the event, this is set using the QR code scanner. Can be done manually through Strapi also but is inconvenient.", "placeholder": "", "visible": true, "editable": true @@ -137,7 +137,7 @@ "Paid": { "edit": { "label": "Paid", - "description": "", + "description": "This is confirmation that the user has purchased the ticket. If it is false, the user did NOT complete the ticket purchase. ", "placeholder": "", "visible": true, "editable": true @@ -208,59 +208,67 @@ } }, "layouts": { - "list": [ - "id", - "People_ID", - "Ticket_ID", - "Name" - ], "edit": [ [ { - "name": "People_ID", - "size": 6 - }, - { - "name": "Ticket_ID", - "size": 6 + "name": "Paid", + "size": 12 } ], [ { "name": "Name", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Email", - "size": 6 + "size": 12 } ], [ { "name": "Phone_Number", - "size": 6 - }, - { - "name": "Answers", - "size": 6 + "size": 12 } ], [ { "name": "People_Ticket_Code", - "size": 6 - }, + "size": 12 + } + ], + [ + { + "name": "Answers", + "size": 12 + } + ], + [ { "name": "Attendance", - "size": 4 + "size": 12 } ], [ { - "name": "Paid", - "size": 4 + "name": "Ticket_ID", + "size": 12 + } + ], + [ + { + "name": "People_ID", + "size": 12 } ] + ], + "list": [ + "id", + "People_ID", + "Ticket_ID", + "Name" ] }, "uid": "api::user-ticket.user-ticket" diff --git a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##value.value.json b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##value.value.json index ba5e8c8..65b09f1 100644 --- a/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##value.value.json +++ b/strapi/config/sync/core-store.plugin_content_manager_configuration_content_types##api##value.value.json @@ -121,29 +121,31 @@ } }, "layouts": { - "list": [ - "id", - "Title", - "Description", - "Image" - ], "edit": [ [ { "name": "Title", - "size": 6 - }, + "size": 12 + } + ], + [ { "name": "Description", - "size": 6 + "size": 12 } ], [ { "name": "Image", - "size": 6 + "size": 12 } ] + ], + "list": [ + "id", + "Title", + "Description", + "Image" ] }, "uid": "api::value.value" diff --git a/web/src/screens/AboutUsScreen.tsx b/web/src/screens/AboutUsScreen.tsx index 2910a22..dfc1ef0 100644 --- a/web/src/screens/AboutUsScreen.tsx +++ b/web/src/screens/AboutUsScreen.tsx @@ -10,6 +10,9 @@ import { Mapper } from "../utils/Mapper"; import { useState, useEffect } from "react"; import ValueCard from "../components/about-us-page/ValueCard"; import { useNavigate } from "react-router"; +import Markdown from "react-markdown"; +import remarkGfm from "remark-gfm"; +import remarkBreaks from "remark-breaks"; export default function AboutUsScreen({ navbar }: { navbar: JSX.Element }) { // Navigation @@ -129,7 +132,11 @@ export default function AboutUsScreen({ navbar }: { navbar: JSX.Element }) {
There is no introduction to display
) : ( <> -

{introduction[0].description}

+ {introduction[0].description} +