From d1c2044c616075032ea4071426c359ffdec93598 Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Tue, 6 Apr 2021 17:42:28 +0200 Subject: [PATCH 01/10] bugfix: sib-ressource endpoints values --- src/views/page-resources.pug | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/page-resources.pug b/src/views/page-resources.pug index 0c98992..f90d0f2 100644 --- a/src/views/page-resources.pug +++ b/src/views/page-resources.pug @@ -1,7 +1,10 @@ div.whitespace-normal - solid-resource(data-src=`${component.endpoints.resources}` - range-resource-type=`${component.endpoints.resourcestypes}` - range-resource-keyword=`${component.endpoints.resourceskeywords}` + solid-resource(data-src=`${component.endpoints.get}` + post-data-src=`${component.endpoints.post}` + range-resource-type=`${component.endpoints.types}` + post-data-type-src=`${component.endpoints.postTypes}` + range-resource-keyword=`${component.endpoints.keywords}` + post-data-keyword-src=`${component.endpoints.postKeywords}` range-resource-circle=`${getComponent('circles').endpoints.get}/` associated-circle-label="" data-trans=`associated-circle-label=${component.parameters && component.parameters.associatedName ? component.parameters.associatedName : 'circle.extensions.associated'}` From bb21fae82a21be35d31fab53bb2fd46ac29a68c0 Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Tue, 6 Apr 2021 17:45:26 +0200 Subject: [PATCH 02/10] doc: update config.json sample for resource --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c58877a..68c35ea 100644 --- a/README.md +++ b/README.md @@ -525,12 +525,13 @@ Module declaration, on `config.json`: { "type": "resources", "endpoints": { - "get": "http://server.url/resources/", - "post": "http://server.url/resources/", - "types": "http://server.url/keywords/", - "keywords": "http://server.url/types/", - "postTypes": "http://server.url/keywords/", - "postKeywords": "http://server.url/types/" + "get": "https://api.test4.startinblox.com/resources/", + "post": "https://api.test4.startinblox.com/resources/", + "types": "https://api.test4.startinblox.com/types/", + "keywords": "https://api.test4.startinblox.com/keywords/", + "postTypes": "https://api.test4.startinblox.com/types/", + "postKeywords": "https://api.test4.startinblox.com/keywords/", + "uploads": "https://api.test4.startinblox.com/upload/" } } ``` From 35136e8b0ad9ec1299610bb2048002a40e700167 Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Tue, 6 Apr 2021 17:54:19 +0200 Subject: [PATCH 03/10] doc: update config.json sample for resource with https://server.url --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 68c35ea..497490c 100644 --- a/README.md +++ b/README.md @@ -525,13 +525,13 @@ Module declaration, on `config.json`: { "type": "resources", "endpoints": { - "get": "https://api.test4.startinblox.com/resources/", - "post": "https://api.test4.startinblox.com/resources/", - "types": "https://api.test4.startinblox.com/types/", - "keywords": "https://api.test4.startinblox.com/keywords/", - "postTypes": "https://api.test4.startinblox.com/types/", - "postKeywords": "https://api.test4.startinblox.com/keywords/", - "uploads": "https://api.test4.startinblox.com/upload/" + "get": "https://server.url/resources/", + "post": "https://server.url/resources/", + "types": "https://server.url/types/", + "keywords": "https://server.url/keywords/", + "postTypes": "https://server.url/types/", + "postKeywords": "https://server.url/keywords/", + "uploads": "https://server.url/upload/" } } ``` From afd6092014439ee308312d4b15c64e7a3aa34ddf Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 6 Apr 2021 16:05:56 +0000 Subject: [PATCH 04/10] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 497490c..5ab7d75 100644 --- a/README.md +++ b/README.md @@ -525,13 +525,13 @@ Module declaration, on `config.json`: { "type": "resources", "endpoints": { - "get": "https://server.url/resources/", - "post": "https://server.url/resources/", - "types": "https://server.url/types/", - "keywords": "https://server.url/keywords/", - "postTypes": "https://server.url/types/", - "postKeywords": "https://server.url/keywords/", - "uploads": "https://server.url/upload/" + "get": "http://server.url/resources/", + "post": "http://server.url/resources/", + "types": "http://server.url/types/", + "keywords": "http://server.url/keywords/", + "postTypes": "http://server.url/types/", + "postKeywords": "http://server.url/keywords/", + "uploads": "http://server.url/upload/" } } ``` From 9222c8d94990fca51cfcad10435001abb1db6efc Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Wed, 7 Apr 2021 06:50:58 +0200 Subject: [PATCH 05/10] update: bump resource to valid version 3.1 --- src/dependencies.pug | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 283c1a3..d530a0f 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -43,9 +43,8 @@ if componentSet.has("profileDirectory") script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@5.1" defer) //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) -//- Disabled - Not in core@0.16 if componentSet.has("resources") - script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.0", defer) + script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.1", defer) //- script(type="module" src="/lib/solid-resource/solid-resource.js" defer) if componentSet.has("themeChecker") From 9d958954095ff9a46e5f6297be178a54cf7c6057 Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Mon, 19 Apr 2021 15:47:25 +0200 Subject: [PATCH 06/10] update: component update --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 1ede7e9..d5f332a 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -53,7 +53,7 @@ if componentSet.has("profileDirectory") //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) if componentSet.has("resources") - script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.1", defer) + script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.2", defer) //- script(type="module" src="/lib/solid-resource/solid-resource.js" defer) if componentSet.has("themeChecker") From 657c471df7d2732f72861b4389c91fa9fecc0ecd Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 19 Apr 2021 16:18:24 +0200 Subject: [PATCH 07/10] patch: icons for project, circle and community harmonized --- package-lock.json | 6 +++--- package.json | 2 +- src/styles/content/_index.scss | 17 +++++------------ src/views/page-admin.pug | 20 ++++++++++---------- src/views/partials/header.pug | 2 +- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01b4a7d..18ad18a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1615,9 +1615,9 @@ } }, "@startinblox/hubl-styling-framework": { - "version": "1.8.21", - "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.21.tgz", - "integrity": "sha512-4T0sqL7rqqe8uFmH4f8geigxZ4pIxI1ze3sycM762CQFtM5fXadAI9tl7wwAOQbY15y6xfZfDcPoK0YEjv0v9g==" + "version": "1.8.22", + "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.22.tgz", + "integrity": "sha512-00P0hIXjecgryh41Abq8ViVm18Aployr5TRbK/KDpNPAQqQ5x2to6z0of8oeeJeSm/srippfGdHLrJ7nyd1emg==" }, "@types/q": { "version": "1.5.4", diff --git a/package.json b/package.json index 5bd7775..bf92dd5 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "clearDist": false }, "dependencies": { - "@startinblox/hubl-styling-framework": "^1.8.21", + "@startinblox/hubl-styling-framework": "^1.8.22", "cross-env": "^7.0.3", "fs-extra": "^9.0.1", "normalize.css": "^8.0.1", diff --git a/src/styles/content/_index.scss b/src/styles/content/_index.scss index 782105b..0bca0a6 100644 --- a/src/styles/content/_index.scss +++ b/src/styles/content/_index.scss @@ -22,8 +22,8 @@ main { &.sidebar-is-closed { @media(min-width: 768.01px) { - margin-left: -152px; - transform: translate(152px); + margin-left: -157px; + transform: translate(157px); } } } @@ -39,18 +39,11 @@ main { width: 217px; @media (max-width: 768px) { - width: 65px; + width: 60px; } ul { - - li { - border-bottom: 1px solid #D6CECE; - - &>a { - vertical-align: super; - } - } + &>li:first-child>a { vertical-align: middle; } @@ -98,7 +91,7 @@ main { &.jsRightMenu:not([open]) { @media (min-width: 768.01px) { - transform: translate(152px); + transform: translate(157px); } } diff --git a/src/views/page-admin.pug b/src/views/page-admin.pug index 6e715bf..2e33722 100644 --- a/src/views/page-admin.pug +++ b/src/views/page-admin.pug @@ -60,7 +60,7 @@ nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-normal(role='navigation') .segment.whitespace-normal.text-color-heading.text-bold ul - li.segment.full.sm-hidden.padding-small.text-normal.jsOffsiteToggle + li.segment.full.sm-hidden.padding-small.text-normal.border-bottom.border-color-grey.jsOffsiteToggle span.icon.icon-arrow-left.icon-xsmall.margin-left-xxsmall.text-left span.segment.full.text-right(hidden) span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall @@ -69,16 +69,16 @@ if component.route if component.type == "circles" solid-link.segment.full(next=`admin-${component.route}`) - li.segment.full.padding-medium - span.icon.ci-bubble-add.icon-xlarge.margin-right-medium - a(data-trans='admin.menuRight.circles') + li.segment.full.padding-medium.border-bottom.border-color-grey + span.icon.icon-globe.icon-large.margin-right-medium + a.text-baseline(data-trans='admin.menuRight.circles') if component.type == "projects" solid-link.segment.full(next=`admin-${component.route}`) - li.segment.full.padding-medium - span.icon.ci-add.icon-xlarge.margin-right-medium - a(data-trans='admin.menuRight.projects') + li.segment.full.padding-medium.border-bottom.border-color-grey + span.icon.icon-folder-alt.icon-large.margin-right-medium + a.text-baseline(data-trans='admin.menuRight.projects') if component.type == "chat" solid-link.segment.full(next=`admin-${component.route}`) - li.segment.full.padding-medium - span.icon.ci-networking.icon-xlarge.margin-right-medium - a(data-trans='admin.menuRight.community') + li.segment.full.padding-medium.border-bottom.border-color-grey + span.icon.icon-grid.icon-large.margin-right-medium + a.text-baseline(data-trans='admin.menuRight.community') diff --git a/src/views/partials/header.pug b/src/views/partials/header.pug index 6a4f0c9..a31802f 100644 --- a/src/views/partials/header.pug +++ b/src/views/partials/header.pug @@ -48,7 +48,7 @@ div if componentSet.has("communities") && getComponent("chat").route solid-link.text-hover(next=`admin-${getRoute("chat", true)}`) li.segment.padding-top-small - a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community') + a.icon.icon-grid.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community') if componentSet.has("circles") && getComponent("circles").route solid-link.text-hover(next=`admin-${getRoute("circles", true)}`) li.segment.padding-top-small From 5bf30385f2f0cec97e3d970e77e3c84ced9a9cec Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Mon, 19 Apr 2021 17:41:45 +0200 Subject: [PATCH 08/10] update: minor version for component --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index d5f332a..728526b 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -53,7 +53,7 @@ if componentSet.has("profileDirectory") //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) if componentSet.has("resources") - script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.2", defer) + script(type="module", src="https://cdn.skypack.dev/@startinblox/component-resource@3.3", defer) //- script(type="module" src="/lib/solid-resource/solid-resource.js" defer) if componentSet.has("themeChecker") From 79635b4e7bf08da1219b467ee0a31c09c5956e8e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 20 Apr 2021 16:46:59 +0000 Subject: [PATCH 09/10] patch: bump chat https://git.startinblox.com/components/solid-xmpp-chat/merge_requests/136 --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 728526b..c4b8fb3 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -17,7 +17,7 @@ if componentSet.has("autoLogin") || componentSet.has("registering") //- script(type="module" src="/lib/sib-auth/index.js" defer) if componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects") - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@5.2" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@5.3" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) if componentSet.has("communities") From 19671ae96f84d997590344cbc2d2ddbd2c8b42a5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 21 Apr 2021 11:02:04 +0000 Subject: [PATCH 10/10] fix: larger timeout and locale fix --- src/locales/en.json | 2 +- src/scripts/timeout-goeswrong.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 955cc4f..9bf13b5 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -280,7 +280,7 @@ "hublStatus": "Public = Public, Private = Private", "success": "Success!", "errors": { - "somethingGoesWrong": "Something goes wrong, try to", + "somethingGoesWrong": "Something went wrong, try to", "reload": "reload" }, "goButton": "GO", diff --git a/src/scripts/timeout-goeswrong.js b/src/scripts/timeout-goeswrong.js index 8df7662..0464b84 100644 --- a/src/scripts/timeout-goeswrong.js +++ b/src/scripts/timeout-goeswrong.js @@ -8,4 +8,4 @@ setTimeout(() => { } } } -}, 10000); \ No newline at end of file +}, 15000); \ No newline at end of file