From 383abdc879cffeffb4fa5056a3b79b803d02905d Mon Sep 17 00:00:00 2001 From: J Cui Date: Wed, 26 Mar 2025 21:11:28 +0000 Subject: [PATCH 1/5] Move announcement information to constants --- app/layout.tsx | 13 ++++++++++--- constants/announcement.tsx | 9 +++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 constants/announcement.tsx diff --git a/app/layout.tsx b/app/layout.tsx index bab460fa5..55afe7d4f 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -6,6 +6,11 @@ import PixelBackground from '@/components/PixelBackground' import VariableBackground from '@/components/VariableBackground' import Footer from '@/components/footer/Footer' import AnnouncementBar from '@/components/AnnouncementBar' +import { + displayAnnouncement, + announcement, + announcementUrl, +} from '@/constants/announcement' export const metadata: Metadata = { title: 'CompSoc', @@ -28,9 +33,11 @@ export default function RootLayout({ return ( - - 🪩 InfBall 2025 tickets are now on sale! infball.comp-soc.com - + {displayAnnouncement && ( + + {announcement} + + )} diff --git a/constants/announcement.tsx b/constants/announcement.tsx new file mode 100644 index 000000000..8b5760c4c --- /dev/null +++ b/constants/announcement.tsx @@ -0,0 +1,9 @@ +export const displayAnnouncement = true + +export const announcement = ( + <> + 🪩 InfBall 2025 tickets are now on sale! infball.comp-soc.com + +) + +export const announcementUrl = 'https://infball.comp-soc.com' From 950bd822c8fbf72334cd73ff7d632bec7c139c55 Mon Sep 17 00:00:00 2001 From: J Cui Date: Wed, 26 Mar 2025 21:15:27 +0000 Subject: [PATCH 2/5] Make announcement bar background colour configurable --- components/AnnouncementBar.tsx | 5 ++++- constants/announcement.tsx | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/components/AnnouncementBar.tsx b/components/AnnouncementBar.tsx index 436b6420c..09cb7aaa3 100644 --- a/components/AnnouncementBar.tsx +++ b/components/AnnouncementBar.tsx @@ -1,5 +1,6 @@ import React, { ReactNode } from 'react' import Link from 'next/link' +import { announcementBarColourClassName } from '@/constants/announcement' interface AnnouncementBarProps { children: ReactNode @@ -9,7 +10,9 @@ interface AnnouncementBarProps { const AnnouncementBar = ({ children, href }: AnnouncementBarProps) => { return ( -
+
{children}
diff --git a/constants/announcement.tsx b/constants/announcement.tsx index 8b5760c4c..4f03c3963 100644 --- a/constants/announcement.tsx +++ b/constants/announcement.tsx @@ -7,3 +7,6 @@ export const announcement = ( ) export const announcementUrl = 'https://infball.comp-soc.com' + +// Tailwind CSS class name, see https://tailwindcss.com/docs/background-color +export const announcementBarColourClassName = 'bg-blue-600' From d5420da7f737107eaa3fe42ed0b02da935687b7a Mon Sep 17 00:00:00 2001 From: J Cui Date: Wed, 26 Mar 2025 21:20:18 +0000 Subject: [PATCH 3/5] Hide InfBall announcement --- constants/announcement.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants/announcement.tsx b/constants/announcement.tsx index 4f03c3963..5b1642b6d 100644 --- a/constants/announcement.tsx +++ b/constants/announcement.tsx @@ -1,4 +1,4 @@ -export const displayAnnouncement = true +export const displayAnnouncement = false export const announcement = ( <> From 737fcd1ca885afb45f6a496c0e427c1fbb3ce8bd Mon Sep 17 00:00:00 2001 From: J Cui Date: Sun, 1 Jun 2025 16:47:05 +0100 Subject: [PATCH 4/5] Refactor and bug fix announcement bar --- app/layout.tsx | 6 +++++- components/AnnouncementBar.tsx | 5 +---- constants/announcement.tsx | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/layout.tsx b/app/layout.tsx index 55afe7d4f..680121e69 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -10,6 +10,7 @@ import { displayAnnouncement, announcement, announcementUrl, + announcementClassName, } from '@/constants/announcement' export const metadata: Metadata = { @@ -34,7 +35,10 @@ export default function RootLayout({ {displayAnnouncement && ( - + {announcement} )} diff --git a/components/AnnouncementBar.tsx b/components/AnnouncementBar.tsx index 32e1adf20..e98d79062 100644 --- a/components/AnnouncementBar.tsx +++ b/components/AnnouncementBar.tsx @@ -1,6 +1,5 @@ import React, { ReactNode } from 'react' import Link from 'next/link' -import { announcementBarColourClassName } from '@/constants/announcement' interface AnnouncementBarProps { children: ReactNode @@ -15,9 +14,7 @@ const AnnouncementBar = ({ }: AnnouncementBarProps) => { return ( -
+
{children}
diff --git a/constants/announcement.tsx b/constants/announcement.tsx index 5b1642b6d..ffffce58a 100644 --- a/constants/announcement.tsx +++ b/constants/announcement.tsx @@ -9,4 +9,4 @@ export const announcement = ( export const announcementUrl = 'https://infball.comp-soc.com' // Tailwind CSS class name, see https://tailwindcss.com/docs/background-color -export const announcementBarColourClassName = 'bg-blue-600' +export const announcementClassName = 'bg-blue-600' From 22c19557069a38adc6755c35e603c925b5ce49db Mon Sep 17 00:00:00 2001 From: J Cui Date: Sun, 1 Jun 2025 17:12:55 +0100 Subject: [PATCH 5/5] Fix generating CSS --- tailwind.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tailwind.config.ts b/tailwind.config.ts index 41bbd6c22..58433967c 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -5,6 +5,7 @@ const config: Config = { './pages/**/*.{js,ts,jsx,tsx,mdx}', './components/**/*.{js,ts,jsx,tsx,mdx}', './app/**/*.{js,ts,jsx,tsx,mdx}', + './constants/**/*.{js,ts,jsx,tsx,mdx}', ], theme: { extend: {