matt/dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Fix-up-statcards

Browse Source
This commit is contained in:
Matt
2024-12-23 23:47:15 -05:00
parent 90a003fccd cdc0c3cc78
commit ce80b9d77b
5 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -25,3 +25,4 @@ dist-ssr
.env
dashboard/build/**
dashboard-server/frontend/build/**
._*

28
dashboard-server/auth-server/index.js
View File

@@ -38,7 +38,13 @@ const corsOptions = {
console.log('CORS check for origin:', origin);
// Check if origin is allowed
// Allow local network IPs (192.168.1.xxx)
if (origin && origin.match(/^http:\/\/192\.168\.1\.\d{1,3}(:\d+)?$/)) {
callback(null, true);
return;
}
// Check if origin is in allowed list
if (!origin || allowedOrigins.indexOf(origin) !== -1) {
callback(null, true);
} else {
@@ -96,19 +102,19 @@ app.post('/login', (req, res) => {
expiresIn: '24h'
});
// Determine if request is from localhost
const isLocalhost = req.headers.origin?.includes('localhost');
// Determine if request is from local network
const isLocalNetwork = req.headers.origin?.includes('192.168.1.') || req.headers.origin?.includes('localhost');
const cookieOptions = {
httpOnly: true,
secure: !isLocalhost,
sameSite: isLocalhost ? 'lax' : 'none',
secure: !isLocalNetwork, // Only use secure for non-local requests
sameSite: isLocalNetwork ? 'lax' : 'none',
path: '/',
maxAge: 24 * 60 * 60 * 1000 // 24 hours
};
// Add domain only for production
if (!isLocalhost) {
// Only set domain for production
if (!isLocalNetwork) {
cookieOptions.domain = '.kent.pw';
}
@@ -163,13 +169,13 @@ app.get('/check', (req, res) => {
});
app.post('/logout', (req, res) => {
const isLocalhost = req.headers.origin?.includes('localhost');
const isLocalNetwork = req.headers.origin?.includes('192.168.1.') || req.headers.origin?.includes('localhost');
const cookieOptions = {
httpOnly: true,
secure: !isLocalhost,
sameSite: isLocalhost ? 'lax' : 'none',
secure: !isLocalNetwork,
sameSite: isLocalNetwork ? 'lax' : 'none',
path: '/',
domain: isLocalhost ? undefined : '.kent.pw'
domain: isLocalNetwork ? undefined : '.kent.pw'
};
console.log('Clearing cookie with options:', cookieOptions);

16
dashboard/src/App.jsx
View File

@@ -91,27 +91,31 @@ const DashboardLayout = () => {
<div className="grid grid-cols-1 xl:grid-cols-6 gap-4">
<div className="xl:col-span-4 col-span-6">
<div className="space-y-4 h-full w-full">
<StatCards />
<div id="stats">
<StatCards />
</div>
</div>
</div>
<div className="xl:col-span-2 col-span-6 h-[500px] xl:h-[643px] 2xl:h-[510px] lg:hidden xl:block">
<div id="feed-xl" className="xl:col-span-2 col-span-6 h-[500px] xl:h-[643px] 2xl:h-[510px] lg:hidden xl:block">
<div className="h-full">
<div className="h-full"><EventFeed /></div>
</div>
</div>
</div>
<div className="grid grid-cols-12 gap-4">
<div className="hidden lg:col-span-6 lg:block xl:hidden h-[740px]">
<div id="feed-lg" className="hidden lg:col-span-6 lg:block xl:hidden h-[740px]">
<EventFeed />
</div>
<div className="col-span-12 lg:col-span-6 xl:col-span-4 h-[600px] lg:h-[740px]">
<div id="products" className="col-span-12 lg:col-span-6 xl:col-span-4 h-[600px] lg:h-[740px]">
<ProductGrid />
</div>
<div className="col-span-12 xl:col-span-8 h-full w-full flex">
<div id="sales" className="col-span-12 xl:col-span-8 h-full w-full flex">
<SalesChart className="w-full h-full"/>
</div>
</div>
<AircallDashboard />
<div id="calls">
<AircallDashboard />
</div>
</div>
</div>
</ScrollProvider>

24
dashboard/src/components/dashboard/Navigation.jsx
View File

@@ -20,25 +20,13 @@ const Navigation = () => {
const baseSections = [
{ id: "stats", label: "Statistics" },
{
id: "realtime",
label: "Realtime",
responsiveIds: ["realtime-lg", "realtime-md"],
order: { md: 2, default: 1 },
id: "feed",
label: "Event Feed",
responsiveIds: ["feed-xl", "feed-lg"],
},
{
id: "products",
label: "Top Products",
responsiveIds: ["products-lg", "products-md"],
order: { md: 1, default: 2 },
},
{ id: "feed", label: "Activity Feed" },
{ id: "sales", label: "Sales Metrics" },
{ id: "campaigns", label: "Campaigns" },
{ id: "meta", label: "Meta Ads" },
{ id: "analytics", label: "Analytics" },
{ id: "behavior", label: "User Behavior" },
{ id: "gorgias", label: "Customer Service" },
{ id: "calls", label: "Calls" },
{ id: "products", label: "Top Products" },
{ id: "sales", label: "Sales Chart" },
{ id: "calls", label: "Aircall" },
];
const sortSections = (sections) => {

24
dashboard/vite.config.js
View File

@@ -72,8 +72,10 @@ export default defineConfig(({ mode }) => {
changeOrigin: true,
secure: true,
cookieDomainRewrite: {
"dashboard.kent.pw": "localhost",
"dashboard.kent.pw": "",
},
hostRewrite: true,
autoRewrite: true,
configure: (proxy, _options) => {
proxy.on("error", (err, req, res) => {
console.log("Auth proxy error:", err);
@@ -85,13 +87,29 @@ export default defineConfig(({ mode }) => {
);
});
proxy.on("proxyReq", (proxyReq, req, _res) => {
proxyReq.setHeader('X-Forwarded-Host', req.headers.host);
proxyReq.setHeader('X-Forwarded-Proto', 'http');
const origin = req.headers.origin || `http://${req.headers.host}`;
proxyReq.setHeader('origin', origin);
console.log("Outgoing auth request:", {
method: req.method,
url: req.url,
headers: req.headers,
headers: proxyReq.getHeaders(),
});
});
proxy.on("proxyRes", (proxyRes, req, _res) => {
proxy.on("proxyRes", (proxyRes, req, res) => {
const cookies = proxyRes.headers['set-cookie'];
if (cookies) {
proxyRes.headers['set-cookie'] = cookies.map(cookie =>
cookie
.replace(/Domain=[^;]+;/g, '')
.replace(/Secure;/g, '')
.replace(/SameSite=None/g, 'SameSite=Lax')
);
}
console.log("Auth proxy response:", {
statusCode: proxyRes.statusCode,
url: req.url,