From 38961869b491863421db8a654a11ecc8870564d4 Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Tue, 14 Jul 2020 18:54:01 +0200 Subject: [PATCH 01/12] Added compodoc generated files to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 86d943a..70cd8d2 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,6 @@ testem.log # System Files .DS_Store Thumbs.db + +# Documentation +documentation/ \ No newline at end of file -- GitLab From b9c4e399f1460d265c5b262b61fe41658478376d Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Tue, 14 Jul 2020 18:54:40 +0200 Subject: [PATCH 02/12] Updated README.md to look better as a landing page also included documentation info --- README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4873a02..b7d4209 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# Versusvirus2020 +# YANA.help initially developed at Versusvirus2020 + +![YANA logo](https://www.yana.help/assets/yana-tree-noHands.svg) ## Contributing workflow 1. After having cloned this repository use `ng serve -o` to test locally (n.b: you might need a local Google Maps API key for some functionalities ask maintainers). @@ -9,10 +11,12 @@ git checkout -b "name-of-your-branch" "origin/name-of-your-branch" ``` 4. Implement your feature or fix the bug and commit your changes. -5. Pull the latest changes from the master repository. (Resolve conflicts if necessary. In doubt ask maintainers) -6. Push the changes to your merge request branch. Remove "WIP" from title and assign a maintainer to review and merge your code. -7. If everything is fine your code will be merged to the staging branch where we can review the edits on http://test.yana.help. -8. Finally the maintainers will take care of merging all changes from staging onto master so that they can integrate the main site. +5. Check the open issue to make sure your merge request satisfies requirements +6. Document and run `npx @compodoc/compodoc -p tsconfig.json` if you want to see the updated documentation locally before merging. Further information https://compodoc.app/guides/getting-started.html +7. Pull the latest changes from the master repository. (Resolve conflicts if necessary. In doubt ask maintainers) +8. Push the changes to your merge request branch. Remove "WIP" from title and assign a maintainer to review and merge your code. +9. If everything is fine your code will be merged to the staging branch where we can review the edits on http://test.yana.help. +10. Finally the maintainers will take care of merging all changes from staging onto master so that they can integrate the main site. This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.4. -- GitLab From 117a0305e2b25bec4c2db47b1d534dc1e2fbe882 Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Thu, 16 Jul 2020 01:53:41 +0200 Subject: [PATCH 03/12] Added documentation to build steps --- .gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a200c1..2776211 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,43 @@ before_script: - gem install dpl stages: + - doc - staging - production +doc: + before_script: + ## + ## Install ssh-agent if not already installed, it is required by Docker. + ## (change apt-get to yum if you use an RPM-based image) + ## + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + + ## + ## Run ssh-agent (inside the build environment) + ## + - eval $(ssh-agent -s) + + ## + ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store + ## We're using tr to fix line endings which makes ed25519 keys work + ## without extra base64 encoding. + ## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556 + ## + - echo "$DOC_SSH_KEY" | tr -d '\r' | ssh-add - + + ## + ## Create the SSH directory and give it the right permissions + ## + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + + script: + - npm install -g @compodoc/compodoc + - npx @compodoc/compodoc -p tsconfig.json + - scp -r ./documentation/* $DOC_SSH_USER@$DOC_SERVER:/var/www/html + + staging: type: deploy stage: staging -- GitLab From d81ff9e8caa7520d663aede7aff15038a816b63a Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Thu, 16 Jul 2020 01:55:46 +0200 Subject: [PATCH 04/12] Added documentation stage to build pipeline --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2776211..63ef45f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ stages: - production doc: + stage: doc before_script: ## ## Install ssh-agent if not already installed, it is required by Docker. -- GitLab From 7c61979e092aba07e4d97e5abf824bb6dcef0e9a Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Thu, 16 Jul 2020 02:23:05 +0200 Subject: [PATCH 05/12] Debugging host key verification failure --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63ef45f..8500aab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ doc: script: - npm install -g @compodoc/compodoc - npx @compodoc/compodoc -p tsconfig.json - - scp -r ./documentation/* $DOC_SSH_USER@$DOC_SERVER:/var/www/html + - scp -v -r ./documentation/* "$DOC_SSH_USER"@"$DOC_SERVER":/var/www/html staging: -- GitLab From 4db204bc13beaed9bdc7bac56fb8ece03b763b59 Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Thu, 16 Jul 2020 03:02:25 +0200 Subject: [PATCH 06/12] Debugging host key verification failure ssh config --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8500aab..d487b71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,6 +40,7 @@ doc: script: - npm install -g @compodoc/compodoc - npx @compodoc/compodoc -p tsconfig.json + - cat ~/.ssh/config - scp -v -r ./documentation/* "$DOC_SSH_USER"@"$DOC_SERVER":/var/www/html -- GitLab From 0dd34eb95841d7b2ef6e7318c33206a2d0fc7cab Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Thu, 16 Jul 2020 03:04:30 +0200 Subject: [PATCH 07/12] Debugging host key verification failure removing ssh config check --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d487b71..8500aab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,6 @@ doc: script: - npm install -g @compodoc/compodoc - npx @compodoc/compodoc -p tsconfig.json - - cat ~/.ssh/config - scp -v -r ./documentation/* "$DOC_SSH_USER"@"$DOC_SERVER":/var/www/html -- GitLab From 1d1808515cc107f47b267d4ab7682b42100eff34 Mon Sep 17 00:00:00 2001 From: Xoeseko Date: Thu, 16 Jul 2020 03:19:25 +0200 Subject: [PATCH 08/12] Disabled host key verification --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8500aab..20500e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ doc: script: - npm install -g @compodoc/compodoc - npx @compodoc/compodoc -p tsconfig.json - - scp -v -r ./documentation/* "$DOC_SSH_USER"@"$DOC_SERVER":/var/www/html + - scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r ./documentation/* "$DOC_SSH_USER"@"$DOC_SERVER":/var/www/html staging: -- GitLab From 1c61e5342eb6ea39478573cb126abc4dbba4a7c1 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 Apr 2020 22:43:14 +0200 Subject: [PATCH 09/12] merge conflict solved --- src/app/maps/maps.component.html | 38 +++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/src/app/maps/maps.component.html b/src/app/maps/maps.component.html index 9f59c7f..148bada 100644 --- a/src/app/maps/maps.component.html +++ b/src/app/maps/maps.component.html @@ -1,3 +1,4 @@ +<<<<<<< HEAD
@@ -13,6 +14,18 @@
+ + +

