co-locate remaining logic

packages/client/src/Lib/AgeGate/AgeGateHooks.ts

@@ -1,5 +1,5 @@
 import { useContext } from "react"
-import { AgeGateContext, AgeGateState } from "./AgeGateContext.ts"
+import { AgeGateContext, AgeGateState } from "./AgeGateContext"
 
 export const useAgeGate = (): AgeGateState => {
   return useContext(AgeGateContext)

packages/client/src/Lib/AgeGate/AgeGateProvider.tsx

@@ -1,5 +1,5 @@
 import { FC, ReactNode, useState } from "react"
-import { AgeGateContext } from "./AgeGateContext.ts"
+import { AgeGateContext } from "./AgeGateContext"
 
 export interface AgeGateProviderProps {
   children: ReactNode

packages/client/src/Lib/AgeGate/index.ts

@@ -1,3 +1,3 @@
-export * from "./AgeGateContext.ts"
-export * from "./AgeGateHooks.ts"
-export * from "./AgeGateProvider.tsx"
+export * from "./AgeGateContext"
+export * from "./AgeGateHooks"
+export * from "./AgeGateProvider"

packages/client/src/Lib/Auth/AuthApi.ts

@@ -1,11 +1,10 @@
 import * as webauthn from "@github/webauthn-json/browser-ponyfill"
 import { RegistrationPublicKeyCredential } from "@github/webauthn-json/browser-ponyfill"
 import z from "zod"
+import { isServerApiError, ServerApi } from "../ServerApi"
 
-import { UserData } from "../../Models"
-import { authTokenStore } from "../../Api/AuthTokenStore.ts"
-import { isServerApiError, ServerApi } from "../../Api"
-import { UserDataSchema, UserResSchema } from "../../Api/Schemas"
+import { authTokenStore } from "../ServerApi/AuthTokenStore"
+import { UserData, UserDataSchema, UserResSchema } from "../Users"
 import {
   PasskeyCreateChallengeSchema,
   PasskeyData,

packages/client/src/Lib/Auth/AuthQueries.ts

@@ -6,12 +6,11 @@ import {
   UseQueryResult,
 } from "@tanstack/react-query"
 
-import { queryKeys } from "../../Queries/QueryKeys.ts"
-import { ServerApiError } from "../../Api"
+import { queryClient, queryKeys } from "../Queries"
+import { ServerApiError } from "../ServerApi"
+import { UserData } from "../Users"
+import { authApiClient, RegisterPassKeyParams } from "./AuthApi"
 import { PasskeyData } from "./Passkeys"
-import { queryClient } from "../QueryClient.ts"
-import { UserData } from "../../Models"
-import { authApiClient, RegisterPassKeyParams } from "./AuthApi.ts"
 
 export const usePasswordLogin$ = () => {
   const queryClient = useQueryClient()

packages/client/src/Lib/Auth/Passkeys/index.ts

@@ -1 +1 @@
-export * from "./PasskeySchema.ts"
+export * from "./PasskeySchema"

packages/client/src/Lib/Auth/index.ts

@@ -1,3 +1,3 @@
 export * from "./Passkeys"
-export * from "./AuthApi.ts"
-export * from "./AuthQueries.ts"
+export * from "./AuthApi"
+export * from "./AuthQueries"

packages/client/src/Lib/Galleries/GalleryApi.ts

@@ -1,5 +1,5 @@
 import { GalleryResSchema } from "./GalleryDataSchema"
-import { ServerApi } from "../../Api"
+import { ServerApi } from "../ServerApi"
 import { GalleryData } from "./GalleryData"
 import { PagedPostData, PagedPostDataResSchema } from "../Posts"
 

packages/client/src/Lib/Galleries/GalleryHooks.ts

@@ -1,5 +1,5 @@
 import { useContext } from "react"
-import { GalleryConfig, GalleryContext } from "./GalleryContext.ts"
+import { GalleryConfig, GalleryContext } from "./GalleryContext"
 
 export const useGalleryContext = (): GalleryConfig => {
   return useContext(GalleryContext)

packages/client/src/Lib/Galleries/GalleryProvider.tsx

@@ -3,7 +3,7 @@ import {
   defaultGalleryConfig,
   GalleryConfig,
   GalleryContext,
-} from "./GalleryContext.ts"
+} from "./GalleryContext"
 
 export interface GalleryContextProviderProps {
   config: Partial<GalleryConfig>

packages/client/src/Lib/Galleries/GalleryQueries.ts

@@ -1,6 +1,6 @@
 import { useQuery, UseQueryResult } from "@tanstack/react-query"
 
-import { queryKeys } from "../../Queries/QueryKeys"
+import { queryKeys } from "../Queries/QueryKeys"
 import { galleryApiClient } from "./GalleryApi"
 import { GalleryData } from "./GalleryData"
 

packages/client/src/Hooks/UseHotkey.ts → packages/client/src/Lib/Hooks/UseHotkey.ts

@@ -1,6 +1,5 @@
 import { useEffect, useRef } from "react"
-
-import { noop } from "../Lib"
+import { noop } from "../Noop"
 
 export const useHotkey = (hotkey: string, action: () => void): void => {
   const actionRef = useRef<() => void>(noop)

packages/client/src/Hooks/UseIsAdmin.ts → packages/client/src/Lib/Hooks/UseIsAdmin.ts

@@ -1,4 +1,4 @@
-import { useCurrentUser$ } from "../Lib/Auth"
+import { useCurrentUser$ } from "../Auth"
 
 export const useIsAdmin = (): boolean => {
   const { data: currentUser } = useCurrentUser$()

packages/client/src/Hooks/UsePostPreloader.ts → packages/client/src/Lib/Hooks/UsePostPreloader.ts

@@ -1,4 +1,5 @@
-import { PostData, useImagePreloader } from "../Lib"
+import { useImagePreloader } from "../Images"
+import { PostData } from "../Posts"
 
 interface PostPreloaderProps {
   post: PostData

packages/client/src/Hooks/index.ts → packages/client/src/Lib/Hooks/index.ts

@@ -1,5 +1,5 @@
 export * from "./UseDragActive"
-export * from "./UseFeatureFlag"
+export * from "../SiteMeta/UseFeatureFlag"
 export * from "./UseFilesDropped"
 export * from "./UseHotkey"
 export * from "./UseInViewport"

packages/client/src/Lib/Images/ImageManager/Actions.ts

@@ -1,6 +1,6 @@
 import { createAction } from "@reduxjs/toolkit"
 
-import { ImageData } from "../ImageData.ts"
+import { ImageData } from "../ImageData"
 
 export type SetImagesPayload = ImageData[]
 export const setImages = createAction<SetImagesPayload>("setImages")

packages/client/src/Lib/Images/ImageManager/ChangesReducer.test.ts

@@ -1,5 +1,13 @@
 import crypto from "node:crypto"
 import { beforeEach, describe, expect, it } from "vitest"
+import { freeze } from "../../index"
+import {
+  AddImageChangeRecord,
+  EditImageChangeRecord,
+  ImageChangeRecord,
+  RemoveImageChangeRecord,
+} from "../ImageChangeRecord"
+import { ImageData } from "../ImageData"
 
 import {
   addImage,
@@ -10,16 +18,8 @@ import {
   RemoveImagePayload,
   setImages,
   SetImagesPayload,
-} from "./Actions.ts"
-import { changesReducer } from "./ChangesReducer.ts"
-import { freeze } from "../../index.ts"
-import { ImageData } from "../ImageData"
-import {
-  AddImageChangeRecord,
-  EditImageChangeRecord,
-  ImageChangeRecord,
-  RemoveImageChangeRecord,
-} from "../ImageChangeRecord.ts"
+} from "./Actions"
+import { changesReducer } from "./ChangesReducer"
 
 describe("ChangesReducer", () => {
   let oldState: ImageChangeRecord[]

packages/client/src/Lib/Images/ImageManager/ChangesReducer.ts

@@ -1,7 +1,7 @@
 import { createReducer } from "@reduxjs/toolkit"
+import { ImageChangeRecord } from "../ImageChangeRecord"
 
-import * as Actions from "./Actions.ts"
-import { ImageChangeRecord } from "../ImageChangeRecord.ts"
+import * as Actions from "./Actions"
 
 export const changesReducer = createReducer<ImageChangeRecord[]>(
   [],

packages/client/src/Lib/Images/ImageManager/ImagesReducer.test.ts

@@ -1,5 +1,7 @@
 import crypto from "node:crypto"
 import { beforeEach, describe, expect, it, vi } from "vitest"
+import { freeze } from "../../index"
+import { ImageData } from "../ImageData"
 
 import {
   addImage,
@@ -8,10 +10,8 @@ import {
   EditImagePayload,
   setImages,
   SetImagesPayload,
-} from "./Actions.ts"
+} from "./Actions"
 import { imagesReducer } from "./ImagesReducer"
-import { freeze } from "../../index"
-import { ImageData } from "../ImageData"
 
 describe("ImageReducer", () => {
   let oldState: ImageData[]

packages/client/src/Lib/Images/ImageManager/ImagesReducer.ts

@@ -1,8 +1,8 @@
 import { createReducer } from "@reduxjs/toolkit"
+import { reorderItems } from "../../Hooks"
+import { ImageData } from "../ImageData"
 
-import * as Actions from "./Actions.ts"
-import { reorderItems } from "../../../Hooks"
-import { ImageData } from "../ImageData.ts"
+import * as Actions from "./Actions"
 
 export const imagesReducer = createReducer<ImageData[]>([], ({ addCase }) => {
   addCase(Actions.setImages, (_images, { payload }) => {

packages/client/src/Lib/Images/ImageManager/UseImageManager.ts

@@ -1,9 +1,9 @@
 import { useReducer } from "react"
+import { ImageChangeRecord } from "../ImageChangeRecord"
+import { ImageData } from "../ImageData"
 
-import * as Actions from "./Actions.ts"
-import { rootReducer } from "./rootReducer.ts"
-import { ImageData } from "../ImageData.ts"
-import { ImageChangeRecord } from "../ImageChangeRecord.ts"
+import * as Actions from "./Actions"
+import { rootReducer } from "./rootReducer"
 
 export type UseImageManagerProps = {
   images?: ImageData[]

packages/client/src/Lib/Images/ImageManager/index.ts

@@ -1 +1 @@
-export * from "./UseImageManager.ts"
+export * from "./UseImageManager"

packages/client/src/Lib/Images/ImageManager/rootReducer.ts

@@ -1,9 +1,9 @@
 import { Reducer } from "@reduxjs/toolkit"
+import { ImageChangeRecord } from "../ImageChangeRecord"
+import { ImageData } from "../ImageData"
 
-import { changesReducer } from "./ChangesReducer.ts"
-import { imagesReducer } from "./ImagesReducer.ts"
-import { ImageData } from "../ImageData.ts"
-import { ImageChangeRecord } from "../ImageChangeRecord.ts"
+import { changesReducer } from "./ChangesReducer"
+import { imagesReducer } from "./ImagesReducer"
 
 export type State = {
   images: ImageData[]

packages/client/src/Lib/Images/ImageQueries.ts

@@ -1,8 +1,8 @@
 import { useQuery, useQueryClient, UseQueryResult } from "@tanstack/react-query"
+import { errorHandler } from "../Errors/ErrorHandler"
 
-import { queryKeys } from "../../Queries/QueryKeys"
+import { queryKeys } from "../Queries/QueryKeys"
 import { imageApi } from "./ImageApi"
-import { errorHandler } from "../../Errors/ErrorHandler"
 import { ImageData } from "./ImageData"
 
 export const useImage$ = (src: string): UseQueryResult<HTMLImageElement> => {

packages/client/src/Api/Endpoints/MetricsApi.ts → packages/client/src/Lib/Metrics/MetricsApi.ts

@@ -1,6 +1,6 @@
-import { ViewMetricsData } from "../../Models"
-import { ViewMetricsResSchema } from "../Schemas/ViewMetricsDataSchema"
 import { ServerApi } from "../ServerApi"
+import { ViewMetricsData } from "./ViewMetricsData"
+import { ViewMetricsResSchema } from "./ViewMetricsDataSchema"
 
 export class MetricsApi extends ServerApi {
   fetchViews(

packages/client/src/Queries/MetricsQueries.ts → packages/client/src/Lib/Metrics/MetricsQueries.ts

@@ -1,7 +1,6 @@
 import { useQuery } from "@tanstack/react-query"
-
-import { queryKeys } from "./QueryKeys"
-import { metricsApiClient } from "../Api"
+import { queryKeys } from "../Queries"
+import { metricsApiClient } from "./MetricsApi"
 
 export const useViewMetrics$ = (params: {
   startDate?: Date | null

packages/client/src/Api/Endpoints/PostViewsApi.ts → packages/client/src/Lib/Metrics/PostViewsApi.ts

@@ -1,7 +1,7 @@
-import { PostData } from "../../Lib/Posts/PostData.ts"
-import { ViewsData } from "../../Models/ViewsData"
-import { PostViewsResSchema } from "../Schemas/PostViewsDataSchema"
+import { PostData } from "../Posts"
 import { ServerApi } from "../ServerApi"
+import { PostViewsResSchema } from "./PostViewsDataSchema"
+import { ViewsData } from "./ViewsData"
 
 class PostViewsApi extends ServerApi {
   public async fetchViews(params: {

packages/client/src/Queries/PostViewsQueries.ts → packages/client/src/Lib/Metrics/PostViewsQueries.ts

@@ -4,11 +4,10 @@ import {
   useQuery,
   UseQueryResult,
 } from "@tanstack/react-query"
-
-import { queryKeys } from "./QueryKeys"
-import { PostData } from "../Lib"
-import { ViewsData } from "../Models"
-import { postViewsApi } from "../Api"
+import { PostData } from "../Posts"
+import { queryKeys } from "../Queries"
+import { postViewsApi } from "./PostViewsApi"
+import { ViewsData } from "./ViewsData"
 
 export const usePostViews$ = (params: {
   postId: PostData["id"]

packages/client/src/Lib/Views/ViewHooks.ts → packages/client/src/Lib/Metrics/ViewHooks.ts

@@ -1,8 +1,8 @@
 import * as uuid from "uuid"
 
-import { postViewsApi } from "../../Api"
 import { noop } from "../Noop"
 import { PostData } from "../Posts"
+import { postViewsApi } from "./PostViewsApi"
 
 const VIEWER_ID_KEY = "viewerId"
 const SESSION_VIEWS_KEY = (postId: string) => `viewed.${postId}`

packages/client/src/Lib/Metrics/index.ts

@@ -0,0 +1,9 @@
+export * from "./MetricsApi"
+export * from "./MetricsQueries"
+export * from "./PostViewsApi"
+export * from "./PostViewsDataSchema"
+export * from "./PostViewsQueries"
+export * from "./ViewMetricsData"
+export * from "./ViewMetricsDataSchema"
+export * from "./ViewsData"
+export * from "./ViewHooks"

packages/client/src/Lib/Posts/PostData.ts

@@ -1,8 +1,7 @@
 import { addDays, setHours, setMinutes } from "date-fns"
 
-import { EditableImage, ImageData } from "../Images/ImageData.ts"
-import { TagData } from "../Tags/TagData.ts"
-import { ImageChangeRecord } from "../Images"
+import { EditableImage, ImageChangeRecord, ImageData } from "../Images"
+import { TagData } from "../Tags"
 
 export interface PostData {
   id: string

packages/client/src/Lib/Posts/PostDataSchema.ts

@@ -1,8 +1,8 @@
 import z from "zod"
 
-import { ImageDataSchema } from "../Images/ImageDataSchema.ts"
-import { PagedResMetaDataSchema } from "../../Api/Schemas/PagedResMetaDataSchema.ts"
-import { TagDataSchema } from "../Tags/TagDataSchema.ts"
+import { ImageDataSchema } from "../Images"
+import { PagedResMetaDataSchema } from "../ServerApi"
+import { TagDataSchema } from "../Tags"
 
 export const PostDataSchema = z.object({
   id: z.string().uuid(),

packages/client/src/Lib/Posts/PostHooks.tsx

@@ -1,5 +1,5 @@
 import { useContext } from "react"
-import { PostContext } from "./PostContext.tsx"
+import { PostContext } from "./PostContext"
 
 export const usePostContext = () => {
   const context = useContext(PostContext)

packages/client/src/Lib/Posts/PostQuries.ts

@@ -8,15 +8,13 @@ import {
   useQueryClient,
   UseQueryResult,
 } from "@tanstack/react-query"
-
-import { queryKeys } from "../../Queries/QueryKeys.ts"
-import { pagedQueryOptions } from "../../Queries/QueryUtils.ts"
-import { EditablePost, PostData } from "./PostData"
-import { EditableImage, ImageChangeRecord } from "../Images"
-import { postsApi } from "./PostsApi"
 import { GalleryData } from "../Galleries"
+import { EditableImage, ImageChangeRecord } from "../Images"
+import { pagedQueryOptions, queryKeys } from "../Queries"
 import { TagData } from "../Tags"
+import { EditablePost, PostData } from "./PostData"
 import { PagedPostData } from "./PostDataSchema"
+import { postsApi } from "./PostsApi"
 
 type PostParams = { postId: string; galleryId?: string; tagId?: string }
 

packages/client/src/Lib/Posts/PostsApi.ts

@@ -1,9 +1,8 @@
 import { AxiosProgressEvent } from "axios"
-
-import { getPostUrl } from "../PostUtil.ts"
-import { ServerApi } from "../../Api"
-import { EditablePost, PostData, postToFormData } from "./PostData"
 import { EditableImage, ImageChangeRecord } from "../Images"
+import { getPostUrl } from "../PostUtil"
+import { ServerApi } from "../ServerApi"
+import { EditablePost, PostData, postToFormData } from "./PostData"
 import {
   PagedPostData,
   PagedPostDataResSchema,