✨ Minor bug fix.

catheart97 · Nov 9, 2023 · 68ec1ea · 68ec1ea
1 parent 82d1d00
commit 68ec1ea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/electron/main.ts b/electron/main.ts
@@ -70,7 +70,8 @@ const VITE_DEV_SERVER_URL = process.env['VITE_DEV_SERVER_URL']
 function createWindow() {
 
     ipcMain.handle("m-userData", (_event, _arg) => {
-        const path = isProd ? (app.getPath("documents") + "/Dragon's Eye/") : (app.getPath("userData") + "/Dragon's Eye/");
+        // const path = isProd ? () : (app.getPath("userData") + "/Dragon's Eye/");
+        const path = app.getPath("documents") + "/Dragon's Eye/";
         if (!fsExtra.existsSync(path)) {
             fsExtra.mkdirSync(path);
         }

diff --git a/source/components/StatblockComponent.tsx b/source/components/StatblockComponent.tsx
@@ -915,7 +915,7 @@ export const RawStatblockComponent = (props: {
 
                         {/* Languages */}
                         {
-                            editMode || statblock.languages.length > 0 ? (
+                            editMode || statblock.languages && statblock.languages.length > 0 ? (
                                 <>
                                     <UIGroup title="Languages" className="text-orange-600">
                                     </UIGroup>
@@ -937,7 +937,7 @@ export const RawStatblockComponent = (props: {
 
                         {/* Skills */}
                         {
-                            editMode || statblock.skills.length > 0 ? (
+                            editMode || statblock.skills && statblock.skills.length > 0 ? (
                                 <>
 
                                     <UIGroup title="Skills" className="text-orange-600">

diff --git a/source/components/view/BoardApp.tsx b/source/components/view/BoardApp.tsx
@@ -14,6 +14,8 @@ const BoardApp = (props: IAppView & {
 
     const [importanceRect, setImportanceRect] = React.useState<Rect | null>(null);
 
+    const [initiativeEnabled, setInitiativeEnabled] = React.useState<boolean>(true);
+
     const forceUpdate = useForceUpdate();
     const update = () => {
         forceUpdate();
@@ -51,7 +53,16 @@ const BoardApp = (props: IAppView & {
                     Dragon's Eye
                 </div>
                 <button
-                    className=" h-full flex items-center"
+                    className=" h-full flex items-center px-2"
+                    onClick={() => {
+                        setInitiativeEnabled(!initiativeEnabled);
+                        forceUpdate();
+                    }}
+                >
+                    <span className={"mso flex text-xl " + (initiativeEnabled ? "msf" : "mso")}>swords</span>
+                </button>
+                <button
+                    className=" h-full flex items-center pl-2"
                     onClick={() => {
                         props.playerViewOpen.current = !props.playerViewOpen.current;
                         forceUpdate();
@@ -77,6 +88,7 @@ const BoardApp = (props: IAppView & {
                     board={props.board}
                     update={update}
                     importanceRect={importanceRect}
+                    initiaitveEnabled={initiativeEnabled}
                 />
             </div>
         </div>

diff --git a/source/components/view/BoardPlayerView.tsx b/source/components/view/BoardPlayerView.tsx
@@ -9,6 +9,7 @@ import Marquee from "react-fast-marquee";
 export type BoardPlayerViewProps = {
     board: React.MutableRefObject<Board>;
     importanceRect: Rect | null;
+    initiaitveEnabled: boolean;
 } & IPlayerAppView
 
 export type BoardPlayerViewHandle = {
@@ -49,7 +50,7 @@ const BoardPlayerViewRenderer: React.ForwardRefRenderFunction<BoardPlayerViewHan
                     importanceRect={props.importanceRect}
                 />
                 {
-                    props.board.current.initiative ? (
+                    props.initiaitveEnabled && props.board.current.initiative ? (
                         <div className="absolute bottom-0 p-3 pointer-events-none flex items-end z-[60] justify-start top-0 right-0 overflow-hidden transition-all duration-200 ease-in-out"
                             style={{
                                 left: -props.board.current.initiativeIndex! * 9 + "rem"

diff --git a/source/components/view/CampaignApp.tsx b/source/components/view/CampaignApp.tsx
@@ -31,7 +31,7 @@ export const CampaignApp = (props: IAppView & {
                     {props.campaign.current!.title} - Dragon's Eye
                 </div>
                 <button
-                    className=" h-full flex items-center"
+                    className=" h-full flex items-center pl-2"
                     onClick={() => {
                         props.playerViewOpen.current = !props.playerViewOpen.current;
                         forceUpdate();