Skip to content

Commit e030f57

Browse files
carlobeltramecarlobeltrame
committed
Consistent project naming
We use eCamp v3 for our instance, and ecamp3 for the source code repository, but never eCamp3
1 parent 4af9a1e commit e030f57

19 files changed

+32
-32
lines changed

‎.helm/ecamp3/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Deploying to a Kubernetes Cluster
22

3-
eCamp3 comes with a native integration with [Kubernetes](https://kubernetes.io/) and the [Helm](https://helm.sh/)
3+
eCamp v3 comes with a native integration with [Kubernetes](https://kubernetes.io/) and the [Helm](https://helm.sh/)
44
package manager.
55

66
[Learn how to deploy in the API platform documentation](https://api-platform.com/docs/deployment/kubernetes/).

‎.ops/aws-setup/Pulumi.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: ecamp-core
22
runtime: nodejs
3-
description: The aws setup for ecamp3
3+
description: The aws setup for eCamp v3

‎.ops/observability/grafana-dev.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@
13811381
},
13821382
"timepicker": {},
13831383
"timezone": "",
1384-
"title": "eCamp3",
1384+
"title": "eCamp v3",
13851385
"uid": "SfJlY9XVk",
13861386
"version": 4,
13871387
"weekStart": ""

‎.ops/observability/grafana-prod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@
13881388
},
13891389
"timepicker": {},
13901390
"timezone": "",
1391-
"title": "eCamp3",
1391+
"title": "eCamp v3",
13921392
"uid": "PxIt89u4z",
13931393
"version": 7,
13941394
"weekStart": ""

‎.ops/observability/grafana-staging.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@
13811381
},
13821382
"timepicker": {},
13831383
"timezone": "",
1384-
"title": "eCamp3",
1384+
"title": "eCamp v3",
13851385
"uid": "NMvj_XX4z",
13861386
"version": 5,
13871387
"weekStart": ""

‎CONTRIBUTING_DE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Wenn du Fragen hast, hinterlasse ein Kommentar auf dem Issue oder melde dich üb
2929

3030
### Git einrichten :octocat:
3131

32-
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.
32+
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.
3333
Wenn du ein fortgeschrittener Git-Benutzer bist, kannst du dies auch selbst einrichten.
3434
In der Praxis sieht die Einrichtung dieses Arbeitsablaufs wie folgt aus:
3535

‎api/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ SENTRY_ENVIRONMENT="local"
7171

7272
FRONTEND_BASE_URL="http://localhost:3000"
7373
MAIL_FROM_EMAIL="[email protected]"
74-
MAIL_FROM_NAME="eCamp3"
74+
MAIL_FROM_NAME="eCamp v3"
7575

7676
###> google/recaptcha ###
7777
# To use Google Recaptcha, you must register a site on Recaptcha's admin panel:

‎api/templates/emails/baseLayout.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ https://github.com/leemunroe/responsive-html-email-template
154154

155155
<tr>
156156
<td class="content-block powered-by">
157-
Powered by <a href="https://www.ecamp3.ch">eCamp3</a>
157+
Powered by <a href="https://www.ecamp3.ch">eCamp v3</a>
158158
</td>
159159
</tr>
160160

‎api/templates/emails/userActivation.de.html.twig

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{% set preheader = 'Willkommen bei eCamp3' %}
1+
{% set preheader = 'Willkommen bei eCamp v3' %}
22
{% extends 'emails/baseLayout.twig' %}
33

44
{% block content %}
5-
<h1>Willkommen bei eCamp3</h1>
5+
<h1>Willkommen bei eCamp v3</h1>
66
<p>Hallo {{ name }},</p>
77
<p>
88
Du hast dich soeben für eCamp registriert. <br />

‎api/templates/emails/userActivation.de.text.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Willkommen bei eCamp3
1+
Willkommen bei eCamp v3
22

33
Hallo {{ name | raw }},
44

‎api/templates/emails/userActivation.en.html.twig

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{% set preheader = 'Welcome to eCamp3' %}
1+
{% set preheader = 'Welcome to eCamp v3' %}
22
{% extends 'emails/baseLayout.twig' %}
33

44
{% block content %}
5-
<h1>Welcome to eCamp3</h1>
5+
<h1>Welcome to eCamp v3</h1>
66
<p>Hi {{ name }},</p>
77
<p>
88
We have just now received your registration for eCamp. <br />

‎api/templates/emails/userActivation.en.text.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Welcome to eCamp3
1+
Welcome to eCamp v3
22

33
We have just now received your registration for eCamp.
44

‎api/tests/Api/ResetPassword/ResetPasswordTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testPostResetPasswordResetsPasswordForAnonymousUser() {
3131
self::assertEmailCount(1);
3232
$mailerMessage = self::getMailerMessage();
3333
self::assertEmailAddressContains($mailerMessage, 'To', $user->getEmail());
34-
self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] Password reset');
34+
self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] Password reset');
3535

3636
self::assertEmailHtmlBodyContains($mailerMessage, $user->getDisplayName());
3737
self::assertEmailHtmlBodyContains($mailerMessage, 'http://localhost:3000/reset-password/');

‎api/tests/Service/MailServiceTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function testSendInviteToCampMailDeChScout() {
5252
self::assertEmailCount(1);
5353
$mailerMessage = self::getMailerMessage(0);
5454
self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
55-
self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] Du wurdest ins Lager "some camp" eingeladen');
55+
self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] Du wurdest ins Lager "some camp" eingeladen');
5656

