ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-25 07:52:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dist' of github.com:urbit/urbit into dist

Browse Source
This commit is contained in:
Ted Blackman 2021-09-27 20:40:56 -04:00
commit 4cc27ea22e
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/grid/src/state/mock-data.ts
View File

@ -164,6 +164,10 @@ export const mockCharges: Charges = _.reduce(
return { ...acc, [desk]: { ...val, chad: { hung: 'glob failed' } } };
}
if (desk === 'messages') {
return { ...acc, [desk]: { ...val, chad: { install: null } } };
}
return { ...acc, [desk]: { ...val, chad } };
},
{} as Charges
@ -343,7 +347,7 @@ export const mockVat = (desk: string, blockers?: boolean): Vat => ({
desk,
next: blockers ? [{ aeon: 3, weft: { name: 'zuse', kelvin: 419 } }] : [],
ship: '~zod',
paused: false
paused: desk === 'groups'
}
},
hash: '0vh.lhfn6.julg1.fs52d.g2lqj.q5kp0.2o7j3.2bljl.jdm34.hd46v.9uv5v'

45
pkg/grid/src/tiles/Tile.tsx
View File

@ -41,36 +41,33 @@ export const Tile: FunctionComponent<TileProps> = ({ charge, desk }) => {
onAuxClick={() => addRecentApp(desk)}
>
<div>
{loading ? (
<div className="absolute z-10 top-4 left-4 sm:top-8 sm:left-8 flex items-center justify-center">
<Spinner className="h-6 w-6" />
</div>
) : (
<>
{vat?.arak.rail?.paused && (
<Bullet className="absolute z-10 top-5 left-5 sm:top-6 sm:left-7 w-4 h-4 text-orange-500 dark:text-black" />
)}
<TileMenu
desk={desk}
active={active}
menuColor={active ? menuColor : suspendMenuColor}
lightText={lightText}
className="absolute z-10 top-2.5 right-2.5 sm:top-4 sm:right-4 opacity-0 pointer-coarse:opacity-100 hover-none:opacity-100 focus:opacity-100 group-hover:opacity-100"
/>
</>
<div className="absolute z-10 top-4 left-4 sm:top-6 sm:left-6 flex items-center">
{!active && (
<>
{loading && <Spinner className="h-6 w-6 mr-2" />}
<span className="text-gray-500">
{suspended && 'Suspended'}
{loading && 'Installing'}
{hung && 'Errored'}
</span>
</>
)}
</div>
{vat?.arak.rail?.paused && (
<Bullet className="absolute z-10 top-5 left-5 sm:top-7 sm:left-7 w-4 h-4 text-orange-500 dark:text-black" />
)}
<TileMenu
desk={desk}
active={active}
menuColor={active ? menuColor : suspendMenuColor}
lightText={lightText}
className="absolute z-10 top-3 right-3 sm:top-5 sm:right-5 opacity-100 pointer-coarse:opacity-100 hover-none:opacity-100 focus:opacity-100 group-hover:opacity-100"
/>
<div
className="h4 absolute z-10 bottom-[8%] left-[5%] sm:bottom-7 sm:left-5 py-1 px-3 rounded-lg"
style={{ backgroundColor }}
>
<h3 className="mix-blend-hard-light">{title}</h3>
{!active && (
<span className={hung ? 'text-orange-500' : 'text-gray-400'}>
{suspended && 'Suspended'}
{loading && 'Installing'}
{hung && 'Errored'}
</span>
)}
</div>
{image && !loading && (
<img className="absolute top-0 left-0 h-full w-full object-contain" src={image} alt="" />