Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion i18n/locales/de/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
"firstName": "Vorname",
"lastName": "Nachname",
"password": "Passwort",
"save": "Speichern"
"save": "Speichern",
"overview": {
"remainingTime": "Verbleibende Zeit vor der automatischen Abmeldung"
}
}
5 changes: 4 additions & 1 deletion i18n/locales/en/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
"firstName": "First Name",
"lastName": "Last Name",
"password": "Password",
"save": "Save"
"save": "Save",
"overview": {
"remainingTime": "Remaining time before auto logout"
}
}
5 changes: 4 additions & 1 deletion i18n/locales/nl/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
"firstName": "Voornaam",
"lastName": "Achternaam",
"password": "Wachtwoord",
"save": "Redden"
"save": "Redden",
"overview": {
"remainingTime": "Verbleibende tijd voor automatische afmelding"
}
}
7 changes: 6 additions & 1 deletion pages/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AxiosError } from "axios"
import type { NextPage } from "next"
import Head from "next/head"
import { useRouter } from "next/router"
import { useCallback, useEffect, useState } from "react"
import { useCallback, useEffect, useRef, useState } from "react"

import { Flow, Messages } from "../pkg"
import { handleFlowError } from "../pkg/errors"
Expand All @@ -18,6 +18,7 @@ import { AdminMessage } from "@/submodules/react-components/types/admin-messages
import { postProcessAdminMessages } from "@/submodules/react-components/helpers/admin-messages-helper"
import AdminMessages from "@/submodules/react-components/components/AdminMessages"
import { useTranslation } from "react-i18next"
import AutoLogoutProgressBar from "@/submodules/react-components/components/AutoLogoutProgressBar"

const Settings: NextPage = () => {
const [initialFlow, setInitialFlow]: any = useState<SettingsFlow>()
Expand Down Expand Up @@ -70,6 +71,9 @@ const Settings: NextPage = () => {
WebSocketsService.initWsNotifications();
}
setLanguage(res?.languageDisplay);
if (res?.autoLogoutMinutes) {
localStorage.setItem("comesFromEntry", "true");
}
}
});
}, []);
Expand Down Expand Up @@ -333,6 +337,7 @@ const Settings: NextPage = () => {
</div>
<div className="img-container">
</div>
{(language && loadPage) && <AutoLogoutProgressBar className='absolute right-2 top-2' autoLogoutMinutes={user?.autoLogoutMinutes} label={t("overview.remainingTime")} comesFromEntry={true} />}
<AdminMessages
adminMessages={activeAdminMessages}
setActiveAdminMessages={setActiveAdminMessages} />
Expand Down
4 changes: 4 additions & 0 deletions styles/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,8 @@ button.button-sign-in:focus {

.hidden {
display: none !important;
}

.top-2 {
top: 24px !important;
}
2 changes: 1 addition & 1 deletion submodules/javascript-functions
2 changes: 1 addition & 1 deletion submodules/tailwind-config