{{ 'MAP.CANTONOF' | translate }} {{cantonSelected}}

+ +

MAP.SORRY

+ >>>>>> a760dc8... merge conflict solved [latitude]="cantonCenter?.lat" [longitude]="cantonCenter?.lng" [zoom]="11" @@ -26,14 +39,16 @@ {{ place.address }}
{{ place.postalCode }}
{{ place.city }}
- MAP.WEBSITE
+ MAP.WEBSITE
+ {{ place.tel }}
+ MAP.WEBSITE
{{ place.tel }}
{{ 'MAP.WHO' | translate }} : {{ place.type }}
- -
+ +<<<<<<< HEAD

{{t.key}}

@@ -50,6 +65,23 @@

{{ 'MAP.DESCRIPTION' | translate }} : {{ d.description }}

+======= +
+

{{t.key}}

+

MAP.UNCATEGORIZED

+
+
+

+ {{d.name}}
+ {{d.address}}
+ {{d.postalCode}} {{ d.city }}
+ {{ d.tel }}
+ MAP.WEBSITE
+ {{ d.tel }}
+ MAP.WEBSITE
+ {{ 'MAP.DESCRIPTION' | translate }} : {{ d.description }}
+

+>>>>>>> a760dc8... merge conflict solved
-- GitLab From d61bb7d2299ba42406f012fc9cd1d32f0950d764 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 25 May 2020 17:04:07 +0200 Subject: [PATCH 10/12] link between getting started and maps + maps new design --- src/app/maps/maps.component.html | 31 ------------------- .../cantonbox/cantonbox.component.css | 4 +-- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/src/app/maps/maps.component.html b/src/app/maps/maps.component.html index 148bada..b0fedca 100644 --- a/src/app/maps/maps.component.html +++ b/src/app/maps/maps.component.html @@ -1,4 +1,3 @@ -<<<<<<< HEAD
@@ -14,18 +13,6 @@
- - -

