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

Update acob url to tools

Browse Source
This commit is contained in:
Matt
2026-01-25 15:50:55 -05:00
parent aec02e490a
commit 100e398aae
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inventory-server/auth/server.js
View File

@@ -35,7 +35,7 @@ global.pool = pool;
app.use(express.json()); app.use(express.json());
app.use(morgan('combined')); app.use(morgan('combined'));
app.use(cors({ app.use(cors({
origin: ['http://localhost:5175', 'http://localhost:5174', 'https://inventory.kent.pw', 'https://acot.site', 'https://acob.acherryontop.com'], origin: ['http://localhost:5175', 'http://localhost:5174', 'https://inventory.kent.pw', 'https://acot.site', 'https://tools.acherryontop.com'],
credentials: true credentials: true
})); }));

2
inventory-server/chat/server.js
View File

@@ -33,7 +33,7 @@ global.pool = pool;
app.use(express.json()); app.use(express.json());
app.use(morgan('combined')); app.use(morgan('combined'));
app.use(cors({ app.use(cors({
origin: ['http://localhost:5175', 'http://localhost:5174', 'https://inventory.kent.pw', 'https://acot.site', 'https://acob.acherryontop.com'], origin: ['http://localhost:5175', 'http://localhost:5174', 'https://inventory.kent.pw', 'https://acot.site', 'https://tools.acherryontop.com'],
credentials: true credentials: true
})); }));

2
inventory-server/dashboard/auth-server/index.js
View File

@@ -33,7 +33,7 @@ const corsOptions = {
origin: function(origin, callback) { origin: function(origin, callback) {
const allowedOrigins = [ const allowedOrigins = [
'http://localhost:3000', 'http://localhost:3000',
'https://acob.acherryontop.com' 'https://tools.acherryontop.com'
]; ];
console.log('CORS check for origin:', origin); console.log('CORS check for origin:', origin);

4
inventory-server/src/middleware/cors.js
View File

@@ -6,7 +6,7 @@ const corsMiddleware = cors({
'https://inventory.kent.pw', 'https://inventory.kent.pw',
'http://localhost:5175', 'http://localhost:5175',
'https://acot.site', 'https://acot.site',
'https://acob.acherryontop.com', 'https://tools.acherryontop.com',
/^http:\/\/192\.168\.\d+\.\d+(:\d+)?$/, /^http:\/\/192\.168\.\d+\.\d+(:\d+)?$/,
/^http:\/\/10\.\d+\.\d+\.\d+(:\d+)?$/ /^http:\/\/10\.\d+\.\d+\.\d+(:\d+)?$/
], ],
@@ -28,7 +28,7 @@ const corsErrorHandler = (err, req, res, next) => {
res.status(403).json({ res.status(403).json({
error: 'CORS not allowed', error: 'CORS not allowed',
origin: req.get('Origin'), origin: req.get('Origin'),
message: 'Origin not in allowed list: https://inventory.kent.pw, https://acot.site, https://acob.acherryontop.com, localhost:5175, 192.168.x.x, or 10.x.x.x' message: 'Origin not in allowed list: https://inventory.kent.pw, https://acot.site, https://tools.acherryontop.com, localhost:5175, 192.168.x.x, or 10.x.x.x'
}); });
} else { } else {
next(err); next(err);

2
inventory-server/src/routes/import.js
View File

@@ -635,7 +635,7 @@ router.post('/upload-image', upload.single('image'), async (req, res) => {
// Create URL for the uploaded file - using an absolute URL with domain // Create URL for the uploaded file - using an absolute URL with domain
// This will generate a URL like: https://acot.site/uploads/products/filename.jpg // This will generate a URL like: https://acot.site/uploads/products/filename.jpg
const baseUrl = 'https://acob.acherryontop.com'; const baseUrl = 'https://tools.acherryontop.com';
const imageUrl = `${baseUrl}/uploads/products/${req.file.filename}`; const imageUrl = `${baseUrl}/uploads/products/${req.file.filename}`;
// Schedule this image for deletion in 24 hours // Schedule this image for deletion in 24 hours

2
inventory-server/src/routes/reusable-images.js
View File

@@ -194,7 +194,7 @@ router.post('/upload', upload.single('image'), async (req, res) => {
} }
// Create URL for the uploaded file // Create URL for the uploaded file
const baseUrl = 'https://acob.acherryontop.com'; const baseUrl = 'https://tools.acherryontop.com';
const imageUrl = `${baseUrl}/uploads/reusable/${req.file.filename}`; const imageUrl = `${baseUrl}/uploads/reusable/${req.file.filename}`;
const pool = req.app.locals.pool; const pool = req.app.locals.pool;

18
inventory/src/config/dashboard.ts
View File

@@ -5,15 +5,15 @@ const isLocal = window.location.hostname === 'localhost' || window.location.host
const useProxy = !isLocal && (window.location.hostname === 'inventory.kent.pw' || window.location.hostname === 'inventory.acot.site' || window.location.hostname === 'acot.site'); const useProxy = !isLocal && (window.location.hostname === 'inventory.kent.pw' || window.location.hostname === 'inventory.acot.site' || window.location.hostname === 'acot.site');
const liveDashboardConfig = { const liveDashboardConfig = {
auth: isDev || useProxy ? '/dashboard-auth' : 'https://acob.acherryontop.com/auth', auth: isDev || useProxy ? '/dashboard-auth' : 'https://tools.acherryontop.com/auth',
aircall: isDev || useProxy ? '/api/aircall' : 'https://acob.acherryontop.com/api/aircall', aircall: isDev || useProxy ? '/api/aircall' : 'https://tools.acherryontop.com/api/aircall',
klaviyo: isDev || useProxy ? '/api/klaviyo' : 'https://acob.acherryontop.com/api/klaviyo', klaviyo: isDev || useProxy ? '/api/klaviyo' : 'https://tools.acherryontop.com/api/klaviyo',
meta: isDev || useProxy ? '/api/meta' : 'https://acob.acherryontop.com/api/meta', meta: isDev || useProxy ? '/api/meta' : 'https://tools.acherryontop.com/api/meta',
gorgias: isDev || useProxy ? '/api/gorgias' : 'https://acob.acherryontop.com/api/gorgias', gorgias: isDev || useProxy ? '/api/gorgias' : 'https://tools.acherryontop.com/api/gorgias',
analytics: isDev || useProxy ? '/api/dashboard-analytics' : 'https://acob.acherryontop.com/api/analytics', analytics: isDev || useProxy ? '/api/dashboard-analytics' : 'https://tools.acherryontop.com/api/analytics',
typeform: isDev || useProxy ? '/api/typeform' : 'https://acob.acherryontop.com/api/typeform', typeform: isDev || useProxy ? '/api/typeform' : 'https://tools.acherryontop.com/api/typeform',
acot: isDev || useProxy ? '/api/acot' : 'https://acob.acherryontop.com/api/acot', acot: isDev || useProxy ? '/api/acot' : 'https://tools.acherryontop.com/api/acot',
clarity: isDev || useProxy ? '/api/clarity' : 'https://acob.acherryontop.com/api/clarity' clarity: isDev || useProxy ? '/api/clarity' : 'https://tools.acherryontop.com/api/clarity'
}; };
export default liveDashboardConfig; export default liveDashboardConfig;

2
inventory/tsconfig.tsbuildinfo
View File

File diff suppressed because one or more lines are too long