Doble/ShiftSync
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Feature/settings page #17

Closed
mattdimegs wants to merge 26 commits from feature/settings-page into main
pull from: feature/settings-page
merge into: Doble:main
Conversation 0 Commits 26 Files changed 13 +666 -671
2 changed files with 666 additions and 671 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 941110abc1 - Show all commits

5
web/src/pages/Settings/Settings.jsx
View file

@ -228,7 +228,6 @@ export const Settings = () => {
const hasChanges = Object.keys(changedFields).length > 0; const hasChanges = Object.keys(changedFields).length > 0;
const onSubmit = (data) => { const onSubmit = (data) => {
console.log('data: ', data);
setDepartment({ setDepartment({
...department, ...department,
...data ...data
@ -305,10 +304,6 @@ export const Settings = () => {
} }
}, [tabValue, isAdministrator, isManager, isScheduler]); }, [tabValue, isAdministrator, isManager, isScheduler]);
useEffect(() => {
}, [department]);
return ( return (
<div> <div>
{user?.administrator || user?.manager ? ( {user?.administrator || user?.manager ? (

100
web/src/router/AppRouter.jsx
View file

@ -65,66 +65,66 @@ const AppRouter = () => {
const [userChanged, setUserChanged] = useState(false); const [userChanged, setUserChanged] = useState(false);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
const localVersion = localStorage.getItem("APP_VERSION"); const localVersion = localStorage.getItem("APP_VERSION");
const currentVersion = window.APP_VERSION; const currentVersion = window.APP_VERSION;
if (localVersion && localVersion !== currentVersion) { if (localVersion && localVersion !== currentVersion) {
console.log("Version changed, forcing reload"); console.log("Version changed, forcing reload");
localStorage.setItem("APP_VERSION", currentVersion); localStorage.setItem("APP_VERSION", currentVersion);
window.location.reload(true); window.location.reload(true);
return; return;
} else { } else {
localStorage.setItem("APP_VERSION", currentVersion); localStorage.setItem("APP_VERSION", currentVersion);
} }
const data = await fetchAPI('userData', 'get'); const data = await fetchAPI('userData', 'get');
console.log('data:', data); console.log('data:', data);
// TODO: Replace this with real data from your API // TODO: Replace this with real data from your API
// const users = data?.users || []; // Example fix // const users = data?.users || []; // Example fix
// const dept = data?.dept || {}; // Example fix // const dept = data?.dept || {}; // Example fix
const employee_count = 1; const employee_count = 1;
const subs_expiration = '10/22/2025'; const subs_expiration = '10/22/2025';
setUser({ setUser({
...users[0], ...users[0],
scheduler: dept?.schedulers?.includes(1), scheduler: dept?.schedulers?.includes(1),
manager: dept?.managers?.includes(1), manager: dept?.managers?.includes(1),
administrator: dept?.administrators?.includes(1) administrator: dept?.administrators?.includes(1)
}); });
const newAdministrators = dept?.administrators?.map((admin) => { const newAdministrators = dept?.administrators?.map((admin) => {
const user = users?.find((user) => user?.id === admin); const user = users?.find((user) => user?.id === admin);
return { id: user?.id, value: `${user?.last_name}, ${user?.first_name}` }; return { id: user?.id, value: `${user?.last_name}, ${user?.first_name}` };
}); });
const newManagers = dept?.managers?.map((manager) => { const newManagers = dept?.managers?.map((manager) => {
const user = users?.find((user) => user?.id === manager); const user = users?.find((user) => user?.id === manager);
return { id: user?.id, value: `${user?.last_name}, ${user?.first_name}` }; return { id: user?.id, value: `${user?.last_name}, ${user?.first_name}` };
}); });
const newSchedulers = dept?.schedulers?.map((scheduler) => { const newSchedulers = dept?.schedulers?.map((scheduler) => {
const user = users?.find((user) => user?.id === scheduler); const user = users?.find((user) => user?.id === scheduler);
return { id: user?.id, value: `${user?.last_name}, ${user?.first_name}` }; return { id: user?.id, value: `${user?.last_name}, ${user?.first_name}` };
}); });
const newUsers = users?.map((user) => ({ const newUsers = users?.map((user) => ({
id: user?.id, id: user?.id,
value: `${user?.last_name}, ${user?.first_name}` value: `${user?.last_name}, ${user?.first_name}`
})); }));
setDepartment({ setDepartment({
...dept, ...dept,
users: newUsers, users: newUsers,
schedulers: newSchedulers, schedulers: newSchedulers,
managers: newManagers, managers: newManagers,
administrators: newAdministrators, administrators: newAdministrators,
employee_count, employee_count,
subs_expiration subs_expiration
}); });
}; };
init(); init();
}, []); }, []);