Skip to content

Commit f651617

Browse files
SquTMSquTM
authored
Merge pull request #3
* Commands Page Done * Commands Page Done * CSS Updated * Merge branch 'master' of https://github.com/SquTM/MangoBotWebsite int… * CSS Updated * Fixed minor thing for Squ
1 parent af376dc commit f651617

4 files changed

Lines changed: 15 additions & 35 deletions

File tree

‎src/main/resources/templates/commands.ftl‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<title>Commands - MangoBot</title>
77
<link rel="icon" type="image/x-icon" href="images/favicon.ico">
8-
<link rel="stylesheet" href="css/main.css">
8+
<link rel="stylesheet" href="css/main.css?v=${.now?long}">
99
<link rel="preconnect" href="https://fonts.googleapis.com">
1010
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
1111
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap" rel="stylesheet">
1212
<link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600&display=swap" rel="stylesheet">
1313
</head>
1414
<body>
15-
<!-- Navbar -->
1615
<nav class="navbar">
1716
<div class="nav-container">
1817
<a href="/home" class="nav-logo">
@@ -32,10 +31,13 @@
3231
</svg>
3332
Join Discord
3433
</a>
34+
<button class="nav-toggle" aria-label="Toggle menu">
35+
<span></span>
36+
<span></span>
37+
<span></span>
38+
</button>
3539
</div>
3640
</nav>
37-
38-
<!-- Page Header -->
3941
<div class="page-header">
4042
<div class="container">
4143
<div class="header-content">
@@ -47,8 +49,6 @@
4749
</div>
4850
</div>
4951
</div>
50-
51-
<!-- Commands Content -->
5252
<div class="commands-content">
5353
<div class="container">
5454
<#list commandDataList as data>
@@ -94,8 +94,6 @@
9494
</#list>
9595
</div>
9696
</div>
97-
98-
<!-- Footer -->
9997
<footer class="footer">
10098
<div class="container">
10199
<div class="footer-content">
@@ -106,13 +104,9 @@
106104
<span class="logo-text">MangoBot</span>
107105
</div>
108106
<p class="footer-text">Developed with passion by MangoRage</p>
109-
<div class="footer-links">
110-
<#list headers as header>
111-
<a href="${header.page()}">${header.text()}</a>
112-
</#list>
113-
</div>
114107
</div>
115108
</div>
116109
</footer>
110+
<script src="js/main.js" defer></script>
117111
</body>
118-
</html>
112+
</html>

‎src/main/resources/templates/guilds.ftl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<title>Guilds - MangoBot</title>
77
<link rel="icon" type="image/x-icon" href="images/favicon.ico">
8-
<link rel="stylesheet" href="css/main.css">
8+
<link rel="stylesheet" href="css/main.css?v=${.now?long}">
99
<link rel="preconnect" href="https://fonts.googleapis.com">
1010
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
1111
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap" rel="stylesheet">
@@ -163,11 +163,6 @@
163163
<span class="logo-text">MangoBot</span>
164164
</div>
165165
<p class="footer-text">Developed with passion by MangoRage</p>
166-
<div class="footer-links">
167-
<#list headers as header>
168-
<a href="${header.page()}">${header.text()}</a>
169-
</#list>
170-
</div>
171166
</div>
172167
</div>
173168
</footer>

‎src/main/resources/templates/home.ftl‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<title>MangoBot - Discord Bot</title>
77
<link rel="icon" type="image/x-icon" href="images/favicon.ico">
8-
<link rel="stylesheet" href="css/main.css">
8+
<link rel="stylesheet" href="css/main.css?v=${.now?long}">
99
<link rel="preconnect" href="https://fonts.googleapis.com">
1010
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
1111
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap" rel="stylesheet">
@@ -240,10 +240,6 @@
240240
<span class="logo-text">MangoBot</span>
241241
</div>
242242
<p class="footer-text">Developed with passion by MangoRage</p>
243-
<div class="footer-links">
244-
<#list headers as header>
245-
<a href="${header.page()}">${header.text()}</a>
246-
</#list>
247243
</div>
248244
</div>
249245
</div>

‎src/main/resources/templates/tricks.ftl‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
<title>${trick.getName()!"Trick"} - MangoBot</title>
6+
<title>MangoBot - Discord Bot</title>
77
<link rel="icon" type="image/x-icon" href="images/favicon.ico">
8-
<link rel="stylesheet" href="css/main.css">
8+
<link rel="stylesheet" href="css/main.css?v=${.now?long}">
99
<link rel="preconnect" href="https://fonts.googleapis.com">
1010
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
1111
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap" rel="stylesheet">
1212
<script src="js/main.js" defer></script>
13-
<meta name="og:title" content="${trick.getName()!"Trick"} - MangoBot">
14-
<meta name="og:description" content="View trick details for ${trick.getName()!"this trick"} on MangoBot.">
13+
<meta name="og:title" content="MangoBot">
14+
<meta name="og:description" content="The Official MangoBot Discord Bot.">
1515
<meta name="og:image" content="https://mangobot.mangorage.org/pink-sheep.png">
16-
<meta name="og:url" content="https://mangobot.mangorage.org/trick?guildId=${guildId!""}&trickId=${trick.getId()!""}">
16+
<meta name="og:url" content="https://mangobot.mangorage.org/">
1717
<meta name="og:type" content="website">
1818
</head>
1919
<body>
@@ -147,11 +147,6 @@
147147
<span class="logo-text">MangoBot</span>
148148
</div>
149149
<p class="footer-text">Developed with passion by MangoRage</p>
150-
<div class="footer-links">
151-
<#list headers as header>
152-
<a href="${header.page()}">${header.text()}</a>
153-
</#list>
154-
</div>
155150
</div>
156151
</div>
157152
</footer>

0 commit comments

Comments
 (0)