Merge branch 'production' into 'master'
# Conflicts: # src/views/ForFreshmenPage/ForFreshmenPageHero.tsx
This commit is contained in:
@@ -70,7 +70,8 @@ const ForFreshmenPageView: React.FC = () => (
|
||||
|
||||
<h6>Freshmen captains</h6>
|
||||
<p>
|
||||
We are your freshman captains <strong>Teemu</strong> and <strong>Henri</strong> and we'll be here to support you and monitor your progress throughout the freshman year adventures toward earning your engineer's hat (= teekkarilakki),
|
||||
We are your freshman captains <strong>Teemu</strong> and <strong>Henri</strong> and we'll be here to support you and monitor your
|
||||
progress throughout the freshman year adventures toward earning your engineer's hat (= teekkarilakki),
|
||||
which you might possibly earn during May Day next spring.
|
||||
If you have any questions, feel free to contact us via <Link to={TG_GROUP_CHAT_LINK} target="_blank">Telegram</Link> or <a href={EMAIL_LINK_MAILTO}>email</a>.
|
||||
</p>
|
||||
@@ -100,7 +101,7 @@ const ForFreshmenPageView: React.FC = () => (
|
||||
Join the guild!
|
||||
</PageLink>
|
||||
<PageLink to={FUKSI_POINTS_LINK} desc="Take a look at the fuksipoints ›">
|
||||
Fuksipoint guide
|
||||
Fuksipoint guide - This will be translated later so don't worry if you don't understand Finnish!
|
||||
</PageLink>
|
||||
</div>
|
||||
<div>
|
||||
@@ -114,7 +115,8 @@ const ForFreshmenPageView: React.FC = () => (
|
||||
|
||||
<p>
|
||||
It's a good idea to take a look at the fuksiguide before starting your studies!
|
||||
The guide will appear to this page sooner than you might expect! <Link to="https://en.wikipedia.org/wiki/Rickrolling" target="_blank">here!</Link>.
|
||||
The guide contains lots of useful information about the guild, the student union, and the student life in Otaniemi.
|
||||
You can find the guide <Link to="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_en_web.pdf" target="_blank">here</Link>.
|
||||
</p>
|
||||
<br />
|
||||
<h6>Telegram?</h6>
|
||||
@@ -129,7 +131,7 @@ const ForFreshmenPageView: React.FC = () => (
|
||||
src="https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2025.jpg"
|
||||
/>
|
||||
<p>or <Link to={TG_GROUP_CHAT_LINK} target="_blank">press me!</Link></p>
|
||||
<p>Also join the notifications channel fo SIK fuksis, to stay in the loop!:</p>
|
||||
<p>Also join the notifications channel for SIK fuksis, to stay in the loop!:</p>
|
||||
<QRImages
|
||||
src="https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-tiedotus-2025.jpg"
|
||||
/>
|
||||
|
||||
@@ -96,7 +96,7 @@ const FreshmenPageView: React.FC = () => (
|
||||
Fuksikipparit tavoitat
|
||||
</PageLink>
|
||||
<PageLink to="https://api.sahkoinsinoorikilta.fi/members/application" desc="ja tule mukaan toimintaamme ›">
|
||||
Liity jäseneksi
|
||||
Liity jäseneksi tästä
|
||||
</PageLink>
|
||||
<PageLink to={FUKSI_POINTS_LINK} desc="Katso fuksipisteitä ›">
|
||||
Fuksipisteohje
|
||||
|
||||
+6
-1
@@ -4,8 +4,13 @@ services:
|
||||
frontend:
|
||||
image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-frontend:prod
|
||||
deploy:
|
||||
replicas: 1
|
||||
replicas: 2 # TEMP 2 for testing
|
||||
update_config:
|
||||
order: start-first
|
||||
ports:
|
||||
- 3000:3000
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
|
||||
Reference in New Issue
Block a user