Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/app/components/footer/footer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FaGithub, FaPaintBrush } from 'react-icons/fa';
import { FaGithub } from 'react-icons/fa';
import FooterSection from './FooterSection';
import FooterLink from './FooterLink';
import footerData from './footerData';
Expand All @@ -19,16 +19,19 @@ export default function Footer() {
Celebrating student creativity at the University of Warwick
</p>

<div className="text-left mt-4">
<a
href="https://submit.wsaf.org.uk/2025/cfp"
target="_blank"
className="inline-flex items-center gap-2 bg-yellow px-2 py-1 sm:px-4 sm:py-2 text-black font-semibold uppercase mr-auto hover:scale-[102%] text-sm lg:text-base"
>
<FaPaintBrush />
Performers Portal
</a>
</div>
{/* W-Paint Link TODO: fix styles */}
{/* <Link
href="/wpaint"
className="flex items-center mx-auto gap-2 rounded hover:underline uppercase text-black bg-yellow"
>
<div className="font-bold">W-Paint</div>
<Image
src={PaintBrush}
alt="Paint brush icon"
width={25}
height={25}
/>
</Link> */}
</FooterSection>

<FooterSection title="Quick Links">
Expand Down
44 changes: 12 additions & 32 deletions src/app/components/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { FiMenu, FiX } from 'react-icons/fi';
import Link from 'next/link';
import { usePathname } from 'next/navigation';
import NavLinks from './NavLinks';
import Image from 'next/image';
import PaintBrush from '@/assets/icons/paintbrush.png';

export default function Header() {
const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
Expand All @@ -33,25 +31,17 @@ export default function Header() {
{/* Right links (desktop) */}
<div className="hidden sm:flex items-center gap-2 ml-auto">
<Link
href="/wpaint"
className={`flex items-center rounded hover:underline uppercase ${
pathname === '/wpaint' ? 'text-yellow-400' : 'text-white'
}`}
href="/crew"
className={`uppercase font-bold px-2.5 py-1.5 hover:scale-[102%] ${pathname === '/crew' ? 'text-yellow-400' : 'bg-yellow text-black'}`}
>
<div className="font-bold">W-Paint</div>
<Image
src={PaintBrush}
alt="Paint brush icon"
width={25}
height={25}
/>
<span className="hidden lg:inline">Join the </span>Crew
</Link>

<Link
href="/crew"
className={`uppercase font-bold px-2.5 py-1.5 hover:scale-[102%] ${pathname === '/crew' ? 'text-yellow-400' : 'bg-yellow text-black'}`}
href="https://submit.wsaf.org.uk/2025/cfp"
className="uppercase font-bold px-2.5 py-1.5 hover:scale-[102%] bg-yellow text-black"
>
<span className="hidden lg:inline">Join the </span>Crew
Performers <span className="hidden lg:inline">Portal</span>
</Link>
</div>

Expand All @@ -76,29 +66,19 @@ export default function Header() {
<NavLinks onClick={() => setMobileMenuOpen(false)} />
</div>

{/* W-Paint Link */}
<Link
href="/wpaint"
href="/crew"
className={`uppercase mx-auto font-bold px-4 py-2 hover:scale-[102%] ${pathname === '/crew' ? 'text-yellow-400' : 'bg-yellow text-black'}`}
onClick={() => setMobileMenuOpen(false)}
className={`flex items-center mx-auto gap-2 rounded hover:underline uppercase ${
pathname === '/wpaint' ? 'text-yellow-400' : 'text-white'
}`}
>
<div className="font-bold">W-Paint</div>
<Image
src={PaintBrush}
alt="Paint brush icon"
width={25}
height={25}
/>
Join the Crew
</Link>

<Link
href="/crew"
className={`uppercase mx-auto font-bold px-4 py-2 hover:scale-[102%] ${pathname === '/crew' ? 'text-yellow-400' : 'bg-yellow text-black'}`}
href="https://submit.wsaf.org.uk/2025/cfp"
className="uppercase mx-auto font-bold px-4 py-2 hover:scale-[102%] bg-yellow text-black"
onClick={() => setMobileMenuOpen(false)}
>
Join the Crew
Performers Portal
</Link>
</nav>
</div>
Expand Down
8 changes: 5 additions & 3 deletions src/app/venues/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ export default async function VenuesPage() {
</h1>

<div className="mt-2 grid px-4 gap-8 md:px-16 mx-auto py-4 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-5 sm:gap-4 justify-center">
{venues.map((venue) => (
<VenueCard key={venue.id} venue={venue} />
))}
{venues
.filter((venue) => venue.eventCount > 0)
.map((venue) => (
<VenueCard key={venue.id} venue={venue} />
))}
</div>
</main>
);
Expand Down
17 changes: 14 additions & 3 deletions src/data/venues.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,24 @@ import FabGallery from '@/assets/venues/fab-gallery.jpg';
import Avon from '@/assets/venues/avon.jpg';
import Fab1 from '@/assets/venues/fab1.jpg';
import Fab2 from '@/assets/venues/fab2.jpg';
import Cinema from '@/assets/venues/fab2.jpg';
import Rehearsal from '@/assets/venues/rehersal.jpg';
import Terrace from '@/assets/venues/terrace.jpg';
import Placeholder from '@/assets/hero.jpg';
import { AdditionalVenueData } from '@/lib/venues';

// Mapping from venue GUID to additional data
const venues: Record<string, AdditionalVenueData> = {
// Milburn G55
'038ea818-8093-57c0-8bd8-1ca2927b488c': {
mapUrl:
'https://campus.warwick.ac.uk/search/623c889d421e6f5928c0d3d2?projectId=warwick',
image: Placeholder,
imageAlt: 'Placeholder',
roomLocation: 'Milburn G55',
slug: 'milburn-g55',
filterBitFieldIndex: 10,
},

// Benefactors Place Stage
'd629fdd8-158b-52e9-87a3-2491c02d2bb2': {
mapUrl:
Expand Down Expand Up @@ -69,7 +80,7 @@ const venues: Record<string, AdditionalVenueData> = {
'825706ae-0ef1-501b-a4a6-ca7026e2de75': {
mapUrl:
'https://campus.warwick.ac.uk/search/623c896e421e6f5928c0fe27?projectId=warwick',
image: Cinema,
image: Rehearsal,
imageAlt: 'Image of FAB Cinema',
roomLocation: 'Unknown',
slug: 'fab-cinema',
Expand Down Expand Up @@ -102,7 +113,7 @@ const venues: Record<string, AdditionalVenueData> = {
'01cbe95d-0b59-58a6-a7f2-3e2365e88a03': {
mapUrl:
'https://campus.warwick.ac.uk/search/623c889c421e6f5928c0d3a7?projectId=warwick',
image: Avon,
image: Placeholder,
imageAlt:
'Picture of a performance in a room that looks like Avon Drama Studio',
roomLocation: 'The Graduate',
Expand Down