diff --git a/myapp/.flutter-plugins-dependencies b/myapp/.flutter-plugins-dependencies index aa5e037..458d077 100644 --- a/myapp/.flutter-plugins-dependencies +++ b/myapp/.flutter-plugins-dependencies @@ -1,5 +1 @@ -<<<<<<< HEAD -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_android-2.2.15/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false}],"web":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2025-07-01 13:27:30.031751","version":"3.32.5","swift_package_manager_enabled":{"ios":false,"macos":false}} -======= -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_android-2.2.15/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false}],"web":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2025-06-22 07:08:45.354337","version":"3.32.1","swift_package_manager_enabled":{"ios":false,"macos":false}} ->>>>>>> refs/remotes/origin/main +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_android-2.2.15/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/home/codespace/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false}],"web":[{"name":"connectivity_plus","path":"/home/codespace/.pub-cache/hosted/pub.dev/connectivity_plus-3.0.6/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2025-07-03 12:54:47.528311","version":"3.32.5","swift_package_manager_enabled":{"ios":false,"macos":false}} \ No newline at end of file diff --git a/myapp/lib/component/graphql_client.dart b/myapp/lib/component/graphql_client.dart index 6b03f55..9b8ce17 100644 --- a/myapp/lib/component/graphql_client.dart +++ b/myapp/lib/component/graphql_client.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; class GraphQLService { static ValueNotifier? _client; static const String _baseUrl = - "https://cuddly-eureka-v77v7pr94qg36xrx-4000.app.github.dev/"; + "https://humble-zebra-jww5wr76jr53jg4w-4000.app.github.dev/"; /// Get or initialize GraphQL client static ValueNotifier getClient() { if (_client == null) { diff --git a/myapp/lib/component/search.dart b/myapp/lib/component/search.dart index 033dc7b..70149da 100644 --- a/myapp/lib/component/search.dart +++ b/myapp/lib/component/search.dart @@ -84,7 +84,7 @@ class _BookSearchContentState extends State { return Scaffold( appBar: _buildAppBar(), - backgroundColor: Color(0xFF80471C), + backgroundColor: Color(0xFF726953), body: Padding( padding: EdgeInsets.all(16.0), child: Column( @@ -131,7 +131,7 @@ class _BookSearchContentState extends State { height: 48, margin: EdgeInsets.only(right: 8), decoration: BoxDecoration( - color: Color(0xFFE5D8BE), + color: Color(0xFFF0ECB2), borderRadius: BorderRadius.circular(30), ), padding: EdgeInsets.symmetric(horizontal: 12), @@ -168,7 +168,7 @@ class _BookSearchContentState extends State { style: GoogleFonts.jua(fontSize: 16, color: Colors.black), decoration: InputDecoration( filled: true, - fillColor: Color(0xFFE5D8BE), + fillColor: Color(0xFFF0ECB2), hintText: '원하시는 책을 검색해보세요', border: OutlineInputBorder( borderRadius: BorderRadius.circular(30), @@ -239,7 +239,7 @@ class _BookSearchContentState extends State { ); }, child: Card( - color: Color(0xFF80471C), + color: Color(0xFF726953), margin: EdgeInsets.symmetric(vertical: 4), elevation: 0, shape: RoundedRectangleBorder( diff --git a/myapp/lib/content/bookmark.dart b/myapp/lib/content/bookmark.dart index b3423e3..62e2b07 100644 --- a/myapp/lib/content/bookmark.dart +++ b/myapp/lib/content/bookmark.dart @@ -49,7 +49,7 @@ class _BookmarkContentState extends State { client: client, child: Scaffold( appBar: _buildAppBar(), - backgroundColor: Color(0xFF80471C), + backgroundColor: Color(0xFF726953), body: Padding( padding: EdgeInsets.all(16.0), child: Column( @@ -97,7 +97,7 @@ class _BookmarkContentState extends State { } Widget _buildBookCard(dynamic book, BuildContext context) { - String bookId = book['isbn']; + String bookId = book['isbn13']; return Consumer( builder: (context, bookmarksProvider, child) { @@ -123,7 +123,7 @@ class _BookmarkContentState extends State { ); }, child: Card( - color: Color(0xFF80471C), + color: Color(0xFF726953), margin: EdgeInsets.symmetric(vertical: 4), elevation: 0, shape: RoundedRectangleBorder( @@ -182,13 +182,13 @@ class _BookmarkContentState extends State { PreferredSizeWidget _buildAppBar() { return AppBar( - backgroundColor: Color(0xFF80471C), + backgroundColor: Color(0xFF726953), centerTitle: true, title: Container( width: MediaQuery.of(context).size.width * 0.85, padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), decoration: BoxDecoration( - color: const Color(0xFFE5D8BE), + color: const Color(0xFFF0ECB2), borderRadius: BorderRadius.circular(8), ), child: Text( diff --git a/myapp/lib/content/home.dart b/myapp/lib/content/home.dart index e5e3f81..2c381c5 100644 --- a/myapp/lib/content/home.dart +++ b/myapp/lib/content/home.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import '../component/feedview.dart'; -import 'dart:ui'; class HomeContent extends StatelessWidget { HomeContent({super.key}); @@ -10,38 +9,39 @@ class HomeContent extends StatelessWidget { @override Widget build(BuildContext context) { - return _buildPageView(); + return _buildPageView(context); } - Widget _buildPageView() { + Widget _buildPageView(BuildContext context) { return PageView( scrollDirection: Axis.vertical, controller: pageController, physics: const BouncingScrollPhysics(), children: [ - _buildMainPage(), + _buildMainPage(context), const FeedView(), ], ); } - Widget _buildMainPage() { + Widget _buildMainPage(BuildContext context) { return Scaffold( extendBodyBehindAppBar: true, appBar: _buildAppBar(), - backgroundColor: const Color(0xFF9AD9B8), - body: _buildMainBody(), + backgroundColor: const Color(0xFFFFFFFF), + body: _buildMainBody(context), ); } + PreferredSizeWidget _buildAppBar() { return AppBar( toolbarHeight: 75, - elevation: 0, - backgroundColor: Colors.transparent, + elevation: 0, + backgroundColor: Colors.transparent, flexibleSpace: Container( decoration: BoxDecoration( - color: const Color(0xFF9AD9B8), + color: const Color(0xFFFFFAE3), boxShadow: [ BoxShadow( color: Colors.black.withOpacity(0.1), @@ -59,7 +59,7 @@ class HomeContent extends StatelessWidget { width: MediaQuery.of(context).size.width * 0.85, padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), decoration: BoxDecoration( - color: const Color(0xFFE5D8BE), + color: const Color(0xFFFFFFFF), borderRadius: BorderRadius.circular(8), ), child: Text( @@ -76,36 +76,16 @@ class HomeContent extends StatelessWidget { ); } - - Widget _buildAppBarTitle(BuildContext context) { - return Container( - width: MediaQuery.of(context).size.width * 0.85, - padding: const EdgeInsets.symmetric(horizontal: 30, vertical: 8), - decoration: BoxDecoration( - color: const Color(0xFFE5D8BE), - borderRadius: BorderRadius.circular(8), - ), - child: Text( - '전투모의지원중대', - style: GoogleFonts.inter( - fontSize: 18, - color: Colors.black, - ), - textAlign: TextAlign.center, - ), - ); - } - -Widget _buildMainBody() { + Widget _buildMainBody(BuildContext context) { return Column( children: [ Spacer(flex: 2), Expanded( flex: 5, - child: _buildBookStack(), + child: _buildBookStack(context), ), Expanded( - flex: 3, + flex: 3, child: Center( child: _buildBottomSection(), ), @@ -114,51 +94,80 @@ Widget _buildMainBody() { ); } -Widget _buildBookStack() { - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Stack( - alignment: Alignment.center, - children: [ - Image.asset( - 'assets/images/book.png', - fit: BoxFit.contain, - width: 250, - height: 320, - ), - Positioned( - top: 20, - child: Text( - '오늘의 책을 \n 추천해드립니다', - style: GoogleFonts.nanumBrushScript( - fontSize: 40, - color: Colors.black, + +Widget _buildBookStack(BuildContext context) { + final screenWidth = MediaQuery.of(context).size.width; + return Container( + width: screenWidth * 0.8, // 화면 너비의 90% (좌우에 약간 여백) + decoration: BoxDecoration( + color: const Color(0xFFF7F2AF), + borderRadius: BorderRadius.circular(16), + border: Border.all( + color: Colors.black.withOpacity(0.1), + width: 1, + ), + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.1), + blurRadius: 8, + offset: Offset(0, 4), + ) + ], + ), + padding: const EdgeInsets.all(16), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Stack( + alignment: Alignment.center, + children: [ + Image.asset( + 'assets/images/book.png', + fit: BoxFit.contain, + width: 275, + height: 335, + ), + Positioned( + top: 75, + child: Text( + '오늘의 책을 \n 추천해드립니다', + style: GoogleFonts.nanumBrushScript( + fontSize: 50, + color: Colors.black, + ), + textAlign: TextAlign.center, ), - textAlign: TextAlign.center, ), + ], + ), + const SizedBox(height: 25), + Text( + '마음이 따뜻해지는 한 권을 만나보세요.', + style: GoogleFonts.nanumBrushScript( + fontSize: 20, + color: Colors.black87, ), - ], - ), - const SizedBox(height: 12), - Text( - '마음이 따뜻해지는 한 권을 만나보세요.', - style: GoogleFonts.nanumBrushScript( - fontSize: 20, - color: Colors.black87, + textAlign: TextAlign.center, ), - textAlign: TextAlign.center, - ), - ], - ); -} + ], + ), + );} + + Widget _buildBottomSection() { return Container( padding: const EdgeInsets.symmetric(vertical: 24, horizontal: 16), decoration: BoxDecoration( - color: Colors.white.withOpacity(0.5), + color: const Color(0xFFFFFAE3), borderRadius: BorderRadius.circular(12), + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.1), + blurRadius: 6, + offset: Offset(0, 3), + ) + ], ), margin: const EdgeInsets.symmetric(horizontal: 32), child: Column( @@ -168,14 +177,14 @@ Widget _buildBookStack() { '유저들이 읽은 책들을\n찾아보세요!', style: GoogleFonts.nanumBrushScript( fontSize: 20, - color: const Color(0xFF5F6368).withOpacity(0.8), + color: const Color(0xFF000000).withOpacity(0.8), ), textAlign: TextAlign.center, ), Icon( Icons.keyboard_double_arrow_down, size: 32, - color: const Color(0xFF5F6368).withOpacity(0.8), + color: const Color(0xFF000000).withOpacity(0.8), ), ], ), diff --git a/myapp/lib/main.dart b/myapp/lib/main.dart index dd5ba1d..9f9c5b5 100644 --- a/myapp/lib/main.dart +++ b/myapp/lib/main.dart @@ -81,7 +81,7 @@ class _MainApp extends State { onChange: _handleNavigationChange, style: FluidNavBarStyle( iconUnselectedForegroundColor: Colors.white, - barBackgroundColor: Color(0xFFE5D8BE), + barBackgroundColor: Color(0xFFFFFAE3), ), scaleFactor: 1.5, defaultIndex: 0,