diff --git a/sample.env b/sample.env index eed77c1..a8cce34 100644 --- a/sample.env +++ b/sample.env @@ -8,3 +8,5 @@ PORT=3000 REQUIRE_TOKEN=false DELETE_TOKEN_ON_USE=true WS_CONNECTION_STRING=wss://auth.foxarmy.org +ENABLE_WORLDMAP=true +WORLDMAP_URL=http://localhost/map diff --git a/src/routers/user.js b/src/routers/user.js index ee79d3a..03fbad0 100644 --- a/src/routers/user.js +++ b/src/routers/user.js @@ -31,7 +31,8 @@ UserRouter.get(['/index', '/skin'], auth.authenticate, async (req, res) => { return res.render('skin.pug', { 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; 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; 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,8 +58,10 @@ UserRouter.get('/worldmap', auth.authenticate, async (req, res) => { const username = jwt.decode(req.cookies["jwt"]).username; 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 }); }); -export default UserRouter; \ No newline at end of file +export default UserRouter; diff --git a/views/header.pug b/views/header.pug index ac2cddd..531d477 100644 --- a/views/header.pug +++ b/views/header.pug @@ -7,5 +7,6 @@ div(class="action-tabs") button(class="actionTabButton" id="skinsTabButton" onclick="goToPage('/index')") Скин button(class="actionTabButton" id="passwordChangeTabButton" onclick="goToPage('/changepassword')") Сменить пароль button(class="actionTabButton" id="chatTabButton" onclick="goToPage('/chat')") Чат - button(class="actionTabButton" id="chatTabButton" onclick="goToPage('/worldmap')") Карта мира - button(class="actionTabButton logoutTabButton" id="logoutTabButton" onclick="window.location.href='/api/logout'") Выйти \ No newline at end of file + if (enable_worldmap) + button(class="actionTabButton" id="chatTabButton" onclick="goToPage('/worldmap')") Карта мира + button(class="actionTabButton logoutTabButton" id="logoutTabButton" onclick="window.location.href='/api/logout'") Выйти diff --git a/views/worldmap.pug b/views/worldmap.pug index 544dc61..14a9841 100644 --- a/views/worldmap.pug +++ b/views/worldmap.pug @@ -10,4 +10,4 @@ html div(class="content-container") div(class="map-container") h1 Карта - iframe(src="/map" class="map-container") + iframe(src=worldmap_url class="map-container")