diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 30f63d6..844fb0a 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -107,20 +107,27 @@ "node-loader": "^2.0.0", "postcss": "^8.4.12", "postcss-loader": "^6.2.1", + "sass-loader": "^12.6.0", "style-loader": "^3.0.0", "tailwindcss": "^3.0.23", "ts-loader": "^9.2.2", - "typescript": "~4.5.4" + "typescript": "~4.5.4", + "webpack": "^5.72.0" }, "dependencies": { - "@nirvana/core": "*", + "@carbon/icons-react": "10.22.0", "@emotion/react": "^11.8.2", "@emotion/styled": "^11.8.1", "@getstation/electron-google-oauth2": "^2.1.0", "@mui/icons-material": "^5.5.1", "@mui/material": "^5.5.1", + "@nirvana/core": "*", + "@types/carbon-components-react": "^7.55.1", "antd": "^4.19.2", "axios": "^0.26.1", + "carbon-components": "10.25.0", + "carbon-components-react": "7.25.0", + "carbon-icons": "7.0.7", "electron-squirrel-startup": "^1.0.0", "electron-store": "^8.0.1", "moment": "^2.29.1", @@ -132,6 +139,7 @@ "react-icons": "^4.3.1", "react-query": "^3.34.16", "recoil": "^0.6.1", + "sass": "1.29.0", "socket.io-client": "^4.4.1" } } diff --git a/packages/desktop/src/app.tsx b/packages/desktop/src/app.tsx index 1139c81..d4f8e0a 100644 --- a/packages/desktop/src/app.tsx +++ b/packages/desktop/src/app.tsx @@ -1,4 +1,5 @@ import "./index.css"; +import "./carbon.scss"; import * as React from "react"; import * as ReactDOM from "react-dom"; diff --git a/packages/desktop/src/carbon.scss b/packages/desktop/src/carbon.scss new file mode 100644 index 0000000..980fc7e --- /dev/null +++ b/packages/desktop/src/carbon.scss @@ -0,0 +1,8 @@ +@import "carbon-components/scss/globals/scss/styles.scss"; + +// TODO: important, note that if current version of sass in package.json is causing issues, install ^1.29.0 +$body-color: red; + +body { + color: $body-color !important; +} diff --git a/packages/desktop/src/index.css b/packages/desktop/src/index.css index 6af978b..d9af3c6 100644 --- a/packages/desktop/src/index.css +++ b/packages/desktop/src/index.css @@ -1,10 +1,3 @@ -body { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, - Arial, sans-serif; - - @apply text-white; -} - #root { padding: 0 !important; } diff --git a/packages/desktop/src/overlay/index.tsx b/packages/desktop/src/overlay/index.tsx index 169c4bc..774225a 100644 --- a/packages/desktop/src/overlay/index.tsx +++ b/packages/desktop/src/overlay/index.tsx @@ -1,10 +1,16 @@ +import "../index.css"; +import "../carbon.scss"; + import * as React from "react"; import * as ReactDOM from "react-dom"; +import { Button } from "carbon-components-react"; + function render() { ReactDOM.render(
this is the overlay for video streams and conversations to be passed in +
, document.getElementById("root") ); diff --git a/packages/desktop/src/pages/Home/header/index.tsx b/packages/desktop/src/pages/Home/header/index.tsx index a703557..fcc426e 100644 --- a/packages/desktop/src/pages/Home/header/index.tsx +++ b/packages/desktop/src/pages/Home/header/index.tsx @@ -30,29 +30,29 @@ export default function Header() { const [userVideo, setUserVideo] = useState(null); - useEffect(() => { - navigator.mediaDevices - .getUserMedia({ video: true, audio: true }) - .then((localMediaStream: any) => { - console.log(localMediaStream); + // useEffect(() => { + // navigator.mediaDevices + // .getUserMedia({ video: true, audio: true }) + // .then((localMediaStream: any) => { + // console.log(localMediaStream); - setUserVideo(localMediaStream); + // setUserVideo(localMediaStream); - var video = document.querySelector("video"); - video.srcObject = localMediaStream; - video.onloadedmetadata = function (e) { - video.play(); - }; + // var video = document.querySelector("video"); + // video.srcObject = localMediaStream; + // video.onloadedmetadata = function (e) { + // video.play(); + // }; - setTimeout(() => { - localMediaStream.getTracks().forEach((track: any) => { - track.stop(); - }); + // setTimeout(() => { + // localMediaStream.getTracks().forEach((track: any) => { + // track.stop(); + // }); - video.srcObject = null; - }, 2000); - }); - }, []); + // video.srcObject = null; + // }, 2000); + // }); + // }, []); const handleClick = (event: any) => { setAnchorEl(event.currentTarget); @@ -95,7 +95,7 @@ export default function Header() { <> -