Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REFACTOR] : add details of search screen and main, product screen #55

Merged
merged 7 commits into from
Oct 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/images/Question-3d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions lib/screens/main/main_screen.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'dart:async';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:dio/dio.dart';
import 'package:saphy/models/product.dart';
Expand Down Expand Up @@ -36,13 +37,13 @@ class _MainScreenState extends State<MainScreen> {
.toList();
return products;
} else {
throw Exception('No results found in the response');
return [];
}
} else {
throw Exception('Failed to load products');
// 로드 실패
return [];
}
} catch (e) {
print('Error: ${e.toString()}');
return [];
}
}
Expand Down Expand Up @@ -173,7 +174,7 @@ class _MainScreenState extends State<MainScreen> {
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
CupertinoPageRoute(
builder: (context) => ItemListPage(
name: category,
url: url,
Expand Down
72 changes: 41 additions & 31 deletions lib/screens/products/item_list_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ class _ItemListPageState extends State<ItemListPage> {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color(0xfff4f4f4),
appBar: TopAppBar(label: widget.name),
appBar: TopAppBar(
label: widget.name,
searchable: true,
),
body: CustomScrollView(
slivers: [
const SliverToBoxAdapter(
Expand Down Expand Up @@ -99,36 +102,43 @@ class _ItemListPageState extends State<ItemListPage> {
return SliverPadding(
padding: const EdgeInsets.only(bottom: 50, right: 20, left: 20, top: 10),
sliver: SliverToBoxAdapter(
child: Wrap(
direction: Axis.horizontal,
alignment: WrapAlignment.spaceBetween,
spacing: 15,
runSpacing: 15,
children: [
FutureBuilder(
future: _products,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(child: CircularProgressIndicator());
} else if (snapshot.hasError) {
return Text('Error: ${snapshot.error.toString()}');
} else if (!snapshot.hasData || snapshot.data!.isEmpty) {
return const Center(child: Text('상품이 없습니다'));
} else {
final products = snapshot.data!;
return Wrap(
direction: Axis.horizontal,
alignment: WrapAlignment.spaceBetween,
spacing: 15,
runSpacing: 15,
children: products
.map((product) => ProductCard(product: product))
.toList(),
);
}
},
)
],
child: FutureBuilder(
future: _products,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(child: CircularProgressIndicator());
} else if (snapshot.hasError) {
return Text('Error: ${snapshot.error.toString()}');
} else if (!snapshot.hasData || snapshot.data!.isEmpty) {
return Center(
child: Column(
children: [
Padding(
padding: const EdgeInsets.only(right: 10.0),
child: Image.asset(
'assets/images/Question-3d.png',
width: 180.0,
),
),
Text(
'상품이 없습니다',
style: textStyle(20, true, null),
),
],
));
} else {
final products = snapshot.data!;
return Wrap(
direction: Axis.horizontal,
alignment: WrapAlignment.spaceBetween,
spacing: 15,
runSpacing: 15,
children: products
.map((product) => ProductCard(product: product))
.toList(),
);
}
},
),
),
);
Expand Down
132 changes: 95 additions & 37 deletions lib/screens/products/liked_list_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
// import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:intl/intl.dart';
import 'package:path/path.dart';
import 'package:saphy/models/product.dart';
import 'package:saphy/service/api_service.dart';
import 'package:saphy/service/authentication/secure_storage.dart';
import 'package:saphy/utils/textstyles.dart';
import 'package:saphy/widgets/product_card.dart';
import 'package:saphy/utils/colors.dart';
import 'package:saphy/widgets/app_bar.dart';
Expand All @@ -21,13 +23,13 @@ class _LikedListPageState extends State<LikedListPage> {
late Future<List<Product>> _products;
int cnt = 0;

Future<List<Product>> getProducts() async {
Future<List<Product>> getProducts(String url) async {
String token = await readJwt();
token = token.toString().split(" ")[2];

try {
final response = await APIService.instance.request(
'https://saphy.site/item-wishes?type=ALL',
'https://saphy.site/item-wishes?type=$url',
DioMethod.get,
contentType: 'application/json',
token: "Bearer $token",
Expand All @@ -54,12 +56,12 @@ class _LikedListPageState extends State<LikedListPage> {
@override
void initState() {
super.initState();
_products = getProducts();
countProducts();
_products = getProducts("ALL");
countProducts("ALL");
}

Future<void> countProducts() async {
List<Product> products = await getProducts();
Future<void> countProducts(String url) async {
List<Product> products = await getProducts(url);
setState(() {
cnt = products.length;
});
Expand All @@ -69,7 +71,10 @@ class _LikedListPageState extends State<LikedListPage> {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color(0xfff4f4f4),
appBar: const TopAppBar(label: "찜 목록"),
appBar: const TopAppBar(
label: "찜 목록",
searchable: true,
),
body: CustomScrollView(
slivers: [
SliverPadding(
Expand All @@ -82,26 +87,39 @@ class _LikedListPageState extends State<LikedListPage> {
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
buildFilterButton("전체"),
const SizedBox(width: 10),
buildFilterButton("스마트폰"),
const SizedBox(width: 10),
buildFilterButton("스마트폰"),
const SizedBox(width: 10),
buildFilterButton("스마트폰"),
const SizedBox(width: 10),
buildFilterButton("스마트폰"),
const SizedBox(width: 10),
buildFilterButton("스마트폰"),
const SizedBox(width: 10),
buildFilterButton("전체", "ALL"),
const SizedBox(
width: 10,
),
buildFilterButton("스마트폰", "PHONE"),
const SizedBox(
width: 10,
),
buildFilterButton("태블릿", "TABLET"),
const SizedBox(
width: 10,
),
buildFilterButton("노트북", "LAPTOP"),
const SizedBox(
width: 10,
),
buildFilterButton("음향기기", "headphone-3d"),
const SizedBox(
width: 10,
),
buildFilterButton("웨어러블", "wearable-3d"),
],
),
),
),
),
),
const SliverToBoxAdapter(
child: SizedBox(height: 10),
),
_buildSorter(),
SliverPadding(
padding: const EdgeInsets.all(20),
padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20),
sliver: SliverToBoxAdapter(
child: Wrap(
direction: Axis.horizontal,
Expand All @@ -117,7 +135,22 @@ class _LikedListPageState extends State<LikedListPage> {
} else if (snapshot.hasError) {
return Text('Error: ${snapshot.error.toString()}');
} else if (!snapshot.hasData || snapshot.data!.isEmpty) {
return const Center(child: Text('상품이 없습니다'));
return Center(
child: Column(
children: [
Padding(
padding: const EdgeInsets.only(right: 10.0),
child: Image.asset(
'assets/images/Question-3d.png',
width: 180.0,
),
),
Text(
'상품이 없습니다',
style: textStyle(20, true, null),
),
],
));
} else {
final products = snapshot.data!;
return Wrap(
Expand All @@ -141,23 +174,48 @@ class _LikedListPageState extends State<LikedListPage> {
);
}

Container buildFilterButton(String label) {
return Container(
height: 45,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20),
border: Border.all(color: gray300, width: 1),
color: white,
SliverPadding _buildSorter() {
return SliverPadding(
padding: const EdgeInsets.symmetric(horizontal: 30),
sliver: SliverToBoxAdapter(
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'상품 $cnt',
style: subTitleText(),
),
IconButton(
icon: const Icon(Icons.sort_outlined),
onPressed: () {},
),
],
),
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 13.0, vertical: 8),
child: Center(
child: Text(
label,
style: const TextStyle(
fontFamily: "Pretendard",
fontSize: 15,
fontWeight: FontWeight.bold),
);
}

InkWell buildFilterButton(String label, String url) {
return InkWell(
onTap: () {
setState(() {
// URL에 따라 제품을 다시 가져오고, 상태를 업데이트합니다.
_products = getProducts(url);
countProducts(url); // 필터에 맞는 제품 개수를 카운트합니다.
});
},
child: Container(
height: 45,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20),
border: Border.all(color: gray300, width: 1),
color: white,
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 13.0, vertical: 8),
child: Center(
child: Text(label, style: textStyle(15, false, null)),
),
),
),
Expand Down
5 changes: 3 additions & 2 deletions lib/screens/products/product_detail_page.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/widgets.dart';
Expand Down Expand Up @@ -318,9 +319,9 @@ class _ProductDetailState extends State<ProductDetail> {
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
CupertinoPageRoute(
builder: (context) => PurchasePage(
product: widget.product,
product: productDetail!,
)),
);
},
Expand Down
11 changes: 6 additions & 5 deletions lib/screens/purchase/purchase_page.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:saphy/screens/purchase/purchase_process_page.dart';
import 'package:saphy/utils/colors.dart';
Expand Down Expand Up @@ -103,21 +104,21 @@ class _PurchaseFooterState extends State<PurchaseFooter> {
),
),
const Divider(
color: black,
color: gray800,
thickness: 1,
indent: 5,
endIndent: 5,
),
const SizedBox(height: 10),
NormalButton(
title: "구매하기",
bgColor: white,
txtColor: black,
bgColor: black,
txtColor: white,
onTap: _isAgreed
? () {
Navigator.push(
context,
MaterialPageRoute(
CupertinoPageRoute(
builder: (context) => PurchaseProcessPage(
product: widget.product, // widget.product 사용
),
Expand Down Expand Up @@ -169,7 +170,7 @@ class PurchaseHeader extends StatelessWidget {
),
const SizedBox(height: 10),
const Divider(
color: black,
color: gray800,
thickness: 1,
indent: 40,
endIndent: 40,
Expand Down
Loading