Navigating to Home

motorradig/.idea/workspace.xml

@@ -3,9 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="eed7de89-f054-487c-bf59-36356758942b" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/FileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/FileController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/js/Icon.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/Icon.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/public/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/app.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/js/views/Gallery.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/Gallery.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/js/store.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/store.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/js/views/Main.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/Main.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/js/views/Upload.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/Upload.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -300,6 +302,10 @@
     </state>
     <state x="623" y="178" width="673" height="724" key="find.popup/0.0.1920.1080@0.0.1920.1080" timestamp="1580465329892" />
     <state x="1903" y="197" width="673" height="708" key="find.popup/0.23.1280.777/1280.23.1920.1057@1280.23.1920.1057" timestamp="1579597123793" />
+    <state x="616" y="250" key="run.anything.popup" timestamp="1583479825710">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="616" y="250" key="run.anything.popup/0.0.1920.1080@0.0.1920.1080" timestamp="1583479825710" />
     <state x="417" y="196" width="670" height="498" key="search.everywhere.popup" timestamp="1581148318017">
       <screen x="0" y="23" width="1280" height="777" />
     </state>

motorradig/public/js/Icon.js

@@ -391,7 +391,7 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(/*! /Users/tschneider/dev/repo/motorradig/motorradig/resources/js/Icon.js */"./resources/js/Icon.js");
+module.exports = __webpack_require__(/*! /mnt/d/repos/motorradig/motorradig/resources/js/Icon.js */"./resources/js/Icon.js");
 
 
 /***/ })

motorradig/public/js/app.js

