Skip to content

Commit 0b8cb5d

Browse files
committed
update paths, set min width on header to prevent icon overlap on small screens
1 parent a9e3b16 commit 0b8cb5d

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import ListTags from './pages/tags/List';
3131
import ListUsers from './pages/users/List';
3232
import NavItems from './components/NavItems';
3333
import NotFound from './pages/NotFound';
34-
import {ReadApp} from './pages/apps/app_detail';
34+
import {ReadApp} from './pages/apps/detail';
3535
import ReadGroup from './pages/groups/Read';
3636
import ReadTag from './pages/tags/Read';
3737
import ReadUser from './pages/users/Read';
@@ -95,7 +95,7 @@ function Dashboard() {
9595
};
9696

9797
return (
98-
<Box sx={{display: 'flex'}}>
98+
<Box sx={{display: 'flex', minWidth: '20rem', overflowX: 'hidden'}}>
9999
<AppBar position="absolute" open={open}>
100100
<Toolbar
101101
sx={{

src/pages/apps/app_detail/app_header.tsx renamed to src/pages/apps/detail/header.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import TagIcon from '@mui/icons-material/LocalOffer';
99
import {useCurrentUser} from '../../../authentication';
1010
import {MoveTooltip} from '.';
1111

12-
interface AppHeaderProps {
12+
interface AppsHeaderProps {
1313
app: App;
1414
moveTooltip: MoveTooltip;
1515
}
1616

17-
const AppHeader: React.FC<AppHeaderProps> = ({app, moveTooltip}) => {
17+
const AppsHeader: React.FC<AppsHeaderProps> = ({app, moveTooltip}) => {
1818
const currentUser = useCurrentUser();
1919
const navigate = useNavigate();
2020

@@ -25,7 +25,8 @@ const AppHeader: React.FC<AppHeaderProps> = ({app, moveTooltip}) => {
2525
<Paper
2626
sx={{
2727
p: 2,
28-
height: 240,
28+
height: '15rem',
29+
minWidth: '20rem',
2930
display: 'flex',
3031
flexDirection: 'column',
3132
justifyContent: 'center',
@@ -73,4 +74,4 @@ const AppHeader: React.FC<AppHeaderProps> = ({app, moveTooltip}) => {
7374
);
7475
};
7576

76-
export default AppHeader;
77+
export default AppsHeader;

src/pages/apps/app_detail/index.tsx renamed to src/pages/apps/detail/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import CreateUpdateApp from '../CreateUpdate';
3131
import DeleteApp from '../Delete';
3232
import NotFound from '../../NotFound';
3333
import Loading from '../../../components/Loading';
34-
import AppHeader from './app_header';
34+
import AppsHeader from './header';
3535

3636
function sortGroupMembers(
3737
[aUserId, aUsers]: [string, Array<OktaUserGroupMember>],
@@ -83,7 +83,7 @@ export const ReadApp = () => {
8383
<React.Fragment>
8484
<Container maxWidth="lg" sx={{mt: 4, mb: 4}}>
8585
<Grid container spacing={3}>
86-
<AppHeader app={app} moveTooltip={moveTooltip} />
86+
<AppsHeader app={app} moveTooltip={moveTooltip} />
8787
{isAccessAdmin(currentUser) || isAppOwnerGroupOwner(currentUser, app.id ?? '') ? (
8888
<Grid item xs={12}>
8989
<Paper

0 commit comments

Comments
 (0)