Imbus/FrostByte
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Restructure

Browse source
This commit is contained in:
Imbus 2023-11-22 15:29:27 +01:00
parent da48f005a3
commit 22a3ca1769
16 changed files with 44 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client-solid/src/RegLogin/Login.tsx → client-solid/src/Components/Login.tsx
View file

@ -1,7 +1,7 @@
import { JSXElement, Show, createSignal, useContext } from "solid-js";
import { LoginContext, ModalContext } from "../GlobalState";
import { AuthResponse, submitLogin } from "../api";
import { LoginContext, ModalContext } from "../Context/GlobalState";
import { AuthResponse, submitLogin } from "../Util/api";
export function LoginForm(): JSXElement {
const modal_ctx = useContext(ModalContext)!;

4
client-solid/src/LoginButton.tsx → client-solid/src/Components/LoginButton.tsx
View file

@ -1,7 +1,7 @@
import { JSXElement, Show, useContext } from "solid-js";
import { LoginContext, ModalContext } from "./GlobalState";
import { UserCircle } from "./Icons";
import { LoginContext, ModalContext } from "../Context/GlobalState";
import { UserCircle } from "../Util/Icons";
export function LoginButton(): JSXElement {
const modal_ctx = useContext(ModalContext)!;

4
client-solid/src/Menu.tsx → client-solid/src/Components/Menu.tsx
View file

@ -1,8 +1,8 @@
import { A } from "@solidjs/router";
import { JSXElement, Show, useContext } from "solid-js";
import { LoginContext } from "./GlobalState";
import { Home, Plus } from "./Icons";
import { LoginContext } from "../Context/GlobalState";
import { Home, Plus } from "../Util/Icons";
// Represents a single list item in the menu bar
export function MenuItem(props: {

4
client-solid/src/NewPost.tsx → client-solid/src/Components/NewPost.tsx
View file

@ -1,8 +1,8 @@
import { useNavigate } from "@solidjs/router";
import { JSXElement, Show, createSignal, onMount, useContext } from "solid-js";
import { LoginContext } from "./GlobalState";
import { NewPost, createPost } from "./api";
import { LoginContext } from "../Context/GlobalState";
import { NewPost, createPost } from "../Util/api";
export function NewPostInputArea(): JSXElement {
const [content, setContent] = createSignal("");

4
client-solid/src/Posts.tsx → client-solid/src/Components/Posts.tsx
View file

@ -1,8 +1,8 @@
import { useNavigate } from "@solidjs/router";
import { For, JSXElement, Show, createSignal } from "solid-js";
import { Arrow, loadSpinner } from "./Icons";
import { Post, getPosts } from "./api";
import { Arrow, loadSpinner } from "../Util/Icons";
import { Post, getPosts } from "../Util/api";
export function Posts(): JSXElement {
const [posts, setPosts] = createSignal([] as Post[]);

4
client-solid/src/RegLogin/Register.tsx → client-solid/src/Components/Register.tsx
View file

@ -1,7 +1,7 @@
import { JSXElement, Show, createSignal, useContext } from "solid-js";
import { LoginContext, ModalContext } from "../GlobalState";
import { AuthResponse, submitRegistration } from "../api";
import { LoginContext, ModalContext } from "../Context/GlobalState";
import { AuthResponse, submitRegistration } from "../Util/api";
export function RegisterForm(): JSXElement {
const modal_ctx = useContext(ModalContext)!;

4
client-solid/src/SinglePost.tsx → client-solid/src/Components/SinglePost.tsx
View file

@ -1,9 +1,9 @@
import { useParams } from "@solidjs/router";
import { JSXElement, Show, Suspense, createResource } from "solid-js";
import { loadSpinner } from "./Icons";
import { loadSpinner } from "../Util/Icons";
import { getPost } from "../Util/api";
import { PostSegment } from "./Posts";
import { getPost } from "./api";
export function SinglePost(): JSXElement {
const params = useParams();

6
client-solid/src/Footer.tsx → client-solid/src/Containers/Footer.tsx
View file

@ -17,7 +17,7 @@ export function Footer(): JSXElement {
viewBox="0 0 24 24"
class="fill-current"
>
<path d="M24 4.557c-.883.392-1.832.656-2.828.775 1.017-.609 1.798-1.574 2.165-2.724-.951.564-2.005.974-3.127 1.195-.897-.957-2.178-1.555-3.594-1.555-3.179 0-5.515 2.966-4.797 6.045-4.091-.205-7.719-2.165-10.148-5.144-1.29 2.213-.669 5.108 1.523 6.574-.806-.026-1.566-.247-2.229-.616-.054 2.281 1.581 4.415 3.949 4.89-.693.188-1.452.232-2.224.084.626 1.956 2.444 3.379 4.6 3.419-2.07 1.623-4.678 2.348-7.29 2.04 2.179 1.397 4.768 2.212 7.548 2.212 9.142 0 14.307-7.721 13.995-14.646.962-.695 1.797-1.562 2.457-2.549z"></path>
<path d="M24 4.557c-.883.392-1.832.656-2.828.775 1.017-.609 1.798-1.574 2.165-2.724-.951.564-2.005.974-3.127 1.195-.897-.957-2.178-1.555-3.594-1.555-3.179 0-5.515 2.966-4.797 6.045-4.091-.205-7.719-2.165-10.148-5.144-1.29 2.213-.669 5.108 1.523 6.574-.806-.026-1.566-.247-2.229-.616-.054 2.281 1.581 4.415 3.949 4.89-.693.188-1.452.232-2.224.084.626 1.956 2.444 3.379 4.6 3.419-2.07 1.623-4.678 2.348-7.29 2.04 2.179 1.397 4.768 2.212 7.548 2.212 9.142 0 14.307-7.721 13.995-14.646.962-.695 1.797-1.562 2.457-2.549z" />
</svg>
</a>
<a>
@ -28,7 +28,7 @@ export function Footer(): JSXElement {
viewBox="0 0 24 24"
class="fill-current"
>
<path d="M19.615 3.184c-3.604-.246-11.631-.245-15.23 0-3.897.266-4.356 2.62-4.385 8.816.029 6.185.484 8.549 4.385 8.816 3.6.245 11.626.246 15.23 0 3.897-.266 4.356-2.62 4.385-8.816-.029-6.185-.484-8.549-4.385-8.816zm-10.615 12.816v-8l8 3.993-8 4.007z"></path>
<path d="M19.615 3.184c-3.604-.246-11.631-.245-15.23 0-3.897.266-4.356 2.62-4.385 8.816.029 6.185.484 8.549 4.385 8.816 3.6.245 11.626.246 15.23 0 3.897-.266 4.356-2.62 4.385-8.816-.029-6.185-.484-8.549-4.385-8.816zm-10.615 12.816v-8l8 3.993-8 4.007z" />
</svg>
</a>
<a>
@ -39,7 +39,7 @@ export function Footer(): JSXElement {
viewBox="0 0 24 24"
class="fill-current"
>
<path d="M9 8h-3v4h3v12h5v-12h3.642l.358-4h-4v-1.667c0-.955.192-1.333 1.115-1.333h2.885v-5h-3.808c-3.596 0-5.192 1.583-5.192 4.615v3.385z"></path>
<path d="M9 8h-3v4h3v12h5v-12h3.642l.358-4h-4v-1.667c0-.955.192-1.333 1.115-1.333h2.885v-5h-3.808c-3.596 0-5.192 1.583-5.192 4.615v3.385z" />
</svg>
</a>
</div>

6
client-solid/src/LoginModal.tsx → client-solid/src/Containers/LoginModal.tsx
View file

@ -1,8 +1,8 @@
import { JSXElement, Show, onCleanup, useContext } from "solid-js";
import { ModalContext } from "./GlobalState";
import { LoginForm } from "./RegLogin/Login";
import { RegisterForm } from "./RegLogin/Register";
import { LoginForm } from "../Components/Login";
import { RegisterForm } from "../Components/Register";
import { ModalContext } from "../Context/GlobalState";
export function LoginModal(): JSXElement {
const modal_ctx = useContext(ModalContext)!;

6
client-solid/src/Navbar.tsx → client-solid/src/Containers/Navbar.tsx
View file

@ -1,9 +1,9 @@
import { A } from "@solidjs/router";
import { JSXElement } from "solid-js";
import { Flake } from "./Icons";
import { LoginButton } from "./LoginButton";
import { Menu } from "./Menu";
import { LoginButton } from "../Components/LoginButton";
import { Menu } from "../Components/Menu";
import { Flake } from "../Util/Icons";
export function Navbar(): JSXElement {
return (

6
client-solid/src/Primary.tsx → client-solid/src/Containers/Primary.tsx
View file

@ -1,9 +1,9 @@
import { Route, Routes } from "@solidjs/router";
import { JSXElement } from "solid-js";
import { NewPostInputArea } from "./NewPost";
import { Posts } from "./Posts";
import { SinglePost } from "./SinglePost";
import { NewPostInputArea } from "../Components/NewPost";
import { Posts } from "../Components/Posts";
import { SinglePost } from "../Components/SinglePost";
// Primary is the section of the page that holds the main content
export function Primary(): JSXElement {

6
client-solid/src/Root.tsx → client-solid/src/Containers/Root.tsx
View file

@ -1,10 +1,10 @@
import { JSXElement } from "solid-js";
import { GlobalStateProvider } from "./GlobalState";
import { GlobalStateProvider } from "../Context/GlobalState";
import { Footer } from "./Footer";
import { LoginModal } from "./LoginModal";
import { Navbar } from "./Navbar";
import { Primary } from "./Primary";
import { Footer } from "./Footer";
function Root(): JSXElement {
return (
@ -14,7 +14,7 @@ function Root(): JSXElement {
<div class="flex flex-col items-center">
<Navbar />
<LoginModal />
<div class="flex w-full min-h-[65vh] flex-col items-center mb-8 space-y-2 px-2 md:max-w-3xl">
<div class="mb-8 flex min-h-[65vh] w-full flex-col items-center space-y-2 px-2 md:max-w-3xl">
<Primary />
</div>
<Footer />

16
client-solid/src/GlobalState.tsx → client-solid/src/Context/GlobalState.tsx
View file

@ -47,7 +47,7 @@ export function GlobalStateProvider(props: {
return token() != "" && username() != "";
}
function logIn (username: string, token: string): void {
function logIn(username: string, token: string): void {
setUsername(username);
setToken(token);
localStorage.setItem("token", token);
@ -63,9 +63,19 @@ export function GlobalStateProvider(props: {
return (
<>
<ModalContext.Provider value={{ isOpen: loginModalOpen, setOpen: setLoginModalOpen }}>
<ModalContext.Provider
value={{ isOpen: loginModalOpen, setOpen: setLoginModalOpen }}
>
<LoginContext.Provider
value={{ token, setToken, username, setUsername, loggedIn, logOut, logIn }}
value={{
token,
setToken,
username,
setUsername,
loggedIn,
logOut,
logIn,
}}
>
{props.children}
</LoginContext.Provider>

0
client-solid/src/Icons.tsx → client-solid/src/Util/Icons.tsx
View file

0
client-solid/src/api.ts → client-solid/src/Util/api.ts
View file

2
client-solid/src/index.tsx
View file

@ -1,7 +1,7 @@
import { Router } from "@solidjs/router";
import { render } from "solid-js/web";
import Root from "./Root";
import Root from "./Containers/Root";
import "./index.css";
const root = document.getElementById("root");