Skip to content
Snippets Groups Projects
Verified Commit 7eb3280c authored by Gaëlle Morin's avatar Gaëlle Morin
Browse files

Merge branch 'release/notification-template' of...

Merge branch 'release/notification-template' of git.startinblox.com:applications/sib-app into feature/notification-template
parents 4b52f0a4 9650e3cf
No related branches found
No related tags found
3 merge requests!200Feature/projects,!185Release/notification template,!183Feature/notification template
Pipeline #6699 passed
...@@ -282,3 +282,21 @@ communityhubl: ...@@ -282,3 +282,21 @@ communityhubl:
when: manual when: manual
tags: tags:
- deploy - 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
...@@ -87,7 +87,7 @@ On `config.json`: ...@@ -87,7 +87,7 @@ On `config.json`:
Where: 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. * `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. * `endpoints.users` is the API endpoints for Users on your djangoldp server.
......
...@@ -31,7 +31,7 @@ if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) ...@@ -31,7 +31,7 @@ if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
//- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer)
if endpoints.users || (endpoints.get && endpoints.get.users) 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(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
script(src="/scripts/index.js" defer) script(src="/scripts/index.js" defer)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment