ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-14 17:41:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

links: use tabbar in links-list, settings

Browse Source
This commit is contained in:
Matilde Park 2020-08-19 21:44:45 -04:00
parent 1fd147f6cb
commit ffadf5718d
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/interface/src/views/apps/links/components/links-list.js
View File

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { LoadingScreen } from './loading'; import { LoadingScreen } from './loading';
import { MessageScreen } from './lib/message-screen'; import { MessageScreen } from './lib/message-screen';
import { LinksTabBar } from './lib/links-tabbar'; import { TabBar } from '~/views/components/chat-link-tabbar';
import { SidebarSwitcher } from '~/views/components/SidebarSwitch'; import { SidebarSwitcher } from '~/views/components/SidebarSwitch';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { LinkItem } from './lib/link-item'; import { LinkItem } from './lib/link-item';
@ -127,11 +127,11 @@ export class Links extends Component {
{props.resource.metadata.title} {props.resource.metadata.title}
</h2> </h2>
</Link> </Link>
<LinksTabBar <TabBar
{...props} location={props.location}
popout={props.popout} popout={props.popout}
page={props.page} popoutHref={makeRoutePath(props.resourcePath, true, props.page)}
resourcePath={props.resourcePath} settings={makeRoutePath(props.resourcePath, props.popout) + '/settings'}
/> />
</div> </div>
<div className="w-100 mt6 flex justify-center overflow-y-scroll ph4 pb4"> <div className="w-100 mt6 flex justify-center overflow-y-scroll ph4 pb4">

18
pkg/interface/src/views/apps/links/components/settings.js
View File

@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
import { LoadingScreen } from './loading'; import { LoadingScreen } from './loading';
import { Spinner } from '~/views/components/Spinner'; import { Spinner } from '~/views/components/Spinner';
import { LinksTabBar } from './lib/links-tabbar'; import { TabBar } from '~/views/components/chat-link-tabbar';
import SidebarSwitcher from '~/views/components/SidebarSwitch'; import SidebarSwitcher from '~/views/components/SidebarSwitch';
import { MetadataSettings } from '~/views/components/metadata/settings'; import { MetadataSettings } from '~/views/components/metadata/settings';
@ -154,7 +154,12 @@ export class SettingsScreen extends Component {
{props.resource.metadata.title} {props.resource.metadata.title}
</h2> </h2>
</Link> </Link>
<LinksTabBar {...props} /> <TabBar
location={props.location}
popout={props.popout}
popoutHref={makeRoutePath(props.resourcePath, true, props.page)}
settings={makeRoutePath(props.resourcePath, props.popout) + '/settings'}
/>
</div> </div>
<div className="w-100 pl3 mt4 cf"> <div className="w-100 pl3 mt4 cf">
<h2 className="f8 pb2">Removing...</h2> <h2 className="f8 pb2">Removing...</h2>
@ -190,8 +195,13 @@ export class SettingsScreen extends Component {
{props.resource.metadata.title} {props.resource.metadata.title}
</h2> </h2>
</Link> </Link>
<LinksTabBar {...props} /> <TabBar
</div> location={props.location}
popout={props.popout}
popoutHref={makeRoutePath(props.resourcePath, true, props.page)}
settings={makeRoutePath(props.resourcePath, props.popout) + '/settings'}
/>
</div>
<div className="w-100 pl3 mt4 cf"> <div className="w-100 pl3 mt4 cf">
<h2 className="f8 pb2">Collection Settings</h2> <h2 className="f8 pb2">Collection Settings</h2>
<p className="f8 mt3 lh-copy db">Mark all links as read</p> <p className="f8 mt3 lh-copy db">Mark all links as read</p>