From 9b022502a7da38de038118ed3b3657df2496a5a7 Mon Sep 17 00:00:00 2001
From: Kekskurse <git@kekskurse.de>
Date: Wed, 17 Jul 2019 14:44:05 +0200
Subject: [PATCH] oops

---
 Dockerfile                    | 10 ++++++++
 build.sh                      |  2 ++
 src/App.vue                   |  2 +-
 src/components/Menu.vue       | 34 ++++++++++++++++++++------
 src/components/MenuMobile.vue | 41 +++++++++++++++++++++++++++++++
 src/services/Api.js           |  4 ++--
 src/services/Apps.js          |  2 +-
 src/views/AppDetails.vue      | 45 +++++++++++++++++++++++++++++++++--
 src/views/ListApps.vue        |  2 +-
 src/views/Login.vue           | 10 ++++++--
 10 files changed, 136 insertions(+), 16 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 build.sh

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..44e759c1
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM node:lts-alpine
+RUN npm install -g http-server
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build
+
+EXPOSE 8080
+CMD [ "http-server", "dist" ]
\ No newline at end of file
diff --git a/build.sh b/build.sh
new file mode 100644
index 00000000..7e885676
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,2 @@
+docker build -t docker.keks.cloud/keksaccount/gui:latest .
+docker push docker.keks.cloud/keksaccount/gui:latest
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 202e2e77..61051825 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-app >
+  <v-app  style="background-color:#ffffff">
       <div v-if="$store.getters.getAllDataLoaded">
           <Menu></Menu>
           <MenuMobile></MenuMobile>
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 3463f318..57ce332e 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -12,13 +12,33 @@
                     flat
             >Apps</v-btn>
 
-            <v-btn
-                    v-if="this.$store.state.loggedIn && this.$store.getters.getMe.admin"
-                    :to="{path: '/admin'}"
-                    flat
-            >Admin</v-btn>
 
 
+            <v-menu offset-y v-if="this.$store.state.loggedIn && this.$store.getters.getMe.admin">
+                <template v-slot:activator="{ on }">
+                    <v-btn
+                            v-on="on"
+                            flat
+                    >
+                        Admin
+                    </v-btn>
+                </template>
+                <v-list>
+                    <v-list-tile @click="">
+                        <v-list-tile-title >Settings</v-list-tile-title>
+                    </v-list-tile>
+                    <v-list-tile @click="">
+                        <v-list-tile-title >Users</v-list-tile-title>
+                    </v-list-tile>
+                    <v-list-tile @click="">
+                        <v-list-tile-title >Invites</v-list-tile-title>
+                    </v-list-tile>
+                    <v-list-tile @click="">
+                        <v-list-tile-title >Apps</v-list-tile-title>
+                    </v-list-tile>
+                </v-list>
+            </v-menu>
+
             <v-menu offset-y v-if="this.$store.state.loggedIn">
                 <template v-slot:activator="{ on }">
                     <v-btn
@@ -29,8 +49,8 @@
                     </v-btn>
                 </template>
                 <v-list>
-                    <v-list-tile>
-                        <v-list-tile-title @click="clickLoogut()">Logout</v-list-tile-title>
+                    <v-list-tile @click="clickLoogut()">
+                        <v-list-tile-title >Logout</v-list-tile-title>
                     </v-list-tile>
                 </v-list>
             </v-menu>
diff --git a/src/components/MenuMobile.vue b/src/components/MenuMobile.vue
index 2869ded5..9d9a5330 100644
--- a/src/components/MenuMobile.vue
+++ b/src/components/MenuMobile.vue
@@ -13,6 +13,47 @@
                 <v-list-tile-title>Home</v-list-tile-title>
             </v-list-tile>
 
+            <v-list-tile>
+                <v-list-tile-action>
+                    <v-icon>home</v-icon>
+                </v-list-tile-action>
+                <v-list-tile-title>Apps</v-list-tile-title>
+            </v-list-tile>
+
+            <v-list-group
+                    prepend-icon="account_circle"
+                    value="true"
+            >
+                <template v-slot:activator>
+                    <v-list-tile>
+                        <v-list-tile-title>Admin</v-list-tile-title>
+                    </v-list-tile>
+                </template>
+
+                <v-list-tile>
+                    <v-list-tile-action>
+                    </v-list-tile-action>
+                    <v-list-tile-title>Settings</v-list-tile-title>
+                </v-list-tile>
+                <v-list-tile>
+                    <v-list-tile-action>
+                    </v-list-tile-action>
+                    <v-list-tile-title>Users</v-list-tile-title>
+                </v-list-tile>
+                <v-list-tile>
+                    <v-list-tile-action>
+                    </v-list-tile-action>
+                    <v-list-tile-title>Apps</v-list-tile-title>
+                </v-list-tile>
+                <v-list-tile>
+                    <v-list-tile-action>
+                    </v-list-tile-action>
+                    <v-list-tile-title>Invites</v-list-tile-title>
+                </v-list-tile>
+
+
+            </v-list-group>
+
             <v-list-group
                     prepend-icon="account_circle"
                     value="true"
