Skip to content

Commit

Permalink
configure: Merge util into lib
Browse files Browse the repository at this point in the history
  • Loading branch information
oscartbeaumont committed Jul 22, 2024
1 parent e170f35 commit 51b695f
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 14 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 3 additions & 8 deletions apps/configure/src/routes/(dash).tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,9 @@ import {
createSignal,
onMount,
} from "solid-js";
import { AccessTokenProvider, logout } from "../util/auth";
import {
db,
invalidateStore,
resetDb,
subscribeToInvalidations,
} from "../util/db";
import { syncAll, useUser } from "../util/sync";
import { AccessTokenProvider, logout } from "~/lib/auth";
import { db, subscribeToInvalidations } from "~/lib/db";
import { syncAll, useUser } from "~/lib/sync";

export function useAccessTokenRaw() {
const [accessToken, setAccessToken] = createSignal<string | null | undefined>(
Expand Down
2 changes: 1 addition & 1 deletion apps/configure/src/routes/(dash)/overview.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ErrorBoundary, Suspense } from "solid-js";
import { useUser } from "../../util/sync";
import { useUser } from "~/lib/sync";

export default function Page() {
const me = useUser();
Expand Down
2 changes: 1 addition & 1 deletion apps/configure/src/routes/(dash)/search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
createStandardTable,
selectCheckboxColumn,
} from "~/components/StandardTable";
import { db } from "../../util/db";
import { db } from "~/lib/db";

// TODO: Rest of the possibilities + clean this up
export type Filter =
Expand Down
2 changes: 1 addition & 1 deletion apps/configure/src/routes/(dash)/users/(users).tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Button } from "@mattrax/ui";
import { A } from "@solidjs/router";
import { createColumnHelper } from "@tanstack/solid-table";
import { Suspense } from "solid-js";
import { type Database, createIdbQuery } from "~/lib/db";
import { createBulkDeleteDialog } from "~c/BulkDeleteDialog";
import { PageLayout, PageLayoutHeading } from "~c/PageLayout";
import {
Expand All @@ -12,7 +13,6 @@ import {
selectCheckboxColumn,
} from "~c/StandardTable";
import { TableSearchParamsInput } from "~c/TableSearchParamsInput";
import { type Database, createIdbQuery } from "../../../util/db";

const column = createColumnHelper<Database["users"]["value"]>();

Expand Down
2 changes: 1 addition & 1 deletion apps/configure/src/routes/(dash)/views/(views).tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { A, useNavigate } from "@solidjs/router";
import { createColumnHelper } from "@tanstack/solid-table";
import { type Database, createIdbQuery, db } from "~/lib/db";
import { createBulkDeleteDialog } from "~c/BulkDeleteDialog";
import { PageLayout, PageLayoutHeading } from "~c/PageLayout";
import {
Expand All @@ -8,7 +9,6 @@ import {
createStandardTable,
selectCheckboxColumn,
} from "~c/StandardTable";
import { type Database, createIdbQuery, db } from "../../../util/db";

const column = createColumnHelper<Database["views"]["value"]>();

Expand Down
2 changes: 1 addition & 1 deletion apps/configure/src/routes/(dash)/views/[viewId].tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createAsync } from "@solidjs/router";
import { Show } from "solid-js";
import { z } from "zod";
import { createIdbQuery } from "~/lib/db";
import { useZodParams } from "~/lib/useZodParams";
import { createIdbQuery } from "../../../util/db";
import { SearchPage, createSearchPageContext } from "../search";

export default function Page() {
Expand Down
2 changes: 1 addition & 1 deletion apps/configure/src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
useNavigate,
} from "@solidjs/router";
import { ErrorBoundary, Match, Suspense, Switch } from "solid-js";
import { generateOAuthUrl, verifyOAuthCode } from "../util/auth";
import { generateOAuthUrl, verifyOAuthCode } from "~/lib/auth";
import { useAccessTokenRaw } from "./(dash)";

export default function Page() {
Expand Down

0 comments on commit 51b695f

Please sign in to comment.