From 21fb038128965cbe8d897f82ebf969963b9bd6d5 Mon Sep 17 00:00:00 2001
From: Kekskurse <git@kekskurse.de>
Date: Tue, 24 Sep 2019 16:46:02 +0200
Subject: [PATCH] Fix Scroll

---
 .env.development         |  2 +-
 src/App.vue              |  3 +++
 src/components/Menu.vue  |  1 +
 src/components/Menu2.vue |  4 ++--
 src/store/store.js       | 16 +++++++++++-----
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.env.development b/.env.development
index 4f533623..a018793e 100644
--- a/.env.development
+++ b/.env.development
@@ -1 +1 @@
-VUE_APP_API_URL=http://localhost:8000/
+VUE_APP_API_URL=http://localhost:8000
diff --git a/src/App.vue b/src/App.vue
index 65e4c355..3fa08c2a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,6 +12,9 @@
       </div>
       <div v-if="!$store.getters.getAllDataLoaded">
         Loading ...
+          <div v-if="$store.getters.getError">
+              Es gab einen Fehler, bitte probiere es später nochmal
+          </div>
       </div>
   </v-app>
 </template>
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 0f1d9d2f..a6c4131e 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -181,6 +181,7 @@
                 }
             },
             handleScroll: function (evt, el) {
+                console.log(el);
                 console.log("SCROLL: "+evt.pageY);
                 if(evt.pageY > 100) {
                     this.big = false;
diff --git a/src/components/Menu2.vue b/src/components/Menu2.vue
index 4a996709..22bfbbcd 100644
--- a/src/components/Menu2.vue
+++ b/src/components/Menu2.vue
@@ -122,8 +122,8 @@
         },
         methods: {
             handleScroll: function (evt, el) {
-                console.log("SCROLL: "+evt.pageY);
-                if(evt.pageY > 0) {
+                let scrollPos = document.documentElement.scrollTop;
+                if(scrollPos> 0) {
                     this.big = false;
                     this.bgcolor = "#fff";
                     this.flat = false;
diff --git a/src/store/store.js b/src/store/store.js
index cffaa817..c5e960ba 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -13,7 +13,8 @@ export default new Vuex.Store({
         me: [],
         redirectIfLoggedIn: null,
         settings: [], // The TV inventory
-        sideMenu: false, //Toggle Side Menu on side Bar
+        sideMenu: false, //Toggle Side Menu on side Bar,
+        error: false
     },
 
     getters: {
@@ -38,6 +39,9 @@ export default new Vuex.Store({
             }
             return loaded;
         },
+        getError: (state) => {
+            return state.error
+        },
         getMe: (state) => {
             return state.me;
         }
@@ -48,6 +52,9 @@ export default new Vuex.Store({
             state.settings = settings;
             state.settingsLoaded = true;
         },
+        setError: function(state) {
+          state.error = true;
+        },
         setMe: function(state, me) {
             if(me == false) {
                 state.loggedIn = false;
@@ -67,6 +74,8 @@ export default new Vuex.Store({
                 ServerService.getPublicSettings().then((res) => {
                     context.commit('setSettings', res.data.data)
                     resolve()
+                }).catch((res) => {
+                    context.commit('setError')
                 });
             })
         },
@@ -74,14 +83,11 @@ export default new Vuex.Store({
             UserService.getTokenFromStorage();
             return new Promise((resolve, reject) => {
                 UserService.me().then((res) => {
-                    console.log("GET USER DATA");
                     context.commit('setMe', res.data.data)
                 }, (res) => {
                     context.commit('setMe', false)
-                    console.log("DONT GET USER DATA");
-                    console.log(res.response.data)
                 })
             })
         }
     }
-});
\ No newline at end of file
+});