Merge branch 'develop-front' of https://github.com/kookmin-sw/capston…

…e-2024-30 into feature/fe/#57-qnaScreen

front/capstone_front/assets/translations/ko-KR.json

@@ -13,20 +13,26 @@
     "kmu_email": "국민대 이메일",
     "password": "비밀번호",
     "password_re": "비밀번호 재입력",
+    "weak_password": "비밀번호는 6자리 이상이어야 합니다",
+    "duplicated_email": "이미 사용된 아이디입니다",
+    "password_not_same": "비밀번호가 일치하지 않습니다",
     "country": "국가",
     "college": "단과대학",
     "department": "학부ㆍ학과",
+    "name": "이름",
     "student_number": "학번",
+    "enter_name": "이름, 학번을 입력해주세요",
     "enter_kmuemail": "국민대 이메일을 입력해주세요",
     "enter_password": "비밀번호를 입력해주세요",
-    "auth_email": "이메일 인증을 완료해주세요",
     "enter_college_department": "단과대학 및 학과를 입력해주세요",
     "enter_college": "단과대학을 골라주세요",
     "enter_department": "학부ㆍ학과를 골라주세요",
     "enter_country": "국가를 입력해주세요",
     "select_country": "국가를 골라주세요",
+    "auth_email": "인증 메일이 발송되었습니다",
     "detail_auth_email": "메일 내 인증 링크를 통해 인증을 완료해주세요\n메일이 보이지 않는다면 스펨메일함을 확인해주세요",
-    "complete_signup": "회원가입 완료"
+    "complete_signup": "회원가입 완료",
+    "ok": "확인"
   },
   "mainScreen": {
     "home": "홈",

front/capstone_front/flutter_launcher_icons.yaml

@@ -0,0 +1,5 @@
+flutter_icons:
+  ios: true
+  android: true
+  image_path: "assets/images/app_logo_icon.png"
+  remove_alpha_ios: true

front/capstone_front/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}

front/capstone_front/lib/main.dart

@@ -13,6 +13,7 @@ import 'package:capstone_front/screens/signup/signup_college_screen.dart';
 import 'package:capstone_front/screens/signup/signup_country_screen.dart';
 import 'package:capstone_front/screens/signup/signup_email_screen.dart';
 import 'package:capstone_front/screens/signup/signup_email_auth_screen.dart';
+import 'package:capstone_front/screens/signup/signup_name.dart';
 import 'package:capstone_front/screens/signup/signup_service.dart';
 import 'package:capstone_front/screens/main_screen.dart';
 import 'package:capstone_front/screens/notice/notice_screen.dart';
@@ -23,13 +24,14 @@ import 'package:capstone_front/screens/qna/qna_write/qna_write_screen.dart';
 import 'package:capstone_front/screens/signup/singup_password_screen.dart';
 import 'package:capstone_front/screens/speech_practice/speech_practice_screen.dart';
 import 'package:capstone_front/screens/speech_practice/speech_screen.dart';
-import 'package:capstone_front/screens/speech_practice/speech_select_sentence_screen.dart';
+import 'package:capstone_front/screens/speech_practice/speech_example_sentences/speech_select_sentence_screen.dart';
 import 'package:capstone_front/utils/page_animation.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 
@@ -138,18 +140,18 @@ final GoRouter router = GoRouter(
     GoRoute(
         name: 'signup',
         path: '/signup',
-        builder: (context, state) => const SignupEmailScreen(),
+        builder: (context, state) => const SignupNameScreen(),
         routes: [
+          GoRoute(
+            name: 'email',
+            path: 'email',
+            builder: (context, state) => const SignupEmailScreen(),
+          ),
           GoRoute(
             name: 'password',
             path: 'password',
             builder: (context, state) => const SignupPasswordScreen(),
           ),
-          GoRoute(
-            name: 'emailAuth',
-            path: 'emailAuth',
-            builder: (context, state) => const SignupEmailAuthScreen(),
-          ),
           GoRoute(
             name: 'college',
             path: 'college',

front/capstone_front/lib/models/api_fail_response.dart

@@ -0,0 +1,16 @@
+class ApiFailResponse {
+  final bool success;
+  final String message;
+  final String code;
+
+  ApiFailResponse({
+    required this.success,
+    required this.message,
+    required this.code,
+  });
+
+  ApiFailResponse.fromJson(Map<String, dynamic> json)
+      : success = json['success'] as bool,
+        message = json['message'] as String,
+        code = json['code'] as String;
+}

front/capstone_front/lib/models/api_success_response.dart

@@ -0,0 +1,16 @@
+class ApiSuccessResponse {
+  final bool success;
+  final String message;
+  final Map<String, dynamic> response;
+
+  ApiSuccessResponse({
+    required this.success,
+    required this.message,
+    required this.response,
+  });
+
+  ApiSuccessResponse.fromJson(Map<String, dynamic> json)
+      : success = json['success'] as bool,
+        message = json['message'] as String,
+        response = json['response'];
+}

front/capstone_front/lib/screens/chatbot/chatbot.dart

@@ -37,16 +37,9 @@ class _ChatbotScreenState extends State<ChatbotScreen> {
     return Scaffold(
       resizeToAvoidBottomInset: true,
       appBar: AppBar(
-        iconTheme: const IconThemeData(
-          color: Colors.white,
-        ),
-        backgroundColor: Theme.of(context).primaryColor,
+        scrolledUnderElevation: 0,
         title: Text(
           tr('chatbotScreen.chatbot'),
-          style: const TextStyle(
-            color: Colors.white,
-            fontWeight: FontWeight.bold,
-          ),
         ),
       ),
       body: Column(
@@ -77,8 +70,10 @@ class _ChatbotScreenState extends State<ChatbotScreen> {
                             painter: BubblePainter(),
                             child: Padding(
                               padding: const EdgeInsets.all(10.0),
-                              child:
-                                  Text(_messages[_messages.length - 1 - index]),
+                              child: Text(
+                                _messages[_messages.length - 1 - index],
+                                style: const TextStyle(color: Colors.white),
+                              ),
                             ),
                           ),
                         ),
@@ -87,12 +82,12 @@ class _ChatbotScreenState extends State<ChatbotScreen> {
               ),
             ),
           ),
-          const Divider(
-            height: 0.0,
-            color: Colors.white,
-          ),
+          // const Divider(
+          //   height: 0.0,
+          //   color: Colors.white,
+          // ),
           Padding(
-            padding: const EdgeInsets.all(10.0),
+            padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
             child: Container(
               decoration: BoxDecoration(
                 color: const Color(0xFFDFE7EE),