File tree 7 files changed +74
-6
lines changed
7 files changed +74
-6
lines changed Original file line number Diff line number Diff line change 1
1
.main {
2
2
position : absolute ;
3
3
top : 43px ;
4
- height : calc (100vh - 43px );
4
+ height : calc (100vh - 43px - 48 px );
5
5
overflow-y : auto ;
6
6
}
7
7
8
+ .footer {
9
+ position : absolute ;
10
+ bottom : 0 ;
11
+ width : 100% ;
12
+ height : 35px ;
13
+ }
14
+
8
15
.ui.table.fixed tr > th {
9
16
overflow : visible ;
10
- }
17
+ }
Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ import UsersPage from './pages/UsersPage';
33
33
import SingleUserPage from './pages/SingleUserPage' ;
34
34
import UserCreatePage from './pages/UserCreatePage' ;
35
35
import ProductInstanceModal from './pages/ProductInstanceModal' ;
36
+ import Footer from './components/navigation/Footer' ;
36
37
37
38
interface Props extends RouteComponentProps {
38
39
// eslint-disable-next-line react/no-unused-prop-types
@@ -47,7 +48,7 @@ function Routes(props: Props) {
47
48
< Dimmer active page inverted >
48
49
49
50
< Header as = "h2" icon >
50
- < Loader inline content = "CRM " size = "large" />
51
+ < Loader inline content = "ParelPracht " size = "large" />
51
52
< Header . Subheader > Checking login information...</ Header . Subheader >
52
53
</ Header >
53
54
</ Dimmer >
@@ -70,12 +71,15 @@ function Routes(props: Props) {
70
71
< Switch >
71
72
< Route path = "/login" exact >
72
73
< LoginPage />
74
+ < Footer />
73
75
</ Route >
74
76
< Route path = "/forgot-password" exact >
75
77
< ForgotPasswordPage />
78
+ < Footer />
76
79
</ Route >
77
80
< Route path = "/reset-password" exact >
78
81
< ResetPasswordPage />
82
+ < Footer />
79
83
</ Route >
80
84
</ Switch >
81
85
) ;
@@ -168,6 +172,7 @@ function Routes(props: Props) {
168
172
< Route path = "/user/:userId" exact component = { SingleUserPage } />
169
173
</ Switch >
170
174
</ Container >
175
+ < Footer />
171
176
</ div >
172
177
) ;
173
178
}
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ class AlertContainer extends React.Component<AlertsProps> {
17
17
< Rail
18
18
internal = { this . props . internal }
19
19
position = "right"
20
- style = { { marginTop : this . props . internal ? '2em' : undefined } }
20
+ style = { { marginTop : this . props . internal ? '2em' : undefined , maxHeight : 'calc(100vh - 2em)' } }
21
21
>
22
22
{ this . props . alerts . map ( ( alert ) => (
23
23
< AlertItem
Original file line number Diff line number Diff line change
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 ;
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ function Navigation() {
8
8
< Menu fixed = "top" inverted size = "large" >
9
9
< Container >
10
10
< Menu . Item as = { NavLink } header to = "/" exact >
11
- CRM
11
+ ParelPracht
12
12
</ Menu . Item >
13
13
< Menu . Item as = { NavLink } to = "/product" >
14
14
< Icon name = "shopping bag" />
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ function LoginPage() {
14
14
< Grid textAlign = "center" verticalAlign = "middle" style = { { height : '100vh' } } >
15
15
< Grid . Column width = { 6 } >
16
16
< Header as = "h1" >
17
- CRM
17
+ ParelPracht
18
18
</ Header >
19
19
< Segment >
20
20
< LoginForm />
You can’t perform that action at this time.
0 commit comments