Kategorie hinzugefügt

.gitignore

@@ -1,4 +1,2 @@
 .idea
 db/*
-backend/target/*
-

Frontend-user/README.md

@@ -14,21 +14,3 @@ A few resources to get you started if this is your first Flutter project:
 For help getting started with Flutter development, view the
 [online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
-
-## toDo
-
-- Einstellungen
-    - darkmode
-    - Secure Storage: https://pub.dev/packages/flutter_secure_storage
-- Einkauf
-- Finance
-    - Einkaufskorb editieren
-        - nur 1 Monat lang möglich
-        - Speichern des veränderten Warenkorbs
-        - redesign (statefull)
-    - farbliche Hervorhebungen
-    - ausstehende Beträge für monatliche Aufladungen
-        - eventuell muss sample data angepasst werden
-- pre-Release:
-    - semanticLabels, Screenreader-Support
-    - Error-Management (throws)

Frontend-user/lib/basket.dart

@@ -1,76 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'sample_data.dart';
-
-class ShowBasket extends StatelessWidget {
-  final Basket basket;
-  final bool editable;
-  const ShowBasket(this.basket, {this.editable = false, super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Expanded(
-          child: getBasket(basket),
-        ),
-        const Divider(),
-        ListTile(
-            leading: const Icon(
-              Icons.euro,
-            ),
-            title: const Text(
-              'Kosten:',
-            ),
-            subtitle: Text(
-              '${basket.price}',
-            ),
-            trailing: editable
-                ? Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      FloatingActionButton(
-                          backgroundColor: Colors.redAccent.shade100,
-                          child: const Icon(Icons.remove_shopping_cart),
-                          onPressed: () {}),
-                      const SizedBox(
-                        width: 10,
-                      ),
-                      FloatingActionButton(
-                          child: const Icon(Icons.shopping_cart_checkout),
-                          onPressed: () {}),
-                    ],
-                  )
-                : null),
-      ],
-    );
-  }
-
-  ListView getBasket(Basket basket) {
-    return ListView.builder(
-      itemCount: basket.purchases.length,
-      itemBuilder: (context, index) {
-        return Card(
-          child: ListTile(
-              leading: Text(
-                basket.purchases.keys.elementAt(index).category.icon,
-                style: const TextStyle(fontSize: 24),
-              ),
-              title: Text(basket.purchases.keys.elementAt(index).name),
-              subtitle: Text(
-                  '${basket.purchases.values.elementAt(index)} ${basket.purchases.keys.elementAt(index).unit}'),
-              trailing: editable
-                  ? SizedBox(
-                      width: 100,
-                      child: TextField(
-                          keyboardType: TextInputType.number,
-                          inputFormatters: <TextInputFormatter>[
-                            FilteringTextInputFormatter.digitsOnly
-                          ]),
-                    )
-                  : null),
-        );
-      },
-    );
-  }
-}

Frontend-user/lib/expand.dart

@@ -1,60 +0,0 @@
-import 'package:flutter/material.dart';
-
-//this was used in a earlier version of the app and will possibly be removed in future versions.
-
-class Expand extends StatefulWidget {
-  final Widget child;
-  final bool expand;
-  const Expand({super.key, this.expand = true, required this.child});
-
-  @override
-  State<Expand> createState() => _ExpandState();
-}
-
-class _ExpandState extends State<Expand> with SingleTickerProviderStateMixin {
-  late AnimationController expandController;
-  late Animation<double> animation;
-
-  @override
-  void initState() {
-    super.initState();
-    prepareAnimations();
-    _runExpandCheck();
-  }
-
-  ///Setting up the animation
-  void prepareAnimations() {
-    expandController = AnimationController(
-        vsync: this, duration: const Duration(milliseconds: 500));
-    animation = CurvedAnimation(
-      parent: expandController,
-      curve: Curves.fastOutSlowIn,
-    );
-  }
-
-  void _runExpandCheck() {
-    if (widget.expand) {
-      expandController.forward();
-    } else {
-      expandController.reverse();
-    }
-  }
-
-  @override
-  void didUpdateWidget(Expand oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    _runExpandCheck();
-  }
-
-  @override
-  void dispose() {
-    expandController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SizeTransition(
-        axisAlignment: 1.0, sizeFactor: animation, child: widget.child);
-  }
-}

Frontend-user/lib/finance.dart

@@ -1,111 +1,103 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:intl/date_symbol_data_local.dart';
-import 'basket.dart';
+
-import 'sample_data.dart';
+/*
+todo:
+  - Design
+  - Details zum Warenkorb und Beschreibung (Popup?)
+  - farbliche Hervorhebungen
+*/
+
+enum Art { monatlBeitrag, aufladung, einkauf, korrektur }
+
+final now = DateTime.now();
+
+class Transaction {
+  int betrag;
+  Art art;
+  DateTime datum;
+  String beschreibung;
+  Transaction(this.art, this.betrag, this.datum, this.beschreibung);
+}
 
 class Finance extends StatelessWidget {
-  const Finance({super.key});
+  Finance({super.key});
+
+  final List<Transaction> transactions = [
+    Transaction(Art.monatlBeitrag, 0, now, ''),
+    Transaction(Art.aufladung, 2042, now, ''),
+    Transaction(Art.einkauf, -2442, now.subtract(const Duration(days: 2)), ''),
+    Transaction(Art.korrektur, 2332, now.subtract(const Duration(hours: 5)),
+        'Korrektur des Warenkorbs')
+  ];
 
   @override
   Widget build(BuildContext context) {
     initializeDateFormatting('de_DE');
-    Intl.defaultLocale = 'de_DE';
 
-    return Scaffold(
+    return ListView.builder(
-        appBar: AppBar(
+      itemCount: null,
-          toolbarHeight: 75,
-          title: const Card(
-            child: ListTile(
-                leading: Icon(
-                  Icons.euro,
-                ),
-                title: Text(
-                  'Aktuelles Guthaben:',
-                ),
-                subtitle: Text(
-                  '-00,34€',
-                )),
-          ),
-        ),
-        body: ListView.builder(
-            itemCount: SampleData().transactions.length,
       itemBuilder: (context, index) {
+        if (index == 0) {
+          return const Card(
+            child: Padding(
+              padding: EdgeInsets.all(8.0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Icon(
+                    Icons.euro,
+                    //color: Colors.black,
+                    //semanticLabel: 'Text for screenreader',
+                  ),
+                  Column(
+                    children: [
+                      Text(
+                        'Aktuelles Guthaben:',
+                        style: TextStyle(fontWeight: FontWeight.bold),
+                      ),
+                      Text(
+                        '-00,34€',
+                        style: TextStyle(fontWeight: FontWeight.bold),
+                      )
+                    ],
+                  )
+                ],
+              ),
+            ),
+          );
+        } else if (index <= transactions.length) {
           return Card(
-                  child: ListTile(
+            child: Padding(
-                      leading: getIcon(SampleData().transactions[index].type),
+              padding: const EdgeInsets.all(8.0),
-                      title:
+              child: Row(
-                          Text(gettitle(SampleData().transactions[index].type)),
+                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                      subtitle: getSubtitle(SampleData().transactions[index]),
+                children: [
-                      trailing: getTrailing(context, index),
+                  Icon(transactions[index - 1].art == Art.korrektur
-                      onTap: (SampleData().transactions[index].basket != null)
+                      ? Icons.error
-                          ? () {
+                      : Icons.money),
-                              showBottomSheet(
+                  Column(
-                                  context: context,
+                    children: [
-                                  builder: (BuildContext context) {
+                      Row(
-                                    return ShowBasket(SampleData()
+                        children: [
-                                        .transactions[index]
+                          Text(DateFormat("EEEE, dd. MMMM yyyy HH:mm", 'de_DE')
-                                        .basket!);
+                              .format(now)),
-                                  });
+                          Text(
-                            }
+                              '${transactions[index - 1].art}:  ${transactions[index - 1].betrag / 100}€'),
-                          : null));
+                        ],
-            }));
+                      ),
-  }
+                      Text(transactions[index - 1].beschreibung)
-
+                    ],
-  String gettitle(TransaktionArt art) {
+                  ),
-    switch (art) {
+                ],
-      case TransaktionArt.aufladung:
+              ),
-        return 'Aufladung';
+            ),
-      case TransaktionArt.einkauf:
-        return 'Einkauf';
-      case TransaktionArt.korrektur:
-        return 'Korrektur';
-      case TransaktionArt.monatlBeitrag:
-        return 'Monatlicher Beitrag';
-      default:
-        return 'Ein Error ist aufgetreten';
-    }
-  }
-
-  Text getSubtitle(Transaction transaction) {
-    String text = '${transaction.amount / 100}';
-    text += '€  ';
-    text += DateFormat("EEEE, dd. MMMM yyyy HH:mm").format(transaction.date);
-    if (transaction.description != null) {
-      (text += '\n${transaction.description}');
-    }
-
-    return Text(text);
-  }
-
-  Icon getIcon(TransaktionArt art) {
-    switch (art) {
-      case TransaktionArt.aufladung:
-        return const Icon(Icons.savings);
-      case TransaktionArt.einkauf:
-        return const Icon(Icons.shopping_basket);
-      case TransaktionArt.monatlBeitrag:
-        return const Icon(Icons.payment);
-      default:
-        return const Icon(Icons.priority_high);
-    }
-  }
-
-  getTrailing(BuildContext context, int index) {
-    if (SampleData().transactions[index].type == TransaktionArt.einkauf) {
-      return IconButton(
-        icon: const Icon(Icons.manage_history),
-        onPressed: () {
-          showBottomSheet(
-              context: context,
-              builder: (BuildContext context) {
-                return ShowBasket(SampleData().transactions[index].basket!,
-                    editable: true);
-              });
-        },
           );
         } else {
           return null;
         }
+      },
+    );
   }
 }

