From 4e09bb1c5281a28d801631884b9b79d51227602d Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Thu, 8 Aug 2019 15:20:31 +0200
Subject: [PATCH 1/4] downgrade: keep only circle, oidc and users
---
src/dependencies.pug | 6 ++--
src/index.pug | 28 +++++++--------
src/menu-left.pug | 68 +++++++++++++++++++------------------
src/page-user-panel.pug | 6 ++--
src/styles/base/header.scss | 2 +-
5 files changed, 56 insertions(+), 54 deletions(-)
diff --git a/src/dependencies.pug b/src/dependencies.pug
index b6daed35..c012d462 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -19,6 +19,6 @@ script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
script(type="module" src="https://unpkg.com/@startinblox/router@0.7")
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.2")
script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.2")
-script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3")
-script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta")
-script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta")
+//- script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3")
+//- script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta")
+//- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta")
diff --git a/src/index.pug b/src/index.pug
index 2e31896f..cf0f8d03 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -15,22 +15,22 @@ html(lang="en")
include menu-left.pug
div#viewport
- #members(hidden).no-sidebar
- include page-members-directory.pug
+ //- #members(hidden).no-sidebar
+ //- include page-members-directory.pug
- #job-offers(hidden).no-sidebar
- include page-job-offers.pug
+ //- #job-offers(hidden).no-sidebar
+ //- include page-job-offers.pug
- #job-offer-create(hidden).no-sidebar
- sib-link(class="backlink", next="job-offers") Back
- include page-job-offer-create.pug
+ //- #job-offer-create(hidden).no-sidebar
+ //- sib-link(class="backlink", next="job-offers") Back
+ //- include page-job-offer-create.pug
- #job-offer-edit(hidden).no-sidebar
- sib-link(class="backlink", next="job-offers") Back
- include page-job-offer-edit.pug
+ //- #job-offer-edit(hidden).no-sidebar
+ //- sib-link(class="backlink", next="job-offers") Back
+ //- include page-job-offer-edit.pug
- #project(hidden).with-sidebar
- include page-project.pug
+ //- #project(hidden).with-sidebar
+ //- include page-project.pug
#circle(hidden).with-sidebar
include page-circle.pug
@@ -38,5 +38,5 @@ html(lang="en")
#messages(hidden).with-sidebar
include page-messages.pug
- #my-profile(hidden).no-sidebar
- include page-user-profile.pug
+ //- #my-profile(hidden).no-sidebar
+ //- include page-user-profile.pug
diff --git a/src/menu-left.pug b/src/menu-left.pug
index 59e078a1..0a15c818 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -3,47 +3,49 @@ sib-widget(name='hd-counter')
sib-badge(data-src="${src}")
nav#main__menu
sib-router#navbar-router(default-route='members')
- sib-route.menu(name='members')
- div.menu-label Members
- div.menu-icon.icon-people
- div.divider
- sib-route.menu(name='job-offers', rdf-type='hd:joboffer')
- div.menu-label Job offers
- div.menu-icon.icon-briefcase
- sib-route(hidden, name='job-offer-create')
- sib-route(hidden, name='job-offer-edit', use-id)
- div.divider
+ //- sib-route.menu(name='members')
+ //- div.menu-label Members
+ //- div.menu-icon.icon-people
+ //- div.divider
+ //- sib-route.menu(name='job-offers', rdf-type='hd:joboffer')
+ //- div.menu-label Job offers
+ //- div.menu-icon.icon-briefcase
+ //- sib-route(hidden, name='job-offer-create')
+ //- sib-route(hidden, name='job-offer-edit', use-id)
+ //- div.divider
+ //- div.menu-wrapper
+ //- div.menu
+ //- div.menu-chevron
+ //- div.menu-icon.icon-arrow-up
+ //- div.menu-label Projects
+ //- div.menu-icon.icon-folder-alt
+ //- sib-route(hidden,name='project', id-prefix=`${endpoints.projects}`, rdf-type='hd:project', use-id='')
+ //- div.sub-menu.menu-notification
+ //- sib-display(
+ //- data-src=`${endpoints.projects}`
+ //- fields='project(customer.name, dash, name), badge'
+ //- value-dash=' - '
+ //- widget-badge='hd-counter'
+ //- action-badge='badge'
+ //- next='project'
+ //- )
+ //- div.divider
div.menu-wrapper
div.menu
div.menu-chevron
div.menu-icon.icon-arrow-up
- div.menu-label Projects
+ div.menu-label Circles
div.menu-icon.icon-folder-alt
- sib-route(hidden,name='project', id-prefix=`${endpoints.projects}`, rdf-type='hd:project', use-id='')
+ sib-route(hidden,name='circle', id-prefix=`${endpoints.circles}`, rdf-type='hd:circle', use-id='')
div.sub-menu.menu-notification
sib-display(
- data-src=`${endpoints.projects}`
- fields='project(customer.name, dash, name), badge'
- value-dash=' - '
+ data-src=`${endpoints.circles}`
+ fields='name, badge'
+ widget-name='sib-display-div',
widget-badge='hd-counter'
action-badge='badge'
- next='project'
+ next='circle'
)
- //- div.divider
- //- div.menu-wrapper
- //- div.menu
- //- div.menu-chevron
- //- div.menu-icon.icon-arrow-up
- //- div.menu-label Cercles
- //- div.menu-icon.icon-globe
- //- sib-route(hidden, name='circle', id-prefix=`${endpoints.circles}`, rdf-type='hd:circle')
- //- div.sub-menu
- //- sib-display(
- //- data-src=`${endpoints.circles}`,
- //- fields='name',
- //- widget-name='sib-display-div',
- //- next='circle'
- //- )
div.divider
div.menu-wrapper
div.menu
@@ -62,6 +64,6 @@ nav#main__menu
next='messages'
)
- div.divider
- sib-route.menu(hidden, name='my-profile', rdf-type='foaf:user', use-id='')
+ //- div.divider
+ //- sib-route.menu(hidden, name='my-profile', rdf-type='foaf:user', use-id='')
diff --git a/src/page-user-panel.pug b/src/page-user-panel.pug
index 988cf84a..d3491ace 100644
--- a/src/page-user-panel.pug
+++ b/src/page-user-panel.pug
@@ -1,9 +1,9 @@
nav(role="user's functionalities menu")
ul
- li
- sib-link(next='my-profile') My profile
+ //- li
+ //- sib-link(next='my-profile') My profile
//-li
sib-link(next='user-settings') Settings
//-li
sib-link(name='user-admin') Admin
- //-button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out
+ button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out
diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss
index 2a0792b6..c1c2e25a 100644
--- a/src/styles/base/header.scss
+++ b/src/styles/base/header.scss
@@ -103,7 +103,7 @@
}
}
- details#user-controls {
+ #user-controls {
padding: 0;
-webkit-touch-callout: none;
-webkit-user-select: none;
--
GitLab
From 5fb9545e5ca33673df0975bada7cacc53fede3d6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Thu, 8 Aug 2019 16:00:16 +0200
Subject: [PATCH 2/4] update: remove menu
---
src/page-circle.pug | 46 ++++++++++++++++++++++----------------------
src/scripts/index.js | 21 ++++++++++----------
2 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/src/page-circle.pug b/src/page-circle.pug
index 1015a5be..b66986c8 100644
--- a/src/page-circle.pug
+++ b/src/page-circle.pug
@@ -1,26 +1,26 @@
.views-container
#circle-chat
include page-circle-chat.pug
- #circle-profile
- include page-circle-profile.pug
- #circle-edit
- include page-circle-edit.pug
- #circle-create
- include page-circle-create.pug
-nav.jsRightMenu(role='navigation')
- sib-router(default-route='circle-chat')
- ul
- li.jsOffsiteToggle
- a Fold menu
- sib-route(name='circle-chat')
- li
- a Chat
- sib-route(name='circle-profile')
- li
- a Information
- sib-route(name='circle-edit')
- //- li
- //- a Edit
- sib-route(name='circle-create')
- //- li
- //- a Add new
\ No newline at end of file
+ //- #circle-profile
+ //- include page-circle-profile.pug
+ //- #circle-edit
+ //- include page-circle-edit.pug
+ //- #circle-create
+ //- include page-circle-create.pug
+//- nav.jsRightMenu(role='navigation')
+//- sib-router(default-route='circle-chat')
+//- ul
+//- li.jsOffsiteToggle
+//- a Fold menu
+//- sib-route(name='circle-chat')
+//- li
+//- a Chat
+//- sib-route(name='circle-profile')
+//- li
+//- a Information
+//- sib-route(name='circle-edit')
+//- //- li
+//- //- a Edit
+//- sib-route(name='circle-create')
+//- //- li
+//- //- a Add new
\ No newline at end of file
diff --git a/src/scripts/index.js b/src/scripts/index.js
index 621808ed..105b5cf2 100644
--- a/src/scripts/index.js
+++ b/src/scripts/index.js
@@ -35,15 +35,16 @@ document.addEventListener('DOMContentLoaded', function (event) {
});
});
- //- Header login hide/show
- // if(document.querySelector('sib-auth').getUser() !== null) {
- // document.querySelector('button[role="log in"]').style.display = 'none';
- // //- Token expired, hack for ask relogin
- // if(new Date(document.querySelector('sib-auth').getUser().expires_at*1000) <= new Date()) {
- // document.querySelector('button[role="log in"]').style.display = '';
- // document.querySelector('button[role="log in"]').style.color = 'red';
- // document.querySelector('button[role="log in"]').innerHTML = 'Re-login';
- // }
- // }
+ document.querySelector('sib-auth').getUser().then(user => {
+ if(user !== null) {
+ document.querySelector('button[role="log in"]').style.display = 'none';
+ //- Token expired, hack for ask relogin
+ if(new Date(document.querySelector('sib-auth').getUser().expires_at*1000) <= new Date()) {
+ document.querySelector('button[role="log in"]').style.display = '';
+ document.querySelector('button[role="log in"]').style.color = 'red';
+ document.querySelector('button[role="log in"]').innerHTML = 'Re-login';
+ }
+ }
+ }).catch(error => console.log(error));
});
\ No newline at end of file
--
GitLab
From 1b69319ce99aac017de66aa7f48fe56cf7ca2a69 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Fri, 9 Aug 2019 16:01:06 +0200
Subject: [PATCH 3/4] fix: chat works
---
src/header.pug | 8 +-------
src/page-circle-chat.pug | 2 +-
src/page-messages.pug | 2 +-
src/page-project-chat.pug | 2 +-
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/header.pug b/src/header.pug
index 2e44180c..43d58354 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -28,13 +28,7 @@ button(role='log in' onclick="document.querySelector('sib-auth').login();") Logi
sib-auth
sib-auth-provider(
- class="sib-auth-provider"
data-authority=`${authority}`
- data-client_id=`${client_id}`,
- data-id="paris"
- data-response_type='id_token token',
- data-scope='openid profile email',
- data-automaticSilentRenew='true',
- data-loadUserInfo='true'
+ data-id=`${authorityName || "paris"}`
)
diff --git a/src/page-circle-chat.pug b/src/page-circle-chat.pug
index 48a1c7f9..3ba8793d 100644
--- a/src/page-circle-chat.pug
+++ b/src/page-circle-chat.pug
@@ -2,7 +2,7 @@
sib-chat(
data-authentication='login',
data-auto-login='true',
- data-bosh-service-url=xmpp,
+ data-bosh-service-url=`${xmpp}`,
data-debug='false',
data-locales-url='en',
bind-resources
diff --git a/src/page-messages.pug b/src/page-messages.pug
index 8f90ba4f..4f164923 100644
--- a/src/page-messages.pug
+++ b/src/page-messages.pug
@@ -2,7 +2,7 @@
sib-chat(
data-authentication='login',
data-auto-login='true',
- data-bosh-service-url=xmpp,
+ data-bosh-service-url=`${xmpp}`,
data-debug='false',
data-locales-url='en',
bind-resources
diff --git a/src/page-project-chat.pug b/src/page-project-chat.pug
index 8f90ba4f..4f164923 100644
--- a/src/page-project-chat.pug
+++ b/src/page-project-chat.pug
@@ -2,7 +2,7 @@
sib-chat(
data-authentication='login',
data-auto-login='true',
- data-bosh-service-url=xmpp,
+ data-bosh-service-url=`${xmpp}`,
data-debug='false',
data-locales-url='en',
bind-resources
--
GitLab
From 582219cfd20f6efc624250c40a4fcce7c1f4ee10 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Fri, 16 Aug 2019 17:48:51 +0200
Subject: [PATCH 4/4] update: remove client_id from sample
---
src/config.sample.json | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/config.sample.json b/src/config.sample.json
index a0748eb4..2b026358 100644
--- a/src/config.sample.json
+++ b/src/config.sample.json
@@ -3,7 +3,6 @@
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "http://127.0.0.1:8000/openid/",
- "client_id": "000000",
"endpoints": {
"businessproviders": "http://127.0.0.1:8000/businessproviders/",
"circles": "http://127.0.0.1:8000/circles/",
@@ -19,7 +18,6 @@
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.alpha.happy-dev.fr/openid/",
- "client_id": "218707",
"endpoints": {
"businessproviders": "https://api.alpha.happy-dev.fr/businessproviders/",
"circles": "https://api.alpha.happy-dev.fr/circles/",
@@ -36,13 +34,12 @@
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.test-paris.happy-dev.fr/openid/",
- "client_id": "196656",
"endpoints": {
"businessproviders": "https://api.test-paris.happy-dev.fr/businessproviders/",
- "circles": "https://api.test-paris.happy-dev.fr/sources/circles/",
+ "circles": "https://api.test-paris.happy-dev.fr/circles/",
"groups": "https://api.test-paris.happy-dev.fr/groups/",
- "joboffers": "https://api.test-paris.happy-dev.fr/sources/job-offers/",
- "projects": "https://api.test-paris.happy-dev.fr/sources/projects/",
+ "joboffers": "https://api.test-paris.happy-dev.fr/job-offers/",
+ "projects": "https://api.test-paris.happy-dev.fr/projects/",
"skills": "https://api.test-paris.happy-dev.fr/skills/",
"users": "https://api.test-paris.happy-dev.fr/users/"
}
@@ -52,13 +49,12 @@
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.test-nantes.happy-dev.fr/openid/",
- "client_id": "621272",
"endpoints": {
"businessproviders": "https://api.test-nantes.happy-dev.fr/businessproviders/",
- "circles": "https://api.test-nantes.happy-dev.fr/sources/circles/",
+ "circles": "https://api.test-nantes.happy-dev.fr/circles/",
"groups": "https://api.test-nantes.happy-dev.fr/groups/",
- "joboffers": "https://api.test-nantes.happy-dev.fr/sources/job-offers/",
- "projects": "https://api.test-nantes.happy-dev.fr/sources/projects/",
+ "joboffers": "https://api.test-nantes.happy-dev.fr/job-offers/",
+ "projects": "https://api.test-nantes.happy-dev.fr/projects/",
"skills": "https://api.test-nantes.happy-dev.fr/skills/",
"users": "https://api.test-nantes.happy-dev.fr/users/"
}
--
GitLab