feat: redo settings and all org pages. (#601)
* feat: new components, deploy storybook * refactor: simplify component field definitions and enhance button loading state - Removed unnecessary type imports and simplified the FIELDS array definitions across multiple components in Storybook. - Updated button component to use a loading state instead of isLoading, improving clarity and consistency in props. - Adjusted button stories to reflect the new loading prop and enhanced the button's loading visual feedback. - Minor CSS adjustments for better layout and styling consistency. * chore: add field, card, password components * feat: improve page component & update AuthUI path * chore: update bits-ui to version 2.14.4 and all org related UI's - Updated bits-ui dependency in pnpm-lock.yaml and package.json to version 2.14.4. - Refactored imports for RoleBasedSecurity and UpgradeBanner components to use the new ui feature directory. - Removed unused Course components and related files to clean up the codebase. - Enhanced various components to improve consistency and maintainability. * chore: move all setting buttons to the top and update auth ui styles * chore: remove svelte-loading-spinners and replace with @cio/ui/base/spinner - Removed all instances of svelte-loading-spinners from the project. - Updated components to use the new Spinner from @cio/ui/base/spinner. - Cleaned up pnpm-lock.yaml and package.json to reflect the removal of svelte-loading-spinners. - Added new CSS animations for rocket launch effects in app.css. - Enhanced email change flow with updated verification messages in translations. * chore: remove supabase file upload from dashboard and move to r2 * chore: update organization API and UI components - Added new API methods for organization plan operations and team management. - Introduced middleware for API key authentication and organization admin checks. - Refactored organization-related components to utilize the new API structure. - Updated various UI components to improve consistency and maintainability. - Enhanced error handling and validation for organization-related actions. - Removed deprecated services and streamlined the codebase.
This commit is contained in:
@@ -28,17 +28,36 @@ export function isLMSPage(path) {
|
||||
return /lms[/a-z 0-9 -]*/.test(path);
|
||||
}
|
||||
|
||||
export function isActive(pagePath: string, itemPath: string, exact: boolean = false) {
|
||||
const pageLinkItems = pagePath.split('/');
|
||||
const itemLinkItems = itemPath.split('/');
|
||||
export function isActive(pagePath: string, itemPath: string, matchPattern?: string, exact: boolean = false) {
|
||||
// If a regex pattern is provided, use it for matching
|
||||
if (matchPattern) {
|
||||
try {
|
||||
const regex = new RegExp(matchPattern);
|
||||
return regex.test(pagePath);
|
||||
} catch (error) {
|
||||
console.warn('Invalid regex pattern in isActive:', matchPattern, error);
|
||||
// Fall through to default matching logic
|
||||
}
|
||||
}
|
||||
|
||||
// Normalize paths by removing trailing slashes (except root)
|
||||
const normalizedPagePath = pagePath === '/' ? '/' : pagePath.replace(/\/$/, '');
|
||||
const normalizedItemPath = itemPath === '/' ? '/' : itemPath.replace(/\/$/, '');
|
||||
|
||||
if (exact) {
|
||||
return pagePath === itemPath;
|
||||
return normalizedPagePath === normalizedItemPath;
|
||||
}
|
||||
|
||||
if (itemLinkItems.length !== pageLinkItems.length) {
|
||||
return false;
|
||||
// Exact match
|
||||
if (normalizedPagePath === normalizedItemPath) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return pagePath.includes(itemPath);
|
||||
// Check if pagePath is a nested route of itemPath
|
||||
// e.g., /org/[slug]/courses matches /org/[slug]/courses/123
|
||||
// We need to ensure we match at path segment boundaries
|
||||
const pagePathWithSlash = normalizedPagePath + '/';
|
||||
const itemPathWithSlash = normalizedItemPath + '/';
|
||||
|
||||
return pagePathWithSlash.startsWith(itemPathWithSlash);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import { supabase } from '$lib/utils/functions/supabase';
|
||||
|
||||
export const sanitizeDomain = (domain: string) => {
|
||||
return domain
|
||||
.trim()
|
||||
@@ -9,15 +7,11 @@ export const sanitizeDomain = (domain: string) => {
|
||||
};
|
||||
|
||||
export async function sendDomainRequest(key: string, domain: string): Promise<Response> {
|
||||
const { data } = await supabase.auth.getSession();
|
||||
const accessToken = data.session?.access_token || '';
|
||||
|
||||
return fetch('/api/domain', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ params: { key, domain } }),
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `${accessToken}`
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user