Skip to content

Commit

Permalink
Merge pull request #48 from kookmin-sw/FE
Browse files Browse the repository at this point in the history
FE
  • Loading branch information
choichangyeon authored May 3, 2024
2 parents 775c695 + f19b13f commit 4bacee7
Show file tree
Hide file tree
Showing 28 changed files with 820 additions and 755 deletions.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#select file
lib/secret.dart
Binary file not shown.
Binary file modified frontend/build/ios/Debug-iphonesimulator/App.framework/App
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</data>
<key>flutter_assets/kernel_blob.bin</key>
<data>
TBuCHYCsU9Sn6/DKvH/8UrORSnk=
FOaenddZmpKRPTREsxvMGZ26+JE=
</data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
Expand Down Expand Up @@ -97,7 +97,7 @@
<dict>
<key>hash2</key>
<data>
DfYg1k2L+3/Dc3aGlqHcMtjBWiALWeqGlNlFYnEfq3M=
v0UppUzLdmLSC8psG1XnAmG8ufMlm+VQ/aqydEFiyFw=
</data>
</dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</data>
<key>flutter_assets/kernel_blob.bin</key>
<data>
TBuCHYCsU9Sn6/DKvH/8UrORSnk=
FOaenddZmpKRPTREsxvMGZ26+JE=
</data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
Expand Down Expand Up @@ -97,7 +97,7 @@
<dict>
<key>hash2</key>
<data>
DfYg1k2L+3/Dc3aGlqHcMtjBWiALWeqGlNlFYnEfq3M=
v0UppUzLdmLSC8psG1XnAmG8ufMlm+VQ/aqydEFiyFw=
</data>
</dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
Expand Down
Binary file not shown.
Binary file modified frontend/build/ios/Debug-iphonesimulator/Runner.app/Runner
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
</data>
<key>Frameworks/App.framework/App</key>
<data>
HIsoTZbmMpK2+8HVXCnfpQkc0L0=
0vQsl63mgEZlI1CvvXlQ3BV0EAM=
</data>
<key>Frameworks/App.framework/Info.plist</key>
<data>
h5OB7aKzS5WR9SemvZAyN6FEkJs=
</data>
<key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
<data>
bN7Gi0tsyXbTuwtrmy6bi0VF6+Y=
dILNPgbpbfvQrhcioUE+uweViVc=
</data>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
<data>
Expand Down Expand Up @@ -82,7 +82,7 @@
</data>
<key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key>
<data>
TBuCHYCsU9Sn6/DKvH/8UrORSnk=
FOaenddZmpKRPTREsxvMGZ26+JE=
</data>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
Expand Down Expand Up @@ -269,7 +269,7 @@
<dict>
<key>hash2</key>
<data>
8KUV8VA9VgM+IoHuGKRwLSWvAzvSaDPiHb1ogMQT/FM=
MHOhmbEegvi19Qqoe2APWRnO2PlkRmsMI4c0UXY2mvg=
</data>
</dict>
<key>Frameworks/App.framework/Info.plist</key>
Expand All @@ -283,7 +283,7 @@
<dict>
<key>hash2</key>
<data>
pAnAhibTavZqtvfUl65RoTmuV5/+n/jVYvFG8d6B6og=
sggMzZh4f9HsAzVS/bGBvS7RGClG2FpK0G0c7KjxXOw=
</data>
</dict>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
Expand Down Expand Up @@ -332,7 +332,7 @@
<dict>
<key>hash2</key>
<data>
DfYg1k2L+3/Dc3aGlqHcMtjBWiALWeqGlNlFYnEfq3M=
v0UppUzLdmLSC8psG1XnAmG8ufMlm+VQ/aqydEFiyFw=
</data>
</dict>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</data>
<key>flutter_assets/kernel_blob.bin</key>
<data>
TBuCHYCsU9Sn6/DKvH/8UrORSnk=
FOaenddZmpKRPTREsxvMGZ26+JE=
</data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
Expand Down Expand Up @@ -97,7 +97,7 @@
<dict>
<key>hash2</key>
<data>
DfYg1k2L+3/Dc3aGlqHcMtjBWiALWeqGlNlFYnEfq3M=
v0UppUzLdmLSC8psG1XnAmG8ufMlm+VQ/aqydEFiyFw=
</data>
</dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
Expand Down
Binary file not shown.
Binary file modified frontend/build/ios/iphonesimulator/Runner.app/Runner
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
</data>
<key>Frameworks/App.framework/App</key>
<data>
HIsoTZbmMpK2+8HVXCnfpQkc0L0=
0vQsl63mgEZlI1CvvXlQ3BV0EAM=
</data>
<key>Frameworks/App.framework/Info.plist</key>
<data>
h5OB7aKzS5WR9SemvZAyN6FEkJs=
</data>
<key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
<data>
bN7Gi0tsyXbTuwtrmy6bi0VF6+Y=
dILNPgbpbfvQrhcioUE+uweViVc=
</data>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
<data>
Expand Down Expand Up @@ -82,7 +82,7 @@
</data>
<key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key>
<data>
TBuCHYCsU9Sn6/DKvH/8UrORSnk=
FOaenddZmpKRPTREsxvMGZ26+JE=
</data>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
Expand Down Expand Up @@ -269,7 +269,7 @@
<dict>
<key>hash2</key>
<data>
8KUV8VA9VgM+IoHuGKRwLSWvAzvSaDPiHb1ogMQT/FM=
MHOhmbEegvi19Qqoe2APWRnO2PlkRmsMI4c0UXY2mvg=
</data>
</dict>
<key>Frameworks/App.framework/Info.plist</key>
Expand All @@ -283,7 +283,7 @@
<dict>
<key>hash2</key>
<data>
pAnAhibTavZqtvfUl65RoTmuV5/+n/jVYvFG8d6B6og=
sggMzZh4f9HsAzVS/bGBvS7RGClG2FpK0G0c7KjxXOw=
</data>
</dict>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
Expand Down Expand Up @@ -332,7 +332,7 @@
<dict>
<key>hash2</key>
<data>
DfYg1k2L+3/Dc3aGlqHcMtjBWiALWeqGlNlFYnEfq3M=
v0UppUzLdmLSC8psG1XnAmG8ufMlm+VQ/aqydEFiyFw=
</data>
</dict>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
Expand Down
100 changes: 78 additions & 22 deletions frontend/lib/http.dart
Original file line number Diff line number Diff line change
@@ -1,28 +1,84 @@
import 'package:http/http.dart' as http;
import 'package:frontend/secret.dart';
import 'dart:convert';