@@ -2208,6 +2208,7 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
 /* harmony default export */ __webpack_exports__["default"] = ({
   data: function data() {
     return {
@@ -2350,15 +2351,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
 
 
 /* harmony default export */ __webpack_exports__["default"] = ({
@@ -2469,6 +2461,10 @@ __webpack_require__.r(__webpack_exports__);
       console.log("New Folder selected:");
       console.log(event.target.value);
       this.$store.state.selectedFolder = event.target.value;
+    },
+    mainPage: function mainPage() {
+      console.log("Pushing to /");
+      this.$router.push('/');
     }
   }
 });
@@ -31811,6 +31807,19 @@ var render = function() {
     ]),
     _vm._v(" "),
     _c("div", { staticClass: "has-text-centered" }, [
+      _c(
+        "button",
+        {
+          staticClass: "button",
+          on: {
+            click: function($event) {
+              return _vm.loadPage("main")
+            }
+          }
+        },
+        [_vm._v("Home")]
+      ),
+      _vm._v(" "),
       _c(
         "button",
         {
@@ -32074,139 +32083,58 @@ var render = function() {
       _vm._v("Motorrad IG\n    ")
     ]),
     _vm._v(" "),
-    _c(
+    _c("div", { staticClass: "has-text-centered" }, [
-      "div",
+      _c(
-      { staticClass: "has-text-centered" },
+        "button",
-      [
+        {
-        _c(
+          staticClass: "button",
-          "button",
+          on: {
-          { staticClass: "button", on: { click: function($event) {} } },
+            click: function($event) {
-          [_vm._v("Über uns")]
+              return _vm.mainPage()
-        ),
-        _vm._v(" "),
-        _c(
-          "button",
-          { staticClass: "button", on: { click: function($event) {} } },
-          [_vm._v("Aktuelles")]
-        ),
-        _vm._v(" "),
-        _c(
-          "button",
-          { staticClass: "button", on: { click: function($event) {} } },
-          [_vm._v("Mitgliedsantrag")]
-        ),
-        _vm._v(" "),
-        !this.$store.state.user.hasOwnProperty("role")
-          ? _c("span", [
-              _c(
-                "button",
-                { staticClass: "button", on: { click: function($event) {} } },
-                [_vm._v("Tourplan (Beispiel)")]
-              )
-            ])
-          : this.$store.state.user.role === "GUEST"
-          ? _c("span", [
-              _c(
-                "button",
-                { staticClass: "button", on: { click: function($event) {} } },
-                [_vm._v("Tourplan (Gast)")]
-              )
-            ])
-          : this.$store.state.user.role === "MEMBER"
-          ? _c("span", [
-              _c(
-                "button",
-                { staticClass: "button", on: { click: function($event) {} } },
-                [_vm._v("Tourplan (komplett)")]
-              )
-            ])
-          : this.$store.state.user.role === "ADMIN"
-          ? _c("span", [
-              _c(
-                "button",
-                { staticClass: "button", on: { click: function($event) {} } },
-                [_vm._v("Tourplan (komplett)")]
-              )
-            ])
-          : _vm._e(),
-        _vm._v(" "),
-        _c(
-          "button",
-          { staticClass: "button", on: { click: function($event) {} } },
-          [_vm._v("Wetter")]
-        ),
-        _vm._v(" "),
-        _c(
-          "button",
-          { staticClass: "button", on: { click: function($event) {} } },
-          [_vm._v("Links")]
-        ),
-        _vm._v(" "),
-        _c(
-          "button",
-          { staticClass: "button", on: { click: function($event) {} } },
-          [_vm._v("Impressum")]
-        ),
-        _vm._v(" "),
-        _c(
-          "button",
-          {
-            staticClass: "button",
-            on: {
-              click: function($event) {
-                return _vm.showContent()
-              }
             }
-          },
+          }
-          [_vm._v("Show content")]
+        },
-        ),
+        [_vm._v("Home")]
-        _vm._v(" "),
+      ),
-        _c(
+      _vm._v(" "),
-          "router-link",
+      _vm._m(0),
-          { staticClass: "button", attrs: { to: { name: "Login" } } },
+      _vm._v(" "),
-          [_vm._v("Log-In")]
+      _c("div", { staticStyle: { "background-color": "cyan" } }, [
-        ),
+        _c("input", {
-        _vm._v(" "),
+          attrs: { type: "text" },
-        _vm._m(0),
+          on: { change: _vm.createFolderRequest }
-        _vm._v(" "),
+        }),
-        _c("div", { staticStyle: { "background-color": "cyan" } }, [
+        _c("button", [_vm._v("Neuen Ordner erzeugen")])
+      ]),
+      _vm._v(" "),
+      _c("label", [_vm._v("Ordner wählen:")]),
+      _vm._v(" "),
+      _c(
+        "select",
+        { on: { change: _vm.newFolderSelected } },
+        _vm._l(this.$store.state.folders, function(folder) {
+          return _c(
+            "option",
+            {
+              domProps: { selected: folder.localeCompare(_vm.selectedFolder) }
+            },
+            [_vm._v(_vm._s(folder))]
+          )
+        }),
+        0
+      ),
+      _vm._v(" "),
+      _c("div", [
+        _c("form", [
+          _c("span", [_vm._v("UPLOAD:")]),
+          _vm._v(" "),
           _c("input", {
-            attrs: { type: "text" },
+            attrs: { name: "filename", type: "file" },
-            on: { change: _vm.createFolderRequest }
+            on: { change: _vm.uploadFile }
-          }),
+          })
-          _c("button", [_vm._v("Neuen Ordner erzeugen")])
-        ]),
-        _vm._v(" "),
-        _c("label", [_vm._v("Ordner wählen:")]),
-        _vm._v(" "),
-        _c(
-          "select",
-          { on: { change: _vm.newFolderSelected } },
-          _vm._l(this.$store.state.folders, function(folder) {
-            return _c(
-              "option",
-              {
-                domProps: { selected: folder.localeCompare(_vm.selectedFolder) }
-              },
-              [_vm._v(_vm._s(folder))]
-            )
-          }),
-          0
-        ),
-        _vm._v(" "),
-        _c("div", [
-          _c("form", [
-            _c("span", [_vm._v("UPLOAD:")]),
-            _vm._v(" "),
-            _c("input", {
-              attrs: { name: "filename", type: "file" },
-              on: { change: _vm.uploadFile }
-            })
-          ])
         ])
-      ],
+      ])
-      1
+    ])
-    )
   ])
 }
 var staticRenderFns = [
@@ -49229,8 +49157,8 @@ var store = new vuex__WEBPACK_IMPORTED_MODULE_1__["default"].Store({
     userlist: {},
     folders: {},
     selectedFolder: "default",
-    app_url: "http://www.programmschmiede.de" //app_url:"http://www.localhost:8000"
+    //app_url:"http://www.programmschmiede.de"
-
+    app_url: "http://localhost:8000"
   }
 });
 
@@ -49737,8 +49665,8 @@ __webpack_require__.r(__webpack_exports__);
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! /Users/tschneider/dev/repo/motorradig/motorradig/resources/js/app.js */"./resources/js/app.js");
+__webpack_require__(/*! /mnt/d/repos/motorradig/motorradig/resources/js/app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! /Users/tschneider/dev/repo/motorradig/motorradig/resources/sass/app.scss */"./resources/sass/app.scss");
+module.exports = __webpack_require__(/*! /mnt/d/repos/motorradig/motorradig/resources/sass/app.scss */"./resources/sass/app.scss");
 
 
 /***/ })

