Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update dependencies #383

Merged
merged 1 commit into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,877 changes: 1,323 additions & 1,554 deletions client/package-lock.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@
"dependencies": {
"@chat-e2ee/service": "file:../service",
"qrcode.react": "^4.0.1",
"react": "^16.13.1",
"react-bootstrap": "^1.5.2",
"react-dom": "^16.13.1",
"react-icons": "^3.10.0",
"react-router-dom": "^5.2.0"
"react": "^18.3.1",
"react-bootstrap": "^2.10.4",
"react-dom": "^18.3.1",
"react-icons": "^5.3.0",
"react-router-dom": "^6.26.2"
},
"devDependencies": {
"react-scripts": "^5.0.1",
"typescript-plugin-css-modules": "^5.0.1",
"@types/jest": "^29.5.2",
"@types/node": "^20.2.5",
"@types/react": "^18.2.9",
"@types/react-dom": "^18.2.4",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"typescript-plugin-css-modules": "^5.1.0",
"@types/jest": "^29.5.13",
"@types/node": "^22.6.1",
"@types/react": "^18.3.8",
"@types/react-dom": "^18.3.0",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/react-router-dom": "^5.3.3",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-promise": "4.1.1",
"eslint-plugin-react": "7.31.11",
"eslint-plugin-react-hooks": "^4.6.0",
"html-webpack-plugin": "^5.5.1",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-promise": "7.1.0",
"eslint-plugin-react": "7.36.1",
"eslint-plugin-react-hooks": "^4.6.2",
"html-webpack-plugin": "^5.6.0",
"typescript": "^4.9.5"
},
"scripts": {
Expand Down
10 changes: 5 additions & 5 deletions client/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ChatLink from "./pages/chatlink";
import Messaging from "./pages/messaging";
import { ThemeProvider, ThemeContext } from "./ThemeContext";

import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
import { BrowserRouter as Router, Route, Routes } from "react-router-dom";

const App = () => {
const [darkMode] = useContext(ThemeContext);
Expand All @@ -18,10 +18,10 @@ const App = () => {
>
<Router>
<div className={styles.bodyContent}>
<Switch>
<Route exact path="/" component={ChatLink} />
<Route exact path="/chat/:channelID" component={Messaging} />
</Switch>
<Routes>
<Route path="/" element={<ChatLink />} />
<Route path="/chat/:channelID" element={<Messaging />} />
</Routes>
</div>
</Router>
</div>
Expand Down
9 changes: 5 additions & 4 deletions client/src/pages/messaging/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useCallback, useContext, useEffect, useRef, useState } from 'react';
import { useHistory, useParams } from 'react-router-dom';
import { useNavigate, useParams } from 'react-router-dom';

import {
createChatInstance, utils, TypeUsersInChannel, setConfig
Expand Down Expand Up @@ -48,12 +48,13 @@ const Chat = () => {
const [deliveredID, setDeliveredID] = useState<string[]>([]);
const [darkMode] = useContext(ThemeContext);
const [linkActive, setLinkActive] = useState(true);
const history = useHistory();
const navigate = useNavigate();

const myKeyRef = useRef<{ privateKey?: string } | null>();
const notificationTimer = useRef<number | undefined>(undefined);

const { channelID }: { channelID: string } = useParams();
const params = useParams<{ channelID: string }>();
const channelID = params.channelID;

let userId = getUserSessionID(channelID);
// if not in session, lets create one and store.
Expand Down Expand Up @@ -163,7 +164,7 @@ const Chat = () => {
const handleDeleteLink = async () => {
setLinkActive(false);
await chate2ee.delete();
history.push("/");
navigate("/");
};

const initChat = async () => {
Expand Down
Loading
Loading