From fd06b8a9a4ca7e6d7fb90fa3bb0b005fd373eb1e Mon Sep 17 00:00:00 2001
From: Tobias Zoghaib <tobias.zoghaib@stud.uni-hannover.de>
Date: Tue, 10 Sep 2024 20:28:24 +0200
Subject: [PATCH] User registration completed

---
 .gitignore                                    |  3 +-
 software/backend/data/accounts.json           | 35 ++++++--
 software/backend/database.ts                  |  2 +-
 software/backend/models/account.model.ts      | 18 +++-
 software/backend/routes/account.routes.ts     | 26 +++++-
 software/backend/routes/category.routes.ts    |  1 -
 software/backend/scripts/categories.json      |  5 --
 software/backend/scripts/validateHelper.ts    | 16 ++++
 software/src/data/models/accountModel.ts      | 13 +++
 software/src/locales/english.json             |  5 +-
 software/src/locales/german.json              |  5 +-
 software/src/pages/loginPage/index.vue        | 27 ++++--
 software/src/pages/loginPage/loginForm.vue    | 18 ++--
 software/src/pages/loginPage/registerForm.vue | 85 +++++++++++++++----
 14 files changed, 203 insertions(+), 56 deletions(-)
 delete mode 100644 software/backend/scripts/categories.json
 create mode 100644 software/backend/scripts/validateHelper.ts
 create mode 100644 software/src/data/models/accountModel.ts

diff --git a/.gitignore b/.gitignore
index 227a76a..3f19c4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,5 @@ coverage
 
 # Build and package files/folders
 build
-*.sqlite
\ No newline at end of file
+*.sqlite
+out/
\ No newline at end of file
diff --git a/software/backend/data/accounts.json b/software/backend/data/accounts.json
index eb1a498..7f4d6ca 100644
--- a/software/backend/data/accounts.json
+++ b/software/backend/data/accounts.json
@@ -4,7 +4,10 @@
       "id": 0,
       "username": "hagemeister93",
       "password": "Xjt3qb5t",
-      "address": "Laportestraße 22, 30449 Hannover",
+      "street": "Laportestraße",
+      "houseNumber": 22,
+      "postalCode": 30449,
+      "city": "Hannover",
       "firstName": "Laurin",
       "lastName": "Hagemeister"
     },
@@ -12,7 +15,10 @@
       "id": 1,
       "username": "katjaStoiber",
       "password": "target123",
-      "address": "Gustav-Adolf-Straße 30, 30167 Hannover",
+      "street": "Gustav-Adolf-Straße",
+      "houseNumber": 30,
+      "postalCode": 30167,
+      "city": "Hannover",
       "firstName": "Katja",
       "lastName": "Stoiber"
     },
@@ -20,7 +26,10 @@
       "id": 2,
       "username": "oetkerohnek",
       "password": "iloveyou",
-      "address": "Eckermannstraße 1, 30625 Hannover",
+      "street": "Eckermannstraße",
+      "houseNumber": 1,
+      "postalCode": 30625,
+      "city": "Hannover",
       "firstName": "Luna",
       "lastName": "Oeter"
     },
@@ -28,7 +37,10 @@
       "id": 3,
       "username": "duranduran",
       "password": "H4nn0ver",
-      "address": "Schlägerstraße 36, 30171 Hannover",
+      "street": "Schlägerstraße",
+      "houseNumber": 36,
+      "postalCode": 30171,
+      "city": "Hannover",
       "firstName": "Jürgen",
       "lastName": "Durand"
     },
@@ -36,7 +48,10 @@
       "id": 4,
       "username": "guitarhero",
       "password": "gwerty123",
-      "address": "Steinmetzstraße 12, 30163 Hannover",
+      "street": "Steinmetzstraße",
+      "houseNumber": 12,
+      "postalCode": 30163,
+      "city": "Hannover",
       "firstName": "Frederik",
       "lastName": "Furtwängler"
     },
@@ -44,7 +59,10 @@
       "id": 5,
       "username": "herbstMareike",
       "password": "qhsrbpgrs",
-      "address": "Allerweg 33, 30851 Langenhagen",
+      "street": "Allerweg",
+      "houseNumber": 33,
+      "postalCode": 30851,
+      "city": "Langenhagen",
       "firstName": "Mareike",
       "lastName": "Herbst"
     },
@@ -52,7 +70,10 @@
       "id": 6,
       "username": "seibertmitb",
       "password": "{jkz+WvQe",
-      "address": "Marktstraße 26, 30880 Laatzen",
+      "street": "Marktstraße",
+      "houseNumber": 26,
+      "postalCode": 30880,
+      "city": "Laatzen",
       "firstName": "Janna",
       "lastName": "Seibert"
     }
