diff --git a/src/components/canvas/Blocks.tsx b/src/components/canvas/Blocks.tsx index 70ee7ae..e00d903 100644 --- a/src/components/canvas/Blocks.tsx +++ b/src/components/canvas/Blocks.tsx @@ -1,10 +1,10 @@ import { useEffect, useRef, useState } from "react"; -import { Sprite, useApp } from "@pixi/react"; + +import * as PIXI from "pixi.js"; +import { useApp } from "@pixi/react"; +import { CompositeTilemap, settings } from "@pixi/tilemap"; import blocksData from "@/data/blocks/programmer-art/average_colors.json"; -import * as PIXI from "pixi.js"; - -import { CompositeTilemap, settings } from "@pixi/tilemap"; interface Props { blocks: Block[]; diff --git a/src/components/canvas/Canvas.tsx b/src/components/canvas/Canvas.tsx index 8363e97..9f34ee6 100644 --- a/src/components/canvas/Canvas.tsx +++ b/src/components/canvas/Canvas.tsx @@ -1,16 +1,18 @@ import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react"; -import { Container, Stage } from "@pixi/react"; -import * as PIXI from "pixi.js"; -import { ImageContext } from "@/context/ImageContext"; -import { SettingsContext } from "@/context/SettingsContext"; -import { TexturesContext } from "@/context/TexturesContext"; -import { ToolContext } from "@/context/ToolContext"; +import * as PIXI from "pixi.js"; +import { Container, Stage } from "@pixi/react"; + +import { ImageContext } from "@/context/Image"; +import { SettingsContext } from "@/context/Settings"; +import { TexturesContext } from "@/context/Textures"; +import { ToolContext } from "@/context/Tool"; import Blocks from "./Blocks"; +import Cursor from "./Cursor"; import Grid from "./Grid"; import CanvasBorder from "./CanvasBorder"; -import Cursor from "./Cursor"; + import CursorInformation from "./information/Cursor"; import CanvasInformation from "./information/Canvas"; diff --git a/src/components/dialogs/OpenImage.tsx b/src/components/dialogs/OpenImage.tsx index b857232..e7def87 100644 --- a/src/components/dialogs/OpenImage.tsx +++ b/src/components/dialogs/OpenImage.tsx @@ -8,7 +8,7 @@ import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; -import { ImageContext } from "@/context/ImageContext"; +import { ImageContext } from "@/context/Image"; function OpenImage({ close }: DialogProps) { const { setImage: setContextImage, setImageDimensions: setContextImageDimensions } = useContext(ImageContext); diff --git a/src/components/menubar/FileMenu.tsx b/src/components/menubar/FileMenu.tsx index 5f29a50..a90fd00 100644 --- a/src/components/menubar/FileMenu.tsx +++ b/src/components/menubar/FileMenu.tsx @@ -11,7 +11,7 @@ import { MenubarTrigger, } from "@/components/ui/menubar"; -import { DialogContext } from "@/context/DialogContext"; +import { DialogContext } from "@/context/Dialog"; function FileMenu() { const openDialog = useContext(DialogContext); diff --git a/src/components/menubar/ThemeChanger.tsx b/src/components/menubar/ThemeChanger.tsx index 07062b7..85f5e9d 100644 --- a/src/components/menubar/ThemeChanger.tsx +++ b/src/components/menubar/ThemeChanger.tsx @@ -1,21 +1,21 @@ -import { MenubarRadioGroup, MenubarRadioItem, MenubarSub, MenubarSubContent, MenubarSubTrigger } from '@/components/ui/menubar'; -import { useTheme } from '@/context/ThemeContext'; +import { MenubarRadioGroup, MenubarRadioItem, MenubarSub, MenubarSubContent, MenubarSubTrigger } from "@/components/ui/menubar"; +import { useTheme } from "@/context/Theme"; function ThemeChanger() { - const { setTheme, theme } = useTheme(); + const { setTheme, theme } = useTheme(); - return ( - - Set theme... - - setTheme(value as Theme)}> - Light - Dark - System - - - - ) + return ( + + Set theme... + + setTheme(value as Theme)}> + Light + Dark + System + + + + ); } -export default ThemeChanger \ No newline at end of file +export default ThemeChanger; diff --git a/src/components/menubar/ViewMenu.tsx b/src/components/menubar/ViewMenu.tsx index 3e686f0..6894e84 100644 --- a/src/components/menubar/ViewMenu.tsx +++ b/src/components/menubar/ViewMenu.tsx @@ -1,6 +1,6 @@ import { useContext } from "react"; import { MenubarCheckboxItem, MenubarContent, MenubarMenu, MenubarTrigger } from "@/components/ui/menubar"; -import { SettingsContext } from "@/context/SettingsContext"; +import { SettingsContext } from "@/context/Settings"; function ViewMenu() { const { settings, setSetting } = useContext(SettingsContext); diff --git a/src/components/menubar/index.tsx b/src/components/menubar/index.tsx index f58a4eb..5cd219b 100644 --- a/src/components/menubar/index.tsx +++ b/src/components/menubar/index.tsx @@ -1,7 +1,7 @@ import { Link } from "react-router"; import { Menubar as UIMenubar } from "@/components/ui/menubar"; -import { DialogProvider } from "@/context/DialogContext"; +import { DialogProvider } from "@/context/Dialog"; import FileMenu from "./FileMenu"; import ViewMenu from "./ViewMenu"; diff --git a/src/components/toolbar/index.tsx b/src/components/toolbar/index.tsx index 39c9ce9..2b2ff47 100644 --- a/src/components/toolbar/index.tsx +++ b/src/components/toolbar/index.tsx @@ -2,7 +2,7 @@ import { useContext } from "react"; import { EraserIcon, HandIcon, PencilIcon, ZoomInIcon } from "lucide-react"; import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group"; -import { ToolContext } from "@/context/ToolContext"; +import { ToolContext } from "@/context/Tool"; function Toolbar() { const { tool, setTool } = useContext(ToolContext); diff --git a/src/context/DialogContext.tsx b/src/context/Dialog.tsx similarity index 100% rename from src/context/DialogContext.tsx rename to src/context/Dialog.tsx diff --git a/src/context/ImageContext.tsx b/src/context/Image.tsx similarity index 100% rename from src/context/ImageContext.tsx rename to src/context/Image.tsx diff --git a/src/context/SettingsContext.tsx b/src/context/Settings.tsx similarity index 100% rename from src/context/SettingsContext.tsx rename to src/context/Settings.tsx diff --git a/src/context/TexturesContext.tsx b/src/context/Textures.tsx similarity index 100% rename from src/context/TexturesContext.tsx rename to src/context/Textures.tsx diff --git a/src/context/ThemeContext.tsx b/src/context/Theme.tsx similarity index 100% rename from src/context/ThemeContext.tsx rename to src/context/Theme.tsx diff --git a/src/context/ToolContext.tsx b/src/context/Tool.tsx similarity index 100% rename from src/context/ToolContext.tsx rename to src/context/Tool.tsx diff --git a/src/main.tsx b/src/main.tsx index a3eb121..03e603a 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -2,7 +2,7 @@ import { StrictMode } from "react"; import { createRoot } from "react-dom/client"; import { BrowserRouter, Route, Routes } from "react-router"; -import { ThemeProvider } from "@/context/ThemeContext.tsx"; +import { ThemeProvider } from "@/context/Theme.tsx"; import IndexPage from "./pages/IndexPage.tsx"; import AppPage from "./pages/AppPage.tsx"; diff --git a/src/pages/AppPage.tsx b/src/pages/AppPage.tsx index 583e0f3..a8469c9 100644 --- a/src/pages/AppPage.tsx +++ b/src/pages/AppPage.tsx @@ -1,7 +1,7 @@ -import { ImageProvider } from "../context/ImageContext"; -import { SettingsProvider } from "../context/SettingsContext"; -import { TexturesProvider } from "../context/TexturesContext"; -import { ToolProvider } from "../context/ToolContext"; +import { ImageProvider } from "../context/Image"; +import { SettingsProvider } from "../context/Settings"; +import { TexturesProvider } from "../context/Textures"; +import { ToolProvider } from "../context/Tool"; import Menubar from "../components/menubar"; import Toolbar from "../components/toolbar";