Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • applications/etuc/hubl
  • applications/hubl
  • decentral1se/hubl
  • rngadam/hubl
  • jvtrudel/hubl
  • 3wc/hubl
6 results
Show changes
Commits on Source (13)
image: node:11
stages:
- integration
- acceptance
- deployment
## TESTING ##
## VALIDATION ##
deploy_test1:
stage: integration
environment:
name: test1
url: https://test1.startinblox.com
script:
- echo "$APP_CONFIG_TEST1" > config.json
- echo "$SSH_ASTRAL_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key
- npm install
- npm run build
- scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test1@astral.startinblox.com:~/front/
only:
- /^feature\/.*/
when: manual
tags:
- deploy
deploy_test2:
stage: integration
environment:
name: test2
url: https://test2.startinblox.com
script:
- echo "$APP_CONFIG_TEST2" > config.json
- echo "$SSH_ASTRAL_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key
- npm install
- npm run build
- scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test2@astral.startinblox.com:~/front/
only:
- /^feature\/.*/
when: manual
tags:
- deploy
deploy_test3:
stage: integration
environment:
name: test3
url: https://test3.startinblox.com
script:
- echo "$APP_CONFIG_TEST3" > config.json
- echo "$SSH_ASTRAL_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key
- npm install
- npm run build
- scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test3@astral.startinblox.com:~/front/
only:
- /^feature\/.*/
when: manual
tags:
- deploy
deploy_stg1:
stage: acceptance
environment:
name: stg1
url: https://stg1.startinblox.com
script:
- echo "$APP_CONFIG_STG1" > config.json
- echo "$SSH_ASTRAL_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key
- npm install
- npm run build
- scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* stg1@astral.startinblox.com:~/front/
only:
- /^release\/.*/
when: manual
tags:
- deploy
deploy_stg2:
stage: acceptance
environment:
name: stg2
url: https://stg2.startinblox.com
script:
- echo "$APP_CONFIG_STG2" > config.json
- echo "$SSH_ASTRAL_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key
- npm install
- npm run build
- scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* stg2@astral.startinblox.com:~/front/
only:
- /^release\/.*/
when: manual
tags:
- deploy
## LIVE DEPLOYMENTS ##
deploy_nantes:
stage: deployment
environment:
name: nantes
url: https://nantes.happy-dev.fr
script:
- echo 'Not happening yet...'
only:
- master
when: manual
tags:
- deploy
deploy_paris:
stage: deployment
environment:
name: paris
url: https://paris.happy-dev.fr
script:
- echo 'Not happening yet...'
only:
- master
when: manual
tags:
- deploy
......@@ -17,11 +17,14 @@ To install SiB App, you'll need:
Before diving in you have to check your SIB server supports the following LDP packages:
* djangoldp_account: 0.2.24
* djangoldp_circle: 0.1.22
* djangoldp_notification: 0.1.7
* djangoldp_profile: 0.1.4
* djangoldp_project: 0.1.26
* djangoldp_account
* djangoldp_circle
* djangoldp_joboffer
* djangoldp_conversation
* djangoldp_notification
* djangoldp_profile
* djangoldp_project
* djangoldp_skill
* oidc_provider: 'git+https://github.com/jblemee/django-oidc-provider.git@develop'
Those packages are given with the last stable version tested.
......@@ -52,6 +55,11 @@ Current Sib App capabilities:
Federated Sib App needs to use `config.sample.federated.json` example.
You can quickly update your API URI from the samples:
```
$ sed 's/http:\/\/localhost:8000/https:\/\/api.test2.startinblox.com/' config.sample.json > config.json
```
Then build your new SIB App:
```bash
......
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEw23THoFtbG25dkre20Zx03wTyGtmEiUTANGekdCmCymie9/oGgpwIfsqR3VysaUZqO/ObS8le//mVtQJhkKi4= deploy key
......@@ -43,7 +43,5 @@ script(data-default-context, type="application/ld+json")
| "account": "http://happy-dev.fr/owl/#account",
| "jabberID": "foaf:jabberID",
| "picture": "foaf:depiction",
| "firstName": "http://happy-dev.fr/owl/#first_name",
| "lastName": "http://happy-dev.fr/owl/#last_name",
| "isAdmin": "http://happy-dev.fr/owl/#is_admin"
| }
......@@ -17,7 +17,7 @@ include templates/hd-user-avatar.pug
details#user-controls.notLoggedIn
summary(tabindex='0' role='button')
sib-display#user-controls__profile(
fields='firstName, account.picture'
fields='first_name, account.picture'
widget-account.picture='hd-user-avatar'
bind-user
)
......
......@@ -169,7 +169,7 @@
width: 45%;
}
sib-display-value[name='firstName'] {
sib-display-value[name='first_name'] {
@include icon('arrow-down');
align-items: center;
display: flex;
......@@ -241,7 +241,7 @@
div {
sib-display-value[name='firstName'] {
sib-display-value[name='first_name'] {
@include icon('close');
&::before {
......
......@@ -75,7 +75,7 @@ sib-job-board {
margin: 0.25em;
}
[name='author.firstName'] {
[name='author.first_name'] {
color: $color-0-0-29;
font-weight: 600;
}
......
......@@ -10,7 +10,7 @@ sib-widget(name='hd-customer')
div
h3 Contact:
ul
li #[span(class='mdi-account-outline') ${await value.firstName} ${await value.lastName ? await value.lastName : ""}]${await value.role ? `, ${await value.role}` : ""}
li #[span(class='mdi-account-outline') ${await value.first_name} ${await value.last_name ? await value.last_name : ""}]${await value.role ? `, ${await value.role}` : ""}
li
span(class='link-color norm-weight mdi-email-outline')
a(href='mailto:${await value.email}') ${await value.email}
......