diff --git a/docs/PROJECT_PROCESSES.md b/docs/PROJECT_PROCESSES.md index 7d6b138..60ff4d3 100644 --- a/docs/PROJECT_PROCESSES.md +++ b/docs/PROJECT_PROCESSES.md @@ -53,8 +53,8 @@ npm install npm run dev # 4. Tarayıcıda açma -# Frontend: http://localhost:5005 -# Backend API: http://localhost:3005 +# Frontend: http://localhost:5173 +# Backend API: http://localhost:3000 ``` #### 1.2 Development Workflow @@ -1531,7 +1531,7 @@ const getFuelSlips = (userId, status) => { const corsOptions = { origin: process.env.NODE_ENV === 'production' ? 'https://your-domain.com' - : ['http://localhost:5005', 'http://localhost:4005'], + : ['http://localhost:5173', 'http://localhost:4173'], methods: ['GET', 'POST', 'PUT', 'DELETE'], allowedHeaders: ['Content-Type', 'Authorization'], credentials: true, diff --git a/docs/TEST_GUIDE.md b/docs/TEST_GUIDE.md index 06b823c..255738a 100644 --- a/docs/TEST_GUIDE.md +++ b/docs/TEST_GUIDE.md @@ -5,8 +5,8 @@ KNOWLEDGE_BASE.md'deki iş akışlarına göre implement edilen tam fonksiyonel yakıt takip sistemi. ### 🚀 **Sunucu Durumu** -- **Frontend**: `http://localhost:5005/` (SvelteKit) -- **Backend**: `http://localhost:3005` (Express/Socket.IO) +- **Frontend**: `http://localhost:5173/` (SvelteKit) +- **Backend**: `http://localhost:3000` (Express/Socket.IO) - **Status**: ✅ Çalışıyor ## 🔐 **Test Kullanıcıları** diff --git a/package.json b/package.json index 551889b..ffe6fff 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,11 @@ "main": "src/server.js", "scripts": { "dev": "npm run server & npm run client", - "server": "PORT=3005 node src/server.js", - "client": "vite dev --port 5005", + "server": "PORT=3000 node src/server.js", + "client": "vite dev --port 5173", "build": "vite build", - "preview": "vite preview --port 5005", - "start": "PORT=3005 node src/production-server.js", + "preview": "vite preview --port 5173", + "start": "PORT=3000 node src/production-server.js", "prod": "npm run build && npm run start", "setup": "node -e \"import('./src/server.js').then(() => console.log('Database setup completed')).catch(console.error);\"", "init-db": "node -e \"import('./src/server.js').catch(console.error)\"" diff --git a/src/lib/components/GoodsManagerContent.svelte b/src/lib/components/GoodsManagerContent.svelte index c8d51a4..a1eb409 100644 --- a/src/lib/components/GoodsManagerContent.svelte +++ b/src/lib/components/GoodsManagerContent.svelte @@ -29,7 +29,7 @@ console.log('🔌 Connecting to Socket.IO...'); // Socket.IO bağlantısı - socket = io('http://localhost:3005'); + socket = io('http://localhost:3000'); console.log('👤 Goods Manager ID:', user.id); diff --git a/src/lib/server/socketClient.js b/src/lib/server/socketClient.js index 1a0a831..f0fa4c4 100644 --- a/src/lib/server/socketClient.js +++ b/src/lib/server/socketClient.js @@ -4,7 +4,7 @@ let socket = null; export function getSocketClient() { if (!socket) { - socket = io('http://localhost:3005', { + socket = io('http://localhost:3000', { transports: ['websocket', 'polling'] }); diff --git a/src/production-server.js b/src/production-server.js index 9e48ff4..618adf2 100644 --- a/src/production-server.js +++ b/src/production-server.js @@ -72,7 +72,7 @@ const app = express(); const server = createServer(app); const io = new Server(server, { cors: { - origin: process.env.NODE_ENV === 'production' ? false : ["http://localhost:5005"], + origin: process.env.NODE_ENV === 'production' ? false : ["http://localhost:5173"], methods: ["GET", "POST"] } }); @@ -80,7 +80,7 @@ const io = new Server(server, { // Export io for use in other modules export { io }; -const PORT = process.env.PORT || 3005; +const PORT = process.env.PORT || 3000; // ES Module equivalent of __dirname const __filename = fileURLToPath(import.meta.url); diff --git a/src/server.js b/src/server.js index fa18dd7..1c6479c 100644 --- a/src/server.js +++ b/src/server.js @@ -117,15 +117,15 @@ const app = express(); const server = createServer(app); const io = new Server(server, { cors: { - origin: "http://localhost:5005", + origin: "http://localhost:5173", methods: ["GET", "POST"] } }); // Export io for use in other modules -export { io }; +// export { io }; // Commented out to avoid circular dependency -const PORT = process.env.PORT || 3005; +const PORT = process.env.PORT || 3000; // ES Module equivalent of __dirname const __filename = fileURLToPath(import.meta.url); @@ -197,14 +197,6 @@ async function initializeDatabase() { if (err) reject(err); }); - // Örnek kullanıcıları ekle - const users = [ - { username: 'admin', password: 'admin123', role: 'admin', full_name: 'Sistem Yöneticisi' }, - { username: 'fuel', password: 'fuel123', role: 'fuel_manager', full_name: 'Yakıt Sorumlusu' }, - { username: 'goods', password: 'goods123', role: 'goods_manager', full_name: 'Mal Sorumlusu' }, - { username: 'ibrahim_kara', password: 'kara123', role: 'goods_manager', full_name: 'İbrahim Kara' } - ]; - // Yakıt fişleri tablosu db.run(`CREATE TABLE IF NOT EXISTS fuel_slips ( id INTEGER PRIMARY KEY AUTOINCREMENT, @@ -232,19 +224,29 @@ async function initializeDatabase() { if (err) reject(err); }); - // Her kullanıcıyı kontrol et ve yoksa ekle - users.forEach(async (user) => { - const hashedPassword = await bcrypt.hash(user.password, 10); + // Tablolar oluşturulduktan sonra kullanıcıları ekle + setTimeout(async () => { + // Örnek kullanıcıları ekle + const users = [ + { username: 'admin', password: 'admin123', role: 'admin', full_name: 'Sistem Yöneticisi' }, + { username: 'fuel', password: 'fuel123', role: 'fuel_manager', full_name: 'Yakıt Sorumlusu' }, + { username: 'goods', password: 'goods123', role: 'goods_manager', full_name: 'Mal Sorumlusu' }, + { username: 'ibrahim_kara', password: 'kara123', role: 'goods_manager', full_name: 'İbrahim Kara' } + ]; - db.get('SELECT id FROM users WHERE username = ?', [user.username], (err, row) => { - if (!row) { - db.run('INSERT INTO users (username, password, role, full_name) VALUES (?, ?, ?, ?)', - [user.username, hashedPassword, user.role, user.full_name]); - } - }); - }); + // Her kullanıcıyı kontrol et ve yoksa ekle + for (const user of users) { + const hashedPassword = await bcrypt.hash(user.password, 10); - resolve(); + db.get('SELECT id FROM users WHERE username = ?', [user.username], (err, row) => { + if (!row) { + db.run('INSERT INTO users (username, password, role, full_name) VALUES (?, ?, ?, ?)', + [user.username, hashedPassword, user.role, user.full_name]); + } + }); + } + resolve(); + }, 100); }); }); } diff --git a/vite.config.js b/vite.config.js index b4f6ab3..5a093cd 100644 --- a/vite.config.js +++ b/vite.config.js @@ -4,10 +4,10 @@ import { defineConfig } from 'vite'; export default defineConfig({ plugins: [sveltekit()], server: { - port: 5005, + port: 5173, proxy: { '/api': { - target: 'http://localhost:3005', + target: 'http://localhost:3000', changeOrigin: true } }