restore page after login

[alttp.git] / resources / js / components / common / Header.js

diff --git a/resources/js/components/common/Header.js b/resources/js/components/common/Header.js
index d5b4f6cc3dd2cb6eeb0ebb379fb9c2f9e02058a3..6868477b54328a3078e16d8f10103f6ee446f92e 100644 (file)
--- a/resources/js/components/common/Header.js
+++ b/resources/js/components/common/Header.js
@@ -5,11 +5,11 @@ import { LinkContainer } from 'react-router-bootstrap';
 import { withTranslation } from 'react-i18next';
 
 import Icon from './Icon';
+import LanguageSwitcher from './LanguageSwitcher';
+import { getAvatarUrl } from '../../helpers/User';
 import { withUser } from '../../helpers/UserContext';
 import i18n from '../../i18n';
 
-const getAvatarUrl = user => `//cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`;
-
 const Header = ({ doLogout, user }) =>
        <Navbar id="header" bg="dark" variant="dark">
                <Container fluid>
@@ -18,7 +18,22 @@ const Header = ({ doLogout, user }) =>
                                        ALttP
                                </Navbar.Brand>
                        </LinkContainer>
-                       <Nav className="ms-auto">
+                       <Nav>
+                               <LinkContainer to="/tournaments/6">
+                                       <Nav.Link href="/tournaments/6">
+                                               ALttPR Weekly
+                                       </Nav.Link>
+                               </LinkContainer>
+                               <LinkContainer to="/tournaments/5">
+                                       <Nav.Link href="/tournaments/5">
+                                               Super Metroid
+                                       </Nav.Link>
+                               </LinkContainer>
+                       </Nav>
+                       <Navbar.Text className="ms-auto me-2">
+                               <LanguageSwitcher />
+                       </Navbar.Text>
+                       <Nav>
                                {user ?
                                        <>
                                                <LinkContainer to={`/users/${user.id}`}>
@@ -37,7 +52,15 @@ const Header = ({ doLogout, user }) =>
                                                </Button>
                                        </>
                                :
-                                       <Button href="/login" variant="discord">
+                                       <Button
+                                               href="/login"
+                                               onClick={() => {
+                                                       if (location.pathname.length > 1) {
+                                                               localStorage.setItem('returnPath', location.pathname.substr(1));
+                                                       }
+                                               }}
+                                               variant="discord"
+                                       >
                                                <Icon.DISCORD />
                                                {' '}
                                                {i18n.t('button.login')}