浏览代码

update .env, readme, and minor fixes

Olivier Massot 2 年之前
父节点
当前提交
76835fb7c2
共有 6 个文件被更改,包括 51 次插入40 次删除
  1. 1 2
      .env.docker
  2. 10 0
      .env.prod
  3. 2 1
      .env.test
  4. 6 6
      README.md
  5. 0 2
      components/Layout/SubHeader/ActivityYear.vue
  6. 32 29
      pages/subscription.vue

+ 1 - 2
.env.docker

@@ -27,9 +27,8 @@ NUXT_PUBLIC_BASE_URL_TYPO3=https://local.sub.opentalent.fr/###subDomain###
 # Mercure push events
 NUXT_BASE_URL_MERCURE=https://mercure/.well-known/mercure
 NUXT_PUBLIC_BASE_URL_MERCURE=https://local.mercure.opentalent.fr/.well-known/mercure
+MERCURE_SUBSCRIBER_JWT_KEY=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM
 
 # Other links
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.opentalent.fr/
-
-MERCURE_SUBSCRIBER_JWT_KEY=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM

+ 10 - 0
.env.prod

@@ -2,6 +2,9 @@
 # /!\ -- USE ONLY IN PRODUCTION --
 DEBUG=0
 
+HOST=0
+PORT=3002
+
 # Current env
 NUXT_ENV=production
 NUXT_PUBLIC_ENV=production
@@ -22,5 +25,12 @@ NUXT_PUBLIC_BASE_URL_ADMIN_LEGACY=https://admin.opentalent.fr/#
 NUXT_BASE_URL_TYPO3=https://###subDomain###.opentalent.fr
 NUXT_PUBLIC_BASE_URL_TYPO3=https://###subDomain###.opentalent.fr
 
+# Mercure push events
+NUXT_BASE_URL_MERCURE=https://mercure.opentalent.fr/.well-known/mercure
+NUXT_PUBLIC_BASE_URL_MERCURE=https://mercure.opentalent.fr/.well-known/mercure
+MERCURE_SUBSCRIBER_JWT_KEY=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM
+
 # Other links
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
+NUXT_PUBLIC_SUPPORT_URL=https://support.opentalent.fr/
+

+ 2 - 1
.env.test

@@ -1,4 +1,5 @@
 ## TEST ENVIRONMENT FILE
+
 DEBUG=1
 
 HOST=0
@@ -27,9 +28,9 @@ NUXT_PUBLIC_BASE_URL_TYPO3=https://test1.opentalent.fr/###subDomain###
 # Mercure push events
 NUXT_BASE_URL_MERCURE=https://mercure.test.opentalent.fr/.well-known/mercure
 NUXT_PUBLIC_BASE_URL_MERCURE=https://mercure.test.opentalent.fr/.well-known/mercure
+MERCURE_SUBSCRIBER_JWT_KEY=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM
 
 # Other links
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.opentalent.fr/
 
-MERCURE_SUBSCRIBER_JWT_KEY=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM

+ 6 - 6
README.md

@@ -1,14 +1,14 @@
-# App - Migration Nuxt 3
+# App
 
