feat : 뒤로가기 구현, 루틴 아이디 있으면 카메라 후 대시보드로 가도록 설정.

SkinCare-Peace · Dec 13, 2024 · 8ab9645 · 8ab9645
1 parent 25e3b75
commit 8ab9645
Show file tree

Hide file tree

Showing 5 changed files with 225 additions and 334 deletions.
diff --git a/frontend/lib/face_detection/face_detector_page.dart b/frontend/lib/face_detection/face_detector_page.dart
@@ -66,14 +66,10 @@ class _FaceDetectorPageState extends State<FaceDetectorPage> {
   );
   // BSTI 화면으로 이동
   void _navigateToBSTI() {
-    //if widget.userData.점수:
-    //bsti 계산 로직 돌려서 유저 데이터 패치
-    //대시보드로 바로 꽂기
-    print('Navigating to BSTI screen...');
+    if (widget.userData.bsti.isEmpty) print('Navigating to BSTI screen...');
     Navigator.pushReplacement(
       context,
       MaterialPageRoute(
-        //builder: (context) => BSTI(widget.userData), // UserData 전달
         builder: (context) => Survey1(widget.userData, surveyInfo),
       ),
     );

diff --git a/frontend/lib/face_detection/face_result.dart b/frontend/lib/face_detection/face_result.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'package:flutter/material.dart';
+import 'package:frontend/record/dash.dart';
 import 'package:http/http.dart' as http;
-import 'package:frontend/Constants/scalling.dart';
 import 'package:frontend/addProduct/add_main.dart';
 import 'package:frontend/Constants/colors.dart';
 import 'package:frontend/Constants/bsti_bbi_image.dart';
@@ -51,10 +51,11 @@ class _BSTIState extends State<BSTI> {
         };
 
         // 정규화된 데이터를 저장
-        final translatedData = (responseData['statistics'] as Map<String, dynamic>)
-            .values
-            .first
-            .map((k, v) => MapEntry(keyTranslation[k] ?? k, v));
+        final translatedData =
+            (responseData['statistics'] as Map<String, dynamic>)
+                .values
+                .first
+                .map((k, v) => MapEntry(keyTranslation[k] ?? k, v));
 
         setState(() {
           skinData = Map<String, int>.from(translatedData);
@@ -208,20 +209,36 @@ class _BSTIState extends State<BSTI> {
                 ),
               ),
               const SizedBox(height: 5),
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 20),
-                child: MainButton(
-                  text: "나만의 루틴 시작하기",
-                  onPressed: () {
-                    Navigator.push(
-                      context,
-                      MaterialPageRoute(
-                        builder: (context) => AddSkinCareMain(widget.userData),
+              widget.userData.routineId.isEmpty
+                  ? Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: MainButton(
+                        text: "나만의 루틴 시작하기",
+                        onPressed: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (context) =>
+                                  AddSkinCareMain(widget.userData),
+                            ),
+                          );
+                        },
                       ),
-                    );
-                  },
-                ),
-              ),
+                    )
+                  : Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: MainButton(
+                        text: "대시보드 가기",
+                        onPressed: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (context) => DashPage(widget.userData),
+                            ),
+                          );
+                        },
+                      ),
+                    ),
             ],
           ),
         ),