motorradig/resources/js/store.js

@@ -12,7 +12,7 @@ export const store = new Vuex.Store({
         folders:{},
         selectedFolder:"default",
 
-        app_url:"http://www.programmschmiede.de"
+        //app_url:"http://www.programmschmiede.de"
-        //app_url:"http://www.localhost:8000"
+        app_url:"http://localhost:8000"
     }
 });

motorradig/resources/js/views/Main.vue

@@ -5,6 +5,7 @@
         </div>
 
         <div class="has-text-centered">
+            <button class="button" @click="loadPage('main')">Home</button>
             <button class="button" @click="loadPage('ueber_uns')">Über uns</button>
             <button class="button" @click="loadPage('aktuelles')"      >Aktuelles</button>
             <button class="button" @click="">Mitgliedsantrag</button>

motorradig/resources/js/views/Upload.vue

@@ -6,23 +6,14 @@
 
         <div class="has-text-centered">
 
-            <button class="button" @click=""       >Über uns</button>
+            <button class="button" @click="mainPage()">Home</button>
-            <button class="button" @click=""      >Aktuelles</button>
-            <button class="button" @click="">Mitgliedsantrag</button>
-
-            <span v-if="!this.$store.state.user.hasOwnProperty('role')"><button class="button" @click="" >Tourplan (Beispiel)</button></span>
-            <span v-else-if="this.$store.state.user.role==='GUEST'"><button class="button" @click="" >Tourplan (Gast)</button></span>
-            <span v-else-if="this.$store.state.user.role==='MEMBER'"><button class="button" @click="" >Tourplan (komplett)</button></span>
-            <span v-else-if="this.$store.state.user.role==='ADMIN'"><button class="button" @click="" >Tourplan (komplett)</button></span>
-
-
-            <button class="button" @click=""         >Wetter</button>
-            <button class="button" @click=""          >Links</button>
-            <button class="button" @click=""      >Impressum</button>
 
+            <!--
             <button class="button" @click="showContent()"      >Show content</button>
 
             <router-link class="button" :to="{ name: 'Login' }">Log-In</router-link>
+            -->
+
 
 
             <div style="background-color:darkmagenta;">
@@ -144,7 +135,6 @@
             },
             uploadFile(event) {
 
-
                 console.log(event.target.files[0].name);
                 var selectedFile=event.target.files[0];
                 var selectedFolder = this.$store.state.selectedFolder;
@@ -205,6 +195,10 @@
                 console.log("New Folder selected:");
                 console.log(event.target.value);
                 this.$store.state.selectedFolder=event.target.value;
+            },
+            mainPage() {
+                console.log("Pushing to /");
+                this.$router.push('/');
             }
         }
     }