Frontend-user/lib/main.dart

@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:mitgliederladen/shopping.dart';
-import 'package:mitgliederladen/settings.dart';
 import 'finance.dart';
 
 void main() {
@@ -16,21 +14,10 @@ class MyApp extends StatelessWidget {
       title: 'SoNaKo Demo App',
       debugShowCheckedModeBanner: false,
       theme: ThemeData(
-          //darkgreen:5f7c61, mediumgreen: 66906a, lightgreen: 9cbe96, yellow: f5de64
           useMaterial3: true,
-          brightness: Brightness.light,
-          textTheme: Typography.englishLike2021,
           colorScheme: ColorScheme.fromSeed(
-              brightness: Brightness.light,
+              seedColor: Colors.green)), //9bbee6 //79,128,104
-              seedColor: const Color(0xff5f7c61))),
+      darkTheme: ThemeData.dark(),
-      darkTheme: ThemeData(
-          useMaterial3: true,
-          brightness: Brightness.dark,
-          textTheme: Typography.englishLike2021,
-          colorScheme: ColorScheme.fromSeed(
-            brightness: Brightness.dark,
-            seedColor: const Color(0xff5f7c61),
-          )),
       themeMode: ThemeMode.system,
       home: const MyHomePage(),
     );
@@ -52,8 +39,6 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading:
-            const Image(image: AssetImage('assets/logo_sonako_4c_optimal.png')),
         title: const Text('SoNaKo Demo App'),
       ),
       bottomNavigationBar: NavigationBar(
@@ -80,9 +65,14 @@ class _MyHomePageState extends State<MyHomePage> {
         ],
       ),
       body: <Widget>[
-        const Shopping(),
+        Container(
-        const Finance(),
+          color: Colors.red,
-        const Settings()
+          alignment: Alignment.center,
+          child: Text('Page $test'),
+        ),
+        Finance(),
+        const Text(
+            'Hier könnten Einstellungen zu Darkmode mit shared_preferences und riverpod sein')
       ][currentPageIndex],
     );
   }

