Lisa_Stuff/pvtchat
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix frontend errors: downgrade to React 17.

Browse Source
This commit is contained in:
ADAMJR 2022-12-16 01:51:24 +00:00
parent b4c676a21c
commit 81d586e520
7 changed files with 1038 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1178
frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

9
frontend/package.json
View File

@ -14,7 +14,7 @@
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
"@types/node": "^16.18.9",
"@types/react": "^18.0.26",
"@types/react": "^17.0.52",
"@types/react-dom": "^18.0.9",
"axios": "^0.21.1",
"babel-plugin-react-scoped-css": "^1.1.1",
@ -29,9 +29,9 @@
"postcss-cli": "^9.1.0",
"raw-loader": "^4.0.2",
"rc-tooltip": "^5.1.1",
"react": "^18.2.0",
"react": "^17.0.2",
"react-contextmenu": "^2.14.0",
"react-dom": "^18.2.0",
"react-dom": "^17.0.2",
"react-draggable": "^4.4.4",
"react-hook-form": "^7.12.1",
"react-modal": "^3.14.3",
@ -80,6 +80,7 @@
]
},
"devDependencies": {
"@acrd/ion": "github:acrdapp/ion",
"@tailwindcss/jit": "^0.1.10",
"@testing-library/jest-dom": "^5.15.0",
"@types/chance": "^1.1.3",
@ -106,4 +107,4 @@
"@material-ui/core": "^4.12.3",
"fsevents": "^2.3.2"
}
}
}

5
frontend/src/components/utils/dropdown.tsx
View File

@ -5,6 +5,7 @@ import { useSelector } from 'react-redux';
export interface DropdownProps {
title: string;
type: React.FunctionComponent;
children: any;
}
const Dropdown: React.FunctionComponent<DropdownProps> = (props) => {
@ -17,7 +18,7 @@ const Dropdown: React.FunctionComponent<DropdownProps> = (props) => {
<FontAwesomeIcon icon={faChevronDown} />
</div>
{
(dropdown === props.type.name) &&
(dropdown === props.type.name) &&
<div className="absolute bg-bg-floating rounded w-56 p-2 mt-5 z-10">
{props.children}
</div>
@ -25,5 +26,5 @@ const Dropdown: React.FunctionComponent<DropdownProps> = (props) => {
</div>
);
}
export default Dropdown;

2
frontend/src/services/event-service.ts
View File

@ -1,6 +1,6 @@
import { EventEmitter } from 'events';
const events = new EventEmitter();
global['events'] = events;
(global as any)['events'] = events;
export default events;

4
frontend/src/services/mention-service.spec.ts
View File

@ -40,8 +40,8 @@ describe.skip('mention-service', () => {
});
test(fn('toHTML'), () => {
given('<@246688207138279428>').assert('', (val) => expect(val).toContainHTML('data-id="246688207138279428"'));
given('<#246688207138279430>').assert('', (val) => expect(val).toContain('data-id="246688207138279430"'));
given('<@246688207138279428>').assert(async (val) => expect(val).toContainHTML('data-id="246688207138279428"'));
given('<#246688207138279430>').assert(async (val) => expect(val).toContain('data-id="246688207138279430"'));
});
});

1
frontend/src/services/mention-service.ts
View File

@ -1,4 +1,3 @@
import { Entity } from '@acrd/types';
import { getChannel, getChannelByName } from '../store/channels';
import { getTag, getUser, getUserByTag } from '../store/users';

2
frontend/tsconfig.json
View File

@ -11,7 +11,7 @@
"esModuleInterop": true,
"noImplicitAny": false,
"allowSyntheticDefaultImports": true,
"strict": true,
"strict": false,
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"module": "esnext",