autonomic-cooperative
/
hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feature: conflict resolved

This commit is contained in:
gaelle morin 2021-01-22 16:26:19 +01:00
parent c2d0b75e54 5461896b4d
commit 8ff5f07d0d
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
38 changed files with 594 additions and 598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cypress/integration/create-channel.spec.js
View File

@ -16,9 +16,9 @@ context('Create Channel Browser Testing', () => {
description = 'Test Description ', description = 'Test Description ',
subtitle = 'Test Subtitle '; subtitle = 'Test Subtitle ';
it('should visit the channel creation screen', () => { it('should visit the channel creation screen', () => {
cy.visit('/admin/admin-circle-create'); cy.visit('/admin-circles-create');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-circle-create'); expect(loc.pathname).to.eq('/admin-circles-create');
}); });
}); });
it('should enter correct channel data', () => { it('should enter correct channel data', () => {
@ -26,20 +26,20 @@ context('Create Channel Browser Testing', () => {
channelName += num; channelName += num;
description += num; description += num;
subtitle += num; subtitle += num;
cy.get('#admin-circle-create input[name="name"]').clear().type(channelName); cy.get('#admin-circles-create input[name="name"]').clear().type(channelName);
cy.get('#admin-circle-create input[name="name"]').should('have.value', channelName); cy.get('#admin-circles-create input[name="name"]').should('have.value', channelName);
cy.get('#admin-circle-create input[name="subtitle"]').clear().type(subtitle); cy.get('#admin-circles-create input[name="subtitle"]').clear().type(subtitle);
cy.get('#admin-circle-create input[name="subtitle"]').should('have.value', subtitle); cy.get('#admin-circles-create input[name="subtitle"]').should('have.value', subtitle);
cy.get('#admin-circle-create [name="description"] [contenteditable="true"]').clear().type(description); cy.get('#admin-circles-create [name="description"] [contenteditable="true"]').clear().type(description);
cy.get('#admin-circle-create [name="description"] [contenteditable="true"]').should('have.value', description); cy.get('#admin-circles-create [name="description"] [contenteditable="true"]').should('have.value', description);
}); });
}); });
it('should click on create channel button', () => { it('should click on create channel button', () => {
cy.get('#admin-circle-create input[type="submit"]').click(); cy.get('#admin-circles-create input[type="submit"]').click();
}); });
it('should land on channels list screen', () => { it('should land on channels list screen', () => {
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin'); expect(loc.pathname).to.eq('/admin-circles');
}); });
}); });
it('should land newly created channel on channels list screen', () => { it('should land newly created channel on channels list screen', () => {
@ -54,9 +54,9 @@ context('Create Channel Browser Testing', () => {
description = 'Test Description ', description = 'Test Description ',
subtitle = 'Test Subtitle '; subtitle = 'Test Subtitle ';
it('should visit the channel creation screen', () => { it('should visit the channel creation screen', () => {
cy.visit('/admin/admin-circle-create'); cy.visit('/admin-circles-create');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-circle-create'); expect(loc.pathname).to.eq('/admin-circles-create');
}); });
}); });
it('should enter correct channel data', () => { it('should enter correct channel data', () => {
@ -64,20 +64,20 @@ context('Create Channel Browser Testing', () => {
channelName += num; channelName += num;
description += num; description += num;
subtitle += num; subtitle += num;
cy.get('#admin-circle-create input[name="name"]').clear().type(channelName); cy.get('#admin-circles-create input[name="name"]').clear().type(channelName);
cy.get('#admin-circle-create input[name="name"]').should('have.value', channelName); cy.get('#admin-circles-create input[name="name"]').should('have.value', channelName);
cy.get('#admin-circle-create input[name="subtitle"]').clear().type(subtitle); cy.get('#admin-circles-create input[name="subtitle"]').clear().type(subtitle);
cy.get('#admin-circle-create input[name="subtitle"]').should('have.value', subtitle); cy.get('#admin-circles-create input[name="subtitle"]').should('have.value', subtitle);
cy.get('#admin-circle-create [name="description"] [contenteditable="true"]').clear().type(description); cy.get('#admin-circles-create [name="description"] [contenteditable="true"]').clear().type(description);
cy.get('#admin-circle-create [name="description"] [contenteditable="true"]').should('have.value', description); cy.get('#admin-circles-create [name="description"] [contenteditable="true"]').should('have.value', description);
}); });
}); });
it('should click on create channel button', () => { it('should click on create channel button', () => {
cy.get('#admin-circle-create input[type="submit"]').click(); cy.get('#admin-circles-create input[type="submit"]').click();
}); });
it('should land on channels list screen', () => { it('should land on channels list screen', () => {
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin'); expect(loc.pathname).to.eq('/admin-circles');
}); });
}); });
it('should land newly created channel on channels list screen', () => { it('should land newly created channel on channels list screen', () => {
@ -92,9 +92,9 @@ context('Create Channel Browser Testing', () => {
description = 'Test Description ', description = 'Test Description ',
subtitle = 'Test Subtitle '; subtitle = 'Test Subtitle ';
it('should visit the channel creation screen', () => { it('should visit the channel creation screen', () => {
cy.visit('/admin/admin-circle-create'); cy.visit('/admin-circles-create');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-circle-create'); expect(loc.pathname).to.eq('/admin-circles-create');
}); });
}); });
it('should enter correct channel data', () => { it('should enter correct channel data', () => {
@ -102,20 +102,20 @@ context('Create Channel Browser Testing', () => {
channelName += num; channelName += num;
description += num; description += num;
subtitle += num; subtitle += num;
cy.get('#admin-circle-create input[name="name"]').clear().type(channelName); cy.get('#admin-circles-create input[name="name"]').clear().type(channelName);
cy.get('#admin-circle-create input[name="name"]').should('have.value', channelName); cy.get('#admin-circles-create input[name="name"]').should('have.value', channelName);
cy.get('#admin-circle-create input[name="subtitle"]').clear().type(subtitle); cy.get('#admin-circles-create input[name="subtitle"]').clear().type(subtitle);
cy.get('#admin-circle-create input[name="subtitle"]').should('have.value', subtitle); cy.get('#admin-circles-create input[name="subtitle"]').should('have.value', subtitle);
cy.get('#admin-circle-create [name="description"] [contenteditable="true"]').clear().type(description); cy.get('#admin-circles-create [name="description"] [contenteditable="true"]').clear().type(description);
cy.get('#admin-circle-create [name="description"] [contenteditable="true"]').should('have.value', description); cy.get('#admin-circles-create [name="description"] [contenteditable="true"]').should('have.value', description);
}); });
}); });
it('should click on create channel button', () => { it('should click on create channel button', () => {
cy.get('#admin-circle-create input[type="submit"]').click(); cy.get('#admin-circles-create input[type="submit"]').click();
}); });
it('should land on channels list screen', () => { it('should land on channels list screen', () => {
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin'); expect(loc.pathname).to.eq('/admin-circles');
}); });
}); });
it('should land newly created channel on channels list screen', () => { it('should land newly created channel on channels list screen', () => {

40
cypress/integration/create-project.spec.js
View File

@ -16,9 +16,9 @@ context('Create Project Browser Testing', () => {
customerName = 'Test Customer ', customerName = 'Test Customer ',
description = 'Test Description '; description = 'Test Description ';
it('should visit the project creation screen', () => { it('should visit the project creation screen', () => {
cy.visit('/admin/admin-projects/admin-project-create'); cy.visit('/admin-projects-create');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-projects/admin-project-create'); expect(loc.pathname).to.eq('/admin-projects-create');
}); });
}); });
it('should enter correct project data', () => { it('should enter correct project data', () => {
@ -26,20 +26,20 @@ context('Create Project Browser Testing', () => {
projectName += num; projectName += num;
customerName += num; customerName += num;
description += num; description += num;
cy.get('#admin-project-create input[name="customer.name"]').clear().type(customerName); cy.get('#admin-projects-create input[name="customer.name"]').clear().type(customerName);
cy.get('#admin-project-create input[name="customer.name"]').should('have.value', customerName); cy.get('#admin-projects-create input[name="customer.name"]').should('have.value', customerName);
cy.get('#admin-project-create input[name="name"]').clear().type(projectName); cy.get('#admin-projects-create input[name="name"]').clear().type(projectName);
cy.get('#admin-project-create input[name="name"]').should('have.value', projectName); cy.get('#admin-projects-create input[name="name"]').should('have.value', projectName);
cy.get('#admin-project-create [name="description"] [contenteditable="true"]').clear().type(description); cy.get('#admin-projects-create [name="description"] [contenteditable="true"]').clear().type(description);
cy.get('#admin-project-create [name="description"] [contenteditable="true"]').should('have.value', description); cy.get('#admin-projects-create [name="description"] [contenteditable="true"]').should('have.value', description);
}); });
}); });
it('should click on create project button', () => { it('should click on create project button', () => {
cy.get('#admin-project-create input[type="submit"]').click(); cy.get('#admin-projects-create input[type="submit"]').click();
}); });
it('should land on projects list screen', () => { it('should land on projects list screen', () => {
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-projects'); expect(loc.pathname).to.eq('/admin-projects');
}); });
}); });
it('should land newly created project on projects list screen', () => { it('should land newly created project on projects list screen', () => {
@ -54,9 +54,9 @@ context('Create Project Browser Testing', () => {
customerName = 'Test Customer ', customerName = 'Test Customer ',
description = 'Test Description '; description = 'Test Description ';
it('should visit the project creation screen', () => { it('should visit the project creation screen', () => {
cy.visit('/admin/admin-projects/admin-project-create'); cy.visit('/admin-projects-create');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-projects/admin-project-create'); expect(loc.pathname).to.eq('/admin-projects-create');
}); });
}); });
it('should enter correct project data', () => { it('should enter correct project data', () => {
@ -64,20 +64,20 @@ context('Create Project Browser Testing', () => {
projectName += num; projectName += num;
customerName += num; customerName += num;
description += num; description += num;
cy.get('#admin-project-create input[name="customer.name"]').clear().type(customerName); cy.get('#admin-projects-create input[name="customer.name"]').clear().type(customerName);
cy.get('#admin-project-create input[name="customer.name"]').should('have.value', customerName); cy.get('#admin-projects-create input[name="customer.name"]').should('have.value', customerName);
cy.get('#admin-project-create input[name="name"]').clear().type(projectName); cy.get('#admin-projects-create input[name="name"]').clear().type(projectName);
cy.get('#admin-project-create input[name="name"]').should('have.value', projectName); cy.get('#admin-projects-create input[name="name"]').should('have.value', projectName);
cy.get('#admin-project-create [name="description"] [contenteditable="true"]').clear().type(description); cy.get('#admin-projects-create [name="description"] [contenteditable="true"]').clear().type(description);
cy.get('#admin-project-create [name="description"] [contenteditable="true"]').should('have.value', description); cy.get('#admin-projects-create [name="description"] [contenteditable="true"]').should('have.value', description);
}); });
}); });
it('should click on create project button', () => { it('should click on create project button', () => {
cy.get('#admin-project-create input[type="submit"]').click(); cy.get('#admin-projects-create input[type="submit"]').click();
}); });
it('should land on projects list screen', () => { it('should land on projects list screen', () => {
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-projects'); expect(loc.pathname).to.eq('/admin-projects');
}); });
}); });
it('should land newly created project on projects list screen', () => { it('should land newly created project on projects list screen', () => {

6
cypress/integration/create-user.spec.js
View File

@ -25,9 +25,9 @@
// it('should login', () => cy.login()); // it('should login', () => cy.login());
// describe('User Creation process', () => { // describe('User Creation process', () => {
// it('should visit the user creation screen', () => { // it('should visit the user creation screen', () => {
// cy.visit('/admin/admin-users/admin-users-create'); // cy.visit('/admin-users-create');
// cy.location().should((loc) => { // cy.location().should((loc) => {
// expect(loc.pathname).to.eq('/admin/admin-users/admin-users-create'); // expect(loc.pathname).to.eq('/admin-users-create');
// }); // });
// }); // });
// it('should enter correct user data', () => { // it('should enter correct user data', () => {
@ -45,7 +45,7 @@
// }); // });
// it('should land on users list screen', () => { // it('should land on users list screen', () => {
// cy.location().should((loc) => { // cy.location().should((loc) => {
// expect(loc.pathname).to.eq('/admin/admin-users'); // expect(loc.pathname).to.eq('/admin-users');
// }); // });
// }); // });
// it('should land newly created user on users list screen', () => { // it('should land newly created user on users list screen', () => {

4
cypress/integration/delete-channel.spec.js
View File

@ -24,9 +24,9 @@ context('Delete Channel Browser Testing', () => {
describe('Channel Retirement process', () => { describe('Channel Retirement process', () => {
let channelsLength; let channelsLength;
it('should visit the channels list screen', () => { it('should visit the channels list screen', () => {
cy.visit('/admin'); cy.visit('/admin-circles');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin'); expect(loc.pathname).to.eq('/admin-circles');
}); });
}); });
it('should visit the last channel edit screen', () => { it('should visit the last channel edit screen', () => {

4
cypress/integration/edit-channel.spec.js
View File

@ -24,9 +24,9 @@ context('Edit Channel Browser Testing', () => {
it('should login', () => cy.login()); it('should login', () => cy.login());
describe('Channel Edition process', () => { describe('Channel Edition process', () => {
it('should visit the channel list screen', () => { it('should visit the channel list screen', () => {
cy.visit('/admin'); cy.visit('/admin-circles');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin'); expect(loc.pathname).to.eq('/admin-circles');
}); });
}); });
it('should visit the last channel edit screen', () => { it('should visit the last channel edit screen', () => {

4
cypress/integration/edit-project.spec.js
View File

@ -26,9 +26,9 @@ context('Edit Project Browser Testing', () => {
it('should login', () => cy.login()); it('should login', () => cy.login());
describe('Project Edition process', () => { describe('Project Edition process', () => {
it('should visit the project list screen', () => { it('should visit the project list screen', () => {
cy.visit('/admin/admin-projects'); cy.visit('/admin-projects');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-projects'); expect(loc.pathname).to.eq('/admin-projects');
}); });
}); });
it('should visit the last project edit screen', () => { it('should visit the last project edit screen', () => {

4
cypress/integration/leave-channel.spec.js
View File

@ -24,9 +24,9 @@ context('Leave Channel Browser Testing', () => {
it('should login', () => cy.login()); it('should login', () => cy.login());
describe('Channel Leaving process', () => { describe('Channel Leaving process', () => {
it('should visit the channels list screen', () => { it('should visit the channels list screen', () => {
cy.visit('/admin'); cy.visit('/admin-circles');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin'); expect(loc.pathname).to.eq('/admin-circles');
}); });
}); });
it('should click the last channel leave button', () => { it('should click the last channel leave button', () => {

4
cypress/integration/leave-project.spec.js
View File

@ -24,9 +24,9 @@ context('Leave Project Browser Testing', () => {
it('should login', () => cy.login()); it('should login', () => cy.login());
describe('Project Leaving process', () => { describe('Project Leaving process', () => {
it('should visit the projects list screen', () => { it('should visit the projects list screen', () => {
cy.visit('/admin/admin-projects'); cy.visit('/admin-projects');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-projects'); expect(loc.pathname).to.eq('/admin-projects');
}); });
}); });
it('should click the last project leave button', () => { it('should click the last project leave button', () => {

4
cypress/integration/retire-channel.spec.js
View File

@ -24,9 +24,9 @@ context('Retire Channel Browser Testing', () => {
describe('Channel Retirement process', () => { describe('Channel Retirement process', () => {
let channelsLength; let channelsLength;
it('should visit the channels list screen', () => { it('should visit the channels list screen', () => {
cy.visit('/admin'); cy.visit('/admin-circles');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin'); expect(loc.pathname).to.eq('/admin-circles');
}); });
}); });
it('should visit the last channel edit screen', () => { it('should visit the last channel edit screen', () => {

4
cypress/integration/retire-project.spec.js
View File

@ -24,9 +24,9 @@ context('Retire Project Browser Testing', () => {
describe('Project Retirement process', () => { describe('Project Retirement process', () => {
let projectsLength; let projectsLength;
it('should visit the projects list screen', () => { it('should visit the projects list screen', () => {
cy.visit('/admin/admin-projects'); cy.visit('/admin-projects');
cy.location().should((loc) => { cy.location().should((loc) => {
expect(loc.pathname).to.eq('/admin/admin-projects'); expect(loc.pathname).to.eq('/admin-projects');
}); });
}); });
it('should visit the last project edit screen', () => { it('should visit the last project edit screen', () => {

10
cypress/integration/signin.spec.js
View File

@ -58,12 +58,12 @@ context('Browser testing', () => {
// it('should navigate the Administration from left menu', () => { // it('should navigate the Administration from left menu', () => {
// cy.get('.create > solid-link').click(); // cy.get('.create > solid-link').click();
// cy.get('#admin-circles > .content-box > .content-box__header > .without-margin').contains('Administration'); // cy.get('#admin-circles > .content-box > .content-box__header > .without-margin').contains('Administration');
// cy.get('#admin-circle-list > .content-box__info > .admin-header > .admin-header__title').contains('Circles'); // cy.get('#admin-circles > .content-box__info > .admin-header > .admin-header__title').contains('Circles');
// }); // });
// it('should navigate to Circle creation', () => { // it('should navigate to Circle creation', () => {
// cy.get('#admin-circle-list > .content-box__info > .admin-header > .button').click(); // cy.get('#admin-circles > .content-box__info > .admin-header > .button').click();
// cy.location().should((loc) => { // cy.location().should((loc) => {
// expect(loc.pathname).to.contain('admin-circle-create'); // expect(loc.pathname).to.contain('admin-circles-create');
// }); // });
// }); // });
// var name = new Uint32Array(1); // var name = new Uint32Array(1);
@ -72,8 +72,8 @@ context('Browser testing', () => {
// it('should allow Circle Creation', () => { // it('should allow Circle Creation', () => {
// cy.get('form > solid-form-label-text[name="name"] > label > input').type(name); // cy.get('form > solid-form-label-text[name="name"] > label > input').type(name);
// cy.get('.content-box__info > solid-form > form > solid-form-label-text[name="description"] > label > input').type('With a great description!'); // cy.get('.content-box__info > solid-form > form > solid-form-label-text[name="description"] > label > input').type('With a great description!');
// cy.get('#admin-circle-create > .content-box__info > solid-form > form > [type="submit"]').click(); // cy.get('#admin-circles-create > .content-box__info > solid-form > form > [type="submit"]').click();
// cy.get('#admin-circle-list > div > div.table > solid-display').contains(name); // cy.get('#admin-circles > div > div.table > solid-display').contains(name);
// }); // });
// it('should open the circle information page', () => { // it('should open the circle information page', () => {
// cy.screenshot(); // cy.screenshot();

17
package-lock.json generated
View File

@ -2271,11 +2271,18 @@
"sha.js": "^2.4.8" "sha.js": "^2.4.8"
} }
}, },
"cross-env": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
"integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
"requires": {
"cross-spawn": "^7.0.1"
}
},
"cross-spawn": { "cross-spawn": {
"version": "7.0.3", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"dev": true,
"requires": { "requires": {
"path-key": "^3.1.0", "path-key": "^3.1.0",
"shebang-command": "^2.0.0", "shebang-command": "^2.0.0",
@ -2286,7 +2293,6 @@
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true,
"requires": { "requires": {
"shebang-regex": "^3.0.0" "shebang-regex": "^3.0.0"
} }
@ -2294,14 +2300,12 @@
"shebang-regex": { "shebang-regex": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
"dev": true
}, },
"which": { "which": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": { "requires": {
"isexe": "^2.0.0" "isexe": "^2.0.0"
} }
@ -5273,8 +5277,7 @@
"path-key": { "path-key": {
"version": "3.1.1", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
"dev": true
}, },
"path-parse": { "path-parse": {
"version": "1.0.6", "version": "1.0.6",

3
package.json
View File

@ -8,7 +8,7 @@
}, },
"scripts": { "scripts": {
"prebuild": "rimraf build", "prebuild": "rimraf build",
"build": "NODE_ENV='production' node internal/parcel.js", "build": "cross-env NODE_ENV='production' node internal/parcel.js",
"watch": "rimraf build .cache && node internal/parcel.js", "watch": "rimraf build .cache && node internal/parcel.js",
"cypress:open": "cypress open", "cypress:open": "cypress open",
"cypress:verify": "cypress verify", "cypress:verify": "cypress verify",
@ -46,6 +46,7 @@
}, },
"dependencies": { "dependencies": {
"@startinblox/hubl-styling-framework": "^1.4.15", "@startinblox/hubl-styling-framework": "^1.4.15",
"cross-env": "^7.0.3",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"parcel-bundler": "^1.12.4", "parcel-bundler": "^1.12.4",

12
src/index.pug
View File

@ -38,19 +38,19 @@ html(lang="en")
script(src="index.js" defer) script(src="index.js" defer)
body body.notLoggedIn.bg-color-grey(style='visibility:hidden;')
if endpoints.get && endpoints.post if endpoints.get && endpoints.post
//- include views/partials/notifications.pug include views/partials/notifications.pug
include views/partials/widgets.pug include views/partials/widgets.pug
header#header.segment.full.padding-left-large.padding-right-large.sm-padding-right-xsmall.sm-padding-left-small.shadow-small.text-disable-selection header#header.segment.full.padding-left-large.padding-right-large.sm-padding-right-xsmall.sm-padding-left-small.shadow-small.text-disable-selection.bg-color-white
include views/partials/header.pug include views/partials/header.pug
nav#main__menu.scrollbar-nav.segment.bg-color-heading.text-top.quarter.jsLeftMenu nav#main__menu.scrollbar-nav.segment.bg-color-heading.text-top.quarter.text-disable-selection.jsLeftMenu
include views/partials/menu-left.pug include views/partials/menu-left.pug
main#content.segment.three-quarter.sm-full.text-top.notLoggedIn main#content.segment.three-quarter.sm-full.text-top
if endpoints.get.dashboards if endpoints.get.dashboards
#dashboard(hidden, data-view="dashboard").scrollbar-content #dashboard(hidden, data-view="dashboard").scrollbar-content
@ -101,7 +101,7 @@ html(lang="en")
#resources(hidden, data-view="resources") #resources(hidden, data-view="resources")
include views/page-resources.pug include views/page-resources.pug
#admin(hidden, data-view="admin", no-render).with-sidebar.whitespace-normal #admin
include views/page-admin.pug include views/page-admin.pug
#about(hidden, data-view="about", no-render) #about(hidden, data-view="about", no-render)

112
src/scripts/firefox-scroll.js
View File

@ -1,60 +1,60 @@
document.addEventListener("DOMContentLoaded", () => { // document.addEventListener("DOMContentLoaded", () => {
const resizeChat = () => { // const resizeChat = () => {
let isMobile = window.innerWidth < 993; // let isMobile = window.innerWidth < 993;
let isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1; // let isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
let isFirefoxMobile = navigator.platform.toLowerCase().indexOf("mobile") > -1 || navigator.platform.toLowerCase().indexOf("tablet") > -1; // let isFirefoxMobile = navigator.platform.toLowerCase().indexOf("mobile") > -1 || navigator.platform.toLowerCase().indexOf("tablet") > -1;
let chatBox = Array.from(document.querySelectorAll("solid-xmpp-chat")) // let chatBox = Array.from(document.querySelectorAll("solid-xmpp-chat"))
.map((el) => el.shadowRoot ? el.shadowRoot.getElementById("conversejs") : false) // .map((el) => el.shadowRoot ? el.shadowRoot.getElementById("conversejs") : false)
.filter((el) => el) // .filter((el) => el)
.pop(); // .pop();
if (chatBox) { // if (chatBox) {
let chatTextArea = chatBox.querySelector(".message-form-container"); // let chatTextArea = chatBox.querySelector(".message-form-container");
let ischatTextArea = setInterval(() => { // let ischatTextArea = setInterval(() => {
chatTextArea = chatBox.querySelector(".message-form-container"); // chatTextArea = chatBox.querySelector(".message-form-container");
if (chatTextArea) { // if (chatTextArea) {
clearInterval(ischatTextArea); // clearInterval(ischatTextArea);
if ( // if (
chatBox.getBoundingClientRect().height - // chatBox.getBoundingClientRect().height -
chatTextArea.getBoundingClientRect().height != // chatTextArea.getBoundingClientRect().height !=
chatTextArea.offsetTop // chatTextArea.offsetTop
) { // ) {
let viewportChat = Array.from( // let viewportChat = Array.from(
document.querySelectorAll("#viewport .chat-view") // document.querySelectorAll("#viewport .chat-view")
); // );
viewportChat.forEach( // viewportChat.forEach(
(c) => (c.style.height = isMobile ? (isFirefox && isFirefoxMobile) ? "calc(100vh - 106px - 57px)" : "calc(100vh - 106px)" : "calc(100vh - 64px - 83px)") // (c) => (c.style.height = isMobile ? (isFirefox && isFirefoxMobile) ? "calc(100vh - 106px - 57px)" : "calc(100vh - 106px)" : "calc(100vh - 64px - 83px)")
); // );
} // }
} // }
}, 15); // }, 15);
} // }
}; // };
resizeChat(); // resizeChat();
let isbody = setInterval(() => { // let isbody = setInterval(() => {
if (document.body) { // if (document.body) {
clearInterval(isbody); // clearInterval(isbody);
resizeChat(); // resizeChat();
} // }
}, 50); // }, 50);
window.addEventListener("load", () => { // window.addEventListener("load", () => {
setTimeout(() => { // setTimeout(() => {
resizeChat(); // resizeChat();
}, 0); // }, 0);
}); // });
let windowResizing; // let windowResizing;
window.addEventListener("resize", () => { // window.addEventListener("resize", () => {
windowResizing = setTimeout(() => { // windowResizing = setTimeout(() => {
clearInterval(windowResizing); // clearInterval(windowResizing);
resizeChat(); // resizeChat();
}, 50); // }, 50);
}); // });
document.addEventListener("navigate", () => { // document.addEventListener("navigate", () => {
setTimeout(() => { // setTimeout(() => {
resizeChat(); // resizeChat();
}, 0); // }, 0);
}); // });
}); // });

10
src/scripts/keyboard-shortcuts.js
View File

@ -1,10 +0,0 @@
document.addEventListener("keydown", function (e) {
/*
CTRL + K : Focus on the user search
Keycode 75
*/
if(e.ctrlKey && e.which == 75) {
document.querySelector('hubl-search-users > input').focus();
e.preventDefault();
}
});

3
src/scripts/login-element-visibility.js
View File

@ -7,9 +7,6 @@ document.addEventListener("DOMContentLoaded", function () {
document document
.querySelectorAll(".notLoggedIn") .querySelectorAll(".notLoggedIn")
.forEach(el => (el.style.visibility = "visible")); .forEach(el => (el.style.visibility = "visible"));
document
.querySelector('.loggedIn')
.setAttribute("style", "display:none !important");
} }
}); });
}); });

11
src/scripts/menu-toggle.js
View File

@ -1,11 +0,0 @@
document.addEventListener("DOMContentLoaded", () => {
const menuWrappers = Array.from(document.querySelectorAll(".menu-wrapper"));
//- Toggle sub-menus
menuWrappers.forEach(menuWrapper => {
const menu = menuWrapper.querySelector(".menu");
menu.addEventListener("click", e => {
menuWrapper.classList.toggle("is-closed");
});
});
});

45
src/scripts/navigate-event.js
View File

@ -1,7 +1,7 @@
// auxiliary function closes the user profile menu // auxiliary function closes the user profile menu
function closeUserControls() { function closeUserControls() {
let userControls = document.querySelector("#user-controls"); let userControls = Array.from(document.querySelectorAll(".user-controls"));
if (userControls) userControls.removeAttribute("open"); userControls.forEach(e => e.removeAttribute("open"));
} }
function closeLeftMenu() { function closeLeftMenu() {
@ -15,6 +15,10 @@ function closeUserControls() {
Array.from(document.querySelectorAll(".views-container")).forEach(vC => Array.from(document.querySelectorAll(".views-container")).forEach(vC =>
vC.classList.toggle("sidebar-is-closed") vC.classList.toggle("sidebar-is-closed")
); );
Array.from(document.querySelectorAll(".jsOffsiteToggle")).forEach(el => {
el.querySelector('.text-right').setAttribute('hidden', '');
el.querySelector('.text-left').removeAttribute('hidden');
});
Array.from(rightMenu).forEach(el => el.removeAttribute("open")); Array.from(rightMenu).forEach(el => el.removeAttribute("open"));
} }
} }
@ -22,6 +26,10 @@ function closeUserControls() {
function openRightMenu() { function openRightMenu() {
let rightMenu = document.querySelectorAll(".jsRightMenu"); let rightMenu = document.querySelectorAll(".jsRightMenu");
Array.from(rightMenu).forEach(el => el.setAttribute("open", "")); Array.from(rightMenu).forEach(el => el.setAttribute("open", ""));
Array.from(document.querySelectorAll(".jsOffsiteToggle")).forEach(el => {
el.querySelector('.text-left').setAttribute('hidden', '');
el.querySelector('.text-right').removeAttribute('hidden');
});
Array.from(document.querySelectorAll(".views-container")).forEach(vC => Array.from(document.querySelectorAll(".views-container")).forEach(vC =>
vC.classList.toggle("sidebar-is-closed") vC.classList.toggle("sidebar-is-closed")
); );
@ -30,13 +38,39 @@ function closeUserControls() {
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
//- View change event //- View change event
window.addEventListener("navigate", () => { window.addEventListener("navigate", e => {
if(e.detail.route.startsWith('admin-')) {
document.querySelector('.only-on-admin').removeAttribute('hidden');
} else {
document.querySelector('.only-on-admin').setAttribute('hidden','');
}
if(e.detail.route.startsWith("admin-communities")) {
document.querySelector('solid-route[name="admin-communities"]').setAttribute('active','');
document.querySelector('.jsRightMenu solid-link[next="admin-communities"]').setAttribute('active','');
} else {
document.querySelector('solid-route[name="admin-communities"]').removeAttribute('active');
document.querySelector('.jsRightMenu solid-link[next="admin-communities"]').removeAttribute('active');
}
if(e.detail.route.startsWith("admin-circles")) {
document.querySelector('solid-route[name="admin-circles"]').setAttribute('active','');
document.querySelector('.jsRightMenu solid-link[next="admin-circles"]').setAttribute('active','');
} else {
document.querySelector('solid-route[name="admin-circles"]').removeAttribute('active');
document.querySelector('.jsRightMenu solid-link[next="admin-circles"]').removeAttribute('active');
}
if(e.detail.route.startsWith("admin-projects")) {
document.querySelector('solid-route[name="admin-projects"]').setAttribute('active','');
document.querySelector('.jsRightMenu solid-link[next="admin-projects"]').setAttribute('active','');
} else {
document.querySelector('solid-route[name="admin-projects"]').removeAttribute('active');
document.querySelector('.jsRightMenu solid-link[next="admin-projects"]').removeAttribute('active');
}
closeLeftMenu(); closeLeftMenu();
closeUserControls(); closeUserControls();
}); });
// Document -> close menu // Document -> close menu
document.addEventListener("click", event => { document.addEventListener("click", event => {
if (!event.target.closest("#user-controls")) { if (!event.target.closest(".user-controls")) {
closeUserControls(); closeUserControls();
} }
if ( if (
@ -46,8 +80,7 @@ document.addEventListener("DOMContentLoaded", function() {
closeLeftMenu(); closeLeftMenu();
} }
if ( if (
!event.target.className.includes("jsMobileSidebarOpenButton") && !event.target.closest(".jsOffsiteToggle")
!event.target.className.includes("jsOffsiteToggle")
) { ) {
closeRightMenu(); closeRightMenu();
} }

7
src/styles/content/_index.scss
View File

@ -71,6 +71,13 @@ main {
/* Styles use with JS to open/close the sidebar */ /* Styles use with JS to open/close the sidebar */
&.jsRightMenu { &.jsRightMenu {
display: block; display: block;
solid-link[active] {
color: white;
background: var(--color-heading);
}
solid-link:not([active]):hover {
background: #e4e4e4;
}
} }
&.jsRightMenu:not([open]) { &.jsRightMenu:not([open]) {

29
src/styles/header/_index.scss
View File

@ -46,13 +46,14 @@ header {
} }
.solid-notifications__button { .solid-notifications__button {
margin-top: -9px;
font-size: 24px; font-size: 24px;
&::before { &::before {
margin-left: 0; margin-left: -9px;
} }
&:hover { &:hover, &:focus {
background: white; background: white;
} }
@ -61,7 +62,7 @@ header {
} }
.solid-notifications__counter { .solid-notifications__counter {
left: 21px; left: 12px;
position: absolute; position: absolute;
top: 1px; top: 1px;
@ -170,7 +171,7 @@ header {
.solid-notification__avatar { .solid-notification__avatar {
align-items: center; align-items: center;
background: var(--color-grey); background: #f6f6f6;
display: flex; display: flex;
height: 35px; height: 35px;
justify-content: center; justify-content: center;
@ -182,7 +183,7 @@ header {
width: 35px; width: 35px;
img { img {
background-color: var(--color-grey); background-color: #f6f6f6;
height: 100%; height: 100%;
object-fit: cover; object-fit: cover;
object-position: center center; object-position: center center;
@ -400,4 +401,22 @@ header {
} }
} }
} }
.solid-notifications__item:hover * {
color: var(--color-secondary)!important;
}
.solid-notification__content {
max-width: calc(100% - 65px);
}
.solid-notification__summary {
text-overflow: ellipsis;
display: block;
width: 100%;
}
.solid-notification__title {
overflow: hidden;
white-space: break-spaces;
text-overflow: ellipsis;
display: block;
width: 100%;
}
} }

75
src/styles/index.scss
View File

@ -6,68 +6,6 @@ solid-display>div {
display: contents !important; display: contents !important;
} }
/*.segment {
&.quarter {
width: 25%;
}
&.third {
width: 33.333%;
}
&.half {
width: 50%;
}
&.two-third {
width: 66.666%;
}
&.three-quarter {
width: 75%;
}
&.full {
width: 100%;
}
&.auto {
width: auto;
}
&.children {
&-quarter>div>solid-display {
width: 25%;
}
&-third>div>solid-display {
width: 33.333%;
}
&-half>div>solid-display {
width: 50%;
}
&-two-third>div>solid-display {
width: 66.666%;
}
&-three-quarter>div>solid-display {
width: 75%;
}
&-full>div>solid-display {
width: 100%;
}
&-auto>div>solid-display {
width: auto;
}
}
}*/
@import 'header/_index'; @import 'header/_index';
@import 'left-nav/_index'; @import 'left-nav/_index';
@import 'content/_index'; @import 'content/_index';
@ -76,3 +14,16 @@ solid-display>div {
@import 'profile/_index'; @import 'profile/_index';
@import 'job-offers/_index'; @import 'job-offers/_index';
@import 'chat/_index'; @import 'chat/_index';
nav#main__menu {
width: 250px;
}
main#content {
width: calc(100% - 250px);
}
.text-ellipsis {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

75
src/views/page-admin.pug
View File

@ -1,31 +1,44 @@
.scrollbar-content.views-container.sidebar-is-closed .with-sidebar.whitespace-normal.bg-color-white.only-on-admin(hidden)
if endpoints.circles || (endpoints.get && endpoints.get.circles) .scrollbar-content.views-container.sidebar-is-closed
#admin-circles(hidden, data-view="admin-circles") if endpoints.circles || (endpoints.get && endpoints.get.circles)
include partials/admin/page-admin-circles.pug #admin-circles(hidden, data-view="admin-circles", no-render)
if endpoints.projects || (endpoints.get && endpoints.get.projects) include partials/admin/page-admin-circles.pug
#admin-projects(hidden, data-view="admin-projects") #circle-left(hidden, data-view="circle-left", no-render)
include partials/admin/page-admin-projects.pug include partials/circle/page-circle-left.pug
if (endpoints.users || (endpoints.get && endpoints.get.users)) #admin-circles-create(hidden, data-view="admin-circles-create", no-render)
#admin-communities(hidden, data-view="admin-communities") include partials/admin/page-admin-circles-create.pug
include partials/admin/page-admin-communities.pug if endpoints.projects || (endpoints.get && endpoints.get.projects)
nav.jsRightMenu.sidebar.whitespace-normal(role='navigation') #admin-projects(hidden, data-view="admin-projects", no-render)
solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='admin-circles') include partials/admin/page-admin-projects.pug
ul #admin-projects-create(hidden, data-view="admin-projects-create", no-render)
li.segment.full.padding-small.text-right.text-normal.jsOffsiteToggle include partials/admin/page-admin-projects-create.pug
span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall #project-left(hidden, data-view="project-left", no-render)
a(data-trans='admin.menuRight.fold') include partials/project/page-project-left.pug
if (endpoints.users || (endpoints.get && endpoints.get.users)) if (endpoints.users || (endpoints.get && endpoints.get.users))
solid-route.segment.full(name='admin-communities') #admin-communities(hidden, data-view="admin-communities")
li.segment.full.padding-medium include partials/admin/page-admin-communities.pug
span.icon.ci-networking.icon-xlarge.margin-right-medium #admin-users-create(hidden, data-view="admin-users-create", no-render)
a(data-trans='admin.menuRight.community') include partials/admin/page-admin-users-create.pug
if endpoints.circles || (endpoints.get && endpoints.get.circles) nav.jsRightMenu.text-disable-selection.sidebar.whitespace-normal(role='navigation')
solid-route.segment.full(name='admin-circles') .segment.whitespace-normal.text-color-heading.text-bold
li.segment.full.padding-medium ul
span.icon.ci-bubble-add.icon-xlarge.margin-right-medium li.segment.full.padding-small.text-normal.jsOffsiteToggle
a(data-trans='admin.menuRight.circles') span.icon.icon-arrow-left.icon-xsmall.margin-left-xxsmall.text-left
if endpoints.projects || (endpoints.get && endpoints.get.projects) span.text-right(hidden, style='float:right;')
solid-route.segment.full(name='admin-projects') span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall
li.segment.full.padding-medium a(data-trans='admin.menuRight.fold')
span.icon.ci-add.icon-xlarge.margin-right-medium if (endpoints.users || (endpoints.get && endpoints.get.users))
a(data-trans='admin.menuRight.projects') solid-link.segment.full(next='admin-communities')
li.segment.full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.community')
if endpoints.circles || (endpoints.get && endpoints.get.circles)
solid-link.segment.full(next='admin-circles')
li.segment.full.padding-medium
span.icon.ci-bubble-add.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.circles')
if endpoints.projects || (endpoints.get && endpoints.get.projects)
solid-link.segment.full(next='admin-projects')
li.segment.full.padding-medium
span.icon.ci-add.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.projects')

12
src/views/page-circle.pug
View File

@ -1,4 +1,4 @@
.scrollbar-content.views-container.sidebar-is-closed .scrollbar-content.views-container.sidebar-is-closed.bg-color-white
solid-ac-checker(permission='acl:Read', bind-resources) solid-ac-checker(permission='acl:Read', bind-resources)
#circle-chat(hidden, data-view="circle-chat") #circle-chat(hidden, data-view="circle-chat")
include partials/circle/page-circle-chat.pug include partials/circle/page-circle-chat.pug
@ -11,12 +11,14 @@
#circle-polls(hidden, data-view="circle-polls") #circle-polls(hidden, data-view="circle-polls")
include partials/circle/page-circle-polls.pug include partials/circle/page-circle-polls.pug
nav.jsRightMenu.sidebar.whitespace-normal(role='navigation') nav.jsRightMenu.text-disable-selection.sidebar.whitespace-normal(role='navigation')
solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='circle-chat') solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='circle-chat')
ul ul
li.segment.full.padding-small.text-right.text-normal.jsOffsiteToggle li.segment.full.padding-small.text-normal.jsOffsiteToggle
span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall span.icon.icon-arrow-left.icon-xsmall.margin-left-xxsmall.text-left
a(data-trans='circle.menuRight.fold') span.text-right(hidden, style='float:right;')
span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall
a(data-trans='circle.menuRight.fold')
solid-route.segment.full(name='circle-chat') solid-route.segment.full(name='circle-chat')
li.segment.full.padding-medium li.segment.full.padding-medium
span.icon.ci-chat.icon-xlarge.margin-right-medium span.icon.ci-chat.icon-xlarge.margin-right-medium

2
src/views/page-messages.pug
View File

@ -1,4 +1,4 @@
div.segment.full.padding-top-small.padding-right-large.padding-bottom-small.padding-left-large.sm-padding-xsmall.border-bottom.border-color-grey.whitespace-normal div.segment.full.padding-top-small.padding-right-large.padding-bottom-small.padding-left-large.sm-padding-xsmall.border-bottom.border-color-grey.whitespace-normal.bg-color-white
solid-display.labelled-avatar.small( solid-display.labelled-avatar.small(
bind-resources bind-resources
fields='segment1(account.picture), segment2(name, hyphen, at, username)' fields='segment1(account.picture), segment2(name, hyphen, at, username)'

12
src/views/page-project.pug
View File

@ -1,4 +1,4 @@
.scrollbar-content.views-container.sidebar-is-closed .scrollbar-content.views-container.sidebar-is-closed.bg-color-white
solid-ac-checker(permission='acl:Read', bind-resources) solid-ac-checker(permission='acl:Read', bind-resources)
#project-chat(hidden, data-view="project-chat") #project-chat(hidden, data-view="project-chat")
include partials/project/page-project-chat.pug include partials/project/page-project-chat.pug
@ -7,12 +7,14 @@
#project-picture(hidden, data-view="project-picture") #project-picture(hidden, data-view="project-picture")
include partials/project/page-project-picture.pug include partials/project/page-project-picture.pug
nav.jsRightMenu.sidebar.whitespace-normal(role='navigation') nav.jsRightMenu.text-disable-selection.sidebar.whitespace-normal(role='navigation')
solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='project-chat') solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='project-chat')
ul ul
li.segment.full.padding-small.text-right.text-normal.jsOffsiteToggle li.segment.full.padding-small.text-normal.jsOffsiteToggle
span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall span.icon.icon-arrow-left.icon-xsmall.margin-left-xxsmall.text-left
a(data-trans='project.menuRight.fold') span.text-right(hidden, style='float:right;')
span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall
a(data-trans='project.menuRight.fold')
solid-route.segment.full(name='project-chat') solid-route.segment.full(name='project-chat')
li.segment.full.padding-medium li.segment.full.padding-medium
span.icon.ci-chat.icon-xlarge.margin-right-medium span.icon.ci-chat.icon-xlarge.margin-right-medium

2
src/views/partials/admin/page-admin-circles-create.pug
View File

@ -2,7 +2,7 @@ div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-p
div.segment.half.sm-full div.segment.half.sm-full
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title') h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title')
div.segment.half.sm-hidden.text-right div.segment.half.sm-hidden.text-right
solid-link(class="backlink", bind-resources, next='admin-circle-list' data-trans='circle.create.backlink') solid-link(class="backlink", bind-resources, next='admin-circles' data-trans='circle.create.backlink')
div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div#loader-circles-create.loader.loader-top div#loader-circles-create.loader.loader-top

225
src/views/partials/admin/page-admin-circles.pug
View File

@ -1,137 +1,124 @@
solid-router(default-route='admin-circle-list', hidden) solid-widget(name='hubl-circle-owner')
solid-route(name='admin-circle-list') template
solid-route(name='admin-circle-create') solid-display.labelled-avatar.two-lines(
solid-route(name='circle-left') data-src='${await value}'
fields='segment1(account.picture), segment2(line1(name), line2(at, username))'
#circle-left(hidden, data-view="circle-left") class-segment1='segment'
include ../circle/page-circle-left.pug class-account.picture='avatar'
#admin-circle-list(hidden, data-view="admin-circle-list") class-segment2='segment three-quarter margin-left-xsmall'
class-line1='segment block'
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='segment block text-xsmall'
solid-widget(name='hubl-circle-owner') widget-account.picture='hubl-user-avatar'
template
solid-display.labelled-avatar.two-lines(
data-src='${await value}'
fields='segment1(account.picture), segment2(line1(name), line2(at, username))'
class-segment1='segment' value-at='@'
class-account.picture='avatar' )
class-segment2='segment three-quarter margin-left-xsmall' div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
class-line1='segment block' h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title')
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='segment block text-xsmall'
widget-account.picture='hubl-user-avatar' div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespace-normal
value-at='@' div#loader-admin-circles.loader.loader-top
div
div
div
div
div.segment.full.margin-bottom-xlarge.whitespace-normal
div.segment.half.sm-full
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='circle.list.subTitle')
div.segment.half.sm-full.text-right
solid-ac-checker(data-src=`${endpoints.circles || (endpoints.post && endpoints.post.circles)}`, permission='acl:Append')
solid-link(
class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus'
next='admin-circles-create'
data-trans='circle.list.buttonCreate'
)
.segment.table-wrapper
.table
div.table-header.bg-color-third.text-color-heading
div.segment.table-cell.third(data-trans='circle.list.tableHeader1')
div.segment.table-cell.third(data-trans='circle.list.tableHeader2')
div.segment.table-cell.third(data-trans='circle.list.tableHeader3')
solid-widget(name='hubl-admin-circle-leave-button')
template
solid-delete(
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}"
data-label=''
data-trans='data-label=circle.list.buttonQuit'
)
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="circles" target-src='${src}')
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${src}`)
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${src}`)
solid-display(
class='table-body'
bind-user
nested-field='circles'
fields='cell1(circle.name, circle.subtitle), cell2(circle.owner), cell3(leaveButton)'
loader-id='loader-admin-circles'
class-cell1='segment table-cell third whitespace-normal'
class-cell2='segment table-cell third text-center text-left'
class-cell3='segment table-cell third text-center'
class-circle.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class-circle.subtitle='segment full text-ellipsis'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-circle-leave-button"
widget-circle.owner='hubl-circle-owner'
order-by="circle.name"
) )
div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal solid-widget(name='hubl-admin-circle-join-button')
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title') template
solid-form(
class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
data-src='${value}'
div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespace-normal fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='solid-form-hidden'
div#loader-admin-circles.loader.loader-top submit-button='Join'
div data-trans='submit-button=circle.list.buttonJoin'
div
div
div
div.segment.full.margin-bottom-xlarge.whitespace-normal
div.segment.half.sm-full
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='circle.list.subTitle')
div.segment.half.sm-full.text-right
solid-ac-checker(data-src=`${endpoints.circles || (endpoints.post && endpoints.post.circles)}`, permission='acl:Append')
solid-link(
class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus'
next='admin-circle-create'
data-trans='circle.list.buttonCreate'
) )
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}')
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${value}')
hubl-reactivity(bind-user nested-field="circles" target-src='${value}')
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${value}`)
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${value}`)
.segment.table-wrapper solid-display(
.table class='table-body'
div.table-header.bg-color-third.text-color-heading data-src=`${endpoints.circles || endpoints.get.circles}joinable/`
div.segment.table-cell.third(data-trans='circle.list.tableHeader1') fields='cell1(name, subtitle), cell2(owner), cell3(members)'
div.segment.table-cell.third(data-trans='circle.list.tableHeader2') loader-id='loader-admin-circles'
div.segment.table-cell.third(data-trans='circle.list.tableHeader3')
solid-widget(name='hubl-admin-circle-leave-button') class-cell1='segment table-cell third whitespace-normal'
template class-cell2='segment table-cell third text-center text-left'
solid-delete( class-cell3='segment table-cell third text-center'
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}"
data-label=''
data-trans='data-label=circle.list.buttonQuit'
)
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="circles" target-src='${src}')
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${src}`)
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${src}`)
solid-display( class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class='table-body' class-subtitle='segment full text-ellipsis'
bind-user
nested-field='circles'
fields='cell1(circle.name, circle.subtitle), cell2(circle.owner), cell3(leaveButton)'
loader-id='loader-admin-circles'
class-cell1='segment table-cell third whitespace-normal' widget-owner='hubl-circle-owner'
class-cell2='segment table-cell third text-center text-left' widget-members="hubl-admin-circle-join-button"
class-cell3='segment table-cell third text-center'
class-circle.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis' order-by="name"
class-circle.subtitle='segment full' )
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-circle-leave-button"
widget-circle.owner='hubl-circle-owner'
order-by="circle.name"
)
solid-widget(name='hubl-admin-circle-join-button')
template
solid-form(
class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
data-src='${value}'
fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='solid-form-hidden'
submit-button=''
data-trans='submit-button=circle.list.buttonJoin'
)
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}')
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${value}')
hubl-reactivity(bind-user nested-field="circles" target-src='${value}')
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${value}`)
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${value}`)
solid-display(
class='table-body'
data-src=`${endpoints.circles || endpoints.get.circles}joinable/`
fields='cell1(name, subtitle), cell2(owner), cell3(members)'
loader-id='loader-admin-circles'
class-cell1='segment table-cell third whitespace-normal'
class-cell2='segment table-cell third text-center text-left'
class-cell3='segment table-cell third text-center'
class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class-subtitle='segment full'
widget-owner='hubl-circle-owner'
widget-members="hubl-admin-circle-join-button"
order-by="name"
)
#admin-circle-create(hidden, data-view="admin-circle-create")
include page-admin-circles-create.pug

64
src/views/partials/admin/page-admin-communities.pug
View File

@ -1,7 +1,3 @@
solid-router(default-route='admin-communities-list', hidden)
solid-route(name='admin-communities-list')
solid-route(name='admin-users-create', use-id)
solid-widget(name='hubl-action-community') solid-widget(name='hubl-action-community')
template template
solid-ac-checker(data-src="${value}", nested-field="members", permission='acl:Append') solid-ac-checker(data-src="${value}", nested-field="members", permission='acl:Append')
@ -14,42 +10,38 @@ solid-widget(name='hubl-action-community')
solid-ac-checker(data-src="${value}", nested-field="members", no-permission='acl:Append') solid-ac-checker(data-src="${value}", nested-field="members", no-permission='acl:Append')
div.button.button-disabled(data-trans='communities.noPermission') div.button.button-disabled(data-trans='communities.noPermission')
#admin-communities-list(hidden, data-view="admin-communities-list") div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div.segment.full.margin-bottom-xlarge div.segment.full.margin-bottom-xlarge
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle') h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle')
.segment.table-wrapper .segment.table-wrapper
.table .table
div.table-header.bg-color-third.text-color-heading div.table-header.bg-color-third.text-color-heading
div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader1') div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader1')
div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader2') div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader2')
solid-display( solid-display(
class='table-body' class='table-body'
bind-user bind-user
nested-field='communities' nested-field='communities'
fields='cell1(community.name), cell2(community)' fields='cell1(community.name), cell2(community)'
loader-id='loader-admin-community' loader-id='loader-admin-community'
class-cell1='segment table-cell half text-center' class-cell1='segment table-cell half text-center'
class-cell2='segment table-cell half text-center' class-cell2='segment table-cell half text-center'
class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis' class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis'
widget-community='hubl-action-community' widget-community='hubl-action-community'
order-asc='community.name' order-asc='community.name'
) )
div#loader-admin-community.loader.loader-top div#loader-admin-community.loader.loader-top
div div
div div
div div
div div
#admin-users-create(hidden, data-view="admin-users-create")
include page-admin-users-create.pug

2
src/views/partials/admin/page-admin-projects-create.pug
View File

@ -2,7 +2,7 @@ div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-p
div.segment.half.sm-full div.segment.half.sm-full
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title') h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title')
div.segment.half.sm-hidden.text-right div.segment.half.sm-hidden.text-right
solid-link(class="backlink right", next='admin-project-list' data-trans='project.create.backlink') solid-link(class="backlink right", next='admin-projects' data-trans='project.create.backlink')
div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div#loader-projects-create.loader.loader-top div#loader-projects-create.loader.loader-top

268
src/views/partials/admin/page-admin-projects.pug
View File

@ -1,167 +1,155 @@
solid-router(default-route='admin-project-list', hidden) div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
solid-route(name='admin-project-list') h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title')
solid-route(name='admin-project-create')
solid-route(name='project-left')
#project-left(hidden, data-view="project-left") div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
include ../project/page-project-left.pug
#admin-project-list(hidden, data-view="admin-project-list") div.segment.full.margin-bottom-xlarge.whitespace-normal
div.segment.half.sm-full
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='project.list.subTitle')
div.segment.half.sm-full.text-right
solid-ac-checker(data-src=`${endpoints.projects || (endpoints.post && endpoints.post.projects)}`, permission='acl:Append')
solid-link(
class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus'
next='admin-projects-create'
data-trans='project.list.buttonCreate'
)
div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal .segment.table-wrapper
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title') .table
div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal div.table-header.bg-color-third.text-color-heading
div.segment.table-cell.quarter(data-trans='project.list.tableHeader1')
div.segment.table-cell.quarter(data-trans='project.list.tableHeader2')
div.segment.table-cell.quarter(data-trans='project.list.tableHeader3')
div.segment.table-cell.quarter(data-trans='project.list.tableHeader4')
div.segment.full.margin-bottom-xlarge.whitespace-normal solid-widget(name="hubl-admin-project-leave-button")
div.segment.half.sm-full template
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='project.list.subTitle') solid-delete(
div.segment.half.sm-full.text-right class='button text-xsmall text-bold text-uppercase color-secondary bordered'
solid-ac-checker(data-src=`${endpoints.projects || (endpoints.post && endpoints.post.projects)}`, permission='acl:Append') data-src="${src}"
solid-link( data-label=''
class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus' data-trans='data-label=project.list.buttonQuit'
next='admin-project-create' )
data-trans='project.list.buttonCreate' hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${src}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${src}`)
solid-widget(name='hubl-project-captain')
template
solid-display.segment.labelled-avatar.two-lines.block(
data-src='${await value}'
fields='segment1(account.picture), segment2(line1(name), line2(at, username))'
class-segment1='segment'
class-account.picture='avatar'
class-segment2='segment three-quarter margin-left-xsmall'
class-line1='segment block'
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='segment block text-xsmall'
widget-account.picture='hubl-user-avatar'
value-at='@'
) )
.segment.table-wrapper solid-widget(name='hubl-project-admins')
.table template
solid-display(
data-src='${value}'
fields='user'
search-fields='is_admin'
search-value-is_admin='true'
search-widget-is_admin='solid-form-hidden'
widget-user='hubl-project-captain'
)
div.table-header.bg-color-third.text-color-heading solid-widget(name='hubl-admin-project-leave-button')
div.segment.table-cell.quarter(data-trans='project.list.tableHeader1') template
div.segment.table-cell.quarter(data-trans='project.list.tableHeader2') solid-delete(
div.segment.table-cell.quarter(data-trans='project.list.tableHeader3') class='button text-xsmall text-bold text-uppercase color-secondary bordered'
div.segment.table-cell.quarter(data-trans='project.list.tableHeader4') data-src="${src}"
data-label=''
data-trans='data-label=project.list.buttonQuit'
)
solid-widget(name="hubl-admin-project-leave-button") solid-display(
template class='table-body'
solid-delete(
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}"
data-label=''
data-trans='data-label=project.list.buttonQuit'
)
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${src}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${src}`)
solid-widget(name='hubl-project-captain') bind-user
template nested-field="projects"
solid-display.labelled-avatar.two-lines( fields='cell1(project.customer.name, project.name), cell2(project.members), cell3(project.captain), cell4(leaveButton)'
data-src='${await value}' loader-id='loader-admin-projects'
fields='segment1(account.picture), segment2(line1(name), line2(at, username))'
class-segment1='segment' class-cell1='segment table-cell quarter text-left whitespace-normal'
class-account.picture='avatar' class-cell2='segment table-cell quarter text-left'
class-cell3='segment table-cell quarter text-left'
class-cell4='segment table-cell quarter text-center'
class-segment2='segment three-quarter margin-left-xsmall' class-project.customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class-line1='segment block' class-project.name='segment full'
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='segment block text-xsmall'
widget-account.picture='hubl-user-avatar' action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-project-leave-button"
value-at='@' widget-project.captain='hubl-project-captain'
) widget-project.members='hubl-project-admins'
solid-widget(name='hubl-project-admins') order-by="project.name"
template )
solid-display(
data-src='${value}'
fields='user'
search-fields='is_admin'
search-value-is_admin='true'
search-widget-is_admin='solid-form-hidden'
widget-user='hubl-project-captain'
)
solid-widget(name='hubl-admin-project-leave-button') solid-widget(name='hubl-admin-project-join-button')
template template
solid-delete( solid-form(
class='button text-xsmall text-bold text-uppercase color-secondary bordered' class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
data-src="${src}" data-src='${src}'
data-label='' nested-field="members"
data-trans='data-label=project.list.buttonQuit'
)
solid-display( fields='user.username'
class='table-body' value-user.username='hubl-workaround-493'
widget-user.username='solid-form-hidden'
bind-user submit-button=''
nested-field="projects" data-trans='submit-button=project.list.buttonJoin'
fields='cell1(project.customer.name, project.name), cell2(project.members), cell3(project.captain), cell4(leaveButton)' )
loader-id='loader-admin-projects' hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${value}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${value}`)
class-cell1='segment table-cell quarter text-left whitespace-normal' solid-display(
class-cell2='segment table-cell quarter text-left' class='table-body'
class-cell3='segment table-cell quarter text-left'
class-cell4='segment table-cell quarter text-center'
class-project.customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis' data-src=`${endpoints.projects || endpoints.get.projects}joinable/`
class-project.name='segment full' fields='cell1(customer.name, name), cell2(members), cell3(captain), cell4(joinButton)'
loader-id='loader-admin-projects'
action-leaveButton="joinButton" class-cell1='segment table-cell quarter text-left whitespace-normal'
widget-leaveButton="hubl-admin-project-leave-button" class-cell2='segment table-cell quarter text-left'
class-cell3='segment table-cell quarter text-left'
class-cell4='segment table-cell quarter text-center'
widget-project.captain='hubl-project-captain' class-customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellpsis'
widget-project.members='hubl-project-admins' class-name='segment full'
order-by="project.name" action-joinButton="joinButton" # Workaround: I need members two times
) widget-joinButton="hubl-admin-project-join-button"
solid-widget(name='hubl-admin-project-join-button') widget-captain='hubl-project-captain'
template widget-members='hubl-project-admins'
solid-form(
class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
data-src='${src}'
nested-field="members"
fields='user.username' order-by="name"
value-user.username='hubl-workaround-493' )
widget-user.username='solid-form-hidden'
submit-button='' div#loader-admin-projects.loader.loader-top
data-trans='submit-button=project.list.buttonJoin' div
) div
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}') div
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}') div
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${value}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${value}`)
solid-display(
class='table-body'
data-src=`${endpoints.projects || endpoints.get.projects}joinable/`
fields='cell1(customer.name, name), cell2(members), cell3(captain), cell4(joinButton)'
loader-id='loader-admin-projects'
class-cell1='segment table-cell quarter text-left whitespace-normal'
class-cell2='segment table-cell quarter text-left'
class-cell3='segment table-cell quarter text-left'
class-cell4='segment table-cell quarter text-center'
class-customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellpsis'
class-name='segment full'
action-joinButton="joinButton" # Workaround: I need members two times
widget-joinButton="hubl-admin-project-join-button"
widget-captain='hubl-project-captain'
widget-members='hubl-project-admins'
order-by="name"
)
div#loader-admin-projects.loader.loader-top
div
div
div
div
#admin-project-create(hidden, data-view="admin-project-create")
include page-admin-projects-create.pug

12
src/views/partials/admin/page-admin-users-create.pug
View File

@ -2,7 +2,7 @@ div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-p
div.segment.half.sm-full div.segment.half.sm-full
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title') h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
div.segment.half.sm-hidden.text-right div.segment.half.sm-hidden.text-right
solid-link(class="backlink", bind-resources, next='admin-communities-list' data-trans='circle.create.backlink') solid-link(class="backlink", bind-resources, next='admin-communities' data-trans='circle.create.backlink')
div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
@ -31,7 +31,13 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
div.segment.margin-bottom-medium div.segment.margin-bottom-medium
div.segment div.segment
p.text-color-heading.text-semibold.text-xlarge.text-letter-spacing-large(data-trans='user.create.title', loader-id='loader-users-title') solid-display.text-color-heading.text-semibold.text-xlarge.text-letter-spacing-large(
bind-resources
fields='text, name'
value-text=''
data-trans='value-text=user.create.title'
loader-id='loader-users-title'
)
solid-form.form#selected-community( solid-form.form#selected-community(
bind-resources bind-resources
@ -59,7 +65,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
widget-user.username='hubl-username-field' widget-user.username='hubl-username-field'
widget-user.email='hubl-email-field' widget-user.email='hubl-email-field'
next='admin-communities-list' next='admin-communities'
submit-button='' submit-button=''
data-trans='label-user.first_name=user.create.labelFirstname;label-user.last_name=user.create.labelLastname;label-user.username=user.create.labelUsername;label-user.email=user.create.labelEmail;submit-button=user.create.buttonSubmit' data-trans='label-user.first_name=user.create.labelFirstname;label-user.last_name=user.create.labelLastname;label-user.username=user.create.labelUsername;label-user.email=user.create.labelEmail;submit-button=user.create.buttonSubmit'

2
src/views/partials/circle/page-circle-left.pug
View File

@ -6,6 +6,6 @@ div.text-center
p p
span(data-trans='circle.left.paragraphJoin') span(data-trans='circle.left.paragraphJoin')
span &nbsp; span &nbsp;
solid-link.link(next="admin-circle-list" data-trans='circle.left.admin') solid-link.link(next="admin-circles" data-trans='circle.left.admin')
span &nbsp; span &nbsp;
span(data-trans='circle.left.paragraphContact') span(data-trans='circle.left.paragraphContact')

18
src/views/partials/header.pug
View File

@ -3,13 +3,13 @@ div
solid-link.segment.sm-hidden(next='dashboard') solid-link.segment.sm-hidden(next='dashboard')
img.logo(src=`${clientLogo || '/images/logo.webp'}`) img.logo(src=`${clientLogo || '/images/logo.webp'}`)
button.notLoggedIn.segment.lg-hidden.icon-menu#toggleMainMenu button.segment.lg-hidden.icon-menu#toggleMainMenu
span.tag.reversed.text-semibold(data-trans='header.beta') span.tag.reversed.text-semibold(data-trans='header.beta')
div div
solid-notifications.segment.sm-margin-right-xlarge.notLoggedIn( solid-notifications.segment.sm-margin-right-xlarge(
nested-field="inbox" nested-field="inbox"
bind-user bind-user
) )
@ -24,7 +24,7 @@ div
) )
//- User menu visible on large screens //- User menu visible on large screens
details.segment.sm-hidden.notLoggedIn details.segment.sm-hidden.user-controls
summary.text-right summary.text-right
solid-display.labelled-avatar.padding-top-xsmall( solid-display.labelled-avatar.padding-top-xsmall(
fields='segment1(account.picture), segment2(first_name), segment3(button)' fields='segment1(account.picture), segment2(first_name), segment3(button)'
@ -51,7 +51,7 @@ div
li.segment.padding-top-small 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-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if endpoints.get.circles if endpoints.get.circles
solid-link.text-hover(next='admin') solid-link.text-hover(next='admin-circles')
li.segment.padding-top-small li.segment.padding-top-small
a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles') a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
if endpoints.get.projects if endpoints.get.projects
@ -61,9 +61,9 @@ div
li.border-bottom.border-color-grey li.border-bottom.border-color-grey
solid-link.segment.padding-small.text-hover(next='about' data-trans='header.about') solid-link.segment.padding-small.text-hover(next='about' data-trans='header.about')
li li
button.segment.padding-small.text-hover.text-bold.text-color-heading(role='log out' onclick="document.querySelector('sib-auth').logout();" data-trans='header.logOut') button.segment.padding-small.text-hover.text-semibold.text-color-heading(role='log out' onclick="document.querySelector('sib-auth').logout();" data-trans='header.logOut')
button.notLoggedIn.segment.lg-hidden.icon-menu#toggleMainMenu button.segment.lg-hidden.icon-menu#toggleMainMenu
sib-auth(style='display:none!important', auto-login) sib-auth(style='display:none!important', auto-login)
sib-auth-provider( sib-auth-provider(
@ -73,7 +73,7 @@ div
) )
//- User menu visible on small screens //- User menu visible on small screens
details.user-menu.segment.lg-hidden.notLoggedIn details.user-menu.segment.lg-hidden.user-controls
summary summary
solid-display.labelled-avatar( solid-display.labelled-avatar(
fields='segment1(account.picture), segment3(button)' fields='segment1(account.picture), segment3(button)'
@ -109,7 +109,7 @@ div
li.segment.padding-top-small.sm-padding-top-medium li.segment.padding-top-small.sm-padding-top-medium
a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community') a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if endpoints.get.circles if endpoints.get.circles
solid-link.text-hover(next='admin') solid-link.text-hover(next='admin-circles')
li.segment.padding-top-small.sm-padding-top-medium li.segment.padding-top-small.sm-padding-top-medium
a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles') a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
if endpoints.get.projects if endpoints.get.projects
@ -121,7 +121,7 @@ div
li li
button.segment.padding-small.sm-padding-medium.sm-padding-left-xlarge.text-hover.text-bold.text-color-heading(role='log out' onclick="document.querySelector('sib-auth').logout();" data-trans='header.logOut') button.segment.padding-small.sm-padding-medium.sm-padding-left-xlarge.text-hover.text-bold.text-color-heading(role='log out' onclick="document.querySelector('sib-auth').logout();" data-trans='header.logOut')
button.notLoggedIn.segment.lg-hidden.icon-menu#toggleMainMenu button.segment.lg-hidden.icon-menu#toggleMainMenu
sib-auth(style='display:none!important', auto-login) sib-auth(style='display:none!important', auto-login)
sib-auth-provider( sib-auth-provider(

16
src/views/partials/menu-left.pug
View File

@ -140,13 +140,15 @@ solid-router#navbar-router(default-route='dashboard')
div.divider div.divider
if endpoints.get.projects if endpoints.get.projects
div.menu-wrapper div.menu-wrapper
solid-link.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin-projects') solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='admin-projects')
div.segment.margin-right-xxsmall div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt div.segment.icon.icon-small.icon-folder-alt
div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects") div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects")
div.menu-chevron.segment div.menu-chevron.segment
div.icon-arrow-right-circle div.icon-arrow-right-circle
solid-route(name='project', rdf-type='hd:project', use-id='', hidden) solid-route(name='project', rdf-type='hd:project', use-id='', hidden)
solid-route(name='admin-projects-create', hidden)
solid-route(name='project-left', hidden)
div.sub-menu.menu-notification div.sub-menu.menu-notification
div#loader-projects.loader.loader-menu div#loader-projects.loader.loader-menu
div div
@ -167,13 +169,15 @@ solid-router#navbar-router(default-route='dashboard')
div.divider div.divider
if endpoints.get.circles if endpoints.get.circles
div.menu-wrapper div.menu-wrapper
solid-link.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin') solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='admin-circles')
div.segment.margin-right-xxsmall div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt div.segment.icon.icon-small.icon-folder-alt
div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles") div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles")
div.menu-chevron.segment div.menu-chevron.segment
div.menu-icon.icon-arrow-right-circle div.menu-icon.icon-arrow-right-circle
solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden) solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
solid-route(name='admin-circles-create')
solid-route(name='circle-left')
div.sub-menu.menu-notification div.sub-menu.menu-notification
div#loader-circles.loader.loader-menu div#loader-circles.loader.loader-menu
div div
@ -193,12 +197,13 @@ solid-router#navbar-router(default-route='dashboard')
) )
div.divider div.divider
div.menu-wrapper div.menu-wrapper
div.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='admin-communities')
div.segment.margin-right-xxsmall div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-envelope-letter div.segment.icon.icon-small.icon-folder-alt
div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.messages") div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.messages")
div.menu-chevron.segment div.menu-chevron.segment
div.icon-arrow-up div.menu-icon.icon-arrow-right-circle
solid-route(name='admin-users-create', use-id='', hidden)
solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden) solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden)
div.sub-menu.menu-notification div.sub-menu.menu-notification
div#loader-messages.loader.loader-menu div#loader-messages.loader.loader-menu
@ -222,6 +227,5 @@ solid-router#navbar-router(default-route='dashboard')
) )
div.divider div.divider
solid-route(name='admin', hidden)
solid-route.menu(name='profile', hidden) solid-route.menu(name='profile', hidden)
solid-route(name='about', hidden) solid-route(name='about', hidden)

1
src/views/partials/notifications.pug
View File

@ -1,4 +1,5 @@
//- Templates for notifications //- Templates for notifications
include notifications/message-circle.pug include notifications/message-circle.pug
include notifications/message-project.pug
include notifications/message-private.pug include notifications/message-private.pug

11
src/views/partials/notifications/message-project.pug Normal file
View File

@ -0,0 +1,11 @@
solid-notifications-template(data-rdf-type='hd:project')
template
.solid-notification__avatar
| ${await author['account.foaf:depiction'] ? `<img src="${await author['account.foaf:depiction']}" style="max-width:100%; max-height: 100%;" />` : `<img src="/images/alien.webp" />`}
.solid-notification__content
.solid-notification__title ${await author.name}
span.solid-notification__title__side
span(data-trans='notification.circle.in')
span.solid-notification__title__icon ${(await object.status) == 'Public' ? '#' : ''}
| ${await object.name}
p.solid-notification__summary ${summary}

2
src/views/partials/project/page-project-left.pug
View File

@ -7,6 +7,6 @@
p p
span(data-trans='project.left.paragraphJoin') span(data-trans='project.left.paragraphJoin')
span &nbsp; span &nbsp;
solid-link.link(next="admin-project-list" data-trans='project.left.admin') solid-link.link(next="admin-projects" data-trans='project.left.admin')
span &nbsp; span &nbsp;
span(data-trans='project.left.paragraphContact') span(data-trans='project.left.paragraphContact')