From 507db8b40ebacccb93f63d0ac6d7cba9c2c6c28a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 17:26:00 +0100
Subject: [PATCH 01/14] add module alias package

---
 frontend/package.json | 4 ++++
 frontend/yarn.lock    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/frontend/package.json b/frontend/package.json
index 5629e0360..7498513f0 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -44,6 +44,7 @@
     "jest": "^26.6.3",
     "jest-canvas-mock": "^2.3.1",
     "jest-environment-jsdom-sixteen": "^2.0.0",
+    "module-alias": "^2.2.2",
     "particles-bg-vue": "1.2.3",
     "portal-vue": "^2.1.7",
     "prettier": "^2.2.1",
@@ -81,6 +82,9 @@
     "vue-template-compiler": "^2.6.11",
     "webpack-bundle-analyzer": "^4.5.0"
   },
+  "_moduleAliases": {
+    "@components": "./components"
+  },
   "postcss": {
     "plugins": {
       "autoprefixer": {}
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 296e0f01b..19ee31c94 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -10287,6 +10287,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+module-alias@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0"
+  integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==
+
 moment@^2.19.2:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"

From c79021187021368d2f9b9e0df8011368dcb781d4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 17:29:32 +0100
Subject: [PATCH 02/14] remove views folder

---
 frontend/src/{views => components}/NotFoundPage.spec.js           | 0
 frontend/src/{views => components}/NotFoundPage.vue               | 0
 frontend/src/{views/Layout => layouts}/AuthLayout_gdd.spec.js     | 0
 frontend/src/{views/Layout => layouts}/AuthLayout_gdd.vue         | 0
 frontend/src/{views/Layout => layouts}/ContentFooter.spec.js      | 0
 frontend/src/{views/Layout => layouts}/ContentFooter.vue          | 0
 .../src/{views/Layout => layouts}/DashboardLayout_gdd.spec.js     | 0
 frontend/src/{views/Layout => layouts}/DashboardLayout_gdd.vue    | 0
 frontend/src/{views/Pages => pages}/AccountOverview.spec.js       | 0
 frontend/src/{views/Pages => pages}/AccountOverview.vue           | 0
 .../Pages => pages}/AccountOverview/GddTransactionList.spec.js    | 0
 .../{views/Pages => pages}/AccountOverview/GddTransactionList.vue | 0
 .../AccountOverview/GddTransactionListFooter.spec.js              | 0
 .../Pages => pages}/AccountOverview/GddTransactionListFooter.vue  | 0
 .../Pages => pages}/AccountOverview/GdtTransactionList.spec.js    | 0
 .../{views/Pages => pages}/AccountOverview/GdtTransactionList.vue | 0
 frontend/src/{views/Pages => pages}/ForgotPassword.spec.js        | 0
 frontend/src/{views/Pages => pages}/ForgotPassword.vue            | 0
 frontend/src/{views/Pages => pages}/Login.spec.js                 | 0
 frontend/src/{views/Pages => pages}/Login.vue                     | 0
 frontend/src/{views/Pages => pages}/Register.spec.js              | 0
 frontend/src/{views/Pages => pages}/Register.vue                  | 0
 frontend/src/{views/Pages => pages}/RegisterCommunity.spec.js     | 0
 frontend/src/{views/Pages => pages}/RegisterCommunity.vue         | 0
 .../src/{views/Pages => pages}/RegisterSelectCommunity.spec.js    | 0
 frontend/src/{views/Pages => pages}/RegisterSelectCommunity.vue   | 0
 frontend/src/{views/Pages => pages}/ResetPassword.spec.js         | 0
 frontend/src/{views/Pages => pages}/ResetPassword.vue             | 0
 frontend/src/{views/Pages => pages}/SendOverview.spec.js          | 0
 frontend/src/{views/Pages => pages}/SendOverview.vue              | 0
 frontend/src/{views/Pages => pages}/SendOverview/GddSend.spec.js  | 0
 frontend/src/{views/Pages => pages}/SendOverview/GddSend.vue      | 0
 .../{views/Pages => pages}/SendOverview/GddSend/QrCode.spec.js    | 0
 .../src/{views/Pages => pages}/SendOverview/GddSend/QrCode.vue    | 0
 .../SendOverview/GddSend/TransactionConfirmation.vue              | 0
 .../Pages => pages}/SendOverview/GddSend/TransactionForm.spec.js  | 0
 .../Pages => pages}/SendOverview/GddSend/TransactionForm.vue      | 0
 .../Pages => pages}/SendOverview/GddSend/TransactionResult.vue    | 0
 frontend/src/{views/Pages => pages}/UserProfile/UserCard.spec.js  | 0
 frontend/src/{views/Pages => pages}/UserProfile/UserCard.vue      | 0
 .../Pages => pages}/UserProfile/UserCard_CoinAnimation.spec.js    | 0
 .../{views/Pages => pages}/UserProfile/UserCard_CoinAnimation.vue | 0
 .../Pages => pages}/UserProfile/UserCard_FormUserData.spec.js     | 0
 .../{views/Pages => pages}/UserProfile/UserCard_FormUserData.vue  | 0
 .../Pages => pages}/UserProfile/UserCard_FormUserMail.spec.js     | 0
 .../{views/Pages => pages}/UserProfile/UserCard_FormUserMail.vue  | 0
 .../Pages => pages}/UserProfile/UserCard_FormUserPasswort.spec.js | 0
 .../Pages => pages}/UserProfile/UserCard_FormUserPasswort.vue     | 0
 .../Pages => pages}/UserProfile/UserCard_FormUsername.spec.js.old | 0
 .../Pages => pages}/UserProfile/UserCard_FormUsername.vue.old     | 0
 .../{views/Pages => pages}/UserProfile/UserCard_Language.spec.js  | 0
 .../src/{views/Pages => pages}/UserProfile/UserCard_Language.vue  | 0
 .../Pages => pages}/UserProfile/UserCard_Newsletter.spec.js       | 0
 .../{views/Pages => pages}/UserProfile/UserCard_Newsletter.vue    | 0
 frontend/src/{views/Pages => pages}/UserProfileOverview.spec.js   | 0
 frontend/src/{views/Pages => pages}/UserProfileOverview.vue       | 0
 .../src/{views/Pages => pages}/UserProfileTransactionList.spec.js | 0
 .../src/{views/Pages => pages}/UserProfileTransactionList.vue     | 0
 frontend/src/{views/Pages => pages}/thx.spec.js                   | 0
 frontend/src/{views/Pages => pages}/thx.vue                       | 0
 60 files changed, 0 insertions(+), 0 deletions(-)
 rename frontend/src/{views => components}/NotFoundPage.spec.js (100%)
 rename frontend/src/{views => components}/NotFoundPage.vue (100%)
 rename frontend/src/{views/Layout => layouts}/AuthLayout_gdd.spec.js (100%)
 rename frontend/src/{views/Layout => layouts}/AuthLayout_gdd.vue (100%)
 rename frontend/src/{views/Layout => layouts}/ContentFooter.spec.js (100%)
 rename frontend/src/{views/Layout => layouts}/ContentFooter.vue (100%)
 rename frontend/src/{views/Layout => layouts}/DashboardLayout_gdd.spec.js (100%)
 rename frontend/src/{views/Layout => layouts}/DashboardLayout_gdd.vue (100%)
 rename frontend/src/{views/Pages => pages}/AccountOverview.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/AccountOverview.vue (100%)
 rename frontend/src/{views/Pages => pages}/AccountOverview/GddTransactionList.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/AccountOverview/GddTransactionList.vue (100%)
 rename frontend/src/{views/Pages => pages}/AccountOverview/GddTransactionListFooter.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/AccountOverview/GddTransactionListFooter.vue (100%)
 rename frontend/src/{views/Pages => pages}/AccountOverview/GdtTransactionList.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/AccountOverview/GdtTransactionList.vue (100%)
 rename frontend/src/{views/Pages => pages}/ForgotPassword.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/ForgotPassword.vue (100%)
 rename frontend/src/{views/Pages => pages}/Login.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/Login.vue (100%)
 rename frontend/src/{views/Pages => pages}/Register.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/Register.vue (100%)
 rename frontend/src/{views/Pages => pages}/RegisterCommunity.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/RegisterCommunity.vue (100%)
 rename frontend/src/{views/Pages => pages}/RegisterSelectCommunity.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/RegisterSelectCommunity.vue (100%)
 rename frontend/src/{views/Pages => pages}/ResetPassword.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/ResetPassword.vue (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview.vue (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview/GddSend.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview/GddSend.vue (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview/GddSend/QrCode.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview/GddSend/QrCode.vue (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview/GddSend/TransactionConfirmation.vue (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview/GddSend/TransactionForm.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview/GddSend/TransactionForm.vue (100%)
 rename frontend/src/{views/Pages => pages}/SendOverview/GddSend/TransactionResult.vue (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard.vue (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_CoinAnimation.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_CoinAnimation.vue (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_FormUserData.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_FormUserData.vue (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_FormUserMail.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_FormUserMail.vue (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_FormUserPasswort.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_FormUserPasswort.vue (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_FormUsername.spec.js.old (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_FormUsername.vue.old (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_Language.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_Language.vue (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_Newsletter.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/UserProfile/UserCard_Newsletter.vue (100%)
 rename frontend/src/{views/Pages => pages}/UserProfileOverview.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/UserProfileOverview.vue (100%)
 rename frontend/src/{views/Pages => pages}/UserProfileTransactionList.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/UserProfileTransactionList.vue (100%)
 rename frontend/src/{views/Pages => pages}/thx.spec.js (100%)
 rename frontend/src/{views/Pages => pages}/thx.vue (100%)

diff --git a/frontend/src/views/NotFoundPage.spec.js b/frontend/src/components/NotFoundPage.spec.js
similarity index 100%
rename from frontend/src/views/NotFoundPage.spec.js
rename to frontend/src/components/NotFoundPage.spec.js
diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/components/NotFoundPage.vue
similarity index 100%
rename from frontend/src/views/NotFoundPage.vue
rename to frontend/src/components/NotFoundPage.vue
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.spec.js b/frontend/src/layouts/AuthLayout_gdd.spec.js
similarity index 100%
rename from frontend/src/views/Layout/AuthLayout_gdd.spec.js
rename to frontend/src/layouts/AuthLayout_gdd.spec.js
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/layouts/AuthLayout_gdd.vue
similarity index 100%
rename from frontend/src/views/Layout/AuthLayout_gdd.vue
rename to frontend/src/layouts/AuthLayout_gdd.vue
diff --git a/frontend/src/views/Layout/ContentFooter.spec.js b/frontend/src/layouts/ContentFooter.spec.js
similarity index 100%
rename from frontend/src/views/Layout/ContentFooter.spec.js
rename to frontend/src/layouts/ContentFooter.spec.js
diff --git a/frontend/src/views/Layout/ContentFooter.vue b/frontend/src/layouts/ContentFooter.vue
similarity index 100%
rename from frontend/src/views/Layout/ContentFooter.vue
rename to frontend/src/layouts/ContentFooter.vue
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/layouts/DashboardLayout_gdd.spec.js
similarity index 100%
rename from frontend/src/views/Layout/DashboardLayout_gdd.spec.js
rename to frontend/src/layouts/DashboardLayout_gdd.spec.js
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/layouts/DashboardLayout_gdd.vue
similarity index 100%
rename from frontend/src/views/Layout/DashboardLayout_gdd.vue
rename to frontend/src/layouts/DashboardLayout_gdd.vue
diff --git a/frontend/src/views/Pages/AccountOverview.spec.js b/frontend/src/pages/AccountOverview.spec.js
similarity index 100%
rename from frontend/src/views/Pages/AccountOverview.spec.js
rename to frontend/src/pages/AccountOverview.spec.js
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/pages/AccountOverview.vue
similarity index 100%
rename from frontend/src/views/Pages/AccountOverview.vue
rename to frontend/src/pages/AccountOverview.vue
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/pages/AccountOverview/GddTransactionList.spec.js
similarity index 100%
rename from frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
rename to frontend/src/pages/AccountOverview/GddTransactionList.spec.js
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/pages/AccountOverview/GddTransactionList.vue
similarity index 100%
rename from frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
rename to frontend/src/pages/AccountOverview/GddTransactionList.vue
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.spec.js b/frontend/src/pages/AccountOverview/GddTransactionListFooter.spec.js
similarity index 100%
rename from frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.spec.js
rename to frontend/src/pages/AccountOverview/GddTransactionListFooter.spec.js
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.vue b/frontend/src/pages/AccountOverview/GddTransactionListFooter.vue
similarity index 100%
rename from frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.vue
rename to frontend/src/pages/AccountOverview/GddTransactionListFooter.vue
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/pages/AccountOverview/GdtTransactionList.spec.js
similarity index 100%
rename from frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
rename to frontend/src/pages/AccountOverview/GdtTransactionList.spec.js
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/pages/AccountOverview/GdtTransactionList.vue
similarity index 100%
rename from frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
rename to frontend/src/pages/AccountOverview/GdtTransactionList.vue
diff --git a/frontend/src/views/Pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
similarity index 100%
rename from frontend/src/views/Pages/ForgotPassword.spec.js
rename to frontend/src/pages/ForgotPassword.spec.js
diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
similarity index 100%
rename from frontend/src/views/Pages/ForgotPassword.vue
rename to frontend/src/pages/ForgotPassword.vue
diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/pages/Login.spec.js
similarity index 100%
rename from frontend/src/views/Pages/Login.spec.js
rename to frontend/src/pages/Login.spec.js
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/pages/Login.vue
similarity index 100%
rename from frontend/src/views/Pages/Login.vue
rename to frontend/src/pages/Login.vue
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/pages/Register.spec.js
similarity index 100%
rename from frontend/src/views/Pages/Register.spec.js
rename to frontend/src/pages/Register.spec.js
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/pages/Register.vue
similarity index 100%
rename from frontend/src/views/Pages/Register.vue
rename to frontend/src/pages/Register.vue
diff --git a/frontend/src/views/Pages/RegisterCommunity.spec.js b/frontend/src/pages/RegisterCommunity.spec.js
similarity index 100%
rename from frontend/src/views/Pages/RegisterCommunity.spec.js
rename to frontend/src/pages/RegisterCommunity.spec.js
diff --git a/frontend/src/views/Pages/RegisterCommunity.vue b/frontend/src/pages/RegisterCommunity.vue
similarity index 100%
rename from frontend/src/views/Pages/RegisterCommunity.vue
rename to frontend/src/pages/RegisterCommunity.vue
diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js b/frontend/src/pages/RegisterSelectCommunity.spec.js
similarity index 100%
rename from frontend/src/views/Pages/RegisterSelectCommunity.spec.js
rename to frontend/src/pages/RegisterSelectCommunity.spec.js
diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.vue b/frontend/src/pages/RegisterSelectCommunity.vue
similarity index 100%
rename from frontend/src/views/Pages/RegisterSelectCommunity.vue
rename to frontend/src/pages/RegisterSelectCommunity.vue
diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js
similarity index 100%
rename from frontend/src/views/Pages/ResetPassword.spec.js
rename to frontend/src/pages/ResetPassword.spec.js
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
similarity index 100%
rename from frontend/src/views/Pages/ResetPassword.vue
rename to frontend/src/pages/ResetPassword.vue
diff --git a/frontend/src/views/Pages/SendOverview.spec.js b/frontend/src/pages/SendOverview.spec.js
similarity index 100%
rename from frontend/src/views/Pages/SendOverview.spec.js
rename to frontend/src/pages/SendOverview.spec.js
diff --git a/frontend/src/views/Pages/SendOverview.vue b/frontend/src/pages/SendOverview.vue
similarity index 100%
rename from frontend/src/views/Pages/SendOverview.vue
rename to frontend/src/pages/SendOverview.vue
diff --git a/frontend/src/views/Pages/SendOverview/GddSend.spec.js b/frontend/src/pages/SendOverview/GddSend.spec.js
similarity index 100%
rename from frontend/src/views/Pages/SendOverview/GddSend.spec.js
rename to frontend/src/pages/SendOverview/GddSend.spec.js
diff --git a/frontend/src/views/Pages/SendOverview/GddSend.vue b/frontend/src/pages/SendOverview/GddSend.vue
similarity index 100%
rename from frontend/src/views/Pages/SendOverview/GddSend.vue
rename to frontend/src/pages/SendOverview/GddSend.vue
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/QrCode.spec.js b/frontend/src/pages/SendOverview/GddSend/QrCode.spec.js
similarity index 100%
rename from frontend/src/views/Pages/SendOverview/GddSend/QrCode.spec.js
rename to frontend/src/pages/SendOverview/GddSend/QrCode.spec.js
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue b/frontend/src/pages/SendOverview/GddSend/QrCode.vue
similarity index 100%
rename from frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue
rename to frontend/src/pages/SendOverview/GddSend/QrCode.vue
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/pages/SendOverview/GddSend/TransactionConfirmation.vue
similarity index 100%
rename from frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
rename to frontend/src/pages/SendOverview/GddSend/TransactionConfirmation.vue
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js b/frontend/src/pages/SendOverview/GddSend/TransactionForm.spec.js
similarity index 100%
rename from frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js
rename to frontend/src/pages/SendOverview/GddSend/TransactionForm.spec.js
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue b/frontend/src/pages/SendOverview/GddSend/TransactionForm.vue
similarity index 100%
rename from frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.vue
rename to frontend/src/pages/SendOverview/GddSend/TransactionForm.vue
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue b/frontend/src/pages/SendOverview/GddSend/TransactionResult.vue
similarity index 100%
rename from frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue
rename to frontend/src/pages/SendOverview/GddSend/TransactionResult.vue
diff --git a/frontend/src/views/Pages/UserProfile/UserCard.spec.js b/frontend/src/pages/UserProfile/UserCard.spec.js
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard.spec.js
rename to frontend/src/pages/UserProfile/UserCard.spec.js
diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/pages/UserProfile/UserCard.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard.vue
rename to frontend/src/pages/UserProfile/UserCard.vue
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.spec.js b/frontend/src/pages/UserProfile/UserCard_CoinAnimation.spec.js
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.spec.js
rename to frontend/src/pages/UserProfile/UserCard_CoinAnimation.spec.js
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.vue b/frontend/src/pages/UserProfile/UserCard_CoinAnimation.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.vue
rename to frontend/src/pages/UserProfile/UserCard_CoinAnimation.vue
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js b/frontend/src/pages/UserProfile/UserCard_FormUserData.spec.js
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js
rename to frontend/src/pages/UserProfile/UserCard_FormUserData.spec.js
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/pages/UserProfile/UserCard_FormUserData.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
rename to frontend/src/pages/UserProfile/UserCard_FormUserData.vue
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserMail.spec.js b/frontend/src/pages/UserProfile/UserCard_FormUserMail.spec.js
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_FormUserMail.spec.js
rename to frontend/src/pages/UserProfile/UserCard_FormUserMail.spec.js
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserMail.vue b/frontend/src/pages/UserProfile/UserCard_FormUserMail.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_FormUserMail.vue
rename to frontend/src/pages/UserProfile/UserCard_FormUserMail.vue
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js b/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.spec.js
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
rename to frontend/src/pages/UserProfile/UserCard_FormUserPasswort.spec.js
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
rename to frontend/src/pages/UserProfile/UserCard_FormUserPasswort.vue
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js.old b/frontend/src/pages/UserProfile/UserCard_FormUsername.spec.js.old
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js.old
rename to frontend/src/pages/UserProfile/UserCard_FormUsername.spec.js.old
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue.old b/frontend/src/pages/UserProfile/UserCard_FormUsername.vue.old
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue.old
rename to frontend/src/pages/UserProfile/UserCard_FormUsername.vue.old
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.spec.js b/frontend/src/pages/UserProfile/UserCard_Language.spec.js
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_Language.spec.js
rename to frontend/src/pages/UserProfile/UserCard_Language.spec.js
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue b/frontend/src/pages/UserProfile/UserCard_Language.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_Language.vue
rename to frontend/src/pages/UserProfile/UserCard_Language.vue
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js b/frontend/src/pages/UserProfile/UserCard_Newsletter.spec.js
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js
rename to frontend/src/pages/UserProfile/UserCard_Newsletter.spec.js
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue b/frontend/src/pages/UserProfile/UserCard_Newsletter.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
rename to frontend/src/pages/UserProfile/UserCard_Newsletter.vue
diff --git a/frontend/src/views/Pages/UserProfileOverview.spec.js b/frontend/src/pages/UserProfileOverview.spec.js
similarity index 100%
rename from frontend/src/views/Pages/UserProfileOverview.spec.js
rename to frontend/src/pages/UserProfileOverview.spec.js
diff --git a/frontend/src/views/Pages/UserProfileOverview.vue b/frontend/src/pages/UserProfileOverview.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfileOverview.vue
rename to frontend/src/pages/UserProfileOverview.vue
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.spec.js b/frontend/src/pages/UserProfileTransactionList.spec.js
similarity index 100%
rename from frontend/src/views/Pages/UserProfileTransactionList.spec.js
rename to frontend/src/pages/UserProfileTransactionList.spec.js
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/pages/UserProfileTransactionList.vue
similarity index 100%
rename from frontend/src/views/Pages/UserProfileTransactionList.vue
rename to frontend/src/pages/UserProfileTransactionList.vue
diff --git a/frontend/src/views/Pages/thx.spec.js b/frontend/src/pages/thx.spec.js
similarity index 100%
rename from frontend/src/views/Pages/thx.spec.js
rename to frontend/src/pages/thx.spec.js
diff --git a/frontend/src/views/Pages/thx.vue b/frontend/src/pages/thx.vue
similarity index 100%
rename from frontend/src/views/Pages/thx.vue
rename to frontend/src/pages/thx.vue

From 14dcb3fa933fa64005b21616d7f42d2f92ed1975 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 18:47:14 +0100
Subject: [PATCH 03/14] resolve relative paths, rename pages

---
 frontend/jest.config.js                       |  1 +
 frontend/package.json                         |  3 --
 frontend/src/App.vue                          |  4 +--
 frontend/src/layouts/ContentFooter.vue        |  2 +-
 .../src/layouts/DashboardLayout_gdd.spec.js   |  2 +-
 frontend/src/layouts/DashboardLayout_gdd.vue  |  8 +++---
 .../AccountOverview/GddTransactionList.vue    | 12 ++++----
 .../GdtTransactionList.spec.js                |  4 +--
 .../AccountOverview/GdtTransactionList.vue    |  6 ++--
 frontend/src/pages/ForgotPassword.vue         |  4 +--
 frontend/src/pages/Login.spec.js              |  2 +-
 frontend/src/pages/Login.vue                  |  8 +++---
 ...countOverview.spec.js => Overview.spec.js} |  6 ++--
 .../{AccountOverview.vue => Overview.vue}     |  2 +-
 ...rofileOverview.spec.js => Profile.spec.js} |  6 ++--
 .../{UserProfileOverview.vue => Profile.vue}  |  0
 frontend/src/pages/Register.spec.js           |  2 +-
 frontend/src/pages/Register.vue               |  8 +++---
 frontend/src/pages/RegisterCommunity.spec.js  |  2 +-
 frontend/src/pages/RegisterCommunity.vue      |  2 +-
 frontend/src/pages/ResetPassword.spec.js      |  2 +-
 frontend/src/pages/ResetPassword.vue          |  4 +--
 ...munity.spec.js => SelectCommunity.spec.js} | 10 +++----
 ...electCommunity.vue => SelectCommunity.vue} |  4 +--
 .../{SendOverview.spec.js => Send.spec.js}    |  6 ++--
 .../src/pages/{SendOverview.vue => Send.vue}  |  2 +-
 ...ctionList.spec.js => Transactions.spec.js} |  6 ++--
 ...leTransactionList.vue => Transactions.vue} |  0
 .../UserCard_CoinAnimation.spec.js            |  4 +--
 .../UserProfile/UserCard_CoinAnimation.vue    |  2 +-
 .../UserProfile/UserCard_FormUserData.spec.js |  2 +-
 .../UserProfile/UserCard_FormUserData.vue     |  2 +-
 .../UserProfile/UserCard_FormUserMail.vue     |  2 +-
 .../UserCard_FormUserPasswort.spec.js         |  2 +-
 .../UserProfile/UserCard_FormUserPasswort.vue |  6 ++--
 .../UserProfile/UserCard_Language.spec.js     |  2 +-
 .../pages/UserProfile/UserCard_Language.vue   |  4 +--
 .../UserProfile/UserCard_Newsletter.spec.js   |  4 +--
 .../pages/UserProfile/UserCard_Newsletter.vue |  2 +-
 frontend/src/routes/router.test.js            |  2 +-
 frontend/src/routes/routes.js                 | 28 +++++++++----------
 41 files changed, 89 insertions(+), 91 deletions(-)
 rename frontend/src/pages/{AccountOverview.spec.js => Overview.spec.js} (89%)
 rename frontend/src/pages/{AccountOverview.vue => Overview.vue} (97%)
 rename frontend/src/pages/{UserProfileOverview.spec.js => Profile.spec.js} (83%)
 rename frontend/src/pages/{UserProfileOverview.vue => Profile.vue} (100%)
 rename frontend/src/pages/{RegisterSelectCommunity.spec.js => SelectCommunity.spec.js} (94%)
 rename frontend/src/pages/{RegisterSelectCommunity.vue => SelectCommunity.vue} (95%)
 rename frontend/src/pages/{SendOverview.spec.js => Send.spec.js} (96%)
 rename frontend/src/pages/{SendOverview.vue => Send.vue} (98%)
 rename frontend/src/pages/{UserProfileTransactionList.spec.js => Transactions.spec.js} (93%)
 rename frontend/src/pages/{UserProfileTransactionList.vue => Transactions.vue} (100%)

diff --git a/frontend/jest.config.js b/frontend/jest.config.js
index 5caae815c..2a52ec707 100644
--- a/frontend/jest.config.js
+++ b/frontend/jest.config.js
@@ -12,6 +12,7 @@ module.exports = {
     '\\.(css|less)$': 'identity-obj-proxy',
     '\\.(scss)$': '<rootDir>/src/assets/mocks/styleMock.js',
     '^@/(.*)$': '<rootDir>/src/$1',
+    '^@test/(.*)$': '<rootDir>/test/$1',
   },
   transform: {
     '^.+\\.vue$': 'vue-jest',
diff --git a/frontend/package.json b/frontend/package.json
index dcf9baf53..785ebb11d 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -82,9 +82,6 @@
     "vue-template-compiler": "^2.6.11",
     "webpack-bundle-analyzer": "^4.5.0"
   },
-  "_moduleAliases": {
-    "@components": "./components"
-  },
   "postcss": {
     "plugins": {
       "autoprefixer": {}
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index b14f5c8a2..39e417404 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -10,8 +10,8 @@
 <script>
 import { ParticlesBg } from 'particles-bg-vue'
 import icon from './icon.js'
-import DashboardLayout from '@/views/Layout/DashboardLayout_gdd.vue'
-import AuthLayoutGDD from '@/views/Layout/AuthLayout_gdd.vue'
+import DashboardLayout from '@/layouts/DashboardLayout_gdd.vue'
+import AuthLayoutGDD from '@/layouts/AuthLayout_gdd.vue'
 
 export default {
   name: 'app',
diff --git a/frontend/src/layouts/ContentFooter.vue b/frontend/src/layouts/ContentFooter.vue
index dedfc4765..9d45cddb6 100755
--- a/frontend/src/layouts/ContentFooter.vue
+++ b/frontend/src/layouts/ContentFooter.vue
@@ -59,7 +59,7 @@
   </footer>
 </template>
 <script>
-import CONFIG from '../../config'
+import CONFIG from '@/config'
 
 export default {
   data() {
diff --git a/frontend/src/layouts/DashboardLayout_gdd.spec.js b/frontend/src/layouts/DashboardLayout_gdd.spec.js
index 87362a6c3..8765c95e7 100644
--- a/frontend/src/layouts/DashboardLayout_gdd.spec.js
+++ b/frontend/src/layouts/DashboardLayout_gdd.spec.js
@@ -2,7 +2,7 @@ import { mount, RouterLinkStub } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
 import DashboardLayoutGdd from './DashboardLayout_gdd'
 
-import { toastErrorSpy } from '../../../test/testSetup'
+import { toastErrorSpy } from '@test/testSetup'
 
 jest.useFakeTimers()
 
diff --git a/frontend/src/layouts/DashboardLayout_gdd.vue b/frontend/src/layouts/DashboardLayout_gdd.vue
index 3ec3091de..a8b356bd1 100755
--- a/frontend/src/layouts/DashboardLayout_gdd.vue
+++ b/frontend/src/layouts/DashboardLayout_gdd.vue
@@ -37,12 +37,12 @@
   </div>
 </template>
 <script>
-import Navbar from '../../components/Menu/Navbar.vue'
-import Sidebar from '../../components/Menu/Sidebar.vue'
-import { logout, transactionsQuery } from '../../graphql/queries'
+import Navbar from '@/components/Menu/Navbar.vue'
+import Sidebar from '@/components/Menu/Sidebar.vue'
+import { logout, transactionsQuery } from '@/graphql/queries'
 import ContentFooter from './ContentFooter.vue'
 import { FadeTransition } from 'vue2-transitions'
-import CONFIG from '../../config'
+import CONFIG from '@/config'
 
 export default {
   components: {
diff --git a/frontend/src/pages/AccountOverview/GddTransactionList.vue b/frontend/src/pages/AccountOverview/GddTransactionList.vue
index bd66630eb..c48d8a88e 100644
--- a/frontend/src/pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/pages/AccountOverview/GddTransactionList.vue
@@ -57,12 +57,12 @@
 </template>
 
 <script>
-import TransactionListItem from '../../../components/TransactionListItem'
-import PaginationButtons from '../../../components/PaginationButtons'
-import TransactionDecay from '../../../components/Transactions/TransactionDecay'
-import TransactionSend from '../../../components/Transactions/TransactionSend'
-import TransactionReceive from '../../../components/Transactions/TransactionReceive'
-import TransactionCreation from '../../../components/Transactions/TransactionCreation'
+import TransactionListItem from '@/components/TransactionListItem'
+import PaginationButtons from '@/components/PaginationButtons'
+import TransactionDecay from '@/components/Transactions/TransactionDecay'
+import TransactionSend from '@/components/Transactions/TransactionSend'
+import TransactionReceive from '@/components/Transactions/TransactionReceive'
+import TransactionCreation from '@/components/Transactions/TransactionCreation'
 
 export default {
   name: 'gdd-transaction-list',
diff --git a/frontend/src/pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/pages/AccountOverview/GdtTransactionList.spec.js
index 42c03b8a3..a04cdc905 100644
--- a/frontend/src/pages/AccountOverview/GdtTransactionList.spec.js
+++ b/frontend/src/pages/AccountOverview/GdtTransactionList.spec.js
@@ -1,8 +1,8 @@
 import { mount } from '@vue/test-utils'
-import { GdtEntryType } from '../../../graphql/enums'
+import { GdtEntryType } from '@/graphql/enums'
 import GdtTransactionList from './GdtTransactionList'
 
-import { toastErrorSpy } from '../../../../test/testSetup'
+import { toastErrorSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/AccountOverview/GdtTransactionList.vue b/frontend/src/pages/AccountOverview/GdtTransactionList.vue
index ed38ee952..0c061ed06 100644
--- a/frontend/src/pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/pages/AccountOverview/GdtTransactionList.vue
@@ -36,9 +36,9 @@
 </template>
 
 <script>
-import { listGDTEntriesQuery } from '../../../graphql/queries'
-import PaginationButtons from '../../../components/PaginationButtons'
-import Transaction from '../../../components/Transaction.vue'
+import { listGDTEntriesQuery } from '@/graphql/queries'
+import PaginationButtons from '@/components/PaginationButtons'
+import Transaction from '@/components/Transaction.vue'
 
 export default {
   name: 'gdt-transaction-list',
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 654711dc7..87c31dcf2 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -38,8 +38,8 @@
   </div>
 </template>
 <script>
-import { sendResetPasswordEmail } from '../../graphql/queries'
-import InputEmail from '../../components/Inputs/InputEmail'
+import { sendResetPasswordEmail } from '@/graphql/queries'
+import InputEmail from '@/components/Inputs/InputEmail'
 
 const textFields = {
   reset: {
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 3035c15eb..411bba88b 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -2,7 +2,7 @@ import { RouterLinkStub, mount } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
 import Login from './Login'
 
-import { toastErrorSpy } from '../../../test/testSetup'
+import { toastErrorSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 42bf7cc01..67afc6a8c 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -60,10 +60,10 @@
   </div>
 </template>
 <script>
-import InputPassword from '../../components/Inputs/InputPassword'
-import InputEmail from '../../components/Inputs/InputEmail'
-import { login } from '../../graphql/queries'
-import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo'
+import InputPassword from '@/components/Inputs/InputPassword'
+import InputEmail from '@/components/Inputs/InputEmail'
+import { login } from '@/graphql/queries'
+import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
 
 export default {
   name: 'login',
diff --git a/frontend/src/pages/AccountOverview.spec.js b/frontend/src/pages/Overview.spec.js
similarity index 89%
rename from frontend/src/pages/AccountOverview.spec.js
rename to frontend/src/pages/Overview.spec.js
index c55317333..af234801e 100644
--- a/frontend/src/pages/AccountOverview.spec.js
+++ b/frontend/src/pages/Overview.spec.js
@@ -1,11 +1,11 @@
 import { mount } from '@vue/test-utils'
-import AccountOverview from './AccountOverview'
+import Overview from './Overview'
 
 const localVue = global.localVue
 
 window.scrollTo = jest.fn()
 
-describe('AccountOverview', () => {
+describe('Overview', () => {
   let wrapper
 
   const mocks = {
@@ -14,7 +14,7 @@ describe('AccountOverview', () => {
   }
 
   const Wrapper = () => {
-    return mount(AccountOverview, {
+    return mount(Overview, {
       localVue,
       mocks,
     })
diff --git a/frontend/src/pages/AccountOverview.vue b/frontend/src/pages/Overview.vue
similarity index 97%
rename from frontend/src/pages/AccountOverview.vue
rename to frontend/src/pages/Overview.vue
index ee11f7fdc..dcbf3823c 100644
--- a/frontend/src/pages/AccountOverview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -27,7 +27,7 @@
   </div>
 </template>
 <script>
-import Status from '../../components/Status.vue'
+import Status from '@/components/Status.vue'
 import GddTransactionList from './AccountOverview/GddTransactionList.vue'
 import GddTransactionListFooter from './AccountOverview/GddTransactionListFooter.vue'
 
diff --git a/frontend/src/pages/UserProfileOverview.spec.js b/frontend/src/pages/Profile.spec.js
similarity index 83%
rename from frontend/src/pages/UserProfileOverview.spec.js
rename to frontend/src/pages/Profile.spec.js
index 7b75b0dd2..5df365cac 100644
--- a/frontend/src/pages/UserProfileOverview.spec.js
+++ b/frontend/src/pages/Profile.spec.js
@@ -1,9 +1,9 @@
 import { shallowMount } from '@vue/test-utils'
-import UserProfileOverview from './UserProfileOverview'
+import Profile from './Profile'
 
 const localVue = global.localVue
 
-describe('UserProfileOverview', () => {
+describe('Profile', () => {
   let wrapper
 
   const mocks = {
@@ -11,7 +11,7 @@ describe('UserProfileOverview', () => {
   }
 
   const Wrapper = () => {
-    return shallowMount(UserProfileOverview, { localVue, mocks })
+    return shallowMount(Profile, { localVue, mocks })
   }
 
   describe('shallow Mount', () => {
diff --git a/frontend/src/pages/UserProfileOverview.vue b/frontend/src/pages/Profile.vue
similarity index 100%
rename from frontend/src/pages/UserProfileOverview.vue
rename to frontend/src/pages/Profile.vue
diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index 4ec3cc0a2..29f88b38f 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -2,7 +2,7 @@ import { mount, RouterLinkStub } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
 import Register from './Register'
 
-import { toastErrorSpy } from '../../../test/testSetup'
+import { toastErrorSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 03012cf34..224ee4ea4 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -188,10 +188,10 @@
   </div>
 </template>
 <script>
-import InputEmail from '../../components/Inputs/InputEmail.vue'
-import LanguageSwitchSelect from '../../components/LanguageSwitchSelect.vue'
-import { createUser } from '../../graphql/mutations'
-import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo'
+import InputEmail from '@/components/Inputs/InputEmail.vue'
+import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue'
+import { createUser } from '@/graphql/mutations'
+import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
 
 export default {
   components: { InputEmail, LanguageSwitchSelect },
diff --git a/frontend/src/pages/RegisterCommunity.spec.js b/frontend/src/pages/RegisterCommunity.spec.js
index b1215a609..deb1d999d 100644
--- a/frontend/src/pages/RegisterCommunity.spec.js
+++ b/frontend/src/pages/RegisterCommunity.spec.js
@@ -1,7 +1,7 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
 import RegisterCommunity from './RegisterCommunity'
 
-import { toastErrorSpy } from '../../../test/testSetup'
+import { toastErrorSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/RegisterCommunity.vue b/frontend/src/pages/RegisterCommunity.vue
index 594c69571..406fa3a7f 100644
--- a/frontend/src/pages/RegisterCommunity.vue
+++ b/frontend/src/pages/RegisterCommunity.vue
@@ -49,7 +49,7 @@
   </div>
 </template>
 <script>
-import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo'
+import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
 
 export default {
   name: 'registerCommunity',
diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js
index 5ee2742f2..5c02a41ab 100644
--- a/frontend/src/pages/ResetPassword.spec.js
+++ b/frontend/src/pages/ResetPassword.spec.js
@@ -2,7 +2,7 @@ import { mount, RouterLinkStub } from '@vue/test-utils'
 import ResetPassword from './ResetPassword'
 import flushPromises from 'flush-promises'
 
-import { toastErrorSpy } from '../../../test/testSetup'
+import { toastErrorSpy } from '@test/testSetup'
 
 // validation is tested in src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
 
diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index e4adeda9f..ee43df310 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -44,8 +44,8 @@
   </div>
 </template>
 <script>
-import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation'
-import { setPassword } from '../../graphql/mutations'
+import InputPasswordConfirmation from '@/components/Inputs/InputPasswordConfirmation'
+import { setPassword } from '@/graphql/mutations'
 
 const textFields = {
   reset: {
diff --git a/frontend/src/pages/RegisterSelectCommunity.spec.js b/frontend/src/pages/SelectCommunity.spec.js
similarity index 94%
rename from frontend/src/pages/RegisterSelectCommunity.spec.js
rename to frontend/src/pages/SelectCommunity.spec.js
index d2a13fb4e..f8896ae15 100644
--- a/frontend/src/pages/RegisterSelectCommunity.spec.js
+++ b/frontend/src/pages/SelectCommunity.spec.js
@@ -1,8 +1,8 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
-import { communities, communityInfo } from '../../graphql/queries'
-import RegisterSelectCommunity from './RegisterSelectCommunity'
+import { communities, communityInfo } from '@/graphql/queries'
+import SelectCommunity from './SelectCommunity'
 
-import { toastErrorSpy } from '../../../test/testSetup'
+import { toastErrorSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
@@ -56,7 +56,7 @@ const apolloQueryMock = jest
 
 const mockStoreCommit = jest.fn()
 
-describe('RegisterSelectCommunity', () => {
+describe('SelectCommunity', () => {
   let wrapper
 
   const mocks = {
@@ -86,7 +86,7 @@ describe('RegisterSelectCommunity', () => {
   }
 
   const Wrapper = () => {
-    return mount(RegisterSelectCommunity, { localVue, mocks, stubs })
+    return mount(SelectCommunity, { localVue, mocks, stubs })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/pages/RegisterSelectCommunity.vue b/frontend/src/pages/SelectCommunity.vue
similarity index 95%
rename from frontend/src/pages/RegisterSelectCommunity.vue
rename to frontend/src/pages/SelectCommunity.vue
index 28b89e95f..59650c168 100644
--- a/frontend/src/pages/RegisterSelectCommunity.vue
+++ b/frontend/src/pages/SelectCommunity.vue
@@ -48,8 +48,8 @@
   </div>
 </template>
 <script>
-import { communities } from '../../graphql/queries'
-import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo'
+import { communities } from '@/graphql/queries'
+import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
 
 export default {
   name: 'registerSelectCommunity',
diff --git a/frontend/src/pages/SendOverview.spec.js b/frontend/src/pages/Send.spec.js
similarity index 96%
rename from frontend/src/pages/SendOverview.spec.js
rename to frontend/src/pages/Send.spec.js
index a03fd3a5a..c724d965f 100644
--- a/frontend/src/pages/SendOverview.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import SendOverview from './SendOverview'
+import Send from './Send'
 
 const sendMock = jest.fn()
 sendMock.mockResolvedValue('success')
@@ -8,7 +8,7 @@ const localVue = global.localVue
 
 // window.scrollTo = jest.fn()
 
-describe('SendOverview', () => {
+describe('Send', () => {
   let wrapper
 
   const propsData = {
@@ -32,7 +32,7 @@ describe('SendOverview', () => {
   }
 
   const Wrapper = () => {
-    return mount(SendOverview, { localVue, mocks, propsData })
+    return mount(Send, { localVue, mocks, propsData })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/pages/SendOverview.vue b/frontend/src/pages/Send.vue
similarity index 98%
rename from frontend/src/pages/SendOverview.vue
rename to frontend/src/pages/Send.vue
index d247e1bbe..db8e8d314 100644
--- a/frontend/src/pages/SendOverview.vue
+++ b/frontend/src/pages/Send.vue
@@ -34,7 +34,7 @@ import GddSend from './SendOverview/GddSend.vue'
 import TransactionForm from './SendOverview/GddSend/TransactionForm.vue'
 import TransactionConfirmation from './SendOverview/GddSend/TransactionConfirmation.vue'
 import TransactionResult from './SendOverview/GddSend/TransactionResult.vue'
-import { sendCoins } from '../../graphql/mutations.js'
+import { sendCoins } from '@/graphql/mutations.js'
 
 const EMPTY_TRANSACTION_DATA = {
   email: '',
diff --git a/frontend/src/pages/UserProfileTransactionList.spec.js b/frontend/src/pages/Transactions.spec.js
similarity index 93%
rename from frontend/src/pages/UserProfileTransactionList.spec.js
rename to frontend/src/pages/Transactions.spec.js
index a9ab48a19..25bc05985 100644
--- a/frontend/src/pages/UserProfileTransactionList.spec.js
+++ b/frontend/src/pages/Transactions.spec.js
@@ -1,11 +1,11 @@
 import { mount } from '@vue/test-utils'
-import UserProfileTransactionList from './UserProfileTransactionList'
+import Transactions from './Transactions'
 
 const localVue = global.localVue
 
 window.scrollTo = jest.fn()
 
-describe('UserProfileTransactionList', () => {
+describe('Transactions', () => {
   let wrapper
 
   const mocks = {
@@ -22,7 +22,7 @@ describe('UserProfileTransactionList', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserProfileTransactionList, { localVue, mocks, stubs })
+    return mount(Transactions, { localVue, mocks, stubs })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/pages/UserProfileTransactionList.vue b/frontend/src/pages/Transactions.vue
similarity index 100%
rename from frontend/src/pages/UserProfileTransactionList.vue
rename to frontend/src/pages/Transactions.vue
diff --git a/frontend/src/pages/UserProfile/UserCard_CoinAnimation.spec.js b/frontend/src/pages/UserProfile/UserCard_CoinAnimation.spec.js
index 4cc4477b1..92c2f2b54 100644
--- a/frontend/src/pages/UserProfile/UserCard_CoinAnimation.spec.js
+++ b/frontend/src/pages/UserProfile/UserCard_CoinAnimation.spec.js
@@ -1,8 +1,8 @@
 import { mount } from '@vue/test-utils'
 import UserCardCoinAnimation from './UserCard_CoinAnimation'
-import { updateUserInfos } from '../../../graphql/mutations'
+import { updateUserInfos } from '@/graphql/mutations'
 
-import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
+import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/UserProfile/UserCard_CoinAnimation.vue b/frontend/src/pages/UserProfile/UserCard_CoinAnimation.vue
index 8f68224a9..19a082e41 100644
--- a/frontend/src/pages/UserProfile/UserCard_CoinAnimation.vue
+++ b/frontend/src/pages/UserProfile/UserCard_CoinAnimation.vue
@@ -31,7 +31,7 @@
   </b-card>
 </template>
 <script>
-import { updateUserInfos } from '../../../graphql/mutations'
+import { updateUserInfos } from '@/graphql/mutations'
 export default {
   name: 'FormUserCoinAnimation',
   data() {
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserData.spec.js b/frontend/src/pages/UserProfile/UserCard_FormUserData.spec.js
index c86a335c7..956318367 100644
--- a/frontend/src/pages/UserProfile/UserCard_FormUserData.spec.js
+++ b/frontend/src/pages/UserProfile/UserCard_FormUserData.spec.js
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
 import UserCardFormUserData from './UserCard_FormUserData'
 import flushPromises from 'flush-promises'
 
-import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
+import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/pages/UserProfile/UserCard_FormUserData.vue
index 33fcccaab..56b8e171c 100644
--- a/frontend/src/pages/UserProfile/UserCard_FormUserData.vue
+++ b/frontend/src/pages/UserProfile/UserCard_FormUserData.vue
@@ -64,7 +64,7 @@
   </b-card>
 </template>
 <script>
-import { updateUserInfos } from '../../../graphql/mutations'
+import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
   name: 'FormUserData',
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserMail.vue b/frontend/src/pages/UserProfile/UserCard_FormUserMail.vue
index de276afdf..f21d8ffa3 100644
--- a/frontend/src/pages/UserProfile/UserCard_FormUserMail.vue
+++ b/frontend/src/pages/UserProfile/UserCard_FormUserMail.vue
@@ -32,7 +32,7 @@
   </b-card>
 </template>
 <script>
-import { updateUserInfos } from '../../../graphql/mutations'
+import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
   name: 'FormUserMail',
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.spec.js b/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.spec.js
index 0299bdc1b..fb79c42c8 100644
--- a/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.spec.js
+++ b/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.spec.js
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
 import UserCardFormPasswort from './UserCard_FormUserPasswort'
 import flushPromises from 'flush-promises'
 
-import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
+import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.vue
index d1608d72e..690edb83e 100644
--- a/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -48,9 +48,9 @@
   </b-card>
 </template>
 <script>
-import InputPassword from '../../../components/Inputs/InputPassword'
-import InputPasswordConfirmation from '../../../components/Inputs/InputPasswordConfirmation'
-import { updateUserInfos } from '../../../graphql/mutations'
+import InputPassword from '@/components/Inputs/InputPassword'
+import InputPasswordConfirmation from '@/components/Inputs/InputPasswordConfirmation'
+import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
   name: 'FormUserPasswort',
diff --git a/frontend/src/pages/UserProfile/UserCard_Language.spec.js b/frontend/src/pages/UserProfile/UserCard_Language.spec.js
index e30632cec..5f54d2905 100644
--- a/frontend/src/pages/UserProfile/UserCard_Language.spec.js
+++ b/frontend/src/pages/UserProfile/UserCard_Language.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils'
 import UserCardLanguage from './UserCard_Language'
 
-import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
+import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/UserProfile/UserCard_Language.vue b/frontend/src/pages/UserProfile/UserCard_Language.vue
index 9109dde60..c792354de 100644
--- a/frontend/src/pages/UserProfile/UserCard_Language.vue
+++ b/frontend/src/pages/UserProfile/UserCard_Language.vue
@@ -60,8 +60,8 @@
   </b-card>
 </template>
 <script>
-import LanguageSwitchSelect from '../../../components/LanguageSwitchSelect.vue'
-import { updateUserInfos } from '../../../graphql/mutations'
+import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue'
+import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
   name: 'FormUserLanguage',
diff --git a/frontend/src/pages/UserProfile/UserCard_Newsletter.spec.js b/frontend/src/pages/UserProfile/UserCard_Newsletter.spec.js
index 1f552807f..8cb55e8c4 100644
--- a/frontend/src/pages/UserProfile/UserCard_Newsletter.spec.js
+++ b/frontend/src/pages/UserProfile/UserCard_Newsletter.spec.js
@@ -1,8 +1,8 @@
 import { mount } from '@vue/test-utils'
 import UserCardNewsletter from './UserCard_Newsletter'
-import { unsubscribeNewsletter, subscribeNewsletter } from '../../../graphql/mutations'
+import { unsubscribeNewsletter, subscribeNewsletter } from '@/graphql/mutations'
 
-import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
+import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/UserProfile/UserCard_Newsletter.vue b/frontend/src/pages/UserProfile/UserCard_Newsletter.vue
index 23834523e..b378406cf 100644
--- a/frontend/src/pages/UserProfile/UserCard_Newsletter.vue
+++ b/frontend/src/pages/UserProfile/UserCard_Newsletter.vue
@@ -27,7 +27,7 @@
   </b-card>
 </template>
 <script>
-import { subscribeNewsletter, unsubscribeNewsletter } from '../../../graphql/mutations'
+import { subscribeNewsletter, unsubscribeNewsletter } from '@/graphql/mutations'
 
 export default {
   name: 'FormUserNewsletter',
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index f82065bc0..eaf8fa035 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -1,5 +1,5 @@
 import router from './router'
-import NotFound from '@/views/NotFoundPage.vue'
+import NotFound from '@/components/NotFoundPage.vue'
 
 describe('router', () => {
   describe('options', () => {
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index fcb4e6fc6..f38f3b6ea 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -1,4 +1,4 @@
-import NotFound from '@/views/NotFoundPage.vue'
+import NotFound from '@/components/NotFoundPage.vue'
 
 const routes = [
   {
@@ -12,43 +12,43 @@ const routes = [
   },
   {
     path: '/overview',
-    component: () => import('../views/Pages/AccountOverview.vue'),
+    component: () => import('@/pages/Overview.vue'),
     meta: {
       requiresAuth: true,
     },
   },
   {
     path: '/send',
-    component: () => import('../views/Pages/SendOverview.vue'),
+    component: () => import('@/pages/Send.vue'),
     meta: {
       requiresAuth: true,
     },
   },
   {
     path: '/profile',
-    component: () => import('../views/Pages/UserProfileOverview.vue'),
+    component: () => import('@/pages/Profile.vue'),
     meta: {
       requiresAuth: true,
     },
   },
   {
     path: '/transactions',
-    component: () => import('../views/Pages/UserProfileTransactionList.vue'),
+    component: () => import('@/pages/Transactions.vue'),
     meta: {
       requiresAuth: true,
     },
   },
   {
     path: '/login',
-    component: () => import('../views/Pages/Login.vue'),
+    component: () => import('@/pages/Login.vue'),
   },
   {
     path: '/register',
-    component: () => import('../views/Pages/Register.vue'),
+    component: () => import('@/pages/Register.vue'),
   },
   {
     path: '/thx/:comingFrom',
-    component: () => import('../views/Pages/thx.vue'),
+    component: () => import('@/pages/thx.vue'),
     beforeEnter: (to, from, next) => {
       const validFrom = ['password', 'reset', 'register', 'login', 'checkEmail']
       if (!validFrom.includes(from.path.split('/')[1])) {
@@ -60,27 +60,27 @@ const routes = [
   },
   {
     path: '/password',
-    component: () => import('../views/Pages/ForgotPassword.vue'),
+    component: () => import('@/pages/ForgotPassword.vue'),
   },
   {
     path: '/password/:comingFrom',
-    component: () => import('../views/Pages/ForgotPassword.vue'),
+    component: () => import('@/pages/ForgotPassword.vue'),
   },
   {
     path: '/register-community',
-    component: () => import('../views/Pages/RegisterCommunity.vue'),
+    component: () => import('@/pages/RegisterCommunity.vue'),
   },
   {
     path: '/select-community',
-    component: () => import('../views/Pages/RegisterSelectCommunity.vue'),
+    component: () => import('@/pages/SelectCommunity.vue'),
   },
   {
     path: '/reset/:optin',
-    component: () => import('../views/Pages/ResetPassword.vue'),
+    component: () => import('@/pages/ResetPassword.vue'),
   },
   {
     path: '/checkEmail/:optin',
-    component: () => import('../views/Pages/ResetPassword.vue'),
+    component: () => import('@/pages/ResetPassword.vue'),
   },
   { path: '*', component: NotFound },
 ]

From bcc3ca49077a11012100601888b2ae32f0f6c37f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 19:07:14 +0100
Subject: [PATCH 04/14] rename password with forgot-password

---
 frontend/src/pages/ForgotPassword.spec.js |  8 ++++----
 frontend/src/pages/ForgotPassword.vue     |  6 +++---
 frontend/src/pages/Login.spec.js          |  4 ++--
 frontend/src/pages/Login.vue              |  2 +-
 frontend/src/pages/ResetPassword.spec.js  |  4 ++--
 frontend/src/pages/ResetPassword.vue      |  2 +-
 frontend/src/pages/thx.spec.js            |  6 +++---
 frontend/src/pages/thx.vue                |  2 +-
 frontend/src/routes/router.test.js        | 18 ++++++++++--------
 frontend/src/routes/routes.js             |  6 +++---
 10 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index 41f1575cd..b8f1be3c0 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -116,7 +116,7 @@ describe('ForgotPassword', () => {
               await flushPromises()
             })
 
-            it('pushes to "/thx/password"', () => {
+            it('pushes to "/thx/forgotPassword"', () => {
               expect(mockAPIcall).toBeCalledWith(
                 expect.objectContaining({
                   variables: {
@@ -124,7 +124,7 @@ describe('ForgotPassword', () => {
                   },
                 }),
               )
-              expect(mockRouterPush).toHaveBeenCalledWith('/thx/password')
+              expect(mockRouterPush).toHaveBeenCalledWith('/thx/forgotPassword')
             })
           })
 
@@ -141,7 +141,7 @@ describe('ForgotPassword', () => {
               await flushPromises()
             })
 
-            it('pushes to "/thx/password"', () => {
+            it('pushes to "/thx/forgotPassword"', () => {
               expect(mockAPIcall).toBeCalledWith(
                 expect.objectContaining({
                   variables: {
@@ -149,7 +149,7 @@ describe('ForgotPassword', () => {
                   },
                 }),
               )
-              expect(mockRouterPush).toHaveBeenCalledWith('/thx/password')
+              expect(mockRouterPush).toHaveBeenCalledWith('/thx/forgotPassword')
             })
           })
         })
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 87c31dcf2..7d389ff59 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -57,7 +57,7 @@ const textFields = {
 }
 
 export default {
-  name: 'password',
+  name: 'ForgotPassword',
   components: {
     InputEmail,
   },
@@ -80,10 +80,10 @@ export default {
           },
         })
         .then(() => {
-          this.$router.push('/thx/password')
+          this.$router.push('/thx/forgotPassword')
         })
         .catch(() => {
-          this.$router.push('/thx/password')
+          this.$router.push('/thx/forgotPassword')
         })
     },
   },
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 411bba88b..ce32e1971 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -136,8 +136,8 @@ describe('Login', () => {
         )
       })
 
-      it('links to /password when clicking "Forgot Password"', () => {
-        expect(wrapper.findAllComponents(RouterLinkStub).at(0).props().to).toBe('/password')
+      it('links to /forgot-password when clicking "Forgot Password"', () => {
+        expect(wrapper.findAllComponents(RouterLinkStub).at(0).props().to).toBe('/forgot-password')
       })
 
       it('has a link "Create new account"', () => {
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 67afc6a8c..75b9ae1e3 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -44,7 +44,7 @@
           </b-card>
           <b-row class="mt-3">
             <b-col cols="6" class="text-center text-sm-left col-12 col-sm-6 pb-5">
-              <router-link to="/password" class="mt-3">
+              <router-link to="/forgot-password" class="mt-3">
                 {{ $t('settings.password.forgot_pwd') }}
               </router-link>
             </b-col>
diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js
index 5c02a41ab..0e798c193 100644
--- a/frontend/src/pages/ResetPassword.spec.js
+++ b/frontend/src/pages/ResetPassword.spec.js
@@ -156,8 +156,8 @@ describe('ResetPassword', () => {
             expect(toastErrorSpy).toHaveBeenCalledWith('...Code is older than 10 minutes')
           })
 
-          it('router pushes to /password/reset', () => {
-            expect(routerPushMock).toHaveBeenCalledWith('/password/reset')
+          it('router pushes to /forgot-password/reset', () => {
+            expect(routerPushMock).toHaveBeenCalledWith('/forgot-password/reset')
           })
         })
 
diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index ee43df310..970cf1cba 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -101,7 +101,7 @@ export default {
         .catch((error) => {
           this.toastError(error.message)
           if (error.message.includes('Code is older than 10 minutes'))
-            this.$router.push('/password/reset')
+            this.$router.push('/forgot-password/reset')
         })
     },
     setDisplaySetup() {
diff --git a/frontend/src/pages/thx.spec.js b/frontend/src/pages/thx.spec.js
index 7d3925a0c..bcba121bd 100644
--- a/frontend/src/pages/thx.spec.js
+++ b/frontend/src/pages/thx.spec.js
@@ -23,7 +23,7 @@ describe('Thx', () => {
 
   describe('mount', () => {
     beforeEach(() => {
-      wrapper = Wrapper(createMockObject('password'))
+      wrapper = Wrapper(createMockObject('forgotPassword'))
     })
 
     it('renders the thx page', () => {
@@ -35,9 +35,9 @@ describe('Thx', () => {
     })
   })
 
-  describe('coming from /password', () => {
+  describe('coming from /forgot-password', () => {
     beforeEach(() => {
-      wrapper = Wrapper(createMockObject('password'))
+      wrapper = Wrapper(createMockObject('forgotPassword'))
     })
 
     it('renders the thanks text', () => {
diff --git a/frontend/src/pages/thx.vue b/frontend/src/pages/thx.vue
index cd74f1872..1308ca0fc 100644
--- a/frontend/src/pages/thx.vue
+++ b/frontend/src/pages/thx.vue
@@ -18,7 +18,7 @@
 </template>
 <script>
 const textFields = {
-  password: {
+  forgotPassword: {
     headline: 'site.thx.title',
     subtitle: 'site.thx.email',
     button: 'login',
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index eaf8fa035..7ad08ed74 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -130,23 +130,25 @@ describe('router', () => {
 
           it('enters the page when coming from a valid page', () => {
             jest.resetAllMocks()
-            beforeEnter({}, { path: '/password' }, next)
+            beforeEnter({}, { path: '/forgot-password' }, next)
             expect(next).toBeCalledWith()
           })
         })
       })
 
-      describe('password', () => {
-        it('loads the "Password" component', async () => {
-          const component = await routes.find((r) => r.path === '/password').component()
-          expect(component.default.name).toBe('password')
+      describe('forgot password', () => {
+        it('loads the "ForgotPassword" component', async () => {
+          const component = await routes.find((r) => r.path === '/forgot-password').component()
+          expect(component.default.name).toBe('ForgotPassword')
         })
       })
 
       describe('password with param comingFrom', () => {
-        it('loads the "Password" component', async () => {
-          const component = await routes.find((r) => r.path === '/password/:comingFrom').component()
-          expect(component.default.name).toBe('password')
+        it('loads the "ForgotPassword" component', async () => {
+          const component = await routes
+            .find((r) => r.path === '/forgot-password/:comingFrom')
+            .component()
+          expect(component.default.name).toBe('ForgotPassword')
         })
       })
 
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index f38f3b6ea..5e7046d9b 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -50,7 +50,7 @@ const routes = [
     path: '/thx/:comingFrom',
     component: () => import('@/pages/thx.vue'),
     beforeEnter: (to, from, next) => {
-      const validFrom = ['password', 'reset', 'register', 'login', 'checkEmail']
+      const validFrom = ['forgot-password', 'reset', 'register', 'login', 'checkEmail']
       if (!validFrom.includes(from.path.split('/')[1])) {
         next({ path: '/login' })
       } else {
@@ -59,11 +59,11 @@ const routes = [
     },
   },
   {
-    path: '/password',
+    path: '/forgot-password',
     component: () => import('@/pages/ForgotPassword.vue'),
   },
   {
-    path: '/password/:comingFrom',
+    path: '/forgot-password/:comingFrom',
     component: () => import('@/pages/ForgotPassword.vue'),
   },
   {

From 33fc91842901870d4d63126531445fbcab73ec32 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 19:22:15 +0100
Subject: [PATCH 05/14] change route for reset password email

---
 backend/src/config/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 448eb57ab..82fb9ff2b 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -65,7 +65,8 @@ const email = {
   EMAIL_SMTP_PORT: process.env.EMAIL_SMTP_PORT || '587',
   EMAIL_LINK_VERIFICATION:
     process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/checkEmail/{code}',
-  EMAIL_LINK_SETPASSWORD: process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/reset/{code}',
+  EMAIL_LINK_SETPASSWORD:
+    process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/reset-password/{code}',
   RESEND_TIME: isNaN(resendTime) ? 10 : resendTime,
 }
 

From 574c1cf20324dab7c52f47b94f3cbc7a3941534b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 19:23:08 +0100
Subject: [PATCH 06/14] rename route for reset-password

---
 frontend/src/pages/ForgotPassword.spec.js |  2 +-
 frontend/src/pages/ForgotPassword.vue     |  2 +-
 frontend/src/pages/Login.spec.js          |  4 ++--
 frontend/src/pages/Login.vue              |  2 +-
 frontend/src/pages/ResetPassword.spec.js  | 14 +++++++-------
 frontend/src/pages/ResetPassword.vue      |  6 +++---
 frontend/src/pages/thx.spec.js            |  4 ++--
 frontend/src/pages/thx.vue                |  2 +-
 frontend/src/routes/router.test.js        |  6 ++++--
 frontend/src/routes/routes.js             |  2 +-
 10 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index b8f1be3c0..a547f9cc1 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -158,7 +158,7 @@ describe('ForgotPassword', () => {
 
     describe('comingFrom login', () => {
       beforeEach(() => {
-        wrapper = Wrapper(createMockObject('reset'))
+        wrapper = Wrapper(createMockObject('resetPassword'))
       })
 
       it('has another subtitle', () => {
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 7d389ff59..eeb954a0c 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -42,7 +42,7 @@ import { sendResetPasswordEmail } from '@/graphql/queries'
 import InputEmail from '@/components/Inputs/InputEmail'
 
 const textFields = {
-  reset: {
+  resetPassword: {
     headline: 'settings.password.reset',
     subtitle: 'settings.password.resend_subtitle',
     button: 'settings.password.send_now',
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index ce32e1971..b0217104f 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -281,8 +281,8 @@ describe('Login', () => {
               await flushPromises()
             })
 
-            it('redirects to /reset/login', () => {
-              expect(mockRouterPush).toBeCalledWith('/reset/login')
+            it('redirects to /reset-password/login', () => {
+              expect(mockRouterPush).toBeCalledWith('/reset-password/login')
             })
           })
         })
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 75b9ae1e3..8a6d571af 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -109,7 +109,7 @@ export default {
           if (error.message.includes('User email not validated')) {
             this.$router.push('/thx/login')
           } else if (error.message.includes('User has no password set yet')) {
-            this.$router.push('/reset/login')
+            this.$router.push('/reset-password/login')
           }
           loader.hide()
         })
diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js
index 0e798c193..2230d13c8 100644
--- a/frontend/src/pages/ResetPassword.spec.js
+++ b/frontend/src/pages/ResetPassword.spec.js
@@ -78,7 +78,7 @@ describe('ResetPassword', () => {
       describe('Register header', () => {
         describe('from reset', () => {
           beforeEach(() => {
-            mocks.$route.path.mock = 'reset'
+            mocks.$route.path.mock = 'reset-password'
             wrapper = Wrapper()
           })
 
@@ -156,8 +156,8 @@ describe('ResetPassword', () => {
             expect(toastErrorSpy).toHaveBeenCalledWith('...Code is older than 10 minutes')
           })
 
-          it('router pushes to /forgot-password/reset', () => {
-            expect(routerPushMock).toHaveBeenCalledWith('/forgot-password/reset')
+          it('router pushes to /forgot-password/resetPassword', () => {
+            expect(routerPushMock).toHaveBeenCalledWith('/forgot-password/resetPassword')
           })
         })
 
@@ -204,9 +204,9 @@ describe('ResetPassword', () => {
           })
         })
 
-        describe('server response with success on /reset', () => {
+        describe('server response with success on /reset-password', () => {
           beforeEach(async () => {
-            mocks.$route.path.mock = 'reset'
+            mocks.$route.path.mock = 'reset-password'
             wrapper = Wrapper()
             apolloMutationMock.mockResolvedValue({
               data: {
@@ -219,8 +219,8 @@ describe('ResetPassword', () => {
             await flushPromises()
           })
 
-          it('redirects to "/thx/reset"', () => {
-            expect(routerPushMock).toHaveBeenCalledWith('/thx/reset')
+          it('redirects to "/thx/resetPassword"', () => {
+            expect(routerPushMock).toHaveBeenCalledWith('/thx/resetPassword')
           })
         })
       })
diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index 970cf1cba..830107a99 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -95,20 +95,20 @@ export default {
           if (this.$route.path.includes('checkEmail')) {
             this.$router.push('/thx/checkEmail')
           } else {
-            this.$router.push('/thx/reset')
+            this.$router.push('/thx/resetPassword')
           }
         })
         .catch((error) => {
           this.toastError(error.message)
           if (error.message.includes('Code is older than 10 minutes'))
-            this.$router.push('/forgot-password/reset')
+            this.$router.push('/forgot-password/resetPassword')
         })
     },
     setDisplaySetup() {
       if (this.$route.path.includes('checkEmail')) {
         this.displaySetup = textFields.checkEmail
       }
-      if (this.$route.path.includes('reset')) {
+      if (this.$route.path.includes('reset-password')) {
         this.displaySetup = textFields.reset
       }
     },
diff --git a/frontend/src/pages/thx.spec.js b/frontend/src/pages/thx.spec.js
index bcba121bd..ab1a3815b 100644
--- a/frontend/src/pages/thx.spec.js
+++ b/frontend/src/pages/thx.spec.js
@@ -53,9 +53,9 @@ describe('Thx', () => {
     })
   })
 
-  describe('coming from /reset', () => {
+  describe('coming from /reset-password', () => {
     beforeEach(() => {
-      wrapper = Wrapper(createMockObject('reset'))
+      wrapper = Wrapper(createMockObject('resetPassword'))
     })
 
     it('renders the thanks text', () => {
diff --git a/frontend/src/pages/thx.vue b/frontend/src/pages/thx.vue
index 1308ca0fc..fc721b63e 100644
--- a/frontend/src/pages/thx.vue
+++ b/frontend/src/pages/thx.vue
@@ -24,7 +24,7 @@ const textFields = {
     button: 'login',
     linkTo: '/login',
   },
-  reset: {
+  resetPassword: {
     headline: 'site.thx.title',
     subtitle: 'site.thx.reset',
     button: 'login',
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index 7ad08ed74..bea723c2f 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -166,9 +166,11 @@ describe('router', () => {
         })
       })
 
-      describe('reset', () => {
+      describe('reset password', () => {
         it('loads the "ResetPassword" component', async () => {
-          const component = await routes.find((r) => r.path === '/reset/:optin').component()
+          const component = await routes
+            .find((r) => r.path === '/reset-password/:optin')
+            .component()
           expect(component.default.name).toBe('ResetPassword')
         })
       })
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 5e7046d9b..3c138cfc9 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -75,7 +75,7 @@ const routes = [
     component: () => import('@/pages/SelectCommunity.vue'),
   },
   {
-    path: '/reset/:optin',
+    path: '/reset-password/:optin',
     component: () => import('@/pages/ResetPassword.vue'),
   },
   {

From 9d14e9dcb6ca07a5a5095c40a00af1f51d1e5dab Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 19:29:20 +0100
Subject: [PATCH 07/14] move folder AccountOverview to components

---
 .../AccountOverview => components}/GddTransactionList.spec.js | 0
 .../AccountOverview => components}/GddTransactionList.vue     | 0
 .../GddTransactionListFooter.spec.js                          | 0
 .../GddTransactionListFooter.vue                              | 0
 .../AccountOverview => components}/GdtTransactionList.spec.js | 0
 .../AccountOverview => components}/GdtTransactionList.vue     | 0
 frontend/src/pages/Overview.vue                               | 4 ++--
 frontend/src/pages/Transactions.vue                           | 4 ++--
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename frontend/src/{pages/AccountOverview => components}/GddTransactionList.spec.js (100%)
 rename frontend/src/{pages/AccountOverview => components}/GddTransactionList.vue (100%)
 rename frontend/src/{pages/AccountOverview => components}/GddTransactionListFooter.spec.js (100%)
 rename frontend/src/{pages/AccountOverview => components}/GddTransactionListFooter.vue (100%)
 rename frontend/src/{pages/AccountOverview => components}/GdtTransactionList.spec.js (100%)
 rename frontend/src/{pages/AccountOverview => components}/GdtTransactionList.vue (100%)

diff --git a/frontend/src/pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js
similarity index 100%
rename from frontend/src/pages/AccountOverview/GddTransactionList.spec.js
rename to frontend/src/components/GddTransactionList.spec.js
diff --git a/frontend/src/pages/AccountOverview/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
similarity index 100%
rename from frontend/src/pages/AccountOverview/GddTransactionList.vue
rename to frontend/src/components/GddTransactionList.vue
diff --git a/frontend/src/pages/AccountOverview/GddTransactionListFooter.spec.js b/frontend/src/components/GddTransactionListFooter.spec.js
similarity index 100%
rename from frontend/src/pages/AccountOverview/GddTransactionListFooter.spec.js
rename to frontend/src/components/GddTransactionListFooter.spec.js
diff --git a/frontend/src/pages/AccountOverview/GddTransactionListFooter.vue b/frontend/src/components/GddTransactionListFooter.vue
similarity index 100%
rename from frontend/src/pages/AccountOverview/GddTransactionListFooter.vue
rename to frontend/src/components/GddTransactionListFooter.vue
diff --git a/frontend/src/pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/components/GdtTransactionList.spec.js
similarity index 100%
rename from frontend/src/pages/AccountOverview/GdtTransactionList.spec.js
rename to frontend/src/components/GdtTransactionList.spec.js
diff --git a/frontend/src/pages/AccountOverview/GdtTransactionList.vue b/frontend/src/components/GdtTransactionList.vue
similarity index 100%
rename from frontend/src/pages/AccountOverview/GdtTransactionList.vue
rename to frontend/src/components/GdtTransactionList.vue
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index dcbf3823c..842f6d2d5 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -28,8 +28,8 @@
 </template>
 <script>
 import Status from '@/components/Status.vue'
-import GddTransactionList from './AccountOverview/GddTransactionList.vue'
-import GddTransactionListFooter from './AccountOverview/GddTransactionListFooter.vue'
+import GddTransactionList from '@/components/GddTransactionList.vue'
+import GddTransactionListFooter from '@/components/GddTransactionListFooter.vue'
 
 export default {
   name: 'Overview',
diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 4eac3ebba..f67f23ca3 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -26,8 +26,8 @@
   </div>
 </template>
 <script>
-import GddTransactionList from './AccountOverview/GddTransactionList.vue'
-import GdtTransactionList from './AccountOverview/GdtTransactionList.vue'
+import GddTransactionList from '@/components/GddTransactionList.vue'
+import GdtTransactionList from '@/components/GdtTransactionList.vue'
 
 export default {
   name: 'UserProfileTransactionList',

From 137408cda4cabcb7952ddd334ecd58a064db60bb Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 19:34:35 +0100
Subject: [PATCH 08/14] move SendOverview to components

---
 .../{pages/SendOverview => components}/GddSend.spec.js |  0
 .../src/{pages/SendOverview => components}/GddSend.vue |  0
 .../SendOverview => components}/GddSend/QrCode.spec.js |  0
 .../SendOverview => components}/GddSend/QrCode.vue     |  0
 .../GddSend/TransactionConfirmation.vue                |  0
 .../GddSend/TransactionForm.spec.js                    |  0
 .../GddSend/TransactionForm.vue                        |  0
 .../GddSend/TransactionResult.vue                      |  0
 frontend/src/pages/Profile.vue                         |  2 +-
 frontend/src/pages/Send.vue                            | 10 +++++-----
 frontend/src/routes/router.test.js                     |  4 ++--
 11 files changed, 8 insertions(+), 8 deletions(-)
 rename frontend/src/{pages/SendOverview => components}/GddSend.spec.js (100%)
 rename frontend/src/{pages/SendOverview => components}/GddSend.vue (100%)
 rename frontend/src/{pages/SendOverview => components}/GddSend/QrCode.spec.js (100%)
 rename frontend/src/{pages/SendOverview => components}/GddSend/QrCode.vue (100%)
 rename frontend/src/{pages/SendOverview => components}/GddSend/TransactionConfirmation.vue (100%)
 rename frontend/src/{pages/SendOverview => components}/GddSend/TransactionForm.spec.js (100%)
 rename frontend/src/{pages/SendOverview => components}/GddSend/TransactionForm.vue (100%)
 rename frontend/src/{pages/SendOverview => components}/GddSend/TransactionResult.vue (100%)

diff --git a/frontend/src/pages/SendOverview/GddSend.spec.js b/frontend/src/components/GddSend.spec.js
similarity index 100%
rename from frontend/src/pages/SendOverview/GddSend.spec.js
rename to frontend/src/components/GddSend.spec.js
diff --git a/frontend/src/pages/SendOverview/GddSend.vue b/frontend/src/components/GddSend.vue
similarity index 100%
rename from frontend/src/pages/SendOverview/GddSend.vue
rename to frontend/src/components/GddSend.vue
diff --git a/frontend/src/pages/SendOverview/GddSend/QrCode.spec.js b/frontend/src/components/GddSend/QrCode.spec.js
similarity index 100%
rename from frontend/src/pages/SendOverview/GddSend/QrCode.spec.js
rename to frontend/src/components/GddSend/QrCode.spec.js
diff --git a/frontend/src/pages/SendOverview/GddSend/QrCode.vue b/frontend/src/components/GddSend/QrCode.vue
similarity index 100%
rename from frontend/src/pages/SendOverview/GddSend/QrCode.vue
rename to frontend/src/components/GddSend/QrCode.vue
diff --git a/frontend/src/pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/components/GddSend/TransactionConfirmation.vue
similarity index 100%
rename from frontend/src/pages/SendOverview/GddSend/TransactionConfirmation.vue
rename to frontend/src/components/GddSend/TransactionConfirmation.vue
diff --git a/frontend/src/pages/SendOverview/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
similarity index 100%
rename from frontend/src/pages/SendOverview/GddSend/TransactionForm.spec.js
rename to frontend/src/components/GddSend/TransactionForm.spec.js
diff --git a/frontend/src/pages/SendOverview/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
similarity index 100%
rename from frontend/src/pages/SendOverview/GddSend/TransactionForm.vue
rename to frontend/src/components/GddSend/TransactionForm.vue
diff --git a/frontend/src/pages/SendOverview/GddSend/TransactionResult.vue b/frontend/src/components/GddSend/TransactionResult.vue
similarity index 100%
rename from frontend/src/pages/SendOverview/GddSend/TransactionResult.vue
rename to frontend/src/components/GddSend/TransactionResult.vue
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index d01c94373..e06511f78 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -21,7 +21,7 @@ import FormUserNewsletter from './UserProfile/UserCard_Newsletter.vue'
 import FormUserCoinAnimation from './UserProfile/UserCard_CoinAnimation.vue'
 
 export default {
-  name: 'UserProfile',
+  name: 'Profile',
   components: {
     UserCard,
     FormUserData,
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index db8e8d314..072342d7c 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -30,10 +30,10 @@
   </div>
 </template>
 <script>
-import GddSend from './SendOverview/GddSend.vue'
-import TransactionForm from './SendOverview/GddSend/TransactionForm.vue'
-import TransactionConfirmation from './SendOverview/GddSend/TransactionConfirmation.vue'
-import TransactionResult from './SendOverview/GddSend/TransactionResult.vue'
+import GddSend from '@/components/GddSend.vue'
+import TransactionForm from '@/components/GddSend/TransactionForm.vue'
+import TransactionConfirmation from '@/components/GddSend/TransactionConfirmation.vue'
+import TransactionResult from '@/components/GddSend/TransactionResult.vue'
 import { sendCoins } from '@/graphql/mutations.js'
 
 const EMPTY_TRANSACTION_DATA = {
@@ -43,7 +43,7 @@ const EMPTY_TRANSACTION_DATA = {
 }
 
 export default {
-  name: 'SendOverview',
+  name: 'Send',
   components: {
     GddSend,
     TransactionForm,
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index bea723c2f..3810f8f4b 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -71,7 +71,7 @@ describe('router', () => {
 
         it('loads the "Send" component', async () => {
           const component = await routes.find((r) => r.path === '/send').component()
-          expect(component.default.name).toBe('SendOverview')
+          expect(component.default.name).toBe('Send')
         })
       })
 
@@ -82,7 +82,7 @@ describe('router', () => {
 
         it('loads the "UserProfile" component', async () => {
           const component = await routes.find((r) => r.path === '/profile').component()
-          expect(component.default.name).toBe('UserProfile')
+          expect(component.default.name).toBe('Profile')
         })
       })
 

From 07dbce59dc5677fd9ecee4dfc438fae5dc03ed47 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 19:49:18 +0100
Subject: [PATCH 09/14] move UserProfile folder to components

---
 .../Inputs/InputPasswordConfirmation.spec.js  |  2 +-
 .../UserCard.spec.js                          |  0
 .../UserProfile => components}/UserCard.vue   |  0
 .../UserCard_CoinAnimation.spec.js            |  0
 .../UserCard_CoinAnimation.vue                |  0
 .../UserCard_FormUserData.spec.js             |  0
 .../UserCard_FormUserData.vue                 |  0
 .../UserCard_FormUserMail.spec.js             |  0
 .../UserCard_FormUserMail.vue                 |  0
 .../UserCard_FormUserPasswort.spec.js         |  0
 .../UserCard_FormUserPasswort.vue             |  0
 .../UserCard_FormUsername.spec.js.old         |  0
 .../UserCard_FormUsername.vue.old             |  0
 .../UserCard_Language.spec.js                 |  0
 .../UserCard_Language.vue                     |  0
 .../UserCard_Newsletter.spec.js               |  0
 .../UserCard_Newsletter.vue                   |  0
 frontend/src/pages/Login.vue                  |  2 +-
 .../NotFoundPage.spec.js                      |  0
 .../{components => pages}/NotFoundPage.vue    |  0
 frontend/src/pages/Profile.vue                | 12 +++---
 frontend/src/pages/Register.vue               |  2 +-
 frontend/src/pages/RegisterCommunity.vue      |  2 +-
 frontend/src/pages/ResetPassword.spec.js      |  2 +-
 frontend/src/pages/SelectCommunity.vue        |  2 +-
 frontend/src/pages/Transactions.vue           |  2 +-
 frontend/src/routes/guards.test.js            |  2 +-
 frontend/src/routes/router.test.js            | 40 +++++++++----------
 frontend/src/routes/routes.js                 |  2 +-
 29 files changed, 35 insertions(+), 35 deletions(-)
 rename frontend/src/{pages/UserProfile => components}/UserCard.spec.js (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard.vue (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_CoinAnimation.spec.js (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_CoinAnimation.vue (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_FormUserData.spec.js (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_FormUserData.vue (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_FormUserMail.spec.js (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_FormUserMail.vue (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_FormUserPasswort.spec.js (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_FormUserPasswort.vue (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_FormUsername.spec.js.old (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_FormUsername.vue.old (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_Language.spec.js (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_Language.vue (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_Newsletter.spec.js (100%)
 rename frontend/src/{pages/UserProfile => components}/UserCard_Newsletter.vue (100%)
 rename frontend/src/{components => pages}/NotFoundPage.spec.js (100%)
 rename frontend/src/{components => pages}/NotFoundPage.vue (100%)

diff --git a/frontend/src/components/Inputs/InputPasswordConfirmation.spec.js b/frontend/src/components/Inputs/InputPasswordConfirmation.spec.js
index 953d0b960..061398739 100644
--- a/frontend/src/components/Inputs/InputPasswordConfirmation.spec.js
+++ b/frontend/src/components/Inputs/InputPasswordConfirmation.spec.js
@@ -4,7 +4,7 @@ import InputPasswordConfirmation from './InputPasswordConfirmation'
 
 const localVue = global.localVue
 
-// validation is tested in src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
+// validation is tested in src/components/UserCard_FormUserPasswort.spec.js
 
 describe('InputPasswordConfirmation', () => {
   let wrapper
diff --git a/frontend/src/pages/UserProfile/UserCard.spec.js b/frontend/src/components/UserCard.spec.js
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard.spec.js
rename to frontend/src/components/UserCard.spec.js
diff --git a/frontend/src/pages/UserProfile/UserCard.vue b/frontend/src/components/UserCard.vue
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard.vue
rename to frontend/src/components/UserCard.vue
diff --git a/frontend/src/pages/UserProfile/UserCard_CoinAnimation.spec.js b/frontend/src/components/UserCard_CoinAnimation.spec.js
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_CoinAnimation.spec.js
rename to frontend/src/components/UserCard_CoinAnimation.spec.js
diff --git a/frontend/src/pages/UserProfile/UserCard_CoinAnimation.vue b/frontend/src/components/UserCard_CoinAnimation.vue
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_CoinAnimation.vue
rename to frontend/src/components/UserCard_CoinAnimation.vue
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserData.spec.js b/frontend/src/components/UserCard_FormUserData.spec.js
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_FormUserData.spec.js
rename to frontend/src/components/UserCard_FormUserData.spec.js
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/components/UserCard_FormUserData.vue
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_FormUserData.vue
rename to frontend/src/components/UserCard_FormUserData.vue
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserMail.spec.js b/frontend/src/components/UserCard_FormUserMail.spec.js
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_FormUserMail.spec.js
rename to frontend/src/components/UserCard_FormUserMail.spec.js
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserMail.vue b/frontend/src/components/UserCard_FormUserMail.vue
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_FormUserMail.vue
rename to frontend/src/components/UserCard_FormUserMail.vue
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.spec.js b/frontend/src/components/UserCard_FormUserPasswort.spec.js
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_FormUserPasswort.spec.js
rename to frontend/src/components/UserCard_FormUserPasswort.spec.js
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/components/UserCard_FormUserPasswort.vue
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_FormUserPasswort.vue
rename to frontend/src/components/UserCard_FormUserPasswort.vue
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUsername.spec.js.old b/frontend/src/components/UserCard_FormUsername.spec.js.old
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_FormUsername.spec.js.old
rename to frontend/src/components/UserCard_FormUsername.spec.js.old
diff --git a/frontend/src/pages/UserProfile/UserCard_FormUsername.vue.old b/frontend/src/components/UserCard_FormUsername.vue.old
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_FormUsername.vue.old
rename to frontend/src/components/UserCard_FormUsername.vue.old
diff --git a/frontend/src/pages/UserProfile/UserCard_Language.spec.js b/frontend/src/components/UserCard_Language.spec.js
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_Language.spec.js
rename to frontend/src/components/UserCard_Language.spec.js
diff --git a/frontend/src/pages/UserProfile/UserCard_Language.vue b/frontend/src/components/UserCard_Language.vue
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_Language.vue
rename to frontend/src/components/UserCard_Language.vue
diff --git a/frontend/src/pages/UserProfile/UserCard_Newsletter.spec.js b/frontend/src/components/UserCard_Newsletter.spec.js
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_Newsletter.spec.js
rename to frontend/src/components/UserCard_Newsletter.spec.js
diff --git a/frontend/src/pages/UserProfile/UserCard_Newsletter.vue b/frontend/src/components/UserCard_Newsletter.vue
similarity index 100%
rename from frontend/src/pages/UserProfile/UserCard_Newsletter.vue
rename to frontend/src/components/UserCard_Newsletter.vue
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 8a6d571af..57b97200d 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -66,7 +66,7 @@ import { login } from '@/graphql/queries'
 import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
 
 export default {
-  name: 'login',
+  name: 'Login',
   components: {
     InputPassword,
     InputEmail,
diff --git a/frontend/src/components/NotFoundPage.spec.js b/frontend/src/pages/NotFoundPage.spec.js
similarity index 100%
rename from frontend/src/components/NotFoundPage.spec.js
rename to frontend/src/pages/NotFoundPage.spec.js
diff --git a/frontend/src/components/NotFoundPage.vue b/frontend/src/pages/NotFoundPage.vue
similarity index 100%
rename from frontend/src/components/NotFoundPage.vue
rename to frontend/src/pages/NotFoundPage.vue
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index e06511f78..e36b7b297 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -13,12 +13,12 @@
   </div>
 </template>
 <script>
-import UserCard from './UserProfile/UserCard.vue'
-import FormUserData from './UserProfile/UserCard_FormUserData.vue'
-import FormUserPasswort from './UserProfile/UserCard_FormUserPasswort.vue'
-import FormUserLanguage from './UserProfile/UserCard_Language.vue'
-import FormUserNewsletter from './UserProfile/UserCard_Newsletter.vue'
-import FormUserCoinAnimation from './UserProfile/UserCard_CoinAnimation.vue'
+import UserCard from '@/components/UserCard.vue'
+import FormUserData from '@/components/UserCard_FormUserData.vue'
+import FormUserPasswort from '@/components/UserCard_FormUserPasswort.vue'
+import FormUserLanguage from '@/components/UserCard_Language.vue'
+import FormUserNewsletter from '@/components/UserCard_Newsletter.vue'
+import FormUserCoinAnimation from '@/components/UserCard_CoinAnimation.vue'
 
 export default {
   name: 'Profile',
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 224ee4ea4..0d3065d38 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -195,7 +195,7 @@ import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
 
 export default {
   components: { InputEmail, LanguageSwitchSelect },
-  name: 'register',
+  name: 'Register',
   mixins: [getCommunityInfoMixin],
   data() {
     return {
diff --git a/frontend/src/pages/RegisterCommunity.vue b/frontend/src/pages/RegisterCommunity.vue
index 406fa3a7f..17f500e07 100644
--- a/frontend/src/pages/RegisterCommunity.vue
+++ b/frontend/src/pages/RegisterCommunity.vue
@@ -52,7 +52,7 @@
 import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
 
 export default {
-  name: 'registerCommunity',
+  name: 'RegisterCommunity',
   mixins: [getCommunityInfoMixin],
 }
 </script>
diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js
index 2230d13c8..04bd11f79 100644
--- a/frontend/src/pages/ResetPassword.spec.js
+++ b/frontend/src/pages/ResetPassword.spec.js
@@ -4,7 +4,7 @@ import flushPromises from 'flush-promises'
 
 import { toastErrorSpy } from '@test/testSetup'
 
-// validation is tested in src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
+// validation is tested in src/components/UserCard_FormUserPasswort.spec.js
 
 const localVue = global.localVue
 
diff --git a/frontend/src/pages/SelectCommunity.vue b/frontend/src/pages/SelectCommunity.vue
index 59650c168..0535e4fe7 100644
--- a/frontend/src/pages/SelectCommunity.vue
+++ b/frontend/src/pages/SelectCommunity.vue
@@ -52,7 +52,7 @@ import { communities } from '@/graphql/queries'
 import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
 
 export default {
-  name: 'registerSelectCommunity',
+  name: 'SelectCommunity',
   data() {
     return {
       communities: [],
diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index f67f23ca3..31094e454 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -30,7 +30,7 @@ import GddTransactionList from '@/components/GddTransactionList.vue'
 import GdtTransactionList from '@/components/GdtTransactionList.vue'
 
 export default {
-  name: 'UserProfileTransactionList',
+  name: 'Transactions',
   components: {
     GddTransactionList,
     GdtTransactionList,
diff --git a/frontend/src/routes/guards.test.js b/frontend/src/routes/guards.test.js
index d4d2869d4..6079a6136 100644
--- a/frontend/src/routes/guards.test.js
+++ b/frontend/src/routes/guards.test.js
@@ -41,7 +41,7 @@ describe('navigation guards', () => {
     })
 
     it('does not commit the pid when not present', async () => {
-      await router.push({ path: 'password' })
+      await router.push({ path: 'forgot-password' })
       expect(storeCommitMock).not.toBeCalled()
     })
   })
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index 3810f8f4b..665848136 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -1,5 +1,5 @@
 import router from './router'
-import NotFound from '@/components/NotFoundPage.vue'
+import NotFound from '@/pages/NotFoundPage.vue'
 
 describe('router', () => {
   describe('options', () => {
@@ -58,7 +58,7 @@ describe('router', () => {
           expect(routes.find((r) => r.path === '/overview').meta.requiresAuth).toBeTruthy()
         })
 
-        it('loads the "Overview" component', async () => {
+        it('loads the "Overview" page', async () => {
           const component = await routes.find((r) => r.path === '/overview').component()
           expect(component.default.name).toBe('Overview')
         })
@@ -69,7 +69,7 @@ describe('router', () => {
           expect(routes.find((r) => r.path === '/send').meta.requiresAuth).toBeTruthy()
         })
 
-        it('loads the "Send" component', async () => {
+        it('loads the "Send" page', async () => {
           const component = await routes.find((r) => r.path === '/send').component()
           expect(component.default.name).toBe('Send')
         })
@@ -80,7 +80,7 @@ describe('router', () => {
           expect(routes.find((r) => r.path === '/profile').meta.requiresAuth).toBeTruthy()
         })
 
-        it('loads the "UserProfile" component', async () => {
+        it('loads the "Profile" page', async () => {
           const component = await routes.find((r) => r.path === '/profile').component()
           expect(component.default.name).toBe('Profile')
         })
@@ -91,30 +91,30 @@ describe('router', () => {
           expect(routes.find((r) => r.path === '/transactions').meta.requiresAuth).toBeTruthy()
         })
 
-        it('loads the "UserProfileTransactionList" component', async () => {
+        it('loads the "Transactions" page', async () => {
           const component = await routes.find((r) => r.path === '/transactions').component()
-          expect(component.default.name).toBe('UserProfileTransactionList')
+          expect(component.default.name).toBe('Transactions')
         })
       })
 
       describe('login', () => {
-        it('loads the "Login" component', async () => {
+        it('loads the "Login" page', async () => {
           const component = await routes.find((r) => r.path === '/login').component()
-          expect(component.default.name).toBe('login')
+          expect(component.default.name).toBe('Login')
         })
       })
 
       describe('register', () => {
-        it('loads the "register" component', async () => {
+        it('loads the "register" page', async () => {
           const component = await routes.find((r) => r.path === '/register').component()
-          expect(component.default.name).toBe('register')
+          expect(component.default.name).toBe('Register')
         })
       })
 
       describe('thx', () => {
         const thx = routes.find((r) => r.path === '/thx/:comingFrom')
 
-        it('loads the "Thx" component', async () => {
+        it('loads the "Thx" page', async () => {
           const component = await thx.component()
           expect(component.default.name).toBe('Thx')
         })
@@ -137,14 +137,14 @@ describe('router', () => {
       })
 
       describe('forgot password', () => {
-        it('loads the "ForgotPassword" component', async () => {
+        it('loads the "ForgotPassword" page', async () => {
           const component = await routes.find((r) => r.path === '/forgot-password').component()
           expect(component.default.name).toBe('ForgotPassword')
         })
       })
 
       describe('password with param comingFrom', () => {
-        it('loads the "ForgotPassword" component', async () => {
+        it('loads the "ForgotPassword" page', async () => {
           const component = await routes
             .find((r) => r.path === '/forgot-password/:comingFrom')
             .component()
@@ -153,21 +153,21 @@ describe('router', () => {
       })
 
       describe('register-community', () => {
-        it('loads the "registerCommunity" component', async () => {
+        it('loads the "registerCommunity" page', async () => {
           const component = await routes.find((r) => r.path === '/register-community').component()
-          expect(component.default.name).toBe('registerCommunity')
+          expect(component.default.name).toBe('RegisterCommunity')
         })
       })
 
       describe('select-community', () => {
-        it('loads the "registerSelectCommunity" component', async () => {
+        it('loads the "SelectCommunity" page', async () => {
           const component = await routes.find((r) => r.path === '/select-community').component()
-          expect(component.default.name).toBe('registerSelectCommunity')
+          expect(component.default.name).toBe('SelectCommunity')
         })
       })
 
       describe('reset password', () => {
-        it('loads the "ResetPassword" component', async () => {
+        it('loads the "ResetPassword" page', async () => {
           const component = await routes
             .find((r) => r.path === '/reset-password/:optin')
             .component()
@@ -176,14 +176,14 @@ describe('router', () => {
       })
 
       describe('checkEmail', () => {
-        it('loads the "CheckEmail" component', async () => {
+        it('loads the "CheckEmail" page', async () => {
           const component = await routes.find((r) => r.path === '/checkEmail/:optin').component()
           expect(component.default.name).toBe('ResetPassword')
         })
       })
 
       describe('not found page', () => {
-        it('renders the "NotFound" component', async () => {
+        it('renders the "NotFound" page', async () => {
           expect(routes.find((r) => r.path === '*').component).toEqual(NotFound)
         })
       })
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 3c138cfc9..0909ff531 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -1,4 +1,4 @@
-import NotFound from '@/components/NotFoundPage.vue'
+import NotFound from '@/pages/NotFoundPage.vue'
 
 const routes = [
   {

From 9c246c62bd8b6d8432a932dbbabdc36ead383ece Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 20:20:54 +0100
Subject: [PATCH 10/14] move user settings in subfolder

---
 .../UserCoinAnimation.spec.js}                |  4 +--
 .../UserCoinAnimation.vue}                    |  2 +-
 .../UserData.spec.js}                         |  4 +--
 .../UserData.vue}                             |  2 +-
 .../UserLanguage.spec.js}                     |  4 +--
 .../UserLanguage.vue}                         |  2 +-
 .../UserNewsletter.spec.js}                   |  4 +--
 .../UserNewsletter.vue}                       |  2 +-
 .../UserPassword.spec.js}                     |  4 +--
 .../UserPassword.vue}                         |  2 +-
 frontend/src/pages/Profile.spec.js            | 20 +++++++++----
 frontend/src/pages/Profile.vue                | 30 +++++++++----------
 frontend/src/routes/routes.js                 |  2 +-
 13 files changed, 45 insertions(+), 37 deletions(-)
 rename frontend/src/components/{UserCard_CoinAnimation.spec.js => UserSettings/UserCoinAnimation.spec.js} (96%)
 rename frontend/src/components/{UserCard_CoinAnimation.vue => UserSettings/UserCoinAnimation.vue} (98%)
 rename frontend/src/components/{UserCard_FormUserData.spec.js => UserSettings/UserData.spec.js} (97%)
 rename frontend/src/components/{UserCard_FormUserData.vue => UserSettings/UserData.vue} (99%)
 rename frontend/src/components/{UserCard_Language.spec.js => UserSettings/UserLanguage.spec.js} (97%)
 rename frontend/src/components/{UserCard_Language.vue => UserSettings/UserLanguage.vue} (99%)
 rename frontend/src/components/{UserCard_Newsletter.spec.js => UserSettings/UserNewsletter.spec.js} (96%)
 rename frontend/src/components/{UserCard_Newsletter.vue => UserSettings/UserNewsletter.vue} (98%)
 rename frontend/src/components/{UserCard_FormUserPasswort.spec.js => UserSettings/UserPassword.spec.js} (98%)
 rename frontend/src/components/{UserCard_FormUserPasswort.vue => UserSettings/UserPassword.vue} (99%)

diff --git a/frontend/src/components/UserCard_CoinAnimation.spec.js b/frontend/src/components/UserSettings/UserCoinAnimation.spec.js
similarity index 96%
rename from frontend/src/components/UserCard_CoinAnimation.spec.js
rename to frontend/src/components/UserSettings/UserCoinAnimation.spec.js
index 92c2f2b54..aabf927fb 100644
--- a/frontend/src/components/UserCard_CoinAnimation.spec.js
+++ b/frontend/src/components/UserSettings/UserCoinAnimation.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardCoinAnimation from './UserCard_CoinAnimation'
+import UserCoinAnimation from './UserCoinAnimation'
 import { updateUserInfos } from '@/graphql/mutations'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
@@ -28,7 +28,7 @@ describe('UserCard_CoinAnimation', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardCoinAnimation, { localVue, mocks })
+    return mount(UserCoinAnimation, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_CoinAnimation.vue b/frontend/src/components/UserSettings/UserCoinAnimation.vue
similarity index 98%
rename from frontend/src/components/UserCard_CoinAnimation.vue
rename to frontend/src/components/UserSettings/UserCoinAnimation.vue
index 19a082e41..e73ddb7af 100644
--- a/frontend/src/components/UserCard_CoinAnimation.vue
+++ b/frontend/src/components/UserSettings/UserCoinAnimation.vue
@@ -33,7 +33,7 @@
 <script>
 import { updateUserInfos } from '@/graphql/mutations'
 export default {
-  name: 'FormUserCoinAnimation',
+  name: 'UserCoinAnimation',
   data() {
     return {
       CoinAnimationStatus: this.$store.state.coinanimation,
diff --git a/frontend/src/components/UserCard_FormUserData.spec.js b/frontend/src/components/UserSettings/UserData.spec.js
similarity index 97%
rename from frontend/src/components/UserCard_FormUserData.spec.js
rename to frontend/src/components/UserSettings/UserData.spec.js
index 956318367..471360582 100644
--- a/frontend/src/components/UserCard_FormUserData.spec.js
+++ b/frontend/src/components/UserSettings/UserData.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardFormUserData from './UserCard_FormUserData'
+import UserData from './UserData'
 import flushPromises from 'flush-promises'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
@@ -28,7 +28,7 @@ describe('UserCard_FormUserData', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardFormUserData, { localVue, mocks })
+    return mount(UserData, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_FormUserData.vue b/frontend/src/components/UserSettings/UserData.vue
similarity index 99%
rename from frontend/src/components/UserCard_FormUserData.vue
rename to frontend/src/components/UserSettings/UserData.vue
index 56b8e171c..b7c3e8777 100644
--- a/frontend/src/components/UserCard_FormUserData.vue
+++ b/frontend/src/components/UserSettings/UserData.vue
@@ -67,7 +67,7 @@
 import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
-  name: 'FormUserData',
+  name: 'UserData',
   data() {
     return {
       showUserData: true,
diff --git a/frontend/src/components/UserCard_Language.spec.js b/frontend/src/components/UserSettings/UserLanguage.spec.js
similarity index 97%
rename from frontend/src/components/UserCard_Language.spec.js
rename to frontend/src/components/UserSettings/UserLanguage.spec.js
index 5f54d2905..f3882487b 100644
--- a/frontend/src/components/UserCard_Language.spec.js
+++ b/frontend/src/components/UserSettings/UserLanguage.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardLanguage from './UserCard_Language'
+import UserLanguage from './UserLanguage'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 
@@ -35,7 +35,7 @@ describe('UserCard_Language', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardLanguage, { localVue, mocks })
+    return mount(UserLanguage, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_Language.vue b/frontend/src/components/UserSettings/UserLanguage.vue
similarity index 99%
rename from frontend/src/components/UserCard_Language.vue
rename to frontend/src/components/UserSettings/UserLanguage.vue
index c792354de..16582cdb8 100644
--- a/frontend/src/components/UserCard_Language.vue
+++ b/frontend/src/components/UserSettings/UserLanguage.vue
@@ -64,7 +64,7 @@ import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue'
 import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
-  name: 'FormUserLanguage',
+  name: 'UserLanguage',
   components: { LanguageSwitchSelect },
   data() {
     return {
diff --git a/frontend/src/components/UserCard_Newsletter.spec.js b/frontend/src/components/UserSettings/UserNewsletter.spec.js
similarity index 96%
rename from frontend/src/components/UserCard_Newsletter.spec.js
rename to frontend/src/components/UserSettings/UserNewsletter.spec.js
index 8cb55e8c4..bb2781586 100644
--- a/frontend/src/components/UserCard_Newsletter.spec.js
+++ b/frontend/src/components/UserSettings/UserNewsletter.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardNewsletter from './UserCard_Newsletter'
+import UserNewsletter from './UserNewsletter'
 import { unsubscribeNewsletter, subscribeNewsletter } from '@/graphql/mutations'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
@@ -29,7 +29,7 @@ describe('UserCard_Newsletter', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardNewsletter, { localVue, mocks })
+    return mount(UserNewsletter, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_Newsletter.vue b/frontend/src/components/UserSettings/UserNewsletter.vue
similarity index 98%
rename from frontend/src/components/UserCard_Newsletter.vue
rename to frontend/src/components/UserSettings/UserNewsletter.vue
index b378406cf..39f3a14af 100644
--- a/frontend/src/components/UserCard_Newsletter.vue
+++ b/frontend/src/components/UserSettings/UserNewsletter.vue
@@ -30,7 +30,7 @@
 import { subscribeNewsletter, unsubscribeNewsletter } from '@/graphql/mutations'
 
 export default {
-  name: 'FormUserNewsletter',
+  name: 'UserNewsletter',
   data() {
     return {
       newsletterState: this.$store.state.newsletterState,
diff --git a/frontend/src/components/UserCard_FormUserPasswort.spec.js b/frontend/src/components/UserSettings/UserPassword.spec.js
similarity index 98%
rename from frontend/src/components/UserCard_FormUserPasswort.spec.js
rename to frontend/src/components/UserSettings/UserPassword.spec.js
index fb79c42c8..59ec65bd7 100644
--- a/frontend/src/components/UserCard_FormUserPasswort.spec.js
+++ b/frontend/src/components/UserSettings/UserPassword.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardFormPasswort from './UserCard_FormUserPasswort'
+import UserPassword from './UserPassword'
 import flushPromises from 'flush-promises'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
@@ -20,7 +20,7 @@ describe('UserCard_FormUserPasswort', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardFormPasswort, { localVue, mocks })
+    return mount(UserPassword, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_FormUserPasswort.vue b/frontend/src/components/UserSettings/UserPassword.vue
similarity index 99%
rename from frontend/src/components/UserCard_FormUserPasswort.vue
rename to frontend/src/components/UserSettings/UserPassword.vue
index 690edb83e..430f9a75d 100644
--- a/frontend/src/components/UserCard_FormUserPasswort.vue
+++ b/frontend/src/components/UserSettings/UserPassword.vue
@@ -53,7 +53,7 @@ import InputPasswordConfirmation from '@/components/Inputs/InputPasswordConfirma
 import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
-  name: 'FormUserPasswort',
+  name: 'UserPassword',
   components: {
     InputPassword,
     InputPasswordConfirmation,
diff --git a/frontend/src/pages/Profile.spec.js b/frontend/src/pages/Profile.spec.js
index 5df365cac..fb4ee2d42 100644
--- a/frontend/src/pages/Profile.spec.js
+++ b/frontend/src/pages/Profile.spec.js
@@ -24,15 +24,23 @@ describe('Profile', () => {
     })
 
     it('has a user first and last name form', () => {
-      expect(wrapper.findComponent({ name: 'FormUserData' }).exists()).toBeTruthy()
-    })
-
-    it('has a user change password form', () => {
-      expect(wrapper.findComponent({ name: 'FormUserPasswort' }).exists()).toBeTruthy()
+      expect(wrapper.findComponent({ name: 'UserData' }).exists()).toBeTruthy()
     })
 
     it('has a user change language form', () => {
-      expect(wrapper.findComponent({ name: 'FormUserLanguage' }).exists()).toBeTruthy()
+      expect(wrapper.findComponent({ name: 'UserLanguage' }).exists()).toBeTruthy()
+    })
+
+    it('has a user change password form', () => {
+      expect(wrapper.findComponent({ name: 'UserPassword' }).exists()).toBeTruthy()
+    })
+
+    it('has a user change newsletter form', () => {
+      expect(wrapper.findComponent({ name: 'UserNewsletter' }).exists()).toBeTruthy()
+    })
+
+    it('has a user change coin animation form', () => {
+      expect(wrapper.findComponent({ name: 'UserCoinAnimation' }).exists()).toBeTruthy()
     })
   })
 })
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index e36b7b297..01308b29a 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -1,34 +1,34 @@
 <template>
   <div fluid="sm" class="mr-2">
     <user-card :balance="balance" :transactionCount="transactionCount"></user-card>
-    <form-user-data />
+    <user-data />
     <hr />
-    <form-user-passwort />
+    <user-password />
     <hr />
-    <form-user-language />
+    <user-language />
     <hr />
-    <form-user-newsletter />
+    <user-newsletter />
     <hr />
-    <form-user-coin-animation />
+    <user-coin-animation />
   </div>
 </template>
 <script>
 import UserCard from '@/components/UserCard.vue'
-import FormUserData from '@/components/UserCard_FormUserData.vue'
-import FormUserPasswort from '@/components/UserCard_FormUserPasswort.vue'
-import FormUserLanguage from '@/components/UserCard_Language.vue'
-import FormUserNewsletter from '@/components/UserCard_Newsletter.vue'
-import FormUserCoinAnimation from '@/components/UserCard_CoinAnimation.vue'
+import UserData from '@/components/UserSettings/UserData.vue'
+import UserPassword from '@/components/UserSettings/UserPassword.vue'
+import UserLanguage from '@/components/UserSettings/UserLanguage.vue'
+import UserNewsletter from '@/components/UserSettings/UserNewsletter.vue'
+import UserCoinAnimation from '@/components/UserSettings/UserCoinAnimation.vue'
 
 export default {
   name: 'Profile',
   components: {
     UserCard,
-    FormUserData,
-    FormUserPasswort,
-    FormUserLanguage,
-    FormUserNewsletter,
-    FormUserCoinAnimation,
+    UserData,
+    UserPassword,
+    UserLanguage,
+    UserNewsletter,
+    UserCoinAnimation,
   },
   props: {
     balance: { type: Number, default: 0 },
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 0909ff531..3fc8dc766 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -50,7 +50,7 @@ const routes = [
     path: '/thx/:comingFrom',
     component: () => import('@/pages/thx.vue'),
     beforeEnter: (to, from, next) => {
-      const validFrom = ['forgot-password', 'reset', 'register', 'login', 'checkEmail']
+      const validFrom = ['forgot-password', 'reset-password', 'register', 'login', 'checkEmail']
       if (!validFrom.includes(from.path.split('/')[1])) {
         next({ path: '/login' })
       } else {

From 4e331e3ae9347a4c1ff8fe2150fc8b7f9eda4624 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 20:26:15 +0100
Subject: [PATCH 11/14] remove unused package

---
 frontend/package.json | 1 -
 frontend/yarn.lock    | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 785ebb11d..3600920e4 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -44,7 +44,6 @@
     "jest": "^26.6.3",
     "jest-canvas-mock": "^2.3.1",
     "jest-environment-jsdom-sixteen": "^2.0.0",
-    "module-alias": "^2.2.2",
     "particles-bg-vue": "1.2.3",
     "portal-vue": "^2.1.7",
     "prettier": "^2.2.1",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 19ee31c94..296e0f01b 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -10287,11 +10287,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-module-alias@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0"
-  integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==
-
 moment@^2.19.2:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"

From 83cbb22cb36988eeed3f242c2b709f8db04fe362 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 20:29:50 +0100
Subject: [PATCH 12/14] correct link in comment

---
 .../src/components/Inputs/InputPasswordConfirmation.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Inputs/InputPasswordConfirmation.spec.js b/frontend/src/components/Inputs/InputPasswordConfirmation.spec.js
index 061398739..d0389267e 100644
--- a/frontend/src/components/Inputs/InputPasswordConfirmation.spec.js
+++ b/frontend/src/components/Inputs/InputPasswordConfirmation.spec.js
@@ -4,7 +4,7 @@ import InputPasswordConfirmation from './InputPasswordConfirmation'
 
 const localVue = global.localVue
 
-// validation is tested in src/components/UserCard_FormUserPasswort.spec.js
+// validation is tested in src/components/UserSettings/UserPassword.spec.js
 
 describe('InputPasswordConfirmation', () => {
   let wrapper

From 5883b18a93272ee46ba97ff54c5cd0166ba61011 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 20:36:14 +0100
Subject: [PATCH 13/14] correct link in comment

---
 frontend/src/pages/ResetPassword.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js
index 04bd11f79..814d97bcb 100644
--- a/frontend/src/pages/ResetPassword.spec.js
+++ b/frontend/src/pages/ResetPassword.spec.js
@@ -4,7 +4,7 @@ import flushPromises from 'flush-promises'
 
 import { toastErrorSpy } from '@test/testSetup'
 
-// validation is tested in src/components/UserCard_FormUserPasswort.spec.js
+// validation is tested in src/components/UserSettings/UserPassword.spec.js
 
 const localVue = global.localVue
 

From 92c5fe2d96cb40d9825558a8fd42a6d665298f0c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 7 Mar 2022 20:48:36 +0100
Subject: [PATCH 14/14] resolve more relative paths

---
 frontend/src/components/LanguageSwitch.vue | 4 ++--
 frontend/src/store/store.js                | 2 +-
 frontend/src/store/store.test.js           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue
index 2678883c3..9d901ae9f 100644
--- a/frontend/src/components/LanguageSwitch.vue
+++ b/frontend/src/components/LanguageSwitch.vue
@@ -12,8 +12,8 @@
   </div>
 </template>
 <script>
-import locales from '../locales/'
-import { updateUserInfos } from '../graphql/mutations'
+import locales from '@/locales/'
+import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
   name: 'LanguageSwitch',
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 0297af6ea..458c8c8de 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import createPersistedState from 'vuex-persistedstate'
 import { localeChanged } from 'vee-validate'
-import i18n from '../i18n.js'
+import i18n from '@/i18n.js'
 
 Vue.use(Vuex)
 
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index e0b7ad24f..ea40d9474 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -1,11 +1,11 @@
 import { mutations, actions } from './store'
 import Vuex from 'vuex'
 import Vue from 'vue'
-import i18n from '../i18n.js'
+import i18n from '@/i18n.js'
 import { localeChanged } from 'vee-validate'
 
 jest.mock('vuex')
-jest.mock('../i18n.js')
+jest.mock('@/i18n.js')
 jest.mock('vee-validate', () => {
   return {
     localeChanged: jest.fn(),