diff --git a/backend/src/services/emailService.ts b/backend/src/services/emailService.ts index 45f269fb..56b7b4b0 100644 --- a/backend/src/services/emailService.ts +++ b/backend/src/services/emailService.ts @@ -100,6 +100,23 @@ function resolveFromAddress(): string { return from; } +/** Shared Prediqo HTML shell (no external image — works in all mail clients). */ +function brandEmailHtml(title: string, bodyHtml: string): string { + return ` +
+
Prediqo
+

${title}

+ ${bodyHtml} +

+ Prediqo — premium prediction platform +

+
+ `; +} + +const CTA_STYLE = + 'background:#10B981;color:#0B0F1A;text-decoration:none;padding:12px 24px;border-radius:8px;font-weight:700;display:inline-block;'; + /** * @param to - Recipient email address * @param verifyUrl - Full URL opened by the user to confirm ownership @@ -116,19 +133,17 @@ export async function sendVerificationEmail(to: string, verifyUrl: string): Prom 'If you did not create an account, you can ignore this email.', ].join('\n'); - const html = ` -
-

Verify your email

-

Thanks for joining Prediqo. Confirm your email address to secure your account.

+ const html = brandEmailHtml( + 'Verify your email', + ` +

Thanks for joining Prediqo. Confirm your email address to secure your account.

- - Verify email - + Verify email

-

Or copy this link:
${verifyUrl}

-

Link expires in ${config.email.verificationExpiryHours} hours.

-
- `; +

Or copy this link:
${verifyUrl}

+

Link expires in ${config.email.verificationExpiryHours} hours.

+ ` + ); if (config.email.transport === 'console') { console.log('[email] Verification message (console transport)'); @@ -167,19 +182,17 @@ export async function sendPasswordResetEmail(to: string, resetUrl: string): Prom 'If you did not request this, you can ignore this email.', ].join('\n'); - const html = ` -
-

Reset your password

-

We received a request to reset the password for your Prediqo account.

+ const html = brandEmailHtml( + 'Reset your password', + ` +

We received a request to reset the password for your Prediqo account.

- - Reset password - + Reset password

-

Or copy this link:
${resetUrl}

-

Link expires in ${config.email.passwordResetExpiryHours} hour(s). If you did not request this, ignore this email.

-
- `; +

Or copy this link:
${resetUrl}

+

Link expires in ${config.email.passwordResetExpiryHours} hour(s). If you did not request this, ignore this email.

+ ` + ); if (config.email.transport === 'console') { console.log('[email] Password reset message (console transport)'); diff --git a/brand/prediqo-app-icon.png b/brand/prediqo-app-icon.png new file mode 100644 index 00000000..d13c51db Binary files /dev/null and b/brand/prediqo-app-icon.png differ diff --git a/brand/prediqo-lockup-source.png b/brand/prediqo-lockup-source.png new file mode 100644 index 00000000..495593ec Binary files /dev/null and b/brand/prediqo-lockup-source.png differ diff --git a/brand/prediqo-lockup.png b/brand/prediqo-lockup.png new file mode 100644 index 00000000..495593ec Binary files /dev/null and b/brand/prediqo-lockup.png differ diff --git a/brand/prediqo-lockup.svg b/brand/prediqo-lockup.svg new file mode 100644 index 00000000..d1fb2366 --- /dev/null +++ b/brand/prediqo-lockup.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + Prediqo + diff --git a/brand/prediqo-mark-source.png b/brand/prediqo-mark-source.png new file mode 100644 index 00000000..6fc6ac0a Binary files /dev/null and b/brand/prediqo-mark-source.png differ diff --git a/brand/prediqo-mark.png b/brand/prediqo-mark.png new file mode 100644 index 00000000..6fc6ac0a Binary files /dev/null and b/brand/prediqo-mark.png differ diff --git a/brand/prediqo-mark.svg b/brand/prediqo-mark.svg new file mode 100644 index 00000000..c52a9613 --- /dev/null +++ b/brand/prediqo-mark.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/prediqo_web/index.html b/prediqo_web/index.html index c22415a3..5c842172 100644 --- a/prediqo_web/index.html +++ b/prediqo_web/index.html @@ -3,6 +3,9 @@ + + + Prediqo diff --git a/prediqo_web/public/brand/prediqo-app-icon.png b/prediqo_web/public/brand/prediqo-app-icon.png new file mode 100644 index 00000000..d13c51db Binary files /dev/null and b/prediqo_web/public/brand/prediqo-app-icon.png differ diff --git a/prediqo_web/public/brand/prediqo-lockup.png b/prediqo_web/public/brand/prediqo-lockup.png new file mode 100644 index 00000000..495593ec Binary files /dev/null and b/prediqo_web/public/brand/prediqo-lockup.png differ diff --git a/prediqo_web/public/brand/prediqo-lockup.svg b/prediqo_web/public/brand/prediqo-lockup.svg new file mode 100644 index 00000000..d1fb2366 --- /dev/null +++ b/prediqo_web/public/brand/prediqo-lockup.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + Prediqo + diff --git a/prediqo_web/public/brand/prediqo-mark.png b/prediqo_web/public/brand/prediqo-mark.png new file mode 100644 index 00000000..6fc6ac0a Binary files /dev/null and b/prediqo_web/public/brand/prediqo-mark.png differ diff --git a/prediqo_web/public/brand/prediqo-mark.svg b/prediqo_web/public/brand/prediqo-mark.svg new file mode 100644 index 00000000..c52a9613 --- /dev/null +++ b/prediqo_web/public/brand/prediqo-mark.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/prediqo_web/public/favicon.svg b/prediqo_web/public/favicon.svg index 6893eb13..b0501e3a 100644 --- a/prediqo_web/public/favicon.svg +++ b/prediqo_web/public/favicon.svg @@ -1 +1,15 @@ - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/prediqo_web/src/app/theme/theme.ts b/prediqo_web/src/app/theme/theme.ts index 9512e739..fea43f48 100644 --- a/prediqo_web/src/app/theme/theme.ts +++ b/prediqo_web/src/app/theme/theme.ts @@ -9,11 +9,11 @@ import { normalizeLocale } from '../../shared/i18n'; const baseThemeOptions: ThemeOptions = { palette: { mode: 'dark', - primary: { main: '#D6B25E' }, // gold accent - secondary: { main: '#7C5CFF' }, + primary: { main: '#10B981' }, // emerald — aligned with mobile + brand mark + secondary: { main: '#7C5CFF' }, // bonus / accent purple background: { - default: '#0B0E14', - paper: '#121724', + default: '#0B0F1A', + paper: '#12182B', }, }, shape: { borderRadius: 14 }, @@ -43,7 +43,7 @@ const baseThemeOptions: ThemeOptions = { }; /** - * Builds the application MUI theme with a dark palette, gold accent, and shared component styling. + * Builds the application MUI theme with a dark palette, emerald brand primary, and shared component styling. * * @returns A configured MUI theme instance for the admin console. */ diff --git a/prediqo_web/src/features/auth/LoginPage.tsx b/prediqo_web/src/features/auth/LoginPage.tsx index e21295cc..c6fc9a35 100644 --- a/prediqo_web/src/features/auth/LoginPage.tsx +++ b/prediqo_web/src/features/auth/LoginPage.tsx @@ -12,6 +12,7 @@ import { api } from '../../shared/services/api'; import { useAuth } from '../../shared/auth/AuthContext'; import { LanguageSwitcher } from '../../shared/i18n/LanguageSwitcher'; import { apiErrorMessage } from '../../shared/utils/apiError'; +import { PrediqoLogo } from '../../shared/brand/PrediqoLogo'; import { TurnstileWidget } from './components/TurnstileWidget'; type LoginResponse = { @@ -155,10 +156,8 @@ export function LoginPage() { - - Prediqo - - {t('auth.brandSubtitle')} + + {t('auth.brandSubtitle')} {verifyHint && {t('auth.verifyEmailHint')}} diff --git a/prediqo_web/src/features/auth/RegisterPage.tsx b/prediqo_web/src/features/auth/RegisterPage.tsx index 32de1970..4e840af1 100644 --- a/prediqo_web/src/features/auth/RegisterPage.tsx +++ b/prediqo_web/src/features/auth/RegisterPage.tsx @@ -21,6 +21,7 @@ import { GenderSelect } from '../../shared/components/GenderSelect'; import type { UserGender } from '../../shared/constants/userGender'; import { api } from '../../shared/services/api'; import { LanguageSwitcher } from '../../shared/i18n/LanguageSwitcher'; +import { PrediqoLogo } from '../../shared/brand/PrediqoLogo'; import { apiErrorMessage } from '../../shared/utils/apiError'; type RegisterResponse = { @@ -133,7 +134,8 @@ export function RegisterPage() { - + + {t('auth.createAccount')} {t('auth.registerSubtitle')} diff --git a/prediqo_web/src/features/auth/SetupPage.tsx b/prediqo_web/src/features/auth/SetupPage.tsx index 509263de..6dabfcdf 100644 --- a/prediqo_web/src/features/auth/SetupPage.tsx +++ b/prediqo_web/src/features/auth/SetupPage.tsx @@ -22,6 +22,7 @@ import { Link as RouterLink, useNavigate } from 'react-router-dom'; import { Trans, useTranslation } from 'react-i18next'; import { api } from '../../shared/services/api'; import { LanguageSwitcher } from '../../shared/i18n/LanguageSwitcher'; +import { PrediqoLogo } from '../../shared/brand/PrediqoLogo'; import { apiErrorMessage } from '../../shared/utils/apiError'; type SetupTab = 'create' | 'promote'; @@ -151,6 +152,7 @@ export function SetupPage() { + diff --git a/prediqo_web/src/features/auth/VerifyEmailPage.tsx b/prediqo_web/src/features/auth/VerifyEmailPage.tsx index 8d516129..4fa19550 100644 --- a/prediqo_web/src/features/auth/VerifyEmailPage.tsx +++ b/prediqo_web/src/features/auth/VerifyEmailPage.tsx @@ -18,6 +18,7 @@ import { Link as RouterLink, useSearchParams } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import { api } from '../../shared/services/api'; import { LanguageSwitcher } from '../../shared/i18n/LanguageSwitcher'; +import { PrediqoLogo } from '../../shared/brand/PrediqoLogo'; import { apiErrorMessage } from '../../shared/utils/apiError'; type Status = 'loading' | 'success' | 'error' | 'missing'; @@ -80,9 +81,7 @@ export function VerifyEmailPage() { }} > - - Prediqo - + {status === 'loading' && ( <> diff --git a/prediqo_web/src/features/faq/FaqPage.tsx b/prediqo_web/src/features/faq/FaqPage.tsx index 898e6d89..4be48d1a 100644 --- a/prediqo_web/src/features/faq/FaqPage.tsx +++ b/prediqo_web/src/features/faq/FaqPage.tsx @@ -18,6 +18,7 @@ import ThumbUpAltOutlinedIcon from '@mui/icons-material/ThumbUpAltOutlined'; import ThumbDownAltOutlinedIcon from '@mui/icons-material/ThumbDownAltOutlined'; import HelpOutlineRoundedIcon from '@mui/icons-material/HelpOutlineRounded'; import TrendingUpRoundedIcon from '@mui/icons-material/TrendingUpRounded'; +import { PrediqoLogo } from '../../shared/brand/PrediqoLogo'; import { useQuery, useMutation } from '@tanstack/react-query'; import { useMemo, useState } from 'react'; import { Link as RouterLink } from 'react-router-dom'; @@ -164,14 +165,13 @@ export function FaqPage({ showPublicHeader = false }: FaqPageProps) { direction="row" sx={{ mb: 3, flexWrap: 'wrap', gap: 1, alignItems: 'center', justifyContent: 'space-between' }} > - - Prediqo - + + {!isLoggedIn && ( <> diff --git a/prediqo_web/src/features/support/utils/notifications.ts b/prediqo_web/src/features/support/utils/notifications.ts index 21492608..9255b9c7 100644 --- a/prediqo_web/src/features/support/utils/notifications.ts +++ b/prediqo_web/src/features/support/utils/notifications.ts @@ -39,7 +39,7 @@ export function notifySupportMessage(options: { const n = new Notification(options.title, { body: options.body, tag: options.tag ?? 'prediqo-support', - icon: '/favicon.ico', + icon: '/brand/prediqo-mark.png', }); n.onclick = () => { window.focus(); diff --git a/prediqo_web/src/shared/brand/PrediqoLogo.tsx b/prediqo_web/src/shared/brand/PrediqoLogo.tsx new file mode 100644 index 00000000..f7d3c4b5 --- /dev/null +++ b/prediqo_web/src/shared/brand/PrediqoLogo.tsx @@ -0,0 +1,63 @@ +/** + * Prediqo brand mark / lockup for web chrome and auth surfaces. + */ +import { Box, Stack, Typography, type SxProps, type Theme } from '@mui/material'; + +type PrediqoLogoProps = { + /** `mark` = icon only; `wordmark`/`lockup` = icon + wordmark */ + variant?: 'mark' | 'lockup' | 'wordmark'; + size?: number; + showWordmark?: boolean; + wordmarkSx?: SxProps; + sx?: SxProps; +}; + +export function PrediqoLogo({ + variant = 'wordmark', + size = 40, + showWordmark, + wordmarkSx, + sx, +}: PrediqoLogoProps) { + const withText = + showWordmark ?? (variant === 'lockup' || variant === 'wordmark'); + + return ( + + + {withText ? ( + + Prediqo + + ) : null} + + ); +} diff --git a/prediqo_web/src/shared/layout/AppShell.tsx b/prediqo_web/src/shared/layout/AppShell.tsx index 7ffd4905..68f42aed 100644 --- a/prediqo_web/src/shared/layout/AppShell.tsx +++ b/prediqo_web/src/shared/layout/AppShell.tsx @@ -13,7 +13,6 @@ import { IconButton, Stack, Toolbar, - Typography, } from '@mui/material'; import SettingsOutlinedIcon from '@mui/icons-material/SettingsOutlined'; import PeopleOutlineRoundedIcon from '@mui/icons-material/PeopleOutlineRounded'; @@ -28,6 +27,7 @@ import AssessmentRoundedIcon from '@mui/icons-material/AssessmentRounded'; import SecurityRoundedIcon from '@mui/icons-material/SecurityRounded'; import HeadsetMicRoundedIcon from '@mui/icons-material/HeadsetMicRounded'; import GavelRoundedIcon from '@mui/icons-material/GavelRounded'; +import { PrediqoLogo } from '../brand/PrediqoLogo'; import HelpOutlineRoundedIcon from '@mui/icons-material/HelpOutlineRounded'; import Badge from '@mui/material/Badge'; import { useQuery, useQueryClient } from '@tanstack/react-query'; @@ -183,7 +183,9 @@ export function AppShell() { const drawer = ( - Prediqo + + + {navItems.map((it) => { @@ -260,15 +262,13 @@ export function AppShell() { )} - - Prediqo - + +