From db22df5e438a261ee16449ea872b149325458a44 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 25 Jun 2020 20:09:12 +0200 Subject: [PATCH 1/3] update: bump solid-xmpp-chat to 0.8 --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index f5c7451..55b275b 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -31,7 +31,7 @@ if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) - script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.7" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.8" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) script(src="/scripts/index.js" defer) From 0ae350c33e08642fc2b2ccf3aa931989d9b19c31 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 29 Jun 2020 17:59:23 +0000 Subject: [PATCH 2/3] cicd: add playground --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19aeb4c..a660e45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -282,3 +282,21 @@ communityhubl: when: manual tags: - deploy + +playground: + stage: deployment + environment: + name: playground + url: https://playground.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_PLAYGROUND" > config.json + - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key + - npm run build + - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* playground@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy From 9650e3cf9c3a73d633f8b5e86b1da32513e1564c Mon Sep 17 00:00:00 2001 From: Alice Poggioli Date: Thu, 9 Jul 2020 13:26:31 +0000 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85a9757..790fd7d 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ On `config.json`: Where: -* `xmpp` is your Prosody with [appropriate modules](https://git.startinblox.com/infra/prosody-modules/) configured on. +* `xmpp` is your [Prosody](https://prosody.im/) with [appropriate modules](https://git.startinblox.com/infra/prosody-modules/) configured on. * `authority` is the OpenID Provider. Usually, if you use `djangoldp-account` it's the same as your djangoldp server. * `endpoints.users` is the API endpoints for Users on your djangoldp server.