Skip to content

Commit 42489c0

Browse files
stranckstranck
committed
Emails now properly work :)
They are now compiled + furizon image link updated
1 parent 374d689 commit 42489c0

23 files changed

+51
-25
lines changed

‎Dockerfile

+8-3
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,23 @@ FROM amazoncorretto:23-alpine
44
ENV APP_HOME=/app
55

66
COPY application-*.jar $APP_HOME/application.jar
7-
COPY templates/* $APP_HOME/templates/
8-
COPY *-key-autocart.rsa $APP_HOME/
7+
#COPY templates/* $APP_HOME/templates/jte/
8+
COPY prodkeys/*-key-autocart.rsa $APP_HOME/
9+
#COPY jte-classes/* $APP_HOME/jte-classes/
910

1011
RUN apk --no-cache -s upgrade && apk --no-cache upgrade
1112

1213
WORKDIR $APP_HOME
1314

1415
RUN addgroup --system --gid 1001 fz-backend
1516
RUN adduser --system --uid 1001 fz-backend
17+
#RUN mkdir $APP_HOME/data/
18+
#RUN mkdir -p $APP_HOME/jte-classes/gg/jte/generated/ondemand/
19+
#RUN chown fz-backend:fz-backend -R $APP_HOME/jte-classes/
20+
#RUN chown fz-backend:fz-backend $APP_HOME/data/
1621

1722
USER fz-backend
1823

1924
EXPOSE 9091
2025

21-
CMD ["java", "-XX:+UseG1GC", "-Xms1024m", "-Xmx1024m", "-XX:MaxGCPauseMillis=500", "-jar", "./application.jar"]
26+
CMD ["java", "-XX:+UseG1GC", "-Xms4096m", "-Xmx4096m", "-XX:MaxGCPauseMillis=500", "-jar", "./application.jar"]

‎application/pom.xml

+22-2
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@
115115
<dependency>
116116
<groupId>gg.jte</groupId>
117117
<artifactId>jte-spring-boot-starter-3</artifactId>
118-
<version>3.1.15</version>
118+
<version>${jte.version}</version>
119119
</dependency>
120120
<dependency>
121121
<groupId>gg.jte</groupId>
122122
<artifactId>jte</artifactId>
123-
<version>3.1.15</version>
123+
<version>${jte.version}</version>
124124
</dependency>
125125
</dependencies>
126126
<dependencyManagement>
@@ -151,6 +151,26 @@
151151
</execution>
152152
</executions>
153153
</plugin>
154+
<plugin>
155+
<groupId>gg.jte</groupId>
156+
<artifactId>jte-maven-plugin</artifactId>
157+
<version>${jte.version}</version>
158+
<configuration>
159+
<!-- This is the directory where your .jte files are located. -->
160+
<!--targetDirectory>${project.build.directory}/jte-classes</targetDirectory-->
161+
<sourceDirectory>${project.basedir}/../templates/jte</sourceDirectory>
162+
<contentType>Html</contentType>
163+
<!--binaryStaticContent>true</binaryStaticContent-->
164+
</configuration>
165+
<executions>
166+
<execution>
167+
<phase>generate-sources</phase>
168+
<goals>
169+
<goal>generate</goal>
170+
</goals>
171+
</execution>
172+
</executions>
173+
</plugin>
154174
</plugins>
155175
</build>
156176
</project>

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<guava.version>33.3.1-jre</guava.version>
3939
<uuid.creator.version>6.0.0</uuid.creator.version>
4040
<paseto4j.version>2024.3</paseto4j.version>
41+
<jte.version>3.1.15</jte.version>
4142
</properties>
4243
<dependencies>
4344
<dependency>

‎templates/jte/email_confirm.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</head>
2121
<div class="body">
2222
<div class="container">
23-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
23+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2424
<div>
2525
<h2 class="title">Confirm your email</h2>
2626
<p class="main-content">Click the following link to confirm your email and activate your account:</p>

‎templates/jte/exchange_initialized.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</head>
2525
<div class="body">
2626
<div class="container">
27-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
27+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2828
<div>
2929
<h2 class="title">Your accommodation got an update!</h2>
3030
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/invite_accepted.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<div class="body">
2323
<div class="container">
24-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
24+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2525
<div>
2626
<h2 class="title">Your room got an update!</h2>
2727
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/invite_refused.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<div class="body">
2323
<div class="container">
24-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
24+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2525
<div>
2626
<h2 class="title">Your room got an update!</h2>
2727
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/membership_card_fatal_error.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</head>
2525
<div class="body">
2626
<div class="container">
27-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
27+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2828
<div>
2929
<h2 class="title">Membership card management fatal error</h2>
3030
<p class="main-content">Order <b>${orderCode}</b> has already generated and REGISTERED the membeship card (<i>${cardId}/${cardIdInYear}</i>), BUT the order's owner has changed (<i>${orderPrevOwnerId} -> ${orderOwnerId}</i>).</p>

‎templates/jte/old_template.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</head>
2323
<div class="body">
2424
<div class="container">
25-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
25+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2626
<div>
2727
<h2 class="title">${title}</h2>
2828
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/order_duplicate_detected.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</head>
2424
<div class="body">
2525
<div class="container">
26-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
26+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2727
<div>
2828
<h2 class="title">You made a duplicate order</h2>
2929
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/password_changed.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</head>
2121
<div class="body">
2222
<div class="container">
23-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
23+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2424
<div>
2525
<h2 class="title">The password of your account has been changed</h2>
2626
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/password_reset.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</head>
2121
<div class="body">
2222
<div class="container">
23-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
23+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2424
<div>
2525
<h2 class="title">Reset the password of your account</h2>
2626
<p class="main-content">Click the following link to reset the password of your account:</p>

‎templates/jte/room_confirmed.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<div class="body">
2323
<div class="container">
24-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
24+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2525
<div>
2626
<h2 class="title">Your room got an update!</h2>
2727
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/room_deleted.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<div class="body">
2323
<div class="container">
24-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
24+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2525
<div>
2626
<h2 class="title">Your accommodation got an update!</h2>
2727
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/room_has_new_owner.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<div class="body">
2323
<div class="container">
24-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
24+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2525
<div>
2626
<h2 class="title">Your room got an update!</h2>
2727
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/room_kicked_from.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</head>
2323
<div class="body">
2424
<div class="container">
25-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
25+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2626
<div>
2727
<h2 class="title">Your accommodation got an update!</h2>
2828
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/room_unconfirmed.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<div class="body">
2323
<div class="container">
24-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
24+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2525
<div>
2626
<h2 class="title">Your room got an update!</h2>
2727
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/room_user_left.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<div class="body">
2323
<div class="container">
24-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
24+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2525
<div>
2626
<h2 class="title">Your room got an update!</h2>
2727
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/room_was_upgraded.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<div class="body">
2323
<div class="container">
24-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
24+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2525
<div>
2626
<h2 class="title">Your room got an update!</h2>
2727
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/sanity_check_deleted.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</head>
2323
<div class="body">
2424
<div class="container">
25-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
25+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2626
<div>
2727
<h2 class="title">Your room has failed our sanity checks.</h2>
2828
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/sanity_check_kick_owner.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</head>
2424
<div class="body">
2525
<div class="container">
26-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
26+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2727
<div>
2828
<h2 class="title">Your room has failed our sanity checks.</h2>
2929
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/sanity_check_kick_user.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</head>
2323
<div class="body">
2424
<div class="container">
25-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
25+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2626
<div>
2727
<h2 class="title">Your accommodation has failed our sanity checks.</h2>
2828
<p class="main-content">Dear ${fursonaName},</p>

‎templates/jte/too_many_login_attempts.jte

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</head>
1919
<div class="body">
2020
<div class="container">
21-
<img src="https://reg.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
21+
<img src="https://fzbe.furizon.net/res/furizon.png" alt="con_logo" title="con_logo" class="con-logo">
2222
<div>
2323
<h2 class="title">Your account was disabled</h2>
2424
<p class="main-content">Your Furizon account was disabled after too many failed login attempts. Please contact an administrator to re-enable the login.</p>

0 commit comments

Comments
 (0)