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
Binary file added assets/landing/background/cambodia-elder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/cambodia-learner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/indonesia-elder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/indonesia-learner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/malaysia-elder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/malaysia-learner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/myanmar-elder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/myanmar-learner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/philippines-elder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/philippines-learner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/singapore-elder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/singapore-learner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/thailand-elder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/thailand-learner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/vietnam-elder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/landing/background/vietnam-learner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions src/lib/learningLanguages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,52 @@ export const LEARNING_LANGUAGE_OPTIONS = [

export type LearningLanguage = (typeof LEARNING_LANGUAGE_OPTIONS)[number];

// Eagerly bundle all landing background images so Vite resolves them at build time.
const backgroundModules = import.meta.glob<string>('../../assets/landing/background/*.png', {
eager: true,
import: 'default',
});

function getLandingBackground(country: string, role: 'learner' | 'elder'): string {
const key = `../../assets/landing/background/${country.toLowerCase()}-${role}.png`;
return backgroundModules[key] ?? '';
}

export const LANGUAGE_BG: Record<LearningLanguage, { learner: string; elder: string }> = {
Tandia: {
learner: getLandingBackground('indonesia', 'learner'),
elder: getLandingBackground('indonesia', 'elder'),
},
Semai: {
learner: getLandingBackground('malaysia', 'learner'),
elder: getLandingBackground('malaysia', 'elder'),
},
Mlabri: {
learner: getLandingBackground('thailand', 'learner'),
elder: getLandingBackground('thailand', 'elder'),
},
Chong: {
learner: getLandingBackground('cambodia', 'learner'),
elder: getLandingBackground('cambodia', 'elder'),
},
Arta: {
learner: getLandingBackground('philippines', 'learner'),
elder: getLandingBackground('philippines', 'elder'),
},
Arem: {
learner: getLandingBackground('vietnam', 'learner'),
elder: getLandingBackground('vietnam', 'elder'),
},
Kristang: {
learner: getLandingBackground('singapore', 'learner'),
elder: getLandingBackground('singapore', 'elder'),
},
Moken: {
learner: getLandingBackground('myanmar', 'learner'),
elder: getLandingBackground('myanmar', 'elder'),
},
};
Comment thread
greptile-apps[bot] marked this conversation as resolved.
Resolved

export const DEFAULT_LEARNING_LANGUAGE: LearningLanguage = 'Semai';

export type LearningLanguageMetadata = {
Expand Down
14 changes: 11 additions & 3 deletions src/pages/LandingPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@
justify-items: center;
}

.landing-hero::after {
background: rgba(0, 0, 0, 0.32);
content: '';
inset: 0;
pointer-events: none;
position: absolute;
z-index: 1;
}

.landing-hero > img {
height: 110%;
left: 0;
Expand Down Expand Up @@ -130,13 +139,12 @@
}

.landing-hero-greeting span {
color: #ffedd6;
font-family: 'Playfair Display', 'Playfair', Georgia, serif;
font-size: 32px;
font-style: italic;
font-weight: 700;
font-size: 32px;
color: #604828;
letter-spacing: 1px;
text-shadow: 0 1px 4px rgba(255, 255, 255, 0.5);
}

.landing-learning-language-badge {
Expand Down
23 changes: 16 additions & 7 deletions src/pages/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import { AppSkeleton } from '../components/ui';
import { LearningLanguageBadge } from '../components/LearningLanguageBadge';
import { withTimeout } from '../lib/asyncTimeout';
import { triggerHapticFeedback } from '../lib/feedback';
import { DEFAULT_LEARNING_LANGUAGE, resolveLearningLanguage } from '../lib/learningLanguages';
import {
DEFAULT_LEARNING_LANGUAGE,
LANGUAGE_BG,
type LearningLanguage,
resolveLearningLanguage,
} from '../lib/learningLanguages';
import { addExploreEntry } from '../lib/navigationEntry';
import { fetchProfileDashboard } from '../lib/profile';
import { STORIES, type Story } from '../lib/storyData';
Expand All @@ -18,8 +23,6 @@ import bayuAvatarImg from '../../assets/home-revised/bayu.png';
import defaultLeaderboardImg from '../../assets/home-revised/default-leaderboard.png';
import gardenCardImg from '../../assets/home-revised/lang-garden.png';
import translateCardImg from '../../assets/home-revised/translate.png';
import bgLearner from '../../assets/landing/background-learner.png';
import bgElder from '../../assets/landing/background-elder.png';

import './LandingPage.css';

Expand Down Expand Up @@ -280,7 +283,7 @@ function LearnerLanding({
firstName: string;
onNavigate: (h: string) => void;
onOpenLanguageSettings: () => void;
learningLanguage: string;
learningLanguage: LearningLanguage;
leaderName: string;
leaderAvatarSrc: string;
leaderHasCustomPhoto: boolean;
Expand All @@ -290,7 +293,7 @@ function LearnerLanding({
<section className="landing-shell landing-shell--learner">
{/* Hero */}
<div className="landing-hero">
<img src={bgLearner} alt="" draggable={false} />
<img src={LANGUAGE_BG[learningLanguage].learner} alt="" draggable={false} />
<div className="landing-hero-greeting">
<span>Hello, {firstName}</span>
</div>
Expand Down Expand Up @@ -365,14 +368,16 @@ function LearnerLanding({
function ElderLanding({
firstName,
onNavigate,
learningLanguage,
}: {
firstName: string;
onNavigate: (h: string) => void;
learningLanguage: LearningLanguage;
}) {
return (
<section className="landing-shell landing-shell--elder">
<div className="landing-hero landing-hero--elder" aria-hidden="true">
<img src={bgElder} alt="" draggable={false} />
<img src={LANGUAGE_BG[learningLanguage].elder} alt="" draggable={false} />
</div>

<div className="landing-card landing-card--elder-simple">
Expand Down Expand Up @@ -532,7 +537,11 @@ export function LandingPage() {
const lastReadStory = getLastReadStory(STORIES, storyProgress);

return isElder ? (
<ElderLanding firstName={firstName} onNavigate={onNavigate} />
<ElderLanding
firstName={firstName}
onNavigate={onNavigate}
learningLanguage={learningLanguage}
/>
) : (
<LearnerLanding
firstName={firstName}
Expand Down
Loading