From 7db636b01a2da61d08caae6f6c1623a3a1309e89 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Mon, 25 Mar 2019 19:22:48 +0100
Subject: [PATCH] some changes

---
 .gitignore                        |  5 +--
 .idea/modules.xml                 | 10 +++++
 frontend/.eslintrc.js             |  2 +-
 frontend/quasar.conf.js           |  1 -
 frontend/src/layouts/MyLayout.vue |  6 +--
 frontend/src/pages/Dashboard.vue  | 10 -----
 frontend/src/pages/Index.vue      | 54 ++++++++++++++++++++++
 frontend/src/pages/Login.vue      | 74 ++++++++++++++++---------------
 frontend/src/pages/TestCaches.vue |  3 ++
 9 files changed, 110 insertions(+), 55 deletions(-)
 create mode 100644 .idea/modules.xml
 create mode 100644 frontend/src/pages/Index.vue

diff --git a/.gitignore b/.gitignore
index db2f45b..6c08a57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,10 +24,7 @@ labswp_2019_sose_geocaching.iml
 # public folder
 src/main/resources/public/
 
-# .idea/
-# nicht notwendig. alle problematischen files sind draußen.
-# wenns trotzdem noch probleme macht muss man die entsprechenden
-# files noch mit "git rm --cached <file> untracken.
+.idea/
 
 
 # Gradle
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..9db8a1d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.iml" filepath="$PROJECT_DIR$/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml" filepath="$PROJECT_DIR$/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml" filepath="$PROJECT_DIR$/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 6ef542c..c4e9e64 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -14,7 +14,7 @@ module.exports = {
   // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
   extends: [
     'plugin:vue/essential',
-    '@vue/prettier'
+    // '@vue/prettier'
   ],
 
   // required to lint *.vue files
diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index 1ffd38f..569ef43 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -47,7 +47,6 @@ module.exports = function (ctx) {
         'QCardActions',
         'QCheckbox',
         'QSeparator',
-        'QInput',
         'QImg',
         'QTabs',
         'QTab',
diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue
index 80c2afb..7dbfd97 100644
--- a/frontend/src/layouts/MyLayout.vue
+++ b/frontend/src/layouts/MyLayout.vue
@@ -1,7 +1,7 @@
 <template>
   <q-layout view="hhh Lpr lFf">
-    <q-header elevated class="bg-white text-green-8 shadow-2">
-      <q-toolbar class="">
+    <q-header elevated class="bg-white text-green-8">
+      <q-toolbar class="q-pa-md">
         <q-btn
           flat
           dense
@@ -13,7 +13,7 @@
         </q-btn>
 
         <q-toolbar-title>
-          BuGa Geocaching SPA
+          BuGa Geocaching
         </q-toolbar-title>
 
         <!--<div>Quasar v{{ $q.version }}</div>-->
diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue
index 7abcc05..04397cc 100644
--- a/frontend/src/pages/Dashboard.vue
+++ b/frontend/src/pages/Dashboard.vue
@@ -1,14 +1,4 @@
 <template>
   <div class="q-pa-md">
-    <q-table
-      title="Treats"
-      :data="data"
-      :columns="columns"
-      row-key="name"
-      selection="single"
-      :selected.sync="selected"
-    />
-
-    <div class="q-mt-md">Selected: {{ JSON.stringify(selected) }}</div>
   </div>
 </template>
diff --git a/frontend/src/pages/Index.vue b/frontend/src/pages/Index.vue
new file mode 100644
index 0000000..5c54dac
--- /dev/null
+++ b/frontend/src/pages/Index.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="q-pa-md row items-start q-gutter-md">
+    <q-card class="my-card">
+      <q-card-section>
+        {{ lorem }}
+      </q-card-section>
+    </q-card>
+
+    <q-card
+      class="my-card text-white"
+      style="background: radial-gradient(circle, #35a2ff 0%, #014a88 100%)"
+    >
+      <q-card-section>
+        <div class="text-h6">Our Changing Planet</div>
+        <div class="text-subtitle2">by John Doe</div>
+      </q-card-section>
+
+      <q-card-section>
+        {{ lorem }}
+      </q-card-section>
+    </q-card>
+
+    <q-card dark bordered class="bg-grey-9 my-card">
+      <q-card-section>
+        <div class="text-h6">Our Changing Planet</div>
+        <div class="text-subtitle2">by John Doe</div>
+      </q-card-section>
+
+      <q-separator dark inset />
+
+      <q-card-section>
+        {{ lorem }}
+      </q-card-section>
+    </q-card>
+
+    <q-card flat bordered class="my-card">
+      <q-card-section>
+        <div class="text-h6">Our Changing Planet</div>
+      </q-card-section>
+
+      <q-card-section>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+        tempor incididunt ut labore et dolore magna aliqua.
+      </q-card-section>
+
+      <q-separator inset />
+
+      <q-card-section>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+        tempor incididunt ut labore et dolore magna aliqua.
+      </q-card-section>
+    </q-card>
+  </div>
+</template>
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 8b5ee79..8808c29 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -1,52 +1,54 @@
 <template>
   <div class="q-pa-md">
-    <q-layout view="lhh LpR lff" container style="height: 350px" class="shadow-2 rounded-borders">
+    <!-- header und toolbar dürfen nur im Layout sein -->
+<!--
       <q-header reveal class="bg-white" text="green-8">
         <q-toolbar>
           <q-toolbar-title class="bg-white text-green-8">Login</q-toolbar-title>
         </q-toolbar>
       </q-header>
-      <q-page-container>
-        <q-page padding>
-            <template>
-              <div class="q-pa-md">
-                <div class="column" style="height: 150px">
-                  <div class="col">
-                    <template>
-                      <div class="q-pa-md">
-                        <div class="q-gutter-md" style="max-width: 300px">
-                          <q-input v-model="text" label="Benutzername" />
-                        </div>
-                      </div>
-                    </template>
-                  </div>
-                  <div class="col">
-                    <template>
-                      <div class="q-pa-md">
-                        <div class="q-gutter-md" style="max-width: 300px">
-                          <q-input v-model="text" label="Passwort" />
-                        </div>
-                      </div>
-                    </template>
+-->
+          <div class="q-pa-md">
+            <div class="column" style="">
+              <div class="col">
+                <div class="q-pa-md">
+                  <div class="q-gutter-md" style="max-width: 300px">
+                    <q-input v-model="text" label="Benutzername"/>
                   </div>
                 </div>
               </div>
-            </template>
-            <q-page-sticky position="bottom-right" :offset="[18, 18]">
-              <q-btn fab color="bg-white" text-color="green-8" @click="onClick" icon="keyboard_arrow_right"/>
-            </q-page-sticky>
-        </q-page>
-      </q-page-container>
-    </q-layout>
+              <div class="col">
+                <div class="q-pa-md">
+                  <div class="q-gutter-md" style="max-width: 300px">
+                    <q-input v-model="text" label="Passwort"/>
+                  </div>
+                </div>
+              </div>
+              <div class="col">
+                <div class="q-pa-md">
+                  <div class="q-gutter-md" style="max-width: 300px">
+                    <q-btn
+                      fab
+                      color="bg-white"
+                      text-color="green-8"
+                      icon="keyboard_arrow_right"
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <!--<q-page-sticky position="bottom-right" :offset="[18, 18]">-->
+          <!--</q-page-sticky>-->
   </div>
 </template>
 
 <script>
-export default {
-  data () {
-    return {
-      text: ''
+  export default {
+    data() {
+      return {
+        text: ""
+      };
     }
-  }
-}
+  };
 </script>
diff --git a/frontend/src/pages/TestCaches.vue b/frontend/src/pages/TestCaches.vue
index 71e251c..2f06321 100644
--- a/frontend/src/pages/TestCaches.vue
+++ b/frontend/src/pages/TestCaches.vue
@@ -23,6 +23,7 @@
       </q-card>
     </div>
 
+    <a href="/">Hallo</a>
   </div>
 </template>
 
@@ -68,6 +69,7 @@ export default {
   },
 
   created: function() {
+    console.log("created(): " + this.caches);
     this.fetchTodos();
   },
 
@@ -75,6 +77,7 @@ export default {
     fetchTodos () {
       this.$axios.get('http://localhost:8080/allCaches')
         .then((response) => {
+          console.log("Caches: " + this.caches);
           this.caches = response.data;
         })
     }