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
43 changes: 35 additions & 8 deletions src/components/mobile/MobileSearch.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Search, SlidersHorizontal } from 'lucide-react-native';
import { AlertCircle, Search, SlidersHorizontal } from 'lucide-react-native';
import React, { useCallback, useMemo, useState } from 'react';
import {
FlatList,
Expand All @@ -10,14 +10,15 @@ import {
View,
} from 'react-native';
import { AppText as Text } from '../common/AppText';
import { sampleCourse } from '../../data/sampleCourse';
import { useAnalytics, useDynamicFontSize, useMemoryMonitor } from '../../hooks';
import { Course } from '../../types/course';
import { addToSearchHistory } from '../../utils/searchHistory';
import { AnalyticsEvent } from '../../utils/trackingEvents';
import { FilterField, FilterSheet, FilterValues } from './FilterSheet';
import { SearchHistory } from './SearchHistory';
import { SearchResultCard, SearchResultItem } from './SearchResultCard';
import { addToSearchHistory } from '../../utils/searchHistory';
import { validateSearchQuery } from '../../utils/validation';
import { sampleCourse } from '../../data/sampleCourse';
import { Course } from '../../types/course';
import { VoiceSearch } from './VoiceSearch';

const DEFAULT_FILTERS: FilterField[] = [
Expand Down Expand Up @@ -91,6 +92,7 @@ export const MobileSearch = ({
placeholder = 'Search courses...',
}: MobileSearchProps) => {
const [query, setQuery] = useState('');
const [queryError, setQueryError] = useState<string | null>(null);
const [suggestionsVisible, setSuggestionsVisible] = useState(false);
const [filterSheetVisible, setFilterSheetVisible] = useState(false);
const [filterValues, setFilterValues] = useState<FilterValues>({});
Expand All @@ -111,12 +113,15 @@ export const MobileSearch = ({

const performSearch = useCallback(
(searchQuery: string) => {
const trimmed = searchQuery.trim();
if (!trimmed) {
const validation = validateSearchQuery(searchQuery);
if (!validation.valid) {
setQueryError(validation.message ?? 'Invalid search query.');
setResults([]);
setHasSearched(true);
setHasSearched(false);
return;
}
setQueryError(null);
const trimmed = searchQuery.trim();
addToSearchHistory(trimmed);
trackEvent(AnalyticsEvent.SEARCH_QUERY, { query: trimmed, filters: filterValues });
const filtered = filterCourse(sampleCourse, trimmed, filterValues)
Expand Down Expand Up @@ -180,7 +185,7 @@ export const MobileSearch = ({
placeholder={placeholder}
placeholderTextColor="#9CA3AF"
value={query}
onChangeText={setQuery}
onChangeText={(text) => { setQuery(text); setQueryError(null); }}
onFocus={() => setSuggestionsVisible(true)}
onBlur={() => setTimeout(() => setSuggestionsVisible(false), 180)}
onSubmitEditing={handleSubmit}
Expand All @@ -204,6 +209,13 @@ export const MobileSearch = ({
</View>
</View>

{queryError && (
<View style={styles.queryErrorRow}>
<AlertCircle size={scale(14)} color="#ef4444" />
<Text style={[styles.queryErrorText, { fontSize: scale(13) }]}>{queryError}</Text>
</View>
)}

{showHistory && (
<View style={styles.suggestSection}>
<SearchHistory onSelectQuery={handleHistorySelect} />
Expand Down Expand Up @@ -350,4 +362,19 @@ const styles = StyleSheet.create({
paddingHorizontal: 16,
paddingTop: 8,
},
queryErrorRow: {
flexDirection: 'row',
alignItems: 'center',
gap: 6,
paddingHorizontal: 16,
paddingVertical: 8,
backgroundColor: '#fee2e2',
borderBottomWidth: StyleSheet.hairlineWidth,
borderBottomColor: '#fca5a5',
},
queryErrorText: {
color: '#dc2626',
flex: 1,
fontWeight: '500',
},
});
11 changes: 7 additions & 4 deletions src/pages/mobile/MobileLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { useBiometricAuth, useDynamicFontSize } from '../../hooks';
import { BiometricInlineButton, BiometricPrompt } from '../../components/mobile/BiometricPrompt';
import mobileAuthService, { AuthResult } from '../../services/mobileAuth';
import * as secureStorage from '../../services/secureStorage';
import { validateEmail, validateRequired } from '../../utils/validation';

// ─── Types ────────────────────────────────────────────────────────────────────

Expand Down Expand Up @@ -111,12 +112,14 @@ export const MobileLogin: React.FC<MobileLoginProps> = ({

// ── Password login ───────────────────────────────────────────────────────
const handlePasswordLogin = async () => {
if (!email.trim()) {
setError('Please enter your email address.');
const emailCheck = validateEmail(email);
if (!emailCheck.valid) {
setError(emailCheck.message ?? 'Invalid email.');
return;
}
if (!password) {
setError('Please enter your password.');
const passwordCheck = validateRequired(password, 'Password');
if (!passwordCheck.valid) {
setError(passwordCheck.message ?? 'Password is required.');
return;
}

Expand Down
Loading
Loading