Skip to content

Develop#124

Merged
smcnab1 merged 82 commits into
mainfrom
develop
May 19, 2026
Merged

Develop#124
smcnab1 merged 82 commits into
mainfrom
develop

Conversation

@smcnab1

@smcnab1 smcnab1 commented May 19, 2026

Copy link
Copy Markdown
Contributor

📋 Summary

🔍 Changes

✅ Checklist

  • PR title follows Conventional Commits (feat:, fix:, chore:, etc.)
  • Code has been linted (pnpm lint)
  • Tests added or updated (pnpm test) if relevant
  • Documentation updated (if applicable)
  • Ready for review (remove Draft status if finished)

🔗 Related

Fixes #

smcnab1 and others added 30 commits May 2, 2026 15:53
Create hero profile header, settings grid, and activity sidebar.

Co-authored-by: v0 <v0[bot]@users.noreply.github.com>
Remove unused imports and fix JSX escaping issue.

Co-authored-by: v0 <v0[bot]@users.noreply.github.com>
… components

- Adjusted formatting in `pnpm-lock.yaml` for consistency.
- Refactored `page.tsx`, `PermissionButton.tsx`, `PermissionField.tsx`, `QuickLinksSection.tsx`, `WorkloadStatusPanel.tsx`, and `WorkloadSummaryCards.tsx` to enhance code readability by aligning props and conditions.
- Removed unnecessary line breaks and improved indentation for better clarity.
- Updated resolution entries to a more structured format.
- Ensured consistent indentation and spacing throughout the file.
- Removed test command from the check script in package.json for streamlined checks.
- Changed JSX setting to 'react-jsx' in tsconfig.json for better compatibility with React 17+.
… TypeScript settings

- Replaced pnpm with npm in package.json scripts for better compatibility.
- Updated .npmrc to use hoisted node linker and set registry.
- Removed pnpm-lock.yaml as part of the transition to npm.
- Adjusted tsconfig.json for clearer structure and updated JSX setting to 'preserve'.
Signed-off-by: Sam <108990188+smcnab1@users.noreply.github.com>
Signed-off-by: Sam <108990188+smcnab1@users.noreply.github.com>
- Updated CONTRIBUTING.md to reflect npm commands for linting and testing.
- Replaced pnpm-lock.yaml with package-lock.json in CODEOWNERS and various GitHub configuration files for consistency.
* refactor auth user helpers for WorkOS migration

* standardise auth helper roles
* add server auth permission helpers

* use database auth context for server permissions

* enforce database memberships in auth context
smcnab1 and others added 25 commits May 4, 2026 10:30
# Conflicts:
#	.codex-progress.json
#	.env.example
#	src/app/api/update-user-username/route.ts
#	src/components/providers/ClerkWrapper.tsx
#	src/lib/actions/syncUsernamesFromClerk.ts
#	src/lib/actions/syncUsers.ts
* Finalize WorkOS auth migration

* Keep health check independent of auth secrets
- Introduced `getActorOrganisationId` function to centralize the logic for fetching the primary organisation ID for a user.
- Updated various queries and mutations to utilize the new function, ensuring consistent organisation context handling.
- Adjusted argument structures in several functions to include `userId` for better context management.
- Enhanced error handling for cases where organisation context is required but not available.

Signed-off-by: Sam <108990188+smcnab1@users.noreply.github.com>
* fixed login process and dashboard protection

* updated all clerk components to workos

* fix: full auth provider & process, reduced dupe calls to /api

* feat: onboarding confirmed working, progress saved also (#109)
* fix: updated profile picture and user detail changes

* fix page actions
Fix redirect logic and update "Profile Settings" link; verify TypeScript correctness

Co-authored-by: v0 <v0[bot]@users.noreply.github.com>
… ?tab= deep linking (#113)

* feat: redesign sidebar and dashboard layout based on shadcn example

Co-authored-by: Sam <108990188+smcnab1@users.noreply.github.com>

* fix: correct type import in PlaceholderPage

Fix type import error and update interface usage.

Co-authored-by: Sam <108990188+smcnab1@users.noreply.github.com>

* feat: fix double sidebar nesting and update layout components

Remove redundant layout nesting and update sidebar components for consistency.

Co-authored-by: Sam <108990188+smcnab1@users.noreply.github.com>

* Potential fix for pull request finding 'CodeQL / Unused variable, import, function or class'

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Sam <108990188+smcnab1@users.noreply.github.com>

* Potential fix for pull request finding 'CodeQL / Unused variable, import, function or class'

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Sam <108990188+smcnab1@users.noreply.github.com>

---------

Signed-off-by: Sam <108990188+smcnab1@users.noreply.github.com>
Co-authored-by: v0 <v0[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
* feat: fix collapsed icon display for sidebar components

Update 'lg' size variant to proper icon-mode styles and fix 'TeamSwitcher' and 'NavUser' for icon-only display on collapse.

Co-authored-by: Sam <108990188+smcnab1@users.noreply.github.com>

* feat: make NEXT_PUBLIC_APP_URL optional with fallback

Set default fallback URL for development to support v0 sandbox.

Co-authored-by: Sam <108990188+smcnab1@users.noreply.github.com>

---------

Co-authored-by: v0 <v0[bot]@users.noreply.github.com>
Increase sidebar width and hide text spans in collapsed state.

Co-authored-by: v0 <v0[bot]@users.noreply.github.com>
* fix: simplified permissions and settings config

* fix: file fix for perm level
* feat: account display updated

* feat: password reset management
* feat: enhance permissions and roles management

- Introduced new role management functions, including `setUserRolesForOrganisation` to replace active roles for users.
- Added canonical role name normalization for consistency across the application.
- Updated permissions to reflect new role structures, ensuring proper access control for various actions.
- Enhanced queries to retrieve user roles and permissions more efficiently.
- Added new constants for default roles and permissions to streamline role assignment processes.

* chore: remove sentry integration
@smcnab1 smcnab1 self-assigned this May 19, 2026
@vercel

vercel Bot commented May 19, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
workload-wizard Building Building Preview, 💬 1 unresolved
✅ 7 resolved
May 19, 2026 1:32pm

@smcnab1
smcnab1 merged commit 9124029 into main May 19, 2026
4 of 10 checks passed
);
}

if (!email || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
</div>
);

if (!isLoaded) {
Comment thread src/app/admin/page.tsx
</div>
);

if (!isLoaded) {
</div>
);

if (!isLoaded) {
return null;
}

if (!isSignedIn || !user) {
linkedStaffProfileId,
onGoToTab,
}: AccountOverviewTabProps) {
const [isDismissing, setIsDismissing] = useState(false);
linkedStaffProfileId,
onGoToTab,
}: AccountOverviewTabProps) {
const [isDismissing, setIsDismissing] = useState(false);
@@ -0,0 +1,121 @@
'use client';

import Link from 'next/link';
Comment on lines +4 to +10
import {
ExternalLink,
KeyRound,
Lock,
Shield,
Smartphone,
} from 'lucide-react';
Smartphone,
} from 'lucide-react';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants