Merge pull request #4741 from carlobeltrame/naming

Consistent project naming
ecamp · Mar 6, 2024 · f8f250c · f8f250c
2 parents ae799e8 + e030f57
commit f8f250c
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 32 deletions.
diff --git a/.helm/ecamp3/README.md b/.helm/ecamp3/README.md
@@ -1,6 +1,6 @@
 # Deploying to a Kubernetes Cluster
 
-eCamp3 comes with a native integration with [Kubernetes](https://kubernetes.io/) and the [Helm](https://helm.sh/)
+eCamp v3 comes with a native integration with [Kubernetes](https://kubernetes.io/) and the [Helm](https://helm.sh/)
 package manager.
 
 [Learn how to deploy in the API platform documentation](https://api-platform.com/docs/deployment/kubernetes/).
diff --git a/.ops/aws-setup/Pulumi.yaml b/.ops/aws-setup/Pulumi.yaml
@@ -1,3 +1,3 @@
 name: ecamp-core
 runtime: nodejs
-description: The aws setup for ecamp3
+description: The aws setup for eCamp v3
diff --git a/.ops/observability/grafana-dev.json b/.ops/observability/grafana-dev.json
@@ -1381,7 +1381,7 @@
   },
   "timepicker": {},
   "timezone": "",
-  "title": "eCamp3",
+  "title": "eCamp v3",
   "uid": "SfJlY9XVk",
   "version": 4,
   "weekStart": ""

diff --git a/.ops/observability/grafana-prod.json b/.ops/observability/grafana-prod.json
@@ -1388,7 +1388,7 @@
   },
   "timepicker": {},
   "timezone": "",
-  "title": "eCamp3",
+  "title": "eCamp v3",
   "uid": "PxIt89u4z",
   "version": 7,
   "weekStart": ""

diff --git a/.ops/observability/grafana-staging.json b/.ops/observability/grafana-staging.json
@@ -1381,7 +1381,7 @@
   },
   "timepicker": {},
   "timezone": "",
-  "title": "eCamp3",
+  "title": "eCamp v3",
   "uid": "NMvj_XX4z",
   "version": 5,
   "weekStart": ""

diff --git a/CONTRIBUTING_DE.md b/CONTRIBUTING_DE.md
@@ -29,7 +29,7 @@ Wenn du Fragen hast, hinterlasse ein Kommentar auf dem Issue oder melde dich üb
 
 ### Git einrichten :octocat:
 
-Wir wenden einen triangulären Git-Workflow an. Das bedeutet, dass alle Code-Änderungen zuerst auf dem Fork des Entwicklers veröffentlicht werden, und erst dann werden die Änderungen via Pull Request in das offizielle eCamp3-Repository eingefügt.
+Wir wenden einen triangulären Git-Workflow an. Das bedeutet, dass alle Code-Änderungen zuerst auf dem Fork des Entwicklers veröffentlicht werden, und erst dann werden die Änderungen via Pull Request in das offizielle ecamp3-Repository eingefügt.
 Wenn du ein fortgeschrittener Git-Benutzer bist, kannst du dies auch selbst einrichten.
 In der Praxis sieht die Einrichtung dieses Arbeitsablaufs wie folgt aus:
 

diff --git a/api/.env b/api/.env
@@ -71,7 +71,7 @@ SENTRY_ENVIRONMENT="local"
 
 FRONTEND_BASE_URL="http://localhost:3000"
 MAIL_FROM_EMAIL="no-reply@ecamp3.ch"
-MAIL_FROM_NAME="eCamp3"
+MAIL_FROM_NAME="eCamp v3"
 
 ###> google/recaptcha ###
 # To use Google Recaptcha, you must register a site on Recaptcha's admin panel:

diff --git a/api/templates/emails/baseLayout.twig b/api/templates/emails/baseLayout.twig
@@ -154,7 +154,7 @@ https://github.com/leemunroe/responsive-html-email-template
 
                  <tr>
                   <td class="content-block powered-by">
-                    Powered by <a href="https://www.ecamp3.ch">eCamp3</a>
+                    Powered by <a href="https://www.ecamp3.ch">eCamp v3</a>
                   </td>
                 </tr>
 

diff --git a/api/templates/emails/userActivation.de.html.twig b/api/templates/emails/userActivation.de.html.twig
@@ -1,8 +1,8 @@
-{% set preheader = 'Willkommen bei eCamp3' %}
+{% set preheader = 'Willkommen bei eCamp v3' %}
 {% extends 'emails/baseLayout.twig' %}
 
 {% block content %}
-    <h1>Willkommen bei eCamp3</h1>
+    <h1>Willkommen bei eCamp v3</h1>
     <p>Hallo {{ name }},</p>
     <p>
         Du hast dich soeben für eCamp registriert. <br />

diff --git a/api/templates/emails/userActivation.de.text.twig b/api/templates/emails/userActivation.de.text.twig
@@ -1,4 +1,4 @@
-Willkommen bei eCamp3
+Willkommen bei eCamp v3
 
 Hallo {{ name | raw }},
 

diff --git a/api/templates/emails/userActivation.en.html.twig b/api/templates/emails/userActivation.en.html.twig
@@ -1,8 +1,8 @@
-{% set preheader = 'Welcome to eCamp3' %}
+{% set preheader = 'Welcome to eCamp v3' %}
 {% extends 'emails/baseLayout.twig' %}
 
 {% block content %}
-    <h1>Welcome to eCamp3</h1>
+    <h1>Welcome to eCamp v3</h1>
     <p>Hi {{ name }},</p>
     <p>
         We have just now received your registration for eCamp. <br />

diff --git a/api/templates/emails/userActivation.en.text.twig b/api/templates/emails/userActivation.en.text.twig
@@ -1,4 +1,4 @@
-Welcome to eCamp3
+Welcome to eCamp v3
 
 We have just now received your registration for eCamp.
 

diff --git a/api/tests/Api/ResetPassword/ResetPasswordTest.php b/api/tests/Api/ResetPassword/ResetPasswordTest.php
@@ -31,7 +31,7 @@ public function testPostResetPasswordResetsPasswordForAnonymousUser() {
         self::assertEmailCount(1);
         $mailerMessage = self::getMailerMessage();
         self::assertEmailAddressContains($mailerMessage, 'To', $user->getEmail());
-        self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] Password reset');
+        self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] Password reset');
 
         self::assertEmailHtmlBodyContains($mailerMessage, $user->getDisplayName());
         self::assertEmailHtmlBodyContains($mailerMessage, 'http://localhost:3000/reset-password/');

diff --git a/api/tests/Service/MailServiceTest.php b/api/tests/Service/MailServiceTest.php
@@ -52,7 +52,7 @@ public function testSendInviteToCampMailDeChScout() {
         self::assertEmailCount(1);
         $mailerMessage = self::getMailerMessage(0);
         self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
-        self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] Du wurdest ins Lager "some camp" eingeladen');
+        self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] Du wurdest ins Lager "some camp" eingeladen');
 
         self::assertEmailHtmlBodyContains($mailerMessage, $this->camp->name);
         self::assertEmailHtmlBodyContains($mailerMessage, $this->user->getDisplayName());
@@ -89,7 +89,7 @@ public function testSendUserActivationMailDeChScout() {
         self::assertEmailCount(1);
         $mailerMessage = self::getMailerMessage(0);
         self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
-        self::assertEmailHeaderSame($mailerMessage, 'subject', 'Willkommen bei eCamp3');
+        self::assertEmailHeaderSame($mailerMessage, 'subject', 'Willkommen bei eCamp v3');
 
         self::assertEmailHtmlBodyContains($mailerMessage, 'Willkommen');
         self::assertEmailHtmlBodyContains($mailerMessage, self::INVITE_KEY);
@@ -106,7 +106,7 @@ public function testSendUserActivationMailFr() {
         self::assertEmailCount(1);
         $mailerMessage = self::getMailerMessage(0);
         self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
-        self::assertEmailHeaderSame($mailerMessage, 'subject', 'Welcome to eCamp3');
+        self::assertEmailHeaderSame($mailerMessage, 'subject', 'Welcome to eCamp v3');
 
         self::assertEmailHtmlBodyContains($mailerMessage, 'Welcome');
         self::assertEmailHtmlBodyContains($mailerMessage, self::INVITE_KEY);
@@ -140,7 +140,7 @@ public function testSendResetPasswordMailDeChScout() {
         self::assertEmailCount(1);
         $mailerMessage = self::getMailerMessage(0);
         self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
-        self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] Passwort zurücksetzen');
+        self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] Passwort zurücksetzen');
 
         self::assertEmailHtmlBodyContains($mailerMessage, 'Passwort zurücksetzen');
         self::assertEmailHtmlBodyContains($mailerMessage, 'reset-password/some-id');
@@ -176,7 +176,7 @@ public function testSendEmailVerificationMail() {
         self::assertEmailCount(1);
         $mailerMessage = self::getMailerMessage(0);
         self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
-        self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] E-Mail-Adresse verifizieren');
+        self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] E-Mail-Adresse verifizieren');
 
         self::assertEmailHtmlBodyContains($mailerMessage, 'Wir haben die Anfrage erhalten, deine E-Mail-Adresse bei eCamp zu ändern.');
         self::assertEmailHtmlBodyContains($mailerMessage, 'profile/verify-mail/some-id');

