new schedule page

ausspeedruns · May 5, 2024 · c30a31e · c30a31e
1 parent aaef148
commit c30a31e
Show file tree

Hide file tree

Showing 17 changed files with 706 additions and 243 deletions.
diff --git a/apps/keystone/migrations/20240505034646_added_external_schedule_links/migration.sql b/apps/keystone/migrations/20240505034646_added_external_schedule_links/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "Event" ADD COLUMN     "horaro" TEXT NOT NULL DEFAULT '',
+ADD COLUMN     "oengus" TEXT NOT NULL DEFAULT '';
diff --git a/apps/keystone/schema.graphql b/apps/keystone/schema.graphql
@@ -684,6 +684,8 @@ type Event {
   submissionInstructions: Event_submissionInstructions_Document
   eventPage: Event_eventPage_Document
   scheduleBlocks: JSON
+  horaro: String
+  oengus: String
 }
 
 type Event_postEventPage_Document {
@@ -767,6 +769,8 @@ input EventWhereInput {
   tickets: TicketManyRelationFilter
   volunteer: VolunteerManyRelationFilter
   donationIncentives: IncentiveManyRelationFilter
+  horaro: StringFilter
+  oengus: StringFilter
 }
 
 input FloatNullableFilter {
@@ -801,6 +805,8 @@ input EventOrderByInput {
   startDate: OrderDirection
   endDate: OrderDirection
   raised: OrderDirection
+  horaro: OrderDirection
+  oengus: OrderDirection
 }
 
 input EventUpdateInput {
@@ -832,6 +838,8 @@ input EventUpdateInput {
   submissionInstructions: JSON
   eventPage: JSON
   scheduleBlocks: JSON
+  horaro: String
+  oengus: String
 }
 
 input IncentiveRelateToManyForUpdateInput {
@@ -888,6 +896,8 @@ input EventCreateInput {
   submissionInstructions: JSON
   eventPage: JSON
   scheduleBlocks: JSON
+  horaro: String
+  oengus: String
 }
 
 input IncentiveRelateToManyForCreateInput {

diff --git a/apps/keystone/schema.prisma b/apps/keystone/schema.prisma
@@ -138,6 +138,8 @@ model Event {
   submissionInstructions        Json         @default("[{\"type\":\"paragraph\",\"children\":[{\"text\":\"\"}]}]")
   eventPage                     Json         @default("[{\"type\":\"paragraph\",\"children\":[{\"text\":\"\"}]}]")
   scheduleBlocks                Json?
+  horaro                        String       @default("")
+  oengus                        String       @default("")
   from_Post_event               Post[]       @relation("Post_event")
   from_Role_event               Role[]       @relation("Role_event")
 }

diff --git a/apps/keystone/src/schema/event.ts b/apps/keystone/src/schema/event.ts
@@ -126,6 +126,13 @@ export const Event: Lists.Event = list({
 			},
 			componentBlocks: liveEventComponentBlocks,
 		}),
-		scheduleBlocks: scheduleBlocks(),
+		...group({
+			label: "Schedule Metadata",
+			fields: {
+				scheduleBlocks: scheduleBlocks(),
+				horaro: text(),
+				oengus: text(),
+			}
+		}),
 	}
 });
diff --git a/apps/nextjs/components/Footer/Footer.module.scss b/apps/nextjs/components/Footer/Footer.module.scss
@@ -15,6 +15,7 @@
 
     ul {
       justify-content: center;
+      flex-wrap: wrap;
 
       @include breakpoint($sm-zero-only) {
         flex-direction: column;

diff --git a/apps/nextjs/components/Heroblock/Heroblock.module.scss b/apps/nextjs/components/Heroblock/Heroblock.module.scss
@@ -37,6 +37,10 @@
       }
     }
 
+    p {
+      text-wrap: balance;
+    }
+
     .ctaBlock {
       text-align: left;
       padding: 25px;

diff --git a/apps/nextjs/components/Heroblock/Heroblock.tsx b/apps/nextjs/components/Heroblock/Heroblock.tsx
@@ -112,8 +112,7 @@ const HeroBlock = ({ event, tagLine, darkText, schedule, submitRuns, ticketLink
 					</h3>
 					<br />
 					<p>
-						{tagLine ??
-							"We will be at The Game Expo! The schedule has been released!"}
+						{tagLine}
 					</p>
 					<Button
 						actionText={event.preferredName}

diff --git a/apps/nextjs/next.config.js b/apps/nextjs/next.config.js
@@ -78,7 +78,7 @@ const nextConfig = {
 			},
 			{
 				source: "/schedule",
-				destination: "/ASDH2024/schedule",
+				destination: "/ASM2024/schedule",
 				permanent: false,
 			},
 			{