added setting to turn off map

This commit is contained in:
leca 2025-02-10 04:00:55 +00:00
parent 8a4f98c5fd
commit c420f643b7
4 changed files with 16 additions and 8 deletions

View File

@ -8,3 +8,5 @@ PORT=3000
REQUIRE_TOKEN=false REQUIRE_TOKEN=false
DELETE_TOKEN_ON_USE=true DELETE_TOKEN_ON_USE=true
WS_CONNECTION_STRING=wss://auth.foxarmy.org WS_CONNECTION_STRING=wss://auth.foxarmy.org
ENABLE_WORLDMAP=true
WORLDMAP_URL=http://localhost/map

View File

@ -31,7 +31,8 @@ UserRouter.get(['/index', '/skin'], auth.authenticate, async (req, res) => {
return res.render('skin.pug', { return res.render('skin.pug', {
username: username, username: username,
can_have_cloak: await UserService.canHaveCloak(username) can_have_cloak: await UserService.canHaveCloak(username),
enable_worldmap: process.env.ENABLE_WORLDMAP
}); });
}); });
@ -39,7 +40,8 @@ UserRouter.get('/changepassword', auth.authenticate, async (req, res) => {
const username = jwt.decode(req.cookies["jwt"]).username; const username = jwt.decode(req.cookies["jwt"]).username;
return res.render('changepassword.pug', { return res.render('changepassword.pug', {
can_have_cloak: await UserService.canHaveCloak(username) can_have_cloak: await UserService.canHaveCloak(username),
enable_worldmap: process.env.ENABLE_WORLDMAP
}); });
}); });
@ -47,7 +49,8 @@ UserRouter.get('/chat', auth.authenticate, async (req, res) => {
const username = jwt.decode(req.cookies["jwt"]).username; const username = jwt.decode(req.cookies["jwt"]).username;
return res.render('chat.pug', { return res.render('chat.pug', {
can_have_cloak: await UserService.canHaveCloak(username) can_have_cloak: await UserService.canHaveCloak(username),
enable_worldmap: process.env.ENABLE_WORLDMAP
}); });
}); });
@ -55,7 +58,9 @@ UserRouter.get('/worldmap', auth.authenticate, async (req, res) => {
const username = jwt.decode(req.cookies["jwt"]).username; const username = jwt.decode(req.cookies["jwt"]).username;
return res.render('worldmap.pug', { return res.render('worldmap.pug', {
can_have_cloak: await UserService.canHaveCloak(username) can_have_cloak: await UserService.canHaveCloak(username),
enable_worldmap: process.env.ENABLE_WORLDMAP,
worldmap_url: process.env.WORLDMAP_URL
}); });
}); });

View File

@ -7,5 +7,6 @@ div(class="action-tabs")
button(class="actionTabButton" id="skinsTabButton" onclick="goToPage('/index')") Скин button(class="actionTabButton" id="skinsTabButton" onclick="goToPage('/index')") Скин
button(class="actionTabButton" id="passwordChangeTabButton" onclick="goToPage('/changepassword')") Сменить пароль button(class="actionTabButton" id="passwordChangeTabButton" onclick="goToPage('/changepassword')") Сменить пароль
button(class="actionTabButton" id="chatTabButton" onclick="goToPage('/chat')") Чат button(class="actionTabButton" id="chatTabButton" onclick="goToPage('/chat')") Чат
if (enable_worldmap)
button(class="actionTabButton" id="chatTabButton" onclick="goToPage('/worldmap')") Карта мира button(class="actionTabButton" id="chatTabButton" onclick="goToPage('/worldmap')") Карта мира
button(class="actionTabButton logoutTabButton" id="logoutTabButton" onclick="window.location.href='/api/logout'") Выйти button(class="actionTabButton logoutTabButton" id="logoutTabButton" onclick="window.location.href='/api/logout'") Выйти

View File

@ -10,4 +10,4 @@ html
div(class="content-container") div(class="content-container")
div(class="map-container") div(class="map-container")
h1 Карта h1 Карта
iframe(src="/map" class="map-container") iframe(src=worldmap_url class="map-container")