Iterating on ministries on admin page

bcgov · Feb 12, 2020 · f0640d3 · f0640d3
1 parent 118316e
commit f0640d3
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/dev-docker-compose.yaml b/dev-docker-compose.yaml
@@ -13,12 +13,4 @@ services:
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: admin
-      POSTGRES_DB: timemachine
-
-  web-dev:
-    build: 
-      context: ./web
-    volumes: 
-      - "./web/:/web/"
-    ports: 
-      - "8080:8080"
+      POSTGRES_DB: timemachine
diff --git a/web/src/components/timeMachine/admin/AdminMinistries.vue b/web/src/components/timeMachine/admin/AdminMinistries.vue
@@ -7,28 +7,52 @@
     </v-layout>
     <v-layout row wrap>
       <v-flex xs12>
+        <p>Welcome to ministries list</p>
+        <p>TODO: Modify, re-name</p>
 
+        <v-list>
+          <v-list-tile
+            v-for="ministry in ministries"
+            :key="ministry.id"
+          >
+            <v-list-tile-content>
+              <v-list-tile-title v-text="ministry.ministryName"></v-list-tile-title>
+            </v-list-tile-content>
+          </v-list-tile>
+        </v-list>
 
-        Lorem ipsum dolor sit amet consectetur adipisicing elit. Nam itaque, asperiores blanditiis ducimus laborum pariatur facere tenetur quo doloribus temporibus culpa eaque sit nihil quasi magni! Mollitia ducimus porro ratione!
 
       </v-flex>
     </v-layout>
   </v-container>
 </template>
 
 <script>
-import Material from 'vuetify/es5/util/colors';
-
+import Material from "vuetify/es5/util/colors";
 
 export default {
-  data: () => ({
-    color: Material,
-    selectedTab: 'tab-1',
-  }),
+  // data: () => ({
+  //   color: Material,
+  //   selectedTab: 'tab-1',
+  //   ministries: this.$store.state.ministryInformation,
+  // }),
+  components: {
+
+  },
+  // data() {
+  //   return {
+  //     ministryInformation: this.$store.state.ministryInformation
+  //   };
+  // },
   beforeMount() {
     // this.$store.state.collapseNavigationBar = true;
   },
-  computed: {},
+  // computed: {},
+  computed: {
+    ministries() {
+      return this.$store.state.ministries;
+    }
+  },
 };
 </script>
 

diff --git a/web/src/menu.js b/web/src/menu.js
@@ -76,9 +76,6 @@ const menuItems = [
     title: 'Admin',
     icon: 'lock_open',
   },
-  {
-    divider: true,
-  },
   {
     header: 'System',
   },

diff --git a/web/vue.config.js b/web/vue.config.js
@@ -2,9 +2,4 @@ module.exports = {
   configureWebpack: {
     devtool: 'source-map',
   },
-
-  // NOTE - ONLY FOR GitHub Pages! Any way to easily configure, maybe env var
-  // Using ./ for GH pages - need to verify but turns paths relative
-  // https://github.com/vuejs/vue-cli/issues/1623
-  baseUrl: './'
-};
+ };