diff --git a/package-lock.json b/package-lock.json index f9f36d8..9982643 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@startinblox/hubl-styling-framework": "^1.0.21", + "@startinblox/hubl-styling-framework": "^1.0.27", "fs-extra": "^9.0.1", "normalize.css": "^8.0.1", "parcel-bundler": "^1.12.4", @@ -1442,9 +1442,9 @@ } }, "node_modules/@startinblox/hubl-styling-framework": { - "version": "1.0.21", - "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.21.tgz", - "integrity": "sha512-LaKWMXwK4LNKgvsuVNLTSlNU2aoUk0VQgjfX0XSSPQskudIe675tS+hVRmCMH2Wtl2/MyWvscyYqX+2//zXnCQ==" + "version": "1.0.27", + "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.27.tgz", + "integrity": "sha512-5lnGDuYPK6q8eXgo6xwWP9VS9ZDYZDiRAGXM1ZcS7M0vW9/aIhmCtKDTi8LYRp9BflgLky6+mInzWsDolS9cXw==" }, "node_modules/@types/q": { "version": "1.5.4", @@ -10603,9 +10603,9 @@ } }, "@startinblox/hubl-styling-framework": { - "version": "1.0.21", - "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.21.tgz", - "integrity": "sha512-LaKWMXwK4LNKgvsuVNLTSlNU2aoUk0VQgjfX0XSSPQskudIe675tS+hVRmCMH2Wtl2/MyWvscyYqX+2//zXnCQ==" + "version": "1.0.27", + "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.27.tgz", + "integrity": "sha512-5lnGDuYPK6q8eXgo6xwWP9VS9ZDYZDiRAGXM1ZcS7M0vW9/aIhmCtKDTi8LYRp9BflgLky6+mInzWsDolS9cXw==" }, "@types/q": { "version": "1.5.4", diff --git a/package.json b/package.json index 5e8750a..b12aa03 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ ] }, "dependencies": { - "@startinblox/hubl-styling-framework": "^1.0.21", + "@startinblox/hubl-styling-framework": "^1.0.27", "fs-extra": "^9.0.1", "normalize.css": "^8.0.1", "parcel-bundler": "^1.12.4", diff --git a/src/index.pug b/src/index.pug index a80d25a..1da58eb 100644 --- a/src/index.pug +++ b/src/index.pug @@ -51,27 +51,32 @@ html(lang="en") include views/partials/menu-left.pug main#content.segment.lg-three-quarter.text-top.notLoggedIn - #project(hidden, data-view="project", no-render).with-sidebar.whitespace-normal - hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.projects") - hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${endpoints.get.projects}`) - hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${endpoints.get.projects}`) - hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}`) - hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}joinable/`) - hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src=`${endpoints.projects || endpoints.get.projects}`) - hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}`) - hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}joinable/`) - include views/page-project.pug + #about(data-view="about", no-render) + include views/page-about.pug - #circle(hidden, data-view="circle").with-sidebar.whitespace-normal - hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.circles") - hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${endpoints.get.circles}`) - hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${endpoints.get.circles}`) - hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}`) - hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}joinable/`) - hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src=`${endpoints.circles || endpoints.get.circles}`) - hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}`) - hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) - include views/page-circle.pug + if endpoints.get.projects + #project(hidden, data-view="project", no-render).with-sidebar.whitespace-normal + hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.projects") + hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${endpoints.get.projects}`) + hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${endpoints.get.projects}`) + hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}`) + hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}joinable/`) + hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src=`${endpoints.projects || endpoints.get.projects}`) + hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}`) + hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}joinable/`) + include views/page-project.pug + + if endpoints.get.circles + #circle(hidden, data-view="circle", no-render).with-sidebar.whitespace-normal + hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.circles") + hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${endpoints.get.circles}`) + hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${endpoints.get.circles}`) + hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}`) + hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}joinable/`) + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src=`${endpoints.circles || endpoints.get.circles}`) + hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}`) + hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) + include views/page-circle.pug diff --git a/src/styles/about/_index.scss b/src/styles/about/_index.scss new file mode 100644 index 0000000..e8ce196 --- /dev/null +++ b/src/styles/about/_index.scss @@ -0,0 +1,10 @@ +#about { + + p { + line-height: 22px; + } + + >div>div>div { + min-height: 285px; + } +} \ No newline at end of file diff --git a/src/styles/index.scss b/src/styles/index.scss index 7f91ddc..16d7809 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -47,4 +47,5 @@ solid-display>div { @import 'header/_index'; @import 'left-nav/_index'; -@import 'content/_index'; \ No newline at end of file +@import 'content/_index'; +@import 'about/_index'; diff --git a/src/views/page-about.pug b/src/views/page-about.pug index 777b645..c010fe6 100644 --- a/src/views/page-about.pug +++ b/src/views/page-about.pug @@ -3,7 +3,7 @@ div.segment.padding-top-small.padding-right-large.padding-bottom-small.padding-l div.segment.lg-two-third.margin-top-small.padding-right-xlarge div.segment.whitespace-normal.shadow.padding-top-xlarge.padding-right-xxlarge.padding-bottom-xxlarge.padding-left-xxlarge.text-center - h3.text-color-heading.text-semibold(data-trans='about.card1.subTitle') + h3.text-color-heading.text-semibold.text-uppercase(data-trans='about.card1.subTitle') div p.segment.whitespace-normal.text-large(data-trans='about.card1.paragraph1') p.segment.whitespace-normal.text-large(data-trans='about.card1.paragraph2') @@ -13,6 +13,6 @@ div.segment.padding-top-small.padding-right-large.padding-bottom-small.padding-l div.segment.whitespace-normal.shadow.padding-top-xlarge.padding-right-xxlarge.padding-bottom-xxlarge.padding-left-xxlarge.text-center div.segment.margin-top-small div.segment.center.icon.icon-xlarge.rounded-third.rounded.rounded-large.icon-envelope.icon-secondary - h3.text-color-heading.text-semibold.text-medium(data-trans='about.card2.subTitle') + h3.text-color-heading.text-semibold.text-uppercase.text-medium(data-trans='about.card2.subTitle') p(data-trans='about.card2.paragraph1') a.button.text-bold.text-uppercase.color-secondary.bordered(href="https://startinblox.com/fr/#home-contact" target="_blank" data-trans='about.card2.link').main-cta diff --git a/src/views/partials/circle/page-circle-edit.pug b/src/views/partials/circle/page-circle-edit.pug index 12abd56..6dd4228 100644 --- a/src/views/partials/circle/page-circle-edit.pug +++ b/src/views/partials/circle/page-circle-edit.pug @@ -82,11 +82,11 @@ div.segment.lg-full.padding-large.whitespace-normal data-trans='submit-button=circle.edit.buttonAddMember' ) - .table-wrapper + .segment.table-wrapper .table div.table-header.bg-color-third.text-color-heading - div.table-cell.w66(data-trans='circle.edit.tableHeader1') - div.table-cell.w33(data-trans='circle.edit.tableHeader2') + div.segment.table-cell.lg-two-third(data-trans='circle.edit.tableHeader1') + div.segment.table-cell.lg-third(data-trans='circle.edit.tableHeader2') solid-display( class='table-body' @@ -95,8 +95,8 @@ div.segment.lg-full.padding-large.whitespace-normal fields='cell(segment1(user.account.picture), segment2(line1(user.name, is_admin), line2(atom, user.communities))), self' loader-id='loader-circle-edit' - class-cell='table-cell w66 labelled-avatar two-lines text-left' - class-self='table-cell w33' + class-cell='segment padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium table-cell lg-two-third labelled-avatar two-lines text-left' + class-self='segment padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium table-cell lg-third text-center' class-segment1='segment' class-user.account.picture='avatar' @@ -120,4 +120,4 @@ div.segment.lg-full.padding-large.whitespace-normal ) //- Only to show the table grid - div.table-cell.w33 + div.segment.padding-top-xsmall.padding-right-medium.padding-bottom-xsmall.padding-left-medium.table-cell.lg-third diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug index 35faf05..b0ffb44 100644 --- a/src/views/partials/menu-left.pug +++ b/src/views/partials/menu-left.pug @@ -133,35 +133,35 @@ solid-router#navbar-router(default-route='dashboard') //- div.segment.icon.icon-small.icon-calendar //- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events") //- div.divider - //- if endpoints.projects || (endpoints.get && endpoints.get.projects) - //- div.menu-wrapper - //- solid-link.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active - //- //- (next='admin-project-list') - //- div.segment.margin-right-xxsmall - //- div.segment.icon.icon-small.icon-folder-alt - //- div.segment.lg-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects") - //- div.menu-chevron.segment - //- div.icon-arrow-up - //- //- div.menu-icon.icon-arrow-right-circle - //- solid-route(name='project', rdf-type='hd:project', use-id='', hidden) - //- div.sub-menu.menu-notification - //- div#loader-projects.loader.loader-menu - //- div - //- div - //- div - //- div - //- solid-display.ellipsis( - //- bind-user - //- nested-field='projects' - //- fields='project' - //- loader-id='loader-projects' - //- empty-widget='hubl-create' - //- empty-value='' - //- data-trans="empty-value=menuLeft.emptyCircleProject.project" - //- widget-project='hubl-menu-fix-url-project' - //- order-asc="project.customer.name" - //- ) - //- div.divider + if endpoints.projects || (endpoints.get && endpoints.get.projects) + div.menu-wrapper + solid-link.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active + //- (next='admin-project-list') + div.segment.margin-right-xxsmall + div.segment.icon.icon-small.icon-folder-alt + div.segment.lg-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects") + div.menu-chevron.segment + div.icon-arrow-up + //- div.menu-icon.icon-arrow-right-circle + solid-route(name='project', rdf-type='hd:project', use-id='', hidden) + div.sub-menu.menu-notification + div#loader-projects.loader.loader-menu + div + div + div + div + solid-display.ellipsis( + bind-user + nested-field='projects' + fields='project' + loader-id='loader-projects' + empty-widget='hubl-create' + empty-value='' + data-trans="empty-value=menuLeft.emptyCircleProject.project" + widget-project='hubl-menu-fix-url-project' + order-asc="project.customer.name" + ) + div.divider if endpoints.circles || (endpoints.get && endpoints.get.circles) div.menu-wrapper solid-link.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active @@ -220,7 +220,7 @@ solid-router#navbar-router(default-route='dashboard') //- order-asc="contact.username" //- ) //-div.divider -//- + //- //-solid-route(name='admin', hidden) //-solid-route.menu(name='profile', hidden) - //-solid-route(name='about', hidden) + solid-route(name='about', hidden)