Package upgrade (#188)

* package-upgrade

* fix type problems

* Delete package-lock.json

* Package upgrade feat (#189)

* add meta keywords tag back

* add basic impressum

* Package upgrade feat2 (#190)

* add meta keywords tag back

* add basic impressum

* extend impressum to lobby and room too

index.html

@@ -8,6 +8,7 @@
 		/>
 		<meta name='description' content='edumeet - Simple web meetings'>
 		<meta name='theme-color' content='#000000' />
+		<meta name="keywords" content="edumeet,letsmeet,multiparty,videoconference,meet,WebRTC,room,rooms,geant,video conferencing, video conference, online meetings, web meeting, video meeting, cloud meeting, cloud video, group video call, group video chat, screen share, application share, mobility, mobile collaboration, desktop share, video collaboration">
 
 		<link rel='preconnect' href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
 		<link rel='shortcut icon' href='/images/favicon.ico' />

package.json

@@ -6,44 +6,44 @@
 	"author": "Håvar Aambø Fosstveit <[email protected]>",
 	"license": "MIT",
 	"dependencies": {
-		"@emotion/cache": "^11.11.0",
-		"@emotion/react": "^11.11.1",
-		"@emotion/styled": "^11.11.0",
-		"@feathersjs/authentication-client": "^5.0.11",
-		"@feathersjs/feathers": "^5.0.11",
-		"@feathersjs/rest-client": "^5.0.11",
-		"@mui/icons-material": "^5.14.16",
-		"@mui/material": "^5.14.16",
-		"@observertc/client-monitor-js": "^3.5.0",
+		"@emotion/cache": "^11.13.1",
+		"@emotion/react": "^11.13.3",
+		"@emotion/styled": "^11.13.0",
+		"@feathersjs/authentication-client": "^5.0.30",
+		"@feathersjs/feathers": "^5.0.30",
+		"@feathersjs/rest-client": "^5.0.30",
+		"@mui/icons-material": "^5.16.7",
+		"@mui/material": "^5.16.7",
+		"@observertc/client-monitor-js": "^3.11.0",
 		"@observertc/samples-encoder": "^2.2.12",
 		"@reduxjs/toolkit": "^1.9.7",
 		"awaitqueue": "^3.0.2",
 		"bowser": "^2.11.0",
-		"debug": "^4.3.4",
-		"dompurify": "^3.0.6",
+		"debug": "^4.3.7",
+		"dompurify": "^3.1.6",
 		"file-saver": "^2.0.5",
 		"fscreen": "^1.2.0",
 		"hark": "^1.2.3",
-		"marked": "^9.1.4",
-		"mediasoup-client": "^3.7.3",
+		"marked": "^9.1.6",
+		"mediasoup-client": "^3.7.16",
 		"native-file-system-adapter": "^3.0.1",
 		"notistack": "^3.0.1",
-		"ortc-p2p": "havfo/ortc-p2p#0.1.1",
+		"ortc-p2p": "github:havfo/ortc-p2p#0.1.1",
 		"random-string": "^0.2.0",
-		"react": "^18.2.0",
-		"react-dom": "^18.2.0",
-		"react-flip-toolkit": "^7.1.0",
-		"react-intl": "^6.5.1",
+		"react": "^18.3.1",
+		"react-dom": "^18.3.1",
+		"react-flip-toolkit": "^7.2.4",
+		"react-intl": "^6.7.0",
 		"react-qrcode-logo": "^3.0.0",
 		"react-redux": "^8.1.3",
-		"react-router-dom": "^6.18.0",
+		"react-router-dom": "^6.26.2",
 		"redux-logger": "^3.0.6",
 		"redux-persist": "^6.0.0",
 		"reselect": "^4.1.8",
-		"socket.io-client": "^4.7.4",
-		"typescript": "^5.2.2",
+		"socket.io-client": "^4.8.0",
+		"typescript": "^5.6.2",
 		"uuid": "^9.0.1",
-		"webtorrent": "^2.1.27"
+		"webtorrent": "^2.5.1"
 	},
 	"scripts": {
 		"start": "vite",
@@ -64,29 +64,29 @@
 		]
 	},
 	"devDependencies": {
-		"@types/debug": "^4.1.10",
-		"@types/dompurify": "^3.0.4",
-		"@types/file-saver": "^2.0.6",
-		"@types/fscreen": "^1.0.3",
-		"@types/hark": "^1.2.4",
-		"@types/node": "^20.8.10",
+		"@types/debug": "^4.1.12",
+		"@types/dompurify": "^3.0.5",
+		"@types/file-saver": "^2.0.7",
+		"@types/fscreen": "^1.0.4",
+		"@types/hark": "^1.2.5",
+		"@types/node": "^20.16.5",
 		"@types/random-string": "^0.0.30",
-		"@types/react": "^18.2.33",
-		"@types/react-dom": "^18.2.14",
-		"@types/react-redux": "^7.1.28",
-		"@types/redux-logger": "^3.0.11",
+		"@types/react": "^18.3.8",
+		"@types/react-dom": "^18.3.0",
+		"@types/react-redux": "^7.1.33",
+		"@types/redux-logger": "^3.0.13",
 		"@types/sdp-transform": "^2.4.9",
 		"@types/ua-parser-js": "^0.7.39",
-		"@types/uuid": "^9.0.6",
-		"@types/webtorrent": "^0.109.5",
-		"@typescript-eslint/eslint-plugin": "^6.9.1",
-		"@typescript-eslint/parser": "^6.9.1",
-		"@vitejs/plugin-basic-ssl": "^1.0.1",
-		"@vitejs/plugin-react": "^4.1.0",
-		"eslint": "^8.52.0",
-		"eslint-plugin-react": "^7.33.2",
-		"vite": "^4.5.0",
+		"@types/uuid": "^9.0.8",
+		"@types/webtorrent": "^0.109.8",
+		"@typescript-eslint/eslint-plugin": "^6.21.0",
+		"@typescript-eslint/parser": "^6.21.0",
+		"@vitejs/plugin-basic-ssl": "^1.1.0",
+		"@vitejs/plugin-react": "^4.3.1",
+		"eslint": "^8.57.1",
+		"eslint-plugin-react": "^7.36.1",
+		"vite": "^4.5.5",
 		"vite-plugin-eslint": "^1.8.1",
-		"vite-tsconfig-paths": "^4.2.1"
+		"vite-tsconfig-paths": "^4.3.2"
 	}
 }

public/config/config.example.js

@@ -9,6 +9,8 @@
 var config = {
 	// Location of management service.
 	managementUrl: 'http://localhost:3030',
+	// Location of the privacy files.
+	impressumUrl: '/privacy/privacy.html',
 	// If ability to log in is enabled.
 	loginEnabled: true,
 

src/components/controlbuttons/ImpressumButton.tsx

@@ -0,0 +1,28 @@
+import InfoIcon from '@mui/icons-material/Info';
+import React from 'react';
+import { Box, Button } from '@mui/material';
+import { styled } from '@mui/material/styles';
+import edumeetConfig from '../../utils/edumeetConfig';
+
+const ImpressumContainer = styled(Box)(({ theme }) => ({
+	position: 'absolute',
+	bottom: theme.spacing(1.5),
+	left: theme.spacing(1.5),
+	color: 'white',
+}));
+
+const impressumUrl = edumeetConfig.impressumUrl;
+
+const ImpressumButton: React.FC = () => {
+	return (
+		<div>
+			<ImpressumContainer>
+				<Button target="_blank" href={impressumUrl} variant="text" color="primary" title='Privacy info' >
+					<InfoIcon />
+				</Button>
+			</ImpressumContainer>
+		</div>
+	);
+};
+
+export default ImpressumButton;

src/components/controlbuttons/WebcamPreviewButton.tsx

@@ -36,7 +36,7 @@ const WebcamPreviewButton = (props: ControlButtonProps): JSX.Element => {
 		<ControlButton
 			toolTip={webcamTip}
 			onClick={() => {
-				if (webcamState === 'unsupported') return;
+				// if (webcamState === 'unsupported') return;
 
 				if (webcamState === 'off') {
 					dispatch(updatePreviewWebcam({ newDeviceId: videoDevice }));

src/components/helpdialog/HelpDialog.tsx

@@ -5,6 +5,7 @@ import { uiActions } from '../../store/slices/uiSlice';
 import { closeLabel } from '../translated/translatedComponents';
 import ShortcutKeys from './ShortcutKeys';
 import GenericDialog from '../genericdialog/GenericDialog';
+import ImpressumButton from '../controlbuttons/ImpressumButton';
 
 const HelpDialog = (): JSX.Element => {
 	const dispatch = useAppDispatch();
@@ -21,7 +22,7 @@ const HelpDialog = (): JSX.Element => {
 			open={ helpOpen }
 			onClose={ handleCloseHelp }
 			maxWidth='xs'
-			content={ <ShortcutKeys /> }
+			content={ <><ShortcutKeys /><ImpressumButton /></> }
 			actions={
 				<Button
 					onClick={ handleCloseHelp }

src/store/store.tsx

@@ -4,6 +4,7 @@ import {
 	ThunkAction,
 	Action,
 } from '@reduxjs/toolkit';
+import * as Redux from 'redux';
 import { createLogger } from 'redux-logger';
 import {
 	persistStore,
@@ -152,8 +153,8 @@ export const store = configureStore({
 				duration: true,
 				timestamp: false,
 				level: 'log',
-				logErrors: true,
-			}) ] : []))
+				logErrors: true
+			}) as Redux.Middleware ] : []))
 });
 
 export const persistor = persistStore(store);

