Skip to content

Commit 10d2818

Browse files
committedJan 9, 2021
Added a footer and replaced "CRM" by the real name of the new system
1 parent a1edc76 commit 10d2818

File tree

7 files changed

+74
-6
lines changed

7 files changed

+74
-6
lines changed
 

‎public/gewis.svg

+29
Loading

‎src/App.scss

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
.main {
22
position: absolute;
33
top: 43px;
4-
height: calc(100vh - 43px);
4+
height: calc(100vh - 43px - 48px);
55
overflow-y: auto;
66
}
77

8+
.footer {
9+
position: absolute;
10+
bottom: 0;
11+
width: 100%;
12+
height: 35px;
13+
}
14+
815
.ui.table.fixed tr > th {
916
overflow: visible;
10-
}
17+
}

‎src/Routes.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import UsersPage from './pages/UsersPage';
3333
import SingleUserPage from './pages/SingleUserPage';
3434
import UserCreatePage from './pages/UserCreatePage';
3535
import ProductInstanceModal from './pages/ProductInstanceModal';
36+
import Footer from './components/navigation/Footer';
3637

3738
interface Props extends RouteComponentProps {
3839
// eslint-disable-next-line react/no-unused-prop-types
@@ -47,7 +48,7 @@ function Routes(props: Props) {
4748
<Dimmer active page inverted>
4849

4950
<Header as="h2" icon>
50-
<Loader inline content="CRM" size="large" />
51+
<Loader inline content="ParelPracht" size="large" />
5152
<Header.Subheader>Checking login information...</Header.Subheader>
5253
</Header>
5354
</Dimmer>
@@ -70,12 +71,15 @@ function Routes(props: Props) {
7071
<Switch>
7172
<Route path="/login" exact>
7273
<LoginPage />
74+
<Footer />
7375
</Route>
7476
<Route path="/forgot-password" exact>
7577
<ForgotPasswordPage />
78+
<Footer />
7679
</Route>
7780
<Route path="/reset-password" exact>
7881
<ResetPasswordPage />
82+
<Footer />
7983
</Route>
8084
</Switch>
8185
);
@@ -168,6 +172,7 @@ function Routes(props: Props) {
168172
<Route path="/user/:userId" exact component={SingleUserPage} />
169173
</Switch>
170174
</Container>
175+
<Footer />
171176
</div>
172177
);
173178
}

‎src/components/alerts/AlertContainer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AlertContainer extends React.Component<AlertsProps> {
1717
<Rail
1818
internal={this.props.internal}
1919
position="right"
20-
style={{ marginTop: this.props.internal ? '2em' : undefined }}
20+
style={{ marginTop: this.props.internal ? '2em' : undefined, maxHeight: 'calc(100vh - 2em)' }}
2121
>
2222
{this.props.alerts.map((alert) => (
2323
<AlertItem

‎src/components/navigation/Footer.tsx

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import React from 'react';
2+
import { Container, Grid, Segment } from 'semantic-ui-react';
3+
4+
function Footer() {
5+
return (
6+
<div className="footer">
7+
<Segment style={{ backgroundColor: '#eee', padding: '0' }} vertical basic>
8+
<Container style={{ padding: '0' }}>
9+
<Grid columns={2}>
10+
<Grid.Column textAlign="left">
11+
© Study Association GEWIS - 2020
12+
</Grid.Column>
13+
<Grid.Column textAlign="right">
14+
Designed and built with
15+
{' '}
16+
<span role="img" aria-label="love">🍑</span>
17+
{' '}
18+
by the 39th board
19+
</Grid.Column>
20+
</Grid>
21+
</Container>
22+
</Segment>
23+
</div>
24+
);
25+
}
26+
27+
export default Footer;

‎src/components/navigation/Navigation.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function Navigation() {
88
<Menu fixed="top" inverted size="large">
99
<Container>
1010
<Menu.Item as={NavLink} header to="/" exact>
11-
CRM
11+
ParelPracht
1212
</Menu.Item>
1313
<Menu.Item as={NavLink} to="/product">
1414
<Icon name="shopping bag" />

‎src/pages/LoginPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function LoginPage() {
1414
<Grid textAlign="center" verticalAlign="middle" style={{ height: '100vh' }}>
1515
<Grid.Column width={6}>
1616
<Header as="h1">
17-
CRM
17+
ParelPracht
1818
</Header>
1919
<Segment>
2020
<LoginForm />

0 commit comments

Comments
 (0)
Please sign in to comment.