Merge branch 'feat/#62' of https://github.com/APPS-sookmyung/2024-OUT…

…FOOT-client into feat/#62
APPS-sookmyung · Dec 26, 2024 · 1d9f77b · 1d9f77b
2 parents 6097474 + 19c4073
commit 1d9f77b
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 183 deletions.
diff --git a/outfoot/lib/screens/checkpage_image.dart b/outfoot/lib/screens/checkpage_image.dart
@@ -127,7 +127,7 @@ class _CheckPageImageState extends State<CheckPageImage> {
                     borderRadius: BorderRadius.circular(6.r),
                   ),
                   child: Text(
-                    Data.date,  
+                    Data.date,
                     style: TextStyle(
                       fontSize: 11.sp,
                       color: blackBrownColor,
@@ -182,51 +182,50 @@ class _CheckPageImageState extends State<CheckPageImage> {
                   ),
                 ),
                 SizedBox(height: 40), // 이미지 그리드 상단 여백
-Container(
-  padding: EdgeInsets.only(
-    left: 16.95.w,
-    right: 16.95.w,
-    top: 17.35.h,
-    bottom: 35.23.h,
-  ),
-  decoration: BoxDecoration(
-    color: Colors.white,
-    borderRadius: BorderRadius.circular(10.r),
-  ),
-  child: GridView.builder(
-  shrinkWrap: true,
-  itemCount: 30, // 총 30개로 변경
-  gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-    crossAxisCount: 5,
-    mainAxisSpacing: 10.63.h,
-    crossAxisSpacing: 10.75.w,
-  ),
-  itemBuilder: (context, index) {
-    if (index < 26) { // 이미지가 있는 경우
-      return Container(
-        decoration: BoxDecoration(
-          shape: BoxShape.circle,
-          color: Colors.white,
-        ),
-        child: Padding(
-          padding: EdgeInsets.all(7.18.w),
-          child: Image.asset(
-            'assets/data/${index + 1}.svg', // 이미지 경로
-            fit: BoxFit.contain,
-          ),
-        ),
-      );
-    } else { // 나머지 빈칸은 점선 원으로 표시
-      return DashedCircle(
-        size: 24.57.w,
-        color: mainBrownColor,
-      );
-    }
-  },
-),
-
-),
-
+                Container(
+                  padding: EdgeInsets.only(
+                    left: 16.95.w,
+                    right: 16.95.w,
+                    top: 17.35.h,
+                    bottom: 35.23.h,
+                  ),
+                  decoration: BoxDecoration(
+                    color: Colors.white,
+                    borderRadius: BorderRadius.circular(10.r),
+                  ),
+                  child: GridView.builder(
+                    shrinkWrap: true,
+                    itemCount: 30, // 총 30개로 변경
+                    gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                      crossAxisCount: 5,
+                      mainAxisSpacing: 10.63.h,
+                      crossAxisSpacing: 10.75.w,
+                    ),
+                    itemBuilder: (context, index) {
+                      if (index < 26) {
+                        // 이미지가 있는 경우
+                        return Container(
+                          child: ClipOval(
+                            // 자식 위젯(SvgPicture)을 원형으로 클리핑합니다.
+                            child: Padding(
+                              padding: EdgeInsets.all(0.w),
+                              child: SvgPicture.asset(
+                                'assets/data/${index + 1}.svg', // 이미지 경로
+                                fit: BoxFit.cover,
+                              ),
+                            ),
+                          ),
+                        );
+                      } else {
+                        // 나머지 빈칸은 점선 원으로 표시
+                        return DashedCircle(
+                          size: 24.57.w,
+                          color: mainBrownColor,
+                        );
+                      }
+                    },
+                  ),
+                ),
               ],
             ),
           ],

diff --git a/outfoot/lib/screens/login/login_page_screen.dart b/outfoot/lib/screens/login/login_page_screen.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:carousel_slider/carousel_slider.dart';
+import 'package:carousel_slider/carousel_controller.dart';
 import 'package:outfoot/colors/colors.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 

diff --git a/outfoot/lib/screens/make_goal/make_personal_goal.dart b/outfoot/lib/screens/make_goal/make_personal_goal.dart
@@ -33,8 +33,8 @@ class _MakePersonalGoalPageState extends State<MakePersonalGoalPage> {
 
     token = dotenv.env['TOKEN'];
     if (token == null) {
-      debugPrint("Error: TOKEN is not defined in .env");
-      return;
+      // debugPrint("Error: TOKEN is not defined in .env");
+      // return;
     }
 
     // 목표 생성 API 호출