diff --git a/.gitignore b/.gitignore index 18532909f..5fa06343a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ # Dependency directories (remove the comment below to include it) # vendor/ +node_modules +.DS_Store +dist \ No newline at end of file diff --git a/net/web/babel.config.js b/net/web/babel.config.js deleted file mode 100644 index 842219d35..000000000 --- a/net/web/babel.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - presets: [ - '@babel/preset-env', - ['@babel/preset-react', {runtime: 'automatic'}], - ], -}; diff --git a/net/web/index.html b/net/web/index.html new file mode 100644 index 000000000..20a58ddf1 --- /dev/null +++ b/net/web/index.html @@ -0,0 +1,21 @@ + + + + + + + + + + + Databag + + + +
+ + + diff --git a/net/web/jest.config.js b/net/web/jest.config.js new file mode 100644 index 000000000..5b47a8925 --- /dev/null +++ b/net/web/jest.config.js @@ -0,0 +1,12 @@ +/** @type {import('ts-jest').JestConfigWithTsJest} */ +export default { + preset: 'ts-jest', + testEnvironment: 'jsdom', + modulePaths: ['/src/'], + testMatch: ['**/test/**'], + moduleNameMapper: { + '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/mock/fileMock.js', + '\\.(css|less|scss|sass)$': 'identity-obj-proxy', + // "(.*)": "/src/$1", + }, +}; diff --git a/net/web/jsconfig.json b/net/web/jsconfig.json deleted file mode 100644 index 5875dc5b6..000000000 --- a/net/web/jsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": "src" - }, - "include": ["src"] -} diff --git a/net/web/package.json b/net/web/package.json index b54e50df7..36bee8cce 100644 --- a/net/web/package.json +++ b/net/web/package.json @@ -2,19 +2,7 @@ "name": "databag", "version": "0.1.0", "private": true, - "jest": { - "testEnvironment": "jsdom", - "modulePaths": [ - "/src/" - ], - "testMatch": [ - "**/test/**" - ], - "moduleNameMapper": { - "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "/mock/fileMock.js", - "\\.(css|less|scss|sass)$": "identity-obj-proxy" - } - }, + "type": "module", "dependencies": { "@charliewilco/gluejar": "^1.0.0", "@testing-library/jest-dom": "^5.14.1", @@ -33,15 +21,13 @@ "react-image-file-resizer": "^0.4.8", "react-resize-detector": "^7.0.0", "react-router-dom": "^6.2.2", - "react-scripts": "5.0.0", "styled-components": "^5.3.3", "web-vitals": "^2.1.0" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", - "test": "react-scripts test", - "eject": "react-scripts eject" + "start": "vite", + "build": "vite build", + "test": "jest" }, "eslintConfig": { "extends": [ @@ -62,14 +48,25 @@ ] }, "devDependencies": { - "@babel/preset-env": "^7.20.2", - "@babel/preset-react": "^7.18.6", "@testing-library/dom": "^8.19.1", "@testing-library/react": "^13.4.0", + "@types/jest": "^29.5.12", + "@types/react": "^18.2.66", + "@types/react-dom": "^18.2.22", + "@typescript-eslint/eslint-plugin": "^7.2.0", + "@typescript-eslint/parser": "^7.2.0", + "@vitejs/plugin-react-swc": "^3.5.0", "babel-jest": "^29.3.1", + "eslint": "^8.57.0", + "eslint-plugin-react-hooks": "^4.6.0", + "eslint-plugin-react-refresh": "^0.4.6", "identity-obj-proxy": "^3.0.0", - "jest": "^29.3.1", + "jest": "^29.7.0", "jest-environment-jsdom": "^29.3.1", - "react-test-renderer": "^18.2.0" + "react-test-renderer": "^18.2.0", + "ts-jest": "^29.1.2", + "typescript": "^5.4.5", + "vite": "^5.2.0", + "vite-tsconfig-paths": "^4.3.2" } } diff --git a/net/web/public/index.html b/net/web/public/index.html deleted file mode 100644 index aa9324710..000000000 --- a/net/web/public/index.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - Databag - - - -
- - - diff --git a/net/web/src/App.styled.js b/net/web/src/App.styled.ts similarity index 100% rename from net/web/src/App.styled.js rename to net/web/src/App.styled.ts diff --git a/net/web/src/App.test.js b/net/web/src/App.test.tsx similarity index 100% rename from net/web/src/App.test.js rename to net/web/src/App.test.tsx diff --git a/net/web/src/App.js b/net/web/src/App.tsx similarity index 100% rename from net/web/src/App.js rename to net/web/src/App.tsx diff --git a/net/web/src/access/Access.styled.js b/net/web/src/access/Access.styled.ts similarity index 100% rename from net/web/src/access/Access.styled.js rename to net/web/src/access/Access.styled.ts diff --git a/net/web/src/access/Access.jsx b/net/web/src/access/Access.tsx similarity index 100% rename from net/web/src/access/Access.jsx rename to net/web/src/access/Access.tsx diff --git a/net/web/src/access/admin/Admin.styled.js b/net/web/src/access/admin/Admin.styled.ts similarity index 100% rename from net/web/src/access/admin/Admin.styled.js rename to net/web/src/access/admin/Admin.styled.ts diff --git a/net/web/src/access/admin/Admin.jsx b/net/web/src/access/admin/Admin.tsx similarity index 100% rename from net/web/src/access/admin/Admin.jsx rename to net/web/src/access/admin/Admin.tsx diff --git a/net/web/src/access/admin/useAdmin.hook.js b/net/web/src/access/admin/useAdmin.hook.ts similarity index 97% rename from net/web/src/access/admin/useAdmin.hook.js rename to net/web/src/access/admin/useAdmin.hook.ts index 2cde10e06..8ab14909f 100644 --- a/net/web/src/access/admin/useAdmin.hook.js +++ b/net/web/src/access/admin/useAdmin.hook.ts @@ -13,7 +13,7 @@ export function useAdmin() { placeholder: '', unclaimed: null, busy: false, - strings: {}, + strings: {} as Record, menuStyle: {}, }); diff --git a/net/web/src/access/createAccount/CreateAccount.styled.js b/net/web/src/access/createAccount/CreateAccount.styled.ts similarity index 100% rename from net/web/src/access/createAccount/CreateAccount.styled.js rename to net/web/src/access/createAccount/CreateAccount.styled.ts diff --git a/net/web/src/access/createAccount/CreateAccount.jsx b/net/web/src/access/createAccount/CreateAccount.tsx similarity index 100% rename from net/web/src/access/createAccount/CreateAccount.jsx rename to net/web/src/access/createAccount/CreateAccount.tsx diff --git a/net/web/src/access/createAccount/useCreateAccount.hook.js b/net/web/src/access/createAccount/useCreateAccount.hook.ts similarity index 98% rename from net/web/src/access/createAccount/useCreateAccount.hook.js rename to net/web/src/access/createAccount/useCreateAccount.hook.ts index ddf26cf20..4aed591ff 100644 --- a/net/web/src/access/createAccount/useCreateAccount.hook.js +++ b/net/web/src/access/createAccount/useCreateAccount.hook.ts @@ -14,7 +14,7 @@ export function useCreateAccount() { busy: false, validatetatus: 'success', help: '', - strings: {}, + strings: {} as Record, menuStyle: {}, }); diff --git a/net/web/src/access/login/Login.styled.js b/net/web/src/access/login/Login.styled.ts similarity index 100% rename from net/web/src/access/login/Login.styled.js rename to net/web/src/access/login/Login.styled.ts diff --git a/net/web/src/access/login/Login.jsx b/net/web/src/access/login/Login.tsx similarity index 100% rename from net/web/src/access/login/Login.jsx rename to net/web/src/access/login/Login.tsx diff --git a/net/web/src/access/login/useLogin.hook.js b/net/web/src/access/login/useLogin.hook.ts similarity index 98% rename from net/web/src/access/login/useLogin.hook.js rename to net/web/src/access/login/useLogin.hook.ts index dc27d49ce..ffeca5410 100644 --- a/net/web/src/access/login/useLogin.hook.js +++ b/net/web/src/access/login/useLogin.hook.ts @@ -13,7 +13,7 @@ export function useLogin() { availableSet: false, disabled: true, busy: false, - strings: {}, + strings: {} as Record, menuStyle: {}, }); diff --git a/net/web/src/access/useAccess.hook.js b/net/web/src/access/useAccess.hook.ts similarity index 94% rename from net/web/src/access/useAccess.hook.js rename to net/web/src/access/useAccess.hook.ts index a79314f66..fab82e8c9 100644 --- a/net/web/src/access/useAccess.hook.js +++ b/net/web/src/access/useAccess.hook.ts @@ -13,7 +13,7 @@ export function useAccess() { themes: [], language: null, languages: [], - strings: {}, + strings: {} as Record, }); const navigate = useNavigate(); @@ -32,7 +32,7 @@ export function useAccess() { }, [app.state, navigate]); useEffect(() => { - let params = new URLSearchParams(location); + let params = new URLSearchParams(location+""); let token = params.get("access"); if (token) { const access = async () => { diff --git a/net/web/src/api/addAccount.js b/net/web/src/api/addAccount.ts similarity index 100% rename from net/web/src/api/addAccount.js rename to net/web/src/api/addAccount.ts diff --git a/net/web/src/api/addAccountAccess.js b/net/web/src/api/addAccountAccess.ts similarity index 100% rename from net/web/src/api/addAccountAccess.js rename to net/web/src/api/addAccountAccess.ts diff --git a/net/web/src/api/addAccountCreate.js b/net/web/src/api/addAccountCreate.ts similarity index 100% rename from net/web/src/api/addAccountCreate.js rename to net/web/src/api/addAccountCreate.ts diff --git a/net/web/src/api/addCall.js b/net/web/src/api/addCall.ts similarity index 100% rename from net/web/src/api/addCall.js rename to net/web/src/api/addCall.ts diff --git a/net/web/src/api/addCard.js b/net/web/src/api/addCard.ts similarity index 100% rename from net/web/src/api/addCard.js rename to net/web/src/api/addCard.ts diff --git a/net/web/src/api/addChannel.js b/net/web/src/api/addChannel.ts similarity index 100% rename from net/web/src/api/addChannel.js rename to net/web/src/api/addChannel.ts diff --git a/net/web/src/api/addChannelTopic.js b/net/web/src/api/addChannelTopic.ts similarity index 100% rename from net/web/src/api/addChannelTopic.js rename to net/web/src/api/addChannelTopic.ts diff --git a/net/web/src/api/addContactChannelTopic.js b/net/web/src/api/addContactChannelTopic.ts similarity index 100% rename from net/web/src/api/addContactChannelTopic.js rename to net/web/src/api/addContactChannelTopic.ts diff --git a/net/web/src/api/addContactRing.js b/net/web/src/api/addContactRing.ts similarity index 100% rename from net/web/src/api/addContactRing.js rename to net/web/src/api/addContactRing.ts diff --git a/net/web/src/api/clearChannelCard.js b/net/web/src/api/clearChannelCard.ts similarity index 100% rename from net/web/src/api/clearChannelCard.js rename to net/web/src/api/clearChannelCard.ts diff --git a/net/web/src/api/clearLogin.js b/net/web/src/api/clearLogin.ts similarity index 100% rename from net/web/src/api/clearLogin.js rename to net/web/src/api/clearLogin.ts diff --git a/net/web/src/api/createAccount.js b/net/web/src/api/createAccount.ts similarity index 100% rename from net/web/src/api/createAccount.js rename to net/web/src/api/createAccount.ts diff --git a/net/web/src/api/fetchUtil.js b/net/web/src/api/fetchUtil.ts similarity index 65% rename from net/web/src/api/fetchUtil.js rename to net/web/src/api/fetchUtil.ts index a5ed506d6..20220a4f3 100644 --- a/net/web/src/api/fetchUtil.js +++ b/net/web/src/api/fetchUtil.ts @@ -12,17 +12,17 @@ export function checkResponse(response) { } } -export async function fetchWithTimeout(url, options) { +export async function fetchWithTimeout(url, options):Promise { return Promise.race([ fetch(url, options).catch(err => { throw new Error(url + ' failed'); }), - new Promise((_, reject) => setTimeout(() => reject(new Error(url + ' timeout')), TIMEOUT)) + new Promise((_, reject) => setTimeout(() => reject(new Error(url + ' timeout')), TIMEOUT)) ]); } -export async function fetchWithCustomTimeout(url, options, timeout) { +export async function fetchWithCustomTimeout(url, options, timeout):Promise { return Promise.race([ fetch(url, options).catch(err => { throw new Error(url + ' failed'); }), - new Promise((_, reject) => setTimeout(() => reject(new Error(url + ' timeout')), timeout)) + new Promise((_, reject) => setTimeout(() => reject(new Error(url + ' timeout')), timeout)) ]); } diff --git a/net/web/src/api/getAccountImageUrl.js b/net/web/src/api/getAccountImageUrl.ts similarity index 100% rename from net/web/src/api/getAccountImageUrl.js rename to net/web/src/api/getAccountImageUrl.ts diff --git a/net/web/src/api/getAccountStatus.js b/net/web/src/api/getAccountStatus.ts similarity index 100% rename from net/web/src/api/getAccountStatus.js rename to net/web/src/api/getAccountStatus.ts diff --git a/net/web/src/api/getAvailable.js b/net/web/src/api/getAvailable.ts similarity index 100% rename from net/web/src/api/getAvailable.js rename to net/web/src/api/getAvailable.ts diff --git a/net/web/src/api/getCardCloseMessage.js b/net/web/src/api/getCardCloseMessage.ts similarity index 100% rename from net/web/src/api/getCardCloseMessage.js rename to net/web/src/api/getCardCloseMessage.ts diff --git a/net/web/src/api/getCardDetail.js b/net/web/src/api/getCardDetail.ts similarity index 100% rename from net/web/src/api/getCardDetail.js rename to net/web/src/api/getCardDetail.ts diff --git a/net/web/src/api/getCardImageUrl.js b/net/web/src/api/getCardImageUrl.ts similarity index 100% rename from net/web/src/api/getCardImageUrl.js rename to net/web/src/api/getCardImageUrl.ts diff --git a/net/web/src/api/getCardOpenMessage.js b/net/web/src/api/getCardOpenMessage.ts similarity index 100% rename from net/web/src/api/getCardOpenMessage.js rename to net/web/src/api/getCardOpenMessage.ts diff --git a/net/web/src/api/getCardProfile.js b/net/web/src/api/getCardProfile.ts similarity index 100% rename from net/web/src/api/getCardProfile.js rename to net/web/src/api/getCardProfile.ts diff --git a/net/web/src/api/getCards.js b/net/web/src/api/getCards.ts similarity index 100% rename from net/web/src/api/getCards.js rename to net/web/src/api/getCards.ts diff --git a/net/web/src/api/getChannelDetail.js b/net/web/src/api/getChannelDetail.ts similarity index 100% rename from net/web/src/api/getChannelDetail.js rename to net/web/src/api/getChannelDetail.ts diff --git a/net/web/src/api/getChannelSummary.js b/net/web/src/api/getChannelSummary.ts similarity index 100% rename from net/web/src/api/getChannelSummary.js rename to net/web/src/api/getChannelSummary.ts diff --git a/net/web/src/api/getChannelTopic.js b/net/web/src/api/getChannelTopic.ts similarity index 100% rename from net/web/src/api/getChannelTopic.js rename to net/web/src/api/getChannelTopic.ts diff --git a/net/web/src/api/getChannelTopicAssetUrl.js b/net/web/src/api/getChannelTopicAssetUrl.ts similarity index 100% rename from net/web/src/api/getChannelTopicAssetUrl.js rename to net/web/src/api/getChannelTopicAssetUrl.ts diff --git a/net/web/src/api/getChannelTopics.js b/net/web/src/api/getChannelTopics.ts similarity index 100% rename from net/web/src/api/getChannelTopics.js rename to net/web/src/api/getChannelTopics.ts diff --git a/net/web/src/api/getChannels.js b/net/web/src/api/getChannels.ts similarity index 100% rename from net/web/src/api/getChannels.js rename to net/web/src/api/getChannels.ts diff --git a/net/web/src/api/getContactChannelDetail.js b/net/web/src/api/getContactChannelDetail.ts similarity index 100% rename from net/web/src/api/getContactChannelDetail.js rename to net/web/src/api/getContactChannelDetail.ts diff --git a/net/web/src/api/getContactChannelSummary.js b/net/web/src/api/getContactChannelSummary.ts similarity index 100% rename from net/web/src/api/getContactChannelSummary.js rename to net/web/src/api/getContactChannelSummary.ts diff --git a/net/web/src/api/getContactChannelTopic.js b/net/web/src/api/getContactChannelTopic.ts similarity index 100% rename from net/web/src/api/getContactChannelTopic.js rename to net/web/src/api/getContactChannelTopic.ts diff --git a/net/web/src/api/getContactChannelTopicAssetUrl.js b/net/web/src/api/getContactChannelTopicAssetUrl.ts similarity index 100% rename from net/web/src/api/getContactChannelTopicAssetUrl.js rename to net/web/src/api/getContactChannelTopicAssetUrl.ts diff --git a/net/web/src/api/getContactChannelTopics.js b/net/web/src/api/getContactChannelTopics.ts similarity index 100% rename from net/web/src/api/getContactChannelTopics.js rename to net/web/src/api/getContactChannelTopics.ts diff --git a/net/web/src/api/getContactChannels.js b/net/web/src/api/getContactChannels.ts similarity index 96% rename from net/web/src/api/getContactChannels.js rename to net/web/src/api/getContactChannels.ts index 579385ed1..9da7ead4c 100644 --- a/net/web/src/api/getContactChannels.js +++ b/net/web/src/api/getContactChannels.ts @@ -1,6 +1,6 @@ import { checkResponse, fetchWithTimeout } from './fetchUtil'; -export async function getContactChannels(server, token, viewRevision, channelRevision) { +export async function getContactChannels(server, token, viewRevision?, channelRevision?) { let host = ""; if (server) { host = `https://${server}`; diff --git a/net/web/src/api/getContactProfile.js b/net/web/src/api/getContactProfile.ts similarity index 100% rename from net/web/src/api/getContactProfile.js rename to net/web/src/api/getContactProfile.ts diff --git a/net/web/src/api/getGroups.js b/net/web/src/api/getGroups.ts similarity index 100% rename from net/web/src/api/getGroups.js rename to net/web/src/api/getGroups.ts diff --git a/net/web/src/api/getListing.js b/net/web/src/api/getListing.ts similarity index 100% rename from net/web/src/api/getListing.js rename to net/web/src/api/getListing.ts diff --git a/net/web/src/api/getListingImageUrl.js b/net/web/src/api/getListingImageUrl.ts similarity index 100% rename from net/web/src/api/getListingImageUrl.js rename to net/web/src/api/getListingImageUrl.ts diff --git a/net/web/src/api/getListingMessage.js b/net/web/src/api/getListingMessage.ts similarity index 100% rename from net/web/src/api/getListingMessage.js rename to net/web/src/api/getListingMessage.ts diff --git a/net/web/src/api/getNodeAccounts.js b/net/web/src/api/getNodeAccounts.ts similarity index 100% rename from net/web/src/api/getNodeAccounts.js rename to net/web/src/api/getNodeAccounts.ts diff --git a/net/web/src/api/getNodeConfig.js b/net/web/src/api/getNodeConfig.ts similarity index 100% rename from net/web/src/api/getNodeConfig.js rename to net/web/src/api/getNodeConfig.ts diff --git a/net/web/src/api/getNodeStatus.js b/net/web/src/api/getNodeStatus.ts similarity index 100% rename from net/web/src/api/getNodeStatus.js rename to net/web/src/api/getNodeStatus.ts diff --git a/net/web/src/api/getProfile.js b/net/web/src/api/getProfile.ts similarity index 100% rename from net/web/src/api/getProfile.js rename to net/web/src/api/getProfile.ts diff --git a/net/web/src/api/getProfileImageUrl.js b/net/web/src/api/getProfileImageUrl.ts similarity index 100% rename from net/web/src/api/getProfileImageUrl.js rename to net/web/src/api/getProfileImageUrl.ts diff --git a/net/web/src/api/getUsername.js b/net/web/src/api/getUsername.ts similarity index 100% rename from net/web/src/api/getUsername.js rename to net/web/src/api/getUsername.ts diff --git a/net/web/src/api/keepCall.js b/net/web/src/api/keepCall.ts similarity index 100% rename from net/web/src/api/keepCall.js rename to net/web/src/api/keepCall.ts diff --git a/net/web/src/api/removeAccount.js b/net/web/src/api/removeAccount.ts similarity index 100% rename from net/web/src/api/removeAccount.js rename to net/web/src/api/removeAccount.ts diff --git a/net/web/src/api/removeCall.js b/net/web/src/api/removeCall.ts similarity index 100% rename from net/web/src/api/removeCall.js rename to net/web/src/api/removeCall.ts diff --git a/net/web/src/api/removeCard.js b/net/web/src/api/removeCard.ts similarity index 100% rename from net/web/src/api/removeCard.js rename to net/web/src/api/removeCard.ts diff --git a/net/web/src/api/removeChannel.js b/net/web/src/api/removeChannel.ts similarity index 100% rename from net/web/src/api/removeChannel.js rename to net/web/src/api/removeChannel.ts diff --git a/net/web/src/api/removeChannelTopic.js b/net/web/src/api/removeChannelTopic.ts similarity index 100% rename from net/web/src/api/removeChannelTopic.js rename to net/web/src/api/removeChannelTopic.ts diff --git a/net/web/src/api/removeContactCall.js b/net/web/src/api/removeContactCall.ts similarity index 100% rename from net/web/src/api/removeContactCall.js rename to net/web/src/api/removeContactCall.ts diff --git a/net/web/src/api/removeContactChannel.js b/net/web/src/api/removeContactChannel.ts similarity index 100% rename from net/web/src/api/removeContactChannel.js rename to net/web/src/api/removeContactChannel.ts diff --git a/net/web/src/api/removeContactChannelTopic.js b/net/web/src/api/removeContactChannelTopic.ts similarity index 100% rename from net/web/src/api/removeContactChannelTopic.js rename to net/web/src/api/removeContactChannelTopic.ts diff --git a/net/web/src/api/setAccountAccess.js b/net/web/src/api/setAccountAccess.ts similarity index 100% rename from net/web/src/api/setAccountAccess.js rename to net/web/src/api/setAccountAccess.ts diff --git a/net/web/src/api/setAccountLogin.js b/net/web/src/api/setAccountLogin.ts similarity index 100% rename from net/web/src/api/setAccountLogin.js rename to net/web/src/api/setAccountLogin.ts diff --git a/net/web/src/api/setAccountSeal.js b/net/web/src/api/setAccountSeal.ts similarity index 100% rename from net/web/src/api/setAccountSeal.js rename to net/web/src/api/setAccountSeal.ts diff --git a/net/web/src/api/setAccountSearchable.js b/net/web/src/api/setAccountSearchable.ts similarity index 100% rename from net/web/src/api/setAccountSearchable.js rename to net/web/src/api/setAccountSearchable.ts diff --git a/net/web/src/api/setAccountStatus.js b/net/web/src/api/setAccountStatus.ts similarity index 100% rename from net/web/src/api/setAccountStatus.js rename to net/web/src/api/setAccountStatus.ts diff --git a/net/web/src/api/setCardCloseMessage.js b/net/web/src/api/setCardCloseMessage.ts similarity index 100% rename from net/web/src/api/setCardCloseMessage.js rename to net/web/src/api/setCardCloseMessage.ts diff --git a/net/web/src/api/setCardOpenMessage.js b/net/web/src/api/setCardOpenMessage.ts similarity index 100% rename from net/web/src/api/setCardOpenMessage.js rename to net/web/src/api/setCardOpenMessage.ts diff --git a/net/web/src/api/setCardProfile.js b/net/web/src/api/setCardProfile.ts similarity index 100% rename from net/web/src/api/setCardProfile.js rename to net/web/src/api/setCardProfile.ts diff --git a/net/web/src/api/setCardStatus.js b/net/web/src/api/setCardStatus.ts similarity index 100% rename from net/web/src/api/setCardStatus.js rename to net/web/src/api/setCardStatus.ts diff --git a/net/web/src/api/setChannelCard.js b/net/web/src/api/setChannelCard.ts similarity index 100% rename from net/web/src/api/setChannelCard.js rename to net/web/src/api/setChannelCard.ts diff --git a/net/web/src/api/setChannelSubject.js b/net/web/src/api/setChannelSubject.ts similarity index 100% rename from net/web/src/api/setChannelSubject.js rename to net/web/src/api/setChannelSubject.ts diff --git a/net/web/src/api/setChannelTopicAsset.js b/net/web/src/api/setChannelTopicAsset.ts similarity index 100% rename from net/web/src/api/setChannelTopicAsset.js rename to net/web/src/api/setChannelTopicAsset.ts diff --git a/net/web/src/api/setChannelTopicSubject.js b/net/web/src/api/setChannelTopicSubject.ts similarity index 100% rename from net/web/src/api/setChannelTopicSubject.js rename to net/web/src/api/setChannelTopicSubject.ts diff --git a/net/web/src/api/setContactChannelTopicAsset.js b/net/web/src/api/setContactChannelTopicAsset.ts similarity index 100% rename from net/web/src/api/setContactChannelTopicAsset.js rename to net/web/src/api/setContactChannelTopicAsset.ts diff --git a/net/web/src/api/setContactChannelTopicSubject.js b/net/web/src/api/setContactChannelTopicSubject.ts similarity index 100% rename from net/web/src/api/setContactChannelTopicSubject.js rename to net/web/src/api/setContactChannelTopicSubject.ts diff --git a/net/web/src/api/setLogin.js b/net/web/src/api/setLogin.ts similarity index 100% rename from net/web/src/api/setLogin.js rename to net/web/src/api/setLogin.ts diff --git a/net/web/src/api/setNodeConfig.js b/net/web/src/api/setNodeConfig.ts similarity index 100% rename from net/web/src/api/setNodeConfig.js rename to net/web/src/api/setNodeConfig.ts diff --git a/net/web/src/api/setNodeStatus.js b/net/web/src/api/setNodeStatus.ts similarity index 100% rename from net/web/src/api/setNodeStatus.js rename to net/web/src/api/setNodeStatus.ts diff --git a/net/web/src/api/setProfileData.js b/net/web/src/api/setProfileData.ts similarity index 100% rename from net/web/src/api/setProfileData.js rename to net/web/src/api/setProfileData.ts diff --git a/net/web/src/api/setProfileImage.js b/net/web/src/api/setProfileImage.ts similarity index 100% rename from net/web/src/api/setProfileImage.js rename to net/web/src/api/setProfileImage.ts diff --git a/net/web/src/carousel/Carousel.styled.js b/net/web/src/carousel/Carousel.styled.ts similarity index 100% rename from net/web/src/carousel/Carousel.styled.js rename to net/web/src/carousel/Carousel.styled.ts diff --git a/net/web/src/carousel/Carousel.jsx b/net/web/src/carousel/Carousel.tsx similarity index 67% rename from net/web/src/carousel/Carousel.jsx rename to net/web/src/carousel/Carousel.tsx index f399f1927..d40265e12 100644 --- a/net/web/src/carousel/Carousel.jsx +++ b/net/web/src/carousel/Carousel.tsx @@ -2,15 +2,21 @@ import React, { useState, useEffect, useRef } from 'react'; import { CarouselWrapper } from './Carousel.styled'; import { CloseOutlined } from '@ant-design/icons'; import ReactResizeDetector from 'react-resize-detector'; +interface Props { + pad?:any + items?:any + itemRenderer?:any + itemRemove?:any -export function Carousel({ pad, items, itemRenderer, itemRemove }) { +} +export function Carousel({ pad, items, itemRenderer, itemRemove }:Props) { const [slots, setSlots] = useState([]); - let carousel = useRef(); + let carousel = useRef(); const RemoveItem = ({ index }) => { if (itemRemove) { - return
itemRemove(index)}>
+ return
itemRemove(index)}>
} return <> } @@ -22,8 +28,8 @@ export function Carousel({ pad, items, itemRenderer, itemRemove }) { {({ width, height }) => { return ( -
-
{ itemRenderer(items[i], i) }
+
+
{ itemRenderer(items[i], i) }
); @@ -32,14 +38,14 @@ export function Carousel({ pad, items, itemRenderer, itemRemove }) { )); } if (items.length > 0) { - assets.push(
) + assets.push(
) } setSlots(assets); }, [items, itemRenderer]); return ( -
+
{slots}
diff --git a/net/web/src/carousel/useCarousel.js b/net/web/src/carousel/useCarousel.ts similarity index 100% rename from net/web/src/carousel/useCarousel.js rename to net/web/src/carousel/useCarousel.ts diff --git a/net/web/src/constants/Colors.js b/net/web/src/constants/Colors.ts similarity index 100% rename from net/web/src/constants/Colors.js rename to net/web/src/constants/Colors.ts diff --git a/net/web/src/constants/Strings.js b/net/web/src/constants/Strings.ts similarity index 100% rename from net/web/src/constants/Strings.js rename to net/web/src/constants/Strings.ts diff --git a/net/web/src/context/AccountContext.js b/net/web/src/context/AccountContext.tsx similarity index 63% rename from net/web/src/context/AccountContext.js rename to net/web/src/context/AccountContext.tsx index e4c346130..fc28247ce 100644 --- a/net/web/src/context/AccountContext.js +++ b/net/web/src/context/AccountContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useAccountContext } from './useAccountContext.hook'; +import { defaultAccountContext, useAccountContext } from './useAccountContext.hook'; -export const AccountContext = createContext({}); +export const AccountContext = createContext(defaultAccountContext); export function AccountContextProvider({ children }) { const { state, actions } = useAccountContext(); diff --git a/net/web/src/context/AppContext.js b/net/web/src/context/AppContext.tsx similarity index 65% rename from net/web/src/context/AppContext.js rename to net/web/src/context/AppContext.tsx index 665eec18b..1836b9555 100644 --- a/net/web/src/context/AppContext.js +++ b/net/web/src/context/AppContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useAppContext } from './useAppContext.hook'; +import { defaultAppContext, useAppContext } from './useAppContext.hook'; -export const AppContext = createContext({}); +export const AppContext = createContext(defaultAppContext); export function AppContextProvider({ children }) { const { state, actions } = useAppContext(); diff --git a/net/web/src/context/CardContext.js b/net/web/src/context/CardContext.tsx similarity index 65% rename from net/web/src/context/CardContext.js rename to net/web/src/context/CardContext.tsx index 1bc8fb182..1a017df9e 100644 --- a/net/web/src/context/CardContext.js +++ b/net/web/src/context/CardContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useCardContext } from './useCardContext.hook'; +import { defaultCardContext, useCardContext } from './useCardContext.hook'; -export const CardContext = createContext({}); +export const CardContext = createContext(defaultCardContext); export function CardContextProvider({ children }) { const { state, actions } = useCardContext(); diff --git a/net/web/src/context/ChannelContext.js b/net/web/src/context/ChannelContext.tsx similarity index 63% rename from net/web/src/context/ChannelContext.js rename to net/web/src/context/ChannelContext.tsx index 103e537c6..ef30b6c41 100644 --- a/net/web/src/context/ChannelContext.js +++ b/net/web/src/context/ChannelContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useChannelContext } from './useChannelContext.hook'; +import { defaultChannelContext, useChannelContext } from './useChannelContext.hook'; -export const ChannelContext = createContext({}); +export const ChannelContext = createContext(defaultChannelContext); export function ChannelContextProvider({ children }) { const { state, actions } = useChannelContext(); diff --git a/net/web/src/context/ConversationContext.js b/net/web/src/context/ConversationContext.tsx similarity index 62% rename from net/web/src/context/ConversationContext.js rename to net/web/src/context/ConversationContext.tsx index 08cde8922..6d96c8c28 100644 --- a/net/web/src/context/ConversationContext.js +++ b/net/web/src/context/ConversationContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useConversationContext } from './useConversationContext.hook'; +import { defaultConversionContext, useConversationContext } from './useConversationContext.hook'; -export const ConversationContext = createContext({}); +export const ConversationContext = createContext(defaultConversionContext); export function ConversationContextProvider({ children }) { const { state, actions } = useConversationContext(); diff --git a/net/web/src/context/ProfileContext.js b/net/web/src/context/ProfileContext.tsx similarity index 63% rename from net/web/src/context/ProfileContext.js rename to net/web/src/context/ProfileContext.tsx index ef48f3141..ebbcf37ff 100644 --- a/net/web/src/context/ProfileContext.js +++ b/net/web/src/context/ProfileContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useProfileContext } from './useProfileContext.hook'; +import { defaultProfileContext, useProfileContext } from './useProfileContext.hook'; -export const ProfileContext = createContext({}); +export const ProfileContext = createContext(defaultProfileContext); export function ProfileContextProvider({ children }) { const { state, actions } = useProfileContext(); diff --git a/net/web/src/context/RingContext.js b/net/web/src/context/RingContext.tsx similarity index 65% rename from net/web/src/context/RingContext.js rename to net/web/src/context/RingContext.tsx index 1ec9e7cad..5c24f5c36 100644 --- a/net/web/src/context/RingContext.js +++ b/net/web/src/context/RingContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useRingContext } from './useRingContext.hook'; +import { defaultRingContext, useRingContext } from './useRingContext.hook'; -export const RingContext = createContext({}); +export const RingContext = createContext(defaultRingContext); export function RingContextProvider({ children }) { const { state, actions } = useRingContext(); diff --git a/net/web/src/context/SettingsContext.js b/net/web/src/context/SettingsContext.tsx similarity index 63% rename from net/web/src/context/SettingsContext.js rename to net/web/src/context/SettingsContext.tsx index 97924e759..dc9b45add 100644 --- a/net/web/src/context/SettingsContext.js +++ b/net/web/src/context/SettingsContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useSettingsContext } from './useSettingsContext.hook'; +import { defaultSettingsContext, useSettingsContext } from './useSettingsContext.hook'; -export const SettingsContext = createContext({}); +export const SettingsContext = createContext(defaultSettingsContext); export function SettingsContextProvider({ children }) { const { state, actions } = useSettingsContext(); diff --git a/net/web/src/context/StoreContext.js b/net/web/src/context/StoreContext.tsx similarity index 64% rename from net/web/src/context/StoreContext.js rename to net/web/src/context/StoreContext.tsx index 02bcdaf8c..6690204d1 100644 --- a/net/web/src/context/StoreContext.js +++ b/net/web/src/context/StoreContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useStoreContext } from './useStoreContext.hook'; +import { defaultStoreContext, useStoreContext } from './useStoreContext.hook'; -export const StoreContext = createContext({}); +export const StoreContext = createContext(defaultStoreContext); export function StoreContextProvider({ children }) { const { state, actions } = useStoreContext(); diff --git a/net/web/src/context/UploadContext.js b/net/web/src/context/UploadContext.tsx similarity index 64% rename from net/web/src/context/UploadContext.js rename to net/web/src/context/UploadContext.tsx index 9ac1b2a81..09b9769d7 100644 --- a/net/web/src/context/UploadContext.js +++ b/net/web/src/context/UploadContext.tsx @@ -1,7 +1,7 @@ import { createContext } from 'react'; -import { useUploadContext } from './useUploadContext.hook'; +import { defaultUploadContext, useUploadContext } from './useUploadContext.hook'; -export const UploadContext = createContext({}); +export const UploadContext = createContext(defaultUploadContext); export function UploadContextProvider({ children }) { const { state, actions } = useUploadContext(); diff --git a/net/web/src/context/cardUtil.js b/net/web/src/context/cardUtil.ts similarity index 100% rename from net/web/src/context/cardUtil.js rename to net/web/src/context/cardUtil.ts diff --git a/net/web/src/context/sealUtil.js b/net/web/src/context/sealUtil.ts similarity index 100% rename from net/web/src/context/sealUtil.js rename to net/web/src/context/sealUtil.ts diff --git a/net/web/src/context/useAccountContext.hook.js b/net/web/src/context/useAccountContext.hook.ts similarity index 80% rename from net/web/src/context/useAccountContext.hook.js rename to net/web/src/context/useAccountContext.hook.ts index f4777858f..ccf1866e0 100644 --- a/net/web/src/context/useAccountContext.hook.js +++ b/net/web/src/context/useAccountContext.hook.ts @@ -5,13 +5,28 @@ import { getAccountStatus } from 'api/getAccountStatus'; import { setAccountLogin } from 'api/setAccountLogin'; import { StoreContext } from './StoreContext'; -export function useAccountContext() { - const [state, setState] = useState({ +export const defaultAccountContext = { + state: { offsync: false, status: null, seal: null, sealKey: null, - }); + }, + actions: { + setToken: (token: any) => {}, + clearToken: () => {}, + setRevision: (rev: any) => Promise.reject(), + setSearchable: (flag: any) => Promise.reject(), + setSeal: (seal: any, sealKey: any) => Promise.reject(), + updateSeal: (seal: any) => Promise.reject(), + unlockSeal: (sealKey: any) => Promise.reject(), + setLogin: (username: any, password: any) => Promise.reject(), + resync: () => Promise.reject(), +} +} + +export function useAccountContext(): typeof defaultAccountContext { + const [state, setState] = useState(defaultAccountContext.state); const access = useRef(null); const setRevision = useRef(null); const curRevision = useRef(null); diff --git a/net/web/src/context/useAppContext.hook.js b/net/web/src/context/useAppContext.hook.ts similarity index 95% rename from net/web/src/context/useAppContext.hook.js rename to net/web/src/context/useAppContext.hook.ts index 8b488215a..f6873f724 100644 --- a/net/web/src/context/useAppContext.hook.js +++ b/net/web/src/context/useAppContext.hook.ts @@ -11,13 +11,18 @@ import { StoreContext } from './StoreContext'; import { UploadContext } from './UploadContext'; import { RingContext } from './RingContext'; import { createWebsocket } from 'api/fetchUtil'; +const defaultState ={ + status: null, + adminToken: null, +} +export const defaultAppContext = { +state:defaultState, +actions: {}as ReturnType["actions"], +} -export function useAppContext(websocket) { - const [state, setState] = useState({ - status: null, - adminToken: null, - }); - const [appRevision, setAppRevision] = useState(); +export function useAppContext() { + const [state, setState] = useState(defaultState); + const [appRevision, setAppRevision] = useState(); const appName = "Databag"; const appVersion = "1.0.0"; diff --git a/net/web/src/context/useCardContext.hook.js b/net/web/src/context/useCardContext.hook.ts similarity index 98% rename from net/web/src/context/useCardContext.hook.js rename to net/web/src/context/useCardContext.hook.ts index 1eca5155c..c1acfec65 100644 --- a/net/web/src/context/useCardContext.hook.js +++ b/net/web/src/context/useCardContext.hook.ts @@ -24,11 +24,17 @@ import { addCard } from 'api/addCard'; import { removeCard } from 'api/removeCard'; import { UploadContext } from 'context/UploadContext'; +const defaultState = { + offsync: false, + cards: new Map(), +} +export const defaultCardContext = { + state:defaultState, + actions: {} as ReturnType["actions"], +} + export function useCardContext() { - const [state, setState] = useState({ - offsync: false, - cards: new Map(), - }); + const [state, setState] = useState(defaultState); const upload = useContext(UploadContext); const access = useRef(null); const syncing = useRef(false); diff --git a/net/web/src/context/useChannelContext.hook.js b/net/web/src/context/useChannelContext.hook.ts similarity index 95% rename from net/web/src/context/useChannelContext.hook.js rename to net/web/src/context/useChannelContext.hook.ts index ccb21d027..9c6f50000 100644 --- a/net/web/src/context/useChannelContext.hook.js +++ b/net/web/src/context/useChannelContext.hook.ts @@ -15,11 +15,19 @@ import { setChannelCard } from 'api/setChannelCard'; import { clearChannelCard } from 'api/clearChannelCard'; import { UploadContext } from 'context/UploadContext'; +const defaultState = { + offsync: false, + channels: new Map(), +} +export const defaultChannelContext = { + +state: defaultState, +actions: {} as ReturnType["actions"] + +} + export function useChannelContext() { - const [state, setState] = useState({ - offsync: false, - channels: new Map(), - }); + const [state, setState] = useState(defaultState); const upload = useContext(UploadContext); const access = useRef(null); const setRevision = useRef(null); @@ -151,7 +159,7 @@ export function useChannelContext() { } else { const subject = message([]); - await addChannelTopic(access.current, channelId, type, subject); + await addChannelTopic(access.current, channelId, type, subject, undefined); } //await resync(); }, diff --git a/net/web/src/context/useConversationContext.hook.js b/net/web/src/context/useConversationContext.hook.ts similarity index 97% rename from net/web/src/context/useConversationContext.hook.js rename to net/web/src/context/useConversationContext.hook.ts index 01d0806bd..ba5286182 100644 --- a/net/web/src/context/useConversationContext.hook.js +++ b/net/web/src/context/useConversationContext.hook.ts @@ -2,16 +2,21 @@ import { useEffect, useState, useRef, useContext } from 'react'; import { CardContext } from 'context/CardContext'; import { ChannelContext } from 'context/ChannelContext'; +const defaultState ={ + offsync: false, + topics: new Map(), + card: null, + channel: null, + topicRevision: null, +} +export const defaultConversionContext = { + state: defaultState, + actions: {}as ReturnType["actions"] +} export function useConversationContext() { const COUNT = 32; - const [state, setState] = useState({ - offsync: false, - topics: new Map(), - card: null, - channel: null, - topicRevision: null, - }); + const [state, setState] = useState(defaultState); const card = useContext(CardContext); const channel = useContext(ChannelContext); diff --git a/net/web/src/context/useProfileContext.hook.js b/net/web/src/context/useProfileContext.hook.ts similarity index 71% rename from net/web/src/context/useProfileContext.hook.js rename to net/web/src/context/useProfileContext.hook.ts index 2bea4585e..8924bc0b5 100644 --- a/net/web/src/context/useProfileContext.hook.js +++ b/net/web/src/context/useProfileContext.hook.ts @@ -5,12 +5,37 @@ import { setProfileData } from 'api/setProfileData'; import { setProfileImage } from 'api/setProfileImage'; import { getProfileImageUrl } from 'api/getProfileImageUrl'; -export function useProfileContext() { - const [state, setState] = useState({ - offsync: false, - identity: {}, - imageUrl: null, - }); +interface Identity { + guid: string; + name: string; + handle: string; + node: any; + revision: string; + seal: string + version: string; + image: string; + location: string; + description: string; + +} +export const defaultProfileContext = { +state:{ + offsync: false, + identity: {} as Partial, + imageUrl: null, +}, +actions: { + setToken: (token: any) => {}, + clearToken: () => {}, + setRevision: (rev: any) => Promise.reject(), + setProfileData: (name: any, location: any, description: any) => Promise.reject(), + setProfileImage: (image: any) => Promise.reject(), + getHandleStatus: (name: any) => Promise.reject(), + resync: () => Promise.reject(), +} +} +export function useProfileContext(): typeof defaultProfileContext { + const [state, setState] = useState(defaultProfileContext.state); const access = useRef(null); const curRevision = useRef(null); const setRevision = useRef(null); diff --git a/net/web/src/context/useRingContext.hook.js b/net/web/src/context/useRingContext.hook.ts similarity index 96% rename from net/web/src/context/useRingContext.hook.js rename to net/web/src/context/useRingContext.hook.ts index 7dc12404f..d155a86b1 100644 --- a/net/web/src/context/useRingContext.hook.js +++ b/net/web/src/context/useRingContext.hook.ts @@ -5,19 +5,25 @@ import { addCall } from 'api/addCall'; import { keepCall } from 'api/keepCall'; import { removeCall } from 'api/removeCall'; import { removeContactCall } from 'api/removeContactCall'; +type Actions = ReturnType["actions"] +const defaultState = { + ringing: new Map(), + callStatus: null, + cardId: null, + localStream: null, + localVideo: false, + localAudio: false, + remoteStream: null, + remoteVideo: false, + remoteAudio: false, +} +export const defaultRingContext={ + state:defaultState, + actions: {} as Actions +} export function useRingContext() { - const [state, setState] = useState({ - ringing: new Map(), - callStatus: null, - cardId: null, - localStream: null, - localVideo: false, - localAudio: false, - remoteStream: null, - remoteVideo: false, - remoteAudio: false, - }); + const [state, setState] = useState(defaultState); const access = useRef(null); const EXPIRE = 3000 @@ -30,8 +36,8 @@ export function useRingContext() { const stream = useRef(null); const accessVideo = useRef(false); const accessAudio = useRef(false); - const videoTrack = useRef(); - const audioTrack = useRef(); + const videoTrack = useRef(); + const audioTrack = useRef(); const offers = useRef([]); const processing = useRef(false); const connected = useRef(false); diff --git a/net/web/src/context/useSettingsContext.hook.js b/net/web/src/context/useSettingsContext.hook.ts similarity index 92% rename from net/web/src/context/useSettingsContext.hook.js rename to net/web/src/context/useSettingsContext.hook.ts index 14710a18d..1919bafb4 100644 --- a/net/web/src/context/useSettingsContext.hook.js +++ b/net/web/src/context/useSettingsContext.hook.ts @@ -2,27 +2,32 @@ import { useEffect, useState } from 'react'; import { LightTheme, DarkTheme } from 'constants/Colors'; import { en, fr, sp, pt, de, ru } from 'constants/Strings'; +const defaultState = { + display: null, + width: null, + height: null, + themes: [{ value: 'dark', label: 'Dark' }, { value: 'light', label: 'Light' }], + theme: null, + scheme: null, + colors: {} as Record, + menuStyle: {}, + languages: [{ value: 'en', label: 'English' }, { value: 'fr', label: 'Français' }, { value: 'sp', label: 'Español' }, { value: 'pt', label: 'Português' }, { value: 'de', label: 'Deutsch' }, { value: 'ru', label: 'Русский' }], + language: null, + strings: en, + dateFormat: 'mm/dd', + timeFormat: '12h', + audioId: null, + audioInputs: [], + videoId: null, + videoInputs: [], +} +export const defaultSettingsContext = { + state: defaultState, + actions: {} as ReturnType["actions"] +} export function useSettingsContext() { - const [state, setState] = useState({ - display: null, - width: null, - height: null, - themes: [{ value: 'dark', label: 'Dark' }, { value: 'light', label: 'Light' }], - theme: null, - scheme: null, - colors: {}, - menuStyle: {}, - languages: [{ value: 'en', label: 'English' }, { value: 'fr', label: 'Français' }, { value: 'sp', label: 'Español' }, { value: 'pt', label: 'Português' }, { value: 'de', label: 'Deutsch' }, { value: 'ru', label: 'Русский' }], - language: null, - strings: en, - dateFormat: 'mm/dd', - timeFormat: '12h', - audioId: null, - audioInputs: [], - videoId: null, - videoInputs: [], - }); + const [state, setState] = useState(defaultState); const SMALL_MEDIUM = 650; const MEDIUM_LARGE = 1000; diff --git a/net/web/src/context/useStoreContext.hook.js b/net/web/src/context/useStoreContext.hook.ts similarity index 80% rename from net/web/src/context/useStoreContext.hook.js rename to net/web/src/context/useStoreContext.hook.ts index de027b354..a7585dfb3 100644 --- a/net/web/src/context/useStoreContext.hook.js +++ b/net/web/src/context/useStoreContext.hook.ts @@ -1,5 +1,13 @@ import { useEffect, useState } from 'react'; +export const defaultStoreContext = { + state: {} as Record, + actions: { + clear: () => {}, + setValue: (key: any, value: any) => {}, + getValue: (key: any) => undefined as any, + } +} export function useStoreContext() { const [state, setState] = useState({}); diff --git a/net/web/src/context/useUploadContext.hook.js b/net/web/src/context/useUploadContext.hook.ts similarity index 97% rename from net/web/src/context/useUploadContext.hook.js rename to net/web/src/context/useUploadContext.hook.ts index af0557a88..f15427f74 100644 --- a/net/web/src/context/useUploadContext.hook.js +++ b/net/web/src/context/useUploadContext.hook.ts @@ -7,11 +7,17 @@ const IMAGE_SCALE_SIZE = (128 * 1024); const GIF_TYPE = 'image/gif'; const WEBP_TYPE = 'image/webp'; +const defaultState = { + progress: new Map(), +} +export const defaultUploadContext = { + state:defaultState, + actions: {} as ReturnType["actions"] +} + export function useUploadContext() { - const [state, setState] = useState({ - progress: new Map(), - }); + const [state, setState] = useState(defaultState); const channels = useRef(new Map()); const index = useRef(0); @@ -63,7 +69,7 @@ export function useUploadContext() { } const actions = { - addTopic: (token, channelId, topicId, files, success, failure, contact) => { + addTopic: (token, channelId, topicId, files, success, failure, contact?) => { if (contact) { const { server, cardId } = contact; diff --git a/net/web/src/dashboard/Dashboard.styled.js b/net/web/src/dashboard/Dashboard.styled.ts similarity index 100% rename from net/web/src/dashboard/Dashboard.styled.js rename to net/web/src/dashboard/Dashboard.styled.ts diff --git a/net/web/src/dashboard/Dashboard.jsx b/net/web/src/dashboard/Dashboard.tsx similarity index 91% rename from net/web/src/dashboard/Dashboard.jsx rename to net/web/src/dashboard/Dashboard.tsx index bc137d0d9..d3cb2d845 100644 --- a/net/web/src/dashboard/Dashboard.jsx +++ b/net/web/src/dashboard/Dashboard.tsx @@ -27,24 +27,24 @@ export function Dashboard() { { state.display === 'small' && ( <>
- } + } onClick={() => actions.reload()}>
- } + } onClick={() => actions.setShowSettings(true)}>
- } + } onClick={() => actions.logout()}>
{ (state.configError || state.accountsError) && ( - + )}
- } + } loading={state.createBusy} onClick={() => actions.setCreateLink()}>
@@ -53,32 +53,32 @@ export function Dashboard() { <>
- } + } onClick={() => actions.reload()}>
- } + } onClick={() => actions.setShowSettings(true)}>
- } + } onClick={() => actions.logout()}>
{ (state.configError || state.accountsError) && ( - + )}
- } + } loading={state.createBusy} onClick={() => actions.setCreateLink()}>
diff --git a/net/web/src/dashboard/accountItem/AccountItem.styled.js b/net/web/src/dashboard/accountItem/AccountItem.styled.ts similarity index 100% rename from net/web/src/dashboard/accountItem/AccountItem.styled.js rename to net/web/src/dashboard/accountItem/AccountItem.styled.ts diff --git a/net/web/src/dashboard/accountItem/AccountItem.jsx b/net/web/src/dashboard/accountItem/AccountItem.tsx similarity index 100% rename from net/web/src/dashboard/accountItem/AccountItem.jsx rename to net/web/src/dashboard/accountItem/AccountItem.tsx diff --git a/net/web/src/dashboard/accountItem/useAccountItem.hook.js b/net/web/src/dashboard/accountItem/useAccountItem.hook.ts similarity index 98% rename from net/web/src/dashboard/accountItem/useAccountItem.hook.js rename to net/web/src/dashboard/accountItem/useAccountItem.hook.ts index 4230f9efb..62e88503a 100644 --- a/net/web/src/dashboard/accountItem/useAccountItem.hook.js +++ b/net/web/src/dashboard/accountItem/useAccountItem.hook.ts @@ -14,7 +14,7 @@ export function useAccountItem(item, remove) { showAccess: false, display: null, menuStyle: {}, - strings: {}, + strings: {} as Record, }); const app = useContext(AppContext); diff --git a/net/web/src/dashboard/copyButton/CopyButton.jsx b/net/web/src/dashboard/copyButton/CopyButton.tsx similarity index 100% rename from net/web/src/dashboard/copyButton/CopyButton.jsx rename to net/web/src/dashboard/copyButton/CopyButton.tsx diff --git a/net/web/src/dashboard/copyButton/useCopyButton.hook.js b/net/web/src/dashboard/copyButton/useCopyButton.hook.ts similarity index 96% rename from net/web/src/dashboard/copyButton/useCopyButton.hook.js rename to net/web/src/dashboard/copyButton/useCopyButton.hook.ts index 0a94a57a6..89f98f632 100644 --- a/net/web/src/dashboard/copyButton/useCopyButton.hook.js +++ b/net/web/src/dashboard/copyButton/useCopyButton.hook.ts @@ -9,7 +9,7 @@ export function useCopyButton() { show: false, }); - const timeout = useRef(); + const timeout = useRef(); const updateState = (value) => { setState((s) => ({ ...s, ...value })); diff --git a/net/web/src/dashboard/useDashboard.hook.js b/net/web/src/dashboard/useDashboard.hook.ts similarity index 98% rename from net/web/src/dashboard/useDashboard.hook.js rename to net/web/src/dashboard/useDashboard.hook.ts index 867ef91e3..506a297ab 100644 --- a/net/web/src/dashboard/useDashboard.hook.js +++ b/net/web/src/dashboard/useDashboard.hook.ts @@ -36,7 +36,10 @@ export function useDashboard() { accounts: [], colors: {}, menuStyle: {}, - strings: {}, + strings: {} as Record, + loading: null, + display: null, + createBusy: null, }); const navigate = useNavigate(); diff --git a/net/web/src/index.js b/net/web/src/index.tsx similarity index 100% rename from net/web/src/index.js rename to net/web/src/index.tsx diff --git a/net/web/src/logo/Logo.jsx b/net/web/src/logo/Logo.tsx similarity index 83% rename from net/web/src/logo/Logo.jsx rename to net/web/src/logo/Logo.tsx index dde73aea7..ce84861b2 100644 --- a/net/web/src/logo/Logo.jsx +++ b/net/web/src/logo/Logo.tsx @@ -2,8 +2,15 @@ import avatar from 'images/avatar.png'; import appstore from 'images/appstore.png'; import solution from 'images/solution.png'; import team from 'images/team.png'; +interface Props { + url?:string + width?:number|string + height?:number|string + radius?:number + img?:string -export function Logo({ url, width, height, radius, img }) { +} +export function Logo({ url, width, height, radius, img }: Props) { return (
{ img === 'team' && ( diff --git a/net/web/src/reportWebVitals.js b/net/web/src/reportWebVitals.ts similarity index 87% rename from net/web/src/reportWebVitals.js rename to net/web/src/reportWebVitals.ts index 5253d3ad9..2c21a92b8 100644 --- a/net/web/src/reportWebVitals.js +++ b/net/web/src/reportWebVitals.ts @@ -1,4 +1,4 @@ -const reportWebVitals = onPerfEntry => { +const reportWebVitals = (onPerfEntry?) => { if (onPerfEntry && onPerfEntry instanceof Function) { import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { getCLS(onPerfEntry); diff --git a/net/web/src/root/Root.jsx b/net/web/src/root/Root.tsx similarity index 100% rename from net/web/src/root/Root.jsx rename to net/web/src/root/Root.tsx diff --git a/net/web/src/session/Session.styled.js b/net/web/src/session/Session.styled.ts similarity index 100% rename from net/web/src/session/Session.styled.js rename to net/web/src/session/Session.styled.ts diff --git a/net/web/src/session/Session.jsx b/net/web/src/session/Session.tsx similarity index 85% rename from net/web/src/session/Session.jsx rename to net/web/src/session/Session.tsx index 962411fd3..3bf4e29bd 100644 --- a/net/web/src/session/Session.jsx +++ b/net/web/src/session/Session.tsx @@ -33,8 +33,8 @@ export function Session() { const { state, actions } = useSession(); const settings = useContext(SettingsContext); const [ringing, setRinging] = useState([]); - const remote = useRef(); - const local = useRef(); + const remote = useRef(); + const local = useRef(); useEffect(() => { console.log(">> ", state.remoteVideo); @@ -128,10 +128,10 @@ export function Session() { { (state.display === 'xlarge') && ( -
-
+
+
-
+
{ state.loading && ( - -
-
+
+
{ state.conversation && ( -
+
)} { state.contact && ( -
+
)} { state.profile && ( -
+
)}
-
+
{ (state.conversation || state.details) && ( -
+
+ // cardId={state.cardId} channelId={state.channelId} + />
)} { state.cards && ( -
+
)} { (state.profile || state.account) && ( -
+
)} @@ -192,10 +193,10 @@ export function Session() {
)} { (state.display === 'large' || state.display === 'medium') && ( -
-
+
+
-
+
{ state.loading && ( - -
-
+
+
{ state.conversation && ( -
+
@@ -223,7 +224,9 @@ export function Session() { onClose={actions.closeDetails} visible={state.details} zIndex={10}> { state.details && (
+ // cardId={state.cardId} + // channelId={state.channelId} + /> )} @@ -250,9 +253,9 @@ export function Session() {
)} { (state.display === 'small') && ( -
-
-
+
+
+
{ state.conversation && ( -
+
)} { state.details && ( -
+
+ // cardId={state.cardId} channelId={state.channelId} + />
)} { state.cards && ( -
+
)} { state.listing && ( -
+
)} { state.contact && ( -
+
)} { state.loading && ( - - +
@@ -324,15 +331,15 @@ export function Session() {
)} { state.remoteStream && ( -