fixed npm deps
This commit is contained in:
parent
667e14999d
commit
6d9bcdc127
13
README.md
13
README.md
@ -1,4 +1,5 @@
|
||||
[![pipeline status](https://git.basehosts.de:20443/panel/basispanel-ui/badges/master/pipeline.svg)](https://git.basehosts.de:20443/panel/basispanel-ui/commits/master)
|
||||
![build status](https://ci.drone1.basehosts.de/api/badges/panel/baseui/status.svg)
|
||||
|
||||
# basispanel UI
|
||||
|
||||
|
||||
@ -16,8 +17,8 @@
|
||||
|
||||
```bash
|
||||
# falls nicht bereits vorhanden
|
||||
git clone ssh://git@git.basehosts.de:22234/panel/basispanel-ui.git
|
||||
cd basispanel-ui
|
||||
git clone ssh://git@gitbase.de:2222/panel/baseui.git
|
||||
cd baseui
|
||||
|
||||
# die Branch auschecken, für die man verantwortlich ist
|
||||
git checkout matdev # z.B. für Mathias
|
||||
@ -37,7 +38,7 @@ npm run serve
|
||||
### Windows
|
||||
|
||||
- z.B. SourceTree für GIT
|
||||
- Repository `ssh://git@git.basehosts.de:22234/panel/basispanel-ui.git` clonen
|
||||
- Repository `ssh://git@gitbase.de:2222/panel/baseui.git` clonen
|
||||
- Branch wechseln (`matdev` für Mathias)
|
||||
- Konsole (cmd oder PowerShell) aufrufen
|
||||
- ins Verzeichnis ..../basispanel-ui wechseln
|
||||
@ -80,7 +81,7 @@ git push
|
||||
|
||||
## Build-Prozess
|
||||
|
||||
- wird auf Gitlab-Server/Runner durch `.gitlab-ci.yml` automatisch erledigt
|
||||
- wird auf Drone-Server durch `.drone.yml` automatisch erledigt
|
||||
|
||||
```bash
|
||||
# Module installieren (erzeugt node_modules/)
|
||||
@ -102,8 +103,6 @@ npm run build
|
||||
- in `.gitlab.yml` ist der Deploy für alle Branches auf "http://ui.basispanel.de/" eingerichtet
|
||||
- master: http://ui.basispanel.de/master/
|
||||
- matdev: http://ui.basispanel.de/matdev/
|
||||
- die jeweiligen URL's sind auch unter Gitlab Environments im Projekt zu finden
|
||||
- sollte mal ein automatische Deploy (fltp mirror) nicht alle geänderten Dateien kopieren, gibt es einen `deploy_fullsync` in Gitlab Pipelines, den man manuell anstoßen kann
|
||||
|
||||
|
||||
## bei Problemen
|
||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -2,7 +2,7 @@
|
||||
"ui": {
|
||||
"title": "MyApp",
|
||||
"api": {
|
||||
"baseURL": "https://cx20.basehosts.de/api/v1/"
|
||||
"baseURL": "https://www.basispanel.de/api/v1/"
|
||||
},
|
||||
"navigation": {
|
||||
"main": [
|
||||
|
@ -10,7 +10,7 @@
|
||||
<div id="vue-app">
|
||||
<div is="app">Lade, bitte warten...</div>
|
||||
</div>
|
||||
<script src="build/baseui-main.bundle.js"></script>
|
||||
<script src="build/main.js"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
9080
package-lock.json
generated
9080
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
35
package.json
35
package.json
@ -17,34 +17,35 @@
|
||||
"license": "UNLICENSED",
|
||||
"private": true,
|
||||
"devDependencies": {
|
||||
"babel-core": "^6.26.0",
|
||||
"babel-core": "^6.26.3",
|
||||
"babel-eslint": "^7.2.3",
|
||||
"babel-loader": "^7.1.2",
|
||||
"babel-loader": "^7.1.5",
|
||||
"babel-plugin-syntax-dynamic-import": "^6.18.0",
|
||||
"babel-preset-es2015": "^6.24.1",
|
||||
"css-loader": "^0.28.5",
|
||||
"eslint": "^4.5.0",
|
||||
"css-loader": "^0.28.11",
|
||||
"eslint": "^4.19.1",
|
||||
"eslint-loader": "^1.9.0",
|
||||
"eslint-plugin-vue": "^3.12.0",
|
||||
"less": "^2.7.2",
|
||||
"less-loader": "^4.0.5",
|
||||
"url-loader": "^0.6.1",
|
||||
"vue-hot-reload-api": "^2.1.0",
|
||||
"eslint-plugin-vue": "^3.14.0",
|
||||
"less": "^3.8.1",
|
||||
"less-loader": "^4.1.0",
|
||||
"url-loader": "^0.6.2",
|
||||
"vue-hot-reload-api": "^2.3.1",
|
||||
"vue-html-loader": "^1.2.4",
|
||||
"vue-loader": "^13.0.4",
|
||||
"vue-template-compiler": "^2.4.2",
|
||||
"webpack": "^3.5.5",
|
||||
"webpack-dev-server": "^2.7.1"
|
||||
"vue-loader": "^13.7.3",
|
||||
"vue-template-compiler": "^2.5.17",
|
||||
"webpack": "^3.12.0",
|
||||
"webpack-cli": "^3.1.2",
|
||||
"webpack-dev-server": "^3.1.10"
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^0.16.2",
|
||||
"babel-polyfill": "^6.26.0",
|
||||
"intersection-observer": "^0.4.0",
|
||||
"intersection-observer": "^0.4.3",
|
||||
"jwt-decode": "^2.2.0",
|
||||
"vue": "^2.4.2",
|
||||
"vue": "^2.5.17",
|
||||
"vue-observe-visibility": "^0.1.3",
|
||||
"vue-router": "^2.7.0",
|
||||
"vuex": "^2.3.1"
|
||||
"vue-router": "^2.8.1",
|
||||
"vuex": "^2.5.0"
|
||||
},
|
||||
"babel": {
|
||||
"presets": [
|
||||
|
Loading…
Reference in New Issue
Block a user