watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactored layout. Added NavBar component.

Browse source
This commit is contained in:
Mike Cao 2023-01-18 15:05:39 -08:00
parent fad38dc180
commit 1d9c3133f0
56 changed files with 601 additions and 429 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pages/settings/index.js
View file

@ -3,7 +3,7 @@ export default () => null;
export async function getServerSideProps() {
return {
redirect: {
destination: '/settings/websites',
destination: '/buttons/websites',
permanent: true,
},
};

6
pages/settings/profile/index.js
View file

@ -1,10 +1,10 @@
import SettingsLayout from 'components/pages/settings/SettingsLayout';
import AppLayout from 'components/layout/AppLayout';
import ProfileSettings from 'components/pages/settings/profile/ProfileSettings';
export default function ProfilePage() {
return (
<SettingsLayout>
<AppLayout>
<ProfileSettings />
</SettingsLayout>
</AppLayout>
);
}

6
pages/settings/teams/[...id].js
View file

@ -1,4 +1,4 @@
import SettingsLayout from 'components/pages/settings/SettingsLayout';
import AppLayout from 'components/layout/AppLayout';
import TeamDetails from 'components/pages/settings/teams/TeamDetails';
import useUser from 'hooks/useUser';
import { useRouter } from 'next/router';
@ -13,8 +13,8 @@ export default function TeamDetailPage() {
}
return (
<SettingsLayout>
<AppLayout>
<TeamDetails teamId={id} />
</SettingsLayout>
</AppLayout>
);
}

6
pages/settings/teams/index.js
View file

@ -1,4 +1,4 @@
import SettingsLayout from 'components/pages/settings/SettingsLayout';
import AppLayout from 'components/layout/AppLayout';
import TeamsList from 'components/pages/settings/teams/TeamsList';
import useUser from 'hooks/useUser';
@ -10,8 +10,8 @@ export default function TeamsPage() {
}
return (
<SettingsLayout>
<AppLayout>
<TeamsList />
</SettingsLayout>
</AppLayout>
);
}

6
pages/settings/users/[...id].js
View file

@ -1,4 +1,4 @@
import SettingsLayout from 'components/pages/settings/SettingsLayout';
import AppLayout from 'components/layout/AppLayout';
import UserSettings from 'components/pages/settings/users/UserSettings';
import useUser from 'hooks/useUser';
import { useRouter } from 'next/router';
@ -13,8 +13,8 @@ export default function TeamDetailPage() {
}
return (
<SettingsLayout>
<AppLayout>
<UserSettings userId={id} />
</SettingsLayout>
</AppLayout>
);
}

6
pages/settings/users/index.js
View file

@ -1,4 +1,4 @@
import SettingsLayout from 'components/pages/settings/SettingsLayout';
import AppLayout from 'components/layout/AppLayout';
import useConfig from 'hooks/useConfig';
import useUser from 'hooks/useUser';
@ -13,8 +13,8 @@ export default function UsersPage() {
}
return (
<SettingsLayout>
<AppLayout>
<UsersList />
</SettingsLayout>
</AppLayout>
);
}

6
pages/settings/websites/[id]/index.js
View file

@ -1,7 +1,7 @@
import { useRouter } from 'next/router';
import WebsiteDetails from 'components/pages/settings/websites/WebsiteDetails';
import useUser from 'hooks/useUser';
import SettingsLayout from 'components/pages/settings/SettingsLayout';
import AppLayout from 'components/layout/AppLayout';
export default function WebsiteSettingsPage() {
const user = useUser();
@ -13,8 +13,8 @@ export default function WebsiteSettingsPage() {
}
return (
<SettingsLayout>
<AppLayout>
<WebsiteDetails websiteId={id} />
</SettingsLayout>
</AppLayout>
);
}

6
pages/settings/websites/index.js
View file

@ -1,10 +1,10 @@
import SettingsLayout from 'components/pages/settings/SettingsLayout';
import AppLayout from 'components/layout/AppLayout';
import WebsitesList from 'components/pages/settings/websites/WebsitesList';
export default function WebsitesPage() {
return (
<SettingsLayout>
<AppLayout>
<WebsitesList />
</SettingsLayout>
</AppLayout>
);
}