sfja/h4-projekt-gruppe-0-sm
1
0
Fork 0
mirror of https://github.com/Mercantec-GHC/h4-projekt-gruppe-0-sm.git synced 2025-04-27 16:24:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

use product repo by server

Browse Source
This commit is contained in:
Mikkel Troels Kongsted 2025-03-06 08:28:53 +01:00
parent 2ce894d756
commit 850391045e
13 changed files with 116 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/app/src/main/AndroidManifest.xml
View File

@ -43,4 +43,5 @@
</intent>
</queries>
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.INTERNET"/>
</manifest>

2
mobile/lib/main.dart
View File

@ -23,7 +23,7 @@ class MyApp extends StatelessWidget {
return MultiProvider(
providers: [
ChangeNotifierProvider(create: (_) => Routing()),
ChangeNotifierProvider(create: (_) => ProductRepoByMemory()),
ChangeNotifierProvider(create: (_) => ProductRepo()),
ChangeNotifierProvider(create: (_) => CartRepo()),
ChangeNotifierProvider(create: (_) => ReceiptRepo()),
ChangeNotifierProvider(create: (_) => PayingStateRepo()),

12
mobile/lib/models/product.dart
View File

@ -4,16 +4,24 @@ class Product {
final int id;
final String name;
final String description;
final int priceInDkkCent;
final int priceInDkkCents;
final Coordinate? location;
final String? barcode;
Product({
required this.id,
required this.name,
required this.priceInDkkCent,
required this.priceInDkkCents,
required this.description,
this.location,
this.barcode,
});
Product.fromJson(Map<String, dynamic> json)
: id = json["id"],
name = json["name"],
description = json["description"],
priceInDkkCents = json["priceInDkkCents"],
location = null,
barcode = null;
}

7
mobile/lib/pages/all_products_page.dart
View File

@ -99,7 +99,7 @@ class AllProductsPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final productRepo = Provider.of<ProductRepoByMemory>(context);
final productRepo = Provider.of<ProductRepo>(context);
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
@ -122,15 +122,14 @@ class AllProductsPage extends StatelessWidget {
],
),
Expanded(
child:
Consumer<ProductRepoByMemory>(builder: (_, productRepo, __) {
child: Consumer<ProductRepo>(builder: (_, productRepo, __) {
final products = productRepo.filteredProducts;
return ListView.builder(
shrinkWrap: true,
itemBuilder: (_, idx) => ProductListItem(
productId: products[idx].id,
name: products[idx].name,
price: products[idx].priceInDkkCent,
price: products[idx].priceInDkkCents,
productPage: ProductPage(product: products[idx]),
product: products[idx],
),

11
mobile/lib/pages/cart_page.dart
View File

@ -162,7 +162,7 @@ class CartPage extends StatelessWidget {
cartRepo: cartRepo,
productId: cart[idx].product.id,
name: cart[idx].product.name,
price: cart[idx].product.priceInDkkCent,
price: cart[idx].product.priceInDkkCents,
amount: cart[idx].amount),
itemCount: cart.length,
);
@ -205,9 +205,8 @@ class CartPage extends StatelessWidget {
child: const Text("Cancel")),
TextButton(
onPressed: () {
final ProductRepoByMemory
productRepo = context.read<
ProductRepoByMemory>();
final productRepo =
context.read<ProductRepo>();
final CartRepo cartRepo =
context.read<CartRepo>();
final productResult =
@ -271,8 +270,8 @@ class CartPage extends StatelessWidget {
}
final CartRepo cartRepo =
context.read<CartRepo>();
final ProductRepoByMemory productRepo =
context.read<ProductRepoByMemory>();
final productRepo =
context.read<ProductRepo>();
final productResult = productRepo
.productWithBarcode(result.rawContent);
switch (productResult) {

2
mobile/lib/pages/finish_shopping_page.dart
View File

@ -36,7 +36,7 @@ class FinishShoppingPage extends StatelessWidget {
child: ListView.builder(
shrinkWrap: true,
itemBuilder: (_, idx) => ReceiptItemView(
pricePerAmount: cart[idx].product.priceInDkkCent,
pricePerAmount: cart[idx].product.priceInDkkCents,
name: cart[idx].product.name,
amount: cart[idx].amount),
itemCount: cart.length)),

4
mobile/lib/pages/product_page.dart
View File

@ -39,7 +39,7 @@ class ProductPage extends StatelessWidget {
),
),
Text(
formatDkkCents(product.priceInDkkCent),
formatDkkCents(product.priceInDkkCents),
style: const TextStyle(
fontSize: 16,
),
@ -67,7 +67,7 @@ class ProductPage extends StatelessWidget {
style: Theme.of(context).textTheme.bodyLarge,
),
Text(
formatDkkCents(product.priceInDkkCent),
formatDkkCents(product.priceInDkkCents),
style: Theme.of(context).textTheme.bodyLarge,
),
Padding(

2
mobile/lib/pages/receipt_page.dart
View File

@ -29,7 +29,7 @@ class ReceiptView extends StatelessWidget {
shrinkWrap: true,
itemBuilder: (_, idx) => ReceiptItemView(
pricePerAmount:
receiptItems[idx].product.priceInDkkCent,
receiptItems[idx].product.priceInDkkCents,
name: receiptItems[idx].product.name,
amount: receiptItems[idx].amount),
itemCount: receiptItems.length),

8
mobile/lib/repos/cart.dart
View File

@ -9,14 +9,14 @@ class CartRepo extends ChangeNotifier {
product: Product(
id: 1,
name: "Letmælk",
priceInDkkCent: 1295,
priceInDkkCents: 1295,
description: "Konventionel letmælk med fedtprocent på 1,5%"),
amount: 1),
CartItem(
product: Product(
id: 2,
name: "Frilands Øko Supermælk",
priceInDkkCent: 1995,
priceInDkkCents: 1995,
description:
"Økologisk mælk af frilandskøer med fedtprocent på 3,5%. Ikke homogeniseret eller pasteuriseret. Skaber store muskler og styrker knoglerne 💪"),
amount: 6),
@ -24,7 +24,7 @@ class CartRepo extends ChangeNotifier {
product: Product(
id: 3,
name: "Minimælk",
priceInDkkCent: 1195,
priceInDkkCents: 1195,
description: "Konventionel minimælk med fedtprocent på 0,4%"),
amount: 1),
];
@ -98,7 +98,7 @@ class CartRepo extends ChangeNotifier {
return cart.fold<int>(
0,
(prev, cartItem) =>
prev + cartItem.amount * cartItem.product.priceInDkkCent);
prev + cartItem.amount * cartItem.product.priceInDkkCents);
}
void clearCart() {

114
mobile/lib/repos/product.dart
View File

@ -1,38 +1,39 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:mobile/models/coordinate.dart';
import 'package:mobile/models/product.dart';
import 'package:mobile/results.dart';
class ProductRepoByMemory extends ChangeNotifier {
class ProductRepo extends ChangeNotifier {
int _nextId = 0;
List<Product> products = [];
late List<Product> filteredProducts;
ProductRepoByMemory() {
String query = "";
ProductRepo() {
_addAllProducts();
filteredProducts = products;
}
int getNextId() {
return _nextId++;
}
List<Product> allProducts() {
return products;
get filteredProducts {
if (query.trim().isEmpty) {
return products;
}
return products.where((product) {
final nameLower = product.name.toLowerCase();
final descriptionLower = product.description.toLowerCase();
final searchLower = query.toLowerCase();
return nameLower.contains(searchLower) ||
descriptionLower.contains(searchLower);
}).toList();
}
void searchProducts(String query) {
if (query.trim().isEmpty) {
filteredProducts = products;
} else {
filteredProducts = products.where((product) {
final nameLower = product.name.toLowerCase();
final descriptionLower = product.description.toLowerCase();
final searchLower = query.toLowerCase();
return nameLower.contains(searchLower) ||
descriptionLower.contains(searchLower);
}).toList();
}
this.query = query;
notifyListeners();
}
@ -50,78 +51,125 @@ class ProductRepoByMemory extends ChangeNotifier {
Product(
id: _nextId++,
name: "Minimælk",
priceInDkkCent: 1200,
priceInDkkCents: 1200,
description: "Konventionel minimælk med fedtprocent på 0,4%"),
Product(
id: _nextId++,
name: "Letmælk",
priceInDkkCent: 1300,
priceInDkkCents: 1300,
description: "Konventionel letmælk med fedtprocent på 1,5%",
location: Coordinate(x: 1800, y: 100)),
Product(
id: _nextId++,
name: "Frilands Øko Supermælk",
priceInDkkCent: 2000,
priceInDkkCents: 2000,
description:
"Økologisk mælk af frilandskøer med fedtprocent på 3,5%. Ikke homogeniseret eller pasteuriseret. Skaber store muskler og styrker knoglerne 💪"),
Product(
id: _nextId++,
name: "Øko Gulerødder 1 kg",
priceInDkkCent: 1000,
priceInDkkCents: 1000,
description: ""),
Product(
id: _nextId++,
name: "Øko Agurk",
priceInDkkCent: 1000,
priceInDkkCents: 1000,
description: ""),
Product(
id: _nextId++,
name: "Æbler 1 kg",
priceInDkkCent: 1000,
priceInDkkCents: 1000,
description: ""),
Product(
id: _nextId++,
name: "Basmati Ris",
priceInDkkCent: 2000,
priceInDkkCents: 2000,
description: ""),
Product(
id: _nextId++,
name: "Haribo Mix",
priceInDkkCent: 3000,
priceInDkkCents: 3000,
description: ""),
Product(
id: _nextId++, name: "Smør", priceInDkkCent: 3000, description: ""),
id: _nextId++, name: "Smør", priceInDkkCents: 3000, description: ""),
Product(
id: _nextId++,
name: "Harboe Cola",
priceInDkkCent: 500,
priceInDkkCents: 500,
description: ""),
Product(
id: _nextId++,
name: "Monster Energi Drik",
priceInDkkCent: 2000,
priceInDkkCents: 2000,
description: ""),
Product(
id: _nextId++,
name: "Spaghetti",
priceInDkkCent: 1000,
priceInDkkCents: 1000,
description: ""),
Product(
id: _nextId++,
name: "Rød Cecil",
priceInDkkCent: 6000,
priceInDkkCents: 6000,
description: ""),
Product(
id: _nextId++,
name: "Jägermeister 750 ml",
priceInDkkCent: 12000,
priceInDkkCents: 12000,
description: ""),
Product(
id: _nextId++,
barcode: "5711953068881",
name: "Protein Chokoladedrik",
priceInDkkCent: 1500,
priceInDkkCents: 1500,
description: "Arla's protein chokolade drik der giver store muskler"),
];
}
}
class ProductRepoByServer extends ChangeNotifier {
String apiUrl = "http://127.0.0.1:8080/products.json";
List<Product> products = [];
String query = "";
ProductRepoByServer() {
fetchProductsFromServer();
}
Future<void> fetchProductsFromServer() async {
final res = await http.get(
Uri.parse(apiUrl),
);
final productsJson = List<Map<String, dynamic>>.from(jsonDecode(res.body));
products =
productsJson.map(((product) => Product.fromJson(product))).toList();
notifyListeners();
}
get filteredProducts {
if (query.trim().isEmpty) {
return products;
}
return products.where((product) {
final nameLower = product.name.toLowerCase();
final descriptionLower = product.description.toLowerCase();
final searchLower = query.toLowerCase();
return nameLower.contains(searchLower) ||
descriptionLower.contains(searchLower);
}).toList();
}
void searchProducts(String query) {
this.query = query;
notifyListeners();
}
Result<Product, String> productWithBarcode(String barcode) {
for (var i = 0; i < products.length; i++) {
if (products[i].barcode == barcode) {
return Ok(products[i]);
}
}
return Err("Product with barcode $barcode doesn't exist");
}
}

10
mobile/lib/repos/receipt.dart
View File

@ -13,14 +13,14 @@ class ReceiptRepo extends ChangeNotifier {
product: Product(
id: 1243,
name: "Letmælk",
priceInDkkCent: 13,
priceInDkkCents: 13,
description: "Konventionel minimælk med fedtprocent på 0,4%"),
amount: 1),
ReceiptItem(
product: Product(
id: 340,
name: "Minimælk",
priceInDkkCent: 12,
priceInDkkCents: 12,
description: "Konventionel minimælk med fedtprocent på 0,4%"),
amount: 3),
]),
@ -32,14 +32,14 @@ class ReceiptRepo extends ChangeNotifier {
product: Product(
id: 12341,
name: "Letmælk",
priceInDkkCent: 13,
priceInDkkCents: 13,
description: "Konventionel minimælk med fedtprocent på 0,4%"),
amount: 3),
ReceiptItem(
product: Product(
id: 1234443,
name: "Minimælk",
priceInDkkCent: 12,
priceInDkkCents: 12,
description: "Konventionel minimælk med fedtprocent på 0,4%"),
amount: 1),
])
@ -119,6 +119,6 @@ class ReceiptItem {
ReceiptItem({required this.product, required this.amount});
int totalPrice() {
return product.priceInDkkCent * amount;
return product.priceInDkkCents * amount;
}
}

2
mobile/pubspec.lock
View File

@ -116,7 +116,7 @@ packages:
source: hosted
version: "6.2.1"
http:
dependency: transitive
dependency: "direct main"
description:
name: http
sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f

1
mobile/pubspec.yaml
View File

@ -38,6 +38,7 @@ dependencies:
barcode_scan2: ^4.4.0
google_fonts: ^6.2.1
intl: ^0.20.2
http: ^1.3.0
dev_dependencies:
flutter_test: