Skip to content

Commit

Permalink
fix: build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
r0man1337 committed Nov 22, 2023
1 parent 743c0b5 commit 992b9ba
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 39 deletions.
1 change: 0 additions & 1 deletion client/src/components/SettingsComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { ReactComponent as Crown } from "../assets/icons/common/crown-circle-out
import { ReactComponent as Settings } from "../assets/icons/common/settings.svg";
import { ReactComponent as Muted } from "../assets/icons/common/muted.svg";
import { ReactComponent as Unmuted } from "../assets/icons/common/unmuted.svg";
import { ReactComponent as CloseIcon } from "../assets/icons/common/cross-circle.svg";
import { SecondaryPopup } from "../elements/SecondaryPopup";
import { Headline } from "../elements/Headline";
import SettleRealmComponent from "./cityview/realm/SettleRealmComponent";
Expand Down
1 change: 0 additions & 1 deletion client/src/components/caravans/CaravanDetailsComponent.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { useMemo } from "react";
import { SecondaryPopup } from "../../elements/SecondaryPopup";
import { ReactComponent as CloseIcon } from "../../assets/icons/common/cross.svg";
import Button from "../../elements/Button";
import { OrderIcon } from "../../elements/OrderIcon";
import { ResourceCost } from "../../elements/ResourceCost";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { useGetPositionCaravans } from "../../../hooks/helpers/useCaravans";
import { NumberInput } from "../../../elements/NumberInput";
import { ReactComponent as ArrowSeparator } from "../../../assets/icons/common/arrow-separator.svg";
import { WEIGHT_PER_DONKEY_KG } from "@bibliothecadao/eternum";
import { ReactComponent as CloseIcon } from "../../../assets/icons/common/cross-circle.svg";
import useUIStore from "../../../hooks/store/useUIStore";

type FeedHyperstructurePopupProps = {
Expand Down
19 changes: 0 additions & 19 deletions client/src/modules/RealmManagementModule.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
import RealmInfoComponent from "../components/cityview/realm/RealmInfoComponent";
import RealmManagementComponent from "../components/cityview/realm/RealmManagementComponent";
import { BaseContainer } from "../containers/BaseContainer";
import { useGetRealm } from "../hooks/helpers/useRealm";
import useRealmStore from "../hooks/store/useRealmStore";
import { useEffect, useState } from "react";
import { useLocation } from "wouter";

const RealmManagementModule = () => {
const { realmEntityId } = useRealmStore();
const { realm } = useGetRealm(realmEntityId);
const [location] = useLocation();
const [showMenu, setShowMenu] = useState(false);

useEffect(() => {
if (!location.includes("/map") && realm) {
setTimeout(() => {
setShowMenu(true);
}, 350);
} else {
setShowMenu(false);
}
}, [location, realm]);

return (
<BaseContainer className="max-h-full h-min !p-0 mt-2">
<RealmInfoComponent />
Expand Down
16 changes: 0 additions & 16 deletions client/src/modules/WorldMapMenuModule.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
import WorldMapMenuComponent from "../components/worldmap/WorldMapMenuComponent";
import { BaseContainer } from "../containers/BaseContainer";
import { useEffect, useState } from "react";
import { useLocation } from "wouter";

const WorldMapMenuModule = () => {
const [location] = useLocation();
const [showMenu, setShowMenu] = useState(false);

useEffect(() => {
if (location.includes("/map")) {
setTimeout(() => {
setShowMenu(true);
}, 1000);
} else {
setShowMenu(false);
}
}, [location]);

return (
<BaseContainer className="max-h-full h-min !p-0 mt-2">
<WorldMapMenuComponent />
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/scenes/MainScene.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Canvas, useThree } from "@react-three/fiber";
import { Canvas } from "@react-three/fiber";
import { WorldMapScene } from "./WorldMapScene";
import { RealmCityViewScene } from "./RealmCityViewScene";
import useUIStore from "../../hooks/store/useUIStore";
Expand Down

0 comments on commit 992b9ba

Please sign in to comment.