Fix rebase

lib/config/router.dart

@@ -9,16 +9,16 @@ import 'package:lacquer/presentation/pages/auth/login_page.dart';
 import 'package:lacquer/presentation/pages/auth/verify_page.dart';
 import 'package:lacquer/presentation/pages/camera/camera_page.dart';
 import 'package:lacquer/presentation/pages/camera/about_screen.dart';
+import 'package:lacquer/presentation/pages/home/add_new_word_page.dart';
+import 'package:lacquer/presentation/pages/home/edit_card_list_page.dart';
 import 'package:lacquer/presentation/pages/home/dictionary_page.dart';
+import 'package:lacquer/presentation/pages/profile/profile_page.dart';
 import 'package:lacquer/presentation/pages/home/flashcard_page.dart';
 import 'package:lacquer/presentation/pages/home/learning_flashcard_page.dart';
 import 'package:lacquer/presentation/pages/friends/friends_page.dart';
 import 'package:lacquer/features/profile/bloc/profile_bloc.dart';
 import 'package:lacquer/features/profile/bloc/profile_event.dart';
-import 'package:lacquer/presentation/pages/home/quiz_page.dart';
 import 'package:lacquer/presentation/pages/home/translator_page.dart';
-import 'package:lacquer/presentation/pages/chat/chat_screen.dart';
-import 'package:lacquer/presentation/pages/history/history_page.dart';
 
 import 'package:lacquer/presentation/pages/mainscreen.dart';
 import 'package:flutter/widgets.dart';
@@ -31,13 +31,14 @@ class RouteName {
   static const String register = '/register';
   static const String camera = '/camera';
   static const String about = '/about';
+  static const String profile = '/profile';
   static const String flashcards = '/flashcards';
+  static String learn(String deckId) => '/learn/$deckId';
+  static String edit(String deckId) => '/edit/$deckId';
   static const String dictionary = '/dictionary';
   static const String translator = '/translator';
   static const String friends = '/friends';
-  static const String quiz = '/quiz';
-  static const String chat = '/chat';
-  static const String history = '/history';
+  static String addNewWord(String deckId) => '/add-new-word/$deckId';
 
   static const publicRoutes = [login, forgotPassword, verify, register];
 }
@@ -99,6 +100,10 @@ final router = GoRouter(
         return AboutScreen(imagePath: imagePath);
       },
     ),
+    noTransitionRoute(
+      path: RouteName.profile,
+      builder: (context, state) => const ProfilePage(),
+    ),
     noTransitionRoute(
       path: RouteName.flashcards,
       builder: (context, state) => const FlashcardPage(),
@@ -112,30 +117,33 @@ final router = GoRouter(
       builder: (context, state) => const FriendsPage(),
     ),
     noTransitionRoute(
-      path: RouteName.quiz,
-      builder: (context, state) => const QuizPage(),
-    ),
-    noTransitionRoute(
-      path: '/learn',
+      path: '/learn/:deckId',
       builder: (context, state) {
-        final data = state.extra as Map<String, dynamic>;
-        final cards = data['cards'] as List<String>;
-        final title = data['title'] as String;
-
-        return LearningFlashcardPage(title: title, cards: cards);
+        final deckId = state.pathParameters['deckId']!;
+        return LearningFlashcardPage(deckId: deckId);
       },
     ),
     noTransitionRoute(
       path: RouteName.translator,
       builder: (context, state) => const TranslatorScreen(),
     ),
     noTransitionRoute(
-      path: '/chat',
-      builder: (context, state) => const ChatScreen(),
+      path: RouteName.translator,
+      builder: (context, state) => const TranslatorScreen(),
     ),
     noTransitionRoute(
-      path: RouteName.history,
-      builder: (context, state) => const HistoryPage(),
+      path: '/edit/:deckId',
+      builder: (context, state) {
+        final deckId = state.pathParameters['deckId']!;
+        return EditCardListPage(deckId: deckId);
+      },
+    ),
+    noTransitionRoute(
+      path: '/add-new-word/:deckId',
+      builder: (context, state) {
+        final deckId = state.pathParameters['deckId']!;
+        return AddNewWordPage(deckId: deckId);
+      },
     ),
   ],
-);
+);

lib/config/theme.dart

@@ -14,6 +14,7 @@ class CustomTheme {
   static const Color mainColor1 = Color(0xFF6D2323);
   static const Color mainColor2 = Color(0xFFE5D0AC);
   static const Color mainColor3 = Color(0xFFFEF9E1);
+  static const Color flashcardColor = Color.fromARGB(255, 224, 78, 78);
   static const Color chatbotprimary = Colors.purple;
   static const Color chatbotsecondary = Colors.blue;
 

lib/features/dictionary/dtos/search_result_dto.dart

@@ -54,6 +54,7 @@ class Data {
 }
 
 class Vocabulary {
+  final String id;
   final List<String> img;
   final String word;
   final String pronunciation;
@@ -62,6 +63,7 @@ class Vocabulary {
   final List<Example> examples;
 
   const Vocabulary({
+    required this.id,
     required this.img,
     required this.word,
     required this.pronunciation,
@@ -72,6 +74,7 @@ class Vocabulary {
 
   factory Vocabulary.fromJson(Map<String, dynamic> json) {
     return Vocabulary(
+      id: json['_id'] ?? '',
       img:
           (json['img'] as List<dynamic>?)?.map((e) => e.toString()).toList() ??
           [],
@@ -124,10 +127,7 @@ class Example {
   final String english;
   final String vietnamese;
 
-  const Example({
-    required this.english,
-    required this.vietnamese,
-  });
+  const Example({required this.english, required this.vietnamese});
 
   factory Example.fromJson(Map<String, dynamic> json) {
     return Example(