Merge pull request 'logout will redirect to startpage (fix #126)' (#127) from bugfix/redirectToStartIfLogout into main
Reviewed-on: #127
This commit is contained in:
commit
a4a80123c8
3 changed files with 26 additions and 30 deletions
|
@ -30,7 +30,7 @@
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-wrap: wrap;
|
||||
min-width: 60%;
|
||||
min-width: 50%;
|
||||
}
|
||||
|
||||
.hero-btns .btn {
|
||||
|
|
|
@ -59,35 +59,32 @@ function Navbar() {
|
|||
</li>
|
||||
{isLoggedIn ? (
|
||||
<li className="nav-item">
|
||||
<Link
|
||||
to="/logout"
|
||||
className="nav-links"
|
||||
onClick={() => logout()}
|
||||
>
|
||||
Abmelden
|
||||
</Link>
|
||||
<>
|
||||
<Link to="/" className="nav-links" onClick={() => logout()}>
|
||||
Abmelden
|
||||
</Link>
|
||||
</>
|
||||
</li>
|
||||
) : (
|
||||
<>
|
||||
<li className="nav-item">
|
||||
<Link
|
||||
to="/login"
|
||||
className="nav-links"
|
||||
onClick={closeMobileMenu}
|
||||
>
|
||||
Anmelden
|
||||
</Link>
|
||||
</li>
|
||||
<li className="nav-item">
|
||||
<Link
|
||||
to="/register"
|
||||
className="nav-links"
|
||||
onClick={closeMobileMenu}
|
||||
>
|
||||
Registrieren
|
||||
</Link>
|
||||
</li>
|
||||
|
||||
<li className="nav-item">
|
||||
<Link
|
||||
to="/login"
|
||||
className="nav-links"
|
||||
onClick={closeMobileMenu}
|
||||
>
|
||||
Anmelden
|
||||
</Link>
|
||||
</li>
|
||||
<li className="nav-item">
|
||||
<Link
|
||||
to="/register"
|
||||
className="nav-links"
|
||||
onClick={closeMobileMenu}
|
||||
>
|
||||
Registrieren
|
||||
</Link>
|
||||
</li>
|
||||
</>
|
||||
)}
|
||||
<li>
|
||||
|
|
|
@ -12,7 +12,6 @@ import { Logger } from "@behametrics/logger-web";
|
|||
import { Redirect } from "react-router";
|
||||
|
||||
export default function Umfrage() {
|
||||
|
||||
/* values from survey */
|
||||
const [age, setAge] = useState("");
|
||||
const [gender, setGender] = useState("");
|
||||
|
@ -123,8 +122,8 @@ export default function Umfrage() {
|
|||
<p>
|
||||
Super, die Registrierung hat funktioniert! Du bist nun eingeloggt und
|
||||
ich erfasse deine Tastaturanschläge und die Mausbewegungen. Wenn du
|
||||
dich wieder abmelden möchtest, kannst du das{" "}
|
||||
<Link to="/logout">hier</Link> machen.
|
||||
dich wieder abmelden möchtest, kannst du das <Link to="/">hier</Link>{" "}
|
||||
machen.
|
||||
</p>
|
||||
<p>
|
||||
Damit ich etwas über die Studienteilnehmenden erfahre, möchte ich hier
|
||||
|
|
Loading…
Reference in a new issue