-[![Latest Release](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/-/badges/release.svg)](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/-/releases)
+[![Latest Release](http://gitlab.2iopenservice.com/opentalent/app/-/badges/release.svg)](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/-/releases)
 
 | Branch  | Status                                                                                                                                                                         | Coverage                                                                                                                                                                       |
 |---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| master  | [![pipeline status](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/badges/master/pipeline.svg)](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/-/commits/master)   | [![coverage report](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/badges/master/coverage.svg)](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/-/commits/master)   |
-| develop | [![pipeline status](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/badges/develop/pipeline.svg)](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/-/commits/develop) | [![coverage report](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/badges/develop/coverage.svg)](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/-/commits/develop) |
+| master  | [![pipeline status](http://gitlab.2iopenservice.com/opentalent/app/badges/master/pipeline.svg)](http://gitlab.2iopenservice.com/opentalent/app/-/commits/master)   | [![coverage report](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/badges/master/coverage.svg)](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/-/commits/master)   |
+| develop | [![pipeline status](http://gitlab.2iopenservice.com/opentalent/app/badges/develop/pipeline.svg)](http://gitlab.2iopenservice.com/opentalent/app/-/commits/develop) | [![coverage report](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/badges/develop/coverage.svg)](http://gitlab.2iopenservice.com/opentalent/app_nuxt3/-/commits/develop) |
 
 
-Frontend développé avec NuxtJs 3
+Frontend Opentalent, avec NuxtJs 3
 
 A voir :
 
@@ -26,7 +26,7 @@ A voir :
 
 Cloner le projet :
 
-    git clone git@gitlab.2iopenservice.com:opentalent/app_nuxt3.git
+    git clone git@gitlab.2iopenservice.com:opentalent/app.git
 
 
 Installer les dépendances :

+ 0 - 2
components/Layout/SubHeader/ActivityYear.vue

@@ -32,10 +32,8 @@ import {useFormStore} from "~/stores/form";
 import {useOrganizationProfileStore} from "~/stores/organizationProfile";
 import {useAccessProfileStore} from "~/stores/accessProfile";
 import Access from "~/models/Access/Access";
-import {Ref, ref} from "@vue/reactivity";
 import {useDisplay} from "vuetify";
 import {usePageStore} from "~/stores/page";
-import MyProfile from "~/models/Access/MyProfile";
 
 const { em } = useEntityManager()
 const accessProfileStore = useAccessProfileStore()

+ 32 - 29
pages/subscription.vue

@@ -233,35 +233,38 @@ Page 'Mon abonnement'
                   <nuxt-img src="/images/nom-de-domaine.jpg" />
                 </v-row>
                 <v-row>
-                  <p>
-                    <b>{{ $t('get_your_own_domain_and_up_to_five_emails_for_only_x_eur_ttc_per_month', { price: formatCurrency(34.80, 'EUR') }) }}</b>
-                  </p>
-
-                  <p>{{ $t('example') }} :</p>
-                  <table>
-                    <tbody>
-                    <tr>
-                      <td style="width: 190px;">
-                        {{ $t('domain_name') }} :
-                      </td>
-                      <td>
-                        <i>{{ $t('dummy_domain_name') }}</i>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>{{ $t('associated_mail_address') }} : </td>
-                      <td>
-                        <i>{{ $t('dummy_email_address') }}</i>
-                      </td>
-                    </tr>
-                    </tbody>
-                  </table>
-
-                  <p>
-                    <a href="/resources/BDC_Nom_de_domaine.pdf" target="_blank">
-                      <b>{{ $t('download_order_form') }}</b>
-                    </a>
-                  </p>
+                    <v-col>
+                      <p>
+                        <b>{{ $t('get_your_own_domain_and_up_to_five_emails_for_only_x_eur_ttc_per_month', { price: formatCurrency(34.80, 'EUR') }) }}</b>
+                      </p>
+
+                      <p>{{ $t('example') }} :</p>
+
+                      <table>
+                        <tbody>
+                        <tr>
+                          <td class="pa-2" style="width: 190px;">
+                            {{ $t('domain_name') }} :
+                          </td>
+                          <td>
+                            <i>{{ $t('dummy_domain_name') }}</i>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td class="pa-2">{{ $t('associated_mail_address') }} : </td>
+                          <td>
+                            <i>{{ $t('dummy_email_address') }}</i>
+                          </td>
+                        </tr>
+                        </tbody>
+                      </table>
+
+                      <p>
+                        <a href="/resources/BDC_Nom_de_domaine.pdf" target="_blank">
+                          <b>{{ $t('download_order_form') }}</b>
+                        </a>
+                      </p>
+                    </v-col>
                 </v-row>
               </v-col>
             </v-row>