Frontend-user/lib/sample_data.dart

@@ -1,223 +0,0 @@
-import 'package:uuid/uuid.dart';
-
-final DateTime now = DateTime.now();
-
-enum TransaktionArt { monatlBeitrag, aufladung, einkauf, korrektur }
-
-enum Unit { stueck, menge }
-
-class Category {
-  final String name;
-  final String icon;
-  const Category({required this.name, required this.icon});
-}
-
-class Transaction {
-  int id = 0;
-  int amount;
-  TransaktionArt type;
-  DateTime date;
-  Basket? basket;
-  String? description;
-  Transaction(
-      {required this.type,
-      required this.amount,
-      required this.date,
-      this.description,
-      this.basket});
-}
-
-class Product {
-  final int id = 0;
-  final String name;
-  final Unit unit; //pro Kg oder Stück
-  final double price;
-  final double vat;
-  final Category category;
-  const Product(this.name, this.unit, this.price, this.vat, this.category);
-}
-
-class Basket {
-  Map<Product, int> purchases;
-  double price;
-  String guid;
-  Basket(this.purchases, this.price) : guid = const Uuid().v4();
-
-  void addItem(Product product, int quantity) {
-    if (purchases.containsKey(product)) {
-      purchases.update(
-          product, (existingQuantity) => existingQuantity + quantity);
-    } else {
-      purchases[product] = quantity;
-    }
-  }
-
-  void removeItem(Product product) {
-    purchases.remove(product);
-  }
-}
-
-class SampleData {
-  static const List<Category> categories = [
-    Category(name: 'Obst und Gemüse', icon: '🍒'),
-    Category(name: 'Kochen und Backen', icon: '🍝'),
-    Category(name: 'Brot, Cerealien & Aufstriche', icon: '🍞'),
-    Category(name: 'Getränke und Pfand', icon: '🫖'),
-    Category(name: 'Drogerie und Haushalt', icon: '🧼'),
-    Category(name: 'Öl, Soßen und Gewürze', icon: '🫚'),
-    Category(name: 'Süßes und Knabbereien', icon: '🍪')
-  ];
-
-  static List<Product> products = [
-    Product('Apfel', Unit.stueck, 0.23, 7, categories[0]),
-    Product('Mehl', Unit.menge, 0.003, 19, categories[1]),
-    Product('Brot', Unit.stueck, 1.23, 7, categories[2]),
-    Product('Milch', Unit.stueck, 2.23, 3, categories[3]),
-    Product('Zahnpasta', Unit.stueck, 0.23, 7, categories[4]),
-    Product('Pfeffer', Unit.stueck, 0.23, 7, categories[5]),
-    Product('Schokolade', Unit.menge, 0.23, 7, categories[6]),
-    Product('Flaschenpfand', Unit.stueck, -0.15, 0, categories[3])
-  ];
-
-  //such a basket can not exist later. It is for testing purposes
-  // when scrolling through a long basket
-  static Basket basket = Basket({
-    products[0]: 20,
-    products[1]: 2200,
-    products[2]: 2,
-    products[3]: 1,
-    products[4]: 1,
-    products[5]: 2,
-    products[6]: 222,
-    products[0]: 20,
-    products[1]: 2200,
-    products[2]: 2,
-    products[3]: 1,
-    products[4]: 1,
-    products[5]: 2,
-    products[6]: 222
-  }, 27.9);
-
-  static Basket basket2 = Basket({
-    products[0]: 22,
-    products[1]: 2241,
-    products[3]: 2,
-    products[4]: 4,
-    products[6]: 2,
-    products[7]: 5,
-  }, 34);
-
-  static Basket basket3 = Basket({
-    products[0]: 2,
-    products[1]: 21,
-    products[3]: 4,
-    products[4]: 1,
-    products[6]: 5,
-  }, -1);
-
-  List<Transaction> transactions = [
-    Transaction(
-      type: TransaktionArt.monatlBeitrag,
-      amount: 0,
-      date: now,
-    ),
-    Transaction(
-      type: TransaktionArt.aufladung,
-      amount: 2042,
-      date: now,
-    ),
-    Transaction(
-        type: TransaktionArt.einkauf,
-        amount: -2442,
-        date: now.subtract(const Duration(days: 2)),
-        basket: basket),
-    Transaction(
-      type: TransaktionArt.korrektur,
-      amount: 2332,
-      date: now.subtract(const Duration(hours: 5)),
-      description: 'Korrektur des Warenkorbs',
-      basket: basket3,
-    ),
-    Transaction(
-      type: TransaktionArt.monatlBeitrag,
-      amount: 0,
-      date: now,
-    ),
-    Transaction(
-      type: TransaktionArt.aufladung,
-      amount: 2042,
-      date: now,
-    ),
-    Transaction(
-        type: TransaktionArt.einkauf,
-        amount: -2442,
-        date: now.subtract(const Duration(days: 2)),
-        basket: basket2),
-    Transaction(
-        type: TransaktionArt.korrektur,
-        amount: 2332,
-        date: now.subtract(const Duration(hours: 5)),
-        description: 'Korrektur des FinanzAK'),
-    Transaction(
-      type: TransaktionArt.monatlBeitrag,
-      amount: 0,
-      date: now,
-    ),
-    Transaction(
-      type: TransaktionArt.aufladung,
-      amount: 2042,
-      date: now,
-    ),
-    Transaction(
-      type: TransaktionArt.einkauf,
-      amount: -2442,
-      date: now.subtract(const Duration(days: 2)),
-      basket: basket,
-    ),
-    Transaction(
-        type: TransaktionArt.korrektur,
-        amount: 2332,
-        date: now.subtract(const Duration(hours: 5)),
-        description: 'Korrektur des Warenkorbs'),
-    Transaction(
-      type: TransaktionArt.monatlBeitrag,
-      amount: 0,
-      date: now,
-    ),
-    Transaction(
-      type: TransaktionArt.aufladung,
-      amount: 2042,
-      date: now,
-    ),
-    Transaction(
-        type: TransaktionArt.einkauf,
-        amount: -2442,
-        date: now.subtract(const Duration(days: 2)),
-        basket: basket),
-    Transaction(
-        type: TransaktionArt.korrektur,
-        amount: 2332,
-        date: now.subtract(const Duration(hours: 5)),
-        description: 'Korrektur des Warenkorbs'),
-    Transaction(
-      type: TransaktionArt.monatlBeitrag,
-      amount: 0,
-      date: now,
-    ),
-    Transaction(
-      type: TransaktionArt.aufladung,
-      amount: 2042,
-      date: now,
-    ),
-    Transaction(
-        type: TransaktionArt.einkauf,
-        amount: -2442,
-        date: now.subtract(const Duration(days: 2)),
-        basket: basket2),
-    Transaction(
-        type: TransaktionArt.korrektur,
-        amount: 2332,
-        date: now.subtract(const Duration(hours: 5)),
-        description: 'Korrektur des Warenkorbs'),
-  ];
-}

