luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

/shared for shared boards

Browse source
This commit is contained in:
Chen-I Lim 2021-01-14 11:33:07 -08:00
parent 0450a03971
commit eecf134b3f
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/app.tsx
View file

@ -65,6 +65,12 @@ export default class App extends React.PureComponent<unknown, State> {
<Route path='/register'>
<RegisterPage/>
</Route>
<Route path='/shared'>
<BoardPage
readonly={true}
setLanguage={this.setAndStoreLanguage}
/>
</Route>
<Route path='/board'>
{this.state.initialLoad && !this.state.user && <Redirect to='login'/>}
<BoardPage setLanguage={this.setAndStoreLanguage}/>

1
webapp/src/components/shareBoardComponent.tsx
View file

@ -47,6 +47,7 @@ class ShareBoardComponent extends React.PureComponent<Props, State> {
const readToken = (sharing && isSharing) ? sharing.token : ''
const shareUrl = new URL(window.location.toString())
shareUrl.searchParams.set('r', readToken)
shareUrl.pathname = '/shared'
let stateDescription: string
if (isSharing) {

12
webapp/src/pages/boardPage.tsx
View file

@ -12,6 +12,7 @@ import {BoardTree, MutableBoardTree} from '../viewModel/boardTree'
import {MutableWorkspaceTree, WorkspaceTree} from '../viewModel/workspaceTree'
type Props = {
readonly?: boolean
setLanguage: (lang: string) => void
}
@ -20,7 +21,6 @@ type State = {
viewId: string
workspaceTree: WorkspaceTree
boardTree?: BoardTree
readonly: boolean
}
export default class BoardPage extends React.Component<Props, State> {
@ -31,13 +31,11 @@ export default class BoardPage extends React.Component<Props, State> {
const queryString = new URLSearchParams(window.location.search)
const boardId = queryString.get('id') || ''
const viewId = queryString.get('v') || ''
const readonly = Boolean(queryString.get('r'))
this.state = {
boardId,
viewId,
workspaceTree: new MutableWorkspaceTree(),
readonly,
}
Utils.log(`BoardPage. boardId: ${boardId}`)
@ -76,7 +74,7 @@ export default class BoardPage extends React.Component<Props, State> {
return
}
if (this.state.readonly) {
if (this.props.readonly) {
return
}
@ -143,7 +141,7 @@ export default class BoardPage extends React.Component<Props, State> {
this.setSearchText(text)
}}
setLanguage={this.props.setLanguage}
readonly={this.state.readonly}
readonly={this.props.readonly || false}
/>
</div>
)
@ -255,7 +253,7 @@ export default class BoardPage extends React.Component<Props, State> {
if (boardId) {
newUrl += `?id=${encodeURIComponent(boardId)}`
if (this.state.readonly) {
if (this.props.readonly) {
newUrl += '&r=1'
}
}
@ -273,7 +271,7 @@ export default class BoardPage extends React.Component<Props, State> {
}
let newUrl = window.location.protocol + '//' + window.location.host + window.location.pathname + `?id=${encodeURIComponent(boardId)}&v=${encodeURIComponent(viewId)}`
if (this.state.readonly) {
if (this.props.readonly) {
newUrl += '&r=1'
}
window.history.pushState({path: newUrl}, '', newUrl)