//회원 가입
Future<String> singup(String email, String name, int age, String gender) async {
var address = Uri.parse(BASE_URL + "/auth/signup");
http.Response res = await http.post(
address,
headers: {
"Content-Type": "application/json",
},
body: json.encode({
"email": email,
"name": name,
"age": age,
"gender": gender,
}),
);
final data = json.decode(utf8.decode(res.bodyBytes));
print(data);

return data['token'];
}

//로그인
Future<String> login(String email) async {
var address = Uri.parse(BASE_URL + "/auth/login");
http.Response res = await http.post(
address,
headers: {
"Content-Type": "application/json",
},
body: json.encode({
"email": email,
}),
);
final data = json.decode(utf8.decode(res.bodyBytes));
print(data);

// Future<String> sendData() async {
// //http.post는 리턴값이 Future이기 떄문에 async 함수 내에서 await로 호출할 수 있다.
// var test = Uri.parse();
// http.Response res = await http.get(
// test,
// headers: {"Content-Type":"application/json",
// 'Authorization': 'Bearer $token'
// },
// // body: json.encode({
// // "email" : "[email protected]",

// // })
// );
// final data = json.decode(utf8.decode(res.bodyBytes));
// final comment = data['body'];
// print(comment);
// // print(res.body);
// //여기서는 응답이 객체로 변환된 res 변수를 사용할 수 있다.
// //여기서 res.body를 jsonDecode 함수로 객체로 만들어서 데이터를 처리할 수 있다.

// return res.body; //작업이 끝났기 때문에 리턴
// }
return data['token'];
}

