Merge branch 'master' into release/project

This commit is contained in:
Jean-Baptiste Pasquier 2020-06-13 16:08:41 +02:00
commit 17eed1d4ad
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
9 changed files with 117 additions and 3 deletions

View File

@ -264,3 +264,21 @@ volumes:
when: manual when: manual
tags: tags:
- deploy - deploy
communityhubl:
stage: deployment
environment:
name: communityhubl
url: https://community.hubl.world
before_script:
- npm ci --cache .npm --prefer-offline --only=production
script:
- echo "$APP_CONFIG_HUBL_COMMUNITY" > 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/* community-hubl@astral.startinblox.com:~/front/
only:
- master
when: manual
tags:
- deploy

View File

@ -24,8 +24,8 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
//- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer) //- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer)
if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users))
script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3" defer) script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.4" defer)
//- script(type="module" src="/lib/sib-directory/index.js" defer) //- script(type="module" src="/lib/sib-directory/dist/index.js" defer)
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1" defer) script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1" defer)

View File

@ -29,6 +29,8 @@ details#user-controls.notLoggedIn
sib-link(next='profile') Mon profil sib-link(next='profile') Mon profil
li li
sib-link(next='admin') Administration sib-link(next='admin') Administration
li
sib-link(next='about') A propos
button(role='log out' onclick="document.querySelector('sib-auth').logout();") Se déconnecter button(role='log out' onclick="document.querySelector('sib-auth').logout();") Se déconnecter
button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login();") Se connecter button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login();") Se connecter

View File

@ -52,6 +52,9 @@ html(lang="en")
#admin(hidden).with-sidebar #admin(hidden).with-sidebar
include page-admin.pug include page-admin.pug
#about.no-sidebar.with-padding
include page-about.pug
if (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.uploads || (endpoints.post && endpoints.post.uploads)) && (endpoints.users || (endpoints.post && endpoints.post.users)) if (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.uploads || (endpoints.post && endpoints.post.uploads)) && (endpoints.users || (endpoints.post && endpoints.post.users))
#profile(hidden).no-sidebar #profile(hidden).no-sidebar
include page-profile.pug include page-profile.pug

View File

@ -138,3 +138,4 @@ nav#main__menu.jsLeftMenu
sib-route(name='admin', hidden) sib-route(name='admin', hidden)
sib-route.menu(name='profile', hidden) sib-route.menu(name='profile', hidden)
sib-route(name='about', hidden)

17
src/page-about.pug Normal file
View File

@ -0,0 +1,17 @@
.views-container
h2 A propos
div.flex-content-white
div
div
h3 Cette application est développée par Startin'blox
p Startinblox est une coopérative qui développe des outils libres pour construire facilement et à moindre coût des applications fédérées et interopérables basées sur les derniers standards du web poussés par le projet SOLID.
p Sa mission est de redonner le pouvoir aux utilisateurs en leur permettant de reprendre la main sur leur outil numérique et de bénéficier dun effet de réseau au sein dun écosystème choisi afin de sémanciper des grandes plateformes.
div
a(href="https://startinblox.com/fr/" target="_blank") https://startinblox.com/fr/
div
div
h3 Contacte-nous
p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ?
div
a(href="https://startinblox.com/fr/#home-contact" target="_blank").main-cta Contact

View File

@ -118,6 +118,20 @@
--color-backlink: var(--color-secondary); --color-backlink: var(--color-secondary);
--color-content-header: var(--color-grey-9); --color-content-header: var(--color-grey-9);
/* directory */
--color-directory-primary: var(--color-primary);
--color-directory-secondary: var(--color-secondary);
--color-directory-complementary: var(--color-complementary);
--color-directory-complementary-darken: var(--color-complementary-darken);
--color-directory-white: var(--color-white);
--color-directory-black: var(--color-black);
--color-directory-grey-1: var(--color-grey-7);
--color-directory-grey-2: var(--color-grey-10);
--color-directory-grey-3: var(--color-grey-9);
--color-directory-grey-4: var(--color-grey-4);
--color-directory-grey-5: var(--color-grey-13);
} }
/* Variables for event */ /* Variables for event */

View File

@ -0,0 +1,58 @@
#about{
$main-color: rgb(236, 94, 92);
$second-color: white;
h2,h3{
text-transform: uppercase;
}
h2{
margin-left: 1.5em;
}
.flex-content-white{
display: flex;
@media only screen and (max-width: 768px) {
flex-direction: column;
}
>div{
padding: 2em 2.5em;
text-align: center;
margin: 0 1.5em 3em 1.5em;
background: white;
box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.11);
display: flex;
flex-direction: column;
justify-content: space-between;
}
>div:first-child{
width: 60%;
}
>div:last-child{
width: 35%;
@media only screen and (max-width: 768px) {
width: 60%;
}
}
a{
text-decoration: none;
}
}
.main-cta{
background: $second-color none repeat scroll 0% 0%;
border: 1px solid $main-color;
border-radius: 55px;
color: $main-color;
cursor: pointer;
font-weight: bold;
text-transform: uppercase;
width: 25%;
font-size: 1.1rem;
align-self: center;
padding: 0.5rem 1.5rem;
}
.main-cta:hover{
background: $main-color none repeat scroll 0% 0%;
border : 1px solid $second-color;
color: $second-color;
}
}

View File

@ -8,6 +8,7 @@
@import 'abstracts/mixins'; @import 'abstracts/mixins';
@import 'components/icons/index'; @import 'components/icons/index';
@import 'base/main'; @import 'base/main';
@import 'base/about';
div#viewport { div#viewport {
display: flex; display: flex;