diff --git a/package-lock.json b/package-lock.json index b65602cf..e6cc6c15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "mapjs", - "version": "1.6.15", + "version": "1.6.18.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/configs/config.example.json b/src/configs/config.example.json index 001d46d5..c9aff702 100644 --- a/src/configs/config.example.json +++ b/src/configs/config.example.json @@ -3,10 +3,16 @@ "port": 8080, "title": "MapJS", "headerTitle": "MapJS - NodeJS Map Replacement", - "homePage": true, "locale": "en", "style": "dark", "sessionSecret": "98ki^e72~!@#(85o3kXLI*#c9wu5l!Z", + "homepage": { + "enabled": false, + "title": "Welcome to MapJS", + "descriptionLine1": "The best place to find Pokemon, Raids, Quests, and more!", + "descriptionLine2": "Please login or join our Discord for more info...", + "discordInvite": "https://discord.gg/yourInvite" + }, "map": { "startLat": 0, "startLon": 0, @@ -46,7 +52,6 @@ }, "discord": { "enabled": false, - "invite": "https://discord.gg/invite_link", "logChannelId": "", "status": "Map Status: Online", "botToken": "", diff --git a/src/configs/default.json b/src/configs/default.json index b930c953..0dcbae68 100644 --- a/src/configs/default.json +++ b/src/configs/default.json @@ -22,6 +22,13 @@ "url": "", "maxScouts": 15 }, + "homepage": { + "enabled": false, + "title": "Welcome to MapJS", + "descriptionLine1": "The best place to find Pokemon, Raids, Quests, and more!", + "descriptionLine2": "Please login or join our Discord for more info...", + "discordInvite": "https://discord.gg/yourInvite" + }, "map": { "startLat": 0, "startLon": 0, diff --git a/src/routes/ui.js b/src/routes/ui.js index e9fc5ed8..5063b456 100644 --- a/src/routes/ui.js +++ b/src/routes/ui.js @@ -17,7 +17,7 @@ if (config.discord.enabled) { }); router.get('/logout', (req, res) => { - if (config.homePage) { + if (config.homepage.enabled) { res.redirect('/home'); } else { res.redirect('/login'); @@ -32,10 +32,13 @@ router.get(['/', '/index'], async (req, res) => { res.render('index', data); }); -if (config.homePage) { +if (config.homepage.enabled) { router.get('/home', (req, res) => { const data = {}; - data.discord_invite = config.discord.invite; + data.discord_invite = config.homepage.discordInvite; + data.map_title = config.homepage.title; + data.description_1 = config.homepage.descriptionLine1; + data.description_2 = config.homepage.descriptionLine2; res.render('home', data); }); } diff --git a/src/views/blocked.mustache b/src/views/blocked.mustache index 5cadeead..7ae38c96 100644 --- a/src/views/blocked.mustache +++ b/src/views/blocked.mustache @@ -27,18 +27,22 @@ #transbox { background-color:rgba(255,255,255,0.8); padding:20px; + border-radius: 20px; } .title { text-align:center; font-size: 2em; color: #3C5FA3; + font-weight: bold; + font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; } .container { width: 90%; margin: 0 auto; padding: 30px; + border-radius: 10px; } .clearfix:after { @@ -56,6 +60,8 @@ margin-left: 10px; margin-bottom: 10px; white-space: pre-wrap; + font-weight: bold; + font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; } .make-center { @@ -66,6 +72,7 @@ .square_btn{ display: inline-block; padding: 7px 20px; + border: solid 3px black; border-radius: 25px; text-decoration: none; color: #FFF; @@ -78,17 +85,22 @@ background-image: -webkit-linear-gradient(45deg, #7289da 0%, #3659d8 100%); background-image: linear-gradient(45deg, #7289da 0%, #3659d8 100%); } + + a { + font-weight: bold; + font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + }