Feature/fix resource addition #11 (#19)

Fix resource adding

.gitignore

@@ -12,3 +12,5 @@ test/unit/coverage
 *.ntvs*
 *.njsproj
 *.sln
+
+.env

build/dev-server.js

@@ -10,7 +10,7 @@ var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
 var proxyMiddleware = require('http-proxy-middleware')
-var webpackConfig = process.env.NODE_ENV === 'testing' || 'production'
+var webpackConfig = process.env.NODE_ENV === 'testing' || process.env.NODE_ENV === 'production'
   ? require('./webpack.prod.conf')
   : require('./webpack.dev.conf')
 

build/webpack.base.conf.js

@@ -11,6 +11,9 @@ module.exports = {
   entry: {
     app: './src/main.js'
   },
+  node: {
+    fs: 'empty'
+  },
   output: {
     path: config.build.assetsRoot,
     filename: '[name].js',

config/dev.env.js

@@ -2,5 +2,6 @@ var merge = require('webpack-merge')
 var prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
+  NODE_ENV: '"development"',
+  PRISMA_API_URL: `"${process.env.PRISMA_API_URL}"`
 })

config/index.js

@@ -1,4 +1,5 @@
 // see http://vuejs-templates.github.io/webpack for documentation.
+require('dotenv').config()
 var path = require('path')
 
 module.exports = {

package.json

@@ -15,6 +15,7 @@
   "dependencies": {
     "@websanova/vue-auth": "^2.16.3-beta",
     "axios": "^0.16.2",
+    "dotenv": "^4.0.0",
     "element-ui": "^1.4.3",
     "vue": "^2.3.3",
     "vue-axios": "^2.0.2",

src/components/album/Album.vue

@@ -33,7 +33,7 @@ export default {
     };
   },
   mounted() {
-    if (!this.album.heritage[0]) return;
+    if (!this.album.heritage || !this.album.heritage[0]) return;
     const coverSource = this.album.heritage[0].asset_name;
     if (!coverSource) return;
     api.getProtectedImage(coverSource).then((response) => {
@@ -94,6 +94,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+  overflow: hidden;
 }
 
 .album a {

src/pages/Login.vue

@@ -5,7 +5,7 @@
     </header>
     <form>
       <el-input placeholder="Email" v-model="email"></el-input>
-      <el-input placeholder="Password" v-model="password"></el-input>
+      <el-input type="password" placeholder="Password" v-model="password"></el-input>
       <el-button type="primary" @click="login">Log in</el-button>
       <!-- <button @click="login" v-if="!$auth.check()">Login</button> -->
     </form>

src/pages/Story.vue

@@ -86,6 +86,7 @@ export default {
           .then((res) => {
             const amountOfHeritage = this.album.heritage.length;
             this.album.heritage[amountOfHeritage - 1].asset_name = res.data.meta.location;
+            this.ftue = false;
           })
           .catch((err) => {
             console.log(err);