From 30f0e39dce54d5864a6dade1661fe874f9185429 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 20 May 2019 15:06:07 +0200 Subject: [PATCH 1/2] ui: fix non working things --- src/header.pug | 11 ++++------ src/page-circle.pug | 12 +++++------ src/page-project.pug | 12 +++++------ src/page-user-panel.pug | 26 +++++++++++------------ src/scripts/index.js | 4 ++++ src/styles/base/header.scss | 42 ++++++++++++++++++------------------- 6 files changed, 54 insertions(+), 53 deletions(-) diff --git a/src/header.pug b/src/header.pug index 152e567..a5b5db5 100644 --- a/src/header.pug +++ b/src/header.pug @@ -2,10 +2,10 @@ sib-link(next='members') img(src='/images/logo.png' width=111 height=32) -#search-bar - input#search-input(type='search') - i#search-icon.icon-magnifier(aria-hidden='true') - i#close-search-icon.icon-close(aria-hidden='true') +//- #search-bar +//- input#search-input(type='search') +//- i#search-icon.icon-magnifier(aria-hidden='true') +//- i#close-search-icon.icon-close(aria-hidden='true') sib-notifications( id-suffix="inbox", @@ -21,12 +21,9 @@ details#user-controls widget-account.picture='hd-user-avatar', bind-user ) - #user-controls__panel - include page-user-panel.pug button(role='log in' onclick="document.querySelector('sib-auth').login();") Login - sib-auth sib-auth-provider( class="sib-auth-provider" diff --git a/src/page-circle.pug b/src/page-circle.pug index a8fd84d..a580d60 100644 --- a/src/page-circle.pug +++ b/src/page-circle.pug @@ -18,9 +18,9 @@ nav.jsRightMenu(role='navigation') sib-route(name='circle-profile') li a Information - sib-route(name='circle-edit') - li - a Edit - sib-route(name='circle-create') - li - a Add new \ No newline at end of file + //- sib-route(name='circle-edit') + //- li + //- a Edit + //- sib-route(name='circle-create') + //- li + //- a Add new \ No newline at end of file diff --git a/src/page-project.pug b/src/page-project.pug index ec2e276..0b750c5 100644 --- a/src/page-project.pug +++ b/src/page-project.pug @@ -18,9 +18,9 @@ nav.jsRightMenu(role='navigation') sib-route(name='project-profile', use-id) li a Information - sib-route(name='project-edit', use-id) - li - a Edit - sib-route(name='project-create', use-id) - li - a Add new \ No newline at end of file + //- sib-route(name='project-edit', use-id) + //- li + //- a Edit + //- sib-route(name='project-create', use-id) + //- li + //- a Add new \ No newline at end of file diff --git a/src/page-user-panel.pug b/src/page-user-panel.pug index efec855..0cb5253 100644 --- a/src/page-user-panel.pug +++ b/src/page-user-panel.pug @@ -1,13 +1,13 @@ -nav(role="user's functionalities menu") - sib-router - ul - sib-route(name='user-profile') - li - a(href='#') My profile - sib-route(name='user-settings') - li - a(href='#') Settings - sib-route(name='user-admin') - li - a Admin - button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out +//- nav(role="user's functionalities menu") +//- sib-router +//- ul +//- sib-route(name='user-profile') +//- li +//- a(href='#') My profile +//- sib-route(name='user-settings') +//- li +//- a(href='#') Settings +//- sib-route(name='user-admin') +//- li +//- a Admin +//- button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out diff --git a/src/scripts/index.js b/src/scripts/index.js index 7146e97..3874ebb 100644 --- a/src/scripts/index.js +++ b/src/scripts/index.js @@ -3,6 +3,10 @@ document.addEventListener('DOMContentLoaded', function (event) { const rightMenus = Array.from(document.querySelectorAll('nav.jsRightMenu')); const viewsContainer = Array.from(document.querySelectorAll('.views-container')); + window.addEventListener('navigate', (event) => { + //- View change event + }); + //- Toggle sub-menus menuWrappers.forEach(menuWrapper => { const menu = menuWrapper.querySelector('.menu'); diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index c9bafca..6acb80a 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -61,7 +61,7 @@ } details { - cursor: pointer; + // cursor: pointer; summary { @@ -106,11 +106,11 @@ details { details#user-controls { - summary:focus { - background-color: $color-233-18-29; - color: $color-0-0-100; - outline: none; - } + // summary:focus { + // background-color: $color-233-18-29; + // color: $color-0-0-100; + // outline: none; + // } #user-controls__profile { div { @@ -131,7 +131,7 @@ details#user-controls { } sib-display-value[name='first_name'] { - @include icon('arrow-down'); + // @include icon('arrow-down'); align-items: center; display: flex; flex-direction: row-reverse; @@ -185,23 +185,23 @@ details#user-controls { } } - &[open] { - background-color: $color-233-18-29; - color: $color-0-0-100; + // &[open] { + // background-color: $color-233-18-29; + // color: $color-0-0-100; - #user-controls__profile { + // #user-controls__profile { - div { + // div { - sib-display-value[name='first_name'] { - @include icon('close'); + // sib-display-value[name='first_name'] { + // @include icon('close'); - &::before { - margin-left: 1.5rem; - } - } - } - } - } + // &::before { + // margin-left: 1.5rem; + // } + // } + // } + // } + // } } From c343d5df593aaae783475b007971fb2615cff5d7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 20 May 2019 15:27:47 +0200 Subject: [PATCH 2/2] fix: route --- src/index.pug | 6 ------ src/page-circle.pug | 4 ++-- src/page-project.pug | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/index.pug b/src/index.pug index 0a96eec..a67f96c 100644 --- a/src/index.pug +++ b/src/index.pug @@ -33,9 +33,3 @@ html(lang="en") #member-chat(hidden).with-sidebar include page-member-chat.pug - - #user-profile(hidden) - - #user-settings(hidden) - - #user-admin(hidden) diff --git a/src/page-circle.pug b/src/page-circle.pug index a580d60..1015a5b 100644 --- a/src/page-circle.pug +++ b/src/page-circle.pug @@ -18,9 +18,9 @@ nav.jsRightMenu(role='navigation') sib-route(name='circle-profile') li a Information - //- sib-route(name='circle-edit') + sib-route(name='circle-edit') //- li //- a Edit - //- sib-route(name='circle-create') + sib-route(name='circle-create') //- li //- a Add new \ No newline at end of file diff --git a/src/page-project.pug b/src/page-project.pug index 0b750c5..6c6b720 100644 --- a/src/page-project.pug +++ b/src/page-project.pug @@ -18,9 +18,9 @@ nav.jsRightMenu(role='navigation') sib-route(name='project-profile', use-id) li a Information - //- sib-route(name='project-edit', use-id) + sib-route(name='project-edit', use-id) //- li //- a Edit - //- sib-route(name='project-create', use-id) + sib-route(name='project-create', use-id) //- li //- a Add new \ No newline at end of file