chore: using ts aliases
This commit is contained in:
@@ -3,10 +3,6 @@ import { type Component, type ParentProps } from "solid-js";
|
||||
import { Login } from "./Login";
|
||||
import { ProtectedRoute } from "./ProtectedRoute";
|
||||
import { Settings } from "./Settings";
|
||||
import { SearchImageContextProvider } from "./contexts/SearchImageContext";
|
||||
import { Image } from "./Image";
|
||||
import { WithEntityDialog } from "./WithEntityDialog";
|
||||
import { Gallery } from "./gallery";
|
||||
import {
|
||||
IconArrowLeft,
|
||||
IconHome,
|
||||
@@ -14,8 +10,9 @@ import {
|
||||
IconSearch,
|
||||
} from "@tabler/icons-solidjs";
|
||||
import { Entity } from "./Entity";
|
||||
import { FrontPage } from "./front";
|
||||
import { onAndroidMount } from "./mobile";
|
||||
import { FrontPage, Gallery, ImagePage } from "./pages";
|
||||
import { SearchImageContextProvider } from "@contexts/SearchImageContext";
|
||||
|
||||
const AppWrapper: Component<ParentProps> = (props) => {
|
||||
return (
|
||||
@@ -59,14 +56,12 @@ export const App = () => {
|
||||
|
||||
<Route path="/" component={ProtectedRoute}>
|
||||
<Route path="/" component={WithDock}>
|
||||
<Route path="/" component={WithEntityDialog}>
|
||||
<Route path="/" component={FrontPage} />
|
||||
<Route path="/image/:imageId" component={Image} />
|
||||
<Route path="/entity/:entityId" component={Entity} />
|
||||
<Route path="/gallery/:entity" component={Gallery} />
|
||||
</Route>
|
||||
<Route path="/settings" component={Settings} />
|
||||
<Route path="/" component={FrontPage} />
|
||||
<Route path="/image/:imageId" component={ImagePage} />
|
||||
<Route path="/entity/:entityId" component={Entity} />
|
||||
<Route path="/gallery/:entity" component={Gallery} />
|
||||
</Route>
|
||||
<Route path="/settings" component={Settings} />
|
||||
</Route>
|
||||
</Route>
|
||||
<Route path="*" component={() => <Navigate href="/" />} />
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { ImageComponent } from "@components/image";
|
||||
import { ConcreteItemModal } from "@components/item-modal/ItemModal";
|
||||
import { useSearchImageContext } from "@contexts/SearchImageContext";
|
||||
import { useParams } from "@solidjs/router";
|
||||
import { Component, For, Show } from "solid-js";
|
||||
import { ConcreteItemModal } from "./components/item-modal/ItemModal";
|
||||
import { useSearchImageContext } from "./contexts/SearchImageContext";
|
||||
import { ImageComponent } from "./components/image";
|
||||
|
||||
export const Entity: Component = () => {
|
||||
const params = useParams<{ entityId: string }>();
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
import {
|
||||
type Component,
|
||||
type ParentProps,
|
||||
Show,
|
||||
createContext,
|
||||
createSignal,
|
||||
useContext,
|
||||
} from "solid-js";
|
||||
import { ItemModal } from "./components/item-modal/ItemModal";
|
||||
import type { UserImage } from "./network";
|
||||
|
||||
const EntityDialogContext = createContext<
|
||||
(image: UserImage | undefined) => void
|
||||
>(() => {});
|
||||
|
||||
export const useSetEntity = () => useContext(EntityDialogContext);
|
||||
|
||||
export const WithEntityDialog: Component<ParentProps> = (props) => {
|
||||
const [selectedEntity, setSelectedEntity] = createSignal<UserImage>();
|
||||
|
||||
return (
|
||||
<EntityDialogContext.Provider value={setSelectedEntity}>
|
||||
<Show when={selectedEntity()}>
|
||||
{(entity) => (
|
||||
<ItemModal
|
||||
item={entity()}
|
||||
onClose={() => setSelectedEntity(undefined)}
|
||||
/>
|
||||
)}
|
||||
</Show>
|
||||
{props.children}
|
||||
</EntityDialogContext.Provider>
|
||||
);
|
||||
};
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Component, For } from "solid-js";
|
||||
import { useSearchImageContext } from "../contexts/SearchImageContext";
|
||||
import { ImageComponent } from "../components/image";
|
||||
import { ImageComponent } from "@components/image";
|
||||
import { useSearchImageContext } from "@contexts/SearchImageContext";
|
||||
|
||||
export const Recent: Component = () => {
|
||||
const { userImages } = useSearchImageContext();
|
||||
@@ -1,9 +1,9 @@
|
||||
import { Component, For } from "solid-js";
|
||||
import { A } from "@solidjs/router";
|
||||
import {
|
||||
SearchImageStore,
|
||||
useSearchImageContext,
|
||||
} from "../contexts/SearchImageContext";
|
||||
import { A } from "@solidjs/router";
|
||||
} from "@contexts/SearchImageContext";
|
||||
|
||||
// TODO: lots of stuff to do with Entities, this could be seperated into a centralized place.
|
||||
const CategoryColor: Record<
|
||||
@@ -1,8 +1,8 @@
|
||||
import { Component, For, Show } from "solid-js";
|
||||
import { useParams } from "@solidjs/router";
|
||||
import { union, literal, safeParse, InferOutput, parse } from "valibot";
|
||||
import { useSearchImageContext } from "../contexts/SearchImageContext";
|
||||
import { SearchCard } from "../components/search-card/SearchCard";
|
||||
import { useSearchImageContext } from "@contexts/SearchImageContext";
|
||||
import { SearchCard } from "@components/search-card/SearchCard";
|
||||
|
||||
const entityValidator = union([
|
||||
literal("event"),
|
||||
@@ -1,10 +1,10 @@
|
||||
import { SearchCard } from "@components/search-card/SearchCard";
|
||||
import { useSearchImageContext } from "@contexts/SearchImageContext";
|
||||
import { base, UserImage } from "@network/index";
|
||||
import { useParams } from "@solidjs/router";
|
||||
import { For, Show, type Component } from "solid-js";
|
||||
import { base, type UserImage } from "./network";
|
||||
import { useSearchImageContext } from "./contexts/SearchImageContext";
|
||||
import { SearchCard } from "./components/search-card/SearchCard";
|
||||
|
||||
export const Image: Component = () => {
|
||||
export const ImagePage: Component = () => {
|
||||
const { imageId } = useParams<{ imageId: string }>();
|
||||
|
||||
const { imagesWithProperties } = useSearchImageContext();
|
||||
3
frontend/src/pages/index.ts
Normal file
3
frontend/src/pages/index.ts
Normal file
@@ -0,0 +1,3 @@
|
||||
export * from "./front";
|
||||
export * from "./gallery";
|
||||
export * from "./image";
|
||||
Reference in New Issue
Block a user