{{ 'MAP.CANTONOF' | translate }} {{cantonSelected}}

- -

MAP.SORRY

- >>>>>> a760dc8... merge conflict solved [latitude]="cantonCenter?.lat" [longitude]="cantonCenter?.lng" [zoom]="11" @@ -48,7 +35,6 @@ -<<<<<<< HEAD

{{t.key}}

@@ -65,23 +51,6 @@

{{ 'MAP.DESCRIPTION' | translate }} : {{ d.description }}

-======= -
-

{{t.key}}

-

MAP.UNCATEGORIZED

-
-
-

- {{d.name}}
- {{d.address}}
- {{d.postalCode}} {{ d.city }}
- {{ d.tel }}
- MAP.WEBSITE
- {{ d.tel }}
- MAP.WEBSITE
- {{ 'MAP.DESCRIPTION' | translate }} : {{ d.description }}
-

->>>>>>> a760dc8... merge conflict solved
diff --git a/src/app/sub-components/cantonbox/cantonbox.component.css b/src/app/sub-components/cantonbox/cantonbox.component.css index f9e3fe7..d21aa94 100644 --- a/src/app/sub-components/cantonbox/cantonbox.component.css +++ b/src/app/sub-components/cantonbox/cantonbox.component.css @@ -27,7 +27,7 @@ transition: border 0.5s ease-in-out } #keyword:focus { - border-color : rgba(81, 203, 238, 1); + border-color : rgba(81, 203, 238, 1);; } .filter-select { @@ -49,7 +49,7 @@ max-height: 400%; overflow-y: auto; background: #fff; - padding-inline-start: 0; + padding-inline-start: 0px; } -- GitLab From fa4d05cf49d10da18b63643a58b1ab0bd5c871e7 Mon Sep 17 00:00:00 2001 From: Xoeseko Yao Nyomi Date: Fri, 17 Jul 2020 00:27:38 +0200 Subject: [PATCH 11/12] Update maps.component.html removing duplicated data from merge --- src/app/maps/maps.component.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/maps/maps.component.html b/src/app/maps/maps.component.html index b0fedca..bfee0ff 100644 --- a/src/app/maps/maps.component.html +++ b/src/app/maps/maps.component.html @@ -26,15 +26,13 @@ {{ place.address }}
{{ place.postalCode }}
{{ place.city }}
- MAP.WEBSITE
- {{ place.tel }}
MAP.WEBSITE
{{ place.tel }}
{{ 'MAP.WHO' | translate }} : {{ place.type }}
 - +

{{t.key}}

-- GitLab From bfffab05570c5b5474c930ad68c84ca590efdb7e Mon Sep 17 00:00:00 2001 From: Xoeseko Yao Nyomi Date: Fri, 17 Jul 2020 00:30:00 +0200 Subject: [PATCH 12/12] Update cantonbox.component.css --- src/app/sub-components/cantonbox/cantonbox.component.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/sub-components/cantonbox/cantonbox.component.css b/src/app/sub-components/cantonbox/cantonbox.component.css index d21aa94..f9e3fe7 100644 --- a/src/app/sub-components/cantonbox/cantonbox.component.css +++ b/src/app/sub-components/cantonbox/cantonbox.component.css @@ -27,7 +27,7 @@ transition: border 0.5s ease-in-out } #keyword:focus { - border-color : rgba(81, 203, 238, 1);; + border-color : rgba(81, 203, 238, 1); } .filter-select { @@ -49,7 +49,7 @@ max-height: 400%; overflow-y: auto; background: #fff; - padding-inline-start: 0px; + padding-inline-start: 0; } -- GitLab