diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 6c38dcf..0ab5a69 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -45,7 +45,7 @@ "port": "4001", "loggerPort": "9002", "mainConfig": "./webpack.main.config.js", - "devContentSecurityPolicy": "connect-src 'self' https://zenquotes.io/api http://localhost:5000 ws://localhost:5000 'unsafe-eval'", + "devContentSecurityPolicy": "connect-src 'self' http://localhost:5000 ws://localhost:5000 'unsafe-eval'", "renderer": { "config": "./webpack.renderer.config.js", "entryPoints": [ diff --git a/packages/desktop/src/components/lines/lineRow.tsx/index.tsx b/packages/desktop/src/components/lines/lineRow.tsx/index.tsx index f7aa00e..35932f6 100644 --- a/packages/desktop/src/components/lines/lineRow.tsx/index.tsx +++ b/packages/desktop/src/components/lines/lineRow.tsx/index.tsx @@ -103,13 +103,13 @@ export default function LineRow({ if (masterLineData.currentUserMember.lastVisitDate) return ( - {moment(masterLineData.currentUserMember.lastVisitDate).fromNow()} + {moment(masterLineData.currentUserMember.lastVisitDate).fromNow(true)} ); return ( - {moment(masterLineData.currentUserMember.lastVisitDate).fromNow()} + {moment(masterLineData.currentUserMember.lastVisitDate).fromNow(true)} ); }, [masterLineData]); diff --git a/packages/desktop/src/controller/recoil.tsx b/packages/desktop/src/controller/recoil.tsx index dad590d..90a617e 100644 --- a/packages/desktop/src/controller/recoil.tsx +++ b/packages/desktop/src/controller/recoil.tsx @@ -40,7 +40,7 @@ type DesktopMode = "flowState" | "overlayOnly" | "terminal"; export const $desktopMode = atom({ key: "DESKTOP_MODE", - default: "terminal", + default: "flowState", }); export const $selectedLineId = atom({ diff --git a/packages/desktop/src/pages/router/index.tsx b/packages/desktop/src/pages/router/index.tsx index 315256d..07d742d 100644 --- a/packages/desktop/src/pages/router/index.tsx +++ b/packages/desktop/src/pages/router/index.tsx @@ -8,7 +8,7 @@ import Channels, { DEFAULT_APP_PRESET, Dimensions, } from "../../electron/constants"; -import { useCallback, useEffect } from "react"; +import { useCallback, useEffect, useState } from "react"; import { useRecoilState, useRecoilValue } from "recoil"; import { LineDataProvider } from "../../controller/lineDataProvider"; @@ -96,16 +96,36 @@ export default function NirvanaRouter() { ); } +type Quote = { q: string; a: string; h?: string }; function FlowState() { + const [quote, setQuote] = useState(null); + useEffect(() => { - fetch("http://zenquotes.io/api/random", { method: "GET" }) + fetch("https://zenquotes.io/api/random") .then((res) => { console.log(res); + + return res.json(); }) - .catch(() => { + .then((data: any) => { + console.warn(data); + + // setQuote(res[0]); + }) + .catch((error) => { // do nothing, don't bother user, just don't show the quote + console.warn(error); }); }, []); - return <>{}; + return ( +
+ {quote && ( + + {quote.q} + {quote.a} + + )} +
+ ); }