Skip to content

Homepage Adjustments #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
versx merged 2 commits into from
Jan 4, 2021
Merged

Homepage Adjustments #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
690af20
Homepage Adjustments
TurtIeSocks Jan 4, 2021
268dabe
Forgot blocked page
TurtIeSocks Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions src/configs/config.example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -46,7 +52,6 @@
},
"discord": {
"enabled": false,
"invite": "https://discord.gg/invite_link",
"logChannelId": "",
"status": "Map Status: Online",
"botToken": "",
Expand Down
7 changes: 7 additions & 0 deletions src/configs/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 6 additions & 3 deletions src/routes/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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);
});
}
Expand Down
16 changes: 14 additions & 2 deletions src/views/blocked.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -66,6 +72,7 @@
.square_btn{
display: inline-block;
padding: 7px 20px;
border: solid 3px black;
border-radius: 25px;
text-decoration: none;
color: #FFF;
Expand All @@ -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;
}
</style>
</head>
<body>
<div class="container clearfix background">
<div id="transbox">
<title>Access denied</title>
<div class="title">Access denied!</div>
<div class="title">Access denied!</div><br>
<div class="description">{{username}} has been blocked for being a member of {{guild_name}}.
Please join our discord for more info.</div>
<div class="make-center">
<a href="/login" class="square_btn">Login</a><a href="{{discord_invite}}" class="square_btn">Join Our Discord</a>
<a href="/login" class="square_btn">Login</a>&nbsp;&nbsp;<a href="{{discord_invite}}" class="square_btn">Join Our Discord</a>
</div>
</div>
</div>
Expand Down
19 changes: 15 additions & 4 deletions src/views/home.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -66,6 +72,7 @@
.square_btn{
display: inline-block;
padding: 7px 20px;
border: solid 3px black;
border-radius: 25px;
text-decoration: none;
color: #FFF;
Expand All @@ -78,17 +85,21 @@
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;
}
</style>
</head>
<body>
<div class="container clearfix background">
<div id="transbox">
<title>Welcome</title>
<div class="title">Welcome</div>
<div class="description">The best place to find pokemon.</div>
<div class="description">Please login or join discord for more info...</div>
<div class="title">{{map_title}}</div><br>
<div class="description">{{description_1}}<br><br>{{description_2}}</div>
<div class="make-center">
<a href="/login" class="square_btn">Login</a><a href="{{discord_invite}}" class="square_btn">Join Our Discord</a>
<a href="/login" class="square_btn">Login</a>&nbsp;&nbsp;<a href="{{discord_invite}}" class="square_btn">Join Our Discord</a>
</div>
</div>
</div>
Expand Down