✨ Update 로그인/등록 화면

-프로바이더 적용 Related to:#30
APP-Android2 · Jun 10, 2024 · 4d5dd43 · 4d5dd43
1 parent 3953b7b
commit 4d5dd43
Show file tree

Hide file tree

Showing 25 changed files with 1,444 additions and 1,379 deletions.
diff --git a/lib/dao/user_dao.dart b/lib/dao/user_dao.dart
@@ -1,43 +1,43 @@
-import 'package:cloud_firestore/cloud_firestore.dart';
-
-import '../model/user_model.dart';
-
-
-Future<void> saveUser(UserModel user) async {
-  await FirebaseFirestore.instance.collection('userData').add({
-    "user_idx": user.userIdx,
-    "login_type": user.loginType,
-    "user_account": user.userAccount,
-    "user_nickname": user.userNickname,
-    "user_birth": user.userBirth,
-    "user_profileImage": user.userProfileImage,
-    "lover_user_idx": user.loverUserIdx,
-    "lover_nickname": user.loverNickname,
-    "home_preset_type": user.homePresetType,
-    "top_bar_type": user.topBarType,
-    "profile_message": user.profileMessage,
-    "alarms_allow": user.alarmsAllow,
-    "app_lock_state": user.appLockState,
-    "top_bar_activate": user.topBarActivate,
-    "lock_password": user.lockPassword,
-    "user_state": user.lockPassword,
-    "love_dDay": user.loveDday,
-  });
-}
-
-Future<void> setUserIndexx(int idx) async {
-  await FirebaseFirestore.instance
-      .collection('Sequence')
-      .doc('DiarySequence')
-      .set({'value': idx});
-}
-
-// // 지금 뜨는 콘텐츠 정보를 가져온다.
-// Future<int> getUserIndex() async {
+// import 'package:cloud_firestore/cloud_firestore.dart';
 //
-//   var querySnapshot = await FirebaseFirestore.instance.collection('userData').where("user_idx").get();
+// import '../model/user_model.dart';
 //
-//   List<int> results = List<int>.from(querySnapshot.docs[0].data()['hot_movie_idx']);
 //
-//   return results;
-// }
+// Future<void> saveUser(UserModel user) async {
+//   await FirebaseFirestore.instance.collection('userData').add({
+//     "user_idx": user.userIdx,
+//     "login_type": user.loginType,
+//     "user_account": user.userAccount,
+//     "user_nickname": user.userNickname,
+//     "user_birth": user.userBirth,
+//     "user_profileImage": user.userProfileImage,
+//     "lover_user_idx": user.loverUserIdx,
+//     "lover_nickname": user.loverNickname,
+//     "home_preset_type": user.homePresetType,
+//     "top_bar_type": user.topBarType,
+//     "profile_message": user.profileMessage,
+//     "alarms_allow": user.alarmsAllow,
+//     "app_lock_state": user.appLockState,
+//     "top_bar_activate": user.topBarActivate,
+//     "lock_password": user.lockPassword,
+//     "user_state": user.lockPassword,
+//     "love_dDay": user.loveDday,
+//   });
+// }
+//
+// Future<void> setUserIndexx(int idx) async {
+//   await FirebaseFirestore.instance
+//       .collection('Sequence')
+//       .doc('DiarySequence')
+//       .set({'value': idx});
+// }
+//
+// // // 지금 뜨는 콘텐츠 정보를 가져온다.
+// // Future<int> getUserIndex() async {
+// //
+// //   var querySnapshot = await FirebaseFirestore.instance.collection('userData').where("user_idx").get();
+// //
+// //   List<int> results = List<int>.from(querySnapshot.docs[0].data()['hot_movie_idx']);
+// //
+// //   return results;
+// // }
diff --git a/lib/main.dart b/lib/main.dart
@@ -7,12 +7,13 @@ import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_naver_map/flutter_naver_map.dart';
 import 'package:kakao_flutter_sdk_user/kakao_flutter_sdk_user.dart';
 import 'package:provider/provider.dart';
