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
13 changes: 6 additions & 7 deletions app/(auth)/login.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
import { queries } from "@/entities";
import { signIn } from "@/entities/user/api";
import { Role, UserInfo } from "@/entities/user/api/schema";
import { setLocalUserInfo } from "@/entities/user/api/storage";
import { registerFcmTokenToServer, retryPendingDeactivate } from "@/shared/lib/fcm/token-management";
import { Button } from "@/shared/ui/buttons";
import { LoginInput } from "@/shared/ui/input";
import { zodResolver } from "@hookform/resolvers/zod";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useRouter } from "expo-router";
Expand All @@ -14,6 +7,12 @@ import { Image, Text, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { z } from "zod";

import { queries } from "@/entities";
import { signIn, Role, type UserInfo, setLocalUserInfo } from "@/entities/user";
import { registerFcmTokenToServer, retryPendingDeactivate } from "@/shared/lib/fcm";
import { Button } from "@/shared/ui/buttons";
import { LoginInput } from "@/shared/ui/input";

export default function LoginScreen() {

const router = useRouter();
Expand Down
8 changes: 4 additions & 4 deletions app/(auth)/signup.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
import { signUp, SignUpRequest } from "@/entities/user/api";
import { Role } from "@/entities/user/api/schema";
import { Button, Icon, InfoInput, MainLayout } from "@/shared/ui";
import { BackHeader } from "@/shared/ui/header";
import { zodResolver } from "@hookform/resolvers/zod";
import { useMutation } from "@tanstack/react-query";
import { useRouter } from "expo-router";
Expand All @@ -11,6 +7,10 @@ import { ScrollView, Text, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { z } from "zod";

import { signUp, type SignUpRequest, Role } from "@/entities/user";
import { Button, Icon, InfoInput, MainLayout } from "@/shared/ui";
import { BackHeader } from "@/shared/ui/header";

export default function SignupScreen() {

const router = useRouter();
Expand Down
11 changes: 5 additions & 6 deletions app/(notifications)/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { useQuery } from "@tanstack/react-query";
import { FlatList, RefreshControl, Text, View } from "react-native";

import { queries } from "@/entities";
import { NotificationResponse } from "@/entities/care/api/schema";
import { emotionKorMap } from "@/shared/lib/emotions";
import { EmotionIconComponent } from "@/shared/lib/emotions/components";
import { normalizeEmotion } from "@/shared/lib/emotions/util";
import { type NotificationResponse } from "@/entities/care";
import { emotionKorMap, EmotionIconComponent, normalizeEmotion } from "@/shared/lib/emotions";
import { BackHeader, MainLayout } from "@/shared/ui";
import { formatDate } from "@/shared/util/format";
import { useQuery } from "@tanstack/react-query";
import { FlatList, RefreshControl, Text, View } from "react-native";

const NotificationItem = ({ item }: { item: NotificationResponse['notifications'][number] }) => {
const emotion = normalizeEmotion(item.top_emotion as string) ?? 'unknown';
Expand Down
3 changes: 2 additions & 1 deletion app/(tabs-care)/_layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Icon } from "@/shared/ui/svg/SvgIcon";
import { Tabs } from "expo-router";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { Icon } from "@/shared/ui/svg";

export default function CareTabsLayout() {
const insets = useSafeAreaInsets();
return (
Expand Down
9 changes: 5 additions & 4 deletions app/(tabs-care)/account.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { queries } from "@/entities";
import { removeLocalUserInfo } from "@/entities/user/api/storage";
import { deactivateFcmTokenFromServer } from "@/shared/lib/fcm/token-management";
import { Button, GradientBanner, Icon, MainHeader, MainLayout } from "@/shared/ui";
import { useMutation, useQuery } from "@tanstack/react-query";
import { router } from "expo-router";
import { ActivityIndicator, Alert, Text, View } from "react-native";

import { queries } from "@/entities";
import { removeLocalUserInfo } from "@/entities/user";
import { deactivateFcmTokenFromServer } from "@/shared/lib/fcm";
import { Button, GradientBanner, Icon, MainHeader, MainLayout } from "@/shared/ui";

export default function AccountScreen(

) {
Expand Down
13 changes: 7 additions & 6 deletions app/(tabs-care)/diary-list/[id].tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import { useQuery } from "@tanstack/react-query";
import { useLocalSearchParams } from "expo-router";
import { RefreshControl, ScrollView, Text, View } from "react-native";

import { queries } from "@/entities";
import { Emotion } from "@/entities/voices/api/schema";
import { type Emotion } from "@/entities/voices";
import {
emotionCharacteristics as emotionCharacteristicsMap,
emotionKorMap,
emotionRawColorMap,
EmotionIconComponent,
normalizeEmotion,
} from "@/shared/lib/emotions";
import { EmotionIconComponent } from "@/shared/lib/emotions/components";
import { normalizeEmotion } from "@/shared/lib/emotions/util";
import { BackHeader, MainLayout } from "@/shared/ui";
import { useQuery } from "@tanstack/react-query";
import { useLocalSearchParams } from "expo-router";
import { RefreshControl, ScrollView, Text, View } from "react-native";

const formatDateSimple = (isoString: string) => {
const date = new Date(isoString);
Expand Down
9 changes: 5 additions & 4 deletions app/(tabs-care)/diary-list/analysis.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { queries } from "@/entities";
import { Role } from "@/entities/user/api/schema";
import { MonthlyFrequencyStatistics, WeeklyStatistics } from "@/shared/lib/emotions/components";
import { BackHeader, HelpButton, MainLayout } from "@/shared/ui";
import { useQuery } from "@tanstack/react-query";
import { ScrollView, Text, View } from "react-native";

import { queries } from "@/entities";
import { Role } from "@/entities/user";
import { MonthlyFrequencyStatistics, WeeklyStatistics } from "@/shared/lib/emotions";
import { BackHeader, HelpButton, MainLayout } from "@/shared/ui";

export default function DiaryAnalysisScreen() {
const { data: userInfo } = useQuery(queries.user.userInfo);
const username = userInfo?.username || "";
Expand Down
11 changes: 5 additions & 6 deletions app/(tabs-care)/diary-list/index.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { Button, Icon, MainHeader, MainLayout } from "@/shared/ui";

import { queries } from "@/entities";
import { CareVoiceListItem, TopEmotionResponse } from "@/entities/care/api/schema";
import { emotionKorMap } from "@/shared/lib/emotions";
import { EmotionIconComponent } from "@/shared/lib/emotions/components";
import DateTimePicker from "@react-native-community/datetimepicker";
import { useQuery } from "@tanstack/react-query";
import { router } from "expo-router";
import React, { useCallback, useMemo, useState } from "react";
import { ActivityIndicator, FlatList, Platform, RefreshControl, Text, TouchableOpacity, View } from "react-native";

import { queries } from "@/entities";
import { type CareVoiceListItem, type TopEmotionResponse } from "@/entities/care";
import { emotionKorMap, EmotionIconComponent } from "@/shared/lib/emotions";
import { Button, Icon, MainHeader, MainLayout } from "@/shared/ui";

type DiaryListCardProps = {
diary: CareVoiceListItem;
topEmotion: TopEmotionResponse;
Expand Down
12 changes: 5 additions & 7 deletions app/(tabs-care)/home.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import { queries } from "@/entities";
import { Role } from "@/entities/user/api";
import { emotionKorMap } from "@/shared/lib/emotions";
import { EmotionIconComponent, MonthlyFrequencyStatistics, WeeklyStatistics } from "@/shared/lib/emotions/components";
import { Footer, GradientBanner, MainHeader, MainLayout, RingButton } from "@/shared/ui";
import { Icon } from "@/shared/ui/svg";

import { useQuery, useQueryClient } from "@tanstack/react-query";
import { useRouter } from "expo-router";
import { useState } from "react";
import { RefreshControl, ScrollView, Text, TouchableOpacity, View } from "react-native";

import { queries } from "@/entities";
import { emotionKorMap, EmotionIconComponent, MonthlyFrequencyStatistics, WeeklyStatistics } from "@/shared/lib/emotions";
import { Footer, GradientBanner, MainHeader, MainLayout, RingButton } from "@/shared/ui";
import { Icon } from "@/shared/ui/svg";



export default function HomeScreen() {
Expand Down
3 changes: 2 additions & 1 deletion app/(tabs-user)/_layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Icon } from "@/shared/ui/svg/SvgIcon";
import { Tabs } from "expo-router";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { Icon } from "@/shared/ui/svg";

export default function UserTabsLayout() {
const insets = useSafeAreaInsets();
return (
Expand Down
9 changes: 5 additions & 4 deletions app/(tabs-user)/account.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { queries } from "@/entities";
import { removeLocalUserInfo } from "@/entities/user/api/storage";
import { deactivateFcmTokenFromServer } from "@/shared/lib/fcm/token-management";
import { Button, HelpButton, Icon, MainHeader, MainLayout } from "@/shared/ui";
import { useMutation, useQuery } from "@tanstack/react-query";
import * as Clipboard from "expo-clipboard";
import { useRouter } from "expo-router";
import { ActivityIndicator, Alert, Text, View } from "react-native";

import { queries } from "@/entities";
import { removeLocalUserInfo } from "@/entities/user";
import { deactivateFcmTokenFromServer } from "@/shared/lib/fcm";
import { Button, HelpButton, Icon, MainHeader, MainLayout } from "@/shared/ui";

export default function AccountScreen() {
const userInfo = useQuery(queries.user.userInfo);
const router = useRouter();
Expand Down
9 changes: 4 additions & 5 deletions app/(tabs-user)/chat-list/[id].tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useSendMessage } from "@/widgets/chat/model/useSendMessage";
import { useSuspenseInfiniteQuery, useSuspenseQuery } from "@tanstack/react-query";
import { useFocusEffect, useLocalSearchParams, useNavigation } from "expo-router";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
Expand All @@ -13,16 +12,16 @@ import {
} from "react-native";

import { queries } from "@/entities";
import { getChatHistory } from "@/entities/chatbot/api/handler";
import { ChatHistoryResponse, ChatMessage } from "@/entities/chatbot/api/schema";
import { getChatHistory, type ChatHistoryResponse, type ChatMessage } from "@/entities/chatbot";
import {
cleanupExpiredPendingChatMessages,
getPendingChatMessages,
removePendingChatMessage,
} from "@/shared/lib/chat-pending/chat-pending-storage";
import { normalizeEmotion } from "@/shared/lib/emotions/util";
} from "@/shared/lib/chat-pending";
import { normalizeEmotion } from "@/shared/lib/emotions";
import { BackHeader, MainLayout } from "@/shared/ui";
import { ChatBubble, ChatInput, DiaryBottomSheet, VoiceMessageModal, VoicePlaybackModal } from "@/widgets/chat";
import { useSendMessage } from "@/widgets/chat/model/useSendMessage";

export default function ChatDetailScreen() {
const navigation = useNavigation();
Expand Down
35 changes: 16 additions & 19 deletions app/(tabs-user)/chat-list/index.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@

import { queries } from "@/entities";
import { ChatSessionItem } from "@/entities/chatbot/api/schema";
import {
getPendingChatMessages,
} from "@/shared/lib/chat-pending/chat-pending-storage";
import { EmotionComponentWithText } from "@/shared/lib/emotions/components";
import { normalizeEmotion } from "@/shared/lib/emotions/util";
import {
cleanupExpiredPendingSessions,
getPendingSessions,
} from "@/shared/lib/session-pending/session-pending-storage";
import {
Button,
HelpButton,
MainHeader,
MainLayout
} from "@/shared/ui";
import { formatDate } from "@/shared/util/format";
import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
import { Image } from "expo-image";
import { router } from "expo-router";
Expand All @@ -30,6 +11,22 @@ import {
View,
} from "react-native";

import { queries } from "@/entities";
import { type ChatSessionItem } from "@/entities/chatbot";
import { getPendingChatMessages } from "@/shared/lib/chat-pending";
import { EmotionComponentWithText, normalizeEmotion } from "@/shared/lib/emotions";
import {
cleanupExpiredPendingSessions,
getPendingSessions,
} from "@/shared/lib/session-pending";
import {
Button,
HelpButton,
MainHeader,
MainLayout
} from "@/shared/ui";
import { formatDate } from "@/shared/util/format";

type ChatListCardProps = {
session: ChatSessionItem;
isAnalyzing?: boolean;
Expand Down
12 changes: 6 additions & 6 deletions app/(tabs-user)/diary-list/[id].tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { queries } from "@/entities";
import { deleteUserVoice } from "@/entities/voices/api/handler";
import { EmotionComponentWithText } from "@/shared/lib/emotions/components";
import { useAudioPlayer } from "@/shared/lib/hooks/useAudioPlayer";
import { useWaveformData } from "@/shared/lib/hooks/useWaveformData";
import { BackHeader, Button, HelpButton, Icon, MainLayout } from "@/shared/ui";
import { useMutation, useQuery, useQueryClient, useSuspenseQuery } from "@tanstack/react-query";
import { router, useLocalSearchParams } from "expo-router";
import { useCallback, useEffect, useRef, useState } from "react";
import { ActivityIndicator, Alert, LayoutChangeEvent, Modal, PanResponder, RefreshControl, ScrollView, Text, TouchableOpacity, View } from "react-native";

import { queries } from "@/entities";
import { deleteUserVoice } from "@/entities/voices";
import { EmotionComponentWithText } from "@/shared/lib/emotions";
import { useAudioPlayer, useWaveformData } from "@/shared/lib/hooks";
import { BackHeader, Button, HelpButton, Icon, MainLayout } from "@/shared/ui";
import { ReportEmotionBottomSheet } from "./report-emotion-bottom-sheet";

const formatDetailDate = (isoString: string) => {
Expand Down
22 changes: 11 additions & 11 deletions app/(tabs-user)/diary-list/index.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
import {
Button,
GradientBanner,
Icon,
MainHeader,
MainLayout
} from "@/shared/ui";

import { queries } from "@/entities";
import { VoiceListItem } from "@/entities/voices/api/schema";
import { EmotionComponentWithText } from "@/shared/lib/emotions/components";
import DateTimePicker from "@react-native-community/datetimepicker";
import { useQuery } from "@tanstack/react-query";
import { router } from "expo-router";
Expand All @@ -23,6 +12,17 @@ import {
View,
} from "react-native";

import { queries } from "@/entities";
import { type VoiceListItem } from "@/entities/voices";
import { EmotionComponentWithText } from "@/shared/lib/emotions";
import {
Button,
GradientBanner,
Icon,
MainHeader,
MainLayout
} from "@/shared/ui";

const formatDateSimple = (date: Date) => {
return `${date.getFullYear()}년 ${(date.getMonth() + 1).toString().padStart(2, "0")}월 ${date.getDate().toString().padStart(2, "0")}일`;
};
Expand Down
8 changes: 4 additions & 4 deletions app/(tabs-user)/diary-list/report-emotion-bottom-sheet.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Emotion } from "@/entities/voices/api/schema";
import { emotionBgColorMap, emotionTextColorMap } from "@/shared/lib/emotions/constant";
import { EmotionIconComponent } from "@/shared/lib/emotions/components/EmotionIconComponent";
import { Button, Icon } from "@/shared/ui";
import { useState } from "react";
import { ActivityIndicator, Modal, Text, TextInput, TouchableOpacity, TouchableWithoutFeedback, View } from "react-native";

import { type Emotion } from "@/entities/voices";
import { emotionBgColorMap, emotionTextColorMap, EmotionIconComponent } from "@/shared/lib/emotions";
import { Button, Icon } from "@/shared/ui";

type ReportEmotion = Exclude<Emotion, "unknown">;

const EMOTIONS: { key: ReportEmotion; label: string }[] = [
Expand Down
37 changes: 19 additions & 18 deletions app/(tabs-user)/diary.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
import { queries } from "@/entities/index";
import { getLocalUserInfo } from "@/entities/user/api/storage";
import {
UploadVoiceWithQuestionRequest,
uploadVoiceWithQuestion,
} from "@/entities/voices/api";
import { addPendingSession } from "@/shared/lib/session-pending/session-pending-storage";
import {
Button,
GradientBanner,
HelpButton,
Icon,
MainHeader,
MainLayout,
RecordingTimer,
SpeechBubble,
WaveformVisualizer,
} from "@/shared/ui";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import {
RecordingPresets,
Expand All @@ -36,6 +18,25 @@ import {
TouchableOpacity,
View,
} from "react-native";

import { queries } from "@/entities";
import { getLocalUserInfo } from "@/entities/user";
import {
type UploadVoiceWithQuestionRequest,
uploadVoiceWithQuestion,
} from "@/entities/voices";
import { addPendingSession } from "@/shared/lib/session-pending";
import {
Button,
GradientBanner,
HelpButton,
Icon,
MainHeader,
MainLayout,
RecordingTimer,
SpeechBubble,
WaveformVisualizer,
} from "@/shared/ui";
import { SavedScreen } from "./diary-saved-screen";

type ScreenState = 'recording' | 'saved';
Expand Down
Loading