Commit ecaed5ff authored by Edgar Z. Alvarenga's avatar Edgar Z. Alvarenga

Fix static path for android build

parent dd8dc830
......@@ -53,7 +53,7 @@ module.exports = {
loader: 'url-loader',
options: {
limit: 10000,
name: utils.assetsPath('/static/img/[name].[hash:7].[ext]')
name: utils.assetsPath('img/[name].[hash:7].[ext]')
}
},
{
......@@ -69,7 +69,8 @@ module.exports = {
loader: 'url-loader',
options: {
limit: 10000,
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
name: utils.assetsPath('fonts/[name].[hash:7].[ext]'),
publicPath: process.env.NODE_ENV === 'production' ? '../../' : '/'
}
}
]
......
......@@ -27,6 +27,7 @@
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
</platform>
<plugin name="cordova-plugin-file" spec="^6.0.1" />
<engine name="android" spec="7.0.0" />
<engine name="browser" spec="5.0.4" />
</widget>
......@@ -4330,6 +4330,11 @@
"resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.2.tgz",
"integrity": "sha1-/Ajzci5n7ve2xnv8mag99q3Quro="
},
"cordova-plugin-file": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.1.tgz",
"integrity": "sha1-SWBrjBWlaI1HKPkuSnMloGHeB/U="
},
"cordova-plugin-whitelist": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
......@@ -10453,6 +10458,12 @@
"resolved": "https://registry.npmjs.org/material-design-icons-font/-/material-design-icons-font-2.2.3.tgz",
"integrity": "sha1-+2F7QDQI7V3jjvJWr3Kx6tJ7wdo="
},
"material-design-icons-iconfont": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-4.0.4.tgz",
"integrity": "sha512-jz4P9uLPrbEbzhEsEKuN+5N1TgBFdc4Dslzx/wc22D7FKT/Aelgs/HP8mB3LGI893NND5Rw6xpvZoiXtukB5zw==",
"dev": true
},
"math-expression-evaluator": {
"version": "1.2.17",
"resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
......
......@@ -25,6 +25,7 @@
"cordova-android": "7.0.0",
"cordova-browser": "5.0.4",
"cordova-plugin-device": "2.0.2",
"cordova-plugin-file": "^6.0.1",
"cordova-plugin-whitelist": "1.3.3",
"eslint-plugin-import": "2.12.0",
"eslint-plugin-node": "6.0.1",
......@@ -94,7 +95,7 @@
"karma-spec-reporter": "0.0.32",
"karma-webpack": "3.0.0",
"lolex": "2.6.0",
"material-design-icons-iconfont": "4.0.4",
"material-design-icons-iconfont": "^4.0.4",
"mocha": "5.2.0",
"nightwatch": "0.9.21",
"node-sass": "4.9.4",
......@@ -136,11 +137,12 @@
"cordova": {
"plugins": {
"cordova-plugin-device": {},
"cordova-plugin-whitelist": {}
"cordova-plugin-whitelist": {},
"cordova-plugin-file": {}
},
"platforms": [
"android",
"browser"
]
}
}
}
\ No newline at end of file
......@@ -58,7 +58,7 @@ function updateConfig (schoolId, configKey, configValue) {
{
space_id: schoolId,
key: configKey,
value: configValue
value: JSON.stringify(configValue)
})
}
......
......@@ -121,7 +121,7 @@ export default {
computed: {
formIconUrl: function () {
return (this.iconUrl == null || this.iconUrl.length === 0)
? '/static/img/placeholder_icon.png'
? './static/img/placeholder_icon.png'
: this.iconUrl
}
},
......
......@@ -20,7 +20,7 @@
<v-card>
<v-card-text>
<v-img v-if="delegate['picture']" :src="delegate['picture']" width="60" height="60"/>
<v-img v-else src="/static/img/svg/Aula_Logo_Kopf.svg" width="60"/>
<v-img v-else src="./static/img/svg/Aula_Logo_Kopf.svg" width="60"/>
<h3>{{ delegate.first_name }} {{ delegate.last_name }}</h3>
(<span v-for="(user, index) in delegate['users']" :key="index">
{{user.first_name}} {{user.last_name}}{{(Object.keys(delegates).length - 1 > index) ? ',' : ''}}
......
......@@ -18,7 +18,7 @@
<v-flex v-if="idea.created_by">
<v-avatar size="36px">
<v-img v-if="idea.created_by.picture" :src="idea.created_by.picture"/>
<v-img v-else src="/static/img/svg/Aula_Logo_Kopf.svg" width="40" height="40"/>
<v-img v-else src="./static/img/svg/Aula_Logo_Kopf.svg" width="40" height="40"/>
</v-avatar>
<div class="author-info">
<p v-if="idea.created_by != null" v-html="$vuetify.t('$vuetify.Idea.authorCreated', idea.created_by.first_name)">
......
......@@ -144,11 +144,11 @@ export default {
ideaSpaceCreationDialog: false,
ideaSpaceDeleteDialog: false,
isEditing: false,
defaultIdeaSpacesImages: ['/static/img/svg/door1.svg', '/static/img/svg/door2.svg', '/static/img/svg/door3.svg', '/static/img/svg/door4.svg'],
defaultIdeaSpacesImages: ['./static/img/svg/door1.svg', './static/img/svg/door2.svg', './static/img/svg/door3.svg', './static/img/svg/door4.svg'],
newIdeaSpace: {
school_id: this.$store.getters.selected_school,
title: '',
image: '/static/img/svg/door1.svg'
image: './static/img/svg/door1.svg'
}
}
},
......
......@@ -8,7 +8,7 @@
<router-link :to="{ name: 'Ideas', params: { spaceSlug: 'school' } }">
<v-card>
<v-img
src="/static/img/svg/Schule.svg"
src="./static/img/svg/Schule.svg"
height="162"
></v-img>
<v-card-title primary-title>
......
......@@ -22,7 +22,7 @@
</span>
<div>
<v-img class="wild-ideas-icon" src="/static/img/lamp.svg" width="300" height="300"></v-img>
<v-img class="wild-ideas-icon" src="./static/img/lamp.svg" width="300" height="300"></v-img>
</div>
</v-flex>
......
......@@ -9,7 +9,7 @@
<v-card-text>
<v-layout wrap align-center>
<v-flex d-flex xs12 sm12 pa-2 align-content-center justify-center>
<v-img :src="user.picture?user.picture: '/static/img/svg/Aula_Logo_Kopf.svg'" class="avatar-image" max-width="300"/>
<v-img :src="user.picture?user.picture: './static/img/svg/Aula_Logo_Kopf.svg'" class="avatar-image" max-width="300"/>
</v-flex>
<v-flex d-flex xs12 sm12 pa-2 align-content-center justify-center>
<h1 class="text-xs-center">{{ $store.getters.user.profile.first_name }} {{ $store.getters.user.profile.last_name }}</h1>
......
......@@ -23,7 +23,7 @@
<v-icon @click="info = true" dark>info</v-icon>
</div>
<div>
<v-img class="topics-icon" src="/static/img/Karteikasten.svg" width="300" height="300"/>
<v-img class="topics-icon" src="./static/img/Karteikasten.svg" width="300" height="300"/>
</div>
</v-flex>
......
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import 'material-design-icons-font/iconfont/material-icons.css'
import 'material-design-icons-iconfont/dist/material-design-icons.css'
import Vue from 'vue'
import Vuetify from 'vuetify'
import VueAxios from 'vue-axios'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment