Project members module

deep9c · deep9c · commit fab66e6c4523 · 2017-10-13T21:13:11.000-04:00
diff --git a/index.html b/index.html
@@ -2,27 +2,40 @@
 <html>
   <head>
     <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
     <title>OneTask</title>
 
-    <!-- CSS imports -->
+    <!-- Vuetify Material Design -->
+    <link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons' rel="stylesheet">
+    <link href="https://unpkg.com/vuetify/dist/vuetify.min.css" rel="stylesheet" type="text/css"></link>
+
+    <!-- jQuery -->
     <script
       src="https://code.jquery.com/jquery-3.1.1.min.js"
       integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="
       crossorigin="anonymous"></script>
+
+    <!--  semantic.js   -->
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.7/semantic.min.css">
-    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.7/semantic.min.css">
-    <script
-      src="https://code.jquery.com/jquery-3.1.1.min.js"
-      integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="
-      crossorigin="anonymous"></script>
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.7/semantic.min.css">    
     <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.7/semantic.min.js"></script>
+    
+
+    <!-- For alert boxes 
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
-    
+    -->
+
     <!-- Bootstrap -->
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 
+    <!-- Material Design 
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic">
+    <link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
+    -->
+    
+
   </head>
   <body>
     <div id="app"></div>
diff --git a/package.json b/package.json
@@ -17,8 +17,10 @@
     "axios": "^0.16.1",
     "cors": "^2.8.3",
     "vue": "^2.2.6",
+    "vue-material": "^0.7.5",
     "vue-resource": "^1.3.4",
-    "vue-router": "^2.3.1"
+    "vue-router": "^2.3.1",
+    "vuetify": "^0.16.6"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
@@ -104,6 +104,9 @@
             console.log('createWorkspace resp-> ' + JSON.stringify(resp.data));
             //this.selectedWs.projects.push(resp.data);
             //this.selectProj(this.selectedWs.projects.findIndex((p)=>{return p._id == resp.data._id}));
+            this.enrolledWorkspaces.push(resp.data);
+            this.$emit('select-ws', resp.data);
+            //selectWorkspace(resp.data);
           });
       },
 
diff --git a/src/main.js b/src/main.js
@@ -3,6 +3,7 @@
 import Vue from 'vue'
 import App from './App'
 import router from './router'
+//import 'vue-material/dist/vue-material.css'
 
 Vue.config.productionTip = false
 var cors = require('cors');
@@ -17,3 +18,20 @@ new Vue({
   template: '<App/>',
   components: { App }
 })
+
+/*import VueMaterial from 'vue-material'
+import 'vue-material/dist/vue-material.css'
+Vue.use(VueMaterial)*/
+
+//var VueMaterial = require('vue-material')
+//Vue.use(VueMaterial)
+//Vue.use(VueMaterial.MdCore)
+
+/*Vue.material.registerTheme('default', {
+  primary: 'blue',
+  accent: 'aaa',
+  warn: 'red',
+  background: 'white'
+})*/
+
+
