Skip to content

updated packages #40

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.

Sign up for GitHub

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

Open
spassvogel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

updated packages #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8550ebe
updated packages
spassvogel Jan 8, 2023
e7fb67c
updated react-router
spassvogel Jan 8, 2023
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
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@
"@testing-library/react": "^11.2.6",
"@testing-library/user-event": "^13.1.8",
"@wordpress/browserslist-config": "^4.0.1",
"classnames": "^2.3.1",
"classnames": "^2.3.2",
"copy-to-clipboard": "^3.3.1",
"gh-pages": "^3.2.3",
"jszip": "^3.6.0",
"lint-staged": "^11.0.0",
"marked": "^4.0.10",
"node-sass": "^4.0.0",
"marked": "^4.2.5",
"node-sass": "^8.0.0",
"prettier": "^2.3.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-dropzone": "^11.3.4",
"react-json-tree": "^0.15.0",
"react-modal": "^3.14.3",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3"
"react-router-dom": "^6.6.1",
"react-scripts": "^5.0.1"
},
"devDependencies": {
"husky": "^7.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/AboutMe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import CopyToClipboard from 'copy-to-clipboard';
import marked from 'marked';
import { marked } from 'marked';
import React from 'react';
// import ReactDOMServer from 'react-dom/server';

Expand Down
2 changes: 1 addition & 1 deletion src/Messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
import marked from 'marked';
import { marked } from 'marked';
import Modal from 'react-modal';

import './Messages.scss';
Expand Down
75 changes: 40 additions & 35 deletions src/Profile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
import { Routes, Route, BrowserRouter } from 'react-router-dom';
import * as Sentry from '@sentry/browser';
import React, { Suspense, lazy } from 'react';

Expand Down Expand Up @@ -43,7 +43,7 @@ function Profile({ fileDate, images, names, profile }) {
};

return (
<Router>
<BrowserRouter>
<div className="Profile">
<div className="Profile-header">
<div>
Expand Down Expand Up @@ -82,38 +82,43 @@ function Profile({ fileDate, images, names, profile }) {
<Tabs routes={routes} />
</Section>

<Switch>
<Route exact path="/">
<AboutMe user={user} interests={interests} />
</Route>
<Route path="/references">
<Suspense fallback={<Loading>References</Loading>}>
<References
names={names}
references={references}
userId={user?.id}
/>
</Suspense>
</Route>
<Route path="/friends">
<Friends names={names} friends={friends?.friends || []} />
</Route>
<Route path="/messages">
<Suspense fallback={<Loading>Messages</Loading>}>
<Messages
messages={messages?.messages || []}
names={names}
userId={user?.id}
/>
</Suspense>
</Route>
<Route path="/images">
<Images images={images} />
</Route>
<Route path="/raw">
<Raw json={profile} />
</Route>
</Switch>
<Routes>
<Route
exact
path="/"
element={<AboutMe user={user} interests={interests} />}
/>
<Route
path="/references"
element={
<Suspense fallback={<Loading>References</Loading>}>
<References
names={names}
references={references}
userId={user?.id}
/>
</Suspense>
}
/>
<Route
path="/friends"
element={<Friends names={names} friends={friends?.friends || []} />}
/>
<Route
path="/messages"
element={
<Suspense fallback={<Loading>Messages</Loading>}>
<Messages
messages={messages?.messages || []}
names={names}
userId={user?.id}
/>
</Suspense>
}
/>
<Route path="/images" element={<Images images={images} />} />
<Route path="/raw" element={<Raw json={profile} />} />
</Routes>

<div className="promo">
<a
Expand All @@ -129,7 +134,7 @@ function Profile({ fileDate, images, names, profile }) {
</a>
</div>
</div>
</Router>
</BrowserRouter>
);
}

Expand Down
129 changes: 66 additions & 63 deletions src/References.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
import marked from 'marked';
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
import { marked } from 'marked';

import './References.scss';
import { formatDate } from './utils';
Expand Down Expand Up @@ -153,72 +153,75 @@ function References({ references, userId, names }) {
);

return (
<Router>
<Section>
<Heading>References</Heading>
<Content>
<p>
{writtenReferences.length ? (
<Section>
<Heading>References</Heading>
<Content>
<p>
{writtenReferences.length ? (
<>
<strong>{`${writtenReferences.length} written: `}</strong>
{`${countReferences(writtenReferences, 'positive')} positive, `}
{`${countReferences(writtenReferences, 'neutral')} neutral, and `}
{`${countReferences(writtenReferences, 'negative')} negative.`}
</>
) : (
`You didn't write references`
)}
</p>
<p>
{receivedReferences.length ? (
<>
<strong>{`${receivedReferences.length} received: `}</strong>
{`${countReferences(receivedReferences, 'positive')} positive, `}
{`${countReferences(
receivedReferences,
'neutral',
)} neutral, and `}
{`${countReferences(receivedReferences, 'negative')} negative.`}
</>
) : (
`You didn't receive references`
)}
</p>

<Tabs
routes={[
{ route: '/references', label: 'Received references' },
{ route: '/references/written', label: 'Written references' },
]}
/>

<Routes>
<Route
exact
path="/references"
element={
<>
<strong>{`${writtenReferences.length} written: `}</strong>
{`${countReferences(writtenReferences, 'positive')} positive, `}
{`${countReferences(
writtenReferences,
'neutral',
)} neutral, and `}
{`${countReferences(writtenReferences, 'negative')} negative.`}
<h3>Received references</h3>
<ReferencesList
list={receivedReferences}
names={names}
userId={userId}
/>
</>
) : (
`You didn't write references`
)}
</p>
<p>
{receivedReferences.length ? (
}
/>
<Route
path="/references/written"
element={
<>
<strong>{`${receivedReferences.length} received: `}</strong>
{`${countReferences(
receivedReferences,
'positive',
)} positive, `}
{`${countReferences(
receivedReferences,
'neutral',
)} neutral, and `}
{`${countReferences(receivedReferences, 'negative')} negative.`}
<h3>Written references</h3>
<ReferencesList
list={writtenReferences}
names={names}
userId={userId}
/>
</>
) : (
`You didn't receive references`
)}
</p>

<Tabs
routes={[
{ route: '/references', label: 'Received references' },
{ route: '/references/written', label: 'Written references' },
]}
}
/>

<Switch>
<Route exact path="/references">
<h3>Received references</h3>
<ReferencesList
list={receivedReferences}
names={names}
userId={userId}
/>
</Route>
<Route path="/references/written">
<h3>Written references</h3>
<ReferencesList
list={writtenReferences}
names={names}
userId={userId}
/>
</Route>
</Switch>
</Content>
</Section>
</Router>
</Routes>
</Content>
</Section>
);
}

Expand Down
7 changes: 4 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import * as Sentry from '@sentry/browser';

import './index.scss';
Expand All @@ -11,11 +11,12 @@ Sentry.init({
dsn: window.couchspinner_settings?.sentry || '',
});

ReactDOM.render(
const container = document.getElementById('root');
const root = createRoot(container);
root.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById('root'),
);

// If you want your app to work offline and load faster, you can change
Expand Down
4 changes: 1 addition & 3 deletions src/trustroots-tree.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading