@mdguggenbichler/slugbase-core 0.0.38 → 0.0.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/backend/dist/app-factory.d.ts.map +1 -1
- package/backend/dist/app-factory.js +2 -0
- package/backend/dist/app-factory.js.map +1 -1
- package/frontend/src/App.tsx +19 -2
- package/frontend/src/components/AppSidebar.tsx +8 -1
- package/frontend/src/contexts/AppConfigContext.tsx +12 -0
- package/frontend/src/pages/Dashboard.tsx +2 -2
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-factory.d.ts","sourceRoot":"","sources":["../src/app-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,OAAO,MAAM,SAAS,CAAC;AAc9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGhE,MAAM,WAAW,gBAAgB;IAC/B,6HAA6H;IAC7H,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC;IACrG,qEAAqE;IACrE,YAAY,EAAE,YAAY,CAAC,OAAO,oBAAoB,CAAC,CAAC;CACzD;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"app-factory.d.ts","sourceRoot":"","sources":["../src/app-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,OAAO,MAAM,SAAS,CAAC;AAc9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGhE,MAAM,WAAW,gBAAgB;IAC/B,6HAA6H;IAC7H,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC;IACrG,qEAAqE;IACrE,YAAY,EAAE,YAAY,CAAC,OAAO,oBAAoB,CAAC,CAAC;CACzD;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CA8FpE"}
|
|
@@ -26,8 +26,10 @@ export function createApp(options) {
|
|
|
26
26
|
frontendUrl,
|
|
27
27
|
'http://localhost:3000',
|
|
28
28
|
'http://localhost:3001',
|
|
29
|
+
'http://localhost:3002', // e2e frontend (run-e2e.js uses port 3002)
|
|
29
30
|
'http://127.0.0.1:3000',
|
|
30
31
|
'http://127.0.0.1:3001',
|
|
32
|
+
'http://127.0.0.1:3002',
|
|
31
33
|
];
|
|
32
34
|
const extraOrigins = (process.env.CORS_EXTRA_ORIGINS || '')
|
|
33
35
|
.split(',')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-factory.js","sourceRoot":"","sources":["../src/app-factory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app-factory.js","sourceRoot":"","sources":["../src/app-factory.ts"],"names":[],"mappings":"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"}
|
package/frontend/src/App.tsx
CHANGED
|
@@ -50,6 +50,18 @@ function AdminRoute({ children }: { children: React.ReactNode }) {
|
|
|
50
50
|
return <>{children}</>;
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
+
function ExtraAdminRoutes() {
|
|
54
|
+
const { extraAdminRoutes } = useAppConfig();
|
|
55
|
+
if (!extraAdminRoutes?.length) return null;
|
|
56
|
+
return (
|
|
57
|
+
<>
|
|
58
|
+
{extraAdminRoutes.map(({ path, element }) => (
|
|
59
|
+
<Route key={path} path={path} element={element} />
|
|
60
|
+
))}
|
|
61
|
+
</>
|
|
62
|
+
);
|
|
63
|
+
}
|
|
64
|
+
|
|
53
65
|
function SharedRedirect() {
|
|
54
66
|
const { pathPrefixForLinks } = useAppConfig();
|
|
55
67
|
const to = `${pathPrefixForLinks || ''}/bookmarks?scope=shared_with_me`.replace(/\/+/g, '/') || '/bookmarks?scope=shared_with_me';
|
|
@@ -137,6 +149,7 @@ function AppRoutes() {
|
|
|
137
149
|
</>
|
|
138
150
|
)}
|
|
139
151
|
<Route path="ai" element={<AdminAIPage />} />
|
|
152
|
+
<ExtraAdminRoutes />
|
|
140
153
|
</Route>
|
|
141
154
|
</Route>
|
|
142
155
|
</Routes>
|
|
@@ -243,9 +256,13 @@ export interface AppProps {
|
|
|
243
256
|
hideAdminOidcAndSmtp?: boolean;
|
|
244
257
|
/** When true, Admin AI page shows only the enable/disable toggle (e.g. cloud uses env for provider/model/key). */
|
|
245
258
|
adminAiOnlyToggle?: boolean;
|
|
259
|
+
/** Optional extra admin routes (e.g. cloud billing). Generic extension; path is segment under /admin. */
|
|
260
|
+
extraAdminRoutes?: { path: string; element: ReactNode }[];
|
|
261
|
+
/** Optional extra admin nav items (e.g. cloud billing). Passed to sidebar when extraAdminRoutes are used. */
|
|
262
|
+
extraAdminNavItems?: { path: string; label: string }[];
|
|
246
263
|
}
|
|
247
264
|
|
|
248
|
-
function App({ basePath, apiBaseUrl, routerBasename, skipSetupFlow, hideAdminOidcAndSmtp, adminAiOnlyToggle }: AppProps = {}) {
|
|
265
|
+
function App({ basePath, apiBaseUrl, routerBasename, skipSetupFlow, hideAdminOidcAndSmtp, adminAiOnlyToggle, extraAdminRoutes, extraAdminNavItems }: AppProps = {}) {
|
|
249
266
|
const appRootPath = routerBasename !== undefined ? '/' : (basePath === '/' || !basePath ? '/' : basePath);
|
|
250
267
|
const pathPrefixForLinks = routerBasename !== undefined ? '' : (basePath ?? '');
|
|
251
268
|
const content = (
|
|
@@ -261,7 +278,7 @@ function App({ basePath, apiBaseUrl, routerBasename, skipSetupFlow, hideAdminOid
|
|
|
261
278
|
);
|
|
262
279
|
return (
|
|
263
280
|
<AppErrorBoundary>
|
|
264
|
-
<AppConfigProvider appBasePath={basePath} apiBaseUrl={apiBaseUrl} appRootPath={appRootPath} skipSetupFlow={skipSetupFlow} pathPrefixForLinks={pathPrefixForLinks} hideAdminOidcAndSmtp={hideAdminOidcAndSmtp} adminAiOnlyToggle={adminAiOnlyToggle}>
|
|
281
|
+
<AppConfigProvider appBasePath={basePath} apiBaseUrl={apiBaseUrl} appRootPath={appRootPath} skipSetupFlow={skipSetupFlow} pathPrefixForLinks={pathPrefixForLinks} hideAdminOidcAndSmtp={hideAdminOidcAndSmtp} adminAiOnlyToggle={adminAiOnlyToggle} extraAdminNavItems={extraAdminNavItems} extraAdminRoutes={extraAdminRoutes}>
|
|
265
282
|
{routerBasename !== undefined ? (
|
|
266
283
|
content
|
|
267
284
|
) : (
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
UserCog,
|
|
16
16
|
Key,
|
|
17
17
|
Sparkles,
|
|
18
|
+
CreditCard,
|
|
18
19
|
} from 'lucide-react';
|
|
19
20
|
import {
|
|
20
21
|
Sidebar,
|
|
@@ -43,7 +44,7 @@ export default function AppSidebar({ user, version = null }: AppSidebarProps) {
|
|
|
43
44
|
const { t } = useTranslation();
|
|
44
45
|
const location = useLocation();
|
|
45
46
|
const pathname = location.pathname;
|
|
46
|
-
const { appBasePath, pathPrefixForLinks, hideAdminOidcAndSmtp } = useAppConfig();
|
|
47
|
+
const { appBasePath, pathPrefixForLinks, hideAdminOidcAndSmtp, extraAdminNavItems } = useAppConfig();
|
|
47
48
|
const { setOpenMobile, toggleSidebar, isMobile, state } = useSidebar();
|
|
48
49
|
const prefix = pathPrefixForLinks || '';
|
|
49
50
|
// For active matching use pathPrefixForLinks so it matches useLocation().pathname (e.g. when Router has basename="/app", pathname is "/bookmarks" not "/app/bookmarks").
|
|
@@ -61,6 +62,12 @@ export default function AppSidebar({ user, version = null }: AppSidebarProps) {
|
|
|
61
62
|
]
|
|
62
63
|
: []),
|
|
63
64
|
{ pathForLink: `${adminBaseLink}/ai`, pathForActive: `${adminBaseFull}/ai`, label: t('admin.ai.nav'), icon: Sparkles },
|
|
65
|
+
...(extraAdminNavItems ?? []).map(({ path, label }) => ({
|
|
66
|
+
pathForLink: `${adminBaseLink}/${path}`.replace(/\/+/g, '/'),
|
|
67
|
+
pathForActive: `${adminBaseFull}/${path}`.replace(/\/+/g, '/'),
|
|
68
|
+
label,
|
|
69
|
+
icon: CreditCard,
|
|
70
|
+
})),
|
|
64
71
|
];
|
|
65
72
|
|
|
66
73
|
const rootActivePath = pathBaseForActive || '/';
|
|
@@ -19,6 +19,10 @@ export interface AppConfig {
|
|
|
19
19
|
bookmarkLimit?: number | null;
|
|
20
20
|
/** True only when plan is team. Used to gate team sharing UI. */
|
|
21
21
|
canShareWithTeams?: boolean;
|
|
22
|
+
/** Optional extra admin nav items (e.g. cloud billing). Generic extension; no cloud-specific naming. */
|
|
23
|
+
extraAdminNavItems?: { path: string; label: string }[];
|
|
24
|
+
/** Optional extra admin route definitions (e.g. cloud billing). Generic extension. */
|
|
25
|
+
extraAdminRoutes?: { path: string; element: React.ReactNode }[];
|
|
22
26
|
}
|
|
23
27
|
|
|
24
28
|
const defaultConfig: AppConfig = {
|
|
@@ -44,6 +48,8 @@ export function AppConfigProvider({
|
|
|
44
48
|
plan,
|
|
45
49
|
bookmarkLimit,
|
|
46
50
|
canShareWithTeams,
|
|
51
|
+
extraAdminNavItems,
|
|
52
|
+
extraAdminRoutes,
|
|
47
53
|
}: {
|
|
48
54
|
children: React.ReactNode;
|
|
49
55
|
appBasePath?: string;
|
|
@@ -62,6 +68,10 @@ export function AppConfigProvider({
|
|
|
62
68
|
bookmarkLimit?: number | null;
|
|
63
69
|
/** True only when plan is team. */
|
|
64
70
|
canShareWithTeams?: boolean;
|
|
71
|
+
/** Optional extra admin nav items (e.g. cloud billing). Generic extension. */
|
|
72
|
+
extraAdminNavItems?: { path: string; label: string }[];
|
|
73
|
+
/** Optional extra admin route definitions (e.g. cloud billing). Generic extension. */
|
|
74
|
+
extraAdminRoutes?: { path: string; element: React.ReactNode }[];
|
|
65
75
|
}) {
|
|
66
76
|
const base = appBasePath ?? defaultConfig.appBasePath;
|
|
67
77
|
const value: AppConfig = {
|
|
@@ -75,6 +85,8 @@ export function AppConfigProvider({
|
|
|
75
85
|
plan,
|
|
76
86
|
bookmarkLimit,
|
|
77
87
|
canShareWithTeams,
|
|
88
|
+
extraAdminNavItems,
|
|
89
|
+
extraAdminRoutes,
|
|
78
90
|
};
|
|
79
91
|
return <AppConfigContext.Provider value={value}>{children}</AppConfigContext.Provider>;
|
|
80
92
|
}
|
|
@@ -246,9 +246,9 @@ export default function Dashboard() {
|
|
|
246
246
|
usage: {
|
|
247
247
|
used: stats.tenantBookmarkCount ?? stats.totalBookmarks,
|
|
248
248
|
limit: stats.bookmarkLimit,
|
|
249
|
-
labelOverride: t('
|
|
249
|
+
labelOverride: t('plan.bookmarksUsed', { count: stats.tenantBookmarkCount ?? stats.totalBookmarks, limit: stats.bookmarkLimit }),
|
|
250
250
|
showProgress: true,
|
|
251
|
-
cta: (stats.tenantBookmarkCount ?? stats.totalBookmarks) >= stats.bookmarkLimit ? { label: t('
|
|
251
|
+
cta: (stats.tenantBookmarkCount ?? stats.totalBookmarks) >= stats.bookmarkLimit ? { label: t('plan.limitBookmarks', { limit: stats.bookmarkLimit }), onClick: () => window.location.href = '/pricing' } : undefined,
|
|
252
252
|
},
|
|
253
253
|
}),
|
|
254
254
|
}}
|