5757
self::assertEmailHtmlBodyContains($mailerMessage, $this->camp->name);
5858
self::assertEmailHtmlBodyContains($mailerMessage, $this->user->getDisplayName());
@@ -89,7 +89,7 @@ public function testSendUserActivationMailDeChScout() {
8989
self::assertEmailCount(1);
9090
$mailerMessage = self::getMailerMessage(0);
9191
self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
92-
self::assertEmailHeaderSame($mailerMessage, 'subject', 'Willkommen bei eCamp3');
92+
self::assertEmailHeaderSame($mailerMessage, 'subject', 'Willkommen bei eCamp v3');
9393

9494
self::assertEmailHtmlBodyContains($mailerMessage, 'Willkommen');
9595
self::assertEmailHtmlBodyContains($mailerMessage, self::INVITE_KEY);
@@ -106,7 +106,7 @@ public function testSendUserActivationMailFr() {
106106
self::assertEmailCount(1);
107107
$mailerMessage = self::getMailerMessage(0);
108108
self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
109-
self::assertEmailHeaderSame($mailerMessage, 'subject', 'Welcome to eCamp3');
109+
self::assertEmailHeaderSame($mailerMessage, 'subject', 'Welcome to eCamp v3');
110110

111111
self::assertEmailHtmlBodyContains($mailerMessage, 'Welcome');
112112
self::assertEmailHtmlBodyContains($mailerMessage, self::INVITE_KEY);
@@ -140,7 +140,7 @@ public function testSendResetPasswordMailDeChScout() {
140140
self::assertEmailCount(1);
141141
$mailerMessage = self::getMailerMessage(0);
142142
self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
143-
self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] Passwort zurücksetzen');
143+
self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] Passwort zurücksetzen');
144144

145145
self::assertEmailHtmlBodyContains($mailerMessage, 'Passwort zurücksetzen');
146146
self::assertEmailHtmlBodyContains($mailerMessage, 'reset-password/some-id');
@@ -176,7 +176,7 @@ public function testSendEmailVerificationMail() {
176176
self::assertEmailCount(1);
177177
$mailerMessage = self::getMailerMessage(0);
178178
self::assertEmailAddressContains($mailerMessage, 'To', self::INVITE_MAIL);
179-
self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp3] E-Mail-Adresse verifizieren');
179+
self::assertEmailHeaderSame($mailerMessage, 'subject', '[eCamp v3] E-Mail-Adresse verifizieren');
180180

181181
self::assertEmailHtmlBodyContains($mailerMessage, 'Wir haben die Anfrage erhalten, deine E-Mail-Adresse bei eCamp zu ändern.');
182182
self::assertEmailHtmlBodyContains($mailerMessage, 'profile/verify-mail/some-id');

‎api/translations/email+intl-icu.de.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"inviteToCamp": {
3-
"subject": "[eCamp3] Du wurdest ins Lager \"{campName}\" eingeladen"
3+
"subject": "[eCamp v3] Du wurdest ins Lager \"{campName}\" eingeladen"
44
},
55
"userActivation": {
6-
"subject": "Willkommen bei eCamp3"
6+
"subject": "Willkommen bei eCamp v3"
77
},
88
"passwordReset": {
9-
"subject": "[eCamp3] Passwort zurücksetzen"
9+
"subject": "[eCamp v3] Passwort zurücksetzen"
1010
},
1111
"emailVerification": {
12-
"subject": "[eCamp3] E-Mail-Adresse verifizieren"
12+
"subject": "[eCamp v3] E-Mail-Adresse verifizieren"
1313
}
1414
}

‎api/translations/email+intl-icu.en.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"inviteToCamp": {
3-
"subject": "[eCamp3] You were invited to collaborate in camp \"{campName}\""
3+
"subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\""
44
},
55
"userActivation": {
6-
"subject": "Welcome to eCamp3"
6+
"subject": "Welcome to eCamp v3"
77
},
88
"passwordReset": {
9-
"subject": "[eCamp3] Password reset"
9+
"subject": "[eCamp v3] Password reset"
1010
},
1111
"emailVerification": {
12-
"subject": "[eCamp3] Verify email address"
12+
"subject": "[eCamp v3] Verify email address"
1313
}
1414
}

‎frontend/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<link rel="manifest" href="/manifest.webmanifest" />
3030
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
3131
<link rel="icon" href="/favicon.svg" />
32-
<title>eCamp3</title>
32+
<title>eCamp v3</title>
3333
<!-- consider enabling CDN for production
3434
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"> -->
3535
</head>

‎print/layouts/default.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ header.style = [
4141
4242
@page {
4343
font-family: "Helvetica", sans-serif;
44-
size: A4 portrait;
44+
size: A4 portrait;
4545
margin-bottom: 15mm;
4646
margin-left: 15mm;
4747
margin-right: 15mm;
4848
margin-top: 15mm;
4949
5050
@top-center {
51-
content: 'eCamp3';
51+
content: 'eCamp v3';
5252
font-size: var(--ecamp-margin-font-size);
5353
}
5454
@bottom-center {

‎print/server/api/pdf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export default defineEventHandler(async (event) => {
119119
format: 'A4',
120120
scale: 1,
121121
displayHeaderFooter: true,
122-
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>`,
122+
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>`,
123123
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>`,
124124
margin: {
125125
bottom: '15mm',

0 commit comments

Comments
 (0)