From 96f603a44b0fcb2d36b6dafa85bfca38fc2dbf4c Mon Sep 17 00:00:00 2001 From: bernat Date: Fri, 4 Dec 2020 13:40:58 +0100 Subject: [PATCH] refactor descriptors --- e2e/paths/04-item/12_descriptor.spec.js | 15 +++------------ .../05-ticket/01-sale/02_edit_sale.spec.js | 1 - e2e/paths/05-ticket/12_descriptor.spec.js | 6 +----- front/core/styles/icons/salixfont.css | 14 ++++++++++---- front/core/styles/icons/salixfont.svg | 6 ++++-- front/core/styles/icons/salixfont.ttf | Bin 32980 -> 34968 bytes front/core/styles/icons/salixfont.woff | Bin 33056 -> 35044 bytes front/salix/components/descriptor/style.scss | 8 ++------ modules/account/front/descriptor/index.html | 4 ++-- modules/client/front/descriptor/index.html | 10 +++++----- modules/entry/front/descriptor/index.html | 4 ++-- modules/item/front/descriptor/index.html | 2 +- modules/route/front/descriptor/index.html | 2 +- modules/supplier/front/descriptor/index.html | 4 ++-- modules/ticket/front/descriptor/index.html | 10 +++++----- 15 files changed, 38 insertions(+), 48 deletions(-) diff --git a/e2e/paths/04-item/12_descriptor.spec.js b/e2e/paths/04-item/12_descriptor.spec.js index 7c6fa074c8..eb9ed25732 100644 --- a/e2e/paths/04-item/12_descriptor.spec.js +++ b/e2e/paths/04-item/12_descriptor.spec.js @@ -16,14 +16,6 @@ describe('Item descriptor path', () => { await browser.close(); }); - it('should check the descriptor inactive icon is dark as the item is active', async() => { - await page.waitForSelector(selectors.itemDescriptor.inactiveIcon); - await page.waitForClassNotPresent(selectors.itemDescriptor.inactiveIcon, 'bright'); - const darkIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon); - - expect(darkIcon).toBeTruthy(); - }); - it('should set the item to inactive', async() => { await page.waitToClick(selectors.itemBasicData.isActiveCheckbox); await page.waitToClick(selectors.itemBasicData.submitBasicDataButton); @@ -32,12 +24,11 @@ describe('Item descriptor path', () => { expect(message.text).toContain('Data saved!'); }); - it('should reload the section and check the inactive icon is bright', async() => { + it('should reload the section and check the inactive icon is visible', async() => { await page.reloadSection('item.card.basicData'); - await page.waitForClassPresent(selectors.itemDescriptor.inactiveIcon, 'bright'); - const brightIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon); + const visibleIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon); - expect(brightIcon).toBeTruthy(); + expect(visibleIcon).toBeTruthy(); }); it('should set the item back to active', async() => { diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js index 248f38927a..d0c0cfeda8 100644 --- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js +++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js @@ -397,6 +397,5 @@ describe('Ticket Edit sale path', () => { it(`should check the ticket is deleted`, async() => { await page.waitForSelector(selectors.ticketDescriptor.isDeletedIcon); - await page.waitForClassPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright'); }); }); diff --git a/e2e/paths/05-ticket/12_descriptor.spec.js b/e2e/paths/05-ticket/12_descriptor.spec.js index c426f7d7f3..1c78953824 100644 --- a/e2e/paths/05-ticket/12_descriptor.spec.js +++ b/e2e/paths/05-ticket/12_descriptor.spec.js @@ -56,7 +56,7 @@ describe('Ticket descriptor path', () => { await page.write(selectors.ticketsIndex.topbarSearch, '18'); await page.waitToClick(selectors.globalItems.searchButton); await page.waitForState('ticket.card.summary'); - await page.waitForClassPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright'); + await page.isVisible(selectors.ticketDescriptor.isDeletedIcon); const result = await page.waitToGetProperty(selectors.ticketsIndex.searchResultDate, 'innerText'); expect(result).toContain(2000); @@ -73,10 +73,6 @@ describe('Ticket descriptor path', () => { expect(message.text).toContain('Data saved!'); }); - - it('should make sure the ticketDeleted icon is no longer bright', async() => { - await page.waitForClassNotPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright'); - }); }); describe('Add stowaway', () => { diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css index aafc549a12..bdd37b2902 100644 --- a/front/core/styles/icons/salixfont.css +++ b/front/core/styles/icons/salixfont.css @@ -22,10 +22,18 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-invoiceIn:before { + content: "\e960"; + color: #5f5f5f; +} +.icon-invoiceOut:before { + content: "\e961"; + color: #5f5f5f; +} .icon-supplier:before { content: "\e936"; } -.icon-latestBuys:before { +.icon-latestBuy:before { content: "\e95f"; } .icon-zone:before { @@ -99,6 +107,7 @@ } .icon-invoices:before { content: "\e91c"; + color: #5f5f5f; } .icon-pets:before { content: "\e94e"; @@ -295,9 +304,6 @@ .icon-stowaway:before { content: "\e92c"; } -.icon-supplier:before { - content: "\e936"; -} .icon-tags:before { content: "\e937"; } diff --git a/front/core/styles/icons/salixfont.svg b/front/core/styles/icons/salixfont.svg index ee14609a40..ca547518dd 100644 --- a/front/core/styles/icons/salixfont.svg +++ b/front/core/styles/icons/salixfont.svg @@ -35,7 +35,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -103,6 +103,8 @@ + + diff --git a/front/core/styles/icons/salixfont.ttf b/front/core/styles/icons/salixfont.ttf index 6958c0e3dd4cfaa662de976ebb1ce9e38a78daec..2d986be4172f153eeb1f7b6d537fcc0461635e00 100644 GIT binary patch delta 3014 zcmb_eZ){Ul6u+nU?Y_R(*KJ+@&2BAgyS|Q&j;`(ciYr}}MbWSbABMUJWD~{+f3~>A zO~QB+1m_14G9}7~eIUjUKr&(zLLxCl6B8pUDlv$OQKBCdqhB!b&sIJ6b(Mi*K-|lH z@7{avJ?EZ#?)m-hyY#&2^&_Ukem#8d3qqil5VCn|_uv55mDnG{+PrngbG>^9KQ&>0 zoRED_^=;|i?D=WaC?Wg5$MIAj3dHvXm5>*>etqB0p^-OUv@~HqhdOWW=zqHVl_yVM zBIE#{e`#m;$N<@IdX|ubXR%+mt9$2`>WzLf-u@k z#JCgTnA!-jWJ@gB%w<_9$+Dnj0S&r+fCVQvV@Vn+s9z3ZvEXXh;tTko6=II&n8R6; z=|!PofZK?t&?L9721Lj~r>rP);iPP_$aC9cT);o3O*8AGSw)f+)nn?EE#dn-sv^&f zNlG?q8e5j-{hXvI(t0kLK5FVzq?s>0s;O6YSS7p6bcy9Cqh%m4_DC0H0tKKV>!21Y zS4g6T3bH_D0Uw~OT(&mY?M|no4!3)O;Uic? zfr;ogx+j!z_i-<{CKJ&$6Qv*s6d#6@a0`;4$gGM1rJ_+l052*Q)dY|#WXXzV6iGCr zO)3a^n{U9Ye~jrlg(=)dR*}cZW=u}aExPe+%kbDj?lOnVX{1|AGNsWbsDQARa=Gnz zlvGW%K^mGh{-)wQPwWo#O>}D%Q`5*oJaUY<+vUIHmQpl(J9MmrJLQziHt z;c*8s zvzCLJY=aci7H-oS!*Jwo;9tg*yA|{(n#nnJL^-0pKuX+z;@Qc_2m&TUr`5{A$N2+3 z6BUZ7fJG2E8I((vk$Z$XRoE=47@VTdPbzlFg(-U8V6>dzEKC)-4Jm~wbSl@?mBZJw zPGmiz*u%ti%wm?Hx5O7=)ID}HK|rri*r<98Rygr5jkF6o(DqsCpc12sgyd1=nk&c^ zMQ-2~E^MX@=HZ5gr~x^00s5izD$}hZ_ZlO*j#D0^tV+IS><)K$vXPZh4ad^7OpI8V zL>3(_I=^u49xjWH79IY3sVxAP#XyV5kR}j~$Ox^V<97)lt==7679B169d5>3;POAv zqH>%_W(zB#W)>|vCfz;2Wzo^HVeUm>R9j*NjRqaca~&QNMSU{(HsS6&ETQ zUWQNDj@qtQRaf;n9(44&*0^4Ez3cv<`mATS=W5N`n$xxE+JoL|@3{Ar?;+nWOMdnz z{gZ+F1D^y3f@kWh>xV+-&{cJxdP=>hPKQ(Bec^KrhZ`<0-5rTF9&h}7nJ4;8^m@}s x)5Yb7Vq?vhd{?ENv;2%un$IAc! delta 965 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 diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss index 814df2ca50..f7055c0fc1 100644 --- a/front/salix/components/descriptor/style.scss +++ b/front/salix/components/descriptor/style.scss @@ -71,13 +71,9 @@ vn-descriptor-content { & > vn-icon { padding: $spacing-xs $spacing-sm; - color: $color-marginal; font-size: 1.5rem; - - &.bright { - color: $color-main; - opacity: 1; - } + color: $color-main; + opacity: 1; } } & > .quicklinks { diff --git a/modules/account/front/descriptor/index.html b/modules/account/front/descriptor/index.html index 50e4d21773..a1ce252a63 100644 --- a/modules/account/front/descriptor/index.html +++ b/modules/account/front/descriptor/index.html @@ -78,12 +78,12 @@ + ng-if="!$ctrl.user.active"> + ng-if="$ctrl.hasAccount"> diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html index 634436395e..dc79d224b0 100644 --- a/modules/client/front/descriptor/index.html +++ b/modules/client/front/descriptor/index.html @@ -47,27 +47,27 @@ + ng-if="$ctrl.client.isActive == false"> + ng-if="$ctrl.client.isFreezed == true"> + ng-if="$ctrl.client.account.active == false"> + ng-if="$ctrl.client.debt > $ctrl.client.credit"> + ng-if="$ctrl.client.isTaxDataChecked == false">
diff --git a/modules/entry/front/descriptor/index.html b/modules/entry/front/descriptor/index.html index 1470eccf44..8955b3ee94 100644 --- a/modules/entry/front/descriptor/index.html +++ b/modules/entry/front/descriptor/index.html @@ -24,12 +24,12 @@ + ng-if="$ctrl.entry.isInventory"> + ng-if="$ctrl.entry.isRaid">
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html index 8363a652f2..917c274d0d 100644 --- a/modules/item/front/descriptor/index.html +++ b/modules/item/front/descriptor/index.html @@ -61,7 +61,7 @@ + ng-if="$ctrl.item.isActive == false">
diff --git a/modules/route/front/descriptor/index.html b/modules/route/front/descriptor/index.html index 442ee7838e..bda46952ae 100644 --- a/modules/route/front/descriptor/index.html +++ b/modules/route/front/descriptor/index.html @@ -47,7 +47,7 @@ + ng-if="$ctrl.route.m3 > $ctrl.route.vehicle.m3 && $ctrl.route.vehicle.m3 != NULL">
diff --git a/modules/supplier/front/descriptor/index.html b/modules/supplier/front/descriptor/index.html index c98a8e001f..97f46db71e 100644 --- a/modules/supplier/front/descriptor/index.html +++ b/modules/supplier/front/descriptor/index.html @@ -26,12 +26,12 @@ + ng-if="$ctrl.supplier.isActive == false"> + ng-if="$ctrl.supplier.isSerious == true">
diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html index 234eb9560e..2bab0b691e 100644 --- a/modules/ticket/front/descriptor/index.html +++ b/modules/ticket/front/descriptor/index.html @@ -39,27 +39,27 @@ + ng-if="$ctrl.ticket.client.isActive == false"> + ng-if="$ctrl.ticket.client.isFreezed == true"> + ng-if="$ctrl.ticket.client.debt > $ctrl.ticket.client.credit"> + ng-if="$ctrl.ticket.client.isTaxDataChecked == false"> + ng-if="$ctrl.ticket.isDeleted == true">