Skip to content

B
BoxDialer
Commit 6d8ffe5d authored by Muhammadali's avatar Muhammadali
Browse files
Options

update-

parent b3ef9906
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 3411 deletions
package-lock.json
View file @ 6d8ffe5d
{ {
"name": "boxdialer", "name": "boxdialer",
"version": "4.8.38", "version": "4.8.51",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "boxdialer", "name": "boxdialer",
"version": "4.8.38", "version": "4.8.51",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@emotion/react": "^11.11.1", "@emotion/react": "^11.11.1",
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-hot-toast": "^2.4.1", "react-hot-toast": "^2.4.1",
"styled-components": "^5.3.5" "styled-components": "^5.3.5",
"zustand": "^4.4.6"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.22.10", "@babel/core": "^7.22.10",
...@@ -10133,6 +10134,14 @@ ...@@ -10133,6 +10134,14 @@
"punycode": "^2.1.0" "punycode": "^2.1.0"
} }
}, },
"node_modules/use-sync-external-store": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
"integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
}
},
"node_modules/util-deprecate": { "node_modules/util-deprecate": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
...@@ -10600,6 +10609,33 @@ ...@@ -10600,6 +10609,33 @@
"funding": { "funding": {
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
},
"node_modules/zustand": {
"version": "4.4.6",
"resolved": "https://registry.npmjs.org/zustand/-/zustand-4.4.6.tgz",
"integrity": "sha512-Rb16eW55gqL4W2XZpJh0fnrATxYEG3Apl2gfHTyDSE965x/zxslTikpNch0JgNjJA9zK6gEFW8Fl6d1rTZaqgg==",
"dependencies": {
"use-sync-external-store": "1.2.0"
},
"engines": {
"node": ">=12.7.0"
},
"peerDependencies": {
"@types/react": ">=16.8",
"immer": ">=9.0",
"react": ">=16.8"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
},
"immer": {
"optional": true
},
"react": {
"optional": true
}
}
} }
} }
} }
package.json
View file @ 6d8ffe5d
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-hot-toast": "^2.4.1", "react-hot-toast": "^2.4.1",
"styled-components": "^5.3.5" "styled-components": "^5.3.5",
"zustand": "^4.4.6"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.22.10", "@babel/core": "^7.22.10",
......
prod/index.html deleted 100644 → 0
View file @ b3ef9906
<!-- @format -->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>React App</title>
<script defer src="main.js"></script></head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="boxdialerwidjet"></div>
</body>
</html>
prod/main.js deleted 100644 → 0
View file @ b3ef9906
This diff is collapsed.
prod/src_static_locale_ru_json.js deleted 100644 → 0
View file @ b3ef9906
"use strict";
/*
* ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
* This devtool is neither made for production nor for readable output files.
* It uses "eval()" calls to create a separate source file in the browser devtools.
* If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
* or disable the default devtool with "devtool: false".
* If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
*/
(self["webpackChunkboxdialer"] = self["webpackChunkboxdialer"] || []).push([["src_static_locale_ru_json"],{
/***/ "./src/static/locale/ru.json":
/*!***********************************!*\
!*** ./src/static/locale/ru.json ***!
\***********************************/
/***/ ((module) => {
eval("module.exports = JSON.parse('{\"APP_APPNAME\":\"AloVoice Dialer Ru\",\"FREE\":\"Приём входящих\",\"TOTOP\":\"У руководства\",\"OUTCALLS\":\"На исходящих\",\"HOME\":\"DND пауза\",\"TADBIR\":\"Другая причина\",\"CALL\":\"Позвонить\",\"STATUS\":\"Статус\"}');\n\n//# sourceURL=webpack://boxdialer/./src/static/locale/ru.json?");
/***/ })
}]);
\ No newline at end of file
src/components/BxMiniWidjetUi/index.jsx
View file @ 6d8ffe5d
...@@ -4,6 +4,7 @@ import React from 'react'; ...@@ -4,6 +4,7 @@ import React from 'react';
import BxMiniWidjetUiStyle, { DialPadIcon } from './style'; import BxMiniWidjetUiStyle, { DialPadIcon } from './style';
import TimerUi from '../TimerUi'; import TimerUi from '../TimerUi';
import { Text, useTranslator } from '@eo-locale/react'; import { Text, useTranslator } from '@eo-locale/react';
// import {useConfig} from "../../storage"
const BxMiniWidjetUi = ({ const BxMiniWidjetUi = ({
widjetState, widjetState,
phoneNumber, phoneNumber,
...@@ -14,6 +15,7 @@ const BxMiniWidjetUi = ({ ...@@ -14,6 +15,7 @@ const BxMiniWidjetUi = ({
position, position,
}) => { }) => {
const translator = useTranslator(); const translator = useTranslator();
// const {state, setState} = useConfig((state) => state)
const colorTypeFunc = ({ widjetState, reason }) => { const colorTypeFunc = ({ widjetState, reason }) => {
switch (`${widjetState}_${reason}`) { switch (`${widjetState}_${reason}`) {
case ('pending_undefined', 'pending_free'): case ('pending_undefined', 'pending_free'):
......
src/components/InnerCaller/index.jsx
View file @ 6d8ffe5d
...@@ -11,13 +11,18 @@ import MicIcon from '@mui/icons-material/Mic'; ...@@ -11,13 +11,18 @@ import MicIcon from '@mui/icons-material/Mic';
import MicOffIcon from '@mui/icons-material/MicOff'; import MicOffIcon from '@mui/icons-material/MicOff';
import PlayArrowIcon from '@mui/icons-material/PlayArrow'; import PlayArrowIcon from '@mui/icons-material/PlayArrow';
import PauseIcon from '@mui/icons-material/Pause'; import PauseIcon from '@mui/icons-material/Pause';
import { contextModalEventProperty } from '../../context/modalEventProperty'; // import { contextModalEventProperty } from '../../context/modalEventProperty';
import { useContext } from 'react'; import { useContext } from 'react';
import {useConfigHoldMute} from "../../storage"
const InnerCaller = ({ hidden, type, from, innerTimer }) => { const InnerCaller = ({ hidden, type, from, innerTimer }) => {
const boxDialer = window.BoxDialer; const boxDialer = window.BoxDialer;
const configHoldMute = useConfigHoldMute((state) => state)
const translator = useTranslator(); const translator = useTranslator();
const [callEvents, setCallEvents] = useContext(contextModalEventProperty);
// // context
// const [callEvents, setCallEvents] = useContext(contextModalEventProperty);
const dataFormatter = (secund) => { const dataFormatter = (secund) => {
let ts = intervalToDuration({ let ts = intervalToDuration({
start: 0, start: 0,
...@@ -27,7 +32,6 @@ const InnerCaller = ({ hidden, type, from, innerTimer }) => { ...@@ -27,7 +32,6 @@ const InnerCaller = ({ hidden, type, from, innerTimer }) => {
? `${ts.hours}:${ts.minutes}:${ts.seconds}` ? `${ts.hours}:${ts.minutes}:${ts.seconds}`
: `${ts.minutes}:${ts.seconds}`; : `${ts.minutes}:${ts.seconds}`;
}; };
console.log('callEvents_callHold: ', callEvents?.callHold);
const selectModalType = (type) => { const selectModalType = (type) => {
switch (type) { switch (type) {
...@@ -37,14 +41,14 @@ const InnerCaller = ({ hidden, type, from, innerTimer }) => { ...@@ -37,14 +41,14 @@ const InnerCaller = ({ hidden, type, from, innerTimer }) => {
<div className='button timer'> <div className='button timer'>
<div>{dataFormatter(innerTimer)}</div> <div>{dataFormatter(innerTimer)}</div>
<div onClick={() => boxDialer.holdButtonClick()}> <div onClick={() => boxDialer.holdButtonClick()}>
{callEvents?.callHold ? ( {configHoldMute?.state?.callHold ? (
<PlayArrowIcon style={{ color: '#fff' }} /> <PlayArrowIcon style={{ color: '#fff' }} />
) : ( ) : (
<PauseIcon style={{ color: '#fff' }} /> <PauseIcon style={{ color: '#fff' }} />
)} )}
</div> </div>
<div onClick={() => boxDialer.muteButtonClick()}> <div onClick={() => boxDialer.muteButtonClick()}>
{callEvents?.callMute ? ( {configHoldMute?.state?.callMute ? (
<MicOffIcon style={{ color: '#fff' }} /> <MicOffIcon style={{ color: '#fff' }} />
) : ( ) : (
<MicIcon style={{ color: '#fff' }} /> <MicIcon style={{ color: '#fff' }} />
......
src/components/Modal/index.jsx
View file @ 6d8ffe5d
...@@ -12,21 +12,18 @@ import SendToMobileIcon from '@mui/icons-material/SendToMobile'; ...@@ -12,21 +12,18 @@ import SendToMobileIcon from '@mui/icons-material/SendToMobile';
import DialpadIcon from '@mui/icons-material/Dialpad'; import DialpadIcon from '@mui/icons-material/Dialpad';
import CallCardDropDown from '../CallCardDropDown'; import CallCardDropDown from '../CallCardDropDown';
import ModalNumpad from '../ModalNumpad'; import ModalNumpad from '../ModalNumpad';
import { useContext } from 'react'; import {useConfigHoldMute} from "../../storage"
import { contextModalEventProperty } from '../../context/modalEventProperty'; // import { contextModalEventProperty } from '../../context/modalEventProperty';
const Modal = ({ children, hidden, hangupButton, phoneNumber, callType }) => { const Modal = ({ children, hidden, hangupButton, phoneNumber, callType }) => {
const boxDialer = window.BoxDialer; const boxDialer = window.BoxDialer;
const configHoldMute = useConfigHoldMute((state) => state)
const [rollUp, setRollUp] = useState(false); const [rollUp, setRollUp] = useState(false);
const [modalHidden, setModalHidden] = useState(false); const [modalHidden, setModalHidden] = useState(false);
// const [callEvents, setCallEvents] = useState({});
const [transferModel, setTransferModel] = useState(true); const [transferModel, setTransferModel] = useState(true);
const [numpadModal, setNumpadModal] = useState(false); const [numpadModal, setNumpadModal] = useState(false);
const { callEvents, setCallEvents } = useContext(contextModalEventProperty);
// useEffect(() => {
// boxDialer.setSipStateChangeCallback(setCallEvents, 'setCallEvents');
// }, []);
useEffect(() => { useEffect(() => {
setModalHidden(hidden); setModalHidden(hidden);
...@@ -102,14 +99,14 @@ const Modal = ({ children, hidden, hangupButton, phoneNumber, callType }) => { ...@@ -102,14 +99,14 @@ const Modal = ({ children, hidden, hangupButton, phoneNumber, callType }) => {
<ModalContainer.Footer justify={'space-between'} rollUp={rollUp}> <ModalContainer.Footer justify={'space-between'} rollUp={rollUp}>
<div className='outcomingEventStyle'> <div className='outcomingEventStyle'>
<div onClick={() => boxDialer.holdButtonClick()}> <div onClick={() => boxDialer.holdButtonClick()}>
{callEvents?.callHold ? ( {configHoldMute?.state?.callHold ? (
<PlayArrowIcon style={{ color: '#fff' }} /> <PlayArrowIcon style={{ color: '#fff' }} />
) : ( ) : (
<PauseIcon style={{ color: '#fff' }} /> <PauseIcon style={{ color: '#fff' }} />
)} )}
</div> </div>
<div onClick={() => boxDialer.muteButtonClick()}> <div onClick={() => boxDialer.muteButtonClick()}>
{callEvents?.callMute ? ( {configHoldMute?.state?.callMute ? (
<MicOffIcon style={{ color: '#fff' }} /> <MicOffIcon style={{ color: '#fff' }} />
) : ( ) : (
<MicIcon style={{ color: '#fff' }} /> <MicIcon style={{ color: '#fff' }} />
......
src/context/index.jsx deleted 100644 → 0
View file @ b3ef9906
/** @format */
import React from 'react';
import ModalEventProperty from './modalEventProperty';
const CreateContext = ({ children }) => {
return (
<>
<ModalEventProperty>{children}</ModalEventProperty>
</>
);
};
export default CreateContext;
src/context/modalEventProperty.js deleted 100644 → 0
View file @ b3ef9906
/** @format */
import React, { createContext, useState } from 'react';
export const contextModalEventProperty = createContext(null);
const ModalEventProperty = ({ children }) => {
const [callEvents, setCallEvents] = useState({});
return (
<contextModalEventProperty.Provider value={{ callEvents, setCallEvents }}>
{children}
</contextModalEventProperty.Provider>
);
};
export default ModalEventProperty;
src/index.js
View file @ 6d8ffe5d
...@@ -4,11 +4,9 @@ import React from 'react'; ...@@ -4,11 +4,9 @@ import React from 'react';
import { createRoot } from 'react-dom/client'; import { createRoot } from 'react-dom/client';
import { Toaster } from 'react-hot-toast'; import { Toaster } from 'react-hot-toast';
import { BoxDialer } from './lib/boxDIaler'; import { BoxDialer } from './lib/boxDIaler';
import Root from './root';
import './index.css'; import './index.css';
import ControlRenderBX from './lib/controlRenderBX'; import ControlRenderBX from './lib/controlRenderBX';
import LanguageController from './lib/languageController'; import LanguageController from './lib/languageController';
import CreateContext from './context';
window.BoxDialer = new BoxDialer(); window.BoxDialer = new BoxDialer();
const container = document.getElementById('boxdialerwidjet'); const container = document.getElementById('boxdialerwidjet');
...@@ -16,11 +14,9 @@ const root = createRoot(container); ...@@ -16,11 +14,9 @@ const root = createRoot(container);
root.render( root.render(
<React.StrictMode> <React.StrictMode>
<CreateContext> <LanguageController>
<LanguageController> <Toaster />
<Toaster /> <ControlRenderBX />
<ControlRenderBX /> </LanguageController>
</LanguageController>
</CreateContext>
</React.StrictMode>, </React.StrictMode>,
); );
src/root/index.jsx
View file @ 6d8ffe5d
...@@ -8,12 +8,15 @@ import Modal from '../components/Modal'; ...@@ -8,12 +8,15 @@ import Modal from '../components/Modal';
import BxMiniWidjetUi from '../components/BxMiniWidjetUi'; import BxMiniWidjetUi from '../components/BxMiniWidjetUi';
import SecondNotifSip from '../components/SecondNotifSip'; import SecondNotifSip from '../components/SecondNotifSip';
import InnerCaller from '../components/InnerCaller'; import InnerCaller from '../components/InnerCaller';
import { contextModalEventProperty } from '../context/modalEventProperty'; import {useConfigHoldMute} from "../storage"
// import { contextModalEventProperty } from '../context/modalEventProperty';
const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => { const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => {
const boxDialer = window.BoxDialer; const boxDialer = window.BoxDialer;
const { callEvents, setCallEvents } = useContext(contextModalEventProperty); // // context
// const { callEvents, setCallEvents } = useContext(contextModalEventProperty);
const configHoldMute = useConfigHoldMute((state) => state)
const [phoneModal, setPhoneModal] = useState(false); const [phoneModal, setPhoneModal] = useState(false);
const [dynamicValue, setDynamicValue] = useState('pending'); const [dynamicValue, setDynamicValue] = useState('pending');
const [modalState, setModalState] = useState(false); const [modalState, setModalState] = useState(false);
...@@ -25,12 +28,6 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => { ...@@ -25,12 +28,6 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => {
from: '', from: '',
}); });
console.log('state_callEvents: ', callEvents);
// const [callEvents, setCallEvents] = useState(null);
// useEffect(() => {
// setCallEventsContext(callEvents);
// }, [callEvents]);
useEffect(() => { useEffect(() => {
if (secondLine) { if (secondLine) {
setTimeout(() => { setTimeout(() => {
...@@ -38,36 +35,7 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => { ...@@ -38,36 +35,7 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => {
}, 5000); }, 5000);
} }
}, [secondLine]); }, [secondLine]);
// ======================================================
// var no_active_delay = 60;
// var now_no_active = 0;
// function activeUser() {
// now_no_active = 0;
// }
// function updateChat() {
// location.reload();
// return;
// }
// setInterval(() => {
// if (
// now_no_active >= no_active_delay && modalState.bool === 'undefined'
// ? true
// : (!modalState.bool && !innerCallerModal.bool) ||
// modalState.bool === 'undefined'
// ) {
// now_no_active++;
// updateChat();
// }
// }, 1000);
// document.onmousemove = activeUser;
// console.log(
// 'modalState_bool: ',
// modalState.bool === 'undefined'
// ? true
// : (!modalState.bool && !innerCallerModal.bool) ||
// modalState.bool === 'undefined',
// );
// ======================================================
useEffect(() => { useEffect(() => {
if (wsphonedata && wsphonedata?.number) { if (wsphonedata && wsphonedata?.number) {
...@@ -76,7 +44,8 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => { ...@@ -76,7 +44,8 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => {
boxDialer.setSipStateChangeCallback(setSecondLine, 'secondLine'); boxDialer.setSipStateChangeCallback(setSecondLine, 'secondLine');
boxDialer.setSipStateChangeCallback(setPhoneModal, 'phoneModal'); boxDialer.setSipStateChangeCallback(setPhoneModal, 'phoneModal');
boxDialer.setSipStateChangeCallback(setInnerTimer, 'innerTimer'); boxDialer.setSipStateChangeCallback(setInnerTimer, 'innerTimer');
boxDialer.setSipStateChangeCallback(setCallEvents, 'setCallEvents'); // // context
boxDialer.setSipStateChangeCallback(configHoldMute.setState, 'setCallEvents');
boxDialer.setSipStateChangeCallback( boxDialer.setSipStateChangeCallback(
setInnerCallerModal, setInnerCallerModal,
'innerCallerModal', 'innerCallerModal',
...@@ -147,8 +116,6 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => { ...@@ -147,8 +116,6 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => {
} }
}; };
console.log('modalState_bool: ', modalState.bool);
console.log( console.log(
'wsphonedata_all_data: ', 'wsphonedata_all_data: ',
wsphonedata?.position, wsphonedata?.position,
...@@ -217,3 +184,34 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => { ...@@ -217,3 +184,34 @@ const Root = ({ wsphonedata, onSetDnd, setWsphonedata, callMethod }) => {
); );
}; };
export default Root; export default Root;
// ======================================================
// var no_active_delay = 60;
// var now_no_active = 0;
// function activeUser() {
// now_no_active = 0;
// }
// function updateChat() {
// location.reload();
// return;
// }
// setInterval(() => {
// if (
// now_no_active >= no_active_delay && modalState.bool === 'undefined'
// ? true
// : (!modalState.bool && !innerCallerModal.bool) ||
// modalState.bool === 'undefined'
// ) {
// now_no_active++;
// updateChat();
// }
// }, 1000);
// document.onmousemove = activeUser;
// console.log(
// 'modalState_bool: ',
// modalState.bool === 'undefined'
// ? true
// : (!modalState.bool && !innerCallerModal.bool) ||
// modalState.bool === 'undefined',
// );
// ======================================================
src/storage/index.js 0 → 100644
View file @ 6d8ffe5d
/** @format */
import { create } from 'zustand';
export const useConfigHoldMute = create((set) => ({
state: {},
setState: (x) => set((state) => ({ state: x }))
}));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023