src/utils/types.tsx

@@ -3,6 +3,7 @@ import { TFLite } from '../services/effectsService';
 
 export const defaultEdumeetConfig: EdumeetConfig = {
 	managementUrl: undefined,
+	impressumUrl: '/privacy/privacy.html',
 	loginEnabled: false,
 	developmentPort: 8443,
 	productionPort: 443,
@@ -94,6 +95,7 @@ export const defaultEdumeetConfig: EdumeetConfig = {
 
 export interface EdumeetConfig {
 	managementUrl?: string;
+	impressumUrl: string;
 	loginEnabled: boolean;
 	developmentPort: number;
 	productionPort: number;

src/views/join/Join.tsx

@@ -18,6 +18,7 @@ import { meActions } from '../../store/slices/meSlice';
 import AudioOutputChooser from '../../components/devicechooser/AudioOutputChooser';
 import { canSelectAudioOutput } from '../../store/selectors';
 import TestAudioOutputButton from '../../components/audiooutputtest/AudioOutputTest';
+import ImpressumButton from '../../components/controlbuttons/ImpressumButton';
 
 interface JoinProps {
 	roomId: string;
@@ -84,14 +85,15 @@ const Join = ({ roomId }: JoinProps): React.JSX.Element => {
 				</>
 			}
 			actions={
-				<Button
+				<><ImpressumButton /><Button
 					onClick={handleJoin}
 					variant='contained'
 					disabled={!displayName || joinInProgress || mediaLoading}
 					size='small'
 				>
-					{ joinLabel() }
-				</Button>
+					{joinLabel()}
+				</Button></>
+
 			}
 		/>
 	);

src/views/landingpage/LandingPage.tsx

@@ -8,8 +8,10 @@ import GenericDialog from '../../components/genericdialog/GenericDialog';
 import StyledBackground from '../../components/StyledBackground';
 import PrecallTitle from '../../components/precalltitle/PrecallTitle';
 import { QRCode } from 'react-qrcode-logo';
+import ImpressumButton from '../../components/controlbuttons/ImpressumButton';
 import edumeetConfig from '../../utils/edumeetConfig';
 
+
 const LandingPage = (): JSX.Element => {
 	const navigate = useNavigate();
 	const randomizeOnBlank = edumeetConfig.randomizeOnBlank;
@@ -35,14 +37,15 @@ const LandingPage = (): JSX.Element => {
 
 				}
 				actions={
-					<Button
-						onClick={onClicked}
-						variant='contained'
-						disabled={!roomId}
-						size='small'
-					>
-						{ joinLabel()}
-					</Button>
+					<><ImpressumButton />
+						<Button
+							onClick={onClicked}
+							variant='contained'
+							disabled={!roomId}
+							size='small'
+						>
+							{ joinLabel()}
+						</Button></>
 				}
 			/>