diff --git a/.env b/.env new file mode 100644 index 0000000000000000000000000000000000000000..bf1eeda21c8fbab2dce8c56e41bb8c4d92fd9def --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +VUE_APP_BASE_URL_API = http://localhost +VUE_APP_BASE_URL_VIEWER = http://localhost diff --git a/.gitignore b/.gitignore index 540690c50c530e857137be7d5927ac7a910c13ac..29ebe5b7b6ad624d3f7de067aec10f85d3d7d705 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules .vscode/settings.json .DS_Store +.env.local diff --git a/package-lock.json b/package-lock.json index e61963acb1c1cc4b842f712963f844cef934c5d4..5ab63765511a204478ba0ba1f57e8026392388d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6086,6 +6086,23 @@ "is-obj": "^2.0.0" } }, + "dotenv-flow": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/dotenv-flow/-/dotenv-flow-3.2.0.tgz", + "integrity": "sha512-GEB6RrR4AbqDJvNSFrYHqZ33IKKbzkvLYiD5eo4+9aFXr4Y4G+QaFrB/fNp0y6McWBmvaPn3ZNjIufnj8irCtg==", + "dev": true, + "requires": { + "dotenv": "^8.0.0" + }, + "dependencies": { + "dotenv": { + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz", + "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==", + "dev": true + } + } + }, "dotgitignore": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz", diff --git a/package.json b/package.json index ddb744096eb11212759804e62fceac7f9c691571..965ba02224b0325bb51629abdccaefc76fd2d30e 100755 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "axios": "^0.21.1", "commitizen": "^4.2.4", "cz-conventional-changelog": "^3.3.0", + "dotenv-flow": "^3.2.0", "husky": "^6.0.0", "markdown-it-attrs": "^4.0.0", "material-design-icons-iconfont": "^6.1.0", diff --git a/readme.md b/readme.md index e524ce49d6d7e321e378563455393e9220c93609..72b83285241a219713fab70a73197a01ab36f431 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,9 @@ ## Get it running - `$ git clone git@gitlab.gwdg.de:subugoe/ahiqar/website.git` - `$ nvm use` *to make sure you use the required node version* -- `$ npm i` *to install al dependencies* +- `$ npm i` *to install all dependencies* +- Create `.env.local` file and copy everything from `.env` file +- Replace your desired values in `.env.local` file - `$ npm run dev` *to get a running (locally) website at [`http://localhost:8080/`](http://localhost:8080/)* ## Edit Content diff --git a/src/.vuepress/api/api.js b/src/.vuepress/api/api.js index 7da44cb2a4370c31516e11dccd3a140570b0e1bb..f9d9ed97e29315c2fcd98c4de091ef8b52a01b84 100644 --- a/src/.vuepress/api/api.js +++ b/src/.vuepress/api/api.js @@ -36,4 +36,4 @@ class ApiService { } } -export default new ApiService('https://ahikar-dev.sub.uni-goettingen.de/api'); +export default new ApiService(process.env.VUE_APP_BASE_URL_API); diff --git a/src/.vuepress/components/SearchResultList.vue b/src/.vuepress/components/SearchResultList.vue index 0d9591c64c3d258866089ef13c188aea1afd69a5..57b751e2574bd8d10a4f4b1ab4b39aa132dd7638 100644 --- a/src/.vuepress/components/SearchResultList.vue +++ b/src/.vuepress/components/SearchResultList.vue @@ -43,7 +43,7 @@ export default { }, computed: { viewerBaseUrl() { - return 'https://ahikar-dev.sub.uni-goettingen.de'; + return process.env.VUE_APP_BASE_URL_VIEWER; }, }, props: { diff --git a/src/.vuepress/config.js b/src/.vuepress/config.js index fccfc43ced2f8bbda12d4a6c65be212cdd93c346..4e27837db52c40ac83d11a475c40392f9068cff1 100755 --- a/src/.vuepress/config.js +++ b/src/.vuepress/config.js @@ -1,4 +1,6 @@ -const { description } = require('../../package') +const { description } = require('../../package'); +const webpack = require('webpack'); +require('dotenv-flow').config(); module.exports = { base: '/', @@ -39,8 +41,7 @@ module.exports = { } }, - plugins: [ - ], + plugins: [], markdown: { // options for markdown-it-anchor anchor: { permalink: false }, @@ -49,5 +50,10 @@ module.exports = { extendMarkdown: md => { md.use(require('markdown-it-attrs')) } + }, + configureWebpack: (config) => { + return { plugins: [ + new webpack.EnvironmentPlugin({...process.env}) + ]} } }