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
18 changes: 13 additions & 5 deletions backend/server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions backend/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,8 @@
"express": "^5.3.0",
"graphql": "^16.14.2",
"pg": "^8.23.1"
},
"overrides": {
"minimatch": "^11.0.1"
}
}
18 changes: 13 additions & 5 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,8 @@
},
"allowScripts": {
"fsevents@2.3.3": true
},
"overrides": {
"minimatch": "^11.0.1"
}
}
8 changes: 4 additions & 4 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useState } from "react";
import "./App.css";
import HomePage from "./pages/homePage/HomePage";
import CategoryPage from "./pages/categoryPage/CategoryPage";
import PcBuilderPage from "./pages/pcBuilderPage/PcBuilderPage";
import CommunityPage from "./pages/communityPage/CommunityPage";
import HomePage from "./pages/homePage/homePage";
import CategoryPage from "./pages/categoryPage/categoryPage";
import PcBuilderPage from "./pages/pcBuilderPage/pcBuilderPage";
import CommunityPage from "./pages/communityPage/communityPage";
import NavBar from "./components/pageSections/Header";
import Footer from "./components/pageSections/Footer";
import BackToTopButton from "./components/buttons/BackToTopButton";
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/DesktopComponentDetailPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useBuild } from "@/context/buildContext";
import { useBuild } from "@/context/BuildContext";
import { Trash2, X } from "lucide-react";
import { useId, useState } from "react";
import { Link } from "react-router";
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/buttons/AddToBuildButton.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ReactNode } from "react";
import type { PcPart } from "@/types/types";
import { useBuild } from "@/context/buildContext";
import { useBuild } from "@/context/BuildContext";
import { useNavigate } from "react-router";
import { twMerge } from "tailwind-merge";
import Button from "./Button";
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/pageSections/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState, type FormEvent } from "react";
import { Link, NavLink, useNavigate } from "react-router";
import { Menu, Search, X } from "lucide-react";
import { useBuild } from "@/context/buildContext";
import { useBuild } from "@/context/BuildContext";

const navigation = [
{ to: "/", label: "Home" },
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/context/BuildProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useEffect, useState } from "react";
import type { ReactNode } from "react";
import type { PcPart } from "@/types/types";
import { BuildContext } from "./buildContext";
import type { BuildParts } from "./buildContext";
import { BuildContext } from "./BuildContext";
import type { BuildParts } from "./BuildContext";

const STORAGE_KEY = "pc-builder";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useRef } from "react";
import Button from "@/components/buttons/Button";
import { useBuild } from "@/context/buildContext";
import { useBuild } from "@/context/BuildContext";

export default function ClearBuild() {
const dialogRef = useRef<HTMLDialogElement>(null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
formatSpecification,
getSpecifications,
} from "@/utils/partSpecifications";
import { useBuild } from "@/context/buildContext";
import { useBuild } from "@/context/BuildContext";
import Button from "@/components/buttons/Button";
import { ArrowLeftRight, Plus, Trash2 } from "lucide-react";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Link } from "react-router";
import { useRef, useState } from "react";
import { useBuild } from "@/context/buildContext";
import { useBuild } from "@/context/BuildContext";
import { publishBuild } from "@/api/builds";
import Button from "@/components/buttons/Button";

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/pcBuilderPage/pcBuilderPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SelectionComponent from "./components/ComponentSelectionComponent";

import { useBuild } from "@/context/buildContext";
import { useBuild } from "@/context/BuildContext";
import { categories } from "@/types/categories";
import BuildSummaryComponent from "./components/BuildSummaryComponent";
import ClearBuild from "./components/ClearBuild";
Expand Down