-
- Home
- About
- App
- Login
- Register
- Verify Account
- Leaderboard
- Whoami
+import "../styles/navbar.styles.css";
+
+export default function Navbar(props) {
+ return (
+
-
-
+
+
-);
\ No newline at end of file
+);
diff --git a/apps/web/src/pages/about.jsx b/apps/web/src/pages/about.jsx
index 6e50321..c51690e 100644
--- a/apps/web/src/pages/about.jsx
+++ b/apps/web/src/pages/about.jsx
@@ -1,18 +1,14 @@
-import '../App.css'
-import 'react-toastify/dist/ReactToastify.css';
-import Navbar from '../components/navbar';
+
+import "react-toastify/dist/ReactToastify.css";
+import Navbar from "../components/navbar";
import { url } from '../libs/api.client';
+
function Home() {
- return (
- <>
-
+
+ );
+}
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 56e4f04..24b4493 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -8,7 +8,6 @@
src: url("/MinecraftBold.woff2");
}
-
:root {
font-family: "MinecraftBold", sans-serif;
line-height: 1.5;
@@ -16,7 +15,8 @@
color-scheme: light dark;
color: rgba(255, 255, 255, 0.87);
- background-color: #242424;
+ /* background-color: #242424; */
+ background-color: #0e0e0e;
font-synthesis: none;
text-rendering: optimizeLegibility;
@@ -35,10 +35,10 @@ a:hover {
body {
margin: 0;
- display: flex;
+ /* display: flex;
place-items: center;
min-width: 320px;
- min-height: 100vh;
+ min-height: 100vh; */
}
h1 {
diff --git a/apps/web/src/main.jsx b/apps/web/src/main.jsx
index 62ed430..69eadfc 100644
--- a/apps/web/src/main.jsx
+++ b/apps/web/src/main.jsx
@@ -1,14 +1,15 @@
-import React from 'react'
-import ReactDOM from 'react-dom/client'
-import App from './App.jsx'
-import { BrowserRouter } from 'react-router-dom';
-import './index.css'
+import React from "react";
+import ReactDOM from "react-dom/client";
+import App from "./App.jsx";
+import { BrowserRouter } from "react-router-dom";
+import "./index.css";
+import "./styles/logo.styles.css";
-const root = ReactDOM.createRoot(document.getElementById('root'));
+const root = ReactDOM.createRoot(document.getElementById("root"));
root.render(
+
- )
- }
-}
\ No newline at end of file
+
+ 
+
+
+
+
+ About
+ News
+ Whoami
+
+
+
+
+
+ App
+ Leaderboard
+ {/* Login
+ Register */}
+ {/* Verify Account */}
{props.pageTitle}
-
-
-
- rcsCTF24
- -
+ return (
+ <>
+
Guides
How to use the scoreboard
@@ -23,8 +19,8 @@ function Home() {
{url}
-
-
-
-
- Machines
-
- {machines.map((machine, index) => (
-
-
-
+ return (
+ <>
+ {/*
- {currentChallenge[0] > -1 && currentChallenge[1] > -1 &&
-
+
+
+
+
+
+ Machines
+
+ {machines.map((machine, index) => (
+
-
+
+
+ {currentChallenge[0] > -1 && currentChallenge[1] > -1 && (
+
+
-
-
-
- Welcome to eeCTF
- -
-
- Actions -
-
- About
- App
- Login
- Register
- Verify Account
- Leaderboard
- Whoami
+ const [user, setUser] = useState(null);
+ useEffect(() => {
+ const token = localStorage.getItem("token");
+
+ if (!token) return;
+
+ apiClient
+ .get("/user/whoami", {
+ headers: {
+ Authorization: "Bearer " + token,
+ },
+ })
+ .then((res) => {
+ if (res.data.error) return;
+
+ if (res.data.message === "Invalid token") return;
+ setUser(res.data);
+ });
+ }, []);
+
+ return (
+
+ );
}
-export default Home
+export default Home;
diff --git a/apps/web/src/pages/leaderboard.jsx b/apps/web/src/pages/leaderboard.jsx
index 8847fda..1e9dd03 100644
--- a/apps/web/src/pages/leaderboard.jsx
+++ b/apps/web/src/pages/leaderboard.jsx
@@ -1,7 +1,6 @@
-import "../App.css";
import "react-toastify/dist/ReactToastify.css";
import { useEffect, useState } from "react";
-import apiClient from '../libs/api.client';
+import apiClient from "../libs/api.client";
import Navbar from "../components/navbar";
function Leaderboard() {
@@ -10,16 +9,16 @@ function Leaderboard() {
useEffect(() => {
const token = localStorage.getItem("token");
- if (!token) return (window.location.href = "/login");
+ if (!token) return (window.location.href = "/");
apiClient
.get("/stats/leaderboard", {
headers: {
Authorization: "Bearer " + token,
- }
+ },
})
.then((response) => {
- if(!Array.isArray(response.data)) return window.location.href = '/login'
+ if (!Array.isArray(response.data)) return (window.location.href = "/");
setLeaderboard(response.data);
})
.catch(() => {
@@ -29,12 +28,8 @@ function Leaderboard() {
return (
<>
-
+
+
+ {user === null ? (
+
+ )}
+
+
+ ) : (
+
+
-
- )
+
+ {/*
- + You are currently in {user.team_name} team. Your team has{" "} + {user.team_score} points. +
*/}
-
-
-
- Leaderboard
-
+