Skip to content

Commit

Permalink
✨ Update 로그인/등록화면 기능
Browse files Browse the repository at this point in the history
-화면 이동 동작 수정
-비밀번호 입력 기능
-연결코드/인증코드 관련 기능
-유효성검사 관련 작업
Related to:#30
  • Loading branch information
pakkyunn committed Jun 9, 2024
1 parent 1fb001e commit 06cd4c0
Show file tree
Hide file tree
Showing 17 changed files with 688 additions and 455 deletions.
51 changes: 37 additions & 14 deletions lib/dao/user_dao.dart
Original file line number Diff line number Diff line change
@@ -1,20 +1,43 @@
import 'package:cloud_firestore/cloud_firestore.dart';

import '../model/user_model.dart';

// 영화 데이터 전체를 가져오는 함수
Future<List<Map<String, dynamic>>> getMovieData() async {
// movie_data 컬렉션에 저장되어 있는 모든 문서를 가져온다.
var querySnapShot = await FirebaseFirestore.instance.collection('movie_data').get();

// 데이터를 담을 리스트
List<Map<String, dynamic>> 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,
});
}

// 데이터를 리스트에 담아준다.
// 컬렉션에 담긴 모든 문서를 가져와 반복한다.
for(var doc in querySnapShot.docs){
// 문서에 담긴 데이터를 맵으로 추출하여 리스트에 담는다.
results.add(doc.data());
}
Future<void> setUserIndexx(int idx) async {
await FirebaseFirestore.instance
.collection('Sequence')
.doc('DiarySequence')
.set({'value': idx});
}

return results;
}
// // 지금 뜨는 콘텐츠 정보를 가져온다.
// 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;
// }
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class _WooYeonHiState extends State<WooYeonHi> {
@override
Widget build(BuildContext context) {
return ChangeNotifierProvider(
create: (context) => UserModel(idx: 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: [], userState: 2, loveDday: DateTime.now()),
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(
debugShowCheckedModeBanner: false,
Expand Down
4 changes: 2 additions & 2 deletions lib/model/user_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
import 'enums.dart';

class UserModel with ChangeNotifier{
int idx;
int userIdx;
LoginType loginType;
String userAccount;
String userNickname;
Expand All @@ -22,7 +22,7 @@ class UserModel with ChangeNotifier{
DateTime loveDday;

UserModel(
{required this.idx,
{required this.userIdx,
required this.loginType,
required this.userAccount,
required this.userNickname,
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/routes_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class RouteGenerator {
switch (settings.name) {
case '/':
return MaterialPageRoute(
builder: (_) => const RegisterDoneScreen(title: 'Flutter Animations'),
builder: (_) => RegisterDoneScreen(title: 'Flutter Animations', isHost: true,),
);

default:
Expand Down
Loading

0 comments on commit 06cd4c0

Please sign in to comment.