From 7ed8366693a67478205dd0a0d4a8f94704b9c86a Mon Sep 17 00:00:00 2001
From: Dennis Czombera <dennis.czombera@spring-media.de>
Date: Tue, 10 Sep 2019 15:09:27 +0200
Subject: [PATCH 01/24] Merge Dev (#1)

* Configured for local testing

* Added deletion

* Added creation

* Added updating

* Fix

* Added error notifications

* Updated layout

* Added responsiveness

* Fix

* Added orderBy to domain list

* Added login failure notification

* Fixed code styling warning/errors

* Fix

* Fix

* Added paginated loading

* Changed id to domain

* Added search bar

* Added endpoint input field

* Fix

* Fix

* Fix

* Fix

* Added login

* Fix and small features

* Added cookie removal during logout

* Added paginated path list

* Added searchbar for path list

* Fixed path filter

* Removed http code 300

* Fix

* Fix

* Credentials include

* Added loading msg

* Fixed login

* Fixed api client
---
 package-lock.json                   | 164 ++++++++-----------
 package.json                        |   3 +-
 src/app.css                         |   1 -
 src/components/AppHeader.vue        |   5 +-
 src/components/DomainPaths.vue      | 148 ++++++++++++++++--
 src/services/api/http-local-mock.js |  71 +++++++++
 src/services/api/http-mock.js       |  91 +++++------
 src/services/api/http.js            |  23 +--
 src/services/token.js               |  18 ++-
 src/store/auth.module.js            |  43 +++--
 src/store/domains.module.js         |  59 ++++---
 src/store/index.js                  |  10 +-
 src/views/DomainDetail.vue          | 235 +++++++++++++++++++++++-----
 src/views/DomainList.vue            | 105 +++++++++++--
 src/views/Domains.vue               |   9 +-
 src/views/Login.vue                 | 131 ++++++++++++----
 vue.config.js                       |  16 +-
 17 files changed, 800 insertions(+), 332 deletions(-)
 create mode 100644 src/services/api/http-local-mock.js

diff --git a/package-lock.json b/package-lock.json
index 41990fa..f519343 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1550,9 +1550,9 @@
       "dev": true
     },
     "ansi-colors": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.1.tgz",
-      "integrity": "sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
       "dev": true
     },
     "ansi-escapes": {
@@ -3213,9 +3213,9 @@
       }
     },
     "connect-history-api-fallback": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
-      "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
       "dev": true
     },
     "console-browserify": {
@@ -3844,7 +3844,7 @@
         },
         "get-stream": {
           "version": "3.0.0",
-          "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
           "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
           "dev": true
         }
@@ -3939,7 +3939,7 @@
       "dependencies": {
         "globby": {
           "version": "6.1.0",
-          "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
@@ -3952,7 +3952,7 @@
           "dependencies": {
             "pify": {
               "version": "2.3.0",
-              "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
               "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
               "dev": true
             }
@@ -5310,9 +5310,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
+      "integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
       "dev": true,
       "requires": {
         "debug": "=3.1.0"
@@ -6185,9 +6185,9 @@
       }
     },
     "handle-thing": {
-      "version": "1.2.5",
-      "resolved": "http://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
-      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
       "dev": true
     },
     "handlebars": {
@@ -6549,7 +6549,7 @@
     },
     "http-proxy-middleware": {
       "version": "0.18.0",
-      "resolved": "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
       "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
       "dev": true,
       "requires": {
@@ -9673,9 +9673,9 @@
       "dev": true
     },
     "p-is-promise": {
-      "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
+      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==",
       "dev": true
     },
     "p-limit": {
@@ -12126,65 +12126,42 @@
       "dev": true
     },
     "spdy": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
-      "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+      "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.8",
-        "handle-thing": "^1.2.5",
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
         "http-deceiver": "^1.2.7",
-        "safe-buffer": "^5.0.1",
         "select-hose": "^2.0.0",
-        "spdy-transport": "^2.0.18"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
+        "spdy-transport": "^3.0.0"
       }
     },
     "spdy-transport": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.1.tgz",
-      "integrity": "sha512-q7D8c148escoB3Z7ySCASadkegMmUZW8Wb/Q1u0/XBgDKMO880rLQDj8Twiew/tYi7ghemKUi/whSYOwE17f5Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.8",
-        "detect-node": "^2.0.3",
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
         "hpack.js": "^2.1.6",
-        "obuf": "^1.1.1",
-        "readable-stream": "^2.2.9",
-        "safe-buffer": "^5.0.1",
-        "wbuf": "^1.7.2"
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "readable-stream": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
+          "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
         }
       }
     },
@@ -13775,9 +13752,9 @@
       }
     },
     "webpack-dev-server": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz",
-      "integrity": "sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==",
+      "version": "3.1.14",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
+      "integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
@@ -13799,21 +13776,23 @@
         "portfinder": "^1.0.9",
         "schema-utils": "^1.0.0",
         "selfsigned": "^1.9.1",
+        "semver": "^5.6.0",
         "serve-index": "^1.7.2",
         "sockjs": "0.3.19",
         "sockjs-client": "1.3.0",
-        "spdy": "^3.4.1",
+        "spdy": "^4.0.0",
         "strip-ansi": "^3.0.0",
         "supports-color": "^5.1.0",
+        "url": "^0.11.0",
         "webpack-dev-middleware": "3.4.0",
         "webpack-log": "^2.0.0",
         "yargs": "12.0.2"
       },
       "dependencies": {
         "ajv-keywords": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
-          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.3.0.tgz",
+          "integrity": "sha512-CMzN9S62ZOO4sA/mJZIO4S++ZM7KFWzH3PPWkveLhy4OZ9i1/VatgwWMD46w/XbGCBy7Ye0gCk+Za6mmyfKK7g==",
           "dev": true
         },
         "ansi-regex": {
@@ -13840,21 +13819,6 @@
             "xregexp": "4.0.0"
           }
         },
-        "execa": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-          "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
         "find-up": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
@@ -13864,12 +13828,6 @@
             "locate-path": "^3.0.0"
           }
         },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        },
         "import-local": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
@@ -13906,31 +13864,31 @@
           }
         },
         "mem": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz",
-          "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz",
+          "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==",
           "dev": true,
           "requires": {
             "map-age-cleaner": "^0.1.1",
             "mimic-fn": "^1.0.0",
-            "p-is-promise": "^1.1.0"
+            "p-is-promise": "^2.0.0"
           }
         },
         "os-locale": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz",
-          "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
-            "execa": "^0.10.0",
+            "execa": "^1.0.0",
             "lcid": "^2.0.0",
             "mem": "^4.0.0"
           }
         },
         "p-limit": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
