Skip to content

Commit 0a02c64

Browse files
committed
šŸ‘ļø fix: update .gitignore for improved file management and add missing entries; refactor UsersController to use query function and simplify user data handling; enhance web route middleware typing
1 parent ce953a5 commit 0a02c64

File tree

3 files changed

+88
-23
lines changed

3 files changed

+88
-23
lines changed

ā€Ž.gitignoreā€Ž

Lines changed: 82 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,89 @@
1-
dist
2-
node_modules
1+
# Dependencies
2+
node_modules/
3+
4+
# Build outputs
5+
dist/
6+
build/
7+
*.js.map
8+
*.d.ts.map
9+
10+
# Environment & Configuration
311
env.json
412
.cache-*/
513
.vscode
614

715
storage/*
816
!storage/example/
917
src/data/database.json
10-
src/server/data/database.json
18+
19+
# Database files
20+
src/data/*.db
21+
src/data/*.db-journal
22+
src/data/*.db-shm
23+
src/data/*.db-wal
24+
src/data/*.sqlite
25+
src/data/*.sqlite3
26+
27+
# Storage & Uploads (keep example folder)
28+
storage/*
29+
!storage/example/
30+
!storage/.gitkeep
31+
uploads/
32+
temp/
33+
34+
# Cache & Temporary files
35+
.cache/
36+
.cache-*/
37+
.temp/
38+
*.tmp
39+
*.log
40+
logs/
41+
*.pid
42+
*.seed
43+
44+
# IDE & Editor files
45+
.vscode/
46+
.idea/
47+
*.swp
48+
*.swo
49+
*~
50+
.DS_Store
51+
Thumbs.db
52+
*.suo
53+
*.ntvs*
54+
*.njsproj
55+
*.sln
56+
*.sw?
57+
58+
# Testing
59+
coverage/
60+
.nyc_output/
61+
*.lcov
62+
test-results/
63+
playwright-report/
64+
65+
# OS files
66+
.DS_Store
67+
.DS_Store?
68+
._*
69+
.Spotlight-V100
70+
.Trashes
71+
ehthumbs.db
72+
Desktop.ini
73+
$RECYCLE.BIN/
74+
75+
# TypeScript
76+
*.tsbuildinfo
77+
78+
# Optional npm cache directory
79+
.npm
80+
81+
# Optional eslint cache
82+
.eslintcache
83+
84+
# Backup files
85+
*.backup
86+
*.bak
87+
*.old
88+
db-backup/
89+

ā€Žsrc/client/controller/users.tsā€Ž

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NextFunction, Request, Response } from "express";
22
import { Controller } from "./controller.js";
3-
import { getDbClient } from "../../server/utils/db.js";
3+
import { query } from "../../server/utils/db.js";
44

55
export class UsersController extends Controller {
66

@@ -23,35 +23,21 @@ export class UsersController extends Controller {
2323
return;
2424
}
2525

26-
const sql = getDbClient();
27-
const usersResult = await sql`
26+
const usersResult = await query<any>(`
2827
SELECT
2928
id, username, email, name, avatar, role,
3029
is_active, last_login_at, created_at, updated_at
3130
FROM users
3231
ORDER BY created_at DESC
33-
`;
34-
35-
const users = usersResult.map((userRow: any) => ({
36-
id: userRow.id,
37-
username: userRow.username,
38-
email: userRow.email,
39-
name: userRow.name,
40-
avatar: userRow.avatar,
41-
role: userRow.role,
42-
is_active: userRow.is_active,
43-
last_login_at: userRow.last_login_at,
44-
created_at: userRow.created_at,
45-
updated_at: userRow.updated_at
46-
}));
32+
`);
4733

4834
// Render users page
4935
const usersData = {
5036
...Controller.defaultConfig,
5137
title: `Users Management - ${Controller.defaultConfig.title}`,
5238
page: 'users',
5339
currentPath,
54-
users,
40+
users: usersResult,
5541
usersError: ""
5642
};
5743

ā€Žsrc/client/routes/web.tsā€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import express, { Request, Response } from 'express';
1+
import express, { Request, Response, NextFunction } from 'express';
22
import path from 'path';
33
import { fileURLToPath } from 'url';
44
import { DashboardController } from '../controller/dashboard.js';
@@ -45,7 +45,7 @@ app.get('/upload/history', UploadHistoryController.get);
4545
app.get('/users', UsersController.get);
4646

4747
// Catch-all 404 handler - render not-found page with default config
48-
app.use((req, res, next) => {
48+
app.use((req: Request, res: Response, next: NextFunction) => {
4949
// Skip API routes - let them be handled by API router
5050
if (req.path.startsWith('/api')) {
5151
return next();

0 commit comments

Comments
Ā (0)