From 137121992abf7562325f4687e1a190e151cc9f0c Mon Sep 17 00:00:00 2001
From: Matthew Patrick <Matthew.535200018@stu.untar.ac.id>
Date: Tue, 26 Apr 2022 15:40:52 +0700
Subject: [PATCH 1/3] login_form - Fixed Fields Label
---
lib/components/login_form.dart | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/components/login_form.dart b/lib/components/login_form.dart
index 6bb8475..64170d5 100644
--- a/lib/components/login_form.dart
+++ b/lib/components/login_form.dart
@@ -68,8 +68,8 @@ class LoginFormState extends State<LoginForm> {
minWidth: double.infinity,
height: 35,
onPressed: () async {
- if (_formKey.currentState!
- .fields["Email Address"]!.value ==
+ if (_formKey.currentState!.fields["Email"]!
+ .value ==
'' ||
_formKey.currentState!.fields["Password"]!
.value ==
@@ -77,8 +77,8 @@ class LoginFormState extends State<LoginForm> {
showAlertDialog(context);
} else {
var statusCode = await loginPost(
- email: _formKey.currentState!
- .fields["Email Address"]!.value,
+ email: _formKey
+ .currentState!.fields["Email"]!.value,
password: _formKey.currentState!
.fields["Password"]!.value);
From ea6c0ddc5be3de428bc247a4f98c00f72ff3fe46 Mon Sep 17 00:00:00 2001
From: Moe <moe@chocola.dev>
Date: Tue, 26 Apr 2022 16:13:40 +0700
Subject: [PATCH 2/3] Add cart page to menu
---
lib/components/menu.dart | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/components/menu.dart b/lib/components/menu.dart
index 4d74b63..b4de2b9 100644
--- a/lib/components/menu.dart
+++ b/lib/components/menu.dart
@@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
-import 'package:nekoya_flutter/screens/login.dart';
import 'dart:math' as math;
import 'package:nekoya_flutter/screens/products.dart';
import 'package:nekoya_flutter/screens/register.dart';
import 'package:nekoya_flutter/screens/checkout.dart';
+import 'package:nekoya_flutter/screens/cart.dart';
+import 'package:nekoya_flutter/screens/login.dart';
class Menu extends StatefulWidget {
const Menu({Key? key}) : super(key: key);
@@ -48,11 +49,11 @@ class _MenuState extends State<Menu> {
if (index == 0) {
_selectedWidget = const Login();
} else if (index == 1) {
- _selectedWidget = const Products();
+ _selectedWidget = const Checkout();
} else if (index == 2) {
_selectedWidget = const Products();
} else if (index == 3) {
- _selectedWidget = const Checkout();
+ _selectedWidget = const Cart();
} else if (index == 4) {
_selectedWidget = const Register();
}
From 620e01fe7abd27cb77fbd0cb8586a12722911a08 Mon Sep 17 00:00:00 2001
From: Moe <moe@chocola.dev>
Date: Tue, 26 Apr 2022 16:13:57 +0700
Subject: [PATCH 3/3] [WIP] Cart Page
---
lib/components/cart_box.dart | 104 +++++++++++++++++++++++++++++++++++
lib/screens/cart.dart | 78 ++++++++++++++++++++++++++
2 files changed, 182 insertions(+)
create mode 100644 lib/components/cart_box.dart
create mode 100644 lib/screens/cart.dart
diff --git a/lib/components/cart_box.dart b/lib/components/cart_box.dart
new file mode 100644
index 0000000..9d423dc
--- /dev/null
+++ b/lib/components/cart_box.dart
@@ -0,0 +1,104 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+
+class CartBox extends StatefulWidget {
+ const CartBox({Key? key, required this.imageUrl, required this.title, required this.quantity, required this.plus, required this.minus, required this.remove}) : super(key: key);
+
+ final String imageUrl;
+ final String title;
+ final int quantity;
+ final Function() plus;
+ final Function() minus;
+ final Function() remove;
+
+ @override
+ State<CartBox> createState() => _CartBoxState();
+}
+
+class _CartBoxState extends State<CartBox> {
+
+ @override
+ Widget build(BuildContext context) {
+ var currentQuantity = widget.quantity;
+
+ return Container(
+ margin: const EdgeInsets.all(8.0),
+ child: Card(
+ color: const Color(0xff212226),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(10),
+ ),
+ child: Row(
+ children: [
+ Flexible(
+ flex: 2,
+ child: CachedNetworkImage(
+ imageUrl: widget.imageUrl,
+ placeholder: (context, url) =>
+ const CircularProgressIndicator(
+ color: Color(0xff8B0000),
+ ),
+ errorWidget: (context, url, error) =>
+ Image.asset('assets/image-error.webp'),
+ fadeOutDuration: const Duration(milliseconds: 5),
+ imageBuilder: (context, imageProvider) => Container(
+ width: 300,
+ height: 150,
+ decoration: BoxDecoration(
+ image: DecorationImage(
+ image: imageProvider, fit: BoxFit.cover)),
+ ),
+ ),
+ ),
+ Flexible(
+ flex: 3,
+ child: Column(
+ children: [
+ Container(
+ margin: const EdgeInsets.only(left: 10.0, right: 10.0),
+ child: Text(
+ widget.title,
+ style: const TextStyle(
+ fontSize: 18,
+ color: Colors.white,
+ fontWeight: FontWeight.w600),
+ textAlign: TextAlign.start,
+ ),
+ ),
+ const SizedBox(height: 10,),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.spaceAround,
+ children: [
+ ElevatedButton(
+ onPressed: (){
+ currentQuantity++;
+ widget.plus();
+ setState(() {});
+ },
+ child: const Text("+")
+ ),
+ Text(currentQuantity.toString(),
+ style: const TextStyle(
+ fontSize: 15,
+ color: Colors.white,
+ fontWeight: FontWeight.w400)
+ ),
+ ElevatedButton(
+ onPressed: (){
+ currentQuantity--;
+ widget.minus();
+ setState(() {});
+ },
+ child: const Text("-")
+ )
+ ],
+ )
+ ],
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+}
\ No newline at end of file
diff --git a/lib/screens/cart.dart b/lib/screens/cart.dart
new file mode 100644
index 0000000..55c749d
--- /dev/null
+++ b/lib/screens/cart.dart
@@ -0,0 +1,78 @@
+import 'package:flutter/material.dart';
+
+import 'package:nekoya_flutter/api/api.dart';
+import 'package:nekoya_flutter/components/cart_box.dart';
+import 'package:nekoya_flutter/data/cart.dart';
+
+class Cart extends StatefulWidget {
+ const Cart({Key? key}) : super(key: key);
+
+ @override
+ State<Cart> createState() => _CartState();
+}
+
+class _CartState extends State<Cart> {
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ backgroundColor: const Color(0xff1b1c1e),
+ appBar: AppBar(
+ title: const Text('Cart'),
+ centerTitle: true,
+ backgroundColor: const Color(0xff212226),
+ ),
+ body: FutureBuilder<dynamic>(
+ future: viewCart(),
+ builder: (context, snapshot) {
+ if (snapshot.hasData) {
+ var data = snapshot.data;
+ return ListView.builder(
+ itemCount: data!.length,
+ itemBuilder: (context, index) {
+ return FutureBuilder<dynamic>(
+ future: getProduct(data[index]["product_id"]),
+ builder: (context, snapshotx) {
+ if (snapshot.hasData) {
+ var productData = snapshotx.data;
+ if (productData != null) {
+ return CartBox(
+ imageUrl: 'https://nekoya.moe.team/img/' + productData[0]['IMAGE'],
+ title: productData[0]['TITLE'],
+ quantity: data[index]["quantity"],
+ plus: () {
+ addToCart(data[index]["product_id"]);
+ },
+ minus: () {
+ removeFromCart(data[index]["product_id"], false);
+ },
+ remove: () {
+ removeFromCart(data[index]["product_id"], true);
+ }
+ );
+ }
+ }
+
+ return CartBox(
+ imageUrl: 'https://i.ibb.co/QJFLZC4/La-Darknesss-Portrait.webp',
+ title: 'Loading...',
+ quantity: 0,
+ plus: () {},
+ minus: () {},
+ remove: () {},
+ );
+ }
+ );
+ },
+ );
+ }
+
+ return const Center(
+ child: CircularProgressIndicator(
+ color: Color(0xff8B0000),
+ ),
+ );
+ }
+ )
+ );
+ }
+}
\ No newline at end of file