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

interface: moved from ~groups url to ~landscape url

Browse Source
This commit is contained in:
Logan Allen 2020-10-06 15:15:31 -05:00
parent bf96c50d4c
commit fb261dc93c
13 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/interface/src/views/apps/chat/components/content/text.js
View File

@ -65,7 +65,7 @@ export default class TextContent extends Component {
return ( return (
<Link <Link
className="bb b--black b--white-d f8 mono lh-copy v-top" className="bb b--black b--white-d f8 mono lh-copy v-top"
to={'/~groups/join/' + group.input}> to={'/~landscape/join/' + group.input}>
{content.text} {content.text}
</Link> </Link>
); );

6
pkg/interface/src/views/apps/chat/components/profile-overlay.js
View File

@ -32,12 +32,12 @@ export class ProfileOverlay extends PureComponent {
const theirStation = `/~${ship}/dm--${window.ship}`; const theirStation = `/~${ship}/dm--${window.ship}`;
if (allStations.indexOf(station) !== -1) { if (allStations.indexOf(station) !== -1) {
history.push(`/~groups/home/resource/chat${station}`); history.push(`/~landscape/home/resource/chat${station}`);
return; return;
} }
if (allStations.indexOf(theirStation) !== -1) { if (allStations.indexOf(theirStation) !== -1) {
history.push(`/~groups/home/resource/chat${theirStation}`); history.push(`/~landscape/home/resource/chat${theirStation}`);
return; return;
} }
@ -58,7 +58,7 @@ export class ProfileOverlay extends PureComponent {
// TODO: make a pretty loading state // TODO: make a pretty loading state
setTimeout(() => { setTimeout(() => {
history.push(`/~groups/home/resource/chat${station}`); history.push(`/~landscape/home/resource/chat${station}`);
}, 5000); }, 5000);
} }

2
pkg/interface/src/views/apps/launch/app.js
View File

@ -62,7 +62,7 @@ export default class LaunchApp extends React.Component {
border={1} border={1}
bg="washedGreen" bg="washedGreen"
borderColor="green" borderColor="green"
to="/~groups/home" to="/~landscape/home"
> >
<Row alignItems="center"> <Row alignItems="center">
<Icon <Icon

2
pkg/interface/src/views/apps/launch/components/Groups.tsx
View File

@ -56,7 +56,7 @@ export default function Groups(props: GroupsProps & Parameters<typeof Box>[0]) {
p={2} p={2}
> >
{groups.map((group) => ( {groups.map((group) => (
<Link to={`/~groups${group["group-path"]}`}> <Link to={`/~landscape${group["group-path"]}`}>
<Box <Box
height="100%" height="100%"
width="100%" width="100%"

3
pkg/interface/src/views/apps/launch/components/welcome.js
View File

@ -25,7 +25,8 @@ export default class Welcome extends React.Component {
<p className="f9 pt2">Since your ID and OS belong to you, it’s up to you to keep them safe. Be sure your ID is somewhere you won’t lose it and you keep your OS on a machine you trust.</p> <p className="f9 pt2">Since your ID and OS belong to you, it’s up to you to keep them safe. Be sure your ID is somewhere you won’t lose it and you keep your OS on a machine you trust.</p>
<p className="f9 pt2">Urbit OS is designed to keep your data secure and hard to lose. But the system is still young — so don’t put anything critical in here just yet.</p> <p className="f9 pt2">Urbit OS is designed to keep your data secure and hard to lose. But the system is still young — so don’t put anything critical in here just yet.</p>
<p className="f9 pt2">To begin exploring, you should probably pop into a chat and verify there are signs of life in this new place. If you were invited by a friend, you probably already have access to a few groups.</p> <p className="f9 pt2">To begin exploring, you should probably pop into a chat and verify there are signs of life in this new place. If you were invited by a friend, you probably already have access to a few groups.</p>
<p className="f9 pt2">If you don't know where to go, feel free to <Link className="no-underline bb b--black b--gray1-d dib" to="/~groups/join/~bitbet-bolbel/urbit-community">join the Urbit Community group</Link>. <p className="f9 pt2">If you don't know where to go, feel free to
<Link className="no-underline bb b--black b--gray1-d dib" to="/~landscape/join/~bitbet-bolbel/urbit-community">join the Urbit Community group</Link>.
</p> </p>
<p className="f9 pt2">Have fun!</p> <p className="f9 pt2">Have fun!</p>
<p className="dib f9 pt2 bb b--black b--gray1-d pointer" <p className="dib f9 pt2 bb b--black b--gray1-d pointer"

2
pkg/interface/src/views/components/leap/Omnibox.js
View File

@ -29,7 +29,7 @@ export class Omnibox extends Component {
componentDidUpdate(prevProps, prevState) { componentDidUpdate(prevProps, prevState) {
if (prevProps !== this.props) { if (prevProps !== this.props) {
const { pathname } = this.props.location; const { pathname } = this.props.location;
const selectedGroup = pathname.startsWith('/~groups/ship/') ? '/' + pathname.split('/').slice(2,5).join('/') : null; const selectedGroup = pathname.startsWith('/~landscape/ship/') ? '/' + pathname.split('/').slice(2,5).join('/') : null;
this.setState({ index: index(this.props.associations, this.props.apps.tiles, selectedGroup) }); this.setState({ index: index(this.props.associations, this.props.apps.tiles, selectedGroup) });
} }

6
pkg/interface/src/views/landscape/components/ChannelMenu.tsx
View File

@ -34,7 +34,7 @@ export function ChannelMenu(props: ChannelMenuProps) {
const history = useHistory(); const history = useHistory();
const { metadata } = association; const { metadata } = association;
const app = metadata.module || association["app-name"]; const app = metadata.module || association["app-name"];
const baseUrl = `/~groups${association?.["group-path"]}/resource/${app}${association["app-path"]}`; const baseUrl = `/~landscape${association?.["group-path"]}/resource/${app}${association["app-path"]}`;
const appPath = association["app-path"]; const appPath = association["app-path"];
const [, ship, name] = appPath.startsWith("/ship/") const [, ship, name] = appPath.startsWith("/ship/")
@ -59,7 +59,7 @@ export function ChannelMenu(props: ChannelMenuProps) {
default: default:
throw new Error("Invalid app name"); throw new Error("Invalid app name");
} }
history.push(`/~groups${association?.["group-path"]}`); history.push(`/~landscape${association?.["group-path"]}`);
}, [api, association]); }, [api, association]);
const onDelete = useCallback(async () => { const onDelete = useCallback(async () => {
@ -77,7 +77,7 @@ export function ChannelMenu(props: ChannelMenuProps) {
default: default:
throw new Error("Invalid app name"); throw new Error("Invalid app name");
} }
history.push(`/~groups${association?.["group-path"]}`); history.push(`/~landscape${association?.["group-path"]}`);
}, [api, association]); }, [api, association]);
return ( return (

2
pkg/interface/src/views/landscape/components/Content.js
View File

@ -40,7 +40,7 @@ export const Content = (props) => {
)} )}
/> />
<Route <Route
path='/~groups' path='/~landscape'
render={p => ( render={p => (
<Landscape <Landscape
history={p.history} history={p.history}

6
pkg/interface/src/views/landscape/components/GroupSwitcher.tsx
View File

@ -59,7 +59,7 @@ function RecentGroups(props: { recent: string[]; associations: Associations }) {
display="block" display="block"
flexShrink='0' flexShrink='0'
/> />
<Link style={{ minWidth: 0 }} to={`/~groups${g}`}> <Link style={{ minWidth: 0 }} to={`/~landscape${g}`}>
<Text verticalAlign='top' maxWidth='100%' overflow='hidden' display='inline-block' style={{ textOverflow: 'ellipsis', whiteSpace: 'pre' }}>{assoc?.metadata?.title}</Text> <Text verticalAlign='top' maxWidth='100%' overflow='hidden' display='inline-block' style={{ textOverflow: 'ellipsis', whiteSpace: 'pre' }}>{assoc?.metadata?.title}</Text>
</Link> </Link>
</Row> </Row>
@ -114,11 +114,11 @@ export function GroupSwitcher(props: {
recent={props.recentGroups} recent={props.recentGroups}
associations={props.associations} associations={props.associations}
/> />
<GroupSwitcherItem to="/~groups/new"> <GroupSwitcherItem to="/~landscape/new">
<Icon mr="2" color="transparent" stroke="gray" icon="Plus" /> <Icon mr="2" color="transparent" stroke="gray" icon="Plus" />
<Text> New Group</Text> <Text> New Group</Text>
</GroupSwitcherItem> </GroupSwitcherItem>
<GroupSwitcherItem to="/~groups/join"> <GroupSwitcherItem to="/~landscape/join">
<Icon mr="2" color="transparent" stroke="gray" icon="Boot" /> <Icon mr="2" color="transparent" stroke="gray" icon="Boot" />
<Text> Join Group</Text> <Text> Join Group</Text>
</GroupSwitcherItem> </GroupSwitcherItem>

4
pkg/interface/src/views/landscape/components/ResourceSkeleton.tsx
View File

@ -51,7 +51,7 @@ export function ResourceSkeleton(props: ResourceSkeletonProps) {
mr={2} mr={2}
display={["block", "none"]} display={["block", "none"]}
> >
<Link to={`/~groups${selectedGroup}`}> {"<- Back"}</Link> <Link to={`/~landscape${selectedGroup}`}> {"<- Back"}</Link>
</Box> </Box>
) : ( ) : (
<Box <Box
@ -61,7 +61,7 @@ export function ResourceSkeleton(props: ResourceSkeletonProps) {
pr={2} pr={2}
mr={2} mr={2}
> >
<Link to={`/~groups${selectedGroup}/resource/${app}${appPath}`}> <Link to={`/~landscape${selectedGroup}/resource/${app}${appPath}`}>
<Text color="blue">Go back to channel</Text> <Text color="blue">Go back to channel</Text>
</Link> </Link>
</Box> </Box>

2
pkg/interface/src/views/landscape/components/Sidebar/Sidebar.tsx
View File

@ -132,7 +132,7 @@ export function Sidebar(props: SidebarProps) {
my={2} my={2}
> >
<Link <Link
to={!!groupPath ? `/~groups${groupPath}/new` : `/~groups/home/new`} to={!!groupPath ? `/~landscape${groupPath}/new` : `/~landscape/home/new`}
> >
<Box <Box
bg="white" bg="white"

2
pkg/interface/src/views/landscape/components/Sidebar/SidebarItem.tsx
View File

@ -71,7 +71,7 @@ export function SidebarItem(props: {
const isSynced = itemStatus !== "unsubscribed"; const isSynced = itemStatus !== "unsubscribed";
const baseUrl = isUnmanaged ? `/~groups/home` : `/~groups${groupPath}`; const baseUrl = isUnmanaged ? `/~landscape/home` : `/~landscape${groupPath}`;
const to = isSynced const to = isSynced
? `${baseUrl}/resource/${module}${appPath}` ? `${baseUrl}/resource/${module}${appPath}`

8
pkg/interface/src/views/landscape/index.tsx
View File

@ -61,26 +61,26 @@ export default class Landscape extends Component<LandscapeProps, {}> {
return ( return (
<Switch> <Switch>
<Route path="/~groups/ship/:host/:name" <Route path="/~landscape/ship/:host/:name"
render={routeProps => { render={routeProps => {
const { const {
host, host,
name name
} = routeProps.match.params as Record<string, string>; } = routeProps.match.params as Record<string, string>;
const groupPath = `/ship/${host}/${name}`; const groupPath = `/ship/${host}/${name}`;
const baseUrl = `/~groups${groupPath}`; const baseUrl = `/~landscape${groupPath}`;
const ws: Workspace = { type: 'group', group: groupPath }; const ws: Workspace = { type: 'group', group: groupPath };
return ( return (
<GroupsPane workspace={ws} baseUrl={baseUrl} {...props} /> <GroupsPane workspace={ws} baseUrl={baseUrl} {...props} />
) )
}}/> }}/>
<Route path="/~groups/home" <Route path="/~landscape/home"
render={routeProps => { render={routeProps => {
const ws: Workspace = { type: 'home' }; const ws: Workspace = { type: 'home' };
return ( return (
<GroupsPane workspace={ws} baseUrl="/~groups/home" {...props} /> <GroupsPane workspace={ws} baseUrl="/~landscape/home" {...props} />
); );
}} }}
/> />