Merge pull request #9 from FabianFelixKraus/develop

Add App-title and Logo
FabianFelixKraus · Oct 30, 2023 · 0ab69f1 · 0ab69f1
2 parents 3620596 + 77a2ca9
commit 0ab69f1
Show file tree

Hide file tree

Showing 9 changed files with 523 additions and 24 deletions.
diff --git a/frontend/index.html b/frontend/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.ico">
+    <link rel="icon" href="/favicon.svg">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>Kassenbuch</title>
   </head>
   <body>
     <div id="app"></div>

diff --git a/frontend/src/assets/british-flag.svg → frontend/public/british-flag.svg b/frontend/src/assets/british-flag.svg → frontend/public/british-flag.svg
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
diff --git a/frontend/public/favicon.svg b/frontend/public/favicon.svg
diff --git a/frontend/src/assets/german-flag.svg → frontend/public/german-flag.svg b/frontend/src/assets/german-flag.svg → frontend/public/german-flag.svg
diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue
@@ -2,15 +2,12 @@
   <div class="d-flex justify-content-between align-items-center start-end-content">
     <h1>{{$t("cashBook")}}</h1>
     <button class="btn-outline-primary" @click="toggleLanguage">
-      <img :src="flagIconClass" :alt="explanationText">
+      switch language
     </button>
     </div>
 </template>
 
 <script>
