Skip to content

Commit

Permalink
change discord and forum urls to global locales
Browse files Browse the repository at this point in the history
  • Loading branch information
beckpaul committed Jan 9, 2024
1 parent 1030488 commit 2ac1962
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 18 deletions.
3 changes: 2 additions & 1 deletion src/backend/AppKernel.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ class AppKernel {

bootstrapExpress() {
this.expressApp = express()

this.expressApp.locals.discordUrl = 'https://discord.gg/mXahVSKGVb'
this.expressApp.locals.forumUrl = 'https://forum.faforever.com/'
this.expressApp.locals.clanInvitations = {}
this.expressApp.use((req, res, next) => {
res.locals.navLinks = []
Expand Down
12 changes: 6 additions & 6 deletions src/backend/templates/layouts/default.pug
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ html(lang='en')
.topNavContainer
a.topnav_item(href='/donation') Support FAF
.topNavContainer
a.topnav_item(href='https://forum.faforever.com/') Forums
a.topnav_item(href=forumUrl) Forums
.topNavContainer
a.topnav_item(href='https://wiki.faforever.com/en/home') Wiki
.topNavContainer
a(href='https://discord.gg/mXahVSKGVb')
a(href=discordUrl)
img(src='/images/fontAwesomeIcons/discord.svg')
.topNavContainer
a(href='https://www.youtube.com/c/ForgedAllianceForever')
Expand Down Expand Up @@ -211,7 +211,7 @@ html(lang='en')
a(href='/logout') Log Out

.mobileSocialMedia
a(href='https://discord.gg/mXahVSKGVb')
a(href=discordUrl)
img(src='/images/fontAwesomeIcons/discord.svg')
a(href='https://www.twitch.tv/faflive')
img(src='/images/fontAwesomeIcons/twitch.svg')
Expand All @@ -220,7 +220,7 @@ html(lang='en')
a(href='https://github.com/FAForever')
img(src='/images/fontAwesomeIcons/github.svg')
.mobileOtherLinks
a(href='https://forum.faforever.com/') Forums
a(href=forumUrl) Forums
a(href='https://wiki.faforever.com/en/home') FAF Wiki
.splatForgedBorder.transformationReverse.absoluteBottom
.movingBackground1
Expand Down Expand Up @@ -288,9 +288,9 @@ html(lang='en')

ul CONTACT US
li
a(href='https://discord.gg/mXahVSKGVb') DISCORD
a(href=discordUrl) DISCORD
li
a(href='https://forum.faforever.com/') FORUMS
a(href=forumUrl) FORUMS

script(src=webpackAssetJS('navigation'))
script(
Expand Down
8 changes: 6 additions & 2 deletions src/backend/templates/views/account/register.pug
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ block content

hr
h3 Lost account / returning player

p If you have a FAF account you can no longer access, please attempt to <a href="https://help.steampowered.com/en/wizard/HelpWithLoginInfo?reset=1&issueid=408" target="_blank">reset your Steam password</a>. For further assistance, contact the moderation team via <a href="https://discord.gg/mXahVSKGVb" target="_blank"/>Discord</a> or the <a href="https://forum.faforever.com/" target="_blank">Forums</a>.
p If you have a FAF account you can no longer access, please attempt to &nbsp
a(href="https://help.steampowered.com/en/wizard/HelpWithLoginInfo?reset=1&issueid=408" target="_blank") reset your Steam password.
| &nbspFor further assistance, contact the moderation team via&nbsp
a(href=discordUrl target="_blank") Discord
| or the&nbsp
a(href=forumUrl target="_blank") Forums.
p Creating and operating multiple accounts is prohibited, and creating a secondary account will lead to moderation action.
form(
method='post',
Expand Down
2 changes: 1 addition & 1 deletion src/backend/templates/views/campaign-missions.pug
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ block content
p FAF has implemented the co-op feature into the campaign. This means now you can play either of the four original campaigns with up to three friends (four players)! But! That's not all, FAF contributors are also working on creating two new campaigns! One for Seraphim and another one for the coalition! However, be warned that the new campaigns are meant to present a real challenge to seasoned players. If you need some help or have questions, feel free joining the FAF Campaign Development Discord or the FAF Discord!
a(href='https://discord.gg/ayzAVr9JUV')
button Campaign Discord
a(href='https://discord.gg/mXahVSKGVb')
a(href=discordUrl)
button Official Discord
.mainShowcase
.showcaseContainer.column6
Expand Down
2 changes: 1 addition & 1 deletion src/backend/templates/views/contribution.pug
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ block content
h2.highlightText Fixing bugs, killing lag
h1 Game development
p Want to help fix a game issue? Create your own Co-op mission? Then you can help with development on Github. To start, join our discord so that you can talk with the correct dev and invite you to our Zulip. It is recommended (but not necessary!) knowing some Lua for game developlment, Python for the server work or Java for the FAF client.
a(target='_blank', href='https://discord.gg/mXahVSKGVb')
a(target='_blank', href=discordUrl)
button Join our Discord
a(target='_blank', href='https://github.com/faforever/')
button FAF repository
Expand Down
6 changes: 3 additions & 3 deletions src/backend/templates/views/index.pug
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ block content
h2.highlightText Thriving community
h1 Make new friends or foes
p Our diverse playerbase makes sure you have a spot in our community. Whether you want to experience surviving against waves of enemy AI, play custom games, rise in the matchmaking ladder or just have fun with friends, FAF has a space for you.
a(href='https://discord.gg/kTsxKu52WU')
a(href=discordUrl)
button Join our Discord
a(href='https://forum.faforever.com')
a(href=forumUrl)
button FAF forums
.mainShowcase
.showcaseContainer.column6
Expand Down Expand Up @@ -114,5 +114,5 @@ block content
.bannerContainer.column12
a(href='/play')
button PLAY NOW
a(href='https://discord.gg/mXahVSKGVb')
a(href=discordUrl)
button Join our Discord
4 changes: 2 additions & 2 deletions src/backend/templates/views/newshub.pug
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ body
.featureLink.featureDiscord.column4
a(
target='_blank',
href='https://discord.gg/mXahVSKGVb'
href=discordUrl
)
img(src='/../../images/logos/discord.svg', alt='')
.featureLink.featureTwitch.column4
Expand Down Expand Up @@ -102,7 +102,7 @@ body
) Community Guides
.clientMenuContainer.column2
ul COMMUNITY
a(target='_blank', href='https://forum.faforever.com/') Forums
a(target='_blank', href=forumUrl) Forums
a(
target='_blank',
href='https://kazbek.github.io/FAF-Analytics/'
Expand Down
4 changes: 2 additions & 2 deletions src/backend/templates/views/play.pug
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ block content
button Download FAF
br
br
a(href='https://discord.gg/mXahVSKGVb')
a(href=discordUrl)
button Discord
a(href='https://forum.faforever.com/')
a(href=forumUrl)
button Forum
a(href='https://wiki.faforever.com/en/Play/Linux-Install')
button Linux Installation
Expand Down

0 comments on commit 2ac1962

Please sign in to comment.