diff --git a/software/backend/database.ts b/software/backend/database.ts
index 5f38cdb..fbe9012 100644
--- a/software/backend/database.ts
+++ b/software/backend/database.ts
@@ -23,7 +23,7 @@ export const sequelize = new Sequelize({
 
 export function startDatabase() {
   // Create database and tables
-  sequelize.sync({ force: false })
+  sequelize.sync({ force: true })
     .then(() => {
       console.log(`Database & tables created!`)
     })
diff --git a/software/backend/models/account.model.ts b/software/backend/models/account.model.ts
index 04683d7..b693ac0 100644
--- a/software/backend/models/account.model.ts
+++ b/software/backend/models/account.model.ts
@@ -1,23 +1,33 @@
-import { Table, Column, Model, HasMany } from 'sequelize-typescript';
+import { Table, Column, Model, HasMany, Unique } from 'sequelize-typescript';
 import { Order } from './order.model';
 
 @Table
 export class Account extends Model {
+  @Unique
   @Column
   username: string
 
   @Column
   password: string
 
-  @Column
-  address: string
-
   @Column
   firstName: string
 
   @Column
   lastName: string
 
+  @Column
+  street: string
+
+  @Column
+  houseNumber: number
+
+  @Column
+  postalCode: number
+
+  @Column
+  city: string
+
   // Relations
   @HasMany(() => Order)
   orders: Order[]
diff --git a/software/backend/routes/account.routes.ts b/software/backend/routes/account.routes.ts
index 3271de6..897eec3 100644
--- a/software/backend/routes/account.routes.ts
+++ b/software/backend/routes/account.routes.ts
@@ -1,12 +1,36 @@
 import { Router, Request, Response, NextFunction } from "express";
 import { Account } from "../models/account.model";
+import { validateString } from "../scripts/validateHelper";
 
 export const account = Router()
 
-account.get("/", (req: Request, res: Response, next: NextFunction)=> {
+// Request all user from the database
+account.get("/", (req: Request, res: Response, next: NextFunction) => {
   Account.findAll()
     .then(accounts => {
       res.json(accounts)
     })
     .catch(next)
+})
+
+// Creating a new user
+account.post("/", (req: Request, res: Response, next: NextFunction) => {
+  if (!validateString(req.body.username, 4))
+  {
+    res.status(400).send({ error: "Username too short!" })
+  }
+  else if (!validateString(req.body.password, 8))
+  {
+    res.status(400).send({ error: "Password too short!" })
+  }
+  else
+  {
+    Account.create(req.body)
+    .then(account => {
+      res.json(account)
+      res.status(200).send()
+    }).catch(reason => {
+      res.status(400).send({ error: reason })
+    })
+  }
 })
\ No newline at end of file
diff --git a/software/backend/routes/category.routes.ts b/software/backend/routes/category.routes.ts
index 5c563dd..0a3abd9 100644
--- a/software/backend/routes/category.routes.ts
+++ b/software/backend/routes/category.routes.ts
@@ -13,7 +13,6 @@ category.get("/", (req: Request, res: Response, next: NextFunction) => {
 
 category.post("/", (req: Request, res: Response, next: NextFunction) => {
   try {
-    console.log(req.body)
     const category = Category.create(req.body)
     res.status(201).json(category)
   } catch (e) {
diff --git a/software/backend/scripts/categories.json b/software/backend/scripts/categories.json
deleted file mode 100644
index 3918073..0000000
--- a/software/backend/scripts/categories.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": 1,
-    "title": "Hello World",
-    "completed": false
-}
\ No newline at end of file
diff --git a/software/backend/scripts/validateHelper.ts b/software/backend/scripts/validateHelper.ts
new file mode 100644
index 0000000..a72440f
--- /dev/null
+++ b/software/backend/scripts/validateHelper.ts
@@ -0,0 +1,16 @@
+/**
+ * Validates a string for undefined and length
+ * 
+ * @param string String to prove
+ * @param length Minimal length of string
+ * 
+ * @returns True if valid
+ */
+export function validateString(string: string, length: number = 0) : boolean {
+  if (string != undefined) {
+    if (string.length >= length)
+      return true
+  }
+
+  return false
+}
\ No newline at end of file
diff --git a/software/src/data/models/accountModel.ts b/software/src/data/models/accountModel.ts
new file mode 100644
index 0000000..b3890aa
--- /dev/null
+++ b/software/src/data/models/accountModel.ts
@@ -0,0 +1,13 @@
+export class AccountModel {
+  id: number
+  username: string = ""
+  password: string = ""
+  street: string = ""
+  houseNumber: number = 0
+  postalCode: number = 0
+  city: string = ""
+  firstName: string = ""
+  lastName: string = ""
+  createdAt: string = ""
+  updatedAt: string = ""
+}
\ No newline at end of file
diff --git a/software/src/locales/english.json b/software/src/locales/english.json
index 443360c..54e02e9 100644
--- a/software/src/locales/english.json
+++ b/software/src/locales/english.json
@@ -36,7 +36,7 @@
   "username": "Username",
   "password": "Password",
   "login": "Login",
-  "noAccountRegister": "No Account? Register now!",
+  "noAccountRegister": "Create new Account!",
   "register": "Create Account",
   "userInfo": {
     "firstName": "First Name",
@@ -45,5 +45,6 @@
     "houseNumber": "House Number",
     "postalCode": "Postal Code",
     "city": "City"
-  }
+  },
+  "backToLogin": "Back to Login"
 }
\ No newline at end of file
diff --git a/software/src/locales/german.json b/software/src/locales/german.json
index 237d1e4..f3171f4 100644
--- a/software/src/locales/german.json
+++ b/software/src/locales/german.json
@@ -36,7 +36,7 @@
   "username": "Username",
   "password": "Passwort",
   "login": "Login",
-  "noAccountRegister": "Noch keinen Account? Jetzt anmelden!",
+  "noAccountRegister": "Neuen Account erstellen!",
   "register": "Account erstellen",
   "userInfo": {
     "firstName": "Vorname",
@@ -45,5 +45,6 @@
     "houseNumber": "Hausnummer",
     "postalCode": "Postleitzahl",
     "city": "Stadt"
-  }
+  },
+  "backToLogin": "Zurück zum Login"
 }
\ No newline at end of file
diff --git a/software/src/pages/loginPage/index.vue b/software/src/pages/loginPage/index.vue
index 6de2249..9c40b08 100644
--- a/software/src/pages/loginPage/index.vue
+++ b/software/src/pages/loginPage/index.vue
@@ -2,18 +2,35 @@
 import { ref } from 'vue';
 import loginForm from './loginForm.vue';
 import registerForm from './registerForm.vue';
+import BannerModel from '@/data/models/bannerModel';
+import alertBanner from '@/components/alertBanner.vue';
 
-const showRegisterDialog = ref(false)
+const showRegisterCard = ref(false)
+const banner = ref(new BannerModel())
 </script>
 
 <template>
-  <v-container max-width="600">
+  <v-container max-width="800">
     <v-row>
       <v-col>
-        <login-form v-model:show-register-dialog="showRegisterDialog" />
+        <alert-banner v-model:alert-banner="banner" />
       </v-col>
     </v-row>
-  </v-container>
 
-  <register-form v-model:show-register-dialog="showRegisterDialog" />
+    <v-expand-transition>
+      <v-row v-if="!showRegisterCard">
+        <v-col>
+          <login-form v-model:show-register-card="showRegisterCard" />
+        </v-col>
+      </v-row>
+    </v-expand-transition>
+
+    <v-expand-transition>
+      <v-row v-if="showRegisterCard">
+        <v-col>
+          <register-form v-model:banner="banner" v-model:show-register-card="showRegisterCard" />
+        </v-col>
+      </v-row>
+    </v-expand-transition>
+  </v-container>
 </template>
\ No newline at end of file
diff --git a/software/src/pages/loginPage/loginForm.vue b/software/src/pages/loginPage/loginForm.vue
index e01348c..192d29f 100644
--- a/software/src/pages/loginPage/loginForm.vue
+++ b/software/src/pages/loginPage/loginForm.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const showRegisterDialog = defineModel("showRegisterDialog", { type: Boolean, default: false })
+const showRegisterCard = defineModel("showRegisterCard", { type: Boolean, default: false })
 </script>
 
 <template>
@@ -16,19 +16,15 @@ const showRegisterDialog = defineModel("showRegisterDialog", { type: Boolean, de
           <v-text-field :label="$t('password')" prepend-icon="mdi-key" type="password" clearable />
         </v-col>
       </v-row>
-
-      <v-row>
-        <v-col>
-          <!-- todo -->
-          <v-btn prepend-icon="mdi-send" color="primary" block>{{ $t('login') }}</v-btn>
-        </v-col>
-      </v-row>
     </v-container>
 
-    <v-card-text class="text-center">
-      <v-btn flat append-icon="mdi-chevron-right" @click="showRegisterDialog = true">
+    <v-card-actions>
+      <v-btn variant="outlined" @click="showRegisterCard = true" color="primary" prepend-icon="mdi-plus">
         {{ $t('noAccountRegister') }}
       </v-btn>
-    </v-card-text>
+      <v-spacer />
+      <v-btn variant="outlined" append-icon="mdi-arrow-right" color="primary">{{ $t('login') }}</v-btn>
+    </v-card-actions>
+
   </v-card>
 </template>
\ No newline at end of file
diff --git a/software/src/pages/loginPage/registerForm.vue b/software/src/pages/loginPage/registerForm.vue
index 281728b..4cc41ce 100644
--- a/software/src/pages/loginPage/registerForm.vue
+++ b/software/src/pages/loginPage/registerForm.vue
@@ -1,54 +1,107 @@
 <script setup lang="ts">
-import actionDialog from '@/components/actionDialog.vue';
+import { AccountModel } from '@/data/models/accountModel';
+import BannerModel from '@/data/models/bannerModel';
+import axios from 'axios';
+import { ref } from 'vue';
 
-const showRegisterDialog = defineModel("showRegisterDialog", { type: Boolean, required: true })
+const newUser = ref(new AccountModel())
+const banner = defineModel("banner", { required: true, type: BannerModel })
+const showRegisterCard = defineModel("showRegisterCard", { type: Boolean, default: false })
+
+function registerUser() {
+  axios.post('http://127.0.0.1:3000/accounts/', newUser.value)
+    .then(res => {
+      console.log(res.status)
+      if (res.status == 200) {
+        banner.value.message = "Created!"
+        banner.value.color = "green"
+        banner.value.icon = "mdi-check"
+        banner.value.show = true
+      }
+    })
+    .catch((error) => {
+      if (error.status == 400) {
+        banner.value.color = "red"
+        banner.value.icon = "mdi-alert-circle"
+        banner.value.message = error.response.data.error
+        banner.value.show = true
+      }
+    })
+}
 </script>
 
 <template>
-  <action-dialog v-model="showRegisterDialog" :title="$t('register')">
-    <template #content>
+  <v-card :title="$t('register')">
+    <v-container>
       <v-row>
         <v-col>
-          <v-text-field :label="$t('username')" prepend-icon="mdi-account" clearable />
+          <v-text-field
+            :label="$t('username')"
+            prepend-icon="mdi-account"
+            v-model="newUser.username"
+            clearable
+          />
         </v-col>
 
         <v-col>
-          <v-text-field :label="$t('password')" prepend-icon="mdi-key" type="password" clearable />
+          <v-text-field
+            :label="$t('password')"
+            prepend-icon="mdi-key"
+            type="password"
+            v-model="newUser.password"
+            clearable
+          />
         </v-col>
       </v-row>
 
       <v-row>
         <v-col>
-          <v-text-field :label="$t('userInfo.firstName')" prepend-icon="mdi-card-account-details" clearable />
+          <v-text-field
+            :label="$t('userInfo.firstName')"
+            prepend-icon="mdi-card-account-details"
+            v-model="newUser.firstName"
+            clearable
+          />
         </v-col>
 
         <v-col>
-          <v-text-field :label="$t('userInfo.lastName')" clearable />
+          <v-text-field :label="$t('userInfo.lastName')" v-model="newUser.lastName" clearable />
         </v-col>
       </v-row>
 
       <v-row>
         <v-col>
-          <v-text-field :label="$t('userInfo.street')" prepend-icon="mdi-numeric" clearable />
+          <v-text-field
+            :label="$t('userInfo.street')"
+            prepend-icon="mdi-numeric"
+            v-model="newUser.street"
+            clearable
+          />
         </v-col>
         <v-col cols="4">
-          <v-text-field :label="$t('userInfo.houseNumber')"  clearable />
+          <v-text-field :label="$t('userInfo.houseNumber')" v-model="newUser.houseNumber" clearable />
         </v-col>
       </v-row>
 
       <v-row>
         <v-col cols="4">
-          <v-text-field :label="$t('userInfo.postalCode')" prepend-icon="mdi-city" clearable />
+          <v-text-field
+            :label="$t('userInfo.postalCode')"
+            prepend-icon="mdi-city"
+            v-model="newUser.postalCode"
+            clearable
+          />
         </v-col>
         <v-col>
-          <v-text-field :label="$t('userInfo.city')" clearable />
+          <v-text-field :label="$t('userInfo.city')" v-model="newUser.city" clearable />
         </v-col>
       </v-row>
-
-    </template>
+    </v-container>
 
     <template #actions>
-      <v-btn prepend-icon="mdi-account-plus" color="primary" variant="outlined">{{ $t('register') }}</v-btn>
+      <v-btn prepend-icon="mdi-arrow-left" color="primary" variant="outlined" @click="showRegisterCard = false">{{ $t('backToLogin') }}</v-btn>
+      <v-spacer />
+      <v-btn prepend-icon="mdi-account-plus" color="primary" variant="outlined" @click="registerUser">{{ $t('register') }}</v-btn>
     </template>
-  </action-dialog>
+  </v-card>
 </template>
\ No newline at end of file