-import germanFlag from "@/assets/german-flag.svg";
-import britishFlag from "@/assets/british-flag.svg";
-
 export default {
   name: "Header",
   data() {
@@ -25,9 +22,6 @@ export default {
     }
   },
   computed: {
-    flagIconClass() {
-      return this.selectedLanguage === "de" ? germanFlag : britishFlag;
-    },
     explanationText() {
       if (this.selectedLanguage === "de") {
         return this.$t("germanFlagTitle");

diff --git a/frontend/src/components/SelectTemplate.vue b/frontend/src/components/SelectTemplate.vue
@@ -15,12 +15,11 @@
     data () {
       return {
         selectedTemplate: undefined,
-        templateNames: ["card4Vend", "sumUp", "payOne", "rentStudentWERK", "invoice", "telekom", "cleaningService", "electricityBill", "accountMaintenanceFee", "deposit", "vodafone", "empty"],
+        templateNames: ["card4Vend", "sumUp", "payOne", "rentStudentWERK", "invoice", "telekom", "cleaningService", "electricityBill", "accountMaintenanceFee", "deposit", "GC_re_home", "vodafone", "empty"],
         templates: {
           "card4Vend": {
             "date": new Date().toISOString().split('T')[0],
             "description": "Card4Vent GmbH",
-            "statementOfAccountId": null,
             "isExpense": false,
             "location": "Waschbar",
             "amount":  null,
@@ -32,7 +31,6 @@
           "sumUp": {
             "date": new Date().toISOString().split('T')[0],
             "description": "Sum up",
-            "statementOfAccountId": null,
             "isExpense": false,
             "location": "Gemeinschaftsraum",
             "amount":  null,
@@ -44,7 +42,6 @@
           "payOne": {
             "date": new Date().toISOString().split('T')[0],
             "description": "PAYONE GmbH",
-            "statementOfAccountId": null,
             "isExpense": false,
             "location": "Waschbar",
             "amount":  null,
@@ -56,7 +53,6 @@
           "rentStudentWERK": {
             "date": new Date().toISOString().split('T')[0],
             "description": "Miete StudierendenWERK",
-            "statementOfAccountId": null,
             "isExpense": true,
             "location": "Waschbar",
             "amount":  160.00,
@@ -68,7 +64,6 @@
           "invoice": {
             "date": new Date().toISOString().split('T')[0],
             "description": "",
-            "statementOfAccountId": null,
             "isExpense": true,
             "location": "Gemeinschaftsraum",
             "amount":  null,
@@ -80,7 +75,6 @@
           "telekom": {
             "date": new Date().toISOString().split('T')[0],
             "description": "Telekom",
-            "statementOfAccountId": null,
             "isExpense": true,
             "location": "Gemeinschaftsraum",
             "amount":  34.94,
@@ -92,7 +86,6 @@
           "cleaningService": {
             "date": new Date().toISOString().split('T')[0],
             "description": "3B Dienstleistungen",
-            "statementOfAccountId": null,
             "isExpense": true,
             "location": "Gemeinschaftsraum",
             "amount":  32.33,
@@ -104,7 +97,6 @@
           "electricityBill": {
             "date": new Date().toISOString().split('T')[0],
             "description": "Naturstromhandel GmbH",
-            "statementOfAccountId": null,
             "isExpense": true,
             "location": "Waschbar",
             "amount":  null,
@@ -116,7 +108,6 @@
           "accountMaintenanceFee": {
             "date": new Date().toISOString().split('T')[0],
             "description": "Kontoführungsgebühren",
-            "statementOfAccountId": null,
             "isExpense": true,
             "location": "Sonstiges",
             "amount":  30.35,
@@ -128,7 +119,6 @@
           "deposit": {
             "date": new Date().toISOString().split('T')[0],
             "description": "Kaution ",
-            "statementOfAccountId": null,
             "isExpense": false,
             "location": "Gemeinschaftsraum",
             "amount":  100.00,
@@ -140,7 +130,6 @@
           "flaschenport": {
             "date": new Date().toISOString().split('T')[0],
             "description": "Erstattung Getränkelieferung Flaschenpost SE",
-            "statementOfAccountId": null,
             "isExpense": true,
             "location": "Gemeinschaftsraum",
             "amount":  null,
@@ -152,7 +141,6 @@
           "vodafone": {
             "date": new Date().toISOString().split('T')[0],
             "description": "Vodafone GmbH",
-            "statementOfAccountId": null,
             "isExpense": true,
             "location": "Waschbar",
             "amount":  26.73,
@@ -161,6 +149,17 @@
             "taxGroup": "WBA",
             "taxRate": 19
           },
+          "GC_re_home": {
+            "date": new Date().toISOString().split('T')[0],
+            "description": "GC re homee GmbH Abschlag (Strom) <Monat>",
+            "isExpense": true,
+            "location": "Waschbar",
+            "amount":  184.00,
+            "account": "Commerzbank",
+            "taxClass": "MwSt. voll",
+            "taxGroup": "WBA",
+            "taxRate": 19
+          },
           "empty": {
             "date": new Date().toISOString().split('T')[0],
             "description": "",

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
@@ -1,4 +1,5 @@
 {
+  "GC_re_home": "Waschbar Strom",
   "account": "Konto",
   "accountMaintenanceFee": "Kontoführungsgebühren",
   "addNewTransaction": "Neue Transaktion hinzufügen",
@@ -8,6 +9,7 @@
   "balanceCash": "Kontostand Kasse, bar",
   "balanceCommerzbank": "Kontostand Commerbank",
   "card4Vend": "Card4Vend",
+  "cashBook": "Kassenbuch",
   "changeOfBalance": "Veränderung",
   "cleaningService": "3B Dienstleistungen",
   "close": "Schließen",
@@ -37,7 +39,6 @@
   "result": "Ergebnis",
   "save": "Speichern",
   "selectTemplate": "Vorlage auswählen",
-  "cashBook": "Kassenbuch",
   "startBalance": "Kontostand zu Beginn des Semesters",
   "statementOfAccountId": "K-Nr",
   "statementOfAccountIdDescription": "Kontoauszugsnummer",

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
@@ -1,4 +1,5 @@
 {
+  "GC_re_home": "Waschbar Electricity",
   "account": "Account",
   "accountMaintenanceFee": "Account Maintenance Fee",
   "addNewTransaction": "Add new transaction",
@@ -8,6 +9,7 @@
   "balanceCash": "Balance Cash",
   "balanceCommerzbank": "Balance Commerzbank",
   "card4Vend": "Card4Vend",
+  "cashBook": "Cash book",
   "changeOfBalance": "Change",
   "cleaningService": "3B Dienstleistungen",
   "close": "Close",
@@ -36,7 +38,6 @@
   "result": "Result",
   "save": "Save",
   "selectTemplate": "select template",
-  "cashBook": "Cash book",
   "startBalance": "Balance at the beginning of semester",
   "statementOfAccountId": "K-No",
   "statementOfAccountIdDescription": "Statement of Account Number",