Frontend-user/lib/settings.dart

@@ -1,19 +0,0 @@
-import 'package:flutter/material.dart';
-
-class Settings extends StatelessWidget {
-  const Settings({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    //Hier in dem Return kann der Inhalt des Setting Tabs angepasst werden
-    return ListView(children: const <Widget>[
-      ListTile(
-        leading: Icon(Icons.dark_mode),
-        title: Text(
-          'Hier könnten Einstellungen zu Darkmode sein',
-          maxLines: 2,
-        ),
-      )
-    ]);
-  }
-}

Frontend-user/lib/shopping.dart

@@ -1,41 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mitgliederladen/sample_data.dart';
-
-class Shopping extends StatelessWidget {
-  const Shopping({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-        floatingActionButton: FloatingActionButton(
-          child: const Icon(Icons.shopping_cart),
-          onPressed: () {},
-        ),
-        body: GridView.builder(
-            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                crossAxisCount: 2),
-            itemCount: SampleData.categories.length,
-            itemBuilder: ((context, index) {
-              return Card(
-                child: Column(children: [
-                  Expanded(
-                    child: FittedBox(
-                      fit: BoxFit.scaleDown,
-                      child: Text(
-                        SampleData.categories[index].icon,
-                        style: const TextStyle(fontSize: 400),
-                      ),
-                    ),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.all(8.0),
-                    child: Text(
-                      SampleData.categories[index].name,
-                      style: Theme.of(context).textTheme.labelLarge,
-                    ),
-                  ),
-                ]),
-              );
-            })));
-  }
-}

