Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ› 메인 λ ˆμ΄μ•„μ›ƒ 및 판맀 νŽ˜μ΄μ§€ νƒ­ λ„€λΉ„κ²Œμ΄μ…˜ 였λ₯˜ μˆ˜μ • #15

Merged
merged 1 commit into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/common/http_error_handler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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');
// }
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

카카였 둜그인 심사λ₯Ό μœ„ν•΄ λΉ„λ‘œκ·ΈμΈ μœ μ €κ°€ 접속 μ‹œ μŠ€λ‚΅λ°” + tuti νƒ­μœΌλ‘œ μ΄λ™ν•˜λŠ” 둜직 제거

} else {
// TuTiSnackBar.showSnackBar(context, data['message'].toString());
}
Expand Down
6 changes: 4 additions & 2 deletions lib/features/tutis/views/personal_branding_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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: '체계적이고 μ•Œμ°¬ 개인 λ§žμΆ€ν˜• λ ˆλ²¨μ—…!',
),
Expand All @@ -47,6 +48,7 @@ class PersonalBrandingScreen extends ConsumerWidget {
),
),
AsyncError() => const Text('Oops, something unexpected happened'),
AsyncLoading() => const CircularProgressIndicator(),
_ => const CircularProgressIndicator(),
},
),
Expand Down
19 changes: 13 additions & 6 deletions lib/features/tutis/views/tuti_screen.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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),
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

νŠΈν‹° νƒ­ ν™”λ©΄ λ ˆμ΄μ•„μ›ƒ 쑰정을 μœ„ν•΄ λ§ˆμ§„ μΆ”κ°€.

즉, ConstranitsScaffold μ—μ„œ Container의 widthλ₯Ό 700으둜 μ œν•œν•˜κ³  있기 λ•Œλ¬Έμ— 이 λΆ€λΆ„μ—μ„œ λ ˆμ΄μ•„μ›ƒμ„ μ‘°μ •ν•΄μ•Ό νŠΈν‹° νƒ­μ˜ λ ˆμ΄μ•„μ›ƒμ΄ 쑰정됨.

child: const Column(
children: [
TuTiHeaderMobile(),
Flexible(
flex: 5,
child: TuTiCardMobile(),
),
],
),
),
);
}
Expand Down
6 changes: 2 additions & 4 deletions lib/features/tutis/widgets/tuti_button_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
);
}
Expand Down
18 changes: 10 additions & 8 deletions lib/features/tutis/widgets/tuti_widgets/main_banner.dart
Original file line number Diff line number Diff line change
@@ -1,29 +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) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

λ°°λ„ˆ 클릭 μ‹œ λ„€λΉ„κ²Œμ΄μ…˜ 둜직이 ν†΅μΌλ˜μ§€ μΌ€μ΄μŠ€ λ³„λ‘œ λ‹€λ₯΄λ―€λ‘œ onTapλ©”μ„œλ“œλ₯Ό μƒμœ„μ—μ„œ μ „λ‹¬ν•˜λ„λ‘ μ„€μ •.

