Merge pull request #14 from Tuti-Project/feature

🐛 임시 메인 레이아웃 에러 수정

firebase.json

@@ -1,10 +1,6 @@
 {
   "hosting": {
-    "public": "public",
-    "ignore": [
-      "firebase.json",
-      "**/.*",
-      "**/node_modules/**"
-    ]
+    "public": "build/web",
+    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
   }
 }

lib/common/http_error_handler.dart

@@ -16,15 +16,15 @@ class HttpErrorHandler {
 
   Future<void> handleResponse() async {
     if (data['code'] == 401 || data['message'] == '유효하지 않은 토큰입니다.') {
-      TuTiSnackBar.showSnackBar(context, '로그인이 세션이 만료되었습니다. 다시 로그인해주세요.');
+      // TuTiSnackBar.showSnackBar(context, '로그인이 세션이 만료되었습니다. 다시 로그인해주세요.');
       if (kIsWeb) {
         await CustomTokenManager.removeToken();
       } else {
         await FlutterSecureStorageManager.removeStorage();
       }
-      if (context.mounted) {
-        context.go('/home');
-      }
+      // if (context.mounted) {
+      //   context.go('/tuti');
+      // }
     } else {
       // TuTiSnackBar.showSnackBar(context, data['message'].toString());
     }

lib/features/profile/services/proifle_service.dart

@@ -19,10 +19,7 @@ class ProfileService {
       Response? response;
       if (memberId != null) {
         response = await _dio.get(
-          '${StringConstants.baseUrl}/member/{memberId}',
-          queryParameters: {
-            'memberId': memberId,
-          },
+          '${StringConstants.baseUrl}/member/$memberId',
         );
       } else {
         response = await _dio.get('${StringConstants.baseUrl}/my-page');

lib/features/tutis/views/personal_branding_screen.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:go_router/go_router.dart';
 import 'package:tuti/common/constraints_scaffold.dart';
 import 'package:tuti/common/service/goods_provider.dart';
 import 'package:tuti/common/tuti_text.dart';
@@ -28,8 +29,8 @@ class PersonalBrandingScreen extends ConsumerWidget {
         children: [
           Container(
             margin: EdgeInsets.only(top: 35.h, bottom: 15.h),
-            child: const TuTiBanner(
-              location: GoodsDetailScreen.routePath,
+            child: TuTiBanner(
+              onTap: () {},
               title: '오직, 트티에서만 제공하는\n2024년 당신의 커리어 고민 해결 솔루션.',
               subtitle: '체계적이고 알찬 개인 맞춤형 레벨업!',
             ),
@@ -47,6 +48,7 @@ class PersonalBrandingScreen extends ConsumerWidget {
                   ),
                 ),
               AsyncError() => const Text('Oops, something unexpected happened'),
+              AsyncLoading() => const CircularProgressIndicator(),
               _ => const CircularProgressIndicator(),
             },
           ),

lib/features/tutis/views/tuti_screen.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:tuti/common/constraints_scaffold.dart';
 
 import '../../../constants/gaps.dart';
@@ -15,12 +16,18 @@ class TuTiScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const ConstraintsScaffold(
-      child: Column(
-        children: [
-          TuTiHeaderMobile(),
-          Flexible(flex: 5, child: TuTiCardMobile()),
-        ],
+    return ConstraintsScaffold(
+      child: Container(
+        margin: EdgeInsets.symmetric(horizontal: 20.w),
+        child: const Column(
+          children: [
+            TuTiHeaderMobile(),
+            Flexible(
+              flex: 5,
+              child: TuTiCardMobile(),
+            ),
+          ],
+        ),
       ),
     );
   }

lib/features/tutis/widgets/tuti_button_widget.dart

@@ -36,10 +36,8 @@ class TuTiButton extends StatelessWidget {
       child: TuTiText.small(
         context,
         title,
-        style: Theme.of(context)
-            .textTheme
-            .bodySmall!
-            .copyWith(color: Colors.white, fontWeight: FontWeight.w600),
+        style: Theme.of(context).textTheme.bodySmall!.copyWith(
+            color: Colors.white, fontWeight: FontWeight.w800, fontSize: 10.sp),
       ),
     );
   }

lib/features/tutis/widgets/tuti_widgets/main_banner.dart

@@ -1,28 +1,31 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:go_router/go_router.dart';
+import 'package:tuti/common/custom_token_manager.dart';
+import 'package:tuti/common/service/navigation_index_provder.dart';
+import 'package:tuti/common/service/token_provider.dart';
 import 'package:tuti/constants/color.dart';
 import 'package:tuti/constants/gaps.dart';
 
-class TuTiBanner extends StatelessWidget {
+class TuTiBanner extends ConsumerWidget {
   const TuTiBanner(
       {super.key,
-      required this.location,
+      required this.onTap,
       required this.title,
       required this.subtitle});
 
-  final String location;
+  final VoidCallback onTap;
   final String title;
   final String subtitle;
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     return GestureDetector(
-      onTap: () {
-        context.push(location);
-      },
+      onTap: onTap,
       child: Container(
-        width: MediaQuery.of(context).size.width * 0.8,
+        margin: EdgeInsets.symmetric(horizontal: 10.w),
+        padding: EdgeInsets.symmetric(horizontal: 13.w, vertical: 10.h),
         height: 80.h,
         decoration: ShapeDecoration(
           color: Colors.white,