소스 검색

Merge branch 'develop' of gitlab.2iopenservice.com:opentalent/app into develop

Olivier Massot 1 년 전
부모
커밋
025a831040
32개의 변경된 파일27개의 추가작업 그리고 9개의 파일을 삭제
  1. 0 0
      assets/css/global.scss
  2. 1 1
      nuxt.config.ts
  3. 4 4
      pages/subscription.vue
  4. BIN
      public/favicon.ico
  5. BIN
      public/favicon/apple-touch-icon-114x114.png
  6. BIN
      public/favicon/apple-touch-icon-120x120.png
  7. BIN
      public/favicon/apple-touch-icon-144x144.png
  8. BIN
      public/favicon/apple-touch-icon-152x152.png
  9. BIN
      public/favicon/apple-touch-icon-57x57.png
  10. BIN
      public/favicon/apple-touch-icon-72x72.png
  11. BIN
      public/favicon/favicon-144x144.png
  12. BIN
      public/favicon/favicon-16x16.png
  13. BIN
      public/favicon/favicon-32x32.png
  14. BIN
      public/favicon/favicon.ico
  15. BIN
      public/favicon/mstile-144x144.png
  16. BIN
      public/images/Artist-Square.jpg
  17. BIN
      public/images/Opentalent_Artist.png
  18. BIN
      public/images/Opentalent_School.png
  19. BIN
      public/images/School-Square.jpg
  20. BIN
      public/resources/BDC_Achat_SMS_CMF.pdf
  21. BIN
      public/resources/BDC_Achat_SMS_Public.pdf
  22. BIN
      public/resources/BDC_Artist_Premium_CMF.pdf
  23. BIN
      public/resources/BDC_Artist_Premium_Public.pdf
  24. BIN
      public/resources/BDC_Nom_de_domaine.pdf
  25. BIN
      public/resources/BDC_Opentalent_Artist_CMF.pdf
  26. BIN
      public/resources/BDC_Opentalent_Artist_Public.pdf
  27. BIN
      public/resources/BDC_SMS_CMF.pdf
  28. BIN
      public/resources/BDC_SMS_Public.pdf
  29. BIN
      public/resources/Fiche_produit_Opentalent_Artist.pdf
  30. BIN
      public/resources/Fiche_produit_Opentalent_Manager.pdf
  31. BIN
      public/resources/Fiche_produit_Opentalent_School.pdf
  32. 22 4
      tests/units/services/layout/menuBuilder/configurationMenuBuilder.test.ts

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
assets/css/global.scss


+ 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: [

+ 4 - 4
pages/subscription.vue

@@ -144,7 +144,7 @@ Page 'Mon abonnement'
                   {{ $t('PRODUCT_ARTIST_PREMIUM') }}
                 </v-row>
                 <v-row class="align-end">
-                  <nuxt-img src="/images/Artist-Square.jpg" />
+                  <nuxt-img src="/images/Opentalent_Artist.png" />
                 </v-row>
                 <v-row>
                   <p>
@@ -216,12 +216,12 @@ Page 'Mon abonnement'
                   </p>
 
                   <p v-if="organizationProfile.isCmf" class="mt-3">
-                    <a href="/resources/BDC_Artist_Premium_CMF.pdf">
+                    <a href="/resources/BDC_Opentalent_Artist_CMF.pdf">
                       <b>{{ $t('download_cmf_order_form') }}</b>
                     </a>
                   </p>
                   <p v-else class="mt-3">
-                    <a href="/resources/BDC_Artist_Premium_Public.pdf">
+                    <a href="/resources/BDC_Opentalent_Artist_Public.pdf">
                       <b>{{ $t('download_order_form') }}</b>
                     </a>
                   </p>
@@ -234,7 +234,7 @@ Page 'Mon abonnement'
                   {{ $t('PRODUCT_SCHOOL') }}
                 </v-row>
                 <v-row class="align-end">
-                  <nuxt-img src="/images/School-Square.jpg" />
+                  <nuxt-img src="/images/Opentalent_School.png" />
                 </v-row>
                 <v-row>
                   <p>

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


BIN
public/images/Artist-Square.jpg


BIN
public/images/Opentalent_Artist.png


BIN
public/images/Opentalent_School.png


BIN
public/images/School-Square.jpg


BIN
public/resources/BDC_Achat_SMS_CMF.pdf


BIN
public/resources/BDC_Achat_SMS_Public.pdf


BIN
public/resources/BDC_Artist_Premium_CMF.pdf


BIN
public/resources/BDC_Artist_Premium_Public.pdf


BIN
public/resources/BDC_Nom_de_domaine.pdf


BIN
public/resources/BDC_Opentalent_Artist_CMF.pdf


BIN
public/resources/BDC_Opentalent_Artist_Public.pdf


BIN
public/resources/BDC_SMS_CMF.pdf


BIN
public/resources/BDC_SMS_Public.pdf


BIN
public/resources/Fiche_produit_Opentalent_Artist.pdf


BIN
public/resources/Fiche_produit_Opentalent_Manager.pdf


BIN
public/resources/Fiche_produit_Opentalent_School.pdf


+ 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', () => {

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.