From 5f81ed17563a48f959ab3aa4c8c8ec2b23e8c0ed Mon Sep 17 00:00:00 2001 From: Riley Smith Date: Thu, 27 Jan 2022 14:29:54 -0800 Subject: [PATCH] more stuff --- .gitignore | 1 + backend/.gitignore | 1 + frontend/src/pages/index.tsx | 2 ++ frontend/src/pages/player.tsx | 3 +-- frontend/src/util/isDev.ts | 3 +++ frontend/src/ws/websocket.ts | 3 +-- 6 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 backend/.gitignore create mode 100644 frontend/src/util/isDev.ts diff --git a/.gitignore b/.gitignore index 17df0ab..a2f8d3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ */.env test */.DS_STORE +.DS_STORE \ No newline at end of file diff --git a/backend/.gitignore b/backend/.gitignore new file mode 100644 index 0000000..9f942ab --- /dev/null +++ b/backend/.gitignore @@ -0,0 +1 @@ +cmd/watchtogether/watchtogether \ No newline at end of file diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx index b5d751e..3dae921 100644 --- a/frontend/src/pages/index.tsx +++ b/frontend/src/pages/index.tsx @@ -8,6 +8,7 @@ import { Container } from "../components/Container"; import { Footer } from "../components/Footer"; import { Hero } from "../components/Hero"; import { Main } from "../components/Main"; +import isDev from "../util/isDev"; const Index: NextPage = () => { return ( @@ -22,6 +23,7 @@ const Index: NextPage = () => { maxWidth="200" alignSelf="center" onClick={() => signIn("discord")} + disabled={!isDev()} > Login With Discord diff --git a/frontend/src/pages/player.tsx b/frontend/src/pages/player.tsx index ed313e5..2ad9d04 100644 --- a/frontend/src/pages/player.tsx +++ b/frontend/src/pages/player.tsx @@ -14,11 +14,10 @@ import isBrowser from "../util/isBrowser"; const Player = dynamic(() => import("../components/Player"), { ssr: false }); interface PlayerPageProps { - URI: string; user: User; } -const PlayerPage: NextPage = ({ URI, user }) => { +const PlayerPage: NextPage = ({ user }) => { const playerRef = useRef(); const socket = useWS({ user }); const [id, setID] = useState(""); diff --git a/frontend/src/util/isDev.ts b/frontend/src/util/isDev.ts new file mode 100644 index 0000000..99f94cd --- /dev/null +++ b/frontend/src/util/isDev.ts @@ -0,0 +1,3 @@ +export default function isDev() { + return process.env.NODE_ENV === "development"; +} diff --git a/frontend/src/ws/websocket.ts b/frontend/src/ws/websocket.ts index ba91dcb..6f346ac 100644 --- a/frontend/src/ws/websocket.ts +++ b/frontend/src/ws/websocket.ts @@ -1,5 +1,3 @@ -// nice and easy way to get types for the - import { User } from "next-auth"; import EventEmitter from "events"; import IdentityData from "../interfaces/Identity"; @@ -8,6 +6,7 @@ import Message from "../util/Message"; import MessageUtil from "../util/MessageUtil"; // browser socket +// todo: write a shim for this let Websocket: typeof WebSocket; if (typeof window !== "undefined") { Websocket = window.WebSocket;