diff --git a/api/translations/email+intl-icu.de.json b/api/translations/email+intl-icu.de.json
@@ -1,14 +1,14 @@
 {
     "inviteToCamp": {
-        "subject": "[eCamp3] Du wurdest ins Lager \"{campName}\" eingeladen"
+        "subject": "[eCamp v3] Du wurdest ins Lager \"{campName}\" eingeladen"
     },
     "userActivation": {
-        "subject": "Willkommen bei eCamp3"
+        "subject": "Willkommen bei eCamp v3"
     },
     "passwordReset": {
-        "subject": "[eCamp3] Passwort zurücksetzen"
+        "subject": "[eCamp v3] Passwort zurücksetzen"
     },
     "emailVerification": {
-        "subject": "[eCamp3] E-Mail-Adresse verifizieren"
+        "subject": "[eCamp v3] E-Mail-Adresse verifizieren"
     }
 }
diff --git a/api/translations/email+intl-icu.en.json b/api/translations/email+intl-icu.en.json
@@ -1,14 +1,14 @@
 {
     "inviteToCamp": {
-        "subject": "[eCamp3] You were invited to collaborate in camp \"{campName}\""
+        "subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\""
     },
     "userActivation": {
-        "subject": "Welcome to eCamp3"
+        "subject": "Welcome to eCamp v3"
     },
     "passwordReset": {
-        "subject": "[eCamp3] Password reset"
+        "subject": "[eCamp v3] Password reset"
     },
     "emailVerification": {
-        "subject": "[eCamp3] Verify email address"
+        "subject": "[eCamp v3] Verify email address"
     }
 }
diff --git a/frontend/index.html b/frontend/index.html
@@ -29,7 +29,7 @@
     <link rel="manifest" href="/manifest.webmanifest" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link rel="icon" href="/favicon.svg" />
-    <title>eCamp3</title>
+    <title>eCamp v3</title>
     <!-- consider enabling CDN for production
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"> -->
   </head>

diff --git a/print/layouts/default.vue b/print/layouts/default.vue
@@ -41,14 +41,14 @@ header.style = [
 
                     @page {
                       font-family: "Helvetica", sans-serif;
-                      size: A4 portrait;              
+                      size: A4 portrait;
                       margin-bottom: 15mm;
                       margin-left: 15mm;
                       margin-right: 15mm;
                       margin-top: 15mm;
 
                       @top-center {
-                        content: 'eCamp3';
+                        content: 'eCamp v3';
                         font-size: var(--ecamp-margin-font-size);
                       }
                       @bottom-center {

diff --git a/print/server/api/pdf.js b/print/server/api/pdf.js
@@ -119,7 +119,7 @@ export default defineEventHandler(async (event) => {
       format: 'A4',
       scale: 1,
       displayHeaderFooter: true,
-      headerTemplate: `<div id="header-template" style="font-size:7pt; text-align: center; width: 100%; font-family: Helvetica, sans-serif; font-weight: 500"><span>eCamp3 Beta</span></div>`,
+      headerTemplate: `<div id="header-template" style="font-size:7pt; text-align: center; width: 100%; font-family: Helvetica, sans-serif; font-weight: 500"><span>eCamp v3 Beta</span></div>`,
       footerTemplate: `<div id="footer-template" style="font-size:7pt; text-align: center; width: 100%; font-family: Helvetica, sans-serif; font-weight: 500"><span class="pageNumber"></span> / <span class="totalPages"></span></div>`,
       margin: {
         bottom: '15mm',