//모임 목록 가져오기(주제를 기반으로)›
Future<List<dynamic>> groupSerachforTopic(String topic) async {
List<dynamic> groupList = [];
var address = Uri.parse(BASE_URL + "/club/search/topic?topic=$topic");
http.Response res = await http.get(
address,
headers: {
"Content-Type": "application/json",
},
);
final data = json.decode(utf8.decode(res.bodyBytes));
for (int i = 0; i < data.length; i++) {
groupList.add(data[i]);
// print(data[i]);
}

return groupList;
}

//모임 생성하기
Future<dynamic> groupCreate(dynamic token, String name, String topic, int maximum, String publication, var password) async {
var address = Uri.parse(BASE_URL + "/club/create");
http.Response res = await http.post(
address,
headers: {
"Content-Type": "application/json",
"Authorization": 'Bearer $token',
},
body: json.encode({
"topic": topic,
"name": name,
"maximum": maximum,
"publicStatus": publication,
"password": password,
}),
);
final data = res.body;
// print(res.body);

return data;
}
16 changes: 10 additions & 6 deletions frontend/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import 'package:flutter/material.dart';
import 'package:frontend/provider/bookinfo_provider.dart';
import 'package:frontend/provider/grouplist_provider.dart';
import 'package:frontend/screens/home/bookreport/bookreport_template_screen.dart';
import 'package:frontend/screens/home/bookreport/bookreport_writing_screen.dart';
import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';

import 'package:frontend/screens/home/home_screen.dart';
import 'package:frontend/screens/home/search/search_screen.dart';
import 'package:frontend/screens/home/shorts/shorts_screen.dart';
import 'package:frontend/screens/home/group/group_screen.dart';
import 'package:provider/provider.dart';
import 'package:frontend/screens/home/group/in_group/group_info_screen.dart';
import 'package:frontend/screens/home/group/make_group/group_make_screen.dart';
import 'package:frontend/screens/home/group/in_group/post/homework_list_screen.dart';
Expand All @@ -18,6 +19,8 @@ import 'package:frontend/screens/home/group/in_group/post/post_screen.dart';
import 'package:frontend/screens/book/book_info_screen.dart';

void main() async {
// WidgetsFlutterBinding.ensureInitialized();
// GroupListProvider().makeGroupList();
runApp(const App());
}

Expand Down Expand Up @@ -122,11 +125,12 @@ class App extends StatelessWidget {

@override
Widget build(BuildContext context) {
return MultiProvider(
providers: [
ChangeNotifierProvider(create: (_) => BookInfoProvider()),
// 다른 프로바이더도 여기에 추가
],
return MultiProvider(
providers: [
ChangeNotifierProvider(create: (_) => BookInfoProvider()),
// ChangeNotifierProvider(create: (context) => GroupListProvider()),
// 다른 프로바이더도 여기에 추가
],
child: MaterialApp.router(
routerConfig: router,
theme: ThemeData(
Expand Down
39 changes: 39 additions & 0 deletions frontend/lib/provider/grouplist_provider.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// import 'package:flutter/material.dart';
// import 'package:frontend/http.dart';
// 일단은 폐기
// final List<String> Thema = ['역사', '경제', '종교', '사회', '시집'];


// class GroupListProvider with ChangeNotifier {
// List<List<dynamic>> GroupList = [[], [], [], [], []];

// void makeGroupList() async {
// for (int i = 0; i < Thema.length; i++) {
// GroupList[i] = await groupSerachforTopic(Thema[i]);
// // print(GroupList[i].length);
// }
// notifyListeners();
// }

// void updateGroupList() {
// makeGroupList();
// }
// }

// class Group {
// final int id;
// var bookId;
// final String topic;
// final String name;
// final int maximum;
// final String publication;

// Group({
// required this.id,
// required this.bookId,
// required this.topic,
// required this.name,
// required this.maximum,
// required this.publication,
// });
// }
Loading

0 comments on commit 4bacee7

Please sign in to comment.