CognxSafeTrack commited on
Commit ·
295ae46
1
Parent(s): 2ab1980
fix: build errors on netlify and shared-types synchronization
Browse files
apps/admin/src/App.tsx
CHANGED
|
@@ -29,7 +29,7 @@ function ProtectedRoute({ children }: { children: React.ReactNode }) {
|
|
| 29 |
|
| 30 |
function AppShell() {
|
| 31 |
const { logout, token, user } = useAuth();
|
| 32 |
-
const { selectedOrgId, setSelectedOrgId,
|
| 33 |
const [orgs, setOrgs] = React.useState<any[]>([]);
|
| 34 |
|
| 35 |
const isSuperAdmin = user?.role === 'SUPER_ADMIN' || user?.role === 'ADMIN';
|
|
@@ -61,8 +61,6 @@ function AppShell() {
|
|
| 61 |
|
| 62 |
const navItems = allNavItems.filter(item => !item.superOnly || isSuperAdmin);
|
| 63 |
|
| 64 |
-
const brandingColor = currentOrg?.brandingData?.primaryColor || '#0f172a';
|
| 65 |
-
|
| 66 |
return (
|
| 67 |
<div className="min-h-screen bg-gray-50 flex">
|
| 68 |
<aside className="w-64 bg-slate-900 text-white p-6 flex flex-col shrink-0">
|
|
|
|
| 29 |
|
| 30 |
function AppShell() {
|
| 31 |
const { logout, token, user } = useAuth();
|
| 32 |
+
const { selectedOrgId, setSelectedOrgId, currentOrg } = useTenant();
|
| 33 |
const [orgs, setOrgs] = React.useState<any[]>([]);
|
| 34 |
|
| 35 |
const isSuperAdmin = user?.role === 'SUPER_ADMIN' || user?.role === 'ADMIN';
|
|
|
|
| 61 |
|
| 62 |
const navItems = allNavItems.filter(item => !item.superOnly || isSuperAdmin);
|
| 63 |
|
|
|
|
|
|
|
| 64 |
return (
|
| 65 |
<div className="min-h-screen bg-gray-50 flex">
|
| 66 |
<aside className="w-64 bg-slate-900 text-white p-6 flex flex-col shrink-0">
|
apps/admin/src/lib/auth.tsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
import React, { useState, createContext, useContext
|
| 2 |
import { User } from '@repo/shared-types';
|
| 3 |
|
| 4 |
const SESSION_KEY = 'edtech_admin_token';
|
|
|
|
| 1 |
+
import React, { useState, createContext, useContext } from 'react';
|
| 2 |
import { User } from '@repo/shared-types';
|
| 3 |
|
| 4 |
const SESSION_KEY = 'edtech_admin_token';
|
apps/admin/src/pages/DashboardPage.tsx
CHANGED
|
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
|
|
| 2 |
import { Users, PlayCircle, CheckCircle, Lightbulb, DollarSign, Download, Building2, Loader2 } from 'lucide-react';
|
| 3 |
import { useAuth } from '../lib/auth';
|
| 4 |
import { useTenant } from '../lib/tenant';
|
| 5 |
-
import { API_URL } from '../lib/api';
|
| 6 |
|
| 7 |
export default function DashboardPage() {
|
| 8 |
const { token, logout } = useAuth();
|
|
|
|
| 2 |
import { Users, PlayCircle, CheckCircle, Lightbulb, DollarSign, Download, Building2, Loader2 } from 'lucide-react';
|
| 3 |
import { useAuth } from '../lib/auth';
|
| 4 |
import { useTenant } from '../lib/tenant';
|
| 5 |
+
import { API_URL, ah } from '../lib/api';
|
| 6 |
|
| 7 |
export default function DashboardPage() {
|
| 8 |
const { token, logout } = useAuth();
|
apps/admin/src/pages/OnboardingWizard.tsx
CHANGED
|
@@ -24,7 +24,7 @@ const STEPS = [
|
|
| 24 |
export default function OnboardingWizard() {
|
| 25 |
const [step, setStep] = useState(0);
|
| 26 |
const [loading, setLoading] = useState(false);
|
| 27 |
-
const {
|
| 28 |
const navigate = useNavigate();
|
| 29 |
|
| 30 |
const [form, setForm] = useState({
|
|
@@ -49,7 +49,7 @@ export default function OnboardingWizard() {
|
|
| 49 |
method: 'POST',
|
| 50 |
headers: {
|
| 51 |
'Content-Type': 'application/json',
|
| 52 |
-
'Authorization': `Bearer ${
|
| 53 |
},
|
| 54 |
body: JSON.stringify({
|
| 55 |
...form,
|
|
|
|
| 24 |
export default function OnboardingWizard() {
|
| 25 |
const [step, setStep] = useState(0);
|
| 26 |
const [loading, setLoading] = useState(false);
|
| 27 |
+
const { token } = useAuth();
|
| 28 |
const navigate = useNavigate();
|
| 29 |
|
| 30 |
const [form, setForm] = useState({
|
|
|
|
| 49 |
method: 'POST',
|
| 50 |
headers: {
|
| 51 |
'Content-Type': 'application/json',
|
| 52 |
+
'Authorization': `Bearer ${token}`
|
| 53 |
},
|
| 54 |
body: JSON.stringify({
|
| 55 |
...form,
|