update for new router

This commit is contained in:
SrGooglo 2023-01-12 20:24:15 +00:00
parent 72166574c0
commit c2c94c210f
11 changed files with 31 additions and 18 deletions

View File

@ -1,8 +0,0 @@
import React from "react"
import Account from "../account"
export default (props) => {
const username = props.match.params.username
return <Account username={username} />
}

View File

@ -0,0 +1,17 @@
import React from "react"
export default (props) => {
const entryParam = props.params.param
if (entryParam.startsWith("@")) {
const username = entryParam.replace("@", "")
window.app.setLocation(`/account/${username}`, {
state: {
"noTransition": true,
}
})
}
return <div />
}

View File

@ -2,7 +2,7 @@ import React from "react"
import Account from "."
export default (props) => {
const username = props.match.params.username
const username = props.params.username
return <Account username={username} />
}

View File

@ -146,7 +146,9 @@ export default class Account extends React.Component {
}
componentWillUnmount = () => {
this.coverIntersectionObserver.disconnect()
if (this.coverIntersectionObserver) {
this.coverIntersectionObserver.disconnect()
}
}
fetchData = async (username) => {
@ -231,7 +233,7 @@ export default class Account extends React.Component {
}
<div className="panels">
<div
<div
className="leftPanel"
ref={this.leftPanelRef}
>
@ -239,7 +241,7 @@ export default class Account extends React.Component {
user={user}
/>
<div
<div
className="actions"
ref={this.actionsRef}
>

View File

@ -13,7 +13,7 @@ import "./index.less"
export default class Dashboard extends React.Component {
state = {
activeTab: this.props.match.params.type ?? "feed"
activeTab: this.props.params.type ?? "feed"
}
primaryPanelRef = React.createRef()

View File

@ -8,7 +8,7 @@ import "./index.less"
export default class Dashboard extends React.Component {
state = {
activeTab: this.props.match.params.type ?? "feed"
activeTab: this.props.params.type ?? "feed"
}
primaryPanelRef = React.createRef()

View File

@ -1,7 +1,9 @@
import React from "react"
export default () => {
app.setLocation("/home/feed")
app.setLocation("/home/feed", {
"noTransition": true,
})
return <></>
}

0
packages/app/src/pages/index.jsx Executable file → Normal file
View File

View File

@ -192,7 +192,7 @@ export default class StreamViewer extends React.Component {
componentDidMount = async () => {
this.enterPlayerAnimation()
const requestedUsername = this.props.match.params.key
const requestedUsername = this.props.params.key
await this.setState({
requestedUsername,

View File

@ -10,7 +10,7 @@ import "./index.less"
export default class MusicDashboard extends React.Component {
state = {
activeTab: this.props.match.params.type ?? "feed"
activeTab: this.props.params.type ?? "feed"
}
primaryPanelRef = React.createRef()

View File

@ -10,7 +10,7 @@ import "./index.less"
export default class TVDashboard extends React.Component {
state = {
activeTab: this.props.match.params.type ?? "feed"
activeTab: this.props.params.type ?? "feed"
}
primaryPanelRef = React.createRef()