Browse Source

Merge branch 'hotfix/V8-6036-favicon-new-logo'

Vincent 1 year ago
parent
commit
37cb11515b

+ 1 - 1
nuxt.config.ts

@@ -68,7 +68,7 @@ export default defineNuxtConfig({
         { name: 'msapplication-TileColor', content: '#324250' },
         {
           name: 'msapplication-TileImage',
-          content: '/favicon/mstile-144x144.png',
+          content: '/favicon/favicon-144x144.png',
         },
       ],
       link: [

BIN
public/favicon.ico


BIN
public/favicon/apple-touch-icon-114x114.png


BIN
public/favicon/apple-touch-icon-120x120.png


BIN
public/favicon/apple-touch-icon-144x144.png


BIN
public/favicon/apple-touch-icon-152x152.png


BIN
public/favicon/apple-touch-icon-57x57.png


BIN
public/favicon/apple-touch-icon-72x72.png


BIN
public/favicon/favicon-144x144.png


BIN
public/favicon/favicon-16x16.png


BIN
public/favicon/favicon-32x32.png


BIN
public/favicon/favicon.ico


BIN
public/favicon/mstile-144x144.png


+ 22 - 4
tests/units/services/layout/menuBuilder/configurationMenuBuilder.test.ts

@@ -82,10 +82,18 @@ describe('build', () => {
     expect(menuBuilder.build()).toEqual({
       label: 'cmf_licence_generate',
       icon: undefined,
-      to: '/cmf_licence_structure',
-      type: MENU_LINK_TYPE.INTERNAL,
+      to: 'https://mydomain.com/#/licence_cmf/organization',
+      type: MENU_LINK_TYPE.V1,
       active: false,
     })
+    //
+    // expect(menuBuilder.build()).toEqual({
+    //   label: 'cmf_licence_generate',
+    //   icon: undefined,
+    //   to: '/cmf_licence_structure',
+    //   type: MENU_LINK_TYPE.INTERNAL,
+    //   active: false,
+    // })
   })
 
   test('has only rights for menu parameters', () => {
@@ -94,13 +102,23 @@ describe('build', () => {
         action === 'display' && subject === 'parameters_page',
     )
 
+    menuBuilder.organizationProfile.id = 123
+
     expect(menuBuilder.build()).toEqual({
       label: 'parameters',
       icon: undefined,
-      to: '/parameters',
-      type: MENU_LINK_TYPE.INTERNAL,
+      to: 'https://mydomain.com/#/main/edit/parameters/123',
+      type: MENU_LINK_TYPE.V1,
       active: false,
     })
+
+    // expect(menuBuilder.build()).toEqual({
+    //   label: 'parameters',
+    //   icon: undefined,
+    //   to: '/parameters',
+    //   type: MENU_LINK_TYPE.INTERNAL,
+    //   active: false,
+    // })
   })
 
   test('has only rights for menu place', () => {