diff --git a/client-solid/src/RegLogin/Login.tsx b/client-solid/src/Components/Login.tsx similarity index 93% rename from client-solid/src/RegLogin/Login.tsx rename to client-solid/src/Components/Login.tsx index 481811c..585f3a8 100644 --- a/client-solid/src/RegLogin/Login.tsx +++ b/client-solid/src/Components/Login.tsx @@ -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)!; diff --git a/client-solid/src/LoginButton.tsx b/client-solid/src/Components/LoginButton.tsx similarity index 83% rename from client-solid/src/LoginButton.tsx rename to client-solid/src/Components/LoginButton.tsx index d4867bf..a04bac5 100644 --- a/client-solid/src/LoginButton.tsx +++ b/client-solid/src/Components/LoginButton.tsx @@ -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)!; diff --git a/client-solid/src/Menu.tsx b/client-solid/src/Components/Menu.tsx similarity index 89% rename from client-solid/src/Menu.tsx rename to client-solid/src/Components/Menu.tsx index 4aac8ba..79e04f6 100644 --- a/client-solid/src/Menu.tsx +++ b/client-solid/src/Components/Menu.tsx @@ -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: { diff --git a/client-solid/src/NewPost.tsx b/client-solid/src/Components/NewPost.tsx similarity index 93% rename from client-solid/src/NewPost.tsx rename to client-solid/src/Components/NewPost.tsx index baace22..0dbdbc2 100644 --- a/client-solid/src/NewPost.tsx +++ b/client-solid/src/Components/NewPost.tsx @@ -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(""); diff --git a/client-solid/src/Posts.tsx b/client-solid/src/Components/Posts.tsx similarity index 92% rename from client-solid/src/Posts.tsx rename to client-solid/src/Components/Posts.tsx index 72b22aa..596185a 100644 --- a/client-solid/src/Posts.tsx +++ b/client-solid/src/Components/Posts.tsx @@ -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[]); diff --git a/client-solid/src/RegLogin/Register.tsx b/client-solid/src/Components/Register.tsx similarity index 94% rename from client-solid/src/RegLogin/Register.tsx rename to client-solid/src/Components/Register.tsx index 6ccccd4..680a7b0 100644 --- a/client-solid/src/RegLogin/Register.tsx +++ b/client-solid/src/Components/Register.tsx @@ -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)!; diff --git a/client-solid/src/SinglePost.tsx b/client-solid/src/Components/SinglePost.tsx similarity index 84% rename from client-solid/src/SinglePost.tsx rename to client-solid/src/Components/SinglePost.tsx index 7e5eca5..285df2f 100644 --- a/client-solid/src/SinglePost.tsx +++ b/client-solid/src/Components/SinglePost.tsx @@ -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(); diff --git a/client-solid/src/Footer.tsx b/client-solid/src/Containers/Footer.tsx similarity index 96% rename from client-solid/src/Footer.tsx rename to client-solid/src/Containers/Footer.tsx index 376e454..3b93362 100644 --- a/client-solid/src/Footer.tsx +++ b/client-solid/src/Containers/Footer.tsx @@ -17,7 +17,7 @@ export function Footer(): JSXElement { viewBox="0 0 24 24" class="fill-current" > - + @@ -28,7 +28,7 @@ export function Footer(): JSXElement { viewBox="0 0 24 24" class="fill-current" > - + @@ -39,7 +39,7 @@ export function Footer(): JSXElement { viewBox="0 0 24 24" class="fill-current" > - + diff --git a/client-solid/src/LoginModal.tsx b/client-solid/src/Containers/LoginModal.tsx similarity index 90% rename from client-solid/src/LoginModal.tsx rename to client-solid/src/Containers/LoginModal.tsx index f7d5541..0c5ef43 100644 --- a/client-solid/src/LoginModal.tsx +++ b/client-solid/src/Containers/LoginModal.tsx @@ -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)!; diff --git a/client-solid/src/Navbar.tsx b/client-solid/src/Containers/Navbar.tsx similarity index 78% rename from client-solid/src/Navbar.tsx rename to client-solid/src/Containers/Navbar.tsx index d06443e..5ef3ed0 100644 --- a/client-solid/src/Navbar.tsx +++ b/client-solid/src/Containers/Navbar.tsx @@ -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 ( diff --git a/client-solid/src/Primary.tsx b/client-solid/src/Containers/Primary.tsx similarity index 74% rename from client-solid/src/Primary.tsx rename to client-solid/src/Containers/Primary.tsx index dfffd80..b411a6c 100644 --- a/client-solid/src/Primary.tsx +++ b/client-solid/src/Containers/Primary.tsx @@ -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 { diff --git a/client-solid/src/Root.tsx b/client-solid/src/Containers/Root.tsx similarity index 80% rename from client-solid/src/Root.tsx rename to client-solid/src/Containers/Root.tsx index e07d657..93407bb 100644 --- a/client-solid/src/Root.tsx +++ b/client-solid/src/Containers/Root.tsx @@ -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 {
-
+