Skip to content

Commit

Permalink
Update app icon, manifest name, and add attributions page
Browse files Browse the repository at this point in the history
  • Loading branch information
sjkneisler committed Mar 22, 2024
1 parent 3fe3216 commit a74394b
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 27 deletions.
Binary file modified app/public/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion app/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
name="description"
content="Scheduling tool for recurring weekly events"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo128.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand Down
Binary file added app/public/logo128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/public/logo192.png
Binary file not shown.
Binary file modified app/public/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions app/public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"short_name": "TTRPG Scheduler",
"name": "TTRPG Scheduler",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"src": "logo128.png",
"type": "image/png",
"sizes": "192x192"
"sizes": "128x128"
},
{
"src": "logo512.png",
Expand Down
5 changes: 5 additions & 0 deletions app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { CampaignView } from './components/CampaignView';
import { ExceptionsCalendar } from './components/ExceptionsCalendar';
import { AggregateExceptionsCalendar } from './components/AggregateExceptionsCalendar';
import { NewUserPage } from './components/NewUserPage';
import { AttributionsPage } from './components/AttributionsPage';

const router = createBrowserRouter([
{
Expand All @@ -34,6 +35,10 @@ const router = createBrowserRouter([
path: '/schedule/:scheduleInviteCode/user/:userId/exceptions',
element: <ExceptionsCalendar />,
},
{
path: '/attributions',
element: <AttributionsPage />,
},
]);

function App() {
Expand Down
32 changes: 32 additions & 0 deletions app/src/components/AttributionsPage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import React from 'react';
import { Box, Container, Link, Stack } from '@mui/material';
import { PageContainer } from './PageContainer';

export const AttributionsPage: React.FC = () => {
return (
<PageContainer>
<Container>
<Box>
{' '}
<Link
display="inline"
href="https://www.iconfinder.com/icons/299092/calendar_icon"
>
Calendar Icon
</Link>{' '}
by{' '}
<Link display="inline" href="https://www.iconfinder.com/paomedia">
Paomedia
</Link>{' '}
is licensed under{' '}
<Link
display="inline"
href="https://creativecommons.org/licenses/by/3.0/"
>
CC BY 3.0
</Link>
</Box>
</Container>
</PageContainer>
);
};
70 changes: 48 additions & 22 deletions app/src/components/TopBar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
/** @jsxImportSource @emotion/react */
import { AppBar, Button, ButtonBase, Toolbar, Typography } from '@mui/material';
import {
AppBar,
Box,
Button,
ButtonBase,
Container,
Stack,
Toolbar,
Typography,
} from '@mui/material';
import { css } from '@emotion/react';
import React from 'react';
import { Link } from 'react-router-dom';
Expand All @@ -17,27 +26,44 @@ export const TopBar: React.FC = () => {
flex: 0 0 auto;
`}
>
<Toolbar
css={css`
gap: 30px;
`}
>
<ButtonBase component={Link} to="/">
<Typography variant="h4">TTRPG Scheduler</Typography>
</ButtonBase>
{schedule && (
<ButtonBase component={Link} to={`/schedule/${schedule?.inviteCode}`}>
<Typography variant="h5">Schedule: {schedule.name}</Typography>
</ButtonBase>
)}
{schedule && user && (
<ButtonBase
component={Link}
to={`/schedule/${schedule.inviteCode}/user/${user.id}`}
>
<Typography variant="h5">User: {user.name}</Typography>
</ButtonBase>
)}
<Toolbar disableGutters>
<Container maxWidth={false}>
<Stack direction="row" justifyContent="space-between">
<Stack
direction="row"
css={css`
gap: 30px;
`}
>
<ButtonBase component={Link} to="/">
<Typography variant="h4">TTRPG Scheduler</Typography>
</ButtonBase>
{schedule && (
<ButtonBase
component={Link}
to={`/schedule/${schedule?.inviteCode}`}
>
<Typography variant="h5">
Schedule: {schedule.name}
</Typography>
</ButtonBase>
)}
{schedule && user && (
<ButtonBase
component={Link}
to={`/schedule/${schedule.inviteCode}/user/${user.id}`}
>
<Typography variant="h5">User: {user.name}</Typography>
</ButtonBase>
)}
</Stack>
<Box alignContent="center">
<ButtonBase component={Link} to="/attributions">
<Typography variant="body2">Attributions</Typography>
</ButtonBase>
</Box>
</Stack>
</Container>
</Toolbar>
</AppBar>
);
Expand Down

0 comments on commit a74394b

Please sign in to comment.