React App

diff --git a/public/favicon.ico b/public/favicon.ico index a11777c..87005d4 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon2.ico b/public/favicon2.ico new file mode 100644 index 0000000..a11777c Binary files /dev/null and b/public/favicon2.ico differ diff --git a/public/index.html b/public/index.html index 94a66ac..d940936 100644 --- a/public/index.html +++ b/public/index.html @@ -30,7 +30,7 @@ - React App + GRAFF Interactive | Remote Demonstration diff --git a/src/App.tsx b/src/App.tsx index 02960ae..b119716 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -70,13 +70,21 @@ function App() { } }, []); - function createSess() { + function createSess() { + try{ ws.send('{ "message" : "NEW_SESS" }'); + return true + } catch { + alert('Что то пошло не так, повторите позже') + return false + } + } function connectSess(port?: string) { if(port) { - window.open('http://' + ConnectData.pixelIp + ":" + port, '_blank'); + // window.open('http://' + ConnectData.pixelIp + ":" + port, '_blank'); + window.location.href= 'http://' + ConnectData.pixelIp + ":" + port; } else { window.open('http://' + ConnectData.pixelIp + ":" + portAndId.current.port, '_blank'); } diff --git a/src/components/connectWindow/popup/popup.css b/src/components/connectWindow/popup/popup.css index 2ad7b40..df4f1ea 100644 --- a/src/components/connectWindow/popup/popup.css +++ b/src/components/connectWindow/popup/popup.css @@ -84,6 +84,10 @@ cursor: pointer; } +.popup-title-input-back-button:hover { + opacity: .7; +} + @media screen and (min-width: 2000px) { .popup-container { width: 25%; @@ -144,8 +148,8 @@ } .popup-logo { - width: 166px; - height: 48px; + width: 239px; + height: 70px; } .popup-title-button-title { diff --git a/src/components/connectWindow/popup/popup.tsx b/src/components/connectWindow/popup/popup.tsx index 730b288..56cfa74 100644 --- a/src/components/connectWindow/popup/popup.tsx +++ b/src/components/connectWindow/popup/popup.tsx @@ -13,7 +13,7 @@ type TProps = { } export const Popup:React.FC = React.memo((props) => { - return

+ return

{ props.logo ?

diff --git a/src/components/mainPart/mainPart.tsx b/src/components/mainPart/mainPart.tsx index 261d90a..8cdf1a4 100644 --- a/src/components/mainPart/mainPart.tsx +++ b/src/components/mainPart/mainPart.tsx @@ -14,7 +14,7 @@ import { ContextLang } from "../ContextLang"; import { ContextWs } from "../../ContextWs"; type TProps = { - createSess: () => void, + createSess: () => boolean, // connectSess: () => void connectSess: (accessCode: string) => void } @@ -104,7 +104,10 @@ export const MainPart: React.FC = React.memo((props) => { } function onClickCreateNewDemo() { - props.createSess(); + if(!props.createSess()) { + return + } + changeContentFunc(); setCurrentContent(