Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

Make colors for challenge difficulty more easy to change (#573)

RandomLetters3b41ab70a60c
diff --git a/apps/web/src/app/_components/feature-card.tsx b/apps/web/src/app/_components/feature-card.tsx
index 7cb9dfdf..aea68eba 100644
--- a/apps/web/src/app/_components/feature-card.tsx
+++ b/apps/web/src/app/_components/feature-card.tsx
@@ -478,6 +478,11 @@ interface MockTrackChallenge {
}
const mockChallenges: MockTrackChallenge[] = [
+ {
+ id: 1,
+ name: 'Generics',
+ difficulty: 'BEGINNER',
+ },
{
id: 2,
name: 'Infer',
@@ -488,20 +493,15 @@ const mockChallenges: MockTrackChallenge[] = [
name: 'Map Types',
difficulty: 'MEDIUM',
},
- {
- id: 5,
- name: 'Classes',
- difficulty: 'EXTREME',
- },
{
id: 4,
name: 'Array/Object',
difficulty: 'HARD',
},
{
- id: 1,
- name: 'Generics',
- difficulty: 'BEGINNER',
+ id: 5,
+ name: 'Classes',
+ difficulty: 'EXTREME',
},
];
diff --git a/apps/web/src/app/explore/_components/explore-card.tsx b/apps/web/src/app/explore/_components/explore-card.tsx
index d5ce45ae..c8d49ce0 100644
--- a/apps/web/src/app/explore/_components/explore-card.tsx
+++ b/apps/web/src/app/explore/_components/explore-card.tsx
@@ -20,24 +20,24 @@ interface ExploreCardProps {
const BORDERS_BY_DIFFICULTY = {
BEGINNER:
- 'dark:hover:border-pink-300 hover:border-pink-500 dark:group-focus:border-pink-300 group-focus:border-pink-500',
- EASY: 'dark:hover:border-green-300 hover:border-green-500 dark:group-focus:border-green-300 group-focus:border-green-500',
+ 'dark:hover:border-difficulty-beginner-dark hover:border-difficulty-beginner dark:group-focus:border-difficulty-beginner-dark group-focus:border-difficulty-beginner',
+ EASY: 'dark:hover:border-difficulty-easy-dark hover:border-difficulty-easy dark:group-focus:border-difficulty-easy-dark group-focus:border-difficulty-easy',
MEDIUM:
- 'dark:hover:border-yellow-300 hover:border-yellow-500 dark:group-focus:border-yellow-300 group-focus:border-yellow-500',
- HARD: 'dark:hover:border-red-300 hover:border-red-500 dark:group-focus:border-red-300 group-focus:border-red-500',
+ 'dark:hover:border-difficulty-medium-dark hover:border-difficulty-medium dark:group-focus:border-difficulty-medium-dark group-focus:border-difficulty-medium',
+ HARD: 'dark:hover:border-difficulty-hard-dark hover:border-difficulty-hard dark:group-focus:border-difficulty-hard-dark group-focus:border-difficulty-hard',
EXTREME:
- 'dark:hover:border-orange-300 hover:border-orange-500 dark:group-focus:border-orange-300 group-focus:border-orange-500',
+ 'dark:hover:border-difficulty-extreme-dark hover:border-difficulty-extreme dark:group-focus:border-difficulty-extreme-dark group-focus:border-difficulty-extreme',
};
const SHADOWS_BY_DIFFICULTY = {
BEGINNER:
- 'hover:shadow-[0_0_1rem_-0.15rem_#f9a8d4] group-focus:shadow-[0_0_1rem_-0.15rem_#f9a8d4]',
- EASY: 'hover:shadow-[0_0_1rem_-0.15rem_#86efac] group-focus:shadow-[0_0_1rem_-0.15rem_#86efac]',
+ 'hover:shadow-beginner group-focus:shadow-beginner dark:hover:shadow-beginner-dark dark:group-focus:shadow-beginner-dark',
+ EASY: 'hover:shadow-easy group-focus:shadow-easy dark:hover:shadow-easy-dark dark:group-focus:shadow-easy-dark',
MEDIUM:
- 'hover:shadow-[0_0_1rem_-0.15rem_#ca8a04] group-focus:shadow-[0_0_1rem_-0.15rem_#fde047] dark:hover:shadow-[0_0_1rem_-0.15rem_#fde047]',
- HARD: 'hover:shadow-[0_0_1rem_-0.15rem_#fca5a5] group-focus:shadow-[0_0_1rem_-0.15rem_#fca5a5]',
+ 'hover:shadow-medium group-focus:shadow-medium dark:hover:shadow-medium-dark dark:group-focus:shadow-medium-dark',
+ HARD: 'hover:shadow-hard group-focus:shadow-hard dark:hover:shadow-hard-dark dark:group-focus:shadow-hard-dark',
EXTREME:
- 'hover:shadow-[0_0_1rem_-0.15rem_#fdba74] group-focus:shadow-[0_0_1rem_-0.15rem_#fdba74]',
+ 'hover:shadow-extreme group-focus:shadow-extreme dark:hover:shadow-extreme-dark dark:group-focus:shadow-extreme-dark',
};
export function ExploreCard({ challenge }: ExploreCardProps) {
@@ -50,32 +50,32 @@ export function ExploreCard({ challenge }: ExploreCardProps) {
>
{challenge.difficulty === 'BEGINNER' && (
<>
- <Circle className="absolute -right-4 -top-8 h-24 w-24 origin-top-right stroke-[0.5] text-black/10 duration-300 group-hover/card:scale-90 group-hover/card:text-pink-500/80 dark:text-white/10 dark:group-hover/card:text-pink-300/80" />
- <Circle className="absolute -right-4 -top-8 h-32 w-32 origin-top-right stroke-[0.4] text-black/10 duration-500 group-hover/card:scale-90 group-hover/card:text-pink-500/80 dark:text-white/10 dark:group-hover/card:text-pink-300/80" />
+ <Circle className="group-hover/card:text-difficulty-beginner dark:group-hover/card:text-difficulty-beginner-dark absolute -right-4 -top-8 h-24 w-24 origin-top-right stroke-[0.5] text-black/10 duration-300 group-hover/card:scale-90 dark:text-white/10" />
+ <Circle className="group-hover/card:text-difficulty-beginner dark:group-hover/card:text-difficulty-beginner-dark absolute -right-4 -top-8 h-32 w-32 origin-top-right stroke-[0.4] text-black/10 duration-500 group-hover/card:scale-90 dark:text-white/10" />
</>
)}
{challenge.difficulty === 'EASY' && (
<>
- <Diamond className="absolute -right-5 -top-10 h-24 w-24 origin-top-right stroke-[0.66] text-black/10 duration-300 group-hover/card:rotate-6 group-hover/card:scale-90 group-hover/card:text-green-400/90 dark:text-white/10 dark:group-hover/card:text-green-300/90" />
- <Diamond className="absolute -right-6 -top-12 h-36 w-36 rotate-12 stroke-[0.44] text-black/10 duration-500 group-hover/card:-translate-y-2 group-hover/card:translate-x-3 group-hover/card:rotate-6 group-hover/card:scale-90 group-hover/card:text-green-400/90 dark:text-white/10 dark:group-hover/card:text-green-300/90" />
+ <Diamond className="group-hover/card:text-difficulty-easy dark:group-hover/card:text-difficulty-easy-dark absolute -right-5 -top-10 h-24 w-24 origin-top-right stroke-[0.66] text-black/10 duration-300 group-hover/card:rotate-6 group-hover/card:scale-90 dark:text-white/10" />
+ <Diamond className="group-hover/card:text-difficulty-easy dark:group-hover/card:text-difficulty-easy-dark absolute -right-6 -top-12 h-36 w-36 rotate-12 stroke-[0.44] text-black/10 duration-500 group-hover/card:-translate-y-2 group-hover/card:translate-x-3 group-hover/card:rotate-6 group-hover/card:scale-90 dark:text-white/10" />
</>
)}
{challenge.difficulty === 'MEDIUM' && (
<>
- <Triangle className="absolute -right-5 -top-5 h-16 w-16 rotate-0 stroke-[0.75] text-black/10 duration-500 group-hover/card:-translate-x-10 group-hover/card:translate-y-10 group-hover/card:rotate-[90deg] group-hover/card:text-yellow-500 dark:text-white/10 dark:group-hover/card:text-yellow-300/80" />
- <Triangle className="absolute -right-14 -top-16 h-36 w-36 rotate-12 stroke-[0.4] text-black/10 duration-300 group-hover/card:translate-x-3 group-hover/card:rotate-[30deg] group-hover/card:scale-50 group-hover/card:stroke-[0.66] group-hover/card:text-yellow-500 dark:text-white/10 dark:group-hover/card:text-yellow-300/80" />
+ <Triangle className="group-hover/card:text-difficulty-medium dark:group-hover/card:text-difficulty-medium-dark absolute -right-5 -top-5 h-16 w-16 rotate-0 stroke-[0.75] text-black/10 duration-500 group-hover/card:-translate-x-10 group-hover/card:translate-y-10 group-hover/card:rotate-[90deg] dark:text-white/10" />
+ <Triangle className="group-hover/card:text-difficulty-medium dark:group-hover/card:text-difficulty-medium-dark absolute -right-14 -top-16 h-36 w-36 rotate-12 stroke-[0.4] text-black/10 duration-300 group-hover/card:translate-x-3 group-hover/card:rotate-[30deg] group-hover/card:scale-50 group-hover/card:stroke-[0.66] dark:text-white/10" />
</>
)}
{challenge.difficulty === 'HARD' && (
<>
- <Plus className="absolute -right-4 -top-8 h-24 w-24 stroke-[0.5] text-black/10 duration-300 group-hover/card:scale-0 group-hover/card:text-red-500/80 dark:text-white/10 dark:group-hover/card:text-red-300/80" />
- <Plus className="absolute -right-4 -top-8 h-32 w-32 stroke-[0.5] text-black/10 duration-500 group-hover/card:-translate-y-5 group-hover/card:translate-x-9 group-hover/card:-rotate-90 group-hover/card:scale-75 group-hover/card:text-red-500/80 dark:text-white/10 dark:group-hover/card:text-red-300/80" />
+ <Plus className="group-hover/card:text-difficulty-hard dark:group-hover/card:text-difficulty-hard-dark absolute -right-4 -top-8 h-24 w-24 stroke-[0.5] text-black/10 duration-300 group-hover/card:scale-0 dark:text-white/10" />
+ <Plus className="group-hover/card:text-difficulty-hard dark:group-hover/card:text-difficulty-hard-dark absolute -right-4 -top-8 h-32 w-32 stroke-[0.5] text-black/10 duration-500 group-hover/card:-translate-y-5 group-hover/card:translate-x-9 group-hover/card:-rotate-90 group-hover/card:scale-75 dark:text-white/10" />
</>
)}
{challenge.difficulty === 'EXTREME' && (
<>
- <Sparkle className="absolute -right-4 -top-10 h-24 w-24 stroke-[0.5] text-black/10 duration-500 group-hover/card:-translate-x-4 group-hover/card:translate-y-10 group-hover/card:-rotate-[125deg] group-hover/card:text-orange-500/80 dark:text-white/10 dark:group-hover/card:text-orange-300/90" />
- <Sparkle className="absolute -right-14 -top-24 h-48 w-48 origin-top-right -rotate-3 stroke-[0.33] text-black/10 duration-300 group-hover/card:scale-50 group-hover/card:text-orange-500/80 dark:text-white/10 dark:group-hover/card:text-orange-300/90" />
+ <Sparkle className="group-hover/card:text-difficulty-extreme dark:group-hover/card:text-difficulty-extreme-dark absolute -right-4 -top-10 h-24 w-24 stroke-[0.5] text-black/10 duration-500 group-hover/card:-translate-x-4 group-hover/card:translate-y-10 group-hover/card:-rotate-[125deg] dark:text-white/10" />
+ <Sparkle className="group-hover/card:text-difficulty-extreme dark:group-hover/card:text-difficulty-extreme-dark absolute -right-14 -top-24 h-48 w-48 origin-top-right -rotate-3 stroke-[0.33] text-black/10 duration-300 group-hover/card:scale-50 dark:text-white/10" />
</>
)}
<CardHeader className="relative flex flex-col items-start gap-1 py-5">
diff --git a/apps/web/src/app/tracks/_components/track-challenge-card.tsx b/apps/web/src/app/tracks/_components/track-challenge-card.tsx
index d3584373..bacd0bd4 100644
--- a/apps/web/src/app/tracks/_components/track-challenge-card.tsx
+++ b/apps/web/src/app/tracks/_components/track-challenge-card.tsx
@@ -12,19 +12,19 @@ interface TrackChallengeProps {
}
const COLORS_BY_DIFFICULTY = {
- BEGINNER: 'text-pink-600 dark:text-pink-300',
- EASY: 'text-emerald-600 dark:text-emerald-300',
- MEDIUM: 'text-yellow-600 dark:text-yellow-300',
- HARD: 'text-red-600 dark:text-red-300',
- EXTREME: 'text-orange-600 dark:text-orange-300',
+ BEGINNER: 'text-difficulty-beginner dark:text-difficulty-beginner-dark',
+ EASY: 'text-difficulty-easy dark:text-difficulty-easy-dark',
+ MEDIUM: 'text-difficulty-medium dark:text-difficulty-medium-dark',
+ HARD: 'text-difficulty-hard dark:text-difficulty-hard-dark',
+ EXTREME: 'text-difficulty-extreme dark:text-difficulty-extreme-dark',
} as const;
const BGS_BY_DIFFICULTY = {
- BEGINNER: 'to-pink-600/20 dark:to-pink-300/20',
- EASY: 'to-emerald-600/20 dark:to-emerald-300/20',
- MEDIUM: 'to-yellow-600/20 dark:to-yellow-300/20',
- HARD: 'to-red-600/20 dark:to-red-300/20',
- EXTREME: 'to-orange-600/20 dark:to-orange-300/20',
+ BEGINNER: 'to-difficulty-beginner/20 dark:to-difficulty-beginner-dark/20',
+ EASY: 'to-difficulty-easy/20 dark:to-difficulty-easy-dark/20',
+ MEDIUM: 'to-difficulty-medium/20 dark:to-difficulty-medium-dark/20',
+ HARD: 'to-difficulty-hard/20 dark:to-difficulty-hard-dark/20',
+ EXTREME: 'to-difficulty-extreme/20 dark:to-difficulty-extreme-dark/20',
} as const;
export function TrackChallenge({ challenge, className, mock }: TrackChallengeProps) {
@@ -36,9 +36,11 @@ export function TrackChallenge({ challenge, className, mock }: TrackChallengePro
>
<div
className={clsx(
- `flex w-full items-center justify-between gap-3 overflow-hidden rounded-lg bg-gradient-to-r from-neutral-500/10 ${
+ `flex w-full items-center justify-between gap-3 overflow-hidden rounded-lg`,
+ `bg-gradient-to-r from-neutral-500/10 from-70% ${
BGS_BY_DIFFICULTY[challenge.difficulty]
- } from-75% to-100% p-4 py-2 text-black/90 duration-300 group-active/challenge:bg-neutral-500/40 group-active/challenge:duration-75 dark:text-white/90 sm:py-4`,
+ } to-100% dark:from-neutral-500/20`,
+ ` p-4 py-2 text-black/90 duration-300 group-active/challenge:bg-neutral-500/40 group-active/challenge:duration-75 dark:text-white/90 sm:py-4`,
className,
!isMobile &&
'group-hover/challenge:scale-105 group-hover/challenge:rounded-xl group-hover/challenge:bg-neutral-500/20',
@@ -61,7 +63,7 @@ export function TrackChallenge({ challenge, className, mock }: TrackChallengePro
<div
className={`relative text-xs font-medium tracking-wide ${
COLORS_BY_DIFFICULTY[challenge.difficulty]
- }`}
+ } text-background`}
>
<div
className={`absolute right-0 top-1/2 h-12 w-12 -translate-y-1/2 blur-3xl ${
diff --git a/apps/web/src/styles/globals.css b/apps/web/src/styles/globals.css
index c00fcf8b..e8679019 100644
--- a/apps/web/src/styles/globals.css
+++ b/apps/web/src/styles/globals.css
@@ -37,6 +37,18 @@
--ring: 240 5% 64.9%;
--radius: 0.5rem;
+
+ --difficulty-beginner: 201 96% 32%;
+ --difficulty-easy: 150 100% 25%;
+ --difficulty-medium: 35 92% 33%;
+ --difficulty-hard: 0 72% 51%;
+ --difficulty-extreme: 262 83% 58%;
+
+ --difficulty-beginner-dark: 199 69% 72%;
+ --difficulty-easy-dark: 142 77% 73%;
+ --difficulty-medium-dark: 31 86% 60%;
+ --difficulty-hard-dark: 0 91% 71%;
+ --difficulty-extreme-dark: 269 97% 85%;
}
.dark {
diff --git a/apps/web/tailwind.config.ts b/apps/web/tailwind.config.ts
index 43b3da4d..3d4e2627 100644
--- a/apps/web/tailwind.config.ts
+++ b/apps/web/tailwind.config.ts
@@ -51,6 +51,29 @@ module.exports = {
hovered: 'hsl(var(--card-hovered))',
foreground: 'hsl(var(--card-foreground))',
},
+
+ 'difficulty-beginner': 'hsl(var(--difficulty-beginner) / <alpha-value>)',
+ 'difficulty-easy': 'hsl(var(--difficulty-easy) / <alpha-value>)',
+ 'difficulty-medium': 'hsl(var(--difficulty-medium) / <alpha-value>)',
+ 'difficulty-hard': 'hsl(var(--difficulty-hard) / <alpha-value>)',
+ 'difficulty-extreme': 'hsl(var(--difficulty-extreme) / <alpha-value>)',
+ 'difficulty-beginner-dark': 'hsl(var(--difficulty-beginner-dark) / <alpha-value>)',
+ 'difficulty-easy-dark': 'hsl(var(--difficulty-easy-dark) / <alpha-value>)',
+ 'difficulty-medium-dark': 'hsl(var(--difficulty-medium-dark) / <alpha-value>)',
+ 'difficulty-hard-dark': 'hsl(var(--difficulty-hard-dark) / <alpha-value>)',
+ 'difficulty-extreme-dark': 'hsl(var(--difficulty-extreme-dark) / <alpha-value>)',
+ },
+ boxShadow: {
+ beginner: '0 0 1rem -0.15rem hsl(var(--difficulty-beginner))',
+ easy: '0 0 1rem -0.15rem hsl(var(--difficulty-easy))',
+ medium: '0 0 1rem -0.15rem hsl(var(--difficulty-medium))',
+ hard: '0 0 1rem -0.15rem hsl(var(--difficulty-hard))',
+ extreme: '0 0 1rem -0.15rem hsl(var(--difficulty-extreme))',
+ 'beginner-dark': '0 0 1rem -0.15rem hsl(var(--difficulty-beginner-dark))',
+ 'easy-dark': '0 0 1rem -0.15rem hsl(var(--difficulty-easy-dark))',
+ 'medium-dark': '0 0 1rem -0.15rem hsl(var(--difficulty-medium-dark))',
+ 'hard-dark': '0 0 1rem -0.15rem hsl(var(--difficulty-hard-dark))',
+ 'extreme-dark': '0 0 1rem -0.15rem hsl(var(--difficulty-extreme-dark))',
},
borderRadius: {
lg: 'var(--radius)',
diff --git a/packages/ui/src/components/difficulty-badge.tsx b/packages/ui/src/components/difficulty-badge.tsx
index e421551d..59f5db5c 100644
--- a/packages/ui/src/components/difficulty-badge.tsx
+++ b/packages/ui/src/components/difficulty-badge.tsx
@@ -6,11 +6,11 @@ interface Props {
}
const COLORS_BY_DIFFICULTY = {
- BEGINNER: 'dark:bg-pink-300 bg-pink-600',
- EASY: 'dark:bg-green-300 bg-green-600',
- MEDIUM: 'dark:bg-yellow-300 bg-yellow-600',
- HARD: 'dark:bg-red-300 bg-red-600',
- EXTREME: 'dark:bg-orange-300 bg-orange-600',
+ BEGINNER: 'dark:bg-difficulty-beginner-dark bg-difficulty-beginner',
+ EASY: 'dark:bg-difficulty-easy-dark bg-difficulty-easy',
+ MEDIUM: 'dark:bg-difficulty-medium-dark bg-difficulty-medium',
+ HARD: 'dark:bg-difficulty-hard-dark bg-difficulty-hard',
+ EXTREME: 'dark:bg-difficulty-extreme-dark bg-difficulty-extreme',
};
export function DifficultyBadge({ difficulty }: Props) {
diff --git a/packages/ui/tailwind.config.ts b/packages/ui/tailwind.config.ts
index 926836b8..01bc6e6d 100644
--- a/packages/ui/tailwind.config.ts
+++ b/packages/ui/tailwind.config.ts
@@ -3,4 +3,21 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: ['src/**/*.{ts,tsx}'],
+ theme: {
+ extend: {
+ colors: {
+ 'difficulty-beginner': 'hsl(var(--difficulty-beginner) / <alpha-value>)',
+ 'difficulty-easy': 'hsl(var(--difficulty-easy) / <alpha-value>)',
+ 'difficulty-medium': 'hsl(var(--difficulty-medium) / <alpha-value>)',
+ 'difficulty-hard': 'hsl(var(--difficulty-hard) / <alpha-value>)',
+ 'difficulty-extreme': 'hsl(var(--difficulty-extreme) / <alpha-value>)',
+
+ 'difficulty-beginner-dark': 'hsl(var(--difficulty-beginner-dark) / <alpha-value>)',
+ 'difficulty-easy-dark': 'hsl(var(--difficulty-easy-dark) / <alpha-value>)',
+ 'difficulty-medium-dark': 'hsl(var(--difficulty-medium-dark) / <alpha-value>)',
+ 'difficulty-hard-dark': 'hsl(var(--difficulty-hard-dark) / <alpha-value>)',
+ 'difficulty-extreme-dark': 'hsl(var(--difficulty-extreme-dark) / <alpha-value>)',
+ },
+ },
+ },
};