Skip to content

Commit 102cda0

Browse files
GamingGeekGamingGeek
committed
Merge branch 'master' of github.com:FireDiscordBot/website
2 parents ecb4595 + ce21641 commit 102cda0

File tree

7 files changed

+672
-4011
lines changed

7 files changed

+672
-4011
lines changed

‎.github/FUNDING.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: GamingGeek
2+
patreon: FireBot

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"cookie-parser": "^1.4.5",
1515
"cross-env": "^7.0.2",
1616
"express": "^4.17.1",
17-
"next": "^10.0.0",
17+
"next": "^11.1.1",
1818
"next-cookies": "^2.0.3",
1919
"react": "17.0.1",
2020
"react-bootstrap": "^1.4.0",

‎src/components/AppNavbar.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Navbar from "react-bootstrap/Navbar";
55
import { useRouter } from "next/router";
66
import Nav from "react-bootstrap/Nav";
77

8-
import { emitter } from "../pages/_app";
8+
// import { emitter } from "../pages/_app";
99

1010
interface NavLinkProps {
1111
href: string;
@@ -30,14 +30,14 @@ const NavLink = ({ href, children }: React.PropsWithChildren<NavLinkProps>) => {
3030

3131
const AppNavbar = () => {
3232
const router = useRouter();
33-
emitter.emit("SUBSCRIBE", router.route);
33+
// emitter.emit("SUBSCRIBE", router.route);
3434

3535
return (
3636
<Navbar bg="dark" expand="md">
3737
<Container>
3838
<NextLink href="/" passHref>
3939
<Navbar.Brand>
40-
<img id="logo-img" src="/logo_white.svg" />
40+
<img id="logo-img" src="/logo.svg" />
4141
</Navbar.Brand>
4242
</NextLink>
4343
<Navbar.Toggle aria-controls="basic-navbar-nav" />

‎src/pages/_app.tsx

+23-23
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ import { EventHandler } from "../../lib/ws/event-handler";
1111
import { Emitter } from "../../lib/ws/event-emitter";
1212
import useWebsocket from "../hooks/use-websocket";
1313

14-
export const emitter = new Emitter();
14+
// export const emitter = new Emitter();
1515

1616
const MyApp = ({ Component, pageProps }: AppProps) => {
17-
const [handler] = useWebsocket(
18-
"wss://aether-ws.gaminggeek.dev/website?encoding=zlib",
19-
emitter
20-
);
21-
if (handler) {
22-
initHandler(handler);
23-
}
17+
// const [handler] = useWebsocket(
18+
// "wss://aether-ws.gaminggeek.dev/website?encoding=zlib",
19+
// emitter
20+
// );
21+
// if (handler) {
22+
// initHandler(handler);
23+
// }
2424

2525
return (
2626
<>
@@ -31,20 +31,20 @@ const MyApp = ({ Component, pageProps }: AppProps) => {
3131
);
3232
};
3333

34-
const initHandler = async (handler: EventHandler) => {
35-
const events = ["SUBSCRIBE"]; // may be populated with more in the future
36-
for (const event of events) emitter.removeAllListeners(event);
37-
emitter.on("SUBSCRIBE", (route, extra) => {
38-
handler.handleSubscribe(route, extra);
39-
});
40-
if (!handler.identified) handler.identify();
41-
const devToolsCheck = /./;
42-
devToolsCheck.toString = () => {
43-
// dev tools is open
44-
handler.devToolsWarning();
45-
return "";
46-
};
47-
console.log("%c", devToolsCheck);
48-
};
34+
// const initHandler = async (handler: EventHandler) => {
35+
// const events = ["SUBSCRIBE"]; // may be populated with more in the future
36+
// for (const event of events) emitter.removeAllListeners(event);
37+
// emitter.on("SUBSCRIBE", (route, extra) => {
38+
// handler.handleSubscribe(route, extra);
39+
// });
40+
// if (!handler.identified) handler.identify();
41+
// const devToolsCheck = /./;
42+
// devToolsCheck.toString = () => {
43+
// // dev tools is open
44+
// handler.devToolsWarning();
45+
// return "";
46+
// };
47+
// console.log("%c", devToolsCheck);
48+
// };
4949

5050
export default MyApp;

‎src/pages/stats.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Head from "../components/Head";
88
import { FireStats } from "../../lib/interfaces/aether";
99
import ClusterModal from "../components/ClusterModal";
1010

11-
import { emitter } from "./_app";
11+
// import { emitter } from "./_app";
1212

1313
interface Props {
1414
initialStats: FireStats;
@@ -31,10 +31,10 @@ const StatsPage: NextPage<Props> = ({ initialStats }) => {
3131
);
3232
};
3333

34-
React.useEffect(() => {
35-
emitter.removeAllListeners("REALTIME_STATS")
36-
emitter.on("REALTIME_STATS", setStats)
37-
}, [])
34+
// React.useEffect(() => {
35+
// emitter.removeAllListeners("REALTIME_STATS")
36+
// emitter.on("REALTIME_STATS", setStats)
37+
// }, [])
3838

3939
let clusterModal = undefined;
4040

‎src/style.css

+15-30
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@
1111

1212
/* Handle */
1313
::-webkit-scrollbar-thumb {
14-
/* background: linear-gradient(25deg, #f04e33, #c52035); */
15-
background: linear-gradient(25deg, #7289da, #6066fe);
14+
background: linear-gradient(25deg, #f04e33, #c52035);
1615
}
1716

1817
/* Handle on hover */
1918
::-webkit-scrollbar-thumb:hover {
20-
/* background: linear-gradient(25deg, #c52035, #f04e33); */
21-
background: linear-gradient(25deg, #7289da, #6066fe);
19+
background: linear-gradient(25deg, #c52035, #f04e33);
2220
}
2321

2422
html {
@@ -35,17 +33,15 @@ body {
3533
}
3634

3735
.fire {
38-
/* background: -webkit-linear-gradient(25deg, #f04e33, #c52035); */
39-
background: -webkit-linear-gradient(25deg, #7289da, #6066fe);
36+
background: -webkit-linear-gradient(25deg, #f04e33, #c52035);
4037
-webkit-background-clip: text;
4138
background-clip: text;
4239
-webkit-text-fill-color: transparent;
4340
font-weight: bold;
4441
}
4542

4643
.navbar {
47-
/* background: linear-gradient(25deg, #f04e33, #c52035); */
48-
background: linear-gradient(25deg, #7289da, #6066fe);
44+
background: linear-gradient(25deg, #f04e33, #c52035);
4945
}
5046

5147
#logo {
@@ -70,8 +66,7 @@ body {
7066
}
7167

7268
#invite-btn {
73-
/* background: linear-gradient(25deg, #f04e33, #c52035); */
74-
background: linear-gradient(25deg, #7289da, #6066fe);
69+
background: linear-gradient(25deg, #f04e33, #c52035);
7570
border-radius: 10px;
7671
opacity: 90%;
7772
text-align: center;
@@ -80,10 +75,8 @@ body {
8075

8176
.btn-fire {
8277
color: white;
83-
/* background: linear-gradient(25deg, #f04e33, #c52035); */
84-
background: linear-gradient(25deg, #7289da, #6066fe);
85-
/* border-color: #c52035; */
86-
border-color: #6066fe;
78+
background: linear-gradient(25deg, #f04e33, #c52035);
79+
border-color: #c52035;
8780
border-radius: 10px;
8881
}
8982

@@ -134,8 +127,7 @@ body {
134127

135128
#categories-list li:hover {
136129
cursor: pointer;
137-
/* background: linear-gradient(25deg, #f04e33, #c52035); */
138-
background: linear-gradient(25deg, #7289da, #6066fe);
130+
background: linear-gradient(25deg, #f04e33, #c52035);
139131
}
140132

141133
.table {
@@ -164,8 +156,7 @@ body {
164156
}
165157

166158
.c-active {
167-
/* background: linear-gradient(25deg, #f04e33, #c52035) !important; */
168-
background: linear-gradient(25deg, #7289da, #6066fe) !important;
159+
background: linear-gradient(25deg, #f04e33, #c52035) !important;
169160
}
170161

171162
.bot-info-box {
@@ -179,8 +170,7 @@ body {
179170
}
180171

181172
.bot-info-box h4 {
182-
/* background: -webkit-linear-gradient(25deg, #f04e33, #c52035); */
183-
background: -webkit-linear-gradient(25deg, #7289da, #6066fe);
173+
background: -webkit-linear-gradient(25deg, #f04e33, #c52035);
184174
-webkit-background-clip: text;
185175
background-clip: text;
186176
-webkit-text-fill-color: transparent;
@@ -196,8 +186,7 @@ body {
196186
}
197187

198188
.about-text strong {
199-
/* background: -webkit-linear-gradient(25deg, #f04e33, #c52035); */
200-
background: -webkit-linear-gradient(25deg, #7289da, #6066fe);
189+
background: -webkit-linear-gradient(25deg, #f04e33, #c52035);
201190
-webkit-background-clip: text;
202191
background-clip: text;
203192
-webkit-text-fill-color: transparent;
@@ -499,10 +488,8 @@ a:hover {
499488
}
500489

501490
.page-item.active .page-link {
502-
/* background: -webkit-linear-gradient(25deg, #f04e33, #c52035); */
503-
background: -webkit-linear-gradient(25deg, #7289da, #6066fe);
504-
/* border-color: #c52035; */
505-
border-color: #6066fe;
491+
background: -webkit-linear-gradient(25deg, #f04e33, #c52035);
492+
border-color: #c52035;
506493
}
507494

508495
.page-link {
@@ -519,10 +506,8 @@ a:hover {
519506

520507
.page-link:hover {
521508
color: #fff;
522-
/* background: -webkit-linear-gradient(25deg, #f04e33, #c52035); */
523-
background: -webkit-linear-gradient(25deg, #7289da, #6066fe);
524-
/* border-color: #f04e33; */
525-
border-color: #7289da;
509+
background: -webkit-linear-gradient(25deg, #f04e33, #c52035);
510+
border-color: #f04e33;
526511
}
527512

528513
.page-link:focus {

0 commit comments

Comments
 (0)