ksan/etf-oglasi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

added push notifications

Browse Source
This commit is contained in:
Ksan
2026-06-03 19:13:56 +02:00
parent a9278b8269
commit 6559a9cd4b
24 changed files with 1598 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -52,6 +52,8 @@ nbdist/
frontend/node_modules/
frontend/google-services.json
frontend/.expo/
frontend/dist/
frontend/web-build/
backend/build.gradle
+2 -1
View File
@@ -39,7 +39,8 @@ dependencies {
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.13.0")
implementation("io.jsonwebtoken:jjwt-api:0.13.0")
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.13.0")
implementation("org.projectlombok:lombok:1.18.42")
annotationProcessor 'org.projectlombok:lombok:1.18.42'
implementation 'com.google.firebase:firebase-admin:9.9.0'
}
backend/init.sql
+1 -1
View File
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS public.subjects
CONSTRAINT subjects_pkey PRIMARY KEY (id)
);
CREATE TABLE IF NOT EXISTS public."user-subject"
CREATE TABLE IF NOT EXISTS public."user_subject"
(
user_id uuid NOT NULL,
subject_id uuid NOT NULL,
backend/src/main/java/dev/ksan/etfoglasiserver/controller/DeviceTokenController.java
+14 -17
View File
@@ -1,45 +1,42 @@
package dev.ksan.etfoglasiserver.controller;
import dev.ksan.etfoglasiserver.model.DeviceToken;
import dev.ksan.etfoglasiserver.model.RegisterTokenRequest;
import dev.ksan.etfoglasiserver.model.User;
import dev.ksan.etfoglasiserver.repository.DeviceTokenRepo;
import dev.ksan.etfoglasiserver.repository.UserRepo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.bind.annotation.*;
import java.util.UUID;
@RestController
@RequestMapping("/api/device-tokens")
@RequiredArgsConstructor
public class DeviceTokenController {
@Autowired
private DeviceTokenRepo deviceTokenRepo;
@Autowired
private UserRepo userRepo;
private final DeviceTokenRepo deviceTokenRepo;
private final UserRepo userRepo;
@PostMapping("/register")
public ResponseEntity<?> register(
@RequestParam UUID userId,
@RequestParam String token
) {
@RequestBody RegisterTokenRequest request,
@AuthenticationPrincipal UserDetails principal) {
User user = userRepo.findById(userId)
User user = userRepo.findByEmail(principal.getUsername())
.orElseThrow(() -> new RuntimeException("User not found"));
DeviceToken deviceToken = deviceTokenRepo
.findByFcmToken(token)
.findByFcmToken(request.getToken())
.orElse(new DeviceToken());
deviceToken.setUser(user);
deviceToken.setFcmToken(token);
deviceToken.setFcmToken(request.getToken());
deviceTokenRepo.save(deviceToken);
return ResponseEntity.ok("Token saved");
return ResponseEntity.noContent().build();
}
}
backend/src/main/java/dev/ksan/etfoglasiserver/controller/UserController.java
+22 -5
View File
@@ -4,8 +4,11 @@ import dev.ksan.etfoglasiserver.dto.JwtResponseDTO;
import dev.ksan.etfoglasiserver.dto.UserCreationDTO;
import dev.ksan.etfoglasiserver.dto.UserDTO;
import dev.ksan.etfoglasiserver.dto.UserLoginDTO;
import dev.ksan.etfoglasiserver.model.NotificationMethod;
import dev.ksan.etfoglasiserver.model.User;
import dev.ksan.etfoglasiserver.service.UserService;
import java.util.Map;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -22,13 +25,11 @@ public class UserController {
@GetMapping("users/me")
public ResponseEntity<UserDTO> getUserById(Authentication authentication) {
String email = authentication.getName();
User user = service.getAccountByEmail(email)
.orElseThrow(() -> new RuntimeException("User not found"));
User user = service.getAccountByEmail(email).orElseThrow(() -> new RuntimeException("User not found"));
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
return ResponseEntity.ok(new UserDTO(user));
}
@PutMapping("/users/me")
@@ -43,6 +44,20 @@ public class UserController {
return ResponseEntity.ok(userUpdated);
}
@PostMapping("users/me/notification-type")
public ResponseEntity<?> updateNotificationType(
@RequestBody Map<String, String> request,
Authentication authentication) {
String email = authentication.getName();
NotificationMethod type = NotificationMethod.valueOf(request.get("notificationType"));
service.updateNotificationType(email, type);
return ResponseEntity.ok(Map.of("status", "updated"));
}
@PutMapping("/users/me/subjects/{subjectId}")
public ResponseEntity<UserDTO> addSubject(
@PathVariable UUID subjectId,
@@ -83,6 +98,8 @@ public class UserController {
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
}
@DeleteMapping("/users/me")
public ResponseEntity<Void> deleteUser(Authentication authentication) {
backend/src/main/java/dev/ksan/etfoglasiserver/dto/UserDTO.java
+13 -23
View File
@@ -3,14 +3,25 @@ package dev.ksan.etfoglasiserver.dto;
import dev.ksan.etfoglasiserver.model.NotificationMethod;
import dev.ksan.etfoglasiserver.model.Subject;
import dev.ksan.etfoglasiserver.model.User;
import lombok.Getter;
import lombok.Setter;
import java.util.Set;
import java.util.UUID;
public class UserDTO {
@Setter
@Getter
private UUID id;
@Setter
@Getter
private String email;
@Setter
@Getter
private Set<Subject> subjectSet;
@Getter
@Setter
private NotificationMethod notificationType;
public UserDTO() {}
@@ -19,38 +30,17 @@ public class UserDTO {
this.id = id;
this.email = email;
this.subjectSet = subjectSet;
this.notificationType = notificationMethod2;
}
public UserDTO(User user) {
this.id = user.getId();
this.email = user.getEmail();
this.subjectSet = user.getSubjectSet();
this.notificationType = user.getNotificationMethod();
}
public UUID getId() {
return id;
}
public void setId(UUID id) {
this.id = id;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public Set<Subject> getSubjectSet() {
return subjectSet;
}
public void setSubjectSet(Set<Subject> subjectSet) {
this.subjectSet = subjectSet;
}
}
backend/src/main/java/dev/ksan/etfoglasiserver/model/DeviceToken.java
+1 -2
View File
@@ -7,6 +7,7 @@ import lombok.Setter;
import java.time.LocalDateTime;
import java.util.UUID;
@Getter // ← add class-level getter
@Entity
@Table(
name = "device_tokens",
@@ -25,7 +26,6 @@ public class DeviceToken {
@JoinColumn(name = "user_id", nullable = false)
private User user;
@Getter
@Setter
@Column(name = "fcm_token", nullable = false)
private String fcmToken;
@@ -38,5 +38,4 @@ public class DeviceToken {
public void touch() {
this.updatedAt = LocalDateTime.now();
}
}
backend/src/main/java/dev/ksan/etfoglasiserver/model/NotificationMethod.java
-1
View File
@@ -3,6 +3,5 @@ package dev.ksan.etfoglasiserver.model;
public enum NotificationMethod {
NO_NOTIFICATION,
EMAIL,
PUSH_NOTIFICATION
}
backend/src/main/java/dev/ksan/etfoglasiserver/model/RegisterTokenRequest.java
+8
View File
@@ -0,0 +1,8 @@
package dev.ksan.etfoglasiserver.model;
import lombok.Data;
@Data
public class RegisterTokenRequest {
private String token;
}
backend/src/main/java/dev/ksan/etfoglasiserver/model/Subject.java
+7 -19
View File
@@ -1,6 +1,8 @@
package dev.ksan.etfoglasiserver.model;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
import java.util.Set;
import java.util.UUID;
@@ -9,13 +11,18 @@ import java.util.UUID;
@Table(name = "subjects")
public class Subject {
@Getter
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(columnDefinition = "uuid")
private UUID id;
@Getter
@Setter
@Column private long code;
@Getter
@Setter
@Column(nullable = false)
private String name;
@@ -26,23 +33,4 @@ public class Subject {
public Subject(){
}
public UUID getId() {
return id;
}
public long getCode() {
return code;
}
public void setCode(long code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
backend/src/main/java/dev/ksan/etfoglasiserver/model/SubjectAlt.java
+7 -10
View File
@@ -9,6 +9,8 @@ import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import lombok.Setter;
import java.util.UUID;
@Entity
@@ -18,9 +20,11 @@ public class SubjectAlt {
@GeneratedValue(strategy = GenerationType.AUTO)
private UUID id;
@Setter
@Column(nullable = false)
String name;
@Setter
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(nullable = false)
private Subject subject;
@@ -32,22 +36,15 @@ public class SubjectAlt {
}
public UUID getId() {
return id;
return this.id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
return this.name;
}
public Subject getSubject() {
return subject;
return this.subject;
}
public void setSubject(Subject subject) {
this.subject = subject;
}
}
backend/src/main/java/dev/ksan/etfoglasiserver/service/EntryService.java
+2
View File
@@ -43,6 +43,8 @@ public class EntryService {
Entry newEntry = new Entry(entry);
newEntry.setSubject(subject);
entryRepo.save(newEntry);
subjectService.notifyAsync(newEntry);
}
public void addEntry(Entry entry) {
backend/src/main/java/dev/ksan/etfoglasiserver/service/UserService.java
+8
View File
@@ -4,6 +4,7 @@ import dev.ksan.etfoglasiserver.dto.JwtResponseDTO;
import dev.ksan.etfoglasiserver.dto.UserCreationDTO;
import dev.ksan.etfoglasiserver.dto.UserDTO;
import dev.ksan.etfoglasiserver.dto.UserLoginDTO;
import dev.ksan.etfoglasiserver.model.NotificationMethod;
import dev.ksan.etfoglasiserver.model.Subject;
import dev.ksan.etfoglasiserver.model.User;
import dev.ksan.etfoglasiserver.repository.SubjectRepo;
@@ -204,4 +205,11 @@ public class UserService {
return getUserDTO(user);
}
public void updateNotificationType(String email, NotificationMethod notificationType) {
User user = userRepo.findByEmail(email).orElseThrow(() -> new RuntimeException("User not found"));
user.setNotificationMethod(notificationType);
userRepo.save(user);
}
}
frontend/app.json
+9 -6
View File
@@ -1,17 +1,18 @@
{
"expo": {
"name": "etfoglasi-frontend",
"slug": "etfoglasi-frontend",
"name": "etfoglasi",
"slug": "etfoglasi",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/images/icon.png",
"scheme": "etfoglasifrontend",
"scheme": "etfoglasi",
"userInterfaceStyle": "automatic",
"newArchEnabled": true,
"ios": {
"supportsTablet": true
},
"android": {
"googleServicesFile": "./google-services.json",
"adaptiveIcon": {
"backgroundColor": "#E6F4FE",
"foregroundImage": "./assets/images/android-icon-foreground.png",
@@ -19,7 +20,8 @@
"monochromeImage": "./assets/images/android-icon-monochrome.png"
},
"edgeToEdgeEnabled": true,
"predictiveBackGestureEnabled": false
"predictiveBackGestureEnabled": false,
"package": "dev.ksan.etfoglasi"
},
"web": {
"output": "static",
@@ -39,7 +41,9 @@
"backgroundColor": "#000000"
}
}
]
],
"@react-native-firebase/app",
"@react-native-firebase/messaging"
],
"experiments": {
"typedRoutes": true,
@@ -47,4 +51,3 @@
}
}
}
frontend/app/_layout.tsx
+52 -3
View File
@@ -1,13 +1,62 @@
import "../globals.css";
import { Stack } from "expo-router";
import {AuthProvider} from "@/context/AuthContext";
import {SafeAreaProvider} from "react-native-safe-area-context";
import { useEffect } from 'react';
import { Stack } from 'expo-router';
import { SafeAreaProvider } from 'react-native-safe-area-context';
import {
getMessaging,
onMessage,
onNotificationOpenedApp,
getInitialNotification,
} from '@react-native-firebase/messaging';
import { registerDeviceToken, listenForTokenRefresh } from '@/services/notifications';
import { AuthProvider, useAuth } from "@/context/AuthContext";
import Toast from 'react-native-toast-message';
function NotificationSetup() {
const { user, loading } = useAuth();
useEffect(() => {
if (loading || !user) return;
registerDeviceToken(user.token);
const messaging = getMessaging();
const unsubRefresh = listenForTokenRefresh(user.token);
const unsubForeground = onMessage(messaging, async (msg) => {
console.log('Foreground notification:', msg);
Toast.show({
type: 'info',
text1: msg.notification?.title ?? 'New Notification',
position: 'top',
visibilityTime: 4000,
});
});
onNotificationOpenedApp(messaging, (msg) => {
console.log('Opened from background:', msg);
});
getInitialNotification(messaging).then((msg) => {
if (msg) console.log('Opened from quit state:', msg);
});
return () => {
unsubRefresh();
unsubForeground();
};
}, [user, loading]);
return null;
}
export default function RootLayout() {
return (
<AuthProvider>
<SafeAreaProvider>
<NotificationSetup />
<Stack screenOptions={{ headerShown: false }} />
<Toast />
</SafeAreaProvider>
</AuthProvider>
);
frontend/context/AuthContext.tsx
+17 -7
View File
@@ -3,7 +3,7 @@ import AsyncStorage from "@react-native-async-storage/async-storage";
import {
authApi,
LoginPayload, RegisterPayload, subscriptionsApi, UserUpdateDTO,
LoginPayload, RegisterPayload, subscriptionsApi, userApi, UserUpdateDTO,
} from "@/services/api";
type User = {
@@ -11,6 +11,7 @@ type User = {
email: string;
token: string;
subscribedSubjectIds: string[];
notificationType: 'PUSH_NOTIFICATION' | 'NO_NOTIFICATION';
};
type AuthContextValue = {
@@ -23,6 +24,7 @@ type AuthContextValue = {
unsubscribe: (subjectId: string) => Promise<void>;
isSubscribed: (subjectId: string) => boolean;
updateUser: (newEmail?: string, newPassword?: string) => Promise<void>;
updateNotificationType: (type: 'PUSH_NOTIFICATION' | 'NO_NOTIFICATION') => Promise<void>;
};
const AuthContext = createContext<AuthContextValue | null>(null);
@@ -43,17 +45,24 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
setUser(u);
};
const updateNotificationType = async (type: 'PUSH_NOTIFICATION' | 'NO_NOTIFICATION') => {
if (!user) return;
await userApi.updateNotificationType(type, user.token);
await persist({ ...user, notificationType: type });
};
const login = async (payload: LoginPayload) => {
const res = await authApi.login(payload);
// Gracefully fetch subscriptions — don't block login if this fails
let subscribedSubjectIds: string[] = [];
let notificationType: 'PUSH_NOTIFICATION' | 'NO_NOTIFICATION' = 'PUSH_NOTIFICATION';
if (res.userId) {
try {
const dto = await authApi.getUser( res.token);
const dto = await authApi.getUser(res.token);
subscribedSubjectIds = dto.subjectSet?.map((s) => s.id) ?? [];
} catch {
// aaaa
notificationType = dto.notificationType ?? 'PUSH_NOTIFICATION';
} catch (e) {
console.error('Failed to load subscriptions on login:', e);
}
}
@@ -62,6 +71,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
email: res.email,
token: res.token,
subscribedSubjectIds,
notificationType,
});
};
@@ -116,7 +126,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
user?.subscribedSubjectIds.includes(subjectId) ?? false;
return (
<AuthContext.Provider value={{ user, loading, login, register, logout, subscribe, unsubscribe, isSubscribed, updateUser }}>
<AuthContext.Provider value={{ user, loading, login, register, logout, subscribe, unsubscribe, isSubscribed, updateUser, updateNotificationType }}>
{children}
</AuthContext.Provider>
);
frontend/index.tsx
+3 -2
View File
@@ -15,8 +15,9 @@ import {enableScreens} from "react-native-screens";
import {SafeAreaProvider} from "react-native-safe-area-context";
import AuthGate from "@/screens/AuthGate";
import {AuthProvider, useAuth} from "@/context/AuthContext";
import messaging, {setBackgroundMessageHandler} from "@react-native-firebase/messaging";
import {getMessaging} from "@firebase/messaging";
messaging().setBackgroundMessageHandler(async () => {});
// Must be called before any navigator renders
enableScreens();
frontend/package-lock.json
Generated
+1325 -432
View File
File diff suppressed because it is too large Load Diff
frontend/package.json
+6 -3
View File
@@ -1,18 +1,20 @@
{
"name": "etfoglasi-frontend",
"name": "etfoglasi",
"main": "expo-router/entry",
"version": "1.0.0",
"scripts": {
"start": "expo start",
"reset-project": "node ./scripts/reset-project.js",
"android": "expo start --android",
"ios": "expo start --ios",
"android": "expo run:android",
"ios": "expo run:ios",
"web": "expo start --web",
"lint": "expo lint"
},
"dependencies": {
"@expo/vector-icons": "^15.0.3",
"@react-native-async-storage/async-storage": "2.2.0",
"@react-native-firebase/app": "^24.0.0",
"@react-native-firebase/messaging": "^24.0.0",
"@react-navigation/bottom-tabs": "^7.4.0",
"@react-navigation/elements": "^2.6.3",
"@react-navigation/native": "^7.1.8",
@@ -37,6 +39,7 @@
"react-native-safe-area-context": "~5.6.0",
"react-native-screens": "~4.16.0",
"react-native-tailwindcss": "^1.1.11",
"react-native-toast-message": "^2.3.3",
"react-native-web": "~0.21.0",
"react-native-worklets": "0.5.1",
"tailwindcss": "^3.4.18"
frontend/screens/AllFeed.tsx
+8 -1
View File
@@ -1,4 +1,4 @@
import React, { useState } from "react";
import React, {useCallback, useState} from "react";
import {
View, Text, ScrollView, TouchableOpacity,
ActivityIndicator, useColorScheme,
@@ -7,6 +7,7 @@ import { SafeAreaView } from "react-native-safe-area-context";
import { Ionicons } from "@expo/vector-icons";
import SearchBar from "../components/SearchBar";
import CollapsibleCategory from "../components/CollapsibleCategory";
import {useFocusEffect} from "expo-router";
const GROUPS = [
@@ -40,6 +41,12 @@ export default function AllFeed() {
setTimeout(() => setRefreshing(false), 800);
};
useFocusEffect(
useCallback(() => {
handleRefresh();
}, [])
);
return (
<SafeAreaView className={`flex-1 ${dark ? "bg-obsidian-200" : "bg-parchment-50"}`}>
{/* Header */}
frontend/screens/Profile.tsx
+30 -19
View File
@@ -23,6 +23,8 @@ type SettingRowProps = {
accent?: string;
};
function SettingRow({ icon, label, value, toggle, toggleValue, onToggle, onPress, accent }: SettingRowProps) {
const dark = useColorScheme() === "dark";
const iconColor = accent ?? (dark ? "#706D67" : "#8A8278");
@@ -149,11 +151,25 @@ function GuestProfile({ onSignIn }: { onSignIn: () => void }) {
function AuthenticatedProfile({ onSignOut }: { onSignOut: () => void }) {
const [showSubs, setShowSubs] = useState(false);
const dark = useColorScheme() === "dark";
const { user } = useAuth();
const [notifications, setNotifications] = React.useState(true);
const { user, updateNotificationType } = useAuth();
const [notifications, setNotifications] = useState(
user?.notificationType === 'PUSH_NOTIFICATION'
);
const [digest, setDigest] = React.useState(false);
const [showEdit, setShowEdit] = useState(false);
const [showHelp, setShowHelp] = useState(false);
const handleNotificationToggle = async (value: boolean) => {
setNotifications(value);
try {
await updateNotificationType(
value ? 'PUSH_NOTIFICATION' : 'NO_NOTIFICATION'
);
} catch {
setNotifications(!value); // revert on failure
}
};
return (
<>
<ScrollView contentContainerStyle={{ paddingBottom: 48 }} showsVerticalScrollIndicator={false}>
@@ -197,13 +213,19 @@ function AuthenticatedProfile({ onSignOut }: { onSignOut: () => void }) {
>
<SectionLabel title="Notifications" />
<SettingRow
icon="notifications-outline" label="Push notifications (TODO)"
toggle toggleValue={notifications} onToggle={setNotifications}
icon="notifications-outline"
label="Push notifications"
toggle
toggleValue={notifications}
onToggle={handleNotificationToggle}
accent={dark ? "#E07B45" : "#C4622D"}
/>
<SettingRow
icon="mail-outline" label="Daily digest email (TODO)"
toggle toggleValue={digest} onToggle={setDigest}
icon="mail-outline"
label="Weekly Digest email (TODO)"
toggle
toggleValue={digest}
onToggle={setDigest}
accent={dark ? "#5E9EF4" : "#3B7DD8"}
/>
@@ -231,32 +253,21 @@ function AuthenticatedProfile({ onSignOut }: { onSignOut: () => void }) {
<Text className="text-sm font-sans font-semibold text-red-500">Sign out</Text>
</View>
</TouchableOpacity>
</ScrollView>
<Modal visible={showEdit} animationType="slide" presentationStyle="pageSheet" onRequestClose={() => setShowEdit(false)}>
<EditProfile onClose={() => setShowEdit(false)} />
</Modal>
<Modal visible={showHelp} animationType="slide" presentationStyle="pageSheet" onRequestClose={() => setShowHelp(false)}>
<HelpSupport onClose={() => setShowHelp(false)} />
</Modal>
<Modal
visible={showSubs}
animationType="slide"
presentationStyle="pageSheet"
onRequestClose={() => setShowSubs(false)}
>
<Modal visible={showSubs} animationType="slide" presentationStyle="pageSheet" onRequestClose={() => setShowSubs(false)}>
<ManageSubscriptions onClose={() => setShowSubs(false)} />
</Modal>
</>
);
}
export default function Profile() {
const dark = useColorScheme() === "dark";
const { user, logout } = useAuth();
frontend/screens/SubscribedFeed.tsx
+9 -3
View File
@@ -9,6 +9,7 @@ import SearchBar from "../components/SearchBar";
import ExpandableItem from "../components/ExpandableItem";
import { useAuth } from "../context/AuthContext";
import { Entry, entriesApi } from "../services/api";
import {useFocusEffect} from "expo-router";
type SortMode = "time" | "subject";
@@ -124,9 +125,14 @@ export default function SubscribedFeed() {
} finally {
setLoading(false);
}
}, [user?.subscribedSubjectIds]);
}, [user?.subscribedSubjectIds?.join(',')]);
useEffect(() => { fetchFeed(); }, [fetchFeed]);
// Always re-fetch when tab gains focus
useFocusEffect(
useCallback(() => {
fetchFeed();
}, [fetchFeed])
);
// Filter then group
const filtered = useMemo(() => {
@@ -249,7 +255,7 @@ export default function SubscribedFeed() {
<View className="items-center mt-16 px-8">
<Text className="text-4xl mb-3">🔍</Text>
<Text className={`text-base font-sans font-semibold text-center ${dark ? "text-ink-dark" : "text-ink-light"}`}>
No results for "{query}"
No results for &#34;{query}&#34;
</Text>
</View>
) : (
frontend/services/api.tsx
+17 -2
View File
@@ -1,7 +1,7 @@
const BASE_URL = process.env.EXPO_PUBLIC_API_URL; // TODO change this
export type NotificationType = 'PUSH_NOTIFICATION' | 'NO_NOTIFICATION';
function authHeader(token?: string) {
return token ? { Authorization: `Bearer ${token}` } : {};
}
@@ -25,7 +25,13 @@ async function request<T>(
headers: { "Content-Type": "application/json", ...authHeader(token) },
...(body ? { body: JSON.stringify(body) } : {}),
});
if (!res.ok) throw new Error(await res.text().catch(() => `HTTP ${res.status}`));
if (!res.ok) {
const errorText = await res.text().catch(() => `HTTP ${res.status}`);
console.log('Failed URL:', res.url);
console.log('Status:', res.status);
console.log('Response:', errorText);
throw new Error(errorText);
}
return res.json();
}
@@ -65,6 +71,7 @@ export type UserDTO = {
id: string;
email: string;
subjectSet: Subject[];
notificationType: NotificationType;
};
@@ -115,6 +122,12 @@ export const authApi = {
};
export const userApi = {
updateNotificationType: (
type: 'PUSH_NOTIFICATION' | 'NO_NOTIFICATION',
token: string
) => post<void>('/users/me/notification-type', { notificationType: type }, token),
};
export const subjectsApi = {
getAll: (token?: string) => get<Subject[]>("/subjects", token),
@@ -135,6 +148,8 @@ export const subscriptionsApi = {
),
};
export const entriesApi = {
getEntries: (params: { subjectId?: string; groupName?: string; page?: number }) =>
get<SpringPage<Entry>>("/entries", undefined, params),
frontend/services/notifications.tsx
+35
View File
@@ -0,0 +1,35 @@
import {
getMessaging,
requestPermission,
getToken,
onTokenRefresh,
AuthorizationStatus,
} from '@react-native-firebase/messaging';
import { post } from '@/services/api';
export async function registerDeviceToken(authToken: string): Promise<void> {
const messaging = getMessaging();
const status = await requestPermission(messaging);
const granted =
status === AuthorizationStatus.AUTHORIZED ||
status === AuthorizationStatus.PROVISIONAL;
if (!granted) return;
const fcmToken = await getToken(messaging);
await fetch(`${process.env.EXPO_PUBLIC_API_URL}/device-tokens/register`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${authToken}`,
},
body: JSON.stringify({ token: fcmToken }),
});
}
export function listenForTokenRefresh(authToken: string): () => void {
return onTokenRefresh(getMessaging(), async (newToken) => {
await post('/device-tokens/register', { token: newToken }, authToken);
});
}