From 401df1a90372f638df67fa13e2acdc6f2127e987 Mon Sep 17 00:00:00 2001 From: Jure Ursic Date: Tue, 12 May 2020 16:51:05 +0200 Subject: [PATCH 01/34] update: Rebased profile-feature --- src/dependencies.pug | 2 +- src/header.pug | 2 +- src/index.pug | 3 +++ src/menu-left.pug | 1 + src/page-profile.pug | 5 +++++ 5 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 src/page-profile.pug diff --git a/src/dependencies.pug b/src/dependencies.pug index 60b0441..fe3a736 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -22,7 +22,7 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3" defer) -//- script(type="module" src="/lib/sib-directory/sib-directory.js" defer) +//- script(type="module" src="/lib/sib-directory/index.js" defer) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1" defer) diff --git a/src/header.pug b/src/header.pug index 55d35a8..3260f08 100644 --- a/src/header.pug +++ b/src/header.pug @@ -26,7 +26,7 @@ details#user-controls.notLoggedIn ul if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) li - sib-link(next='my-profile') Mon profil + sib-link(next='profile') Mon profil //-li sib-link(next='user-settings') Settings li diff --git a/src/index.pug b/src/index.pug index 5ae77e6..40a9fb8 100644 --- a/src/index.pug +++ b/src/index.pug @@ -51,6 +51,9 @@ html(lang="en") #admin(hidden).with-sidebar include page-admin.pug + + #profile(hidden).no-sidebar + include page-profile.pug if analytics each provider in analytics diff --git a/src/menu-left.pug b/src/menu-left.pug index 2d261c0..cb60240 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -125,6 +125,7 @@ nav#main__menu.jsLeftMenu div.divider sib-route(name='admin', hidden) + sib-route.menu(name='profile', hidden) //- div.divider //- sib-route.menu(hidden, name='my-profile', rdf-type='foaf:user', use-id='') diff --git a/src/page-profile.pug b/src/page-profile.pug new file mode 100644 index 0000000..6b51ad5 --- /dev/null +++ b/src/page-profile.pug @@ -0,0 +1,5 @@ +sib-profile( + bind-user + upload-src=`${endpoints.upload || endpoints.post.upload}` + range-skills=`${endpoints.skills || endpoints.get.skills}` +) From 5cfc239b8f31b4235896d65b4f53e7848c4504d8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 12 May 2020 15:14:45 +0000 Subject: [PATCH 02/34] fix: uploads endpoint --- src/page-profile.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page-profile.pug b/src/page-profile.pug index 6b51ad5..79702ef 100644 --- a/src/page-profile.pug +++ b/src/page-profile.pug @@ -1,5 +1,5 @@ sib-profile( bind-user - upload-src=`${endpoints.upload || endpoints.post.upload}` + upload-src=`${endpoints.uploads || endpoints.post.uploads}` range-skills=`${endpoints.skills || endpoints.get.skills}` ) From 985c9c498ae6a0d064a799b58941e0f5e1749801 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 20 May 2020 12:41:01 +0200 Subject: [PATCH 03/34] fix: test suit config.json --- docker/config.json | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/config.json b/docker/config.json index 4000c0e..0830a23 100644 --- a/docker/config.json +++ b/docker/config.json @@ -2,17 +2,23 @@ "xmpp": "https://jabber.happy-dev.fr/http-bind/", "authority": "$SERVER", "authorityName": "djangoldp-server-name", + "publicDirectory": true, "endpoints": { "get": { "circles": "$SERVER/circles/", + "dashboards": "$SERVER/dashboards/", "groups": "$SERVER/groups/", - "users": "$SERVER/users/" + "users": "$SERVER/users/", + "skills": "$SERVER/skills/", + "uploads": "$SERVER/upload/" }, "post": { "circles": "$SERVER/circles/", + "dashboards": "$SERVER/dashboards/", "groups": "$SERVER/groups/", - "users": "$SERVER/users/" + "users": "$SERVER/users/", + "skills": "$SERVER/skills/", + "uploads": "$SERVER/upload/" } - }, - "analytics": [] + } } From 72983551de1d36ff01da1556d33ab1671db477a9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 20 May 2020 12:46:45 +0200 Subject: [PATCH 04/34] bugfix: condition for my profile --- src/index.pug | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/index.pug b/src/index.pug index 40a9fb8..321313a 100644 --- a/src/index.pug +++ b/src/index.pug @@ -52,8 +52,9 @@ html(lang="en") #admin(hidden).with-sidebar include page-admin.pug - #profile(hidden).no-sidebar - include page-profile.pug + if (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.uploads || (endpoints.post && endpoints.post.uploads)) + #profile(hidden).no-sidebar + include page-profile.pug if analytics each provider in analytics From 119ae66795d938b2d77ca4695153327342c68180 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 20 May 2020 12:48:18 +0200 Subject: [PATCH 05/34] cicd: use config.json from docker folder --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c40bb5b..2ff9e16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ build: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - cp config.sample.json config.json + - cp docker/config.json config.json - npm run build artifacts: when: on_success From 9b5844f07f6014e21f6df89e0fc0c1c5d1da0879 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 20 May 2020 12:52:21 +0200 Subject: [PATCH 06/34] cicd: revert config.json from sample --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ff9e16..c40bb5b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ build: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - cp docker/config.json config.json + - cp config.sample.json config.json - npm run build artifacts: when: on_success From caaf84312651785bd7854d2972b5fadf0b163dcc Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Sat, 23 May 2020 14:53:38 +0200 Subject: [PATCH 07/34] update: conflict resolved --- src/dependencies.pug | 4 ++-- src/styles/base/main.scss | 3 ++- src/styles/base/menu-left.scss | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 313f0a0..be5b0d4 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -24,8 +24,8 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) //- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer) if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) - script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3" defer) -//- script(type="module" src="/lib/sib-directory/index.js" defer) + script(type="module" src="/lib/sib-directory/index.js" defer) +//- script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3" defer) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1" defer) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 403483d..caee792 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -153,7 +153,8 @@ h5 { } %padding-main { - padding: 5rem; + /*padding: 5rem;*/ + padding: 1.3rem; } %padding-block { diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index 3470d71..9dd8e13 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -247,23 +247,23 @@ &.jsLeftMenu { - @include breakpoint(sm) { - display: none; + display: none; + + @include breakpoint(lg) { + display: block; } } &.jsLeftMenu[open] { - @include breakpoint(sm) { - display: block; - bottom: 0; - box-shadow: 0 2px 8px 0 rgba(65, 69, 73, 0.5); - min-width: 80%; - position: fixed; - right: 0; - top: 0; - z-index: 1; - } + display: block; + bottom: 0; + box-shadow: 0 2px 8px 0 rgba(65, 69, 73, 0.5); + min-width: 80%; + position: fixed; + right: 0; + top: 0; + z-index: 1; } } From 28fd228d298966a4829fdbe2649b81e2c25bef70 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Sat, 23 May 2020 15:27:01 +0200 Subject: [PATCH 08/34] update: new class to handle the main padding + HD colors handle for the directory component --- client.sample.happy-dev.css | 35 ++++++++++++++++++++++++++++++ src/index.pug | 6 ++--- src/styles/base/main.scss | 1 - src/styles/components/sidebar.scss | 5 ++++- 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index 11cf69a..dcf85e8 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -108,6 +108,23 @@ --color-chat-grey-1: var(--color-grey-4); --color-chat-grey-2: var(--color-grey-6); --color-chat-grey-3: var(--color-grey-10); + + /* Directory */ + --color-directory-grey-4: #7A7F85; + --color-directory-grey-5: #F0F3F6; + + --color-directory-avatar-background: #E4E8ED; + --color-directory-back-link: #36383B; + --color-directory-border: #DAE2F3; + --color-directory-content-header-border: #DAE2F3; + --color-directory-h1: var(--color-complementary-darken); + --color-directory-list-icon: var(--color-primary); + --color-directory-text: var(--color-directory-grey-4); + + --color-directory-form-input: #EDF1FA; + --color-directory-form-input-text: var(--color-directory-grey-4); + --color-directory-form-input-active: var(--color-complementary); + --color-directory-form-select-icon: var(--color-complementary); } /* Button to edit a channel or a project (in project-profile) */ @@ -174,3 +191,21 @@ #admin-circle-list>div>div.table>sib-display:nth-child(5)>div>sib-display>div>admin-circle-join-button>sib-form:hover input { color: var(--color-complementary); } + + +/* Directory - my profile*/ + +/* Button to update the avatar */ +#sib-picture-browse, +#sib-picture-remove { + background-color: var(--color-white); + border: 1px solid var(--color-complementary); + color: var(--color-complementary); +} + +#sib-picture-browse:hover, +#sib-picture-remove:hover { + background-color: var(--color-complementary); + border: 1px solid var(--color-complementary); + color: var(--color-white); +} diff --git a/src/index.pug b/src/index.pug index 321313a..e47be56 100644 --- a/src/index.pug +++ b/src/index.pug @@ -22,15 +22,15 @@ html(lang="en") div#viewport if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) - #dashboard(hidden).no-sidebar + #dashboard(hidden).no-sidebar.with-padding include page-dashboard.pug if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) - #members(hidden).no-sidebar + #members(hidden).no-sidebar.with-padding include page-directory.pug if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) - #job-offers(hidden).no-sidebar + #job-offers(hidden).no-sidebar.with-padding include page-job-offers.pug if endpoints.projects || (endpoints.get && endpoints.get.projects) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index caee792..2bd45f9 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -153,7 +153,6 @@ h5 { } %padding-main { - /*padding: 5rem;*/ padding: 1.3rem; } diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss index 940a574..682f3c7 100644 --- a/src/styles/components/sidebar.scss +++ b/src/styles/components/sidebar.scss @@ -1,6 +1,9 @@ .no-sidebar { flex: 1; - @extend %padding-main; + + &.with-padding { + @extend %padding-main; + } } .with-sidebar { From b8d7badae4606f3299bc5f12baa213fd0af925f1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 26 May 2020 12:29:08 +0200 Subject: [PATCH 09/34] fix: sib-profile --- README.md | 6 +++++- styling.md => STYLING.md | 0 src/dependencies.pug | 18 +++++++++--------- src/header.pug | 4 +--- src/index.pug | 2 +- src/menu-left.pug | 7 ++----- 6 files changed, 18 insertions(+), 19 deletions(-) rename styling.md => STYLING.md (100%) diff --git a/README.md b/README.md index 6cbf8f0..b002528 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,9 @@ On `config.json`: "xmpp": "https://jabber.happy-dev.fr/http-bind/", "authority": "http://localhost:8000/", "endpoints": { - "users": "http://server.url/users/" + "skills": "http://server.url/skills/", + "users": "http://server.url/users/", + "uploads": "http://server.url/upload/" } } ``` @@ -155,6 +157,8 @@ On `config.json`: } ``` +A [sample fixture](https://git.startinblox.com/djangoldp-packages/djangoldp-dashboard/blob/master/djangoldp_dashboard/fixtures/sample.json) can be loaded with `./manage.py loaddata path/to/djangoldp_dashboard/fixtures/sample.json`. + ### Events Events allow to create and manage instance-level evenement. To activate them, you need: diff --git a/styling.md b/STYLING.md similarity index 100% rename from styling.md rename to STYLING.md diff --git a/src/dependencies.pug b/src/dependencies.pug index be5b0d4..5de986a 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -8,28 +8,28 @@ script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8" defer) //- script(type="module" src="/lib/sib-oidc/index.js" defer) script(type="module" src="https://unpkg.com/@startinblox/router@0.7" defer) -//- script(type="module" src="/lib/sib-router/src/index.js" defer) + //- script(type="module" src="/lib/sib-router/src/index.js" defer) script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.3" defer) -//- script(type="module" src="/lib/sib-notifications/index.js" defer) + //- script(type="module" src="/lib/sib-notifications/index.js" defer) if endpoints.events || (endpoints.get && endpoints.get.events) script(type="module" src="https://unpkg.com/@startinblox/component-event@0.1" defer) -//- script(type="module" src="/lib/sib-event/sib-event.js" defer) + //- script(type="module" src="/lib/sib-event/sib-event.js" defer) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3" defer) script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3" defer) -//- script(type="module" src="/lib/sib-job-board/sib-job-board.js" defer) -//- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer) + //- script(type="module" src="/lib/sib-job-board/sib-job-board.js" defer) + //- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer) -if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) - script(type="module" src="/lib/sib-directory/index.js" defer) -//- script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3" defer) +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="/lib/sib-directory/index.js" defer) 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="/lib/sib-dashboard/sib-dashboard.js" defer) + //- script(type="module" src="/lib/sib-dashboard/sib-dashboard.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.6" defer) diff --git a/src/header.pug b/src/header.pug index 3260f08..7184052 100644 --- a/src/header.pug +++ b/src/header.pug @@ -24,11 +24,9 @@ details#user-controls.notLoggedIn #user-controls__panel nav(role="user's functionalities menu") ul - if publicDirectory && (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)) li sib-link(next='profile') Mon profil - //-li - sib-link(next='user-settings') Settings li sib-link(next='admin') Administration button(role='log out' onclick="document.querySelector('sib-auth').logout();") Se déconnecter diff --git a/src/index.pug b/src/index.pug index e47be56..dd21d1d 100644 --- a/src/index.pug +++ b/src/index.pug @@ -52,7 +52,7 @@ html(lang="en") #admin(hidden).with-sidebar include page-admin.pug - if (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.uploads || (endpoints.post && endpoints.post.uploads)) + 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 include page-profile.pug diff --git a/src/menu-left.pug b/src/menu-left.pug index 10cba84..0d69f2c 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -84,7 +84,7 @@ nav#main__menu.jsLeftMenu nested-field='projects' fields='project' empty-widget='hubl-create' - empty-value='project' + empty-value='projet' widget-project='hubl-menu-fix-url-project' order-by='project.customer.name' next='project' @@ -105,7 +105,7 @@ nav#main__menu.jsLeftMenu nested-field='circles' fields='circle' empty-widget='hubl-create' - empty-value='circle' + empty-value='cercle' widget-circle='hubl-menu-fix-url-circle' order-by='circle.name' next='circle' @@ -138,6 +138,3 @@ nav#main__menu.jsLeftMenu sib-route(name='admin', hidden) sib-route.menu(name='profile', hidden) - //- div.divider - //- sib-route.menu(hidden, name='my-profile', rdf-type='foaf:user', use-id='') - From 4acef64e1f41bf109442e9be09f1a876d3fb43a4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 26 May 2020 12:53:46 +0200 Subject: [PATCH 10/34] fix: links on left menu --- src/menu-left.pug | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/menu-left.pug b/src/menu-left.pug index 0d69f2c..272ec08 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -71,12 +71,12 @@ nav#main__menu.jsLeftMenu div.divider if endpoints.projects || (endpoints.get && endpoints.get.projects) div - div.menu - div.menu-chevron - sib-link(next='admin-project-list') - div.menu-icon.icon-arrow-right - div.menu-label Projets - div.menu-icon.icon-folder-alt + sib-link(next='admin-project-list') + div.menu + div.menu-chevron + div.menu-icon.icon-arrow-right-circle + div.menu-label Projets + div.menu-icon.icon-folder-alt sib-route(name='project', rdf-type='hd:project', use-id='', hidden) div.sub-menu.menu-notification sib-display.project-tab( @@ -92,12 +92,12 @@ nav#main__menu.jsLeftMenu div.divider if endpoints.circles || (endpoints.get && endpoints.get.circles) div - div.menu - div.menu-chevron - sib-link(next='admin-circle-list') - div.menu-icon.icon-arrow-right - div.menu-label Canaux - div.menu-icon.icon-folder-alt + sib-link(next='admin-circle-list') + div.menu + div.menu-chevron + div.menu-icon.icon-arrow-right-circle + div.menu-label Canaux + div.menu-icon.icon-folder-alt sib-route(name='circle', rdf-type='hd:circle', use-id='', hidden) div.sub-menu.menu-notification sib-display( From 94c8a9934df450f43a11827d40c130a19653a24b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 26 May 2020 14:10:44 +0200 Subject: [PATCH 11/34] hotfix: temp dashboard icon --- src/styles/layout/dashboard/dashboard.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/layout/dashboard/dashboard.scss b/src/styles/layout/dashboard/dashboard.scss index f3ffc7a..0718af8 100644 --- a/src/styles/layout/dashboard/dashboard.scss +++ b/src/styles/layout/dashboard/dashboard.scss @@ -1,3 +1,7 @@ .dashboard>div { margin: 0 2px; } + +sib-dashboard .icon::before { + width: 41px; +} \ No newline at end of file From 78833a269447dde17ca362b500e7c6edab2d78f4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 26 May 2020 15:13:16 +0200 Subject: [PATCH 12/34] fix: z-index of main --- src/styles/base/main.scss | 1 + src/styles/base/menu-left.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 2bd45f9..29f3946 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -18,6 +18,7 @@ main { display: flex; + z-index: 0; overflow: hidden; height: calc(100vh - 83px); /* 83px = height of the header */ position: relative; diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index 9dd8e13..a4b5459 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -137,6 +137,7 @@ sib-display.nosub>nav { text-align: center; + overflow: hidden; display: grid; grid-template-columns: auto 50% auto; grid-template-areas: "left middle right"; From b1dbe8a63db8a23c02ac131000cd88d86f578ba9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 26 May 2020 22:08:17 +0200 Subject: [PATCH 13/34] fix: overload reactive store workaround --- src/scripts/reactive-store.js | 53 +++++++++++------------------------ 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/src/scripts/reactive-store.js b/src/scripts/reactive-store.js index 3dc54f7..a8bd608 100644 --- a/src/scripts/reactive-store.js +++ b/src/scripts/reactive-store.js @@ -3,7 +3,7 @@ function refreshSibDisplays(resourceId, clearCache = true) { let cacheCleared = false; Array.from(document.querySelectorAll("sib-display")) - .filter(sibDisplay => sibDisplay.component.resourceId == resourceId) // keep only elements with resource == edited resource + .filter(sibDisplay => sibDisplay.component?sibDisplay.component.resourceId == resourceId:false) // keep only elements with resource == edited resource .forEach(async (e) => { //clear cache if we were unable to before if ((clearCache && !cacheCleared) && e.component.resource != null) { @@ -25,6 +25,13 @@ async function updateSources(resource) { refreshSibDisplays(res.join('/'),cacheCleared); } +async function resToChildrens(resource) { + resource = resource.getResourceData(); + refreshSibDisplays(resource["http://happy-dev.fr/owl/#user"]["@id"]); + refreshSibDisplays(resource["http://happy-dev.fr/owl/#project"]["@id"] + "members/"); + refreshSibDisplays(resource["http://happy-dev.fr/owl/#circle"]["@id"] + "members/"); +} + //auxiliary function updates displays using a given resource //NOTE: this is a temporary workaround and should be replaced by a reactive storage //https://git.startinblox.com/framework/sib-core/issues/524 @@ -33,42 +40,9 @@ async function refreshResource(event) { // if of the edited resource || id of the container of the created resource const resourceId = event.detail.resource["@id"] || event.target.dataset.src; updateSources(resourceId, event); - let resource; - try { - resource = document - .querySelector('[data-src="' + resourceId + '"]') - .component.resource.getResourceData(); - } catch (e) { - try { - resource = document - .querySelector('[data-src="' + resourceId.replace('circle-members','circles').split('/').slice(0, 4).join('/') + '/"]') - .component.resource.getResourceData(); - } catch (e) { - try { - resource = document - .querySelector('[nested-field="' + resourceId.split('/').slice(3, 4).join('').replace('circle-members','circles') + '"]') - .component.resource.getResourceData(); - } catch (e) { - resource = undefined; - } - } - } - - if(resource) { - //special case: refresh circles/X/ from circle-members/Y/ - let partnerId = null; - if (resourceId.includes("circle-members")) { - partnerId = resource["http://happy-dev.fr/owl/#circle"]["@id"]; - } else if (resourceId.includes("project-members")) { - partnerId = resource["http://happy-dev.fr/owl/#project"]["@id"]; - } - //refresh all resources using the partner ID - if (partnerId != null) { - refreshSibDisplays(partnerId); - refreshSibDisplays(partnerId + "members/"); - } - } - + [...new Set(Array.from(document.querySelectorAll('[data-src="' + resourceId + '"]')).map(e=>e.component?e.component.resource:null).filter(e=>e!=null))].forEach(resToChildrens); + [...new Set(Array.from(document.querySelectorAll('[data-src="' + resourceId.replace('circle-members','circles').split('/').slice(0, 4).join('/') + '/"]')).map(e=>e.component?e.component.resource:null).filter(e=>e!=null))].forEach(resToChildrens); + [...new Set(Array.from(document.querySelectorAll('[nested-field="' + resourceId.split('/').slice(3, 4).join('').replace('circle-members','circles') + '"]')).map(e=>e.component?e.component.resource:null).filter(e=>e!=null))].forEach(resToChildrens); //special cases updating users/X/circles for the left-side-menu (leaving or joining circle) let user = await document.querySelector('sib-auth').getUser(); @@ -82,6 +56,11 @@ async function refreshResource(event) { if(resourceId.includes('users')) { refreshSibDisplays(resourceId.split('/').slice(0, 3).join('/') + '/users/'); refreshSibDisplays(resourceId.split('/').slice(0, 3).join('/') + '/sources/users/'); + refreshSibDisplays(resourceId + 'profile/'); + refreshSibDisplays(resourceId + 'account/'); + refreshSibDisplays(resourceId + 'chatProfile/'); + refreshSibDisplays(resourceId + 'skills/'); + refreshSibDisplays(resourceId + 'account/'); } //clear cache on this resource From 148992eaef5501bbfbc7f3469c4dc03715112a75 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Wed, 27 May 2020 11:17:44 +0200 Subject: [PATCH 14/34] feature: about sib | HTML of page + header link + include + sib router --- src/header.pug | 3 +++ src/index.pug | 5 ++++- src/menu-left.pug | 1 + src/page-about.pug | 16 ++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/page-about.pug diff --git a/src/header.pug b/src/header.pug index 55d35a8..b47c11c 100644 --- a/src/header.pug +++ b/src/header.pug @@ -29,9 +29,12 @@ details#user-controls.notLoggedIn sib-link(next='my-profile') Mon profil //-li sib-link(next='user-settings') Settings + li sib-link(next='admin') Administration button(role='log out' onclick="document.querySelector('sib-auth').logout();") Se déconnecter + li + sib-link(next='about') A propos button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login();") Se connecter diff --git a/src/index.pug b/src/index.pug index 5ae77e6..19d3aae 100644 --- a/src/index.pug +++ b/src/index.pug @@ -17,9 +17,12 @@ html(lang="en") header#header(role='banner') include header.pug + main.notLoggedIn include menu-left.pug + include page-about.pug div#viewport + if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) #dashboard(hidden).no-sidebar @@ -59,4 +62,4 @@ html(lang="en") type=`${provider.type}` url=`${provider.url}` id=`${provider.id}` - ) \ No newline at end of file + ) diff --git a/src/menu-left.pug b/src/menu-left.pug index 3c82383..35c0430 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -54,6 +54,7 @@ nav#main__menu.jsLeftMenu div.menu-label Tableau de bord div.menu-icon.icon-home div.divider + sib-route(name='about', hidden) if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) sib-route.menu(name='members') div.menu-label Annuaire des membres diff --git a/src/page-about.pug b/src/page-about.pug new file mode 100644 index 0000000..064da90 --- /dev/null +++ b/src/page-about.pug @@ -0,0 +1,16 @@ +#about + .views-container + h2 A propos + div + h3 Cette application est développé par Startin'blox + p Ici un paragraphe qui explique ce qu'est SIB + + + a https://startinblox.com/fr + + div + h3 Contacte-nous + p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? + + div + p Contact \ No newline at end of file From 4148b8c6f0f521bb45c82377394c697115ae221c Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Wed, 27 May 2020 15:07:30 +0200 Subject: [PATCH 15/34] feature: about page | change spot in header --- src/header.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/header.pug b/src/header.pug index b47c11c..7cc5191 100644 --- a/src/header.pug +++ b/src/header.pug @@ -32,9 +32,9 @@ details#user-controls.notLoggedIn li sib-link(next='admin') Administration - button(role='log out' onclick="document.querySelector('sib-auth').logout();") Se déconnecter li sib-link(next='about') A propos + 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 From 6ea07c6bc04bd0561736dfee2f0f2757ad923689 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Thu, 28 May 2020 23:05:34 +0200 Subject: [PATCH 16/34] feature: classes for about page --- src/page-about.pug | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/page-about.pug b/src/page-about.pug index 064da90..ca8b2b3 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -1,16 +1,17 @@ -#about +#about.no-sidebar .views-container h2 A propos - div - h3 Cette application est développé par Startin'blox - p Ici un paragraphe qui explique ce qu'est SIB + div.flex-content-white + div + h3 Cette application est développé par Startin'blox + p Ici un paragraphe qui explique ce qu'est SIB - a https://startinblox.com/fr - - div - h3 Contacte-nous - p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? + a https://startinblox.com/fr div - p Contact \ No newline at end of file + h3 Contacte-nous + p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? + + div + p Contact \ No newline at end of file From 5ce5f5523bb30f637dffc04a0fe09621e0660a7b Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Thu, 28 May 2020 23:16:23 +0200 Subject: [PATCH 17/34] add css files for about page --- src/styles/base/about.scss | 7 +++++++ src/styles/index.scss | 1 + 2 files changed, 8 insertions(+) create mode 100644 src/styles/base/about.scss diff --git a/src/styles/base/about.scss b/src/styles/base/about.scss new file mode 100644 index 0000000..902332e --- /dev/null +++ b/src/styles/base/about.scss @@ -0,0 +1,7 @@ +#about{ + .flex-content-white{ + div{ + + } + } +} \ No newline at end of file diff --git a/src/styles/index.scss b/src/styles/index.scss index 5132044..e7ee1f6 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -8,6 +8,7 @@ @import 'abstracts/mixins'; @import 'components/icons/index'; @import 'base/main'; +@import 'base/about'; div#viewport { display: flex; From 3ca338e4c61d9774cfa2380da1b168d7f0ac1bc5 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Thu, 28 May 2020 23:49:21 +0200 Subject: [PATCH 18/34] css for about page --- src/page-about.pug | 2 +- src/styles/base/about.scss | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/page-about.pug b/src/page-about.pug index ca8b2b3..ae58d0d 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -7,7 +7,7 @@ p Ici un paragraphe qui explique ce qu'est SIB - a https://startinblox.com/fr + a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr div h3 Contacte-nous diff --git a/src/styles/base/about.scss b/src/styles/base/about.scss index 902332e..40691c1 100644 --- a/src/styles/base/about.scss +++ b/src/styles/base/about.scss @@ -1,7 +1,27 @@ #about{ - .flex-content-white{ - div{ + h2,h3{ + text-transform: uppercase; + } + .flex-content-white{ + display: flex; + >div{ + padding: 4.2em 4.7em; + text-align: center; + margin: 0 3em 3em 0; + background: white; + box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.11); + >div{ + display: flex; + flex-direction: column; + justify-content: space-between; + } + } + >div:first-child{ + width: 100%; + } + >div:last-child{ + width: 35%; } } } \ No newline at end of file From 7725350ca1b10711b74f530ff926b38d876dfec3 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Thu, 28 May 2020 23:49:46 +0200 Subject: [PATCH 19/34] feature: about sib : place import in clean spot of index --- src/index.pug | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.pug b/src/index.pug index 19d3aae..a997ede 100644 --- a/src/index.pug +++ b/src/index.pug @@ -20,9 +20,7 @@ html(lang="en") main.notLoggedIn include menu-left.pug - include page-about.pug div#viewport - if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) #dashboard(hidden).no-sidebar @@ -54,6 +52,7 @@ html(lang="en") #admin(hidden).with-sidebar include page-admin.pug + include page-about.pug if analytics each provider in analytics From bf2bddeb32d8675aa98f7b3ec0d4da8db2e56cf9 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Fri, 29 May 2020 00:28:53 +0200 Subject: [PATCH 20/34] feature : css for about page : colors & make clean on mobile --- src/page-about.pug | 2 +- src/styles/base/about.scss | 29 +++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/page-about.pug b/src/page-about.pug index ae58d0d..39f42f1 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -13,5 +13,5 @@ h3 Contacte-nous p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? - div + sib-link.main-cta p Contact \ No newline at end of file diff --git a/src/styles/base/about.scss b/src/styles/base/about.scss index 40691c1..c202d11 100644 --- a/src/styles/base/about.scss +++ b/src/styles/base/about.scss @@ -1,9 +1,14 @@ #about{ + $main-color: rgb(236, 94, 92); + $second-color: white; h2,h3{ text-transform: uppercase; } .flex-content-white{ display: flex; + @media only screen and (max-width: 768px) { + flex-direction: column; + } >div{ padding: 4.2em 4.7em; text-align: center; @@ -16,12 +21,32 @@ justify-content: space-between; } } - >div:first-child{ - width: 100%; + width: 60%; } >div:last-child{ width: 35%; + @media only screen and (max-width: 768px) { + width: 60%; + } } } + + .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: 1rem; + } + + .main-cta:hover{ + background: $main-color none repeat scroll 0% 0%; + border : 1px solid $second-color; + color: $second-color; + } } \ No newline at end of file From b0be741980092f08e3b3575f5e248f855dcb7dd1 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Fri, 29 May 2020 10:16:53 +0200 Subject: [PATCH 21/34] add space betwween text and cta's --- src/page-about.pug | 19 +++++++++++-------- src/styles/base/about.scss | 9 ++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/page-about.pug b/src/page-about.pug index 39f42f1..f9b5b0b 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -3,15 +3,18 @@ h2 A propos div.flex-content-white div - h3 Cette application est développé par Startin'blox - p Ici un paragraphe qui explique ce qu'est SIB + div + h3 Cette application est développé par Startin'blox + p Ici un paragraphe qui explique ce qu'est SIB - - a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr + div + a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr div - h3 Contacte-nous - p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? + div + h3 Contacte-nous + p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? - sib-link.main-cta - p Contact \ No newline at end of file + div + sib-link.main-cta + p Contact \ No newline at end of file diff --git a/src/styles/base/about.scss b/src/styles/base/about.scss index c202d11..2b0c81b 100644 --- a/src/styles/base/about.scss +++ b/src/styles/base/about.scss @@ -15,11 +15,10 @@ margin: 0 3em 3em 0; background: white; box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.11); - >div{ - display: flex; - flex-direction: column; - justify-content: space-between; - } + display: flex; + flex-direction: column; + justify-content: space-between; + } >div:first-child{ width: 60%; From 5c361bdef9f24785b56621bc31393433833331c9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 1 Jun 2020 12:42:35 +0200 Subject: [PATCH 22/34] small fixes, remove tabs --- src/header.pug | 3 -- src/index.pug | 5 +- src/menu-left.pug | 2 +- src/page-about.pug | 24 +++++----- src/styles/base/about.scss | 93 +++++++++++++++++++------------------- 5 files changed, 61 insertions(+), 66 deletions(-) diff --git a/src/header.pug b/src/header.pug index baa32e2..6ed556d 100644 --- a/src/header.pug +++ b/src/header.pug @@ -27,9 +27,6 @@ details#user-controls.notLoggedIn if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) li sib-link(next='my-profile') Mon profil - //-li - sib-link(next='user-settings') Settings - sib-link(next='profile') Mon profil li sib-link(next='admin') Administration li diff --git a/src/index.pug b/src/index.pug index 911e51b..fd04427 100644 --- a/src/index.pug +++ b/src/index.pug @@ -17,7 +17,6 @@ html(lang="en") header#header(role='banner') include header.pug - main.notLoggedIn include menu-left.pug div#viewport @@ -52,7 +51,9 @@ html(lang="en") #admin(hidden).with-sidebar include page-admin.pug - include page-about.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)) #profile(hidden).no-sidebar diff --git a/src/menu-left.pug b/src/menu-left.pug index 4ccc378..d3b4edf 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -54,7 +54,6 @@ nav#main__menu.jsLeftMenu div.menu-label Tableau de bord div.menu-icon.icon-home div.divider - sib-route(name='about', hidden) if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) sib-route.menu(name='members') div.menu-label Annuaire des membres @@ -139,3 +138,4 @@ nav#main__menu.jsLeftMenu sib-route(name='admin', hidden) sib-route.menu(name='profile', hidden) + sib-route(name='about', hidden) diff --git a/src/page-about.pug b/src/page-about.pug index ab6f285..3ec5af0 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -1,16 +1,14 @@ -#about.no-sidebar.with-padding - .views-container - h2 A propos - div.flex-content-white - div - h3 Cette application est développé par Startin'blox - p Ici un paragraphe qui explique ce qu'est SIB +.views-container + h2 A propos + div.flex-content-white + div + h3 Cette application est développé par Startin'blox + p Ici un paragraphe qui explique ce qu'est SIB - a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr + a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr - div - h3 Contacte-nous - p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? + div + h3 Contacte-nous + p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? - sib-link.main-cta - p Contact \ No newline at end of file + a(href="https://startinblox.com/fr" target="_blank").main-cta Contact \ No newline at end of file diff --git a/src/styles/base/about.scss b/src/styles/base/about.scss index 2b0c81b..8df00cb 100644 --- a/src/styles/base/about.scss +++ b/src/styles/base/about.scss @@ -1,51 +1,50 @@ #about{ - $main-color: rgb(236, 94, 92); - $second-color: white; - h2,h3{ - text-transform: uppercase; - } - .flex-content-white{ - display: flex; - @media only screen and (max-width: 768px) { - flex-direction: column; - } - >div{ - padding: 4.2em 4.7em; - text-align: center; - margin: 0 3em 3em 0; - background: white; - box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.11); - display: flex; - flex-direction: column; - justify-content: space-between; + $main-color: rgb(236, 94, 92); + $second-color: white; + h2,h3{ + text-transform: uppercase; + } + .flex-content-white{ + display: flex; + @media only screen and (max-width: 768px) { + flex-direction: column; + } + >div{ + padding: 4.2em 4.7em; + text-align: center; + margin: 0 3em 3em 0; + 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%; + } + } + } - } - >div:first-child{ - width: 60%; - } - >div:last-child{ - width: 35%; - @media only screen and (max-width: 768px) { - width: 60%; - } - } - } + .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: 1rem; + } - .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: 1rem; - } - - .main-cta:hover{ - background: $main-color none repeat scroll 0% 0%; - border : 1px solid $second-color; - color: $second-color; - } + .main-cta:hover{ + background: $main-color none repeat scroll 0% 0%; + border : 1px solid $second-color; + color: $second-color; + } } \ No newline at end of file From cf166b71d77a6e0aa60ce29393062e8323f2640d Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Mon, 1 Jun 2020 16:05:23 +0200 Subject: [PATCH 23/34] feature: about sib | align center blocs & fix contact button --- src/styles/base/about.scss | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/styles/base/about.scss b/src/styles/base/about.scss index 8df00cb..3c9d33e 100644 --- a/src/styles/base/about.scss +++ b/src/styles/base/about.scss @@ -4,6 +4,9 @@ h2,h3{ text-transform: uppercase; } + h2{ + margin-left: 1.5em; + } .flex-content-white{ display: flex; @media only screen and (max-width: 768px) { @@ -12,7 +15,7 @@ >div{ padding: 4.2em 4.7em; text-align: center; - margin: 0 3em 3em 0; + margin: 0 1.5em 3em 1.5em; background: white; box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.11); display: flex; @@ -28,6 +31,9 @@ width: 60%; } } + a{ + text-decoration: none; + } } .main-cta{ @@ -39,7 +45,9 @@ font-weight: bold; text-transform: uppercase; width: 25%; - font-size: 1rem; + font-size: 1.1rem; + align-self: center; + padding: 5px; } .main-cta:hover{ From 65be45c7772ffb16ac4cf384b75656346eab4f79 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Mon, 1 Jun 2020 16:14:00 +0200 Subject: [PATCH 24/34] feature: about sib - reduce padding size & add div in blocs --- src/page-about.pug | 18 ++++++++++-------- src/styles/base/about.scss | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/page-about.pug b/src/page-about.pug index 3ec5af0..f8748aa 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -2,13 +2,15 @@ h2 A propos div.flex-content-white div - h3 Cette application est développé par Startin'blox - p Ici un paragraphe qui explique ce qu'est SIB - - a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr + div + h3 Cette application est développé par Startin'blox + p Ici un paragraphe qui explique ce qu'est SIB + div + a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr div - h3 Contacte-nous - p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? - - a(href="https://startinblox.com/fr" target="_blank").main-cta Contact \ No newline at end of file + 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" target="_blank").main-cta Contact \ No newline at end of file diff --git a/src/styles/base/about.scss b/src/styles/base/about.scss index 3c9d33e..c7b6230 100644 --- a/src/styles/base/about.scss +++ b/src/styles/base/about.scss @@ -13,7 +13,7 @@ flex-direction: column; } >div{ - padding: 4.2em 4.7em; + padding: 2em 2.5em; text-align: center; margin: 0 1.5em 3em 1.5em; background: white; @@ -47,7 +47,7 @@ width: 25%; font-size: 1.1rem; align-self: center; - padding: 5px; + padding: 0.5rem 1.5rem; } .main-cta:hover{ From 3d860913a635b392b2b333ee863bd50ab1d28a31 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 1 Jun 2020 16:28:04 +0200 Subject: [PATCH 25/34] fix: profile url --- src/header.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/header.pug b/src/header.pug index 6ed556d..f3e9241 100644 --- a/src/header.pug +++ b/src/header.pug @@ -26,7 +26,7 @@ details#user-controls.notLoggedIn ul if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) li - sib-link(next='my-profile') Mon profil + sib-link(next='profile') Mon profil li sib-link(next='admin') Administration li From 4a33ead577aedf27872b1dc48a7e839193b3f73d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 2 Jun 2020 10:43:00 +0000 Subject: [PATCH 26/34] update: add text to about --- src/page-about.pug | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/page-about.pug b/src/page-about.pug index f8748aa..d14df9b 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -1,16 +1,17 @@ -.views-container - h2 A propos - div.flex-content-white - div - div - h3 Cette application est développé par Startin'blox - p Ici un paragraphe qui explique ce qu'est SIB - 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 +.views-container + h2 A propos + div.flex-content-white + div + div + h3 Cette application est développé par Startin'blox + p Startin’blox 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 d’un effet de réseau au sein d’un é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" target="_blank").main-cta Contact \ No newline at end of file From bee847d888760b40f1d27e5446f59542501d0d22 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 2 Jun 2020 10:53:26 +0000 Subject: [PATCH 27/34] fix: typo --- src/page-about.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page-about.pug b/src/page-about.pug index d14df9b..54d5346 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -3,7 +3,7 @@ div.flex-content-white div div - h3 Cette application est développé par Startin'blox + h3 Cette application est développée par Startin'blox p Startin’blox 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 d’un effet de réseau au sein d’un écosystème choisi afin de s’émanciper des grandes plateformes. div From c856621bd8820807bb05bb35269b6d59912d660d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 3 Jun 2020 13:43:14 +0000 Subject: [PATCH 28/34] fix: router magic --- src/page-about.pug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/page-about.pug b/src/page-about.pug index 54d5346..0bad6cf 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -7,11 +7,11 @@ p Startin’blox 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 d’un effet de réseau au sein d’un écosystème choisi afin de s’émanciper des grandes plateformes. div - a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr + 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" target="_blank").main-cta Contact \ No newline at end of file + a(href="https://startinblox.com/fr/#home-contact" target="_blank").main-cta Contact \ No newline at end of file From de36926b454710470996a6f4c9580d99935cc9f7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 8 Jun 2020 19:55:28 +0200 Subject: [PATCH 29/34] update: directory to 0.4 --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 5de986a..da3124a 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -24,7 +24,7 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) //- 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)) - 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) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) From 2d640609430b53291e85b2c9e039574f3e3b7e26 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 8 Jun 2020 19:22:35 +0000 Subject: [PATCH 30/34] fix: sib-directory local path --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index da3124a..d6f87ac 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -25,7 +25,7 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) 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.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) script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1" defer) From 61c853ee54c9b7a27f69748fe2b33ec848a78721 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 11 Jun 2020 18:26:43 +0000 Subject: [PATCH 31/34] cicd: add hubl community --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5884a93..7175ec8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -264,3 +264,21 @@ volumes: when: manual tags: - deploy + +volumes: + stage: deployment + environment: + name: community-hubl + 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 From 4fb2a1dd1ad837173b10d2599bd388a17d57066f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 11 Jun 2020 18:29:10 +0000 Subject: [PATCH 32/34] fix: environment name for community hubl --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7175ec8..01e739e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -268,7 +268,7 @@ volumes: volumes: stage: deployment environment: - name: community-hubl + name: communityhubl url: https://community.hubl.world before_script: - npm ci --cache .npm --prefer-offline --only=production From 7f091cdb47414b2d7754812e8a6d95dd98c885ec Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 11 Jun 2020 18:35:29 +0000 Subject: [PATCH 33/34] fix: environment name for communityhubl --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01e739e..19aeb4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -265,7 +265,7 @@ volumes: tags: - deploy -volumes: +communityhubl: stage: deployment environment: name: communityhubl From 99ea055f03a0d2e7431b8bdeb070b30f2ad1a2f7 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Sat, 13 Jun 2020 01:50:44 +0200 Subject: [PATCH 34/34] fix: colors for directory --- src/styles/abstracts/_variables.scss | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss index e974acd..923ac4d 100644 --- a/src/styles/abstracts/_variables.scss +++ b/src/styles/abstracts/_variables.scss @@ -118,6 +118,20 @@ --color-backlink: var(--color-secondary); --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 */