diff --git a/front/src/components/TopBar.tsx b/front/src/components/TopBar.tsx index d5ac19d..0c80551 100644 --- a/front/src/components/TopBar.tsx +++ b/front/src/components/TopBar.tsx @@ -8,7 +8,7 @@ export default function TopBar({ user }: { user: User | undefined }) { const [burgerMenuOpen, setBurgerMenuOpen] = useState(false) return ( -
+
Home Channels diff --git a/front/src/index.css b/front/src/index.css index fa3145f..8c34fe7 100644 --- a/front/src/index.css +++ b/front/src/index.css @@ -3,6 +3,26 @@ html { min-height: 100vh; } +.forum-page { + display: flex; + flex-direction: column; + justify-content: start; + align-items: center; + width: 100%; + gap: 20px; +} + +.forum-section { + width: 97%; + padding: 10px; + display: flex; + flex-direction: column; + align-items: start; + gap: 10px; + border: 1px solid #270722; + background-color: #fff6fd; +} + .cat { width: 100px; } @@ -17,4 +37,29 @@ html { .fish { width: 300px; +} + +@media (prefers-color-scheme: dark) { + html { + background: linear-gradient(#121212, #1e1b29); + } + + .forum-section { + border: 1px solid #a678af; + background-color: #1b1b23; + color: #e4d9ec; + } + + a { + color: #b88edc; + text-decoration: underline; + } + + a:hover { + color: #d4b4f0; + } + + a:visited { + color: #a678af; + } } \ No newline at end of file diff --git a/front/src/pages/404.tsx b/front/src/pages/404.tsx index 7127469..159ff3c 100644 --- a/front/src/pages/404.tsx +++ b/front/src/pages/404.tsx @@ -26,9 +26,9 @@ export default function NotFoundPage() { }, []); return ( -
+
-
+

404 - Page Not Found

Sorry, the page you are looking for does not exist.

Go back to the homepage diff --git a/front/src/pages/ChannelPage.tsx b/front/src/pages/ChannelPage.tsx index 936a238..c86c75a 100644 --- a/front/src/pages/ChannelPage.tsx +++ b/front/src/pages/ChannelPage.tsx @@ -150,9 +150,9 @@ export default function ChannelPage({socket}: {socket: WebSocket}) { if (noChannel) { return ( -
+
-
+

Channel Not Found

Sorry, the channel you are looking for does not exist.

Go back to the homepage @@ -163,9 +163,9 @@ export default function ChannelPage({socket}: {socket: WebSocket}) { if (!channel) { return ( -
+
-
+

Loading...

@@ -173,9 +173,9 @@ export default function ChannelPage({socket}: {socket: WebSocket}) { } return ( -
+
-
+

Channel {channel.name}

{channel.description}

Owner: {channel.owner_username}

diff --git a/front/src/pages/ChannelsPage.tsx b/front/src/pages/ChannelsPage.tsx index c6473e2..2050ada 100644 --- a/front/src/pages/ChannelsPage.tsx +++ b/front/src/pages/ChannelsPage.tsx @@ -4,8 +4,6 @@ import { Channels, User } from "../types" import axios from "axios" import TopBar from "../components/TopBar" -import "../styles/ChannelsPage.css" - export default function ChannelsPage({socket}: {socket: WebSocket}) { const [channels, setChannels] = useState(); const [search, setSearch] = useState(""); @@ -64,9 +62,9 @@ export default function ChannelsPage({socket}: {socket: WebSocket}) { if (!channels) { return ( -
+
-
+

Channels

Loading...

@@ -75,9 +73,9 @@ export default function ChannelsPage({socket}: {socket: WebSocket}) { } return ( -
+
-
+

Channels

Create channel +
-
+

Create Channel

diff --git a/front/src/pages/CreateEmoji.tsx b/front/src/pages/CreateEmoji.tsx index 88c5e63..fe0a678 100644 --- a/front/src/pages/CreateEmoji.tsx +++ b/front/src/pages/CreateEmoji.tsx @@ -4,8 +4,6 @@ import { User } from "../types"; import axios from "axios"; import TopBar from "../components/TopBar"; -import "../styles/CreateEmoji.css"; - export default function CreateEmoji() { const navigate = useNavigate(); const [name, setName] = useState(""); @@ -50,9 +48,9 @@ export default function CreateEmoji() { } return ( -

+
-
+

Create Emoji

diff --git a/front/src/pages/EditProfile.tsx b/front/src/pages/EditProfile.tsx index f5f123b..29d32c7 100644 --- a/front/src/pages/EditProfile.tsx +++ b/front/src/pages/EditProfile.tsx @@ -4,8 +4,6 @@ import { Link } from "react-router-dom" import axios from "axios" import TopBar from "../components/TopBar" -import "../styles/EditProfile.css" - export default function EditProfile() { const [token, setToken] = useState(""); const [user, setUser] = useState(); @@ -92,9 +90,9 @@ export default function EditProfile() { if (!user) { return ( -

+
-
+

Please log in to edit your profile

Login
@@ -103,9 +101,9 @@ export default function EditProfile() { } return ( -
+
-
+

Edit Profile Picture

@@ -113,14 +111,14 @@ export default function EditProfile() {
-
+

Edit Username

-
+

Edit Password

diff --git a/front/src/pages/EmojisPage.tsx b/front/src/pages/EmojisPage.tsx index 1bcfbf0..9cd4009 100644 --- a/front/src/pages/EmojisPage.tsx +++ b/front/src/pages/EmojisPage.tsx @@ -4,8 +4,6 @@ import { Emojis, User } from "../types" import axios from "axios" import TopBar from "../components/TopBar" -import "../styles/EmojisPage.css" - export default function EmojisPage({socket}: {socket: WebSocket}) { const [emojis, setEmojis] = useState(); const [search, setSearch] = useState(""); @@ -67,9 +65,9 @@ export default function EmojisPage({socket}: {socket: WebSocket}) { if (!emojis) { return ( -
+
-
+

Emojis

Loading...

@@ -78,10 +76,10 @@ export default function EmojisPage({socket}: {socket: WebSocket}) { } return ( -
+
-
-

Channels

+
+

Emojis

Create emoji -
+

Welcome to Tanuki's forum !

@@ -156,7 +156,7 @@ export default function Home({socket}: {socket: WebSocket}) { osaka

-
+

Last messages

{messages?.map((message) => ( @@ -170,7 +170,7 @@ export default function Home({socket}: {socket: WebSocket}) { ))}
-
+

Channels

All channels diff --git a/front/src/pages/Login.tsx b/front/src/pages/Login.tsx index 9d72af9..f295eac 100644 --- a/front/src/pages/Login.tsx +++ b/front/src/pages/Login.tsx @@ -3,8 +3,6 @@ import { useState } from "react"; import { useNavigate, Link } from "react-router-dom"; import TopBar from "../components/TopBar"; -import "../styles/Login.css"; - export default function Login() { const [username, setUsername] = useState(""); const [password, setPassword] = useState(""); @@ -24,9 +22,9 @@ export default function Login() { } return ( -
+
-
+

Login

+
-
+

Register

diff --git a/front/src/pages/UserPage.tsx b/front/src/pages/UserPage.tsx index c65baa7..293bef9 100644 --- a/front/src/pages/UserPage.tsx +++ b/front/src/pages/UserPage.tsx @@ -97,9 +97,9 @@ export default function UserPage({socket}: {socket: WebSocket}) { if (noUser) { return ( -

+
-
+

User Not Found

Sorry, the user you are looking for does not exist.

Go back to the homepage @@ -110,9 +110,9 @@ export default function UserPage({socket}: {socket: WebSocket}) { if (!pageUser) { return ( -
+
-
+

Loading...

@@ -120,9 +120,9 @@ export default function UserPage({socket}: {socket: WebSocket}) { } return ( -
+
-
+
pfp

{pageUser.username}

@@ -142,7 +142,7 @@ export default function UserPage({socket}: {socket: WebSocket}) {
)}
-
+

Last messages

{messages?.map((message) => ( diff --git a/front/src/pages/UsersPage.tsx b/front/src/pages/UsersPage.tsx index cd2bb4b..6e64d43 100644 --- a/front/src/pages/UsersPage.tsx +++ b/front/src/pages/UsersPage.tsx @@ -4,8 +4,6 @@ import { User, Users } from "../types" import axios from "axios" import TopBar from "../components/TopBar" -import "../styles/UsersPage.css" - export default function UsersPage({socket}: {socket: WebSocket}) { const [users, setUsers] = useState(); const [search, setSearch] = useState(""); @@ -64,9 +62,9 @@ export default function UsersPage({socket}: {socket: WebSocket}) { if (!users) { return ( -
+
-
+

Users

Loading...

@@ -75,9 +73,9 @@ export default function UsersPage({socket}: {socket: WebSocket}) { } return ( -
+
-
+

Users