diff --git a/.github/pr-previews/redesign/admin-talks.png b/.github/pr-previews/redesign/admin-talks.png new file mode 100644 index 0000000..97c6ed0 Binary files /dev/null and b/.github/pr-previews/redesign/admin-talks.png differ diff --git a/.github/pr-previews/redesign/admin-thumbnails.png b/.github/pr-previews/redesign/admin-thumbnails.png new file mode 100644 index 0000000..58876a4 Binary files /dev/null and b/.github/pr-previews/redesign/admin-thumbnails.png differ diff --git a/.github/pr-previews/redesign/doorbell.png b/.github/pr-previews/redesign/doorbell.png new file mode 100644 index 0000000..176ffb2 Binary files /dev/null and b/.github/pr-previews/redesign/doorbell.png differ diff --git a/.github/pr-previews/redesign/event-detail.png b/.github/pr-previews/redesign/event-detail.png new file mode 100644 index 0000000..243227f Binary files /dev/null and b/.github/pr-previews/redesign/event-detail.png differ diff --git a/.github/pr-previews/redesign/event-terms.png b/.github/pr-previews/redesign/event-terms.png new file mode 100644 index 0000000..dd6852d Binary files /dev/null and b/.github/pr-previews/redesign/event-terms.png differ diff --git a/.github/pr-previews/redesign/events.png b/.github/pr-previews/redesign/events.png new file mode 100644 index 0000000..a67ef36 Binary files /dev/null and b/.github/pr-previews/redesign/events.png differ diff --git a/.github/pr-previews/redesign/home.png b/.github/pr-previews/redesign/home.png new file mode 100644 index 0000000..e769358 Binary files /dev/null and b/.github/pr-previews/redesign/home.png differ diff --git a/.github/pr-previews/redesign/login.png b/.github/pr-previews/redesign/login.png new file mode 100644 index 0000000..21cd3f6 Binary files /dev/null and b/.github/pr-previews/redesign/login.png differ diff --git a/.github/pr-previews/redesign/nametags.png b/.github/pr-previews/redesign/nametags.png new file mode 100644 index 0000000..b1843dc Binary files /dev/null and b/.github/pr-previews/redesign/nametags.png differ diff --git a/.github/pr-previews/redesign/reset-password.png b/.github/pr-previews/redesign/reset-password.png new file mode 100644 index 0000000..7b68861 Binary files /dev/null and b/.github/pr-previews/redesign/reset-password.png differ diff --git a/.github/pr-previews/redesign/setup.png b/.github/pr-previews/redesign/setup.png new file mode 100644 index 0000000..32f57db Binary files /dev/null and b/.github/pr-previews/redesign/setup.png differ diff --git a/.github/pr-previews/redesign/slide-detail.png b/.github/pr-previews/redesign/slide-detail.png new file mode 100644 index 0000000..9bacbe1 Binary files /dev/null and b/.github/pr-previews/redesign/slide-detail.png differ diff --git a/.github/pr-previews/redesign/slides.png b/.github/pr-previews/redesign/slides.png new file mode 100644 index 0000000..f6fd997 Binary files /dev/null and b/.github/pr-previews/redesign/slides.png differ diff --git a/.github/pr-previews/redesign/submit-talk.png b/.github/pr-previews/redesign/submit-talk.png new file mode 100644 index 0000000..986c265 Binary files /dev/null and b/.github/pr-previews/redesign/submit-talk.png differ diff --git a/.github/pr-previews/redesign/talk.png b/.github/pr-previews/redesign/talk.png new file mode 100644 index 0000000..a2559f8 Binary files /dev/null and b/.github/pr-previews/redesign/talk.png differ diff --git a/.github/pr-previews/redesign/watch.png b/.github/pr-previews/redesign/watch.png new file mode 100644 index 0000000..b3cb093 Binary files /dev/null and b/.github/pr-previews/redesign/watch.png differ diff --git a/.github/pr-previews/redesign/whois.png b/.github/pr-previews/redesign/whois.png new file mode 100644 index 0000000..2c97ba4 Binary files /dev/null and b/.github/pr-previews/redesign/whois.png differ diff --git a/app/components/Button.tsx b/app/components/Button.tsx index 970b355..871b5fc 100644 --- a/app/components/Button.tsx +++ b/app/components/Button.tsx @@ -70,69 +70,53 @@ export const Button = ({ // Styled Components // -const StyledButton = styled.button<{ +// Shared visual rules for all three DOM variants (button/Link/anchor) — +// kept as one template so the three renderers below can't drift apart. +const sharedButtonCss = (props: { $variant: "primary" | "secondary" | "tertiary" $size: "small" | "default" -}>` - padding: ${(props) => (props.$size === "small" ? "0.5rem 1rem" : "0.75rem 1.5rem")}; - border-radius: ${(props) => (props.$variant === "tertiary" ? "0.375rem" : "0.25rem")}; - font-weight: ${(props) => (props.$size === "small" ? "500" : "600")}; - font-size: ${(props) => (props.$size === "small" ? "inherit" : "1.1rem")}; +}) => ` + padding: ${props.$size === "small" ? "0.5rem 1.1rem" : "0.85rem 1.75rem"}; + border-radius: 999px; + font-weight: ${props.$size === "small" ? "600" : "700"}; + font-size: ${props.$size === "small" ? "0.9rem" : "1.05rem"}; cursor: pointer; - transition: all 0.3s ease; + transition: all 0.2s ease; text-decoration: none; display: inline-flex; align-items: center; + justify-content: center; gap: 0.5rem; - border: none; font-family: inherit; line-height: 1.5; - background-color: ${(props) => + white-space: nowrap; + background-color: ${ props.$variant === "primary" - ? "white" - : props.$variant === "tertiary" + ? "var(--color-accent)" + : props.$variant === "secondary" ? "transparent" - : "transparent"}; - color: ${(props) => (props.$variant === "primary" ? "black" : "white")}; - border: ${(props) => (props.$variant === "secondary" ? "1px solid white" : "none")}; - position: ${(props) => (props.$variant === "tertiary" ? "relative" : "static")}; - overflow: ${(props) => (props.$variant === "tertiary" ? "hidden" : "visible")}; - - ${(props) => - props.$variant === "tertiary" && - ` - &::before { - content: ""; - position: absolute; - top: 0; - left: -100%; - width: 100%; - height: 100%; - background: linear-gradient( - 90deg, - transparent, - rgba(255, 255, 255, 0.1), - transparent - ); - transition: left 0.5s ease; - } - `} + : "transparent" + }; + color: ${ + props.$variant === "primary" + ? "var(--color-accent-ink)" + : props.$variant === "secondary" + ? "var(--color-ink)" + : "var(--color-ink-muted)" + }; + border: ${props.$variant === "secondary" ? "1.5px solid var(--color-ink)" : "1.5px solid transparent"}; +` +const sharedButtonHoverCss = (props: { $variant: "primary" | "secondary" | "tertiary" }) => ` &:hover:not(:disabled) { - background-color: ${(props) => { - if (props.$variant === "primary") return "#ddd" - if (props.$variant === "tertiary") return "rgba(255, 255, 255, 0.05)" - return "rgba(255, 255, 255, 0.1)" - }}; - border-radius: ${(props) => (props.$variant === "tertiary" ? "0.375rem" : "0.25rem")}; - - ${(props) => - props.$variant === "tertiary" && - ` - &::before { - left: 100%; - } - `} + background-color: ${ + props.$variant === "primary" + ? "var(--color-accent-hover)" + : props.$variant === "secondary" + ? "var(--color-ink)" + : "transparent" + }; + color: ${props.$variant === "secondary" ? "var(--color-bg)" : props.$variant === "tertiary" ? "var(--color-ink)" : "var(--color-accent-ink)"}; } &:disabled { @@ -141,134 +125,26 @@ const StyledButton = styled.button<{ } ` -const StyledLink = styled(Link)<{ +const StyledButton = styled.button<{ $variant: "primary" | "secondary" | "tertiary" $size: "small" | "default" }>` - padding: ${(props) => (props.$size === "small" ? "0.5rem 1rem" : "0.75rem 1.5rem")}; - border-radius: ${(props) => (props.$variant === "tertiary" ? "0.375rem" : "0.25rem")}; - font-weight: ${(props) => (props.$size === "small" ? "500" : "600")}; - font-size: ${(props) => (props.$size === "small" ? "inherit" : "1.1rem")}; - cursor: pointer; - transition: all 0.3s ease; - text-decoration: none; - display: inline-flex; - align-items: center; - gap: 0.5rem; - border: none; - font-family: inherit; - line-height: 1.5; - background-color: ${(props) => - props.$variant === "primary" - ? "white" - : props.$variant === "tertiary" - ? "transparent" - : "transparent"}; - color: ${(props) => (props.$variant === "primary" ? "black" : "white")}; - border: ${(props) => (props.$variant === "secondary" ? "1px solid white" : "none")}; - position: ${(props) => (props.$variant === "tertiary" ? "relative" : "static")}; - overflow: ${(props) => (props.$variant === "tertiary" ? "hidden" : "visible")}; - - ${(props) => - props.$variant === "tertiary" && - ` - &::before { - content: ""; - position: absolute; - top: 0; - left: -100%; - width: 100%; - height: 100%; - background: linear-gradient( - 90deg, - transparent, - rgba(255, 255, 255, 0.1), - transparent - ); - transition: left 0.5s ease; - } - `} - - &:hover { - background-color: ${(props) => { - if (props.$variant === "primary") return "#ddd" - if (props.$variant === "tertiary") return "rgba(255, 255, 255, 0.05)" - return "rgba(255, 255, 255, 0.1)" - }}; - border-radius: ${(props) => (props.$variant === "tertiary" ? "0.375rem" : "0.25rem")}; + ${sharedButtonCss} + ${sharedButtonHoverCss} +` - ${(props) => - props.$variant === "tertiary" && - ` - &::before { - left: 100%; - } - `} - } +const StyledLink = styled(Link)<{ + $variant: "primary" | "secondary" | "tertiary" + $size: "small" | "default" +}>` + ${sharedButtonCss} + ${sharedButtonHoverCss} ` const StyledExternalLink = styled.a<{ $variant: "primary" | "secondary" | "tertiary" $size: "small" | "default" }>` - padding: ${(props) => (props.$size === "small" ? "0.5rem 1rem" : "0.75rem 1.5rem")}; - border-radius: ${(props) => (props.$variant === "tertiary" ? "0.375rem" : "0.25rem")}; - font-weight: ${(props) => (props.$size === "small" ? "500" : "600")}; - font-size: ${(props) => (props.$size === "small" ? "inherit" : "1.1rem")}; - cursor: pointer; - transition: all 0.3s ease; - text-decoration: none; - display: inline-flex; - align-items: center; - gap: 0.5rem; - border: none; - font-family: inherit; - line-height: 1.5; - background-color: ${(props) => - props.$variant === "primary" - ? "white" - : props.$variant === "tertiary" - ? "transparent" - : "transparent"}; - color: ${(props) => (props.$variant === "primary" ? "black" : "white")}; - border: ${(props) => (props.$variant === "secondary" ? "1px solid white" : "none")}; - position: ${(props) => (props.$variant === "tertiary" ? "relative" : "static")}; - overflow: ${(props) => (props.$variant === "tertiary" ? "hidden" : "visible")}; - - ${(props) => - props.$variant === "tertiary" && - ` - &::before { - content: ""; - position: absolute; - top: 0; - left: -100%; - width: 100%; - height: 100%; - background: linear-gradient( - 90deg, - transparent, - rgba(255, 255, 255, 0.1), - transparent - ); - transition: left 0.5s ease; - } - `} - - &:hover { - background-color: ${(props) => { - if (props.$variant === "primary") return "#ddd" - if (props.$variant === "tertiary") return "rgba(255, 255, 255, 0.05)" - return "rgba(255, 255, 255, 0.1)" - }}; - border-radius: ${(props) => (props.$variant === "tertiary" ? "0.375rem" : "0.25rem")}; - - ${(props) => - props.$variant === "tertiary" && - ` - &::before { - left: 100%; - } - `} - } + ${sharedButtonCss} + ${sharedButtonHoverCss} ` diff --git a/app/components/Card.tsx b/app/components/Card.tsx index 7b09795..ee6a039 100644 --- a/app/components/Card.tsx +++ b/app/components/Card.tsx @@ -78,13 +78,13 @@ export const CardContent = styled.div<{ $padding?: string }>` export const CardTitle = styled.h3<{ $size?: string }>` font-size: ${(props) => props.$size || "1.25rem"}; font-weight: bold; - color: white; + color: var(--color-ink); margin-bottom: 0.5rem; ` export const CardText = styled.p<{ $color?: string; $size?: string; $weight?: string }>` font-size: ${(props) => props.$size || "0.875rem"}; - color: ${(props) => props.$color || "#9ca3af"}; + color: ${(props) => props.$color || "var(--color-ink-muted)"}; margin-bottom: 0.5rem; font-weight: ${(props) => props.$weight || "normal"}; ` @@ -94,49 +94,55 @@ export const CardText = styled.p<{ $color?: string; $size?: string; $weight?: st const StyledLink = styled(Link)` display: flex; flex-direction: column; - background-color: rgba(21, 21, 28, 0.75); - backdrop-filter: blur(10px); - border-radius: 0.5rem; + background-color: var(--color-bg-raised); + border: 1px solid var(--color-border); + border-radius: 0.75rem; overflow: hidden; - transition: transform 0.2s ease; + transition: + transform 0.2s ease, + box-shadow 0.2s ease; text-decoration: none; color: inherit; &:hover { transform: translateY(-4px); - box-shadow: 0 10px 20px rgba(0, 0, 0, 0.2); + box-shadow: 0 12px 24px rgba(23, 20, 15, 0.1); } ` const StyledExternalLink = styled.a` display: flex; flex-direction: column; - background-color: rgba(21, 21, 28, 0.75); - backdrop-filter: blur(10px); - border-radius: 0.5rem; + background-color: var(--color-bg-raised); + border: 1px solid var(--color-border); + border-radius: 0.75rem; overflow: hidden; - transition: transform 0.2s ease; + transition: + transform 0.2s ease, + box-shadow 0.2s ease; text-decoration: none; color: inherit; &:hover { transform: translateY(-4px); - box-shadow: 0 10px 20px rgba(0, 0, 0, 0.2); + box-shadow: 0 12px 24px rgba(23, 20, 15, 0.1); } ` const StyledDiv = styled.div` display: flex; flex-direction: column; - background-color: rgba(21, 21, 28, 0.75); - backdrop-filter: blur(10px); - border-radius: 0.5rem; + background-color: var(--color-bg-raised); + border: 1px solid var(--color-border); + border-radius: 0.75rem; overflow: hidden; - transition: transform 0.2s ease; + transition: + transform 0.2s ease, + box-shadow 0.2s ease; &:hover { transform: translateY(-4px); - box-shadow: 0 10px 20px rgba(0, 0, 0, 0.2); + box-shadow: 0 12px 24px rgba(23, 20, 15, 0.1); } ` @@ -147,8 +153,8 @@ const ImageContainer = styled.div<{ $aspectRatio?: "16/9" | "1/1" | "auto" }>` ${(props) => props.$aspectRatio === "16/9" && "aspect-ratio: 16/9;"} ${(props) => props.$aspectRatio === "1/1" && "aspect-ratio: 1/1;"} background-color: ${(props) => - props.$aspectRatio !== "auto" ? "rgba(0, 0, 0, 0.8)" : "transparent"}; - border-radius: ${(props) => (props.$aspectRatio !== "auto" ? "0.5rem" : "0")}; + props.$aspectRatio !== "auto" ? "var(--color-border)" : "transparent"}; + border-radius: 0; ` const CardImage = styled.img<{ $aspectRatio?: "16/9" | "1/1" | "auto" }>` diff --git a/app/components/Footer.tsx b/app/components/Footer.tsx index d4da903..ac4b35e 100644 --- a/app/components/Footer.tsx +++ b/app/components/Footer.tsx @@ -90,8 +90,8 @@ const FooterContainer = styled.footer` align-items: center; justify-content: center; width: 100%; - background-color: rgba(0, 0, 0, 0.1); - backdrop-filter: blur(64px); + background-color: var(--color-bg); + border-top: 1px solid var(--color-border); margin-top: auto; ` @@ -101,7 +101,7 @@ const FooterContent = styled.div` align-items: center; justify-content: space-between; padding: 1.5rem 1rem; - color: #a3a3a3; + color: var(--color-ink-muted); max-width: 1200px; width: 100%; gap: 1rem; @@ -139,14 +139,14 @@ const SocialNav = styled.nav` const SocialLink = styled.a` display: flex; align-items: center; - color: inherit; - transition: opacity 0.2s ease; + color: var(--color-ink-muted); + transition: color 0.2s ease; svg { fill: currentColor; } &:hover { - opacity: 0.7; + color: var(--color-accent); } ` diff --git a/app/components/GiveATalkCTA.tsx b/app/components/GiveATalkCTA.tsx index 012fa15..7a194c2 100644 --- a/app/components/GiveATalkCTA.tsx +++ b/app/components/GiveATalkCTA.tsx @@ -1,9 +1,8 @@ "use client" -import styled from "styled-components" -import Link from "next/link" import { useRouter } from "next/navigation" import { useState, useEffect } from "react" import { supabaseClient } from "../../lib/supabaseClient" +import { Button } from "./Button" // Components // @@ -21,214 +20,17 @@ export const GiveATalkCTA: React.FC = () => { checkAuth() }, []) - const handleClick = (e: React.MouseEvent) => { + const handleClick = (e?: React.MouseEvent) => { if (isAuthenticated === false) { - e.preventDefault() + e?.preventDefault() const redirectUrl = encodeURIComponent("/submit-talk") router.push(`/login?redirect=${redirectUrl}`) } } return ( - - - - - - - Give a Talk! - + ) } - -const StyledLink = styled(Link)` - display: inline-flex; - align-items: center; - padding: 0.5rem 1rem; - gap: 0.5rem; - font-weight: 500; - font-size: 0.875rem; - color: rgba(255, 255, 255, 0.95); - text-decoration: none; - transition: all 0.3s ease-in-out; - border-radius: 15px 0 20px 0px; - box-shadow: - 0 0 20px rgba(156, 163, 255, 0.15), - 0 0 40px rgba(92, 107, 246, 0.1), - 0 0 60px rgba(28, 28, 40, 0.4), - 0 1px 3px rgba(0, 0, 0, 0.9), - 0 10px 20px -5px rgba(28, 28, 40, 0.5), - inset 0 1px 0 rgba(156, 163, 255, 0.1); - background: linear-gradient( - 135deg, - rgba(28, 28, 40, 0.9) 0%, - rgba(15, 15, 22, 0.95) 25%, - rgba(0, 0, 1, 1) 50%, - rgba(15, 15, 22, 0.95) 75%, - rgba(28, 28, 40, 0.9) 100% - ); - border: 1px solid rgba(156, 163, 255, 0.5); - position: relative; - overflow: hidden; - white-space: nowrap; - transform: perspective(1000px) rotateX(5deg) skew(-10deg) scaleY(.9); - animation: pulseGlow 3s ease-in-out infinite; - - &::before { - content: ""; - position: absolute; - top: -200%; - left: -100%; - width: 300%; - height: 400%; - background: linear-gradient( - 115deg, - transparent 40%, - rgba(156, 163, 255, 0.15) 48%, - rgba(255, 255, 255, 0.25) 50%, - rgba(156, 163, 255, 0.15) 52%, - transparent 60% - ); - animation: shimmer 2.5s linear infinite; - } - - &::after { - content: ""; - position: absolute; - top: 0; - left: 0; - right: 0; - height: 1px; - background: linear-gradient( - 90deg, - transparent 0%, - rgba(255, 255, 255, 0.4) 50%, - transparent 100% - ); - pointer-events: none; - } - - &:hover { - transform: perspective(1000px) rotateX(5deg) translateY(-1px) skew(-10deg) scaleY(.9); - box-shadow: - 0 0 30px rgba(156, 163, 255, 0.25), - 0 0 50px rgba(92, 107, 246, 0.15), - 0 0 80px rgba(28, 28, 40, 0.5), - 0 2px 4px rgba(0, 0, 0, 1), - 0 15px 30px -5px rgba(28, 28, 40, 0.7), - inset 0 1px 0 rgba(156, 163, 255, 0.15); - text-decoration: none; - } - - @keyframes shimmer { - 0% { - transform: translateX(-100%) translateY(-100%) rotate(45deg); - } - 100% { - transform: translateX(100%) translateY(100%) rotate(45deg); - } - } - - @keyframes pulseGlow { - 0%, 100% { - box-shadow: - 0 0 20px rgba(156, 163, 255, 0.15), - 0 0 40px rgba(92, 107, 246, 0.1), - 0 0 60px rgba(28, 28, 40, 0.4), - 0 1px 3px rgba(0, 0, 0, 0.9), - 0 10px 20px -5px rgba(28, 28, 40, 0.5), - inset 0 1px 0 rgba(156, 163, 255, 0.1); - } - 50% { - box-shadow: - 0 0 35px rgba(156, 163, 255, 0.25), - 0 0 70px rgba(92, 107, 246, 0.18), - 0 0 100px rgba(28, 28, 40, 0.5), - 0 1px 3px rgba(0, 0, 0, 0.9), - 0 10px 20px -5px rgba(28, 28, 40, 0.5), - inset 0 1px 0 rgba(156, 163, 255, 0.15); - } - } - - &:hover { - transform: scale(1.02) skew(-10deg) scaleY(.9); - box-shadow: - 0 4px 12px rgba(0, 0, 0, 1), - 0 0 20px rgba(92, 107, 246, 0.1), - inset 0 1px 0 rgba(255, 255, 255, 0.2); - text-decoration: none; - } - - @keyframes shimmer { - 0% { - transform: translateX(-100%) translateY(-100%) rotate(45deg); - } - 100% { - transform: translateX(100%) translateY(100%) rotate(45deg); - } - } - - &::after { - content: ""; - position: absolute; - top: 0; - left: 0; - right: 0; - height: 50%; - background: linear-gradient(180deg, rgba(255, 255, 255, 0.1) 0%, transparent 100%); - pointer-events: none; - } - - &:hover { - transform: scale(1.03) skew(-10deg) scaleY(.9); - box-shadow: - 0 6px 16px rgba(0, 0, 0, 0.8), - 0 0 20px rgba(92, 107, 246, 0.15), - inset 0 1px 0 rgba(255, 255, 255, 0.25), - inset 0 -1px 0 rgba(0, 0, 0, 0.9); - text-decoration: none; - } - - @keyframes shimmer { - 0% { - transform: translateX(-100%) translateY(-100%) rotate(45deg); - } - 100% { - transform: translateX(100%) translateY(100%) rotate(45deg); - } - } - } - - @keyframes pulse { - 0%, - 100% { - opacity: 1; - } - 50% { - opacity: 0.8; - } - } -` - -const IconWrapper = styled.div` - width: 1.25rem; - height: 1.25rem; - display: flex; - align-items: center; - justify-content: center; - - svg { - width: 100%; - height: 100%; - } -` diff --git a/app/components/Header.tsx b/app/components/Header.tsx index 067a76b..128b8bd 100644 --- a/app/components/Header.tsx +++ b/app/components/Header.tsx @@ -1,6 +1,7 @@ "use client" import { useState, useEffect } from "react" import { useRouter } from "next/navigation" +import Link from "next/link" import styled from "styled-components" import { links } from "../siteConfig" import { GiveATalkCTA } from "./GiveATalkCTA" @@ -129,7 +130,7 @@ export const Header = () => {