Frontend-user/pubspec.lock

@@ -41,14 +41,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.17.1"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.3"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -192,22 +184,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.2"
-  uuid:
-    dependency: "direct main"
-    description:
-      name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.7"
   vector_math:
     dependency: transitive
     description:

Frontend-user/pubspec.yaml

@@ -36,7 +36,6 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
   intl: ^0.18.1
-  uuid: ^3.0.7
 
 dev_dependencies:
   flutter_test:
@@ -61,8 +60,9 @@ flutter:
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this:
-  assets:
+  # assets:
-    - assets/
+  #   - images/a_dot_burr.jpeg
+  #   - images/a_dot_ham.jpeg
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware

README.md

@@ -1,36 +1,2 @@
 # Mitgliederladen
 
-
-## Development branches
-
-backend
-: Server component, using Rust/SQL, offering API (via HTTP/2?)
-
-db_scripts
-: SQL scripts
-
-main
-: frontend client as flutter app
-
-
-
-## Tech used
-
-### Backend
-
-- Database connection using Rust-lang and SQLx
-
-- RESTful (Level 2, JSON over RPC) API using Rust-lang (and probably (actix web framework)[https://actix.rs] plus (utoipa\[sic! 🍺 beer-branded punny name\])[https://github.com/juhaku/utoipa]
-
-## Frontend
-
-- Google Flutter using Dart.
-
-Target platforms?
-
-- probably Android[^1], iOS[^2].
-- Debug target could be desktop for fastest deployment. Production targets: Perhaps desktop and/or web, if wanted.
-
-
-[1]: via APK? Via Play Store or F-Droid? Then Registration as Play store developer (for charity or one time purchase with credit card?) needed.
-[2]: Registration as Apple developer for charity needed.

db_scripts/create.sql

@@ -13,9 +13,9 @@ CREATE TABLE IF NOT EXISTS transaktion_art (
     art VARCHAR(50) NOT NULL
 );
 
-INSERT OR IGNORE INTO transaktion_art(art_id, art) VALUES (1, 'monatlicher_beitrag');
+INSERT INTO transaktion_art(art_id, art) VALUES (1, 'monatlicher_beitrag');
-INSERT OR IGNORE INTO transaktion_art(art_id, art) VALUES (2, 'aufladung');
+INSERT INTO transaktion_art(art_id, art) VALUES (2, 'aufladung');
-INSERT OR IGNORE INTO transaktion_art(art_id, art) VALUES (3, 'einkauf');
+INSERT INTO transaktion_art(art_id, art) VALUES (3, 'einkauf');
 
 CREATE TABLE IF NOT EXISTS transaktion (
     transaktion_id INT NOT NULL PRIMARY KEY,
@@ -41,22 +41,33 @@ CREATE TABLE IF NOT EXISTS mwst (
     prozent INT NOT NULL
 );
 
-INSERT OR IGNORE INTO mwst(mwst_id, prozent) VALUES (1, 7);
+INSERT INTO mwst(mwst_id, prozent) VALUES (1, 7);
-INSERT OR IGNORE INTO mwst(mwst_id, prozent) VALUES (2, 19);
+INSERT INTO mwst(mwst_id, prozent) VALUES (2, 19);
 
 CREATE TABLE IF NOT EXISTS einheit(
     einheit_id INT NOT NULL PRIMARY KEY,
     bezeichnung VARCHAR(50) NOT NULL
 );
 
-INSERT OR IGNORE INTO einheit(einheit_id, bezeichnung) VALUES (1, 'stueck');
+INSERT INTO einheit(einheit_id, bezeichnung) VALUES (1, 'stueck');
-INSERT OR IGNORE INTO einheit(einheit_id, bezeichnung) VALUES (2, 'menge');
+INSERT INTO einheit(einheit_id, bezeichnung) VALUES (2, 'menge');
+
+CREATE TABLE IF NOT EXISTS kategorie (
+	kategorie_id INT NOT NULL PRIMARY KEY,
+	parent_id INT,
+	name VARCHAR(100) NOT NULL,
+	icon_unicode VARCHAR(100) NOT NULL,
+	CONSTRAINT fk_kategorie_tree FOREIGN KEY (parent_id) REFERENCES kategorie(kategorie_id)
+);
 
 CREATE TABLE IF NOT EXISTS artikel (
     artikel_id INT NOT NULL PRIMARY KEY,
+    bezeichnung VARCHAR(255) NOT NULL,
+    kategorie_id INT NOT NULL,
     einheit_id INT NOT NULL,
     mwst_id INT NOT NULL,
     preis INT NOT NULL,
     CONSTRAINT fk_mwst_artikel FOREIGN KEY (mwst_id) REFERENCES mwst(mwst_id),
-    CONSTRAINT fk_einheit_artikel FOREIGN KEY (einheit_id) REFERENCES einheit(einheit_id)
+    CONSTRAINT fk_einheit_artikel FOREIGN KEY (einheit_id) REFERENCES einheit(einheit_id),
+    CONSTRAINT fk_kategorie_artikel FOREIGN KEY (kategorie_id) REFERENCES kategorie(kategorie_id)
 );

db_scripts/drop.sql

@@ -5,3 +5,4 @@ DROP TABLE IF EXISTS monatlicher_beitrag;
 DROP TABLE IF EXISTS mwst;
 DROP TABLE IF EXISTS einheit;
 DROP TABLE IF EXISTS artikel;
+DROP TABLE IF EXISTS kategorie;

server/.gitignore

@@ -1,21 +0,0 @@
-Cargo.lock
-target/
-guide/build/
-/gh-pages
-
-*.so
-*.out
-*.pyc
-*.pid
-*.sock
-*~
-.DS_Store
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
-
-# Configuration directory generated by CLion
-.idea
-
-# Configuration directory generated by VSCode
-.vscode

server/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "server"
-version = "1.0.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-actix-web ="4"
-utoipa = { version = "3", features = ["actix_extras"] }

server/readme.md

@@ -1,15 +0,0 @@
-# installation
-
-## windows (step 1)
-
-choco install -y
-
-## Linux, macos (alernate step 1)
-
-use apt, pacman, curl, brew or whatever.
-
-## Always (steps 2 and so on)
-
-- `rustup-init.sh` (Windows: rustup-init.ex, e.g. %AppData%\Local\Temp\chocolatey\rustup.install\1.25.1\rustup-init.exe)
-- select a good match in the dialog of this CLI installer
-

server/src/main.rs

@@ -1,28 +0,0 @@
-use actix_web::{get, post, web, App, HttpResponse, HttpServer, Responder};
-
-#[get("/")]
-async fn hello() -> impl Responder {
-    HttpResponse::Ok().body("Hello world!")
-}
-
-#[post("/echo")]
-async fn echo(req_body: String) -> impl Responder {
-    HttpResponse::Ok().body(req_body)
-}
-
-async fn manual_hello() -> impl Responder {
-    HttpResponse::Ok().body("Hey there!")
-}
-
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    HttpServer::new(|| {
-        App::new()
-            .service(hello)
-            .service(echo)
-            .route("/hey", web::get().to(manual_hello))
-    })
-    .bind(("127.0.0.1", 8080))?
-    .run()
-    .await
-}