Skip to content

Commit

Permalink
fix: fix error
Browse files Browse the repository at this point in the history
  • Loading branch information
brownglasses committed Apr 6, 2024
1 parent 1c68c92 commit 3a08c51
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 53 deletions.
29 changes: 5 additions & 24 deletions front/lib/app/config/routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ import 'package:front/features/team/presentation/pages/team/team_create.dart';
import 'package:front/features/team/presentation/pages/team/team_datail.dart';
import 'package:front/features/team/presentation/pages/team/teams_list.dart';
import 'package:front/features/user/presentation/component/change_info_list.dart';
import 'package:front/features/user/presentation/screens/email_singin.dart';
import 'package:front/features/user/presentation/screens/login.dart';
import 'package:front/features/user/presentation/screens/main_screen.dart';

import 'package:front/features/user/presentation/screens/my_info_screen.dart';
import 'package:front/features/user/presentation/screens/signin.dart';

import 'package:front/features/user/presentation/screens/social_login_info_screen.dart';
import 'package:go_router/go_router.dart';

Expand All @@ -22,21 +20,8 @@ final router = GoRouter(initialLocation: '/', routes: [
name: 'example',
builder: (context, state) => const FormDemoScreen2(),
),
GoRoute(
path: 'login',
name: 'login',
builder: (context, state) => const LoginScreen(),
),
GoRoute(
path: 'signup',
name: 'signup',
builder: (context, state) => const SignInScreen(),
),
GoRoute(
path: 'emailSignup',
name: 'emailSignup',
builder: (context, state) => const EmailSignInScreen(),
),


GoRoute(
path: 'teamsList',
name: 'teamsList',
Expand Down Expand Up @@ -69,11 +54,7 @@ final router = GoRouter(initialLocation: '/', routes: [
name: 'projectUpdate',
builder: (context, state) => ProjectUpdateScreen(),
),
GoRoute(
path: 'main',
name: 'main',
builder: (context, state) => const MainScreen(),
),

ShellRoute(
builder: (context, state, child) => ScaffoldWithMyInfo(child: child),
routes: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

import 'package:front/core/network_handling/exceptions/custom_exception.dart';

class ExceptionHandler {
static showToast(Exception e) {
if (Exception is CustomException) {
final exception = e as CustomException;
var exception = e as CustomException;
// ToastService.show(NormalToast(message: '${exception.message}'));
} else {
// ToastService.show(NormalToast(message: '$e'));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:front/features/user/models/user.dart';
import 'package:front/features/user/data/models/user.dart';
import 'package:front/features/team/presentation/pages/team/widgets/dialog.dart';

typedef VoidCallback = void Function(UserModel user);
Expand Down Expand Up @@ -37,7 +37,7 @@ class ProjectManagerSelector extends StatelessWidget {
backgroundColor: Colors.grey[300],
child: const Text('⭐'),
),
Text(administrator.nickname ?? ''),
Text(administrator.nickName ?? ''),
],
);
}
Expand Down Expand Up @@ -87,7 +87,7 @@ class ProjectManagerSelector extends StatelessWidget {
const SizedBox(
width: 5,
),
Text(user.nickname ?? ''),
Text(user.nickName ?? ''),
],
),
),
Expand All @@ -104,7 +104,7 @@ class ProjectManagerSelector extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text('프로젝트 담당자 ${user.nickname}'),
Text('프로젝트 담당자 ${user.nickName}'),
const Text('으로 변경하시겠습니까?'),
const SizedBox(height: 16),
Row(
Expand All @@ -114,7 +114,7 @@ class ProjectManagerSelector extends StatelessWidget {
onPressed: () {
Navigator.pop(context);
onChanged(user);
_showConfirmationDialog(user.nickname ?? '', context);
_showConfirmationDialog(user.nickName ?? '', context);
},
child: const Text('확인'),
),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ignore_for_file: public_member_api_docs, sort_constructors_first
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:front/features/user/models/user.dart';
import 'package:front/features/user/data/models/user.dart';
import 'package:front/features/project/data/models/project_request.dart';
import 'package:front/features/project/presentaion/component/project_from.dart';
import 'package:front/features/project/presentaion/component/project_manager_selector.dart';
Expand Down Expand Up @@ -54,13 +54,13 @@ class _BodyState extends ConsumerState<_Body> {
final _formKey = GlobalKey<CustomFormState>();
late CustomFormState? currentState;
var manager =
UserModel(id: 1, nickname: 'user1', email: 'email', type: 'type');
UserModel(id: 1, nickName: 'user1', email: 'email', type: 'type');
final List<UserModel> teamMembers = [
UserModel(id: 1, email: 'email', nickname: 'user1', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickname: 'user2', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickname: 'user3', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickname: 'user4', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickname: 'user5', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user1', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user2', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user3', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user4', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user5', type: 'MEMBER'),
];

@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';

import 'package:front/core/const/enum.dart';
import 'package:front/features/user/models/user.dart';
import 'package:front/features/user/data/models/user.dart';
import 'package:front/features/project/data/models/project_request.dart';
import 'package:front/features/project/entities/project.dart';
import 'package:front/features/project/presentaion/component/project_from.dart';
Expand Down Expand Up @@ -66,13 +66,13 @@ class _BodyState extends ConsumerState<_Body> {
final _formKey = GlobalKey<CustomFormState>();
late CustomFormState? currentState;
var manager =
UserModel(id: 1, nickname: 'user1', email: 'email', type: 'type');
UserModel(id: 1, nickName: 'user1', email: 'email', type: 'type');
final List<UserModel> teamMembers = [
UserModel(id: 1, email: 'email', nickname: 'user1', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickname: 'user2', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickname: 'user3', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickname: 'user4', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickname: 'user5', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user1', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user2', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user3', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user4', type: 'MEMBER'),
UserModel(id: 1, email: 'email', nickName: 'user5', type: 'MEMBER'),
];

@override
Expand Down
2 changes: 1 addition & 1 deletion front/lib/features/user/data/models/user.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class UserModel with _$UserModel {
id: user.id,
email: user.email,
nickName: user.nickName,
imageUrl: user.imageUrl,
imageUrl: user.imageUrl, type: user.type,
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ class SocialLoginInfoScreen extends StatelessWidget {
onPressed: () {
context.push('/changeMyInfoList');
},
child: Text('⚙ 개인정보 수정')),
Expanded(
child: const Text('⚙ 개인정보 수정')),
const Expanded(
child: SizedBox(),
),
Padding(
padding: const EdgeInsets.all(80.0),
child: TextButton(onPressed: () {}, child: Text('로그아웃')),
child: TextButton(onPressed: () {}, child: const Text('로그아웃')),
)
],
);
Expand Down
11 changes: 11 additions & 0 deletions front/lib/features/user/usecase/auto_sign_in_check_usecase.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import 'package:front/core/utils/result.dart';
import 'package:front/features/user/repositories/user_repositories.dart';

final class AutoSignInCheckUseCase {
const AutoSignInCheckUseCase(this._userRepository);
final UserRepository _userRepository;

Future<Result<bool>> call() async {
return _userRepository.autoSignInCheck();
}
}
6 changes: 3 additions & 3 deletions front/lib/features/user/usecase/set_auto_sign_in_true.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:front/core/utils/result.dart';
import 'package:front/features/user/repositories/user_repositories.dart';

final class SetAutoSignInFalse {
const SetAutoSignInFalse(this._userRepository);
final class SetAutoSignInTrue {
const SetAutoSignInTrue(this._userRepository);
final UserRepository _userRepository;

Future<Result> call() async {
return _userRepository.setAutoSignInFalse();
return _userRepository.setAutoSignInTrue();
}
}
12 changes: 12 additions & 0 deletions front/lib/features/user/usecase/sign_out_usecase.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import 'package:front/core/utils/api_response.dart';
import 'package:front/core/utils/result.dart';
import 'package:front/features/user/repositories/user_repositories.dart';

final class SignOutUseCase {
const SignOutUseCase(this._userRepository);
final UserRepository _userRepository;

Future<Result<ApiResponse>> call() async {
return _userRepository.signOut();
}
}
1 change: 0 additions & 1 deletion front/lib/main/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class _EagerInitialization extends ConsumerWidget {

@override
Widget build(BuildContext context, WidgetRef ref) {
ref.watch(sharedPrefProvider);
ref.watch(secureStorageProvider);

return child;
Expand Down

0 comments on commit 3a08c51

Please sign in to comment.