diff --git a/src/App.tsx b/src/App.tsx index f1985a0..f296c7c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -15,6 +15,7 @@ type WsData = { } function App() { + // const [isSessionCreated, setIsSessionCreated] = useState(false); const [currentLang, setCurrentLang] = useState<'ru' | 'en'>('ru'); const [wsEvent, setWsEvent] = useState(null); const portAndId = useRef<{port: string, id:string}>() @@ -62,7 +63,13 @@ function App() { }, []); function createSess() { - ws.send('{ "message" : "NEW_SESS" }'); + // if(!isSessionCreated) { + // setIsSessionCreated(true); + ws.send('{ "message" : "NEW_SESS" }'); + // } else { + + // } + } function connectSess() { diff --git a/src/components/footer/footer.tsx b/src/components/footer/footer.tsx index ddbc89a..e8c86aa 100644 --- a/src/components/footer/footer.tsx +++ b/src/components/footer/footer.tsx @@ -29,21 +29,25 @@ export const Footer:React.FC = React.memo(() => { { value1: { type: 'email', - value: 'info@graff.tech' + value: 'info@graff.tech', + href: 'info@graff.tech' }, value2: { type: 'email', - value: 'waseem@graff.tech' + value: 'waseem@graff.tech', + href: 'waseem@graff.tech' } }, { value1: { type: "phone", - value: '+7 800 770 00 67' + value: '+7 800 770 00 67', + href: '+7 800 770 00 67' }, value2: { type: "phone", - value: '+971 50 983 8902' + value: '+971 50 983 8902', + href: '+971 50 983 8902' } } ]} diff --git a/src/components/mainPart/backgroundJpgImage.jpg b/src/components/mainPart/backgroundJpgImage.jpg new file mode 100644 index 0000000..4f4505d Binary files /dev/null and b/src/components/mainPart/backgroundJpgImage.jpg differ diff --git a/src/components/mainPart/form/form.css b/src/components/mainPart/form/form.css index 6ed779d..22539d5 100644 --- a/src/components/mainPart/form/form.css +++ b/src/components/mainPart/form/form.css @@ -66,4 +66,10 @@ .MuiFormHelperText-root.Mui-error { font-size: .6vw !important; } +} + +@media screen and (max-width: 640px) { + .request-form { + gap: 15px; + } } \ No newline at end of file diff --git a/src/components/mainPart/mainPart.css b/src/components/mainPart/mainPart.css index 746615a..1015c7d 100644 --- a/src/components/mainPart/mainPart.css +++ b/src/components/mainPart/mainPart.css @@ -18,7 +18,8 @@ width: 100%; height: 100%; /* background: url('backgroundImage.svg') 50% 50% no-repeat; */ - background: url('backgroundImagePng.png') 50% 50% no-repeat; + /* background: url('backgroundImagePng.png') 50% 50% no-repeat; */ + background: url('backgroundJpgImage.jpg') 50% 50% no-repeat; background-color: #B196AF; /* background-size: 100% 100%; */ } diff --git a/src/components/mainPart/mainPart.tsx b/src/components/mainPart/mainPart.tsx index f95813d..bb203d8 100644 --- a/src/components/mainPart/mainPart.tsx +++ b/src/components/mainPart/mainPart.tsx @@ -199,6 +199,7 @@ export const MainPart: React.FC = React.memo((props) => { } function toMain() { + document.location.reload(); changeContentFunc(); setCurrentContent(defaultCurrentContent); setPlanContent(null); diff --git a/src/connections/connectData.ts b/src/connections/connectData.ts index f7bed8c..d247590 100644 --- a/src/connections/connectData.ts +++ b/src/connections/connectData.ts @@ -1,5 +1,7 @@ export const ConnectData = { - pixelIp: "192.168.1.170", - url: `http://192.168.1.170`, + // pixelIp: "192.168.1.170", + pixelIp: 'stream.graff.tech', + // url: `http://192.168.1.170`, + url: `https://stream.graff.tech`, port: 13001 } \ No newline at end of file diff --git a/src/connections/ws.ts b/src/connections/ws.ts index 5d4a827..9eaf3cd 100644 --- a/src/connections/ws.ts +++ b/src/connections/ws.ts @@ -4,7 +4,7 @@ export class Ws { ws: WebSocket; constructor() { - this.ws = new WebSocket(`ws://${ConnectData.pixelIp}:${ConnectData.port}`); + this.ws = new WebSocket(`wss://${ConnectData.pixelIp}:${ConnectData.port}`); } WebSokets() {