From 325848c5a90f58ea244c07ac055ffa2382793207 Mon Sep 17 00:00:00 2001 From: Ruby Date: Sun, 15 Mar 2026 19:46:36 +0000 Subject: [PATCH] fix signup box, merge crime & rename crime --- frontend/src/components/ui/AuthModal.tsx | 16 +++++++++------- frontend/src/components/ui/Header.tsx | 4 ++-- frontend/src/components/ui/MobileMenu.tsx | 2 +- frontend/src/lib/group-icons.ts | 3 +-- server-rs/src/features.rs | 14 ++++---------- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/frontend/src/components/ui/AuthModal.tsx b/frontend/src/components/ui/AuthModal.tsx index 7d98fe0..5ab32fc 100644 --- a/frontend/src/components/ui/AuthModal.tsx +++ b/frontend/src/components/ui/AuthModal.tsx @@ -81,12 +81,14 @@ export default function AuthModal({ view === 'login' ? 'Log in' : view === 'register' ? 'Create account' : 'Reset password'; return ( -
-
-
e.stopPropagation()} - > +
{ + if (e.target === e.currentTarget) onClose(); + }} + > +
+
{/* Header */}

{title}

@@ -119,7 +121,7 @@ export default function AuthModal({ }`} onClick={() => switchView('register')} > - Register + Create account
)} diff --git a/frontend/src/components/ui/Header.tsx b/frontend/src/components/ui/Header.tsx index b042bc5..d3908ed 100644 --- a/frontend/src/components/ui/Header.tsx +++ b/frontend/src/components/ui/Header.tsx @@ -258,7 +258,7 @@ export default function Header({ onClick={onRegisterClick} className="px-3 py-1.5 rounded bg-teal-600 hover:bg-teal-700 transition-colors text-sm font-medium" > - Register + Create account )} @@ -271,7 +271,7 @@ export default function Header({ onClick={onRegisterClick} className="px-4 py-1.5 rounded bg-teal-600 hover:bg-teal-700 transition-colors text-sm font-semibold" > - Sign up + Create account )} diff --git a/frontend/src/components/ui/MobileMenu.tsx b/frontend/src/components/ui/MobileMenu.tsx index 36d90a9..dd8db5a 100644 --- a/frontend/src/components/ui/MobileMenu.tsx +++ b/frontend/src/components/ui/MobileMenu.tsx @@ -183,7 +183,7 @@ export default function MobileMenu({ }} className="flex-1 px-3 py-2.5 rounded bg-teal-600 hover:bg-teal-700 transition-colors text-sm font-medium text-center" > - Register + Create account
)} diff --git a/frontend/src/lib/group-icons.ts b/frontend/src/lib/group-icons.ts index 050d7b3..95108f0 100644 --- a/frontend/src/lib/group-icons.ts +++ b/frontend/src/lib/group-icons.ts @@ -12,11 +12,10 @@ import { } from '../components/ui/icons'; const GROUP_ICONS: Record> = { - 'Properties in the area': HouseIcon, + Properties: HouseIcon, Transport: RouteIcon, Education: GraduationCapIcon, Deprivation: ChartBarIcon, - 'Crime summary': ShieldIcon, Crime: ShieldIcon, Demographics: UsersIcon, Amenities: ShoppingBagIcon, diff --git a/server-rs/src/features.rs b/server-rs/src/features.rs index ff4f35b..5f3fe9c 100644 --- a/server-rs/src/features.rs +++ b/server-rs/src/features.rs @@ -64,7 +64,7 @@ pub struct EnumFeatureGroup { pub static FEATURE_GROUPS: &[FeatureGroup] = &[ FeatureGroup { - name: "Properties in the area", + name: "Properties", features: &[ FeatureConfig { name: "Last known price", @@ -131,7 +131,7 @@ pub static FEATURE_GROUPS: &[FeatureGroup] = &[ suffix: "", raw: false, absolute: false, - modes: &[], + modes: &["historical"], linked: "", }, FeatureConfig { @@ -516,9 +516,8 @@ pub static FEATURE_GROUPS: &[FeatureGroup] = &[ }, ], }, - FeatureGroup { - name: "Crime summary", + name: "Crime", features: &[ FeatureConfig { name: "Serious crime (avg/yr)", @@ -588,11 +587,6 @@ pub static FEATURE_GROUPS: &[FeatureGroup] = &[ modes: &[], linked: "", }, - ], - }, - FeatureGroup { - name: "Crime", - features: &[ FeatureConfig { name: "Anti-social behaviour (avg/yr)", bounds: Bounds::Percentile { @@ -1022,7 +1016,7 @@ pub static FEATURE_GROUPS: &[FeatureGroup] = &[ pub static ENUM_FEATURE_GROUPS: &[EnumFeatureGroup] = &[ EnumFeatureGroup { - name: "Properties in the area", + name: "Properties", features: &[ EnumFeatureConfig { name: "Listing status",