Compare commits

...

5 Commits

Author SHA1 Message Date
Kekskurse ae316bfbe9 Stuff 2019-12-25 19:41:27 +01:00
Kekskurse 54e8017289 Icon 2019-12-25 19:34:36 +01:00
Kekskurse 2d2ce3c45d Change icon url 2019-12-25 19:23:36 +01:00
Kekskurse 88a8273ebc Stuff 2019-12-25 18:36:31 +01:00
Kekskurse f7bd710fc0 Settings and api preload 2019-12-02 17:14:49 +01:00
6 changed files with 23 additions and 9 deletions

View File

@ -1,13 +1,18 @@
FROM node:lts
RUN npm install -g http-server
FROM node:lts AS source-code
WORKDIR /app
COPY package*.json ./
RUN npm install
COPY . .
RUN npm install
RUN npm run build
FROM nginx:1.17
WORKDIR /usr/share/nginx/html
COPY --from=source-code /app/dist /usr/share/nginx/html
COPY docker/start.sh /start.sh
RUN chmod uog+rwx /start.sh
EXPOSE 8080
EXPOSE 80
CMD [ "/start.sh"]

View File

@ -1,2 +1,2 @@
docker build -t docker.keks.cloud/keksaccount/gui:latest .
docker push docker.keks.cloud/keksaccount/gui:latest
docker push docker.keks.cloud/keksaccount/gui:latest

View File

@ -1,3 +1,3 @@
#!/bin/sh
echo $VUE_APP_API_URL > dist/apiurl
http-server dist
echo $VUE_APP_API_URL > /usr/share/nginx/html/apiurl
nginx -g 'daemon off;'

View File

@ -5,7 +5,7 @@ export default {
return Api().get('/v1/app')
},
getAppImage(id) {
return process.env.VUE_APP_API_URL+"gui/apps/"+id+"/icon";
return localStorage.getItem("apiURL")+"v1/app/"+id+"/icon";
},
getApp(id) {
return Api().get('/v1/app/'+id)

View File

@ -13,6 +13,9 @@ export default {
},
getAPIUrl () {
return new Promise((resolve, reject) => {
if(localStorage.getItem("apiURL")) {
resolve();
}
axios.get('/apiurl')
.then(function (response) {
// handle success

View File

@ -71,12 +71,18 @@ export default new Vuex.Store({
actions: {
getSettings: function (context) {
return new Promise((resolve, reject) => {
if(localStorage.getItem("settings")) {
context.commit('setSettings', localStorage.getItem("settings"))
resolve();
}
ServerService.getPublicSettings().then((res) => {
localStorage.setItem("settings", res.data.data)
context.commit('setSettings', res.data.data)
resolve()
}).catch((res) => {
context.commit('setError')
});
})
},
checkAccount: function(context) {