From 2ef2f28d4c1eae25d9fd6cc0d0e858a633999e5d Mon Sep 17 00:00:00 2001 From: dm1sh Date: Sun, 5 Sep 2021 12:26:46 +0300 Subject: [PATCH] Addedlogotypes --- apps/front/package.json | 3 ++- apps/front/src/components/BuildingPlan.tsx | 4 ++++ apps/front/src/components/Header.tsx | 19 +++++++++++++++++-- apps/front/src/components/logo.svg | 1 + apps/front/tsconfig.json | 3 ++- apps/front/vite.config.js | 3 ++- 6 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 apps/front/src/components/logo.svg diff --git a/apps/front/package.json b/apps/front/package.json index c3df376..311446e 100644 --- a/apps/front/package.json +++ b/apps/front/package.json @@ -9,7 +9,8 @@ "devDependencies": { "@types/react-dom": "^17.0.9", "typescript": "^4.4.2", - "vite": "^2.5.3" + "vite": "^2.5.3", + "vite-plugin-svgr": "^0.4.0" }, "dependencies": { "@material-ui/core": "^4.12.3", diff --git a/apps/front/src/components/BuildingPlan.tsx b/apps/front/src/components/BuildingPlan.tsx index a0323d5..9914428 100644 --- a/apps/front/src/components/BuildingPlan.tsx +++ b/apps/front/src/components/BuildingPlan.tsx @@ -5,6 +5,8 @@ import { useRoomContext } from "../context"; import { RoomDisplay } from "../types/room"; import { Canvas } from "./Canvas"; +import {ReactComponent as Logotype} from './logo.svg' + export type BuildingPlanProps = { width: number; height: number }; const getRoomByCoord = (x: number, y: number, map: RoomDisplay[]) => { @@ -61,6 +63,8 @@ export const BuildingPlan = ({ width, height }: BuildingPlanProps) => { if (index >= 0) toggleFree(index + 1); }; + if (state.map.length === 0) return + return ( <> ( - roomruler + + + + + + + roomruler + ); diff --git a/apps/front/src/components/logo.svg b/apps/front/src/components/logo.svg new file mode 100644 index 0000000..e286b00 --- /dev/null +++ b/apps/front/src/components/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/front/tsconfig.json b/apps/front/tsconfig.json index c7517b2..ecc01bb 100644 --- a/apps/front/tsconfig.json +++ b/apps/front/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "target": "es6", "module": "ESNext", - "jsx": "react-jsx" + "jsx": "react-jsx", + "types": ["vite-plugin-svgr/client"] }, "include": ["src"], "references": [{ "path": "../../packages/messages/tsconfig.json" }] diff --git a/apps/front/vite.config.js b/apps/front/vite.config.js index bf5811b..1c45603 100644 --- a/apps/front/vite.config.js +++ b/apps/front/vite.config.js @@ -1,9 +1,10 @@ import { defineConfig } from "vite"; +import svgrPlugin from "vite-plugin-svgr"; export default defineConfig({ esbuild: { jsxInject: `import React from "react"`, }, optimizeDeps: { include: ["@roomruler/messages"] }, - + plugins: [svgrPlugin()], });