diff --git a/src/services/Api.js b/src/services/Api.js
index 56ed9ed9..751e8ebf 100644
--- a/src/services/Api.js
+++ b/src/services/Api.js
@@ -2,8 +2,8 @@ import axios from 'axios'
 
 export default() => {
     return axios.create({
-        baseURL: `http://127.0.0.1:8000/api/`,
-        //baseURL: `https://account.keks.cloud/api/`,
+        //baseURL: `http://127.0.0.1:8000/api/`,
+        baseURL: `https://account.keks.cloud/api/`,
         withCredentials: false,
         headers: {
             'Accept': 'application/json',
diff --git a/src/services/Apps.js b/src/services/Apps.js
index f68dd746..5875811a 100644
--- a/src/services/Apps.js
+++ b/src/services/Apps.js
@@ -5,7 +5,7 @@ export default {
         return Api().get('/v1/app')
     },
     getAppImage(id) {
-        return "https://account.keks.cloud/gui/apps/"+id+"/icon";
+        return "https://api.account.keks.cloud/gui/apps/"+id+"/icon";
     },
     getApp(id) {
         return Api().get('/v1/app/'+id)
diff --git a/src/views/AppDetails.vue b/src/views/AppDetails.vue
index dd4bd215..0b818be5 100644
--- a/src/views/AppDetails.vue
+++ b/src/views/AppDetails.vue
@@ -44,7 +44,7 @@
                                             hint="You can't edit this"
                                     ></v-text-field>
                                     <br>
-                                    <h2>API Access</h2>
+                                    <!--<h2>API Access</h2>
                                     <p>
                                         You can access the API to get informations about this APP with the following API Credentials:
                                         <v-text-field
@@ -70,7 +70,7 @@
                                                 value=""
                                                 disabled
                                         ></v-text-field>
-                                    </p>
+                                    </p>!-->
                                 </v-container>
                             </v-tab-item>
                             <v-tab-item :key="3" :transition="false"  :reverse-transition="false">
@@ -145,6 +145,47 @@
                                 <v-container style="padding-right: 0px; padding-left:0px;">
                                     <p>
                                         Beim ändern der Permissions müssen alle User den Zugriff erneut bestätigen.
+
+                                        <v-checkbox
+                                                v-model="app.access.oAuth"
+                                                label="Use oAuth"
+                                                disabled
+                                        ></v-checkbox>
+                                        <v-checkbox
+                                                v-model="app.access.api"
+                                                label="Make API-Requests"
+                                                disabled
+                                        ></v-checkbox>
+                                        <v-checkbox
+                                                v-model="app.access.update_apps"
+                                                label="Update the Users App"
+                                                disabled
+                                        ></v-checkbox>
+                                        <v-checkbox
+                                                v-model="app.access.update_profile"
+                                                label="Update the User Profile"
+                                                disabled
+                                        ></v-checkbox>
+                                        <v-checkbox
+                                                v-model="app.access.update_access"
+                                                label="Update the User Access list (revoke Access)""
+                                                disabled
+                                        ></v-checkbox>
+                                        <v-checkbox
+                                                v-model="app.access.read_access"
+                                                label="Read all Access from the User"
+                                                disabled
+                                        ></v-checkbox>
+                                        <v-checkbox
+                                                v-model="app.access.read_apps"
+                                                label="Read all Apps from the User"
+                                                disabled
+                                        ></v-checkbox>
+                                        <v-checkbox
+                                                v-model="app.access.read_profile"
+                                                label="Read the User-Profil Information"
+                                                disabled
+                                        ></v-checkbox>
                                     </p>
                                 </v-container>
                             </v-tab-item>
diff --git a/src/views/ListApps.vue b/src/views/ListApps.vue
index 1fafe438..1123504c 100644
--- a/src/views/ListApps.vue
+++ b/src/views/ListApps.vue
@@ -9,7 +9,7 @@
                 </v-flex>
             </v-layout>
             <v-layout row wrap>
-                <v-flex md4 text-xs-center v-for="(item, index) in apps">
+                <v-flex md4 xs12 text-xs-center v-for="(item, index) in apps">
                 <v-card>
                     <v-layout>
                         <v-flex xs5>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 5f963c4f..76006d44 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -53,8 +53,14 @@
     },
     mounted: function() {
       console.log("REDIRECT: "+this.$store.state.redirectIfLoggedIn)
-      if(this.$store.state.loggedIn == true && this.$store.state.redirectIfLoggedIn != null) {
-        this.$router.push(this.$store.state.redirectIfLoggedIn);
+      if(this.$store.state.loggedIn == true) {
+        if(this.$store.state.redirectIfLoggedIn != null) {
+          this.$router.push(this.$store.state.redirectIfLoggedIn);
+        } else {
+          this.$router.push({name: 'Dashboard'});
+        }
+
+
       }
       this.nameBig = this.$store.getters.getSettingValue("name_big");
       this.nameSmall = this.$store.getters.getSettingValue("name_small");