From e02cd465a1bc826ee9150c55c143b7b4f1ec266d Mon Sep 17 00:00:00 2001 From: Sebastian Frank Date: Thu, 7 Sep 2017 23:45:41 +0200 Subject: [PATCH 01/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9136442..43d5fe7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,4 +81,4 @@ docker_test: script: - mkdir _for_docker - mv assets build conf index.html _for_docker - - docker-compose up -d --build + - docker-compose -p ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME} up -d --build From 05b24f03dc87d2f96b291b42172c56f2eddac4bd Mon Sep 17 00:00:00 2001 From: Sebastian Frank Date: Thu, 7 Sep 2017 23:46:31 +0200 Subject: [PATCH 02/11] Update docker-compose.yml --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9248f2b..ddb0e23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,6 @@ services: frontend: build: . image: ${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} - container_name: ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME} restart: always networks: - web From 9c0b7cec47a2b45777eaec199ccbf3b99fc3db1a Mon Sep 17 00:00:00 2001 From: Sebastian Frank Date: Fri, 8 Sep 2017 12:01:40 +0200 Subject: [PATCH 03/11] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 7192501..1594bcc 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@
- +
Lade, bitte warten...
From aa13efc651bf7bef4047c9a832622896894da685 Mon Sep 17 00:00:00 2001 From: Sebastian Frank Date: Fri, 8 Sep 2017 12:23:34 +0200 Subject: [PATCH 04/11] review via docker app --- .gitlab-ci.yml | 117 ++++++++++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 49 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43d5fe7..b71396d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ stages: - build # - test - - deploy + - review build_ui: image: node @@ -23,62 +23,81 @@ build_ui: - build - conf - index.html + - Dockerfile + - docker-compose.yml + + +#start_review: +# image: mwienk/docker-lftp +# tags: +# - docker +# dependencies: +# - build_ui +# stage: deploy +# script: +# - cat index.html +# - mkdir _for_upload +# - mv assets build conf index.html _for_upload +# - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v -n -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME" +# environment: +# name: review/$CI_COMMIT_REF_NAME +# url: http://ui.basispanel.de/$CI_COMMIT_REF_NAME/ +# on_stop: stop_review +# +#stop_review: +# image: mwienk/docker-lftp +# tags: +# - docker +# stage: deploy +# variables: +# GIT_STRATEGY: none +# script: +# - echo stopping env +# environment: +# name: review/$CI_COMMIT_REF_NAME +# action: stop +# when: manual +# +# +# +#fullsync_review: +# image: mwienk/docker-lftp +# tags: +# - docker +# dependencies: +# - build_ui +# stage: deploy +# script: +# - mkdir _for_upload +# - mv assets build conf index.html _for_upload +# - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v --transfer-all -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME" +# when: manual start_review: - image: mwienk/docker-lftp - tags: - - docker - dependencies: - - build_ui - stage: deploy - script: - - cat index.html - - mkdir _for_upload - - mv assets build conf index.html _for_upload - - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v -n -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME" - environment: - name: review/$CI_COMMIT_REF_NAME - url: http://ui.basispanel.de/$CI_COMMIT_REF_NAME/ - on_stop: stop_review - -stop_review: - image: mwienk/docker-lftp - tags: - - docker - stage: deploy - variables: - GIT_STRATEGY: none - script: - - echo stopping env - environment: - name: review/$CI_COMMIT_REF_NAME - action: stop - when: manual - - - -fullsync_review: - image: mwienk/docker-lftp - tags: - - docker - dependencies: - - build_ui - stage: deploy - script: - - mkdir _for_upload - - mv assets build conf index.html _for_upload - - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v --transfer-all -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME" - when: manual - - -docker_test: tags: - shell dependencies: - build_ui - stage: deploy + stage: review script: - mkdir _for_docker - mv assets build conf index.html _for_docker - docker-compose -p ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME} up -d --build + environment: + name: review/$CI_COMMIT_REF_NAME + url: http://${CI_COMMIT_REF_NAME}.${CI_PROJECT_NAME}.dev.basehosts.de/ + on_stop: stop_review + +stop_review: + tags: + - shell + variables: + GIT_STRATEGY: none + stage: review + when: manual + script: + - docker-compose -p ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME} down + environment: + name: review/$CI_COMMIT_REF_NAME + action: stop From f3825e3ba6acdbdfa2b0a132936d9cf98ce1f16c Mon Sep 17 00:00:00 2001 From: Sebastian Frank Date: Wed, 20 Sep 2017 13:00:27 +0200 Subject: [PATCH 05/11] test git push from windows --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b2d7d77..6e5a114 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ [![pipeline status](https://git.basehosts.de:20443/panel/basispanel-ui/badges/master/pipeline.svg)](https://git.basehosts.de:20443/panel/basispanel-ui/commits/master) # basispanel UI + + ## Entwicklungsprozess ### Allgemeines From ce89e9a77cc3f06b8567e1f35c553a416ca02d1e Mon Sep 17 00:00:00 2001 From: Anton Schubert Date: Fri, 22 Sep 2017 15:56:42 +0200 Subject: [PATCH 06/11] search on input --- src/components/scroll-table.vue | 7 ++++--- src/lib/util.js | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 src/lib/util.js diff --git a/src/components/scroll-table.vue b/src/components/scroll-table.vue index 616f26d..e1c01d2 100644 --- a/src/components/scroll-table.vue +++ b/src/components/scroll-table.vue @@ -1,6 +1,6 @@