return GestureDetector(
onTap: () {
context.push(location);
},
onTap: onTap,
child: Container(
margin: EdgeInsets.symmetric(horizontal: 10.w),
padding: EdgeInsets.symmetric(horizontal: 13.w, vertical: 10.h),
margin: EdgeInsets.symmetric(horizontal: 20.w),
height: 80.h,
decoration: ShapeDecoration(
color: Colors.white,
Expand Down
123 changes: 60 additions & 63 deletions lib/features/tutis/widgets/tuti_widgets/tuti_card_mobile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ 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/tuti_icon.dart';
import 'package:tuti/features/profile/models/member_model.dart';
import 'package:tuti/features/tutis/views/personal_branding_screen.dart';
Expand Down Expand Up @@ -86,63 +87,58 @@ class _TuTiCardMobileState extends ConsumerState<TuTiCardMobile> {

@override
Widget build(BuildContext context) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 30.w),
child: CustomScrollView(
controller: _scrollController,
slivers: [
SliverAppBar(
expandedHeight: 80.h,
floating: false,
pinned: false,
flexibleSpace: const FlexibleSpaceBar(
background: TuTiBanner(
location: PersonalBrandingScreen.routePath,
title: '[곡지]\nνŠΈν‹° 강점 발견 μ—°κ΅¬μ†Œ 1κΈ° λͺ¨μ§‘ 쀑!',
subtitle: '🀯 인생 κ³ λ―Ό, μ§„λ‘œ κ³ λ―Ό ! λ―Έλž˜μ— λŒ€ν•œ 확신이 듀지 μ•Šμ„ λ•Œ!',
),
return CustomScrollView(
controller: _scrollController,
slivers: [
SliverAppBar(
expandedHeight: 80.h,
floating: false,
pinned: false,
flexibleSpace: FlexibleSpaceBar(
background: TuTiBanner(
onTap: () {
// νŒλ§€νŽ˜μ΄μ§€ νƒ­μœΌλ‘œ 이동
ref.read(navigationSelectedIndexProvider.notifier).state = 0;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

νŒλ§€νŽ˜μ΄μ§€ νƒ­μœΌλ‘œ μ΄λ™ν•˜λŠ” 둜직 μΆ”κ°€

},
title: '[곡지]\nνŠΈν‹° 강점 발견 μ—°κ΅¬μ†Œ 1κΈ° λͺ¨μ§‘ 쀑!',
subtitle: '🀯 인생 κ³ λ―Ό, μ§„λ‘œ κ³ λ―Ό ! λ―Έλž˜μ— λŒ€ν•œ 확신이 듀지 μ•Šμ„ λ•Œ!',
),
),
SliverGrid(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
),
delegate: SliverChildBuilderDelegate(childCount: _allMembers.length,
(context, index) {
final member = _allMembers[index];
return Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),
child: Container(
constraints: BoxConstraints(
minHeight: 250.h,
maxHeight: 250.h,
),
margin: EdgeInsets.symmetric(vertical: 20.w),
decoration: ShapeDecoration(
color: Colors.white,
shape: RoundedRectangleBorder(
side: const BorderSide(
width: 2,
color: ColorConstants.primaryColor,
),
borderRadius: BorderRadius.circular(45),
),
),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
_buildLeftColumn(context, member),
Gaps.w24,
_buildRightColumn(context, member),
],
),
SliverGrid(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
),
delegate: SliverChildBuilderDelegate(childCount: _allMembers.length,
(context, index) {
final member = _allMembers[index];
return Container(
margin: EdgeInsets.symmetric(vertical: 20.w, horizontal: 8.w),
decoration: ShapeDecoration(
color: Colors.white,
shape: RoundedRectangleBorder(
side: const BorderSide(
width: 2,
color: ColorConstants.primaryColor,
),
borderRadius: BorderRadius.circular(45),
),
);
}),
)
],
),
),
child: Padding(
padding: EdgeInsets.all(7.w),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
_buildLeftColumn(context, member),
_buildRightColumn(context, member),
],
),
),
);
}),
)
],
);
}

Expand Down Expand Up @@ -175,9 +171,12 @@ class _TuTiCardMobileState extends ConsumerState<TuTiCardMobile> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
_buildSwitchRow(context, member),
Gaps.h10,
TuTiText.small(
context,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(fontSize: 10.sp, fontWeight: FontWeight.w800),
member.applyMatchingStatus == 'ON' ? '맀칭 κ°€λŠ₯' : '재직 쀑',
// member.applyMatchingStatus == 'ON' ? '맀칭 κ°€λŠ₯' : member.matchingDescription.isNotEmpty ? member.matchingDescription : '재직 쀑',
),
Expand All @@ -204,21 +203,21 @@ class _TuTiCardMobileState extends ConsumerState<TuTiCardMobile> {
return Text('Error: ${snapshot.error}');
}
}
return const SizedBox();
return const SizedBox.shrink();
},
),
Gaps.h12,
Gaps.h6,
TuTiText.small(
context,
member.university == ''
? 'λ―Έμž…λ ₯'
: '${member.university} / ${member.major}',
: '${member.university}\n${member.major}',
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(fontSize: 9.sp, fontWeight: FontWeight.w900),
.copyWith(fontSize: 8.sp, fontWeight: FontWeight.w900),
),
],
),
Expand All @@ -233,6 +232,7 @@ class _TuTiCardMobileState extends ConsumerState<TuTiCardMobile> {
children: [
_buildKeywordsWrap(member),
TuTiButton(
padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 20.w),
title: '더보기',
onPressed: () async {
String? authToken = await CustomTokenManager.getToken();
Expand All @@ -247,9 +247,6 @@ class _TuTiCardMobileState extends ConsumerState<TuTiCardMobile> {
_getDetailProfile(member.memberId);
}
},
padding: EdgeInsets.symmetric(
horizontal: 35.w,
),
fontSize: 10.sp,
),
Gaps.h16,
Expand Down Expand Up @@ -325,8 +322,8 @@ class _TuTiCardMobileState extends ConsumerState<TuTiCardMobile> {
for (var job in jobTags)
TuTiIcon(
title: job,
fontSize: 10.sp,
iconHeight: 50.h,
fontSize: 9.sp,
iconHeight: 60.h,
),
],
),
Expand Down