diff --git a/src/pages/About.tsx b/src/pages/About.tsx index 5a0dddd..b740cfe 100644 --- a/src/pages/About.tsx +++ b/src/pages/About.tsx @@ -12,18 +12,23 @@ import { withStyles, Typography, Link, - Tooltip + Tooltip, + Button } from '@material-ui/core'; + import OpenInNewIcon from '@material-ui/icons/OpenInNew'; -import DomainIcon from '@material-ui/icons/Domain'; import ChatIcon from '@material-ui/icons/Chat'; import PersonIcon from '@material-ui/icons/Person'; +import AssignmentIcon from '@material-ui/icons/Assignment'; import AssignmentIndIcon from '@material-ui/icons/AssignmentInd'; import NetworkCheckIcon from '@material-ui/icons/NetworkCheck'; import UpdateIcon from '@material-ui/icons/Update'; import InfoIcon from '@material-ui/icons/Info'; import NotesIcon from '@material-ui/icons/Notes'; import CodeIcon from '@material-ui/icons/Code'; +import TicketAccountIcon from 'mdi-material-ui/TicketAccount'; +import MastodonIcon from 'mdi-material-ui/Mastodon'; + import {styles} from './PageLayout.styles'; import {Instance} from '../types/Instance'; import {LinkableIconButton, LinkableAvatar} from '../interfaces/overrides'; @@ -33,7 +38,7 @@ import { getConfig } from '../utilities/settings'; import { License } from '../types/Config'; interface IAboutPageState { - instance?: Instance | any; + instance?: Instance; federated?: boolean; developer?: boolean; hyperspaceAdmin?: UAccount; @@ -64,7 +69,7 @@ class AboutPage extends Component { componentWillMount() { this.client.get('/instance').then((resp: any) => { this.setState({ - instance: resp.data + instance: resp.data as Instance }) }) @@ -95,24 +100,19 @@ class AboutPage extends Component { const { classes } = this.props; return (
- About your instance - - - - - - - - - - - - - - - - - + +
+ + + + {this.state.instance ? this.state.instance.uri: "Loading..."} +
+ @@ -134,6 +134,53 @@ class AboutPage extends Component { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

diff --git a/src/pages/PageLayout.styles.tsx b/src/pages/PageLayout.styles.tsx index 73f1783..82deddd 100644 --- a/src/pages/PageLayout.styles.tsx +++ b/src/pages/PageLayout.styles.tsx @@ -207,4 +207,28 @@ export const styles = (theme: Theme) => createStyles({ width: 'auto', height: 128 }, + instanceHeaderPaper: { + height: 200, + backgroundPosition: "center", + backgroundRepeat: "no-repeat", + backgroundSize: "cover", + position: "relative", + backgroundColor: theme.palette.primary.dark, + borderTopLeftRadius: theme.shape.borderRadius, + borderTopRightRadius: theme.shape.borderRadius + }, + instanceHeaderText: { + position: "absolute", + bottom: theme.spacing.unit, + left: theme.spacing.unit * 2, + color: theme.palette.common.white, + textShadow: `0 0 4px ${theme.palette.grey[700]}`, + fontWeight: 600 + }, + instanceToolbar: { + position: "absolute", + top: theme.spacing.unit, + right: theme.spacing.unit, + color: theme.palette.common.white + } }); \ No newline at end of file