-          "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
+          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -13973,7 +13931,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
diff --git a/package.json b/package.json
index 4054b32..6f169a9 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,7 @@
       "node": true
     },
     "extends": [
-      "plugin:vue/essential",
-      "@vue/prettier"
+      "plugin:vue/essential"
     ],
     "rules": {},
     "parserOptions": {
diff --git a/src/app.css b/src/app.css
index 32ff777..7f16128 100644
--- a/src/app.css
+++ b/src/app.css
@@ -63,4 +63,3 @@
   * @import "utilities/background-patterns";
   * @import "utilities/skew-transforms";
   */
- 
\ No newline at end of file
diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
index 55d7fda..644c2f5 100644
--- a/src/components/AppHeader.vue
+++ b/src/components/AppHeader.vue
@@ -17,11 +17,10 @@ export default {
   name: "app-header",
   methods: {
     ...mapMutations('auth', [
-      'clearToken'
+      'clearLoginData'
     ]),
     logout() {
-      console.log("logout");
-      this.clearToken();
+      this.clearLoginData();
       this.$router.push({name: "login"});
     }
   }
diff --git a/src/components/DomainPaths.vue b/src/components/DomainPaths.vue
index d6a10ba..085ce92 100644
--- a/src/components/DomainPaths.vue
+++ b/src/components/DomainPaths.vue
@@ -1,14 +1,43 @@
 <template>
   <div>
     <div v-if="!showForm">
+      <div v-if="this.paths && this.paths.length > 0">
+      <input
+        name="search-field"
+        id="search-field"
+        placeholder="Search..."
+        v-on:keyup.enter="setFilter"
+        class="form-input mb-4"
+        :hidden="!paths"
+      >
+      <button
+        @click.prevent="prevPage"
+        class="button button-secondary button-small mr-4"
+        :disabled="pageNumber==1"
+        :hidden="!paths"
+      >previous</button>
+      <button
+        @click.prevent="nextPage"
+        class="button button-primary button-small"
+        :disabled="pageNumber >= pageCount"
+        :hidden="!paths"
+      >next</button>
+      <br>
+      <br>
+      <div class="text-white" :hidden="!paths">{{pageNumber + "/" + pageCount}}</div>
+      <br>
       <ul class="list-reset">
-        <li class="flex mb-1 pb-1 border-b border-blue-dark2" v-for="path of paths" :key="path.from + path.to">
+        <li
+          class="flex mb-1 pb-1 border-b border-blue-dark2"
+          v-for="path of paginatedData"
+          :key="path.from + path.to"
+        >
           <div class="flex-1">
             <div class="text-blue-lightest text-base font-bold mr-1 mb-1 flex">
               <div class="inline-block w-12">From</div>
               <div class="text-white">
                 <div>{{path.from}}</div>
-                <div class="text-xs text-nepal">{{target}}{{path.from}}</div>
+                <div class="text-xs text-nepal">{{domain}}{{path.from}}</div>
               </div>
             </div>
             <div class="text-blue-lightest text-base font-bold mr-1 flex">
@@ -20,25 +49,61 @@
             </div>
           </div>
           <div class="self-center">
-            <button @click.prevent="remove(path)" class="button button-secondary button-small mr-4" type="submit">Remove</button>
-            <button @click.prevent="edit(path)" class="button button-primary button-small" type="submit">Edit</button>
+            <button
+              @click.prevent="remove(path)"
+              class="button button-secondary button-small mr-4"
+              type="submit"
+            >Remove</button>
+            <button
+              @click.prevent="edit(path)"
+              class="button button-primary button-small"
+              type="submit"
+            >Edit</button>
           </div>
         </li>
       </ul>
-      <button @click.prevent="create" class="button button-primary button-small" type="submit">New Path</button>
+      </div>
+      <button
+        @click.prevent="create"
+        class="button button-primary button-small"
+        type="submit"
+      >New Path</button>
     </div>
     <div v-if="showForm">
       <div class="mb-1">
         <label for="from-field" class="form-label mb-1">From</label>
-        <input v-model="from" type="text" name="from-field" id="from-field" placeholder="/from/path" class="form-input" autofocus>
+        <input
+          v-model="from"
+          type="text"
+          name="from-field"
+          id="from-field"
+          placeholder="/from/path"
+          class="form-input"
+          autofocus
+        >
       </div>
       <div class="mb-4">
         <label for="to-field" class="form-label mb-1">To</label>
-        <input v-model="to" type="text" name="to-field" id="to-field" placeholder="/to/path" class="form-input">
+        <input
+          v-model="to"
+          type="text"
+          name="to-field"
+          id="to-field"
+          placeholder="/to/path"
+          class="form-input"
+        >
       </div>
       <div class="flex justify-between">
-        <button @click.prevent="add" class="button button-primary button-small" type="submit">{{saveLabel}}</button>
-        <button @click.prevent="cancel" class="text-athens-gray text-sm font-bold rounded py-1 px-4 bg-oxford-blue hover:bg-grey-dark focus:border-blue-light focus:outline-none appearance-none" type="reset">Cancel</button>
+        <button
+          @click.prevent="add"
+          class="button button-primary button-small"
+          type="submit"
+        >{{saveLabel}}</button>
+        <button
+          @click.prevent="cancel"
+          class="text-athens-gray text-sm font-bold rounded py-1 px-4 bg-oxford-blue hover:bg-grey-dark focus:border-blue-light focus:outline-none appearance-none"
+          type="reset"
+        >Cancel</button>
       </div>
     </div>
   </div>
@@ -57,6 +122,14 @@ export default {
     target: {
       type: String,
       default: ""
+    },
+    domain: {
+      type: String,
+      default: ""
+    },
+    size: {
+      type: Number,
+      default: 10
     }
   },
   data() {
@@ -65,28 +138,63 @@ export default {
       from: "",
       to: "",
       isNew: false,
-      pathToEdit: null
-    }
+      pathToEdit: null,
+      pageNumber: 1,
+      currentPaths: this.paths,
+      filter: ""
+    };
   },
   computed: {
     saveLabel() {
       return this.isNew ? "Add Path" : "Update Path";
+    },
+    pageCount() {
+      if (!this.currentPaths) return;
+      let l = this.currentPaths.length, s = this.size;
+      return Math.ceil(l/s);
+    },
+    paginatedData() {
+      this.doFilter();
+      if (!this.currentPaths) return [];
+      let cpPaths = this.currentPaths.slice(0);
+      const start = (this.pageNumber - 1) * this.size,
+        end = start + this.size;
+      return cpPaths.slice(start, end);
     }
-  },
+  }, 
   methods: {
+    setFilter(ev) {
+      this.filter = ev.target.value;
+      this.pageNumber = 1;
+    },
+    doFilter() {
+      let filter = this.filter;
+      if (filter != "" && this.paths) {
+        let cpPaths = this.paths.slice(0);
+        cpPaths = cpPaths.filter(path => path.from.startsWith(filter));
+        this.currentPaths = [...cpPaths].sort(function(a, b) {
+          if (a.from < b.from) return -1;
+          if (a.from > b.from) return 1;
+          return 0;
+        });
+        return;
+      } 
+      this.currentPaths = this.paths;
+    },
     add() {
       this.showForm = false;
 
       if (this.isNew) {
-        this.$emit('add', {
+        this.$emit("add", {
           from: this.from,
           to: this.to
         });
 
+
         return;
       }
 
-      this.$emit('update', {
+      this.$emit("update", {
         from: this.from,
         to: this.to,
         path: this.pathToEdit
@@ -101,7 +209,7 @@ export default {
     edit(path) {
       this.showForm = true;
       this.isNew = false;
-      
+
       this.from = path.from;
       this.to = path.to;
       this.pathToEdit = path;
@@ -115,8 +223,14 @@ export default {
       this.pathToEdit = null;
     },
     remove(path) {
-      this.$emit('remove', path);
+      this.$emit("remove", path);
+    },
+    nextPage() {
+      this.pageNumber++;
+    },
+    prevPage() {
+      this.pageNumber--;
     }
   }
-}
+};
 </script>
diff --git a/src/services/api/http-local-mock.js b/src/services/api/http-local-mock.js
new file mode 100644
index 0000000..38ea4fd
--- /dev/null
+++ b/src/services/api/http-local-mock.js
@@ -0,0 +1,71 @@
+/**
+ * 
+ * @param {string} resource 
+ * 
+ * @returns {Promise}
+ */
+const read = resource => {
+  let data = JSON.parse(localStorage.getItem(resource));
+
+  if (resource === "https://api.swerve.tortuga.cloud/domains") {
+    data = Object.keys(localStorage)
+      .filter(key => key.startsWith("https://api.swerve.tortuga.cloud/domains"))
+      .map(key => JSON.parse(localStorage.getItem(key)));
+  }
+
+  return Promise.resolve({
+    data
+  });
+};
+
+/**
+ * 
+ * @param {string} resource 
+ * @param {*} data 
+ * 
+ * @returns {Promise}
+ */
+const create = (resource, data) => {
+  const id = Math.floor(Math.random() * 1000000);
+  const payload = {
+    ...data,
+    id
+  };
+  const storageKey = resource + '/' + id;
+
+  localStorage.setItem(storageKey, JSON.stringify(payload));
+  
+  return Promise.resolve({
+    data: payload
+  });
+};
+
+/**
+ * 
+ * @param {string} resource 
+ * 
+ * @returns {Promise}
+ */
+const remove = (resource) => {
+  localStorage.removeItem(resource);
+
+  return Promise.resolve({
+
+  });
+};
+
+/**
+ * 
+ * @param {string} resource 
+ * 
+ * @return {Promise}
+ */
+const update = (resource, data) => {
+  localStorage.setItem(resource, JSON.stringify(data));
+  
+  return Promise.resolve({
+    data
+  });
+};
+
+export { read, create, update, remove };
\ No newline at end of file
diff --git a/src/services/api/http-mock.js b/src/services/api/http-mock.js
index 38ea4fd..2fb3f2d 100644
--- a/src/services/api/http-mock.js
+++ b/src/services/api/http-mock.js
@@ -1,71 +1,74 @@
+const handleError = response => {
+  if (!response.ok) {
+    throw new Error(response.statusText);
+  }
+
+  return response;
+};
+
+const toJSON = text => (text.length ? JSON.parse(text) : {});
+
+const toText = response => response.text();
+
+const request = (resource, options = {}) => {
+  return fetch(resource, {
+    method: "GET",
+    ...options
+  })
+    .then(handleError)
+    .then(toText)
+    .then(toJSON);
+};
+
 /**
- * 
- * @param {string} resource 
- * 
+ *
+ * @param {string} resource
+ *
  * @returns {Promise}
  */
 const read = resource => {
-  let data = JSON.parse(localStorage.getItem(resource));
-
-  if (resource === "https://api.swerve.tortuga.cloud/domains") {
-    data = Object.keys(localStorage)
-      .filter(key => key.startsWith("https://api.swerve.tortuga.cloud/domains"))
-      .map(key => JSON.parse(localStorage.getItem(key)));
-  }
-
-  return Promise.resolve({
-    data
+  return request(resource, {
+    method: "GET"
   });
 };
 
 /**
- * 
- * @param {string} resource 
- * @param {*} data 
- * 
+ *
+ * @param {string} resource
+ * @param {*} data
+ *
  * @returns {Promise}
  */
 const create = (resource, data) => {
-  const id = Math.floor(Math.random() * 1000000);
-  const payload = {
-    ...data,
-    id
-  };
-  const storageKey = resource + '/' + id;
-
-  localStorage.setItem(storageKey, JSON.stringify(payload));
-  
-  return Promise.resolve({
-    data: payload
+  return request(resource, {
+    method: "POST",
+    body: JSON.stringify(data)
   });
 };
 
 /**
- * 
- * @param {string} resource 
- * 
+ *
+ * @param {string} resource
+ *
  * @returns {Promise}
  */
-const remove = (resource) => {
-  localStorage.removeItem(resource);
-
-  return Promise.resolve({
-
+const remove = resource => {
+  return request(resource, {
+    method: "DELETE"
   });
 };
 
 /**
- * 
- * @param {string} resource 
- * 
+ *
+ * @param {string} resource
+ *
  * @return {Promise}
  */
 const update = (resource, data) => {
-  localStorage.setItem(resource, JSON.stringify(data));
-  
-  return Promise.resolve({
-    data
+  return request(resource, {
+    method: "PUT",
+    body: JSON.stringify(data)
   });
 };
 
-export { read, create, update, remove };
\ No newline at end of file
+export { read, create, update, remove };
diff --git a/src/services/api/http.js b/src/services/api/http.js
index 52a857d..081d2f5 100644
--- a/src/services/api/http.js
+++ b/src/services/api/http.js
@@ -6,18 +6,19 @@ const handleError = response => {
   return response;
 };
 
-const toJSON = response => response.json();
+const toJSON = text => (text.length ? JSON.parse(text) : {});
+
+const toText = response => response.text();
 
 const request = (resource, options = {}) => {
   return fetch(resource, {
     method: "GET",
     ...options
   })
-  .then(handleError)
-  .then(toJSON)
-  .catch(error => error)
+    .then(handleError)
+    .then(toText)
+    .then(toJSON);
 };
-
 /**
  * 
  * @param {string} resource 
@@ -26,7 +27,8 @@ const request = (resource, options = {}) => {
  */
 const read = resource => {
   return request(resource, {
-    method: 'GET'
+    method: 'GET',
+    credentials: "include",
   });
 };
 
@@ -40,7 +42,8 @@ const read = resource => {
 const create = (resource, data) => {
   return request(resource, {
     method: 'POST',
-    data: JSON.stringify(data)
+    credentials: "include",
+    body: JSON.stringify(data)
   });
 };
 
@@ -52,7 +55,8 @@ const create = (resource, data) => {
  */
 const remove = resource => {
   return request(resource, {
-    method: "DELETE"
+    method: "DELETE",
+    credentials: "include",
   });
 };
 
@@ -65,7 +69,8 @@ const remove = resource => {
 const update = (resource, data) => {
   return request(resource, {
     method: "PUT",
-    data: JSON.stringify(data)
+    credentials: "include",
+    body: JSON.stringify(data)
   });
 };
 
diff --git a/src/services/token.js b/src/services/token.js
index e2965b1..18d5b8e 100644
--- a/src/services/token.js
+++ b/src/services/token.js
@@ -1,13 +1,15 @@
 import { getItem, removeItem, setItem } from "./storage";
 
 const TOKEN_STORAGE_KEY = "swerve_access_token";
+const ENDPOINT_STORAGE_KEY = "swerve_endpoint";
 
 /**
  * 
  * @param {string} token 
  */
-const setToken = (token) => {
-  return setItem(TOKEN_STORAGE_KEY, token);
+const setLoginData = (data) => {
+  setItem(TOKEN_STORAGE_KEY, data.token);
+  setItem(ENDPOINT_STORAGE_KEY, data.endpoint)
 };
 
 /**
@@ -17,15 +19,19 @@ const getToken = () => {
   return getItem(TOKEN_STORAGE_KEY);
 };
 
-const clearToken = () => {
-  return removeItem(TOKEN_STORAGE_KEY);
+const getEndpoint = () => {
+  return getItem(ENDPOINT_STORAGE_KEY);
+};
+
+const clearLoginData = () => {
+  removeItem(TOKEN_STORAGE_KEY);
 };
 
 /**
  * @returns {boolean}
  */
 const isValid = () => {
-  return !!getToken();
+  return !!getToken() && !!getEndpoint();
 };
 
-export { TOKEN_STORAGE_KEY, getToken, clearToken, setToken, isValid };
\ No newline at end of file
+export { TOKEN_STORAGE_KEY, getToken, getEndpoint, clearLoginData, setLoginData, isValid };
\ No newline at end of file
diff --git a/src/store/auth.module.js b/src/store/auth.module.js
index ecbf496..e00c8c4 100644
--- a/src/store/auth.module.js
+++ b/src/store/auth.module.js
@@ -1,9 +1,11 @@
 import {create} from "api-client";
-import {getToken, setToken, clearToken} from "../services/token";
+import {getToken, getEndpoint, setLoginData, clearLoginData} from "../services/token";
+import { read } from "fs";
 
 
 const state = {
-  token: getToken()
+  token: getToken(),
+  endpoint: getEndpoint(),
 };
 
 const getters = {
@@ -11,40 +13,31 @@ const getters = {
 };
 
 const actions = {
-  async fetchToken({commit}, {username, password}) {
-    try {
-      /*
-      const response = await create("https://some.api.endpoint", {
+  async fetchLoginData({commit}, {username, password, endpoint}) {
+      const response = await create(endpoint + "/login", {
         username,
         password
-      });
-      */
-
-      if (username !== 'admin' && password !== 'admin') {
-        return Promise.reject();
-      }
-
-      const response = await Promise.resolve({data: {access_token: 'access_token'}});
+      })
   
-      const token = response.data.access_token;
-  
-      commit('storeToken', token);
+      commit('storeLoginData', {
+        endpoint,
+      });
 
       return response;
-    } catch (error) {
-      return error;
     }
-  }
 };
 
 const mutations = {
-  storeToken(state, token) {
-    state.token = token;
-    setToken(token);
+  storeLoginData(state, data) {
+    state.token = data.token;
+    state.endpoint = data.endpoint
+    setLoginData(data);
   },
-  clearToken(state) {
+  clearLoginData(state) {
     state.token = null;
-    clearToken();
+    state.endpoint = null;
+    document.cookie = "token=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+    clearLoginData();
   }
 };
 
diff --git a/src/store/domains.module.js b/src/store/domains.module.js
index 16069a1..bf0af7f 100644
--- a/src/store/domains.module.js
+++ b/src/store/domains.module.js
@@ -1,11 +1,17 @@
-import {read, create, update, remove} from "api-client";
-import Vue from "vue";
+import { read, create, update, remove } from "api-client";
 
 /**
  * @typedef {Object} Domain
  * @property {Number} id
  * @property {String} domain
  * @property {String} redirect
+ * @property {Path[]} paths
+ */
+
+/**
+ * @typedef {Object} Path
+ * @property {String} from
+ * @property {String} to
  */
 
 /**
@@ -17,59 +23,64 @@ const state = {
   domains: []
 };
 
-const getters = {
-
-};
+const getters = {};
 
 const actions = {
-  async fetchOne({commit}, {id}) {
-    let response = await read(`https://api.swerve.tortuga.cloud/domains/${id}`);
+  async fetchOne({ commit }, {endpoint, id}) {
+    let response = await read(`${endpoint}/api/domain/${id}`);
 
     if (!response) {
-      response = {data: {}};
+      response = { data: {} };
     }
 
     return response;
   },
-  async fetchList({commit}) {
-    const response = await read("https://api.swerve.tortuga.cloud/domains");
+  async fetchList({ commit }, {endpoint, cursor}) {
+    const response = await read(endpoint + "/api/domain" + (cursor && cursor != "reload" ? ("?cursor=" + cursor) : ""));
 
-    commit('setDomains', response.data || []);
+    if (cursor == "reload") {
+      response.data.reload = true;
+    }
+    commit("setDomains", response.data || []);
 
     return response;
   },
-  async updateOne({commit}, data) {
-    const response = await update(`https://api.swerve.tortuga.cloud/domains/${data.id}`, data);
+  async updateOne({ commit }, {endpoint, domain}) {
+    const response = await update(`${endpoint}/api/domain/${domain.domain}`, domain);
 
     return response;
   },
-  async createOne({commit}, data) {
-    const response = await create('https://api.swerve.tortuga.cloud/domains', data);
-
-    commit("addDomain", response.data);
+  async createOne({ commit }, {endpoint, domain}) {
+    const response = await create(endpoint + "/api/domain/", domain);
 
     return response;
   },
-  async deleteOne({commit}, data) {
+  async deleteOne({ commit }, {endpoint, domain}) {
+    const response = await remove(`${endpoint}/api/domain/${domain.domain}`);
 
+    return response;
   }
 };
 
 const mutations = {
   /**
-   * @param {DomainState} state 
-   * @param {Domain[]} domains 
+   * @param {DomainState} state
+   * @param {Domain[]} domains
    */
   setDomains(state, domains) {
+    if (state.domains && state.domains.domains && !domains.reload) {
+      state.domains.domains = [...state.domains.domains, ...domains.domains]
+      state.domains.cursor = domains.cursor
+    } else
     state.domains = domains;
   },
   /**
-   * @param {DomainState} state 
-   * @param {Domain} domain 
+   * @param {DomainState} state
+   * @param {Domain} domain
    */
   addDomain(state, domain) {
     state.domains.push(domain);
-  },
+  }
 };
 
 export default {
@@ -78,4 +89,4 @@ export default {
   getters,
   actions,
   mutations
-}
\ No newline at end of file
+};
diff --git a/src/store/index.js b/src/store/index.js
index 812e26d..a4a44c9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -12,6 +12,12 @@ const mutations = {
   },
   removeNotification(state, notification) {
     state.notifications = state.notifications.filter(n => n !== notification);
+  },
+  updateDomainsLoadingStatus(state, status) {
+    state.isLoadingDomains = status
+  },
+  updateDomainLoadingStatus(state, status) {
+    state.isLoadingDomain = status
   }
 };
 
@@ -23,8 +29,10 @@ export default new Vuex.Store({
   },
   state: {
     isLoading: false,
+    isLoadingDomains: false,
+    isLoadingDomain: false,
     notifications: []
   },
   mutations,
   actions: {}
-});
\ No newline at end of file
+});
diff --git a/src/views/DomainDetail.vue b/src/views/DomainDetail.vue
index 995f7af..0f77ee5 100644
--- a/src/views/DomainDetail.vue
+++ b/src/views/DomainDetail.vue
@@ -1,25 +1,55 @@
 <template>
   <div>
-    <form @submit.prevent="save" @reset.prevent="cancel" class="max-w-md">
+    <div v-if="isLoadingDomain" class="text-white no-underline">Loading...</div>
+    <form v-if="!isLoadingDomain" @submit.prevent="save" @reset.prevent="cancel" class="w-full">
       <fieldset class="form-fieldset">
         <legend class="form-legend">Basic Data</legend>
         <div class="mb-4">
           <label for="domain-field" class="form-label mb-1 ml-px">Domain</label>
-            <input type="url" name="domain-field" id="domain-field" placeholder="https://domain.com" v-model="domain.domain" required class="form-input">
+          <input
+            name="domain-field"
+            id="domain-field"
+            placeholder="domain.com"
+            v-model="domain.domain"
+            required
+            class="form-input"
+            :disabled="!isNew"
+          >
         </div>
         <div class="mb-1">
           <label for="redirect-field" class="form-label mb-1 ml-px">Redirect</label>
-          <input type="url" name="redirect-field" id="redirect-field" v-model="domain.redirect" placeholder="https://redirect.com" required class="form-input">
+          <input
+            name="redirect-field"
+            id="redirect-field"
+            v-model="domain.redirect"
+            placeholder="redirect.com"
+            required
+            class="form-input"
+          >
         </div>
         <div class="flex mb-4">
-          <input type="checkbox" name="promotable-field" id="promotable-field" class="mr-2" v-model="domain.promotable">
-          <label for="promotable-field" class="form-label">Include Path and Query-String <span class="text-xs">(optional)</span></label>
+          <input
+            type="checkbox"
+            name="promotable-field"
+            id="promotable-field"
+            class="mr-2 bg-blue-dark"
+            v-model="domain.promotable"
+          >
+          <label for="promotable-field" class="form-label">
+            Include Path and Query-String
+            <span class="text-xs">(optional)</span>
+          </label>
         </div>
         <div>
-          <label for="status-field" class="form-label mb-1 ml-px">HTTP Statuscode</label>
-          <select name="status-field" id="status-field" v-model="domain.status" required class="bg-blue-dark border border-blue-dark2 text-l text-white p-2 rounded focus:border-blue-light focus:outline-none appearance-none">
+          <label for="code-field" class="form-label mb-1 ml-px">HTTP Statuscode</label>
+          <select
+            name="code-field"
+            id="code-field"
+            v-model.number="domain.code"
+            required
+            class="bg-blue-dark border border-blue-dark2 text-l text-white p-2 rounded focus:border-blue-light focus:outline-none appearance-none"
+          >
             <option :value="undefined">Please choose ...</option>
-            <option value="200">300 - Multiple Choices</option>
             <option value="301">301 - Moved Permanently</option>
             <option value="302">302 - Found</option>
             <option value="303">303 - See Other</option>
@@ -32,18 +62,38 @@
       </fieldset>
       <fieldset class="form-fieldset">
         <legend class="form-legend">Paths</legend>
-        <domain-paths :paths="domain.paths" :target="domain.redirect" @add="addPath" @update="updatePath" @remove="removePath"></domain-paths>
+        <domain-paths
+          :paths="domain.paths"
+          :target="domain.redirect"
+          :domain="domain.domain"
+          @add="addPath"
+          @update="updatePath"
+          @remove="removePath"
+        ></domain-paths>
       </fieldset>
       <fieldset class="form-fieldset">
         <legend class="form-legend">Additional Information</legend>
         <div>
-          <label for="description-field" class="form-label mb-1 ml-px">Description <span class="text-xs">(optional)</span></label>
-          <textarea rows="3" id="description-field" name="description-field" v-model="domain.description" class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 rounded focus:border-blue-light focus:outline-none appearance-none"></textarea>
+          <label for="description-field" class="form-label mb-1 ml-px">
+            Description
+            <span class="text-xs">(optional)</span>
+          </label>
+          <textarea
+            rows="3"
+            id="description-field"
+            name="description-field"
+            v-model="domain.description"
+            class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 rounded focus:border-blue-light focus:outline-none appearance-none"
+          ></textarea>
         </div>
       </fieldset>
       <div class="flex justify-between">
         <button class="button button-primary" type="submit">Save</button>
-        <button v-if="!isNew" @click.prevent="deleteDomain" class="button bg-crimson hover:bg-cinnabar">Delete Domain</button>
+        <button
+          v-if="!isNew"
+          @click.prevent="deleteDomain"
+          class="button bg-crimson hover:bg-cinnabar"
+        >Delete Domain</button>
         <button class="button button-secondary" type="reset">Cancel</button>
       </div>
     </form>
@@ -51,7 +101,7 @@
 </template>
 
 <script>
-import {mapState, mapActions, mapMutations} from "vuex";
+import { mapState, mapActions, mapMutations } from "vuex";
 import DomainPaths from "../components/DomainPaths";
 
 export default {
@@ -63,50 +113,153 @@ export default {
     return {
       isNew: false,
       domain: {}
-    }
+    };
+  },
+  computed: {
+    ...mapState("auth", ['endpoint']),
+    ...mapState("domains", ["domains"]),
+    ...mapState(['isLoadingDomain']),
   },
   methods: {
     ...mapActions("domains", [
       "fetchOne",
       "createOne",
-      "updateOne"
-    ]),
-    ...mapMutations([
-      "addNotification"
+      "updateOne",
+      "deleteOne",
+      "fetchList"
     ]),
+    ...mapMutations(["addNotification", "updateDomainLoadingStatus"]),
     reset() {
       this.domain = {};
     },
-    save() {
-      if (this.isNew) {
-        this.createOne(this.domain);
-        return;
-      }
-
-      this.updateOne(this.domain).then(() => {
+    reload() {
+      this.fetchList({
+        endpoint: this.endpoint,
+        cursor: "reload"
+        }).catch(() => {
         this.addNotification({
-          type: "success",
-          text: "Domain updated"
+          type: "failure",
+          text: "Domains could not be loaded"
         });
       });
+      this.cancel();
+    },
+    save() {
+      if (this.isNew) {
+        this.createOne({
+        endpoint: this.endpoint,
+        domain: this.domain
+        })
+          .then(() => {
+            this.addNotification({
+              type: "success",
+              text: "Domain created"
+            });
+            this.reload();
+          })
+          .catch((err) => {
+            if (err.toString() == "Error: Unauthorized") {
+              this.addNotification({
+              type: "failure",
+              text: "Please relogin"
+            });
+              return
+            }
+            this.addNotification({
+              type: "failure",
+              text: "Domain could not be created"
+            });
+          });
+        return;
+      } else
+        this.updateOne({
+          endpoint: this.endpoint,
+          domain: this.domain,
+        })
+          .then(() => {
+            this.addNotification({
+              type: "success",
+              text: "Domain updated"
+            });
+            this.reload();
+          })
+          .catch((err) => {
+            if (err.toString() == "Error: Unauthorized") {
+              this.addNotification({
+              type: "failure",
+              text: "Please relogin"
+            });
+              return
+            }
+            this.addNotification({
+              type: "failure",
+              text: "Domain could not be updated"
+            });
+          });
     },
     cancel() {
       this.reset();
-      this.$router.push({name: "domains"});
+      this.$router.push({ name: "domains" });
     },
     deleteDomain() {
-
+      this.deleteOne({
+        endpoint: this.endpoint,
+        domain: this.domain
+        })
+        .then(() => {
+          this.addNotification({
+            type: "success",
+            text: "Domain deleted"
+          });
+          this.reload();
+        })
+        .catch((err) => {
+          if (err.toString() == "Error: Unauthorized") {
+              this.addNotification({
+              type: "failure",
+              text: "Please relogin"
+            });
+              return
+            }
+          this.addNotification({
+            type: "failure",
+            text: "Domain could not be deleted"
+          });
+        });
     },
     load(id) {
-      this.fetchOne({id}).then(response => {
-        this.domain = {
-          paths: [],
-          status: "301",
-          ...response.data
-        };
-      });
+      this.updateDomainLoadingStatus(true)
+      this.fetchOne({
+        endpoint: this.endpoint,
+        id
+      })
+        .then(response => {
+          this.updateDomainLoadingStatus(false)
+          this.domain = {
+            paths: [],
+            code: "301",
+            ...response.data
+          };
+        })
+        .catch((err) => {
+          this.updateDomainLoadingStatus(false)
+          if (err.toString() == "Error: Unauthorized") {
+            this.$router.push({name: "login"});
+            return
+          }
+          this.addNotification({
+            type: "failure",
+            text: "Domain could not be loaded"
+          });
+        });
+    },
+    loadNew() {
+      this.domain = {
+        paths: []
+      };
     },
     addPath(path) {
+      if (!this.domain.paths) this.domain.paths = [];
       this.domain.paths.push(path);
     },
     updatePath(payload) {
@@ -120,11 +273,11 @@ export default {
   beforeRouteUpdate(to, from, next) {
     this.reset();
 
-    this.isNew = to.params.domain === 'new';
+    this.isNew = to.params.domain === "new";
 
     if (!this.isNew) {
       this.load(to.params.domain);
-    }
+    } else this.loadNew();
 
     next();
   },
@@ -132,12 +285,12 @@ export default {
     next(vm => {
       vm.reset();
 
-      vm.isNew = to.params.domain === 'new';
+      vm.isNew = to.params.domain === "new";
 
       if (!vm.isNew) {
         vm.load(to.params.domain);
-      }
+      } else vm.loadNew();
     });
   }
-}
+};
 </script>
diff --git a/src/views/DomainList.vue b/src/views/DomainList.vue
index a15513a..2519b54 100644
--- a/src/views/DomainList.vue
+++ b/src/views/DomainList.vue
@@ -1,34 +1,105 @@
 <template>
   <div class="px-2">
-    <h2 class="text-blue text-lg font-bold">Domains</h2>
-    <ul class="list-reset">
-      <router-link v-for="domain of domains" :key="domain.id" tag="li" :to="{name: 'domain', params: {domain: domain.id}}" class="router-link">
-        <a class="text-white no-underline">{{domain.domain}}</a>
-      </router-link>
-    </ul>
+    <h2 class="text-blue text-lg font-bold mb-1">Domains</h2>
+    <input
+            name="search-field"
+            id="search-field"
+            placeholder="Search..."
+            v-on:keyup.enter="onFilter"
+            required
+            class="form-input mb-4"
+          >
+    <div @scroll="onScroll" class="overflow-auto h-24 md:h-64">
+      <div v-if="isLoadingDomains" class="text-white no-underline">Loading...</div>
+      <ul class="list-reset">
+        <router-link
+          v-for="domain of orderedDomains"
+          :key="domain.domain"
+          tag="li"
+          :to="{name: 'domain', params: {domain: domain.domain}}"
+          class="router-link"
+        >
+          <a class="text-white no-underline">{{domain.domain}}</a>
+        </router-link>
+      </ul>
+    </div>
     <div>
-      <router-link to="/domains/new" class="button button-primary inline-block mt-4 no-underline">New Domain</router-link>
+      <router-link
+        to="/domains/new"
+        class="button button-primary inline-block mt-4 no-underline"
+      >New Domain</router-link>
     </div>
   </div>
 </template>
 
 <script>
-import {mapState, mapActions} from "vuex";
+import { mapState, mapActions, mapMutations } from "vuex";
 
 export default {
   name: "domain-list",
+  data() {
+    return {
+      filter: "",
+    };
+  },
   computed: {
-    ...mapState('domains', [
-      'domains'
-    ])
+    ...mapState("domains", ["domains"]),
+    ...mapState("auth", ['endpoint']),
+    ...mapState(['isLoadingDomains']),
+    orderedDomains: function() {
+      let sortDomains = Object.assign({}, this.domains);
+      if (sortDomains.domains) {
+        if (this.filter != "") sortDomains.domains  = sortDomains.domains.filter((domain) => domain.domain.startsWith(this.filter));
+        return [...sortDomains.domains].sort(function(a, b) {
+          if (a.domain < b.domain) return -1;
+          if (a.domain > b.domain) return 1;
+          return 0;
+        });
+      }
+      return 0;
+    }
   },
   methods: {
-    ...mapActions('domains', [
-      'fetchList'
-    ])
+    ...mapActions("domains", ["fetchList"]),
+    ...mapMutations(["addNotification", "updateDomainsLoadingStatus"]),
+    onFilter(ev) {
+      this.filter = ev.target.value;
+    },
+    onScroll ({ target: { scrollTop, clientHeight, scrollHeight }}) {
+      if (scrollTop + clientHeight >= scrollHeight) {
+        if (this.domains.cursor != "EOF") {
+        this.fetchList({
+        endpoint: this.endpoint,
+        cursor: this.domain.cursor
+        }).catch(() => {
+          this.addNotification({
+            type: "failure",
+            text: "Domains could not be loaded"
+          });
+        });
+        }
+      }
+    }
   },
   created() {
-    this.fetchList();
-  }
-}
+    this.updateDomainsLoadingStatus(true)   
+    this.fetchList({
+        endpoint: this.endpoint,
+        cursor: "reload",
+        })
+        .then(() => {
+          this.updateDomainsLoadingStatus(false)  
+        }).catch((err) => {
+          this.updateDomainsLoadingStatus(false)  
+          if (err.toString() == "Error: Unauthorized") {
+            this.$router.push({name: "login"});
+            return
+          }
+          this.addNotification({
+            type: "failure",
+            text: "Domains could not be loaded"
+          });
+    });
+  },
+};
 </script>
diff --git a/src/views/Domains.vue b/src/views/Domains.vue
index 01ffad8..1a831bc 100644
--- a/src/views/Domains.vue
+++ b/src/views/Domains.vue
@@ -1,7 +1,8 @@
 <template>
-  <div class="flex h-full py-4">
-    <domain-list class="w-1/6"></domain-list>
-    <router-view class="w-5/6"></router-view>
+  <div class="h-full w-full md:flex text-center py-4 px-8">
+    <domain-list class="m-auto w-full mb-24 md:m-0 md:w-1/6"></domain-list>
+    <div class="w-12 h-full"></div>
+    <router-view class="m-auto w-full md:m-0 md:w-auto md:w-2/3"></router-view>
   </div>
 </template>
 
@@ -13,5 +14,5 @@ export default {
   components: {
     DomainList
   }
-}
+};
 </script>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 34b94aa..cda56d0 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,59 +1,130 @@
 <template>
   <div class="flex justify-center items-center sm:items-end h-screen p-4">
-  <transition appear name="slide-fade">
-    <form method="POST" action="" @submit.prevent="onSubmit" class="w-full max-w-screen-sm">
-      <label for="username-input" class="block text-blue-lightest text-base font-bold mb-1 cursor-pointer ml-1">Username</label>
-      <input type="text" name="username" id="username-input" v-model="username" required placeholder="admin" autofocus autocomplete="off" class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 mb-3 rounded focus:border-blue-light focus:outline-none appearance-none">
-      <label for="password-input" class="block text-blue-lightest text-base font-bold mb-1 cursor-pointer ml-1">Password</label>
-      <input type="password" name="password" id="password-input" v-model="password" required placeholder="admin" autocomplete="off" class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 mb-3 rounded focus:border-blue-light focus:outline-none appearance-none">
-      <button :disabled="disabled" class="button button-primary ml-1 sm:w-full disabled:bg-grey-dark disabled:cursor-not-allowed disabled:text-grey-darkest" type="submit">Login</button>
-    </form>
-  </transition>
+    <transition appear name="slide-fade">
+      <form method="POST" action @submit.prevent="onSubmit" class="w-full max-w-screen-sm">
+        <label
+          for="endpoint-input"
+          class="block text-blue-lightest text-base font-bold mb-1 cursor-pointer ml-1"
+        >Endpoint</label>
+        <input
+          type="text"
+          name="endpoint"
+          id="endpoint-input"
+          v-model="endpoint"
+          required
+          placeholder="api.swerve.tortuga.service:8080"
+          autofocus
+          autocomplete="off"
+          class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 mb-3 rounded focus:border-blue-light focus:outline-none appearance-none"
+        >
+        <label
+          for="username-input"
+          class="block text-blue-lightest text-base font-bold mb-1 cursor-pointer ml-1"
+        >Username</label>
+        <input
+          type="text"
+          name="username"
+          id="username-input"
+          v-model="username"
+          required
+          placeholder="admin"
+          autofocus
+          autocomplete="off"
+          class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 mb-3 rounded focus:border-blue-light focus:outline-none appearance-none"
+        >
+        <label
+          for="password-input"
+          class="block text-blue-lightest text-base font-bold mb-1 cursor-pointer ml-1"
+        >Password</label>
+        <input
+          type="password"
+          name="password"
+          id="password-input"
+          v-model="password"
+          required
+          placeholder="admin"
+          autocomplete="off"
+          class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 mb-3 rounded focus:border-blue-light focus:outline-none appearance-none"
+        >
+        <button
+          :disabled="disabled"
+          class="button button-primary ml-1 sm:w-full disabled:bg-grey-dark disabled:cursor-not-allowed disabled:text-grey-darkest"
+          type="submit"
+        >Login</button>
+      </form>
+    </transition>
   </div>
 </template>
 
 <script>
-import {mapActions} from "vuex";
+import { mapActions, mapMutations } from "vuex";
+import { getEndpoint } from "../services/token";
 
 export default {
   data() {
+    let endpoint = getEndpoint();
+    if (!endpoint) endpoint = "";
     return {
-      username: null,
-      password: null,
+      username: "",
+      password: "",
+      endpoint: endpoint,
       disabled: false
-    }
+    };
   },
   methods: {
-    ...mapActions('auth', [
-      'fetchToken'
-    ]),
+    ...mapActions("auth", ["fetchLoginData"]),
+    ...mapMutations(["addNotification"]),
     onSubmit() {
+      let url;
+      try {
+        url = new URL(this.endpoint)
+      } catch(e) {
+        this.addNotification({
+            type: "failure",
+            text: "Please enter a valid endpoint"
+          });
+          return
+      }
+      if (!url.origin) {
+        this.addNotification({
+            type: "failure",
+            text: "Please enter a valid endpoint"
+          });
+      }
       this.disabled = true;
 
-      this.fetchToken({
-        username: this.username, 
-        password: this.password
-      }).then(() => {
-        this.$router.push(this.$router.history.current.query.redirectTo || '/');
-      }).catch(() => {
-        this.disabled = false;
-      });
+      this.fetchLoginData({
+        username: this.username,
+        password: this.password,
+        endpoint: url.origin,
+      })
+        .then((res) => {
+          this.$router.push(
+            this.$router.history.current.query.redirectTo || "/"
+          );
+        })
+        .catch((err) => {
+          this.addNotification({
+            type: "failure",
+            text: "Login failed"
+          });
+          this.disabled = false;
+        });
     }
   }
-}
+};
 </script>
 
 <style>
 .slide-fade-enter-active {
-  transition: all .3s ease;
+  transition: all 0.3s ease;
 }
 .slide-fade-leave-active {
-  transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
+  transition: all 0.8s cubic-bezier(1, 0.5, 0.8, 1);
 }
-.slide-fade-enter, .slide-fade-leave-to {
+.slide-fade-enter,
+.slide-fade-leave-to {
   transform: translateX(10px);
   opacity: 0;
 }
 </style>
-
-
diff --git a/vue.config.js b/vue.config.js
index 37e3807..388f9f2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,15 +4,21 @@ module.exports = {
   productionSourceMap: false,
 
   pwa: {
-    name: 'SwerveUI'
+    name: "SwerveUI"
   },
 
   chainWebpack: config => {
     console.log("chainwebpack");
-    if (process.env.NODE_ENV === 'production') {
-      config.resolve.alias.set('api-client$', path.join(__dirname, 'src/services/api/http.js'));
+    if (process.env.NODE_ENV === "production") {
+      config.resolve.alias.set(
+        "api-client$",
+        path.join(__dirname, "src/services/api/http.js")
+      );
     } else {
-      config.resolve.alias.set('api-client$', path.join(__dirname, 'src/services/api/http-mock.js'));
+      config.resolve.alias.set(
+        "api-client$",
+        path.join(__dirname, "src/services/api/http-mock.js")
+      );
     }
   }
-}
\ No newline at end of file
+};

From b8771fc70e6e4411898266459884ea1e5769861b Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Tue, 10 Sep 2019 15:14:39 +0200
Subject: [PATCH 02/24] Add Jenkinsfile

---
 Jenkinsfile | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..980853f
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,55 @@
+@Library("sharedLibraries")
+
+def parent = "red"
+def project = "swerve-ui"
+
+node("jenkins-agent-images") {
+
+	stage("clone repository") {
+		deleteDir()
+		checkout(scm)
+	}
+
+	def BRANCH_NAME = getBranchName()
+
+	parent = "${parent}${BRANCH_NAME != "master" ? '-branches' : ''}"
+
+	def dockerBuildOnly = BRANCH_NAME == ""
+
+	def imageTag = buildDockerContainer2(
+			parent: "${parent}",
+			project: "${project}",
+			branch: "${BRANCH_NAME}",
+			dockerBuildOnly: dockerBuildOnly
+	)
+
+	if (!dockerBuildOnly) {
+
+		if (BRANCH_NAME == "master") {
+
+			deployKubernetes(
+					parent: "${parent}",
+					project: "${project}",
+					imageTag: "${imageTag}",
+					namespace: "red-stg",
+					env: "stg"
+			)
+
+            // deployKubernetes(
+            //     parent: "${parent}",
+            //     project: "${project}",
+            //     imageTag: "${imageTag}",
+            //     namespace: "red-prd",
+            //     env: "prd"
+            // )
+
+			// sendReleaseMail(
+			// 		project: "${project}",
+			// 		imageTag: "${imageTag}",
+			// 		mailto: "jenkins-red@spring-media.de",
+			// 		env: "PRODUCTION"
+			// )
+
+		}
+	}
+}
\ No newline at end of file

From ccf60b5577250009a6c5bdaa4f9cf014f9b46f12 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Tue, 10 Sep 2019 15:45:01 +0200
Subject: [PATCH 03/24] Add makefile

---
 Makefile | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..b6c4093
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,37 @@
+PROJECT=swerve-ui
+PARENT=red
+
+REGISTRY=spring-docker.jfrog.io
+IMAGE_NAME=$(REGISTRY)/$(PARENT)/$(PROJECT)
+IMAGE_LATEST=$(IMAGE_NAME):latest
+GIT_HASH=$(shell git rev-parse --short HEAD)
+FULL_NAME=$(IMAGE_NAME):$(GIT_HASH)
+
+# test if the make is running inside a Jenkins, then set different network options than on Docker for Mac
+ifdef BUILD_NUMBER
+    HOSTNAME=$(shell hostname)
+    NETWORK=$(shell docker ps -q --filter 'label=io.kubernetes.pod.name=$(HOSTNAME)' -n1)
+    DOCKER_OPT_ARGS=--pull --network=container:$(NETWORK)
+else
+	DOCKER_OPT_ARGS=--pull
+endif
+
+.DEFAULT_GOAL: build
+
+.PHONY: build
+build:
+	docker build $(DOCKER_OPT_ARGS) -t $(FULL_NAME) .
+	docker tag $(FULL_NAME) $(IMAGE_LATEST)
+
+.PHONY: release
+release: build
+	docker push $(IMAGE_LATEST)
+	docker push $(FULL_NAME)
+
+.PHONY: gettag
+gettag:
+	@echo $(GIT_HASH)
+
+.PHONY: run
+run: build
+	docker run $(IMAGE_LATEST)
\ No newline at end of file

From 44d74e63d57c7629c0fa232f96ed210cdd210ebf Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Fri, 13 Sep 2019 15:54:51 +0200
Subject: [PATCH 04/24] Preprare Jenkinsfile

---
 Jenkinsfile | 95 ++++++++++++++++++++++-------------------------------
 Makefile    | 37 ---------------------
 2 files changed, 40 insertions(+), 92 deletions(-)
 delete mode 100644 Makefile

diff --git a/Jenkinsfile b/Jenkinsfile
index 980853f..ac827b1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,55 +1,40 @@
-@Library("sharedLibraries")
-
-def parent = "red"
-def project = "swerve-ui"
-
-node("jenkins-agent-images") {
-
-	stage("clone repository") {
-		deleteDir()
-		checkout(scm)
-	}
-
-	def BRANCH_NAME = getBranchName()
-
-	parent = "${parent}${BRANCH_NAME != "master" ? '-branches' : ''}"
-
-	def dockerBuildOnly = BRANCH_NAME == ""
-
-	def imageTag = buildDockerContainer2(
-			parent: "${parent}",
-			project: "${project}",
-			branch: "${BRANCH_NAME}",
-			dockerBuildOnly: dockerBuildOnly
-	)
-
-	if (!dockerBuildOnly) {
-
-		if (BRANCH_NAME == "master") {
-
-			deployKubernetes(
-					parent: "${parent}",
-					project: "${project}",
-					imageTag: "${imageTag}",
-					namespace: "red-stg",
-					env: "stg"
-			)
-
-            // deployKubernetes(
-            //     parent: "${parent}",
-            //     project: "${project}",
-            //     imageTag: "${imageTag}",
-            //     namespace: "red-prd",
-            //     env: "prd"
-            // )
-
-			// sendReleaseMail(
-			// 		project: "${project}",
-			// 		imageTag: "${imageTag}",
-			// 		mailto: "jenkins-red@spring-media.de",
-			// 		env: "PRODUCTION"
-			// )
-
-		}
-	}
-}
\ No newline at end of file
+// @Library("sharedLibraries")
+
+// def parent = "red"
+// def project = "swerve-ui"
+
+// node("jenkins-agent-npm") {
+
+// 	stage("clone repository") {
+// 		deleteDir()
+// 		checkout(scm)
+// 	}
+
+// 	buildSwerveUI()
+
+// 	def releaseVersion
+
+// 	stage("get release version") {
+// 		releaseVersion = sh(
+// 			script: """grep -e "version" package.json | awk '{print \$2}' | sed 's/[",]//g'""",
+// 			returnStdout: true
+// 		).trim()
+// 	}
+
+// 	// staging
+// 	uploadToAkamai(
+// 		privateKeyFilename: "swerveui_stg_rsa",
+// 		domainNamePrefix: "cmsassetsstg",
+// 		buildOutputDir: "build",
+// 		targetPath: "/swerveui/${releaseVersion}/"
+// 	)
+
+// 	// production
+// 	uploadToAkamai(
+// 		privateKeyFilename: "swerveui_prd_rsa",
+// 		domainNamePrefix: "cmsassetsprd",
+// 		buildOutputDir: "build",
+// 		targetPath: "/swerveui/${releaseVersion}/"
+// 	)
+
+// }
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b6c4093..0000000
--- a/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-PROJECT=swerve-ui
-PARENT=red
-
-REGISTRY=spring-docker.jfrog.io
-IMAGE_NAME=$(REGISTRY)/$(PARENT)/$(PROJECT)
-IMAGE_LATEST=$(IMAGE_NAME):latest
-GIT_HASH=$(shell git rev-parse --short HEAD)
-FULL_NAME=$(IMAGE_NAME):$(GIT_HASH)
-
-# test if the make is running inside a Jenkins, then set different network options than on Docker for Mac
-ifdef BUILD_NUMBER
-    HOSTNAME=$(shell hostname)
-    NETWORK=$(shell docker ps -q --filter 'label=io.kubernetes.pod.name=$(HOSTNAME)' -n1)
-    DOCKER_OPT_ARGS=--pull --network=container:$(NETWORK)
-else
-	DOCKER_OPT_ARGS=--pull
-endif
-
-.DEFAULT_GOAL: build
-
-.PHONY: build
-build:
-	docker build $(DOCKER_OPT_ARGS) -t $(FULL_NAME) .
-	docker tag $(FULL_NAME) $(IMAGE_LATEST)
-
-.PHONY: release
-release: build
-	docker push $(IMAGE_LATEST)
-	docker push $(FULL_NAME)
-
-.PHONY: gettag
-gettag:
-	@echo $(GIT_HASH)
-
-.PHONY: run
-run: build
-	docker run $(IMAGE_LATEST)
\ No newline at end of file

From 8238ac7745420b539df721e01cd685f3ba312682 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Mon, 28 Oct 2019 11:50:45 +0100
Subject: [PATCH 05/24] Add build files

---
 Dockerfile  |  18 ++++++
 Jenkinsfile | 159 +++++++++++++++++++++++++++++++++++++++-------------
 Makefile    |  37 ++++++++++++
 3 files changed, 174 insertions(+), 40 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 Makefile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..f2aaacb
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+# ---- Base Node ----
+FROM node:10-alpine AS dependencies
+
+LABEL NAME="red-swerve-ui"
+
+WORKDIR /app
+COPY . /app
+
+ARG NODE_ENV
+ENV PATH /app/node_modules/.bin:$PATH
+RUN npm install -g @vue/cli && \
+    npm install
+RUN vue-cli-service build --mode NODE_ENV
+
+# ---- Release ----å
+FROM nginx AS release
+
+COPY --from=dependencies /app/dist /usr/share/nginx/html
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index ac827b1..9d868e4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,40 +1,119 @@
-// @Library("sharedLibraries")
-
-// def parent = "red"
-// def project = "swerve-ui"
-
-// node("jenkins-agent-npm") {
-
-// 	stage("clone repository") {
-// 		deleteDir()
-// 		checkout(scm)
-// 	}
-
-// 	buildSwerveUI()
-
-// 	def releaseVersion
-
-// 	stage("get release version") {
-// 		releaseVersion = sh(
-// 			script: """grep -e "version" package.json | awk '{print \$2}' | sed 's/[",]//g'""",
-// 			returnStdout: true
-// 		).trim()
-// 	}
-
-// 	// staging
-// 	uploadToAkamai(
-// 		privateKeyFilename: "swerveui_stg_rsa",
-// 		domainNamePrefix: "cmsassetsstg",
-// 		buildOutputDir: "build",
-// 		targetPath: "/swerveui/${releaseVersion}/"
-// 	)
-
-// 	// production
-// 	uploadToAkamai(
-// 		privateKeyFilename: "swerveui_prd_rsa",
-// 		domainNamePrefix: "cmsassetsprd",
-// 		buildOutputDir: "build",
-// 		targetPath: "/swerveui/${releaseVersion}/"
-// 	)
-
-// }
\ No newline at end of file
+@Library("sharedLibraries")
+
+def parent = "red"
+def project = "swerve"
+
+node("jenkins-agent-images") {
+
+	stage("clone repository") {
+		deleteDir()
+		checkout(scm)
+	}
+
+	def BRANCH_NAME = getBranchName()
+
+	parent = "${parent}${BRANCH_NAME != "master" ? '-branches' : ''}"
+
+	def dockerBuildOnly = BRANCH_NAME == ""
+	def imageTagStg
+	def imageTagPrd
+
+	if (BRANCH_NAME == "master") {
+		imageTagPrd = buildContainer(
+				parent: "${parent}",
+				project: "${project}",
+				branch: "${BRANCH_NAME}",
+				nodeEnv: "production"
+				dockerBuildOnly: dockerBuildOnly
+		)
+	}
+
+	imageTagStg = buildContainer(
+			parent: "${parent}",
+			project: "${project}",
+			branch: "${BRANCH_NAME}",
+			nodeEnv: "staging"
+			dockerBuildOnly: dockerBuildOnly
+	)
+
+	if (!dockerBuildOnly) {
+		if (BRANCH_NAME == "master") {
+			deployKubernetes(
+				parent: "${parent}",
+				project: "${project}",
+				imageTag: "${imageTagPrd}",
+				namespace: "red-prd",
+				env: "prd"
+			)
+
+			sendReleaseMail(
+					project: "${project}",
+					imageTag: "${imageTag}",
+					mailto: "jenkins-red@spring-media.de",
+					env: "PRODUCTION"
+			)
+		}
+
+		deployKubernetes(
+			parent: "${parent}",
+			project: "${project}",
+			imageTag: "${imageTagStg}",
+			namespace: "red-stg",
+			env: "stg"
+		)
+	}
+}
+
+def buildContainer(Map pipelineParams) {
+	def registry = "spring-docker.jfrog.io"
+	def credentialIdArtifactory = "artifactory-user"
+
+	def project = "${pipelineParams.project}"
+	def parent = "${pipelineParams.parent}"
+	def nodeEnv = "${pipelineParams.nodeEnv}"
+
+	def dockerBuildOnly = pipelineParams.dockerBuildOnly ?: false
+	def dockerTag
+
+	try {
+		container("docker") {
+
+			stage("build docker image") {
+				withCredentials([
+					usernamePassword(
+						credentialsId: "${credentialIdArtifactory}",
+						usernameVariable: "ARTIFACTORY_USERNAME",
+						passwordVariable: "ARTIFACTORY_PASSWORD"
+					)
+				]) {
+					sh "docker login -u $ARTIFACTORY_USERNAME -p '$ARTIFACTORY_PASSWORD' https://${registry}"
+
+					if (dockerBuildOnly) {
+						sh "make build PROJECT=${project} PARENT=${parent} NODE_ENV=${nodeEnv}"
+					} else {
+						sh "make release PROJECT=${project} PARENT=${parent} NODE_ENV=${nodeEnv}"
+					}
+
+					dockerTag = sh(
+						returnStdout: true,
+						script: "make gettag"
+					).trim()
+
+                    sh "docker rmi spring-docker.jfrog.io/${parent}/${project}:${dockerTag} spring-docker.jfrog.io/${parent}/${project}:latest"
+				}
+			}
+		}
+	} catch (e) {
+		emailext (
+			mimeType: "text/html",
+			subject: "Docker container build has failed",
+			body: """
+			<p> &#9760; Something went wrong</p>
+			<p><b>Here you find the result of the Jenkins build:</b> "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BUILD_NUMBER}]</a>"</p>
+			""",
+			recipientProviders: [[$class: "DevelopersRecipientProvider"]]
+		)
+		throw e
+	}
+
+}
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..69865f8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,37 @@
+PROJECT=red-delivery
+PARENT=red
+
+REGISTRY=spring-docker.jfrog.io
+IMAGE_NAME=$(REGISTRY)/$(PARENT)/$(PROJECT)
+IMAGE_LATEST=$(IMAGE_NAME):latest
+GIT_HASH=$(shell git rev-parse --short HEAD)
+FULL_NAME=$(IMAGE_NAME):$(GIT_HASH)
+
+# test if the make is running inside a Jenkins, then set different network options than on Docker for Mac
+ifdef BUILD_NUMBER
+    HOSTNAME=$(shell hostname)
+    NETWORK=$(shell docker ps -q --filter 'label=io.kubernetes.pod.name=$(HOSTNAME)' -n1)
+    DOCKER_OPT_ARGS=--pull --network=container:$(NETWORK)
+else
+	DOCKER_OPT_ARGS=--pull
+endif
+
+.DEFAULT_GOAL: build
+
+.PHONY: build
+build:
+	docker build $(DOCKER_OPT_ARGS) -t $(FULL_NAME) --build-arg NODE_ENV=$(NODE_ENV) .
+	docker tag $(FULL_NAME) $(IMAGE_LATEST)
+
+.PHONY: release
+release: build
+	docker push $(IMAGE_LATEST)
+	docker push $(FULL_NAME)
+
+.PHONY: gettag
+gettag:
+	@echo $(GIT_HASH)
+
+.PHONY: run
+run: build
+	docker run $(IMAGE_LATEST)
\ No newline at end of file

From aec81ac3134258c954381941b37c4f95c4f376e7 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Tue, 5 Nov 2019 13:49:31 +0100
Subject: [PATCH 06/24] Deploy to EKS cluster

---
 Jenkinsfile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9d868e4..9068ed7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,7 +23,7 @@ node("jenkins-agent-images") {
 				parent: "${parent}",
 				project: "${project}",
 				branch: "${BRANCH_NAME}",
-				nodeEnv: "production"
+				nodeEnv: "production",
 				dockerBuildOnly: dockerBuildOnly
 		)
 	}
@@ -38,27 +38,31 @@ node("jenkins-agent-images") {
 
 	if (!dockerBuildOnly) {
 		if (BRANCH_NAME == "master") {
-			deployKubernetes(
+			deployKubernetesEKS(
 				parent: "${parent}",
 				project: "${project}",
 				imageTag: "${imageTagPrd}",
-				namespace: "red-prd",
+				k8sCluster: "preview-red-springtools-de",
+				namespace: "preview-prd",
+				releaseName: "preview",
 				env: "prd"
 			)
 
 			sendReleaseMail(
-					project: "${project}",
-					imageTag: "${imageTag}",
-					mailto: "jenkins-red@spring-media.de",
-					env: "PRODUCTION"
+				project: "${project}",
+				imageTag: "${imageTagPrd}",
+				mailto: "jenkins-red@spring-media.de",
+				env: "PRODUCTION"
 			)
 		}
 
-		deployKubernetes(
+		deployKubernetesEKS(
 			parent: "${parent}",
 			project: "${project}",
 			imageTag: "${imageTagStg}",
-			namespace: "red-stg",
+			k8sCluster: "preview-red-springtools-de",
+			namespace: "preview-stg",
+			releaseName: "preview",
 			env: "stg"
 		)
 	}

From 926b2df0c0fb2de3ce9b41db82c1ab25bce18315 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Tue, 5 Nov 2019 13:52:07 +0100
Subject: [PATCH 07/24] Add helm values

---
 helm/values-prd.yaml | 0
 helm/values-stg.yaml | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 helm/values-prd.yaml
 create mode 100644 helm/values-stg.yaml

diff --git a/helm/values-prd.yaml b/helm/values-prd.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/helm/values-stg.yaml b/helm/values-stg.yaml
new file mode 100644
index 0000000..e69de29

From 6a741486e653a261b8e79d12381c6e777b184a74 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Tue, 5 Nov 2019 15:15:57 +0100
Subject: [PATCH 08/24] Fix typo

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9068ed7..39e22ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ node("jenkins-agent-images") {
 			parent: "${parent}",
 			project: "${project}",
 			branch: "${BRANCH_NAME}",
-			nodeEnv: "staging"
+			nodeEnv: "staging",
 			dockerBuildOnly: dockerBuildOnly
 	)
 

From 6c3d32827519295c7114044cff3943913aa5635e Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Tue, 5 Nov 2019 17:22:41 +0100
Subject: [PATCH 09/24] Change naming in deployment pipeline

---
 Jenkinsfile | 2 +-
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 39e22ef..b548955 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 @Library("sharedLibraries")
 
 def parent = "red"
-def project = "swerve"
+def project = "swerve-ui"
 
 node("jenkins-agent-images") {
 
diff --git a/Makefile b/Makefile
index 69865f8..cf63246 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PROJECT=red-delivery
+PROJECT=swerve-ui
 PARENT=red
 
 REGISTRY=spring-docker.jfrog.io

From 2e2f04d5647afc35adc0fc56f6f0589a66265d3f Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Wed, 6 Nov 2019 11:00:24 +0100
Subject: [PATCH 10/24] Set npm config in during build of docker image

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index f2aaacb..e7202f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ COPY . /app
 
 ARG NODE_ENV
 ENV PATH /app/node_modules/.bin:$PATH
+RUN npm config set unsafe-perm true
 RUN npm install -g @vue/cli && \
     npm install
 RUN vue-cli-service build --mode NODE_ENV
@@ -15,4 +16,6 @@ RUN vue-cli-service build --mode NODE_ENV
 # ---- Release ----å
 FROM nginx AS release
 
+EXPOSE 8080
+
 COPY --from=dependencies /app/dist /usr/share/nginx/html
\ No newline at end of file

From 31514bb4b6b6c5132b2ea072a47aff8d43422557 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Wed, 6 Nov 2019 12:30:59 +0100
Subject: [PATCH 11/24] Install vue-cli locally in docker build

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e7202f2..5901a81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ COPY . /app
 ARG NODE_ENV
 ENV PATH /app/node_modules/.bin:$PATH
 RUN npm config set unsafe-perm true
-RUN npm install -g @vue/cli && \
+RUN npm install @vue/cli && \
     npm install
 RUN vue-cli-service build --mode NODE_ENV
 

From d0bad85de679cda109cd857ecd730a0983edeac3 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Wed, 6 Nov 2019 13:18:22 +0100
Subject: [PATCH 12/24] Run vue-cli-service with full path

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5901a81..401828d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ ENV PATH /app/node_modules/.bin:$PATH
 RUN npm config set unsafe-perm true
 RUN npm install @vue/cli && \
     npm install
-RUN vue-cli-service build --mode NODE_ENV
+RUN /app/node_modules/.bin/vue-cli-service build --mode NODE_ENV
 
 # ---- Release ----å
 FROM nginx AS release

From 7c7e801f2292338eccc32eecbb3b51b3f7ffe85a Mon Sep 17 00:00:00 2001
From: dfassben <daniel.fassbender@spring-media.de>
Date: Thu, 7 Nov 2019 16:17:36 +0100
Subject: [PATCH 13/24] fix the build pipeline

---
 Dockerfile   |  18 +------
 Jenkinsfile  | 143 +++++++++++++++------------------------------------
 package.json |   5 +-
 3 files changed, 47 insertions(+), 119 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 401828d..5e9ff4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,5 @@
-# ---- Base Node ----
-FROM node:10-alpine AS dependencies
-
-LABEL NAME="red-swerve-ui"
-
-WORKDIR /app
-COPY . /app
-
-ARG NODE_ENV
-ENV PATH /app/node_modules/.bin:$PATH
-RUN npm config set unsafe-perm true
-RUN npm install @vue/cli && \
-    npm install
-RUN /app/node_modules/.bin/vue-cli-service build --mode NODE_ENV
-
-# ---- Release ----å
 FROM nginx AS release
 
 EXPOSE 8080
 
-COPY --from=dependencies /app/dist /usr/share/nginx/html
\ No newline at end of file
+COPY dist /usr/share/nginx/html
diff --git a/Jenkinsfile b/Jenkinsfile
index b548955..bb682b4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,121 +3,62 @@
 def parent = "red"
 def project = "swerve-ui"
 
-node("jenkins-agent-images") {
+podTemplate(name: 'jenkins-agent-swerve-ui',
+		podRetention: never(),
+		yamlMergeStrategy: merge(),
+		inheritFrom: 'jenkins-agent-nodejs-10 jenkins-agent-docker jenkins-agent-kubetools') {
 
-	stage("clone repository") {
-		deleteDir()
-		checkout(scm)
-	}
+	node(POD_LABEL) {
 
-	def BRANCH_NAME = getBranchName()
+		stage("clone repository") {
+			deleteDir()
+			checkout(scm)
+		}
 
-	parent = "${parent}${BRANCH_NAME != "master" ? '-branches' : ''}"
+		def BRANCH_NAME = getBranchName()
 
-	def dockerBuildOnly = BRANCH_NAME == ""
-	def imageTagStg
-	def imageTagPrd
+		parent = "${parent}${BRANCH_NAME != "master" ? '-branches' : ''}"
 
-	if (BRANCH_NAME == "master") {
-		imageTagPrd = buildContainer(
-				parent: "${parent}",
-				project: "${project}",
-				branch: "${BRANCH_NAME}",
-				nodeEnv: "production",
-				dockerBuildOnly: dockerBuildOnly
-		)
-	}
+		def dockerBuildOnly = BRANCH_NAME == "" ? true : false
 
-	imageTagStg = buildContainer(
-			parent: "${parent}",
-			project: "${project}",
-			branch: "${BRANCH_NAME}",
-			nodeEnv: "staging",
-			dockerBuildOnly: dockerBuildOnly
-	)
+		container("nodejs") {
+			stage("build and test") {
 
-	if (!dockerBuildOnly) {
-		if (BRANCH_NAME == "master") {
-			deployKubernetesEKS(
-				parent: "${parent}",
-				project: "${project}",
-				imageTag: "${imageTagPrd}",
-				k8sCluster: "preview-red-springtools-de",
-				namespace: "preview-prd",
-				releaseName: "preview",
-				env: "prd"
-			)
+				initNodeJS()
 
-			sendReleaseMail(
-				project: "${project}",
-				imageTag: "${imageTagPrd}",
-				mailto: "jenkins-red@spring-media.de",
-				env: "PRODUCTION"
-			)
+				sh """
+					yarn install
+					yarn check --integrity
+					yarn check --verify-tree
+					yarn build
+
+					# yarn check:all
+					
+					yarn install --production
+				"""
+			}
 		}
 
-		deployKubernetesEKS(
-			parent: "${parent}",
-			project: "${project}",
-			imageTag: "${imageTagStg}",
-			k8sCluster: "preview-red-springtools-de",
-			namespace: "preview-stg",
-			releaseName: "preview",
-			env: "stg"
+		// build docker image
+		def imageTag = buildDockerContainer2(
+				parent: "${parent}",
+				project: "${project}",
+				branch: "${BRANCH_NAME}",
+				dockerBuildOnly: dockerBuildOnly
 		)
-	}
-}
-
-def buildContainer(Map pipelineParams) {
-	def registry = "spring-docker.jfrog.io"
-	def credentialIdArtifactory = "artifactory-user"
-
-	def project = "${pipelineParams.project}"
-	def parent = "${pipelineParams.parent}"
-	def nodeEnv = "${pipelineParams.nodeEnv}"
 
-	def dockerBuildOnly = pipelineParams.dockerBuildOnly ?: false
-	def dockerTag
+		if (!dockerBuildOnly) {
+			if (BRANCH_NAME == "master") {
 
-	try {
-		container("docker") {
+				deployKubernetes(
+						parent: "${parent}",
+						project: "${project}",
+						imageTag: "${imageTag}",
+						namespace: "red-stg",
+						env: "stg"
+				)
 
-			stage("build docker image") {
-				withCredentials([
-					usernamePassword(
-						credentialsId: "${credentialIdArtifactory}",
-						usernameVariable: "ARTIFACTORY_USERNAME",
-						passwordVariable: "ARTIFACTORY_PASSWORD"
-					)
-				]) {
-					sh "docker login -u $ARTIFACTORY_USERNAME -p '$ARTIFACTORY_PASSWORD' https://${registry}"
-
-					if (dockerBuildOnly) {
-						sh "make build PROJECT=${project} PARENT=${parent} NODE_ENV=${nodeEnv}"
-					} else {
-						sh "make release PROJECT=${project} PARENT=${parent} NODE_ENV=${nodeEnv}"
-					}
-
-					dockerTag = sh(
-						returnStdout: true,
-						script: "make gettag"
-					).trim()
-
-                    sh "docker rmi spring-docker.jfrog.io/${parent}/${project}:${dockerTag} spring-docker.jfrog.io/${parent}/${project}:latest"
-				}
 			}
 		}
-	} catch (e) {
-		emailext (
-			mimeType: "text/html",
-			subject: "Docker container build has failed",
-			body: """
-			<p> &#9760; Something went wrong</p>
-			<p><b>Here you find the result of the Jenkins build:</b> "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BUILD_NUMBER}]</a>"</p>
-			""",
-			recipientProviders: [[$class: "DevelopersRecipientProvider"]]
-		)
-		throw e
 	}
-
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 6f169a9..305274c 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,10 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "test:unit": "vue-cli-service test:unit"
+    "test:unit": "vue-cli-service test:unit",
+    "check:all": "yarn check:lint && yarn test:unit && yarn test:integration && yarn check:bundle",
+    "check:lint": "yarn lint --no-fix",
+    "check:bundle": "es-check es5 dist/**/*.js"
   },
   "dependencies": {
     "register-service-worker": "^1.5.2",

From 5f12acf11cb99725440b21ac4c44204b3a533c8c Mon Sep 17 00:00:00 2001
From: dfassben <daniel.fassbender@spring-media.de>
Date: Fri, 8 Nov 2019 10:29:08 +0100
Subject: [PATCH 14/24] fix the build pipeline

---
 helm/values-prd.yaml | 2 ++
 helm/values-stg.yaml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/helm/values-prd.yaml b/helm/values-prd.yaml
index e69de29..dd4acd0 100644
--- a/helm/values-prd.yaml
+++ b/helm/values-prd.yaml
@@ -0,0 +1,2 @@
+url:
+  - "swerve-ui.prd.red.springtools.de"
diff --git a/helm/values-stg.yaml b/helm/values-stg.yaml
index e69de29..6b244e2 100644
--- a/helm/values-stg.yaml
+++ b/helm/values-stg.yaml
@@ -0,0 +1,2 @@
+url:
+  - "swerve-ui.stg.red.springtools.de"

From 822cf3fe10ec1c597b74c8aaed21bf2945c61ecd Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Mon, 11 Nov 2019 12:35:00 +0100
Subject: [PATCH 15/24] Add build mode

---
 Jenkinsfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bb682b4..09edd8d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,20 +22,20 @@ podTemplate(name: 'jenkins-agent-swerve-ui',
 		def dockerBuildOnly = BRANCH_NAME == "" ? true : false
 
 		container("nodejs") {
-			stage("build and test") {
+			stage("build") {
 
 				initNodeJS()
 
 				sh """
+					yarn add @vue/cli
 					yarn install
-					yarn check --integrity
-					yarn check --verify-tree
-					yarn build
-
-					# yarn check:all
-					
-					yarn install --production
 				"""
+
+				if (BRANCH_NAME == "master") {
+					sh "vue-cli-service build --mode production"
+				}  else {
+					sh "vue-cli-service build --mode staging"
+				}
 			}
 		}
 

From b45126529a119d4a2e6d65eb6310b86a1ec77f1f Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Mon, 11 Nov 2019 12:42:00 +0100
Subject: [PATCH 16/24] Install vue cli global

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 09edd8d..691c445 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,7 +27,7 @@ podTemplate(name: 'jenkins-agent-swerve-ui',
 				initNodeJS()
 
 				sh """
-					yarn add @vue/cli
+					yarn global add @vue/cli
 					yarn install
 				"""
 

From cff35e9f7e2c8b192c9ac9f4ca52fec6c7e29cfd Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Mon, 11 Nov 2019 16:40:41 +0100
Subject: [PATCH 17/24] Use yarn to build project

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 691c445..5d760c2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,9 +32,9 @@ podTemplate(name: 'jenkins-agent-swerve-ui',
 				"""
 
 				if (BRANCH_NAME == "master") {
-					sh "vue-cli-service build --mode production"
+					sh "yarn build --mode production"
 				}  else {
-					sh "vue-cli-service build --mode staging"
+					sh "yarn build --mode staging"
 				}
 			}
 		}

From 873239f3c39bc78bcc08274e3e6d9d94acee5791 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Mon, 11 Nov 2019 17:05:02 +0100
Subject: [PATCH 18/24] Deploy to EKS cluster

---
 Jenkinsfile | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5d760c2..3adddc6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,16 +49,26 @@ podTemplate(name: 'jenkins-agent-swerve-ui',
 
 		if (!dockerBuildOnly) {
 			if (BRANCH_NAME == "master") {
-
-				deployKubernetes(
-						parent: "${parent}",
-						project: "${project}",
-						imageTag: "${imageTag}",
-						namespace: "red-stg",
-						env: "stg"
-				)
-
+				deployKubernetesEKS(
+								parent: "${parent}",
+								project: "${project}",
+								imageTag: "${imageTag}",
+								k8sCluster: "preview-red-springtools-de",
+								namespace: "preview-prd",
+								releaseName: "preview",
+								env: "prd"
+							)
 			}
+
+			deployKubernetesEKS(
+							parent: "${parent}",
+							project: "${project}",
+							imageTag: "${imageTag}",
+							k8sCluster: "preview-red-springtools-de",
+							namespace: "preview-stg",
+							releaseName: "preview",
+							env: "stg"
+						)
 		}
 	}
 }

From 620e82832a55b04fe5a5fb9681a0df277f7cecf6 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Tue, 12 Nov 2019 17:19:32 +0100
Subject: [PATCH 19/24] Set node port variables

---
 helm/values-prd.yaml | 1 +
 helm/values-stg.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/helm/values-prd.yaml b/helm/values-prd.yaml
index dd4acd0..7db398b 100644
--- a/helm/values-prd.yaml
+++ b/helm/values-prd.yaml
@@ -1,2 +1,3 @@
 url:
   - "swerve-ui.prd.red.springtools.de"
+nodePort: 31425
diff --git a/helm/values-stg.yaml b/helm/values-stg.yaml
index 6b244e2..bb93b88 100644
--- a/helm/values-stg.yaml
+++ b/helm/values-stg.yaml
@@ -1,2 +1,3 @@
 url:
   - "swerve-ui.stg.red.springtools.de"
+nodePort: 30425

From de312c7c24266b82a72a438ae99b1e0394ee16fe Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Wed, 13 Nov 2019 15:48:28 +0100
Subject: [PATCH 20/24] Remove unused helm values

---
 Dockerfile           | 2 --
 helm/values-prd.yaml | 1 -
 helm/values-stg.yaml | 1 -
 3 files changed, 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5e9ff4a..67cf46b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,3 @@
 FROM nginx AS release
 
-EXPOSE 8080
-
 COPY dist /usr/share/nginx/html
diff --git a/helm/values-prd.yaml b/helm/values-prd.yaml
index 7db398b..dd4acd0 100644
--- a/helm/values-prd.yaml
+++ b/helm/values-prd.yaml
@@ -1,3 +1,2 @@
 url:
   - "swerve-ui.prd.red.springtools.de"
-nodePort: 31425
diff --git a/helm/values-stg.yaml b/helm/values-stg.yaml
index bb93b88..6b244e2 100644
--- a/helm/values-stg.yaml
+++ b/helm/values-stg.yaml
@@ -1,3 +1,2 @@
 url:
   - "swerve-ui.stg.red.springtools.de"
-nodePort: 30425

From 82b62ad4889fa4ca1684aac5346cfc9df3fbe40b Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Thu, 14 Nov 2019 13:04:36 +0100
Subject: [PATCH 21/24] Add support for endpoint env variable

---
 .env                       |  1 +
 .env.development           |  1 +
 .env.production            |  1 +
 .env.staging               |  1 +
 src/services/token.js      | 24 +++++++-----
 src/store/auth.module.js   | 37 +++++++-----------
 src/store/index.js         | 15 +++----
 src/views/DomainDetail.vue | 60 ++++++++++++++--------------
 src/views/DomainList.vue   | 80 ++++++++++++++++++++------------------
 src/views/Login.vue        | 47 +++++++---------------
 10 files changed, 127 insertions(+), 140 deletions(-)
 create mode 100644 .env
 create mode 100644 .env.development
 create mode 100644 .env.production
 create mode 100644 .env.staging

diff --git a/.env b/.env
new file mode 100644
index 0000000..4eb3d9f
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+VUE_APP_ENDPOINT=http://127.0.0.1:8082
\ No newline at end of file
diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..eb62422
--- /dev/null
+++ b/.env.development
@@ -0,0 +1 @@
+VUE_APP_ENDPOINT=
\ No newline at end of file
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..eb62422
--- /dev/null
+++ b/.env.production
@@ -0,0 +1 @@
+VUE_APP_ENDPOINT=
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
new file mode 100644
index 0000000..4eb3d9f
--- /dev/null
+++ b/.env.staging
@@ -0,0 +1 @@
+VUE_APP_ENDPOINT=http://127.0.0.1:8082
\ No newline at end of file
diff --git a/src/services/token.js b/src/services/token.js
index 18d5b8e..bdeb31c 100644
--- a/src/services/token.js
+++ b/src/services/token.js
@@ -1,15 +1,14 @@
-import { getItem, removeItem, setItem } from "./storage";
+import { getItem, removeItem, setItem } from './storage';
 
-const TOKEN_STORAGE_KEY = "swerve_access_token";
-const ENDPOINT_STORAGE_KEY = "swerve_endpoint";
+const TOKEN_STORAGE_KEY = 'swerve_access_token';
+const ENDPOINT_STORAGE_KEY = 'swerve_endpoint';
 
 /**
- * 
- * @param {string} token 
+ *
+ * @param {string} token
  */
-const setLoginData = (data) => {
+const setLoginData = data => {
   setItem(TOKEN_STORAGE_KEY, data.token);
-  setItem(ENDPOINT_STORAGE_KEY, data.endpoint)
 };
 
 /**
@@ -20,7 +19,7 @@ const getToken = () => {
 };
 
 const getEndpoint = () => {
-  return getItem(ENDPOINT_STORAGE_KEY);
+  return process.env.VUE_APP_ENDPOINT;
 };
 
 const clearLoginData = () => {
@@ -34,4 +33,11 @@ const isValid = () => {
   return !!getToken() && !!getEndpoint();
 };
 
-export { TOKEN_STORAGE_KEY, getToken, getEndpoint, clearLoginData, setLoginData, isValid };
\ No newline at end of file
+export {
+  TOKEN_STORAGE_KEY,
+  getToken,
+  getEndpoint,
+  clearLoginData,
+  setLoginData,
+  isValid
+};
diff --git a/src/store/auth.module.js b/src/store/auth.module.js
index e00c8c4..2d54781 100644
--- a/src/store/auth.module.js
+++ b/src/store/auth.module.js
@@ -1,42 +1,31 @@
-import {create} from "api-client";
-import {getToken, getEndpoint, setLoginData, clearLoginData} from "../services/token";
-import { read } from "fs";
-
+import { create } from 'api-client';
+import { getToken, setLoginData, clearLoginData } from '../services/token';
 
 const state = {
-  token: getToken(),
-  endpoint: getEndpoint(),
+  token: getToken()
 };
 
-const getters = {
-
-};
+const getters = {};
 
 const actions = {
-  async fetchLoginData({commit}, {username, password, endpoint}) {
-      const response = await create(endpoint + "/login", {
-        username,
-        password
-      })
-  
-      commit('storeLoginData', {
-        endpoint,
-      });
+  async fetchLoginData({ commit }, { username, password, endpoint }) {
+    const response = await create(endpoint + '/login', {
+      username,
+      password
+    });
 
-      return response;
-    }
+    return response;
+  }
 };
 
 const mutations = {
   storeLoginData(state, data) {
     state.token = data.token;
-    state.endpoint = data.endpoint
     setLoginData(data);
   },
   clearLoginData(state) {
     state.token = null;
-    state.endpoint = null;
-    document.cookie = "token=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+    document.cookie = 'token=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
     clearLoginData();
   }
 };
@@ -47,4 +36,4 @@ export default {
   getters,
   actions,
   mutations
-}
\ No newline at end of file
+};
diff --git a/src/store/index.js b/src/store/index.js
index a4a44c9..232ce63 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,7 +1,7 @@
-import Vue from "vue";
-import Vuex from "vuex";
-import auth from "./auth.module";
-import domains from "./domains.module";
+import Vue from 'vue';
+import Vuex from 'vuex';
+import auth from './auth.module';
+import domains from './domains.module';
 
 Vue.use(Vuex);
 
@@ -14,10 +14,10 @@ const mutations = {
     state.notifications = state.notifications.filter(n => n !== notification);
   },
   updateDomainsLoadingStatus(state, status) {
-    state.isLoadingDomains = status
+    state.isLoadingDomains = status;
   },
   updateDomainLoadingStatus(state, status) {
-    state.isLoadingDomain = status
+    state.isLoadingDomain = status;
   }
 };
 
@@ -31,7 +31,8 @@ export default new Vuex.Store({
     isLoading: false,
     isLoadingDomains: false,
     isLoadingDomain: false,
-    notifications: []
+    notifications: [],
+    endpoint: process.env.VUE_APP_ENDPOINT
   },
   mutations,
   actions: {}
diff --git a/src/views/DomainDetail.vue b/src/views/DomainDetail.vue
index 0f77ee5..3923dbc 100644
--- a/src/views/DomainDetail.vue
+++ b/src/views/DomainDetail.vue
@@ -14,7 +14,7 @@
             required
             class="form-input"
             :disabled="!isNew"
-          >
+          />
         </div>
         <div class="mb-1">
           <label for="redirect-field" class="form-label mb-1 ml-px">Redirect</label>
@@ -25,7 +25,7 @@
             placeholder="redirect.com"
             required
             class="form-input"
-          >
+          />
         </div>
         <div class="flex mb-4">
           <input
@@ -34,7 +34,7 @@
             id="promotable-field"
             class="mr-2 bg-blue-dark"
             v-model="domain.promotable"
-          >
+          />
           <label for="promotable-field" class="form-label">
             Include Path and Query-String
             <span class="text-xs">(optional)</span>
@@ -116,9 +116,9 @@ export default {
     };
   },
   computed: {
-    ...mapState("auth", ['endpoint']),
+    ...mapState(["endpoint"]),
     ...mapState("domains", ["domains"]),
-    ...mapState(['isLoadingDomain']),
+    ...mapState(["isLoadingDomain"])
   },
   methods: {
     ...mapActions("domains", [
@@ -136,7 +136,7 @@ export default {
       this.fetchList({
         endpoint: this.endpoint,
         cursor: "reload"
-        }).catch(() => {
+      }).catch(() => {
         this.addNotification({
           type: "failure",
           text: "Domains could not be loaded"
@@ -147,8 +147,8 @@ export default {
     save() {
       if (this.isNew) {
         this.createOne({
-        endpoint: this.endpoint,
-        domain: this.domain
+          endpoint: this.endpoint,
+          domain: this.domain
         })
           .then(() => {
             this.addNotification({
@@ -157,13 +157,13 @@ export default {
             });
             this.reload();
           })
-          .catch((err) => {
+          .catch(err => {
             if (err.toString() == "Error: Unauthorized") {
               this.addNotification({
-              type: "failure",
-              text: "Please relogin"
-            });
-              return
+                type: "failure",
+                text: "Please relogin"
+              });
+              return;
             }
             this.addNotification({
               type: "failure",
@@ -174,7 +174,7 @@ export default {
       } else
         this.updateOne({
           endpoint: this.endpoint,
-          domain: this.domain,
+          domain: this.domain
         })
           .then(() => {
             this.addNotification({
@@ -183,13 +183,13 @@ export default {
             });
             this.reload();
           })
-          .catch((err) => {
+          .catch(err => {
             if (err.toString() == "Error: Unauthorized") {
               this.addNotification({
-              type: "failure",
-              text: "Please relogin"
-            });
-              return
+                type: "failure",
+                text: "Please relogin"
+              });
+              return;
             }
             this.addNotification({
               type: "failure",
@@ -205,7 +205,7 @@ export default {
       this.deleteOne({
         endpoint: this.endpoint,
         domain: this.domain
-        })
+      })
         .then(() => {
           this.addNotification({
             type: "success",
@@ -213,14 +213,14 @@ export default {
           });
           this.reload();
         })
-        .catch((err) => {
+        .catch(err => {
           if (err.toString() == "Error: Unauthorized") {
-              this.addNotification({
+            this.addNotification({
               type: "failure",
               text: "Please relogin"
             });
-              return
-            }
+            return;
+          }
           this.addNotification({
             type: "failure",
             text: "Domain could not be deleted"
@@ -228,24 +228,24 @@ export default {
         });
     },
     load(id) {
-      this.updateDomainLoadingStatus(true)
+      this.updateDomainLoadingStatus(true);
       this.fetchOne({
         endpoint: this.endpoint,
         id
       })
         .then(response => {
-          this.updateDomainLoadingStatus(false)
+          this.updateDomainLoadingStatus(false);
           this.domain = {
             paths: [],
             code: "301",
             ...response.data
           };
         })
-        .catch((err) => {
-          this.updateDomainLoadingStatus(false)
+        .catch(err => {
+          this.updateDomainLoadingStatus(false);
           if (err.toString() == "Error: Unauthorized") {
-            this.$router.push({name: "login"});
-            return
+            this.$router.push({ name: "login" });
+            return;
           }
           this.addNotification({
             type: "failure",
diff --git a/src/views/DomainList.vue b/src/views/DomainList.vue
index 2519b54..26cdcc6 100644
--- a/src/views/DomainList.vue
+++ b/src/views/DomainList.vue
@@ -2,13 +2,13 @@
   <div class="px-2">
     <h2 class="text-blue text-lg font-bold mb-1">Domains</h2>
     <input
-            name="search-field"
-            id="search-field"
-            placeholder="Search..."
-            v-on:keyup.enter="onFilter"
-            required
-            class="form-input mb-4"
-          >
+      name="search-field"
+      id="search-field"
+      placeholder="Search..."
+      v-on:keyup.enter="onFilter"
+      required
+      class="form-input mb-4"
+    />
     <div @scroll="onScroll" class="overflow-auto h-24 md:h-64">
       <div v-if="isLoadingDomains" class="text-white no-underline">Loading...</div>
       <ul class="list-reset">
@@ -39,17 +39,20 @@ export default {
   name: "domain-list",
   data() {
     return {
-      filter: "",
+      filter: ""
     };
   },
   computed: {
     ...mapState("domains", ["domains"]),
-    ...mapState("auth", ['endpoint']),
-    ...mapState(['isLoadingDomains']),
+    ...mapState(["endpoint"]),
+    ...mapState(["isLoadingDomains"]),
     orderedDomains: function() {
       let sortDomains = Object.assign({}, this.domains);
       if (sortDomains.domains) {
-        if (this.filter != "") sortDomains.domains  = sortDomains.domains.filter((domain) => domain.domain.startsWith(this.filter));
+        if (this.filter != "")
+          sortDomains.domains = sortDomains.domains.filter(domain =>
+            domain.domain.startsWith(this.filter)
+          );
         return [...sortDomains.domains].sort(function(a, b) {
           if (a.domain < b.domain) return -1;
           if (a.domain > b.domain) return 1;
@@ -65,41 +68,42 @@ export default {
     onFilter(ev) {
       this.filter = ev.target.value;
     },
-    onScroll ({ target: { scrollTop, clientHeight, scrollHeight }}) {
+    onScroll({ target: { scrollTop, clientHeight, scrollHeight } }) {
       if (scrollTop + clientHeight >= scrollHeight) {
         if (this.domains.cursor != "EOF") {
-        this.fetchList({
-        endpoint: this.endpoint,
-        cursor: this.domain.cursor
-        }).catch(() => {
-          this.addNotification({
-            type: "failure",
-            text: "Domains could not be loaded"
+          this.fetchList({
+            endpoint: this.endpoint,
+            cursor: this.domain.cursor
+          }).catch(() => {
+            this.addNotification({
+              type: "failure",
+              text: "Domains could not be loaded"
+            });
           });
-        });
         }
       }
     }
   },
   created() {
-    this.updateDomainsLoadingStatus(true)   
+    this.updateDomainsLoadingStatus(true);
     this.fetchList({
-        endpoint: this.endpoint,
-        cursor: "reload",
-        })
-        .then(() => {
-          this.updateDomainsLoadingStatus(false)  
-        }).catch((err) => {
-          this.updateDomainsLoadingStatus(false)  
-          if (err.toString() == "Error: Unauthorized") {
-            this.$router.push({name: "login"});
-            return
-          }
-          this.addNotification({
-            type: "failure",
-            text: "Domains could not be loaded"
-          });
-    });
-  },
+      endpoint: this.endpoint,
+      cursor: "reload"
+    })
+      .then(() => {
+        this.updateDomainsLoadingStatus(false);
+      })
+      .catch(err => {
+        this.updateDomainsLoadingStatus(false);
+        if (err.toString() == "Error: Unauthorized") {
+          this.$router.push({ name: "login" });
+          return;
+        }
+        this.addNotification({
+          type: "failure",
+          text: "Domains could not be loaded"
+        });
+      });
+  }
 };
 </script>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index cda56d0..188a89a 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -2,21 +2,6 @@
   <div class="flex justify-center items-center sm:items-end h-screen p-4">
     <transition appear name="slide-fade">
       <form method="POST" action @submit.prevent="onSubmit" class="w-full max-w-screen-sm">
-        <label
-          for="endpoint-input"
-          class="block text-blue-lightest text-base font-bold mb-1 cursor-pointer ml-1"
-        >Endpoint</label>
-        <input
-          type="text"
-          name="endpoint"
-          id="endpoint-input"
-          v-model="endpoint"
-          required
-          placeholder="api.swerve.tortuga.service:8080"
-          autofocus
-          autocomplete="off"
-          class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 mb-3 rounded focus:border-blue-light focus:outline-none appearance-none"
-        >
         <label
           for="username-input"
           class="block text-blue-lightest text-base font-bold mb-1 cursor-pointer ml-1"
@@ -27,11 +12,10 @@
           id="username-input"
           v-model="username"
           required
-          placeholder="admin"
           autofocus
           autocomplete="off"
           class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 mb-3 rounded focus:border-blue-light focus:outline-none appearance-none"
-        >
+        />
         <label
           for="password-input"
           class="block text-blue-lightest text-base font-bold mb-1 cursor-pointer ml-1"
@@ -42,10 +26,9 @@
           id="password-input"
           v-model="password"
           required
-          placeholder="admin"
           autocomplete="off"
           class="w-full bg-blue-dark border border-blue-dark2 text-l text-white p-2 mb-3 rounded focus:border-blue-light focus:outline-none appearance-none"
-        >
+        />
         <button
           :disabled="disabled"
           class="button button-primary ml-1 sm:w-full disabled:bg-grey-dark disabled:cursor-not-allowed disabled:text-grey-darkest"
@@ -63,7 +46,7 @@ import { getEndpoint } from "../services/token";
 export default {
   data() {
     let endpoint = getEndpoint();
-    if (!endpoint) endpoint = "";
+
     return {
       username: "",
       password: "",
@@ -77,33 +60,33 @@ export default {
     onSubmit() {
       let url;
       try {
-        url = new URL(this.endpoint)
-      } catch(e) {
+        url = new URL(this.endpoint);
+      } catch (e) {
         this.addNotification({
-            type: "failure",
-            text: "Please enter a valid endpoint"
-          });
-          return
+          type: "failure",
+          text: "Please enter a valid endpoint"
+        });
+        return;
       }
       if (!url.origin) {
         this.addNotification({
-            type: "failure",
-            text: "Please enter a valid endpoint"
-          });
+          type: "failure",
+          text: "Please enter a valid endpoint"
+        });
       }
       this.disabled = true;
 
       this.fetchLoginData({
         username: this.username,
         password: this.password,
-        endpoint: url.origin,
+        endpoint: url.origin
       })
-        .then((res) => {
+        .then(res => {
           this.$router.push(
             this.$router.history.current.query.redirectTo || "/"
           );
         })
-        .catch((err) => {
+        .catch(err => {
           this.addNotification({
             type: "failure",
             text: "Login failed"

From 751abd306449a033b861a6c8a9c113981dc80a5f Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Thu, 14 Nov 2019 13:06:46 +0100
Subject: [PATCH 22/24] Add default endpoint

---
 .env.development | 2 +-
 .env.staging     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index eb62422..4eb3d9f 100644
--- a/.env.development
+++ b/.env.development
@@ -1 +1 @@
-VUE_APP_ENDPOINT=
\ No newline at end of file
+VUE_APP_ENDPOINT=http://127.0.0.1:8082
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
index 4eb3d9f..eb62422 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1 +1 @@
-VUE_APP_ENDPOINT=http://127.0.0.1:8082
\ No newline at end of file
+VUE_APP_ENDPOINT=
\ No newline at end of file

From 66af46a8767a37298591a96a2f31e8290269a508 Mon Sep 17 00:00:00 2001
From: dfassben <daniel.fassbender@spring-media.de>
Date: Fri, 22 Nov 2019 09:55:53 +0100
Subject: [PATCH 23/24] =?UTF-8?q?RED-3583=20EC2=20Instanzen=20f=C3=BCr=20P?=
 =?UTF-8?q?review=20Nodes=20verkleinern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile                  | 2 ++
 helm/values-preview-prd.yaml | 9 +++++++++
 helm/values-preview-stg.yaml | 9 +++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 helm/values-preview-prd.yaml
 create mode 100644 helm/values-preview-stg.yaml

diff --git a/Jenkinsfile b/Jenkinsfile
index 3adddc6..26f73c1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,6 +56,7 @@ podTemplate(name: 'jenkins-agent-swerve-ui',
 								k8sCluster: "preview-red-springtools-de",
 								namespace: "preview-prd",
 								releaseName: "preview",
+								helmValuesFile: "values-preview-stg.yaml",
 								env: "prd"
 							)
 			}
@@ -67,6 +68,7 @@ podTemplate(name: 'jenkins-agent-swerve-ui',
 							k8sCluster: "preview-red-springtools-de",
 							namespace: "preview-stg",
 							releaseName: "preview",
+							helmValuesFile: "values-preview-prd.yaml",
 							env: "stg"
 						)
 		}
diff --git a/helm/values-preview-prd.yaml b/helm/values-preview-prd.yaml
new file mode 100644
index 0000000..f5777e4
--- /dev/null
+++ b/helm/values-preview-prd.yaml
@@ -0,0 +1,9 @@
+url:
+  - "swerve-ui.prd.red.springtools.de"
+resources:
+  requests:
+    memory: "256Mi"
+    cpu: "200m"
+  limits:
+    memory: "512Mi"
+    cpu: "1"
diff --git a/helm/values-preview-stg.yaml b/helm/values-preview-stg.yaml
new file mode 100644
index 0000000..a86cd87
--- /dev/null
+++ b/helm/values-preview-stg.yaml
@@ -0,0 +1,9 @@
+url:
+  - "swerve-ui.stg.red.springtools.de"
+resources:
+  requests:
+    memory: "256Mi"
+    cpu: "200m"
+  limits:
+    memory: "512Mi"
+    cpu: "1"

From 0da5691b423dde249aaae7d748dd3983c6803c66 Mon Sep 17 00:00:00 2001
From: Dennis Czombera <milchschaumschluerfer@gmail.com>
Date: Thu, 9 Jan 2020 17:09:36 +0100
Subject: [PATCH 24/24] Deploy to old cluster

---
 Jenkinsfile | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3adddc6..102d6e2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,27 +48,23 @@ podTemplate(name: 'jenkins-agent-swerve-ui',
 		)
 
 		if (!dockerBuildOnly) {
+			deployKubernetes(
+				parent: "${parent}",
+				project: "${project}",
+				imageTag: "${imageTag}",
+				namespace: "red-stg",
+				env: "stg"
+			)
+
 			if (BRANCH_NAME == "master") {
-				deployKubernetesEKS(
-								parent: "${parent}",
-								project: "${project}",
-								imageTag: "${imageTag}",
-								k8sCluster: "preview-red-springtools-de",
-								namespace: "preview-prd",
-								releaseName: "preview",
-								env: "prd"
-							)
+				deployKubernetes(
+					parent: "${parent}",
+					project: "${project}",
+					imageTag: "${imageTag}",
+					namespace: "red-prd",
+					env: "prd"
+				)
 			}
-
-			deployKubernetesEKS(
-							parent: "${parent}",
-							project: "${project}",
-							imageTag: "${imageTag}",
-							k8sCluster: "preview-red-springtools-de",
-							namespace: "preview-stg",
-							releaseName: "preview",
-							env: "stg"
-						)
 		}
 	}
-}
+}
\ No newline at end of file