diff --git a/.DS_Store b/.DS_Store
index 4b37c4ec39..3a54170640 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000..26d33521af
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/capstone-2024-39.iml b/.idea/capstone-2024-39.iml
new file mode 100644
index 0000000000..34057bbd58
--- /dev/null
+++ b/.idea/capstone-2024-39.iml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000..26bc0807d0
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000..35eb1ddfbb
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend/lib/screens/home/group/group_screen.dart b/frontend/lib/screens/home/group/group_screen.dart
index 7195efdaef..64cbece5bf 100644
--- a/frontend/lib/screens/home/group/group_screen.dart
+++ b/frontend/lib/screens/home/group/group_screen.dart
@@ -78,7 +78,13 @@ class _GroupState extends State {
},
child: Text('${j + 1}'),
),
- Text(Thema[j]),
+ Text(
+ Thema[j],
+ style: TextStyle(
+ fontSize: 14.sp,
+ fontWeight: FontWeight.w700,
+ ),
+ ),
],
),
),
diff --git a/frontend/lib/screens/home/mypage/mypage_screen.dart b/frontend/lib/screens/home/mypage/mypage_screen.dart
index e4be2b8493..360db0bbdc 100644
--- a/frontend/lib/screens/home/mypage/mypage_screen.dart
+++ b/frontend/lib/screens/home/mypage/mypage_screen.dart
@@ -15,37 +15,6 @@ class MypageScreen extends StatefulWidget {
_MypageScreenState createState() => _MypageScreenState();
}
-class Book {
- final String title;
- final String author;
- final String publisher;
- final String startDate;
- final String endDate;
- final String type;
- final String imageUrl;
-
- Book({
- required this.title,
- required this.author,
- required this.publisher,
- required this.startDate,
- required this.endDate,
- required this.type,
- required this.imageUrl,
- });
-
- // factory Book.fromJson(Map json) {
- // return Book(
- // id: json['id'] as int,
- // writer: json['writer'] as String,
- // clubId: json['clubId'] as int,
- // title: json['title'] as String,
- // body: json['body'] as String,
- // isSticky: json['isSticky'] as bool,
- // );
- // }
-}
-
class Library {
String name;
List books;
@@ -70,7 +39,7 @@ class _MypageScreenState extends State
with SingleTickerProviderStateMixin {
late TabController _tabController;
- List books = [];
+ var books = [];
List libraries = [
Library(
@@ -124,12 +93,12 @@ class _MypageScreenState extends State
var id;
var token;
var isLogin;
+ var userInfo;
@override
void initState() {
super.initState();
_initUserState();
- // _initBookState();
_tabController = TabController(length: 2, vsync: this);
books.sort((a, b) => a.endDate.compareTo(b.endDate));
}
@@ -138,27 +107,18 @@ class _MypageScreenState extends State
final secureStorage =
Provider.of(context, listen: false);
token = await secureStorage.readData("token");
+ id = await secureStorage.readData("id");
print(token);
if (token == null) {
isLogin = false;
} else {
isLogin = true;
+ userInfo = await getUserInfo(id, token);
+ books = userInfo['contentList'];
+ print(books);
}
}
-// Future _initBookState() async {
-// final secureStorage =
-// Provider.of(context, listen: false);
-// id = await secureStorage.readData("id");
-// token = await secureStorage.readData("token");
-// Map userInfo = await getUserInfo(id, token);
-// if (userInfo.containsKey("contentList")) {
-// books = List.from(userInfo["contentList"].map((bookJson) => Book.fromJson(bookJson)));
-// } else {
-// books = []; // Handle case when "postList" is not present or is empty
-// }
-// }
-
@override
Widget build(BuildContext context) {
return ScreenUtilInit(
@@ -233,6 +193,10 @@ class LoggedWidget extends StatelessWidget {
children: [
Row(
children: [
+ Icon(
+ Icons.account_circle,
+ size: 70.w,
+ ),
SizedBox(width: 16.w),
Text(
name,
@@ -316,7 +280,7 @@ void signInWithGoogle(BuildContext context) async {
}
class BookReportWidget extends StatelessWidget {
- final List books;
+ final List books;
const BookReportWidget({super.key, required this.books});