Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Setting as pages #3813

Merged
merged 41 commits into from
Jan 20, 2025
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
bb031fe
Basic setup
Mikehrn Dec 26, 2024
7f60503
Combine delete invite dialog
Mikehrn Jan 2, 2025
d743202
Merge branch 'main' into mike/settings-as-pages
Mikehrn Jan 7, 2025
f038bc9
Merge branch 'main' into mike/settings-as-pages
Mikehrn Jan 7, 2025
8090691
Changed to slug instead of id
Mikehrn Jan 9, 2025
ba87130
Clean up code, remove redirects
Mikehrn Jan 9, 2025
0829194
Updated UserNav
Mikehrn Jan 9, 2025
e3ad819
Add billing redirects
Mikehrn Jan 9, 2025
cf404e8
Remove collapisble
Mikehrn Jan 9, 2025
a91c7e7
Fix General workspace settings
Mikehrn Jan 13, 2025
490190a
Fix sidebar active state
Mikehrn Jan 13, 2025
b3ea9da
Updated routes
Mikehrn Jan 13, 2025
26b5add
Fixed sidebar
Mikehrn Jan 13, 2025
1ec477d
Add back link for mobile
Mikehrn Jan 14, 2025
b0377e7
Merged main
Mikehrn Jan 14, 2025
c218fbf
Linting fixes
Mikehrn Jan 14, 2025
a88eb52
Get ID before getting members
Mikehrn Jan 14, 2025
ae4ab3c
Minor fix
Mikehrn Jan 14, 2025
4bace0d
Fixed state
Mikehrn Jan 14, 2025
e5ef994
Fix tooltip
Mikehrn Jan 14, 2025
93d30e0
Cleanup redirects
Mikehrn Jan 14, 2025
3cc7b80
Update copy
Mikehrn Jan 14, 2025
abcee78
Add middleware check for server settings routes
Mikehrn Jan 15, 2025
584cb51
Add middleware check for server settings routes
Mikehrn Jan 15, 2025
d68549f
Change to existing middleware
Mikehrn Jan 15, 2025
c9fbd83
Fix titles
Mikehrn Jan 15, 2025
b27b6e8
Merge branch 'main' into mike/settings-as-pages
Mikehrn Jan 17, 2025
82f1c01
Addressed merge comments
Mikehrn Jan 17, 2025
9c7a435
Added toasts and update copy
Mikehrn Jan 20, 2025
49a6fbe
Get rid of optimistic response
Mikehrn Jan 20, 2025
dcbcc22
Auto apply middleare to settings routes
Mikehrn Jan 20, 2025
926928e
Updated menu types
Mikehrn Jan 20, 2025
5869a84
Merge branch 'main' into mike/settings-as-pages
Mikehrn Jan 20, 2025
53b774c
Fix linting after merging main
Mikehrn Jan 20, 2025
3c82d75
Refactor members table to use slug instead of ID
Mikehrn Jan 20, 2025
8a2e97e
Add check for workspace id
Mikehrn Jan 20, 2025
dedd338
Align backdrop
Mikehrn Jan 20, 2025
7417fb6
Got rid of workspaceGetIdBySlugQuery
Mikehrn Jan 20, 2025
8a277c2
Cleanup
Mikehrn Jan 20, 2025
a1bc284
Added require-valid-workspace middleware
Mikehrn Jan 20, 2025
8db105a
Removed admin middleware for workspaces
Mikehrn Jan 20, 2025
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
Prev Previous commit
Next Next commit
Remove collapisble
Mikehrn committed Jan 9, 2025
commit cf404e8979fb2383875e483eb5c2c2b25e901b2b
10 changes: 8 additions & 2 deletions packages/frontend-2/components/settings/Sidebar.vue
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@
<p class="text-body-xs font-medium text-foreground">Exit settings</p>
</NuxtLink>
</LayoutSidebarMenuGroup>
<LayoutSidebarMenuGroup collapsible title="User settings">
<LayoutSidebarMenuGroup title="User settings">
<template #title-icon>
<IconAccount class="size-4" />
</template>
<NuxtLink
v-for="(sidebarMenuItem, key) in userMenuItems"
:key="key"
@@ -20,7 +23,10 @@
/>
</NuxtLink>
</LayoutSidebarMenuGroup>
<LayoutSidebarMenuGroup v-if="isAdmin" collapsible title="Server settings">
<LayoutSidebarMenuGroup v-if="isAdmin" title="Server settings">
<template #title-icon>
<IconServer class="size-4" />
</template>
<NuxtLink
v-for="(sidebarMenuItem, key) in serverMenuItems"
:key="key"
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
:title="collapsible ? 'Members' : undefined"
:collapsible="collapsible"
:icon="iconName"
:icon-click="isWorkspaceAdmin ? iconClick : undefined"
:icon-click="iconClick"
:icon-text="iconText"
:tag="workspaceInfo.team.totalCount.toString() || undefined"
no-hover
2 changes: 1 addition & 1 deletion packages/frontend-2/layouts/settings.vue
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<div class="relative flex h-[calc(100dvh-3rem)]">
<SettingsSidebar />

<main class="w-full h-full overflow-y-auto simple-scrollbar lg:py-12">
<main class="w-full h-full overflow-y-auto simple-scrollbar py-6 lg:py-12">
<div class="container mx-auto px-6 md:px-8">
<slot />
</div>