-import 'package:woo_yeon_hi/model/user_model.dart';
+import 'package:woo_yeon_hi/provider/login_provider.dart';
+import 'package:woo_yeon_hi/provider/password_provider.dart';
+import 'package:woo_yeon_hi/provider/register_provider.dart';
 import 'package:woo_yeon_hi/routes/routes_generator.dart';
-import 'package:woo_yeon_hi/screen/register/register_screen.dart';
+import 'package:woo_yeon_hi/screen/login/login_screen.dart';
 
 import 'firebase_options.dart';
-import 'model/enums.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -68,10 +69,13 @@ class _WooYeonHiState extends State<WooYeonHi> {
 
   @override
   Widget build(BuildContext context) {
-    return ChangeNotifierProvider(
-    create: (context) => UserModel(userIdx: 0, loginType: LoginType.none, userAccount: '', userNickname: '', userBirth: DateTime.now(), userProfileImage: '', loverUserIdx: 0, loverNickname: '', homePresetType: 0, topBarType: 0, profileMessage: '', alarmsAllow: false, appLockState: 0, topBarActivate: false, lockPassword: [0, 0, 0, 0], userState: 2, loveDday: DateTime.now()),
-    child:
-      MaterialApp(
+    return MultiProvider(
+        providers: [
+          ChangeNotifierProvider(create: (context) => UserProvider()),
+          ChangeNotifierProvider(create: (context) => CodeConnectProvider()),
+          ChangeNotifierProvider(create: (context) => PasswordEnterProvider())
+        ],
+        child: MaterialApp(
       debugShowCheckedModeBanner: false,
       title: "WooYeonHi",
         theme: ThemeData(
@@ -90,7 +94,7 @@ class _WooYeonHiState extends State<WooYeonHi> {
             ),
           useMaterial3: true
       ),
-      home: const RegisterScreen(),
+      home: const LoginScreen(),
       onGenerateRoute: RouteGenerator.generateRoute,
       ));
   }

diff --git a/lib/model/user_model.dart b/lib/model/user_model.dart
@@ -1,9 +1,6 @@
-import 'package:flutter/cupertino.dart';
-import 'package:image_picker/image_picker.dart';
-
 import 'enums.dart';
 
-class UserModel with ChangeNotifier{
+class User {
   int userIdx;
   LoginType loginType;
   String userAccount;
@@ -22,10 +19,10 @@ class UserModel with ChangeNotifier{
   int userState;
   DateTime loveDday;
 
-  UserModel(
+  User(
       {required this.userIdx,
-       required this.loginType,
-       required this.userAccount,
+        required this.loginType,
+        required this.userAccount,
         required this.userNickname,
         required this.userBirth,
         required this.userProfileImage,
@@ -42,19 +39,25 @@ class UserModel with ChangeNotifier{
         required this.loveDday,
       });
 
-  bool checkProvider(TextEditingController textEditingController){
-    if(textEditingController.text.isEmpty || textEditingController.text == ""){
-      return false;
-    }else{
-      return true;
-    }
-  }
-
-  XFile? _image;
-  XFile? get image => _image;
-  void setImage(XFile? image) {
-    _image = image;
-    notifyListeners();
+  factory User.fromData(Map<String, dynamic> data){
+    return User(
+        userIdx: data['user_idx'],
+        loginType: data['diary_user_idx'],
+        userAccount: data['diary_date'],
+        userNickname: data['diary_weather'],
+        userBirth: data['diary_image'],
+        userProfileImage: data['diary_title'],
+        loverUserIdx: data['diary_content'],
+        loverNickname: data['diary_lover_check'],
+        homePresetType: data['diary_state'],
+      topBarType: data['diary_state'],
+      profileMessage: data['diary_state'],
+      alarmsAllow: data['diary_state'],
+      appLockState: data['diary_state'],
+      topBarActivate: data['diary_state'],
+      lockPassword: data['diary_state'],
+      userState: data['diary_state'],
+      loveDday: data['diary_state'],
+    );
   }
-
 }