Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions react-router.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ import type { Config } from "@react-router/dev/config";
export default {
appDirectory: "src",
ssr: false,
// change if deploying to a subdirectory
basename: "/",
} satisfies Config;
6 changes: 5 additions & 1 deletion src/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ import "@fontsource-variable/inter/index.css";

// eslint-disable-next-line react-refresh/only-export-components
export const links: Route.LinksFunction = () => [
{ rel: "icon", type: "icon/png", href: "/hydrant.png" },
{
rel: "icon",
type: "icon/png",
href: import.meta.env.BASE_URL + "hydrant.png",
},
];

export function HydrateFallback() {
Expand Down
6 changes: 4 additions & 2 deletions src/routes/_index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ export async function clientLoader({ request }: Route.ClientLoaderArgs) {
const searchParams = new URL(request.url).searchParams;
const urlNameOrig = searchParams.get("t");

const latestTerm = await fetchNoCache<LatestTermInfo>("/latestTerm.json");
const latestTerm = await fetchNoCache<LatestTermInfo>(
import.meta.env.BASE_URL + "latestTerm.json",
);
const { urlName, shouldWarn } = getClosestUrlName(
urlNameOrig,
latestTerm.semester.urlName,
Expand All @@ -54,7 +56,7 @@ export async function clientLoader({ request }: Route.ClientLoaderArgs) {
}

const { classes, lastUpdated, termInfo } = await fetchNoCache<SemesterData>(
`/${termToFetch}.json`,
`${import.meta.env.BASE_URL}${termToFetch}.json`,
);
const classesMap = new Map(Object.entries(classes));

Expand Down
6 changes: 4 additions & 2 deletions src/routes/export.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ export async function clientLoader({ request }: Route.ClientLoaderArgs) {
const currentTerm = searchParams.get("t");
const callback = searchParams.get("callback");

const latestTerm = await fetchNoCache<LatestTermInfo>("/latestTerm.json");
const latestTerm = await fetchNoCache<LatestTermInfo>(
import.meta.env.BASE_URL + "latestTerm.json",
);
const { urlName } = getClosestUrlName(
currentTerm,
latestTerm.semester.urlName,
Expand All @@ -34,7 +36,7 @@ export async function clientLoader({ request }: Route.ClientLoaderArgs) {
const term = urlName === latestTerm.semester.urlName ? "latest" : urlName;

const { classes, lastUpdated, termInfo } = await fetchNoCache<SemesterData>(
`/${term}.json`,
`${import.meta.env.BASE_URL}${term}.json`,
);
const classesMap = new Map(Object.entries(classes));
const hydrantObj = new State(
Expand Down
1 change: 1 addition & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import checker from "vite-plugin-checker";

// https://vitejs.dev/config/
export default defineConfig({
base: "",
plugins: [
reactRouter(),
tsconfigPaths(),
Expand Down