diff --git a/.graphqlconfig b/.graphqlconfig index 0e4f09f..21176e6 100644 --- a/.graphqlconfig +++ b/.graphqlconfig @@ -4,7 +4,7 @@ "extensions": { "endpoints": { "Remote SWAPI GraphQL Endpoint": { - "url": "http://localhost:5433/graphql", + "url": "http://localhost:3000/graphql", "headers": { "user-agent": "JS GraphQL" }, diff --git a/dev.Dockerfile b/dev.Dockerfile deleted file mode 100644 index 00cdb99..0000000 --- a/dev.Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM node:13.7.0 - -ENV CONTAINER_PATH /var/www/docker-vue - -WORKDIR $CONTAINER_PATH - -COPY package*.json ./ - -RUN npm install - -COPY postcss.config.js babel.config.js .eslintrc.js ./ -COPY public ./public -COPY resources ./resources -COPY bin ./bin -COPY src ./src - -EXPOSE 8080 - -CMD ["npm", "run", "serve"] diff --git a/public/img/facebook.2.png b/public/img/facebook.2.png deleted file mode 100644 index 65b0dcf..0000000 Binary files a/public/img/facebook.2.png and /dev/null differ diff --git a/public/index.html b/public/index.html index 28c149f..127e361 100644 --- a/public/index.html +++ b/public/index.html @@ -5,11 +5,11 @@ Kandimat - - - + + + - + @@ -21,16 +21,14 @@ - - - + - + @@ -56,24 +54,5 @@
- - diff --git a/run-dev.sh b/run-dev.sh new file mode 100755 index 0000000..15f4f99 --- /dev/null +++ b/run-dev.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +npm ci +npm run serve diff --git a/src/assets/icons/diem25-logo.js b/src/assets/icons/diem25-logo.js index fc81036..36d7e19 100644 --- a/src/assets/icons/diem25-logo.js +++ b/src/assets/icons/diem25-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 189, height: 39, viewBox: '0 0 189 39', - data: '' + data: '' } }) diff --git a/src/assets/icons/edp-logo.js b/src/assets/icons/edp-logo.js index 3cb1f0f..ba2fb93 100644 --- a/src/assets/icons/edp-logo.js +++ b/src/assets/icons/edp-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 300, height: 258.492, viewBox: '0 0 300 258.492', - data: '' + data: '' } }) diff --git a/src/assets/icons/egp-logo.js b/src/assets/icons/egp-logo.js index fcdff96..ef89c69 100644 --- a/src/assets/icons/egp-logo.js +++ b/src/assets/icons/egp-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 612.8, height: 319.773, viewBox: '0 0 612.8 319.773', - data: '' + data: '' } }) diff --git a/src/assets/icons/euromat-logo.js b/src/assets/icons/euromat-logo.js index 25e3904..e094ea9 100644 --- a/src/assets/icons/euromat-logo.js +++ b/src/assets/icons/euromat-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 101, height: 47, viewBox: '0 0 101 47', - data: '' + data: '' } }) diff --git a/src/assets/icons/european-left-logo.js b/src/assets/icons/european-left-logo.js index 5bfc6c5..0e5989d 100644 --- a/src/assets/icons/european-left-logo.js +++ b/src/assets/icons/european-left-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 178.087, height: 158.217, viewBox: '0 0 670.742 530.503', - data: '' + data: '' } }) diff --git a/src/assets/icons/flag-si.js b/src/assets/icons/flag-si.js index 5e1170a..6544cbb 100644 --- a/src/assets/icons/flag-si.js +++ b/src/assets/icons/flag-si.js @@ -5,6 +5,6 @@ icon.register({ width: 12, height: 15.459, viewBox: '0 0 12 6', - data: '' + data: '' } }) diff --git a/src/assets/icons/grune-logo.js b/src/assets/icons/grune-logo.js index 9c1789a..0f5c852 100644 --- a/src/assets/icons/grune-logo.js +++ b/src/assets/icons/grune-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 249.45, height: 150.28, viewBox: '0 0 249.45 150.28', - data: '' + data: '' } }) diff --git a/src/assets/icons/ovld-logo.js b/src/assets/icons/ovld-logo.js index 8428618..95a1271 100644 --- a/src/assets/icons/ovld-logo.js +++ b/src/assets/icons/ovld-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 588.005, height: 256.078, viewBox: '0 0 588.005 256.078', - data: '' + data: '' } }) diff --git a/src/assets/icons/pirates-logo.js b/src/assets/icons/pirates-logo.js index b80bda9..6afe4c0 100644 --- a/src/assets/icons/pirates-logo.js +++ b/src/assets/icons/pirates-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 409.841, height: 181.365, viewBox: '0 0 409.841 181.365', - data: '' + data: '' } }) diff --git a/src/assets/icons/poe-colored-logo.js b/src/assets/icons/poe-colored-logo.js index 8ff736f..75e2bf7 100644 --- a/src/assets/icons/poe-colored-logo.js +++ b/src/assets/icons/poe-colored-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 171, height: 15, viewBox: '0 0 171 15', - data: '' + data: '' } }) diff --git a/src/assets/icons/poe-logo.js b/src/assets/icons/poe-logo.js index 92800e2..783a193 100644 --- a/src/assets/icons/poe-logo.js +++ b/src/assets/icons/poe-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 171, height: 15, viewBox: '0 0 171 15', - data: '' + data: '' } }) diff --git a/src/assets/icons/polis-colored-logo.js b/src/assets/icons/polis-colored-logo.js index 1b2f3b1..5cf5d18 100644 --- a/src/assets/icons/polis-colored-logo.js +++ b/src/assets/icons/polis-colored-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 480, height: 265, viewBox: '0 0 480 265', - data: '' + data: '' } }) diff --git a/src/assets/icons/polis-logo.js b/src/assets/icons/polis-logo.js index a68eeda..55478b4 100644 --- a/src/assets/icons/polis-logo.js +++ b/src/assets/icons/polis-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 61, height: 34, viewBox: '0 0 61 34', - data: '' + data: '' } }) diff --git a/src/assets/icons/volt-logo.js b/src/assets/icons/volt-logo.js index 867ac9c..917d685 100644 --- a/src/assets/icons/volt-logo.js +++ b/src/assets/icons/volt-logo.js @@ -5,6 +5,6 @@ icon.register({ width: 7825, height: 3260, viewBox: '0 0 7825 3260', - data: '' + data: '' } }) diff --git a/src/main.js b/src/main.js index 900a0f9..ac5702a 100644 --- a/src/main.js +++ b/src/main.js @@ -5,6 +5,8 @@ import App from '@/app/app' import router from '@/router' import i18n from '@/i18n' import storage from '@/helper/storage' +// eslint-disable-next-line +import styles from './styles/fonts.scss' import '@/registerComponents' import '@/registerServiceWorker' @@ -17,7 +19,7 @@ Vue.use(storage) Vue.use(VueApollo) const apolloClient = new ApolloClient({ - uri: 'http://localhost:5433/graphql' + uri: process.env.VUE_APP_BACKEND_URL }) const apolloProvider = new VueApollo({ diff --git a/src/router/index.js b/src/router/index.js index ed14674..010404d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,11 +15,13 @@ import { routes as contact } from '@/app/contact' import { routes as imprint } from '@/app/imprint' import { routes as privacy } from '@/app/privacy' import { routes as fourzerofour } from '@/app/404' +import { publicPath } from '../../vue.config' Vue.use(Router) const router = new Router({ mode: 'history', + base: publicPath, routes: [ { path: '/:locale', diff --git a/vue.config.js b/vue.config.js new file mode 100644 index 0000000..5a295ad --- /dev/null +++ b/vue.config.js @@ -0,0 +1,6 @@ +module.exports = { + publicPath: process.env.VUE_APP_PUBLIC_URL, + devServer: { + disableHostCheck: true + } +}