Backend/jest.config.js

@@ -1,22 +0,0 @@
-/** @type {import('jest').Config} */
-const config = {
-    preset: 'ts-jest',
-    testEnvironment: 'node',
-    roots: ['<rootDir>/tests'],
-    testMatch: ['**/*.test.ts'],
-    moduleNameMapper: {
-        '^@/(.*)$': '<rootDir>/src/$1'
-    },
-    clearMocks: true,
-    collectCoverageFrom: [
-        'src/**/*.ts',
-        '!src/**/*.d.ts',
-        '!src/generated/**',
-        '!src/server.ts'
-    ],
-    transform: {
-        '^.+\\.tsx?$': ['ts-jest', { tsconfig: './tsconfig.test.json' }]
-    }
-};
-
-module.exports = config;

Backend/package.json

@@ -44,7 +44,6 @@
         "@types/bcrypt": "^5.0.2",
         "@types/cors": "^2.8.17",
         "@types/express": "^5.0.0",
-        "@types/jest": "^30.0.0",
         "@types/jsonwebtoken": "^9.0.7",
         "@types/multer": "^1.4.12",
         "@types/node": "^22.10.5",

Backend/pnpm-lock.yaml

@@ -78,9 +78,6 @@ importers:
       '@types/express':
         specifier: ^5.0.0
         version: 5.0.6
-      '@types/jest':
-        specifier: ^30.0.0
-        version: 30.0.0
       '@types/jsonwebtoken':
         specifier: ^9.0.7
         version: 9.0.10
@@ -122,7 +119,7 @@ importers:
         version: 7.2.2
       ts-jest:
         specifier: ^29.2.5
-        version: 29.4.6(@babel/core@7.28.5)(@jest/transform@29.7.0)(@jest/types@30.2.0)(babel-jest@29.7.0(@babel/core@7.28.5))(jest-util@30.2.0)(jest@29.7.0(@types/node@22.19.5))(typescript@5.9.3)
+        version: 29.4.6(@babel/core@7.28.5)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.5))(jest-util@29.7.0)(jest@29.7.0(@types/node@22.19.5))(typescript@5.9.3)
       tsconfig-paths:
         specifier: ^4.2.0
         version: 4.2.0
@@ -618,10 +615,6 @@ packages:
       node-notifier:
         optional: true
 
-  '@jest/diff-sequences@30.0.1':
-    resolution: {integrity: sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   '@jest/environment@29.7.0':
     resolution: {integrity: sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -630,10 +623,6 @@ packages:
     resolution: {integrity: sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  '@jest/expect-utils@30.2.0':
-    resolution: {integrity: sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   '@jest/expect@29.7.0':
     resolution: {integrity: sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -642,18 +631,10 @@ packages:
     resolution: {integrity: sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  '@jest/get-type@30.1.0':
-    resolution: {integrity: sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   '@jest/globals@29.7.0':
     resolution: {integrity: sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  '@jest/pattern@30.0.1':
-    resolution: {integrity: sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   '@jest/reporters@29.7.0':
     resolution: {integrity: sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -667,10 +648,6 @@ packages:
     resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  '@jest/schemas@30.0.5':
-    resolution: {integrity: sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   '@jest/source-map@29.6.3':
     resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -691,10 +668,6 @@ packages:
     resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  '@jest/types@30.2.0':
-    resolution: {integrity: sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   '@jridgewell/gen-mapping@0.3.13':
     resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
 
@@ -889,9 +862,6 @@ packages:
   '@sinclair/typebox@0.27.8':
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
 
-  '@sinclair/typebox@0.34.48':
-    resolution: {integrity: sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==}
-
   '@sinonjs/commons@3.0.1':
     resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==}
 
@@ -1145,9 +1115,6 @@ packages:
   '@types/istanbul-reports@3.0.4':
     resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==}
 
-  '@types/jest@30.0.0':
-    resolution: {integrity: sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==}
-
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
@@ -1466,10 +1433,6 @@ packages:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
 
-  ci-info@4.4.0:
-    resolution: {integrity: sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==}
-    engines: {node: '>=8'}
-
   cjs-module-lexer@1.4.3:
     resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==}
 
@@ -1766,10 +1729,6 @@ packages:
     resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  expect@30.2.0:
-    resolution: {integrity: sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   express-rate-limit@7.5.1:
     resolution: {integrity: sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==}
     engines: {node: '>= 16'}
@@ -2159,10 +2118,6 @@ packages:
     resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  jest-diff@30.2.0:
-    resolution: {integrity: sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   jest-docblock@29.7.0:
     resolution: {integrity: sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -2191,26 +2146,14 @@ packages:
     resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  jest-matcher-utils@30.2.0:
-    resolution: {integrity: sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   jest-message-util@29.7.0:
     resolution: {integrity: sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  jest-message-util@30.2.0:
-    resolution: {integrity: sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   jest-mock@29.7.0:
     resolution: {integrity: sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  jest-mock@30.2.0:
-    resolution: {integrity: sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   jest-pnp-resolver@1.2.3:
     resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
     engines: {node: '>=6'}
@@ -2224,10 +2167,6 @@ packages:
     resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  jest-regex-util@30.0.1:
-    resolution: {integrity: sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   jest-resolve-dependencies@29.7.0:
     resolution: {integrity: sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -2252,10 +2191,6 @@ packages:
     resolution: {integrity: sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  jest-util@30.2.0:
-    resolution: {integrity: sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   jest-validate@29.7.0:
     resolution: {integrity: sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -2649,10 +2584,6 @@ packages:
     resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  pretty-format@30.2.0:
-    resolution: {integrity: sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==}
-    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
-
   prisma@5.22.0:
     resolution: {integrity: sha512-vtpjW3XuYCSnMsNVBjLMNkTj6OZbudcPPTPYHqX0CJfpcdWciI1dM8uHETwmDxxiqEwCIE6WvXucWUetJgfu/A==}
     engines: {node: '>=16.13'}
@@ -4096,8 +4027,6 @@ snapshots:
       - supports-color
       - ts-node
 
-  '@jest/diff-sequences@30.0.1': {}
-
   '@jest/environment@29.7.0':
     dependencies:
       '@jest/fake-timers': 29.7.0
@@ -4109,10 +4038,6 @@ snapshots:
     dependencies:
       jest-get-type: 29.6.3
 
-  '@jest/expect-utils@30.2.0':
-    dependencies:
-      '@jest/get-type': 30.1.0
-
   '@jest/expect@29.7.0':
     dependencies:
       expect: 29.7.0
@@ -4129,8 +4054,6 @@ snapshots:
       jest-mock: 29.7.0
       jest-util: 29.7.0
 
-  '@jest/get-type@30.1.0': {}
-
   '@jest/globals@29.7.0':
     dependencies:
       '@jest/environment': 29.7.0
@@ -4140,11 +4063,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@jest/pattern@30.0.1':
-    dependencies:
-      '@types/node': 22.19.5
-      jest-regex-util: 30.0.1
-
   '@jest/reporters@29.7.0':
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
@@ -4178,10 +4096,6 @@ snapshots:
     dependencies:
       '@sinclair/typebox': 0.27.8
 
-  '@jest/schemas@30.0.5':
-    dependencies:
-      '@sinclair/typebox': 0.34.48
-
   '@jest/source-map@29.6.3':
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
@@ -4231,16 +4145,6 @@ snapshots:
       '@types/yargs': 17.0.35
       chalk: 4.1.2
 
-  '@jest/types@30.2.0':
-    dependencies:
-      '@jest/pattern': 30.0.1
-      '@jest/schemas': 30.0.5
-      '@types/istanbul-lib-coverage': 2.0.6
-      '@types/istanbul-reports': 3.0.4
-      '@types/node': 22.19.5
-      '@types/yargs': 17.0.35
-      chalk: 4.1.2
-
   '@jridgewell/gen-mapping@0.3.13':
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -4412,8 +4316,6 @@ snapshots:
 
   '@sinclair/typebox@0.27.8': {}
 
-  '@sinclair/typebox@0.34.48': {}
-
   '@sinonjs/commons@3.0.1':
     dependencies:
       type-detect: 4.0.8
@@ -4819,11 +4721,6 @@ snapshots:
     dependencies:
       '@types/istanbul-lib-report': 3.0.3
 
-  '@types/jest@30.0.0':
-    dependencies:
-      expect: 30.2.0
-      pretty-format: 30.2.0
-
   '@types/json-schema@7.0.15': {}
 
   '@types/jsonwebtoken@9.0.10':
@@ -5219,8 +5116,6 @@ snapshots:
 
   ci-info@3.9.0: {}
 
-  ci-info@4.4.0: {}
-
   cjs-module-lexer@1.4.3: {}
 
   cliui@8.0.1:
@@ -5503,15 +5398,6 @@ snapshots:
       jest-message-util: 29.7.0
       jest-util: 29.7.0
 
-  expect@30.2.0:
-    dependencies:
-      '@jest/expect-utils': 30.2.0
-      '@jest/get-type': 30.1.0
-      jest-matcher-utils: 30.2.0
-      jest-message-util: 30.2.0
-      jest-mock: 30.2.0
-      jest-util: 30.2.0
-
   express-rate-limit@7.5.1(express@4.22.1):
     dependencies:
       express: 4.22.1
@@ -5986,13 +5872,6 @@ snapshots:
       jest-get-type: 29.6.3
       pretty-format: 29.7.0
 
-  jest-diff@30.2.0:
-    dependencies:
-      '@jest/diff-sequences': 30.0.1
-      '@jest/get-type': 30.1.0
-      chalk: 4.1.2
-      pretty-format: 30.2.0
-
   jest-docblock@29.7.0:
     dependencies:
       detect-newline: 3.1.0
@@ -6044,13 +5923,6 @@ snapshots:
       jest-get-type: 29.6.3
       pretty-format: 29.7.0
 
-  jest-matcher-utils@30.2.0:
-    dependencies:
-      '@jest/get-type': 30.1.0
-      chalk: 4.1.2
-      jest-diff: 30.2.0
-      pretty-format: 30.2.0
-
   jest-message-util@29.7.0:
     dependencies:
       '@babel/code-frame': 7.27.1
@@ -6063,38 +5935,18 @@ snapshots:
       slash: 3.0.0
       stack-utils: 2.0.6
 
-  jest-message-util@30.2.0:
-    dependencies:
-      '@babel/code-frame': 7.27.1
-      '@jest/types': 30.2.0
-      '@types/stack-utils': 2.0.3
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      micromatch: 4.0.8
-      pretty-format: 30.2.0
-      slash: 3.0.0
-      stack-utils: 2.0.6
-
   jest-mock@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
       '@types/node': 22.19.5
       jest-util: 29.7.0
 
-  jest-mock@30.2.0:
-    dependencies:
-      '@jest/types': 30.2.0
-      '@types/node': 22.19.5
-      jest-util: 30.2.0
-
   jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
     optionalDependencies:
       jest-resolve: 29.7.0
 
   jest-regex-util@29.6.3: {}
 
-  jest-regex-util@30.0.1: {}
-
   jest-resolve-dependencies@29.7.0:
     dependencies:
       jest-regex-util: 29.6.3
@@ -6201,15 +6053,6 @@ snapshots:
       graceful-fs: 4.2.11
       picomatch: 2.3.1
 
-  jest-util@30.2.0:
-    dependencies:
-      '@jest/types': 30.2.0
-      '@types/node': 22.19.5
-      chalk: 4.1.2
-      ci-info: 4.4.0
-      graceful-fs: 4.2.11
-      picomatch: 4.0.3
-
   jest-validate@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
@@ -6601,12 +6444,6 @@ snapshots:
       ansi-styles: 5.2.0
       react-is: 18.3.1
 
-  pretty-format@30.2.0:
-    dependencies:
-      '@jest/schemas': 30.0.5
-      ansi-styles: 5.2.0
-      react-is: 18.3.1
-
   prisma@5.22.0:
     dependencies:
       '@prisma/engines': 5.22.0
@@ -6960,7 +6797,7 @@ snapshots:
 
   ts-deepmerge@7.0.3: {}
 
-  ts-jest@29.4.6(@babel/core@7.28.5)(@jest/transform@29.7.0)(@jest/types@30.2.0)(babel-jest@29.7.0(@babel/core@7.28.5))(jest-util@30.2.0)(jest@29.7.0(@types/node@22.19.5))(typescript@5.9.3):
+  ts-jest@29.4.6(@babel/core@7.28.5)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.5))(jest-util@29.7.0)(jest@29.7.0(@types/node@22.19.5))(typescript@5.9.3):
     dependencies:
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
@@ -6976,9 +6813,9 @@ snapshots:
     optionalDependencies:
       '@babel/core': 7.28.5
       '@jest/transform': 29.7.0
-      '@jest/types': 30.2.0
+      '@jest/types': 29.6.3
       babel-jest: 29.7.0(@babel/core@7.28.5)
-      jest-util: 30.2.0
+      jest-util: 29.7.0
 
   tsconfig-paths@4.2.0:
     dependencies:

Backend/src/controllers/AdminCourseApprovalController.ts

@@ -24,7 +24,9 @@ export class AdminCourseApprovalController {
     @Response('401', 'Unauthorized')
     @Response('403', 'Forbidden - Admin only')
     public async listPendingCourses(@Request() request: any): Promise<ListPendingCoursesResponse> {
-        return await AdminCourseApprovalService.listPendingCourses(request.user.id);
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await AdminCourseApprovalService.listPendingCourses(token);
     }
 
     /**
@@ -39,7 +41,9 @@ export class AdminCourseApprovalController {
     @Response('403', 'Forbidden - Admin only')
     @Response('404', 'Course not found')
     public async getCourseDetail(@Request() request: any, @Path() courseId: number): Promise<GetCourseDetailForAdminResponse> {
-        return await AdminCourseApprovalService.getCourseDetail(request.user.id, courseId);
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await AdminCourseApprovalService.getCourseDetail(token, courseId);
     }
 
     /**
@@ -58,7 +62,10 @@ export class AdminCourseApprovalController {
         @Request() request: any,
         @Path() courseId: number
     ): Promise<ApproveCourseResponse> {
-        return await AdminCourseApprovalService.approveCourse(request.user.id, courseId, undefined);
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
+        return await AdminCourseApprovalService.approveCourse(token, courseId, undefined);
     }
 
     /**
@@ -78,10 +85,13 @@ export class AdminCourseApprovalController {
         @Path() courseId: number,
         @Body() body: RejectCourseBody
     ): Promise<RejectCourseResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         // Validate body
         const { error } = RejectCourseValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
-        return await AdminCourseApprovalService.rejectCourse(request.user.id, courseId, body.comment);
+        return await AdminCourseApprovalService.rejectCourse(token, courseId, body.comment);
     }
 }

Backend/src/controllers/AuditController.ts

@@ -40,6 +40,11 @@ export class AuditController {
         @Query() page?: number,
         @Query() limit?: number
     ): Promise<ListAuditLogsResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+
         return await auditService.getLogs({
             userId,
             action,
@@ -67,6 +72,11 @@ export class AuditController {
         @Request() request: any,
         @Path() logId: number
     ): Promise<AuditLogResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+
         const log = await auditService.getLogById(logId);
         if (!log) {
             throw new ValidationError('Audit log not found');
@@ -84,6 +94,11 @@ export class AuditController {
     @Response('401', 'Unauthorized')
     @Response('403', 'Forbidden - Admin only')
     public async getAuditStats(@Request() request: any): Promise<AuditLogStats> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+
         return await auditService.getStats();
     }
 
@@ -103,6 +118,11 @@ export class AuditController {
         @Path() entityType: string,
         @Path() entityId: number
     ): Promise<AuditLogResponse[]> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+
         return await auditService.getEntityHistory(entityType, entityId);
     }
 
@@ -122,6 +142,11 @@ export class AuditController {
         @Path() userId: number,
         @Query() limit?: number
     ): Promise<AuditLogResponse[]> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+
         return await auditService.getUserActivity(userId, limit || 50);
     }
 
@@ -139,6 +164,11 @@ export class AuditController {
         @Request() request: any,
         @Query() days: number = 90
     ): Promise<{ deleted: number; message: string }> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+
         if (days < 6) {
             throw new ValidationError('Cannot delete logs newer than 6 days');
         }

Backend/src/controllers/AuthController.ts

@@ -33,6 +33,32 @@ export class AuthController {
         data: {
             token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
             refreshToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
+            user: {
+                id: 1,
+                username: 'admin',
+                email: 'admin@elearning.local',
+                email_verified_at: new Date('2024-01-01T00:00:00Z'),
+                updated_at: new Date('2024-01-01T00:00:00Z'),
+                created_at: new Date('2024-01-01T00:00:00Z'),
+                role: {
+                    code: 'ADMIN',
+                    name: {
+                        th: 'ผู้ดูแลระบบ',
+                        en: 'Administrator'
+                    }
+                },
+                profile: {
+                    prefix: {
+                        th: 'นาย',
+                        en: 'Mr.'
+                    },
+                    first_name: 'Admin',
+                    last_name: 'User',
+                    phone: null,
+                    avatar_url: null,
+                    birth_date: null
+                }
+            }
         }
     })
     public async login(@Body() body: LoginRequest): Promise<LoginResponse> {

Backend/src/controllers/CategoriesController.ts

@@ -27,11 +27,13 @@ export class CategoriesAdminController {
     @SuccessResponse('200', 'Category created successfully')
     @Response('401', 'Invalid or expired token')
     public async createCategory(@Request() request: any, @Body() body: createCategory): Promise<createCategoryResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '') || '';
+
         // Validate body
         const { error } = CreateCategoryValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
-        return await this.categoryService.createCategory(request.user.id, body);
+        return await this.categoryService.createCategory(token, body);
     }
 
     @Put('{id}')
@@ -39,11 +41,13 @@ export class CategoriesAdminController {
     @SuccessResponse('200', 'Category updated successfully')
     @Response('401', 'Invalid or expired token')
     public async updateCategory(@Request() request: any, @Body() body: updateCategory): Promise<updateCategoryResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '') || '';
+
         // Validate body
         const { error } = UpdateCategoryValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
-        return await this.categoryService.updateCategory(request.user.id, body.id, body);
+        return await this.categoryService.updateCategory(token, body.id, body);
     }
 
     @Delete('{id}')
@@ -51,6 +55,7 @@ export class CategoriesAdminController {
     @SuccessResponse('200', 'Category deleted successfully')
     @Response('401', 'Invalid or expired token')
     public async deleteCategory(@Request() request: any, @Path() id: number): Promise<deleteCategoryResponse> {
-        return await this.categoryService.deleteCategory(request.user.id, id);
+        const token = request.headers.authorization?.replace('Bearer ', '') || '';
+        return await this.categoryService.deleteCategory(token, id);
     }
 }

Backend/src/controllers/CertificateController.ts

@@ -1,4 +1,5 @@
 import { Get, Post, Route, Tags, SuccessResponse, Response, Security, Path, Request } from 'tsoa';
+import { ValidationError } from '../middleware/errorHandler';
 import { CertificateService } from '../services/certificate.service';
 import {
     GenerateCertificateResponse,
@@ -20,7 +21,9 @@ export class CertificateController {
     @SuccessResponse('200', 'Certificates retrieved successfully')
     @Response('401', 'Invalid or expired token')
     public async listMyCertificates(@Request() request: any): Promise<ListMyCertificatesResponse> {
-        return await this.certificateService.listMyCertificates({ userId: request.user.id });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await this.certificateService.listMyCertificates({ token });
     }
 
     /**
@@ -34,7 +37,9 @@ export class CertificateController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Certificate not found')
     public async getCertificate(@Request() request: any, @Path() courseId: number): Promise<GetCertificateResponse> {
-        return await this.certificateService.getCertificate({ userId: request.user.id, course_id: courseId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await this.certificateService.getCertificate({ token, course_id: courseId });
     }
 
     /**
@@ -49,6 +54,8 @@ export class CertificateController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Enrollment not found')
     public async generateCertificate(@Request() request: any, @Path() courseId: number): Promise<GenerateCertificateResponse> {
-        return await this.certificateService.generateCertificate({ userId: request.user.id, course_id: courseId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await this.certificateService.generateCertificate({ token, course_id: courseId });
     }
 }

Backend/src/controllers/ChaptersLessonInstructorController.ts

@@ -65,11 +65,14 @@ export class ChaptersLessonInstructorController {
         @Path() courseId: number,
         @Body() body: CreateChapterBody
     ): Promise<CreateChapterResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = CreateChapterValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.createChapter({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             title: body.title,
             description: body.description,
@@ -93,11 +96,14 @@ export class ChaptersLessonInstructorController {
         @Path() chapterId: number,
         @Body() body: UpdateChapterBody
     ): Promise<UpdateChapterResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = UpdateChapterValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.updateChapter({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             chapter_id: chapterId,
             ...body,
@@ -119,7 +125,9 @@ export class ChaptersLessonInstructorController {
         @Path() courseId: number,
         @Path() chapterId: number
     ): Promise<DeleteChapterResponse> {
-        return await chaptersLessonService.deleteChapter({ userId: request.user.id, course_id: courseId, chapter_id: chapterId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await chaptersLessonService.deleteChapter({ token, course_id: courseId, chapter_id: chapterId });
     }
 
     /**
@@ -135,11 +143,14 @@ export class ChaptersLessonInstructorController {
         @Path() chapterId: number,
         @Body() body: ReorderChapterBody
     ): Promise<ReorderChapterResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = ReorderChapterValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.reorderChapter({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             chapter_id: chapterId,
             sort_order: body.sort_order,
@@ -163,7 +174,9 @@ export class ChaptersLessonInstructorController {
         @Path() chapterId: number,
         @Path() lessonId: number
     ): Promise<GetLessonResponse> {
-        return await chaptersLessonService.getLesson({ userId: request.user.id, course_id: courseId, chapter_id: chapterId, lesson_id: lessonId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await chaptersLessonService.getLesson({ token, course_id: courseId, chapter_id: chapterId, lesson_id: lessonId });
     }
 
     /**
@@ -179,11 +192,14 @@ export class ChaptersLessonInstructorController {
         @Path() chapterId: number,
         @Body() body: CreateLessonBody
     ): Promise<CreateLessonResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = CreateLessonValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.createLesson({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             chapter_id: chapterId,
             title: body.title,
@@ -207,11 +223,14 @@ export class ChaptersLessonInstructorController {
         @Path() lessonId: number,
         @Body() body: UpdateLessonBody
     ): Promise<UpdateLessonResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = UpdateLessonValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.updateLesson({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             chapter_id: chapterId,
             lesson_id: lessonId,
@@ -239,7 +258,9 @@ export class ChaptersLessonInstructorController {
         @Path() chapterId: number,
         @Path() lessonId: number
     ): Promise<DeleteLessonResponse> {
-        return await chaptersLessonService.deleteLesson({ userId: request.user.id, course_id: courseId, chapter_id: chapterId, lesson_id: lessonId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await chaptersLessonService.deleteLesson({ token, course_id: courseId, chapter_id: chapterId, lesson_id: lessonId });
     }
 
     /**
@@ -255,11 +276,14 @@ export class ChaptersLessonInstructorController {
         @Path() chapterId: number,
         @Body() body: ReorderLessonsBody
     ): Promise<ReorderLessonsResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = ReorderLessonsValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.reorderLessons({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             chapter_id: chapterId,
             lesson_id: body.lesson_id,
@@ -285,11 +309,14 @@ export class ChaptersLessonInstructorController {
         @Path() lessonId: number,
         @Body() body: AddQuestionBody
     ): Promise<AddQuestionResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = AddQuestionValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.addQuestion({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             ...body,
@@ -311,11 +338,14 @@ export class ChaptersLessonInstructorController {
         @Path() questionId: number,
         @Body() body: UpdateQuestionBody
     ): Promise<UpdateQuestionResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = UpdateQuestionValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.updateQuestion({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             question_id: questionId,
@@ -334,11 +364,14 @@ export class ChaptersLessonInstructorController {
         @Path() questionId: number,
         @Body() body: ReorderQuestionBody
     ): Promise<ReorderQuestionResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = ReorderQuestionValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.reorderQuestion({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             question_id: questionId,
@@ -360,8 +393,10 @@ export class ChaptersLessonInstructorController {
         @Path() lessonId: number,
         @Path() questionId: number
     ): Promise<DeleteQuestionResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await chaptersLessonService.deleteQuestion({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             question_id: questionId,
@@ -382,11 +417,14 @@ export class ChaptersLessonInstructorController {
         @Path() lessonId: number,
         @Body() body: UpdateQuizBody
     ): Promise<UpdateQuizResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = UpdateQuizValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.updateQuiz({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             ...body,

Backend/src/controllers/CoursesInstructorController.ts

@@ -22,10 +22,12 @@ import {
     GetCourseApprovalHistoryResponse,
     setCourseDraftResponse,
     CloneCourseResponse,
-    GetAllMyStudentsResponse,
 } from '../types/CoursesInstructor.types';
 import { CreateCourseValidator, UpdateCourseValidator, CloneCourseValidator } from "../validators/CoursesInstructor.validator";
 
+import jwt from 'jsonwebtoken';
+import { config } from '../config';
+
 @Route('api/instructors/courses')
 @Tags('CoursesInstructor')
 export class CoursesInstructorController {
@@ -43,7 +45,11 @@ export class CoursesInstructorController {
         @Request() request: any,
         @Query() status?: 'DRAFT' | 'PENDING' | 'APPROVED' | 'REJECTED' | 'ARCHIVED'
     ): Promise<ListMyCourseResponse> {
-        return await CoursesInstructorService.listMyCourses({ userId: request.user.id, status });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await CoursesInstructorService.listMyCourses({ token, status });
     }
 
     /**
@@ -61,23 +67,9 @@ export class CoursesInstructorController {
         @Path() courseId: number,
         @Query() query: string
     ): Promise<SearchInstructorResponse> {
-        return await CoursesInstructorService.searchInstructors({ userId: request.user.id, query, course_id: courseId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
-    }
+        if (!token) throw new ValidationError('No token provided');
-
+        return await CoursesInstructorService.searchInstructors({ token, query, course_id: courseId });
-    /**
-     * ดึงผู้เรียนทั้งหมดของ instructor ทุกคอร์ส
-     * Get all students enrolled in all of instructor's courses
-     *
-     * @returns รายการผู้เรียนแยกตามคอร์ส พร้อม total_enrolled และ total_completed ต่อคอร์ส
-     */
-    @Get('my-students')
-    @Security('jwt', ['instructor'])
-    @SuccessResponse('200', 'Students retrieved successfully')
-    @Response('401', 'Unauthorized')
-    public async getMyAllStudents(
-        @Request() request: any
-    ): Promise<GetAllMyStudentsResponse> {
-        return await CoursesInstructorService.getMyAllStudents(request.user.id);
     }
 
     /**
@@ -91,7 +83,11 @@ export class CoursesInstructorController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Course not found')
     public async getMyCourse(@Request() request: any, @Path() courseId: number): Promise<GetMyCourseResponse> {
-        return await CoursesInstructorService.getmyCourse({ userId: request.user.id, course_id: courseId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await CoursesInstructorService.getmyCourse({ token, course_id: courseId });
     }
 
     /**
@@ -105,10 +101,13 @@ export class CoursesInstructorController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Course not found')
     public async updateCourse(@Request() request: any, @Path() courseId: number, @Body() body: UpdateMyCourse): Promise<UpdateMyCourseResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = UpdateCourseValidator.validate(body.data);
         if (error) throw new ValidationError(error.details[0].message);
 
-        return await CoursesInstructorService.updateCourse(request.user.id, courseId, body.data);
+        return await CoursesInstructorService.updateCourse(token, courseId, body.data);
     }
 
     /**
@@ -127,6 +126,10 @@ export class CoursesInstructorController {
         @FormField() data: string,
         @UploadedFile() thumbnail?: Express.Multer.File
     ): Promise<createCourseResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
+        const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
         const parsed = JSON.parse(data);
         const { error, value } = CreateCourseValidator.validate(parsed);
         if (error) throw new ValidationError(error.details[0].message);
@@ -134,7 +137,7 @@ export class CoursesInstructorController {
         // Validate thumbnail file type if provided
         if (thumbnail && !thumbnail.mimetype?.startsWith('image/')) throw new ValidationError('Only image files are allowed for thumbnail');
 
-        return await CoursesInstructorService.createCourse(value, request.user.id, thumbnail);
+        return await CoursesInstructorService.createCourse(value, decoded.id, thumbnail);
     }
 
     /**
@@ -153,9 +156,11 @@ export class CoursesInstructorController {
         @Path() courseId: number,
         @UploadedFile() file: Express.Multer.File
     ): Promise<{ code: number; message: string; data: { course_id: number; thumbnail_url: string } }> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         if (!file.mimetype?.startsWith('image/')) throw new ValidationError('Only image files are allowed');
 
-        return await CoursesInstructorService.uploadThumbnail(request.user.id, courseId, file);
+        return await CoursesInstructorService.uploadThumbnail(token, courseId, file);
     }
 
     /**
@@ -169,7 +174,9 @@ export class CoursesInstructorController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Course not found')
     public async deleteCourse(@Request() request: any, @Path() courseId: number): Promise<DeleteMyCourseResponse> {
-        return await CoursesInstructorService.deleteCourse(request.user.id, courseId);
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided')
+        return await CoursesInstructorService.deleteCourse(token, courseId);
     }
 
     /**
@@ -189,11 +196,14 @@ export class CoursesInstructorController {
         @Path() courseId: number,
         @Body() body: { title: { th: string; en: string } }
     ): Promise<CloneCourseResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         const { error } = CloneCourseValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         const result = await CoursesInstructorService.cloneCourse({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             title: body.title
         });
@@ -210,7 +220,9 @@ export class CoursesInstructorController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Course not found')
     public async submitCourse(@Request() request: any, @Path() courseId: number): Promise<submitCourseResponse> {
-        return await CoursesInstructorService.sendCourseForReview({ userId: request.user.id, course_id: courseId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided')
+        return await CoursesInstructorService.sendCourseForReview({ token, course_id: courseId });
     }
 
     /**
@@ -224,7 +236,9 @@ export class CoursesInstructorController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Course not found')
     public async setCourseDraft(@Request() request: any, @Path() courseId: number): Promise<setCourseDraftResponse> {
-        return await CoursesInstructorService.setCourseDraft({ userId: request.user.id, course_id: courseId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided')
+        return await CoursesInstructorService.setCourseDraft({ token, course_id: courseId });
     }
 
     /**
@@ -239,7 +253,9 @@ export class CoursesInstructorController {
     @Response('403', 'You are not an instructor of this course')
     @Response('404', 'Course not found')
     public async getCourseApprovals(@Request() request: any, @Path() courseId: number): Promise<GetCourseApprovalsResponse> {
-        return await CoursesInstructorService.getCourseApprovals(request.user.id, courseId);
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided')
+        return await CoursesInstructorService.getCourseApprovals(token, courseId);
     }
 
     /**
@@ -253,7 +269,9 @@ export class CoursesInstructorController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Instructors not found')
     public async listInstructorCourses(@Request() request: any, @Path() courseId: number): Promise<listinstructorCourseResponse> {
-        return await CoursesInstructorService.listInstructorsOfCourse({ userId: request.user.id, course_id: courseId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided')
+        return await CoursesInstructorService.listInstructorsOfCourse({ token, course_id: courseId });
     }
 
     /**
@@ -268,7 +286,9 @@ export class CoursesInstructorController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Instructor not found')
     public async addInstructor(@Request() request: any, @Path() courseId: number, @Path() emailOrUsername: string): Promise<addinstructorCourseResponse> {
-        return await CoursesInstructorService.addInstructorToCourse({ userId: request.user.id, course_id: courseId, email_or_username: emailOrUsername });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided')
+        return await CoursesInstructorService.addInstructorToCourse({ token, course_id: courseId, email_or_username: emailOrUsername });
     }
 
     /**
@@ -283,7 +303,9 @@ export class CoursesInstructorController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Instructor not found')
     public async removeInstructor(@Request() request: any, @Path() courseId: number, @Path() userId: number): Promise<removeinstructorCourseResponse> {
-        return await CoursesInstructorService.removeInstructorFromCourse({ userId: request.user.id, course_id: courseId, user_id: userId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided')
+        return await CoursesInstructorService.removeInstructorFromCourse({ token, course_id: courseId, user_id: userId });
     }
 
     /**
@@ -298,7 +320,9 @@ export class CoursesInstructorController {
     @Response('401', 'Invalid or expired token')
     @Response('404', 'Primary instructor not found')
     public async setPrimaryInstructor(@Request() request: any, @Path() courseId: number, @Path() userId: number): Promise<setprimaryCourseInstructorResponse> {
-        return await CoursesInstructorService.setPrimaryInstructor({ userId: request.user.id, course_id: courseId, user_id: userId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided')
+        return await CoursesInstructorService.setPrimaryInstructor({ token, course_id: courseId, user_id: userId });
     }
 
     /**
@@ -323,8 +347,10 @@ export class CoursesInstructorController {
         @Query() search?: string,
         @Query() status?: 'ENROLLED' | 'COMPLETED'
     ): Promise<GetEnrolledStudentsResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await CoursesInstructorService.getEnrolledStudents({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             page,
             limit,
@@ -350,8 +376,10 @@ export class CoursesInstructorController {
         @Path() courseId: number,
         @Path() studentId: number
     ): Promise<GetEnrolledStudentDetailResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await CoursesInstructorService.getEnrolledStudentDetail({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             student_id: studentId,
         });
@@ -382,8 +410,10 @@ export class CoursesInstructorController {
         @Query() search?: string,
         @Query() isPassed?: boolean
     ): Promise<GetQuizScoresResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await CoursesInstructorService.getQuizScores({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             page,
@@ -412,8 +442,10 @@ export class CoursesInstructorController {
         @Path() lessonId: number,
         @Path() studentId: number
     ): Promise<GetQuizAttemptDetailResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await CoursesInstructorService.getQuizAttemptDetail({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             student_id: studentId,
@@ -435,6 +467,8 @@ export class CoursesInstructorController {
         @Request() request: any,
         @Path() courseId: number
     ): Promise<GetCourseApprovalHistoryResponse> {
-        return await CoursesInstructorService.getCourseApprovalHistory(request.user.id, courseId);
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await CoursesInstructorService.getCourseApprovalHistory(token, courseId);
     }
 }

Backend/src/controllers/CoursesStudentController.ts

@@ -36,7 +36,11 @@ export class CoursesStudentController {
     @Response('404', 'Course not found')
     @Response('409', 'Already enrolled in this course')
     public async enrollCourse(@Request() request: any, @Path() courseId: number): Promise<EnrollCourseResponse> {
-        return await this.service.enrollCourse({ userId: request.user.id, course_id: courseId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.service.enrollCourse({ token, course_id: courseId });
     }
 
     /**
@@ -56,7 +60,11 @@ export class CoursesStudentController {
         @Query() limit?: number,
         @Query() status?: EnrollmentStatus
     ): Promise<ListEnrolledCoursesResponse> {
-        return await this.service.GetEnrolledCourses({ userId: request.user.id, page, limit, status });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.service.GetEnrolledCourses({ token, page, limit, status });
     }
 
     /**
@@ -71,7 +79,11 @@ export class CoursesStudentController {
     @Response('403', 'Not enrolled in this course')
     @Response('404', 'Course not found')
     public async getCourseLearning(@Request() request: any, @Path() courseId: number): Promise<GetCourseLearningResponse> {
-        return await this.service.getCourseLearning({ userId: request.user.id, course_id: courseId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.service.getCourseLearning({ token, course_id: courseId });
     }
 
     /**
@@ -91,7 +103,11 @@ export class CoursesStudentController {
         @Path() courseId: number,
         @Path() lessonId: number
     ): Promise<GetLessonContentResponse> {
-        return await this.service.getlessonContent({ userId: request.user.id, course_id: courseId, lesson_id: lessonId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.service.getlessonContent({ token, course_id: courseId, lesson_id: lessonId });
     }
 
     /**
@@ -110,7 +126,11 @@ export class CoursesStudentController {
         @Path() courseId: number,
         @Path() lessonId: number
     ): Promise<CheckLessonAccessResponse> {
-        return await this.service.checkAccessLesson({ userId: request.user.id, course_id: courseId, lesson_id: lessonId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.service.checkAccessLesson({ token, course_id: courseId, lesson_id: lessonId });
     }
 
     /**
@@ -129,12 +149,14 @@ export class CoursesStudentController {
         @Path() lessonId: number,
         @Body() body: SaveVideoProgressBody
     ): Promise<SaveVideoProgressResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
 
         const { error } = SaveVideoProgressValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await this.service.saveVideoProgress({
-            userId: request.user.id,
+            token,
             lesson_id: lessonId,
             video_progress_seconds: body.video_progress_seconds,
             video_duration_seconds: body.video_duration_seconds,
@@ -156,7 +178,11 @@ export class CoursesStudentController {
         @Request() request: any,
         @Path() lessonId: number
     ): Promise<GetVideoProgressResponse> {
-        return await this.service.getVideoProgress({ userId: request.user.id, lesson_id: lessonId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.service.getVideoProgress({ token, lesson_id: lessonId });
     }
 
     /**
@@ -176,7 +202,11 @@ export class CoursesStudentController {
         @Path() courseId: number,
         @Path() lessonId: number
     ): Promise<CompleteLessonResponse> {
-        return await this.service.completeLesson({ userId: request.user.id, lesson_id: lessonId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.service.completeLesson({ token, lesson_id: lessonId });
     }
 
     /**
@@ -197,12 +227,14 @@ export class CoursesStudentController {
         @Path() lessonId: number,
         @Body() body: SubmitQuizBody
     ): Promise<SubmitQuizResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
 
         const { error } = SubmitQuizValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await this.service.submitQuiz({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             answers: body.answers,
@@ -226,8 +258,12 @@ export class CoursesStudentController {
         @Path() courseId: number,
         @Path() lessonId: number
     ): Promise<GetQuizAttemptsResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
         return await this.service.getQuizAttempts({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
         });

Backend/src/controllers/LessonsController.ts

@@ -42,6 +42,8 @@ export class LessonsController {
         @Path() lessonId: number,
         @UploadedFile() video: Express.Multer.File
     ): Promise<VideoOperationResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
 
         if (!video) {
             throw new ValidationError('Video file is required');
@@ -55,7 +57,7 @@ export class LessonsController {
         };
 
         return await chaptersLessonService.uploadVideo({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             video: videoInfo,
@@ -85,6 +87,8 @@ export class LessonsController {
         @Path() lessonId: number,
         @UploadedFile() video: Express.Multer.File
     ): Promise<VideoOperationResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
 
         if (!video) {
             throw new ValidationError('Video file is required');
@@ -98,7 +102,7 @@ export class LessonsController {
         };
 
         return await chaptersLessonService.updateVideo({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             video: videoInfo,
@@ -128,6 +132,8 @@ export class LessonsController {
         @Path() lessonId: number,
         @UploadedFile() attachment: Express.Multer.File
     ): Promise<AttachmentOperationResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
 
         if (!attachment) {
             throw new ValidationError('Attachment file is required');
@@ -141,7 +147,7 @@ export class LessonsController {
         };
 
         return await chaptersLessonService.uploadAttachment({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             attachment: attachmentInfo,
@@ -171,9 +177,11 @@ export class LessonsController {
         @Path() lessonId: number,
         @Path() attachmentId: number
     ): Promise<DeleteAttachmentResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
 
         return await chaptersLessonService.deleteAttachment({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             attachment_id: attachmentId,
@@ -203,12 +211,14 @@ export class LessonsController {
         @Path() lessonId: number,
         @Body() body: SetYouTubeVideoBody
     ): Promise<YouTubeVideoResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
 
         const { error } = SetYouTubeVideoValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await chaptersLessonService.setYouTubeVideo({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             lesson_id: lessonId,
             youtube_video_id: body.youtube_video_id,

Backend/src/controllers/RecommendedCoursesController.ts

@@ -1,4 +1,5 @@
 import { Get, Path, Put, Query, Request, Response, Route, Security, SuccessResponse, Tags } from 'tsoa';
+import { ValidationError } from '../middleware/errorHandler';
 import { RecommendedCoursesService } from '../services/RecommendedCourses.service';
 import {
     ListApprovedCoursesResponse,
@@ -24,7 +25,9 @@ export class RecommendedCoursesController {
         @Query() search?: string,
         @Query() categoryId?: number
     ): Promise<ListApprovedCoursesResponse> {
-        return await RecommendedCoursesService.listApprovedCourses(request.user.id, { search, categoryId });
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await RecommendedCoursesService.listApprovedCourses(token, { search, categoryId });
     }
 
     /**
@@ -40,7 +43,9 @@ export class RecommendedCoursesController {
     @Response('403', 'Forbidden - Admin only')
     @Response('404', 'Course not found')
     public async getCourseById(@Request() request: any, @Path() courseId: number): Promise<GetCourseByIdResponse> {
-        return await RecommendedCoursesService.getCourseById(request.user.id, courseId);
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await RecommendedCoursesService.getCourseById(token, courseId);
     }
 
     /**
@@ -60,6 +65,8 @@ export class RecommendedCoursesController {
         @Path() courseId: number,
         @Query() is_recommended: boolean
     ): Promise<ToggleRecommendedResponse> {
-        return await RecommendedCoursesService.toggleRecommended(request.user.id, courseId, is_recommended);
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await RecommendedCoursesService.toggleRecommended(token, courseId, is_recommended);
     }
 }

Backend/src/controllers/UserController.ts

@@ -1,10 +1,12 @@
-import { Get, Body, Post, Route, Tags, SuccessResponse, Response, Security, Request, Put, UploadedFile } from 'tsoa';
+import { Get, Body, Post, Route, Tags, SuccessResponse, Response, Example, Controller, Security, Request, Put, UploadedFile } from 'tsoa';
 import { ValidationError } from '../middleware/errorHandler';
 import { UserService } from '../services/user.service';
 import {
     UserResponse,
+    ProfileResponse,
     ProfileUpdate,
     ProfileUpdateResponse,
+    ChangePasswordRequest,
     ChangePasswordResponse,
     updateAvatarResponse,
     SendVerifyEmailResponse,
@@ -21,6 +23,8 @@ export class UserController {
 
     /**
      * Get current user profile
+     * @summary Retrieve authenticated user's profile information
+     * @param request Express request object with JWT token in Authorization header
      */
     @Get('me')
     @SuccessResponse('200', 'User found')
@@ -28,7 +32,12 @@ export class UserController {
     @Response('401', 'Invalid or expired token')
     @Security('jwt')
     public async getMe(@Request() request: any): Promise<UserResponse> {
-        return await this.userService.getUserProfile(request.user.id);
+        // Extract token from Authorization header
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.userService.getUserProfile(token);
     }
 
     @Put('me')
@@ -38,20 +47,34 @@ export class UserController {
     @Response('400', 'Validation error')
     public async updateProfile(@Request() request: any, @Body() body: ProfileUpdate): Promise<ProfileUpdateResponse> {
         const { error } = profileUpdateSchema.validate(body);
-        if (error) throw new ValidationError(error.details[0].message);
+        if (error) {
-        return await this.userService.updateProfile(request.user.id, body);
+            throw new ValidationError(error.details[0].message);
+        }
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.userService.updateProfile(token, body);
     }
 
     @Get('roles')
     @Security('jwt')
     @SuccessResponse('200', 'Roles retrieved successfully')
     @Response('401', 'Invalid or expired token')
-    public async getRoles(): Promise<rolesResponse> {
+    public async getRoles(@Request() request: any): Promise<rolesResponse> {
-        return await this.userService.getRoles();
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+        return await this.userService.getRoles(token);
     }
 
     /**
      * Change password
+     * @summary Change user password using old password
+     * @param request Express request object with JWT token in Authorization header
+     * @param body Old password and new password
+     * @returns Success message
      */
     @Post('change-password')
     @Security('jwt')
@@ -60,12 +83,22 @@ export class UserController {
     @Response('400', 'Validation error')
     public async changePassword(@Request() request: any, @Body() body: ChangePassword): Promise<ChangePasswordResponse> {
         const { error } = changePasswordSchema.validate(body);
-        if (error) throw new ValidationError(error.details[0].message);
+        if (error) {
-        return await this.userService.changePassword(request.user.id, body.oldPassword, body.newPassword);
+            throw new ValidationError(error.details[0].message);
+        }
+
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) {
+            throw new ValidationError('No token provided');
+        }
+
+        return await this.userService.changePassword(token, body.oldPassword, body.newPassword);
     }
 
     /**
      * Upload user avatar picture
+     * @param request Express request object with JWT token in Authorization header
+     * @param file Avatar image file
      */
     @Post('upload-avatar')
     @Security('jwt')
@@ -76,6 +109,9 @@ export class UserController {
         @Request() request: any,
         @UploadedFile() file: Express.Multer.File
     ): Promise<updateAvatarResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         // Validate file type (images only)
         if (!file.mimetype?.startsWith('image/')) throw new ValidationError('Only image files are allowed');
 
@@ -83,11 +119,13 @@ export class UserController {
         const maxSize = 5 * 1024 * 1024; // 5MB
         if (file.size > maxSize) throw new ValidationError('File size must be less than 5MB');
 
-        return await this.userService.uploadAvatarPicture(request.user.id, file);
+        return await this.userService.uploadAvatarPicture(token, file);
     }
 
     /**
      * Send verification email to user
+     * @summary Send email verification link to authenticated user's email
+     * @param request Express request object with JWT token in Authorization header
      */
     @Post('send-verify-email')
     @Security('jwt')
@@ -95,7 +133,9 @@ export class UserController {
     @Response('401', 'Invalid or expired token')
     @Response('400', 'Email already verified')
     public async sendVerifyEmail(@Request() request: any): Promise<SendVerifyEmailResponse> {
-        return await this.userService.sendVerifyEmail(request.user.id);
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+        return await this.userService.sendVerifyEmail(token);
     }
 
     /**

Backend/src/controllers/announcementsController.ts

@@ -37,8 +37,10 @@ export class AnnouncementsController {
         @Query() page?: number,
         @Query() limit?: number
     ): Promise<ListAnnouncementResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await announcementsService.listAnnouncement({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             page,
             limit,
@@ -61,6 +63,9 @@ export class AnnouncementsController {
         @FormField() data: string,
         @UploadedFiles() files?: Express.Multer.File[]
     ): Promise<CreateAnnouncementResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         // Parse JSON data field
         const parsed = JSON.parse(data) as CreateAnnouncementBody;
 
@@ -69,7 +74,7 @@ export class AnnouncementsController {
         if (error) throw new ValidationError(error.details[0].message);
 
         return await announcementsService.createAnnouncement({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             title: parsed.title,
             content: parsed.content,
@@ -98,12 +103,15 @@ export class AnnouncementsController {
         @Path() announcementId: number,
         @Body() body: UpdateAnnouncementBody
     ): Promise<UpdateAnnouncementResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
+
         // Validate body
         const { error } = UpdateAnnouncementValidator.validate(body);
         if (error) throw new ValidationError(error.details[0].message);
 
         return await announcementsService.updateAnnouncement({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             announcement_id: announcementId,
             title: body.title,
@@ -131,8 +139,10 @@ export class AnnouncementsController {
         @Path() courseId: number,
         @Path() announcementId: number
     ): Promise<DeleteAnnouncementResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await announcementsService.deleteAnnouncement({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             announcement_id: announcementId,
         });
@@ -156,8 +166,10 @@ export class AnnouncementsController {
         @Path() announcementId: number,
         @UploadedFile() file: Express.Multer.File
     ): Promise<UploadAnnouncementAttachmentResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await announcementsService.uploadAttachment({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             announcement_id: announcementId,
             file: file as any,
@@ -183,8 +195,10 @@ export class AnnouncementsController {
         @Path() announcementId: number,
         @Path() attachmentId: number
     ): Promise<DeleteAnnouncementAttachmentResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await announcementsService.deleteAttachment({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             announcement_id: announcementId,
             attachment_id: attachmentId,
@@ -214,8 +228,10 @@ export class AnnouncementsStudentController {
         @Query() page?: number,
         @Query() limit?: number
     ): Promise<ListAnnouncementResponse> {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        if (!token) throw new ValidationError('No token provided');
         return await announcementsService.listAnnouncement({
-            userId: request.user.id,
+            token,
             course_id: courseId,
             page,
             limit,

Backend/src/services/AdminCourseApproval.service.ts

@@ -1,6 +1,8 @@
 import { prisma } from '../config/database';
+import { config } from '../config';
 import { logger } from '../config/logger';
-import { ValidationError, NotFoundError } from '../middleware/errorHandler';
+import { UnauthorizedError, ValidationError, ForbiddenError, NotFoundError } from '../middleware/errorHandler';
+import jwt from 'jsonwebtoken';
 import { getPresignedUrl } from '../config/minio';
 import {
     ListPendingCoursesResponse,
@@ -16,7 +18,7 @@ export class AdminCourseApprovalService {
     /**
      * Get all pending courses for admin review
      */
-    static async listPendingCourses(userId: number): Promise<ListPendingCoursesResponse> {
+    static async listPendingCourses(token: string): Promise<ListPendingCoursesResponse> {
         try {
             const courses = await prisma.course.findMany({
                 where: { status: 'PENDING' },
@@ -94,8 +96,9 @@ export class AdminCourseApprovalService {
             };
         } catch (error) {
             logger.error('Failed to list pending courses', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: 0,
@@ -110,7 +113,7 @@ export class AdminCourseApprovalService {
     /**
      * Get course details for admin review
      */
-    static async getCourseDetail(userId: number, courseId: number): Promise<GetCourseDetailForAdminResponse> {
+    static async getCourseDetail(token: string, courseId: number): Promise<GetCourseDetailForAdminResponse> {
         try {
             const course = await prisma.course.findUnique({
                 where: { id: courseId },
@@ -225,8 +228,9 @@ export class AdminCourseApprovalService {
             };
         } catch (error) {
             logger.error('Failed to get course detail', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: courseId,
@@ -241,8 +245,9 @@ export class AdminCourseApprovalService {
     /**
      * Approve a course
      */
-    static async approveCourse(userId: number, courseId: number, comment?: string): Promise<ApproveCourseResponse> {
+    static async approveCourse(token: string, courseId: number, comment?: string): Promise<ApproveCourseResponse> {
         try {
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             const course = await prisma.course.findUnique({ where: { id: courseId } });
             if (!course) {
@@ -259,7 +264,7 @@ export class AdminCourseApprovalService {
                     where: { id: courseId },
                     data: {
                         status: 'APPROVED',
-                        approved_by: userId,
+                        approved_by: decoded.id,
                         approved_at: new Date()
                     }
                 }),
@@ -268,7 +273,7 @@ export class AdminCourseApprovalService {
                     data: {
                         course_id: courseId,
                         submitted_by: course.created_by,
-                        reviewed_by: userId,
+                        reviewed_by: decoded.id,
                         action: 'APPROVED',
                         previous_status: course.status,
                         new_status: 'APPROVED',
@@ -279,7 +284,7 @@ export class AdminCourseApprovalService {
 
             // Audit log - APPROVE_COURSE
             await auditService.logSync({
-                userId,
+                userId: decoded.id,
                 action: AuditAction.APPROVE_COURSE,
                 entityType: 'Course',
                 entityId: courseId,
@@ -294,8 +299,9 @@ export class AdminCourseApprovalService {
             };
         } catch (error) {
             logger.error('Failed to approve course', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: courseId,
@@ -311,8 +317,9 @@ export class AdminCourseApprovalService {
     /**
      * Reject a course
      */
-    static async rejectCourse(userId: number, courseId: number, comment: string): Promise<RejectCourseResponse> {
+    static async rejectCourse(token: string, courseId: number, comment: string): Promise<RejectCourseResponse> {
         try {
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             const course = await prisma.course.findUnique({ where: { id: courseId } });
             if (!course) {
@@ -343,7 +350,7 @@ export class AdminCourseApprovalService {
                     data: {
                         course_id: courseId,
                         submitted_by: course.created_by,
-                        reviewed_by: userId,
+                        reviewed_by: decoded.id,
                         action: 'REJECTED',
                         previous_status: course.status,
                         new_status: 'REJECTED',
@@ -354,7 +361,7 @@ export class AdminCourseApprovalService {
 
             // Audit log - REJECT_COURSE
             await auditService.logSync({
-                userId,
+                userId: decoded.id,
                 action: AuditAction.REJECT_COURSE,
                 entityType: 'Course',
                 entityId: courseId,
@@ -369,8 +376,9 @@ export class AdminCourseApprovalService {
             };
         } catch (error) {
             logger.error('Failed to reject course', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: courseId,

Backend/src/services/ChaptersLesson.service.ts

@@ -59,11 +59,14 @@ import { AuditAction } from '@prisma/client';
  * ตรวจสอบสิทธิ์เข้าถึง Course (สำหรับทั้ง Instructor และ Student)
  * Returns: { hasAccess: boolean, role: 'INSTRUCTOR' | 'STUDENT' | null, userId: number }
  */
-async function validateCourseAccess(userId: number, course_id: number): Promise<{
+async function validateCourseAccess(token: string, course_id: number): Promise<{
     hasAccess: boolean;
     role: 'INSTRUCTOR' | 'STUDENT' | null;
     userId: number;
 }> {
+    const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
+    const userId = decodedToken.id;
+
     const user = await prisma.user.findUnique({ where: { id: userId } });
     if (!user) {
         throw new UnauthorizedError('Invalid token');
@@ -95,8 +98,9 @@ async function validateCourseAccess(userId: number, course_id: number): Promise<
 export class ChaptersLessonService {
     async listChapters(request: ChaptersRequest): Promise<ListChaptersResponse> {
         try {
-            const { userId, course_id } = request;
+            const { token, course_id } = request;
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) {
                 throw new UnauthorizedError('Invalid token');
             }
@@ -113,13 +117,14 @@ export class ChaptersLessonService {
 
     async createChapter(request: CreateChapterInput): Promise<CreateChapterResponse> {
         try {
-            const { userId, course_id, title, description, sort_order } = request;
+            const { token, course_id, title, description, sort_order } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) {
                 throw new UnauthorizedError('Invalid token');
             }
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) {
                 throw new ForbiddenError('You are not permitted to create chapter');
             }
@@ -127,7 +132,7 @@ export class ChaptersLessonService {
 
             // Audit log - CREATE Chapter
             auditService.log({
-                userId: userId,
+                userId: decodedToken.id,
                 action: AuditAction.CREATE,
                 entityType: 'Chapter',
                 entityId: chapter.id,
@@ -137,8 +142,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Chapter created successfully', data: chapter as ChapterData };
         } catch (error) {
             logger.error(`Error creating chapter: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Chapter',
                 entityId: 0,
@@ -153,13 +159,14 @@ export class ChaptersLessonService {
 
     async updateChapter(request: UpdateChapterInput): Promise<UpdateChapterResponse> {
         try {
-            const { userId, course_id, chapter_id, title, description, sort_order } = request;
+            const { token, course_id, chapter_id, title, description, sort_order } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) {
                 throw new UnauthorizedError('Invalid token');
             }
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) {
                 throw new ForbiddenError('You are not permitted to update chapter');
             }
@@ -167,8 +174,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Chapter updated successfully', data: chapter as ChapterData };
         } catch (error) {
             logger.error(`Error updating chapter: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Chapter',
                 entityId: request.chapter_id,
@@ -183,13 +191,14 @@ export class ChaptersLessonService {
 
     async deleteChapter(request: DeleteChapterRequest): Promise<DeleteChapterResponse> {
         try {
-            const { userId, course_id, chapter_id } = request;
+            const { token, course_id, chapter_id } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) {
                 throw new UnauthorizedError('Invalid token');
             }
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) {
                 throw new ForbiddenError('You are not permitted to delete chapter');
             }
@@ -197,7 +206,7 @@ export class ChaptersLessonService {
 
             // Audit log - DELETE Chapter
             auditService.log({
-                userId: userId,
+                userId: decodedToken.id,
                 action: AuditAction.DELETE,
                 entityType: 'Chapter',
                 entityId: chapter_id,
@@ -210,8 +219,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Chapter deleted successfully' };
         } catch (error) {
             logger.error(`Error deleting chapter: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Chapter',
                 entityId: request.chapter_id,
@@ -226,13 +236,14 @@ export class ChaptersLessonService {
 
     async reorderChapter(request: ReorderChapterRequest): Promise<ReorderChapterResponse> {
         try {
-            const { userId, course_id, chapter_id, sort_order: newSortOrder } = request;
+            const { token, course_id, chapter_id, sort_order: newSortOrder } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) {
                 throw new UnauthorizedError('Invalid token');
             }
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) {
                 throw new ForbiddenError('You are not permitted to reorder chapter');
             }
@@ -302,8 +313,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Chapter reordered successfully', data: chapters as ChapterData[] };
         } catch (error) {
             logger.error(`Error reordering chapter: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Chapter',
                 entityId: request.chapter_id,
@@ -323,13 +335,14 @@ export class ChaptersLessonService {
      */
     async createLesson(request: CreateLessonInput): Promise<CreateLessonResponse> {
         try {
-            const { userId, course_id, chapter_id, title, content, type, sort_order } = request;
+            const { token, course_id, chapter_id, title, content, type, sort_order } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) {
                 throw new UnauthorizedError('Invalid token');
             }
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) {
                 throw new ForbiddenError('You are not permitted to create lesson');
             }
@@ -341,6 +354,7 @@ export class ChaptersLessonService {
 
             // If QUIZ type, create empty Quiz shell
             if (type === 'QUIZ') {
+                const userId = decodedToken.id;
 
                 await prisma.quiz.create({
                     data: {
@@ -362,7 +376,7 @@ export class ChaptersLessonService {
 
                 // Audit log - CREATE Lesson (QUIZ)
                 auditService.log({
-                    userId: userId,
+                    userId: decodedToken.id,
                     action: AuditAction.CREATE,
                     entityType: 'Lesson',
                     entityId: lesson.id,
@@ -374,7 +388,7 @@ export class ChaptersLessonService {
 
             // Audit log - CREATE Lesson
             auditService.log({
-                userId: userId,
+                userId: decodedToken.id,
                 action: AuditAction.CREATE,
                 entityType: 'Lesson',
                 entityId: lesson.id,
@@ -384,8 +398,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Lesson created successfully', data: lesson as LessonData };
         } catch (error) {
             logger.error(`Error creating lesson: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Lesson',
                 entityId: 0,
@@ -404,10 +419,10 @@ export class ChaptersLessonService {
      */
     async getLesson(request: GetLessonRequest): Promise<GetLessonResponse> {
         try {
-            const { userId, course_id, lesson_id } = request;
+            const { token, course_id, lesson_id } = request;
 
             // Check access for both instructor and enrolled student
-            const access = await validateCourseAccess(userId, course_id);
+            const access = await validateCourseAccess(token, course_id);
             if (!access.hasAccess) {
                 throw new ForbiddenError('You do not have access to this course');
             }
@@ -534,8 +549,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Lesson fetched successfully', data: lessonData as LessonData };
         } catch (error) {
             logger.error(`Error fetching lesson: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Lesson',
                 entityId: request.lesson_id,
@@ -550,13 +566,14 @@ export class ChaptersLessonService {
 
     async updateLesson(request: UpdateLessonRequest): Promise<UpdateLessonResponse> {
         try {
-            const { userId, course_id, lesson_id, data } = request;
+            const { token, course_id, lesson_id, data } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) {
                 throw new UnauthorizedError('Invalid token');
             }
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) {
                 throw new ForbiddenError('You are not permitted to update lesson');
             }
@@ -564,8 +581,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Lesson updated successfully', data: lesson as LessonData };
         } catch (error) {
             logger.error(`Error updating lesson: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Lesson',
                 entityId: request.lesson_id,
@@ -584,13 +602,14 @@ export class ChaptersLessonService {
      */
     async reorderLessons(request: ReorderLessonsRequest): Promise<ReorderLessonsResponse> {
         try {
-            const { userId, course_id, chapter_id, lesson_id, sort_order: newSortOrder } = request;
+            const { token, course_id, chapter_id, lesson_id, sort_order: newSortOrder } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to reorder lessons');
 
             // Verify chapter exists and belongs to the course
@@ -663,8 +682,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Lessons reordered successfully', data: lessons as LessonData[] };
         } catch (error) {
             logger.error(`Error reordering lessons: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Lesson',
                 entityId: request.lesson_id,
@@ -684,13 +704,14 @@ export class ChaptersLessonService {
      */
     async deleteLesson(request: DeleteLessonRequest): Promise<DeleteLessonResponse> {
         try {
-            const { userId, course_id, lesson_id } = request;
+            const { token, course_id, lesson_id } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to delete this lesson');
 
             // Fetch lesson with all related data
@@ -730,7 +751,7 @@ export class ChaptersLessonService {
 
             // Audit log - DELETE Lesson
             auditService.log({
-                userId: userId,
+                userId: decodedToken.id,
                 action: AuditAction.DELETE,
                 entityType: 'Lesson',
                 entityId: lesson_id,
@@ -743,8 +764,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Lesson deleted successfully' };
         } catch (error) {
             logger.error(`Error deleting lesson: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Lesson',
                 entityId: request.lesson_id,
@@ -767,13 +789,14 @@ export class ChaptersLessonService {
      */
     async uploadVideo(request: UploadVideoInput): Promise<VideoOperationResponse> {
         try {
-            const { userId, course_id, lesson_id, video } = request;
+            const { token, course_id, lesson_id, video } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists and is VIDEO type
@@ -810,7 +833,7 @@ export class ChaptersLessonService {
 
             // Audit log - UPLOAD_FILE (Video)
             auditService.log({
-                userId: userId,
+                userId: decodedToken.id,
                 action: AuditAction.UPLOAD_FILE,
                 entityType: 'Lesson',
                 entityId: lesson_id,
@@ -830,8 +853,9 @@ export class ChaptersLessonService {
             };
         } catch (error) {
             logger.error(`Error uploading video: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Lesson',
                 entityId: request.lesson_id,
@@ -850,13 +874,14 @@ export class ChaptersLessonService {
      */
     async updateVideo(request: UpdateVideoInput): Promise<VideoOperationResponse> {
         try {
-            const { userId, course_id, lesson_id, video } = request;
+            const { token, course_id, lesson_id, video } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists and is VIDEO type
@@ -921,8 +946,9 @@ export class ChaptersLessonService {
             };
         } catch (error) {
             logger.error(`Error updating video: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Lesson',
                 entityId: request.lesson_id,
@@ -941,13 +967,14 @@ export class ChaptersLessonService {
      */
     async setYouTubeVideo(request: SetYouTubeVideoInput): Promise<YouTubeVideoResponse> {
         try {
-            const { userId, course_id, lesson_id, youtube_video_id, video_title } = request;
+            const { token, course_id, lesson_id, youtube_video_id, video_title } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists and is VIDEO type
@@ -1011,8 +1038,9 @@ export class ChaptersLessonService {
             };
         } catch (error) {
             logger.error(`Error setting YouTube video: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Lesson',
                 entityId: request.lesson_id,
@@ -1031,13 +1059,14 @@ export class ChaptersLessonService {
      */
     async uploadAttachment(request: UploadAttachmentInput): Promise<AttachmentOperationResponse> {
         try {
-            const { userId, course_id, lesson_id, attachment } = request;
+            const { token, course_id, lesson_id, attachment } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists
@@ -1072,7 +1101,7 @@ export class ChaptersLessonService {
 
             // Audit log - UPLOAD_FILE (Attachment)
             auditService.log({
-                userId: userId,
+                userId: decodedToken.id,
                 action: AuditAction.UPLOAD_FILE,
                 entityType: 'LessonAttachment',
                 entityId: newAttachment.id,
@@ -1096,8 +1125,9 @@ export class ChaptersLessonService {
             };
         } catch (error) {
             logger.error(`Error uploading attachment: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'LessonAttachment',
                 entityId: request.lesson_id,
@@ -1116,13 +1146,14 @@ export class ChaptersLessonService {
      */
     async deleteAttachment(request: DeleteAttachmentInput): Promise<DeleteAttachmentResponse> {
         try {
-            const { userId, course_id, lesson_id, attachment_id } = request;
+            const { token, course_id, lesson_id, attachment_id } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists
@@ -1153,7 +1184,7 @@ export class ChaptersLessonService {
 
             // Audit log - DELETE_FILE (Attachment)
             auditService.log({
-                userId: userId,
+                userId: decodedToken.id,
                 action: AuditAction.DELETE_FILE,
                 entityType: 'LessonAttachment',
                 entityId: attachment_id,
@@ -1163,8 +1194,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Attachment deleted successfully' };
         } catch (error) {
             logger.error(`Error deleting attachment: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'LessonAttachment',
                 entityId: request.attachment_id,
@@ -1184,13 +1216,14 @@ export class ChaptersLessonService {
      */
     async addQuestion(request: AddQuestionInput): Promise<AddQuestionResponse> {
         try {
-            const { userId, course_id, lesson_id, question, explanation, question_type, sort_order, choices } = request;
+            const { token, course_id, lesson_id, question, explanation, question_type, sort_order, choices } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists and is QUIZ type
@@ -1248,8 +1281,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Question added successfully', data: completeQuestion as QuizQuestionData };
         } catch (error) {
             logger.error(`Error adding question: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Question',
                 entityId: 0,
@@ -1269,13 +1303,14 @@ export class ChaptersLessonService {
      */
     async updateQuestion(request: UpdateQuestionInput): Promise<UpdateQuestionResponse> {
         try {
-            const { userId, course_id, lesson_id, question_id, question, explanation, question_type, sort_order, choices } = request;
+            const { token, course_id, lesson_id, question_id, question, explanation, question_type, sort_order, choices } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists and is QUIZ type
@@ -1332,8 +1367,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Question updated successfully', data: completeQuestion as QuizQuestionData };
         } catch (error) {
             logger.error(`Error updating question: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Question',
                 entityId: request.question_id,
@@ -1348,13 +1384,14 @@ export class ChaptersLessonService {
 
     async reorderQuestion(request: ReorderQuestionInput): Promise<ReorderQuestionResponse> {
         try {
-            const { userId, course_id, lesson_id, question_id, sort_order } = request;
+            const { token, course_id, lesson_id, question_id, sort_order } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists and is QUIZ type
@@ -1434,8 +1471,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Question reordered successfully', data: questions as QuizQuestionData[] };
         } catch (error) {
             logger.error(`Error reordering question: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Question',
                 entityId: request.question_id,
@@ -1455,13 +1493,14 @@ export class ChaptersLessonService {
      */
     async deleteQuestion(request: DeleteQuestionInput): Promise<DeleteQuestionResponse> {
         try {
-            const { userId, course_id, lesson_id, question_id } = request;
+            const { token, course_id, lesson_id, question_id } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists and is QUIZ type
@@ -1491,8 +1530,9 @@ export class ChaptersLessonService {
             return { code: 200, message: 'Question deleted successfully' };
         } catch (error) {
             logger.error(`Error deleting question: ${error}`);
+            const decodedToken = jwt.decode(request.token) as { id: number } | null;
             await auditService.logSync({
-                userId: request.userId || 0,
+                userId: decodedToken?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Question',
                 entityId: request.question_id,
@@ -1640,13 +1680,14 @@ export class ChaptersLessonService {
      */
     async updateQuiz(request: UpdateQuizInput): Promise<UpdateQuizResponse> {
         try {
-            const { userId, course_id, lesson_id, title, description, passing_score, time_limit, shuffle_questions, shuffle_choices, show_answers_after_completion, is_skippable, allow_multiple_attempts } = request;
+            const { token, course_id, lesson_id, title, description, passing_score, time_limit, shuffle_questions, shuffle_choices, show_answers_after_completion, is_skippable, allow_multiple_attempts } = request;
+            const decodedToken = jwt.verify(token, config.jwt.secret) as { id: number };
             await CoursesInstructorService.validateCourseStatus(course_id);
 
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            const user = await prisma.user.findUnique({ where: { id: decodedToken.id } });
             if (!user) throw new UnauthorizedError('Invalid token');
 
-            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await CoursesInstructorService.validateCourseInstructor(token, course_id);
             if (!courseInstructor) throw new ForbiddenError('You are not permitted to modify this lesson');
 
             // Verify lesson exists and is QUIZ type

Backend/src/services/CoursesInstructor.service.ts

@@ -1,7 +1,9 @@
 import { prisma } from '../config/database';
 import { Prisma } from '@prisma/client';
+import { config } from '../config';
 import { logger } from '../config/logger';
-import { ValidationError, ForbiddenError, NotFoundError } from '../middleware/errorHandler';
+import { UnauthorizedError, ValidationError, ForbiddenError, NotFoundError } from '../middleware/errorHandler';
+import jwt from 'jsonwebtoken';
 import { uploadFile, deleteFile, getPresignedUrl } from '../config/minio';
 import {
     CreateCourseInput,
@@ -25,7 +27,6 @@ import {
     SearchInstructorResponse,
     GetEnrolledStudentsInput,
     GetEnrolledStudentsResponse,
-    EnrolledStudentData,
     GetQuizScoresInput,
     GetQuizScoresResponse,
     GetQuizAttemptDetailInput,
@@ -37,7 +38,6 @@ import {
     CloneCourseResponse,
     setCourseDraft,
     setCourseDraftResponse,
-    GetAllMyStudentsResponse,
 } from "../types/CoursesInstructor.types";
 import { auditService } from './audit.service';
 import { AuditAction } from '@prisma/client';
@@ -121,9 +121,10 @@ export class CoursesInstructorService {
 
     static async listMyCourses(input: ListMyCoursesInput): Promise<ListMyCourseResponse> {
         try {
+            const decoded = jwt.verify(input.token, config.jwt.secret) as { id: number; type: string };
             const courseInstructors = await prisma.courseInstructor.findMany({
                 where: {
-                    user_id: input.userId,
+                    user_id: decoded.id,
                     course: input.status ? { status: input.status } : undefined
                 },
                 include: {
@@ -156,8 +157,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to retrieve courses', { error });
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: 0,
@@ -172,10 +174,12 @@ export class CoursesInstructorService {
 
     static async getmyCourse(getmyCourse: getmyCourse): Promise<GetMyCourseResponse> {
         try {
+            const decoded = jwt.verify(getmyCourse.token, config.jwt.secret) as { id: number; type: string };
+
             // Check if user is instructor of this course
             const courseInstructor = await prisma.courseInstructor.findFirst({
                 where: {
-                    user_id: getmyCourse.userId,
+                    user_id: decoded.id,
                     course_id: getmyCourse.course_id
                 },
                 include: {
@@ -221,8 +225,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to retrieve course', { error });
+            const decoded = jwt.decode(getmyCourse.token) as { id: number } | null;
             await auditService.logSync({
-                userId: getmyCourse.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: getmyCourse.course_id,
@@ -235,9 +240,9 @@ export class CoursesInstructorService {
         }
     }
 
-    static async updateCourse(userId: number, courseId: number, courseData: UpdateCourseInput): Promise<createCourseResponse> {
+    static async updateCourse(token: string, courseId: number, courseData: UpdateCourseInput): Promise<createCourseResponse> {
         try {
-            await this.validateCourseInstructor(userId, courseId);
+            await this.validateCourseInstructor(token, courseId);
 
             const course = await prisma.course.update({
                 where: {
@@ -253,8 +258,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to update course', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: courseId,
@@ -267,9 +273,9 @@ export class CoursesInstructorService {
         }
     }
 
-    static async uploadThumbnail(userId: number, courseId: number, file: Express.Multer.File): Promise<{ code: number; message: string; data: { course_id: number; thumbnail_url: string } }> {
+    static async uploadThumbnail(token: string, courseId: number, file: Express.Multer.File): Promise<{ code: number; message: string; data: { course_id: number; thumbnail_url: string } }> {
         try {
-            await this.validateCourseInstructor(userId, courseId);
+            await this.validateCourseInstructor(token, courseId);
 
             // Get current course to check for existing thumbnail
             const currentCourse = await prisma.course.findUnique({
@@ -316,8 +322,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to upload thumbnail', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: courseId,
@@ -330,9 +337,9 @@ export class CoursesInstructorService {
         }
     }
 
-    static async deleteCourse(userId: number, courseId: number): Promise<createCourseResponse> {
+    static async deleteCourse(token: string, courseId: number): Promise<createCourseResponse> {
         try {
-            const courseInstructorId = await this.validateCourseInstructor(userId, courseId);
+            const courseInstructorId = await this.validateCourseInstructor(token, courseId);
             if (!courseInstructorId.is_primary) {
                 throw new ForbiddenError('You have no permission to delete this course');
             }
@@ -358,8 +365,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to delete course', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: courseId,
@@ -374,10 +382,11 @@ export class CoursesInstructorService {
 
     static async sendCourseForReview(sendCourseForReview: sendCourseForReview): Promise<submitCourseResponse> {
         try {
+            const decoded = jwt.verify(sendCourseForReview.token, config.jwt.secret) as { id: number; type: string };
             await prisma.courseApproval.create({
                 data: {
                     course_id: sendCourseForReview.course_id,
-                    submitted_by: sendCourseForReview.userId,
+                    submitted_by: decoded.id,
                 }
             });
             await prisma.course.update({
@@ -389,7 +398,7 @@ export class CoursesInstructorService {
                 }
             });
             await auditService.logSync({
-                userId: sendCourseForReview.userId,
+                userId: decoded.id,
                 action: AuditAction.UPDATE,
                 entityType: 'Course',
                 entityId: sendCourseForReview.course_id,
@@ -403,8 +412,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to send course for review', { error });
+            const decoded = jwt.decode(sendCourseForReview.token) as { id: number } | null;
             await auditService.logSync({
-                userId: sendCourseForReview.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: sendCourseForReview.course_id,
@@ -419,7 +429,7 @@ export class CoursesInstructorService {
 
     static async setCourseDraft(setCourseDraft: setCourseDraft): Promise<setCourseDraftResponse> {
         try {
-            await this.validateCourseInstructor(setCourseDraft.userId, setCourseDraft.course_id);
+            await this.validateCourseInstructor(setCourseDraft.token, setCourseDraft.course_id);
             await prisma.course.update({
                 where: {
                     id: setCourseDraft.course_id,
@@ -435,8 +445,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to set course to draft', { error });
+            const decoded = jwt.decode(setCourseDraft.token) as { id: number } | null;
             await auditService.logSync({
-                userId: setCourseDraft.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: setCourseDraft.course_id,
@@ -449,7 +460,7 @@ export class CoursesInstructorService {
         }
     }
 
-    static async getCourseApprovals(userId: number, courseId: number): Promise<{
+    static async getCourseApprovals(token: string, courseId: number): Promise<{
         code: number;
         message: string;
         data: any[];
@@ -457,7 +468,7 @@ export class CoursesInstructorService {
     }> {
         try {
             // Validate instructor access
-            await this.validateCourseInstructor(userId, courseId);
+            await this.validateCourseInstructor(token, courseId);
 
             const approvals = await prisma.courseApproval.findMany({
                 where: { course_id: courseId },
@@ -480,8 +491,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to retrieve course approvals', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: courseId,
@@ -498,6 +510,8 @@ export class CoursesInstructorService {
 
     static async searchInstructors(input: SearchInstructorInput): Promise<SearchInstructorResponse> {
         try {
+            const decoded = jwt.verify(input.token, config.jwt.secret) as { id: number };
+
             // Get existing instructors in the course
             const existingInstructors = await prisma.courseInstructor.findMany({
                 where: { course_id: input.course_id },
@@ -514,7 +528,7 @@ export class CoursesInstructorService {
                     ],
                     role: { code: 'INSTRUCTOR' },
                     id: {
-                        notIn: [input.userId, ...existingInstructorIds],
+                        notIn: [decoded.id, ...existingInstructorIds],
                     },
                 },
                 include: {
@@ -549,8 +563,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to search instructors', { error });
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: input.course_id,
@@ -566,7 +581,7 @@ export class CoursesInstructorService {
     static async addInstructorToCourse(addinstructorCourse: addinstructorCourse): Promise<addinstructorCourseResponse> {
         try {
             // Validate user is instructor of this course
-            await this.validateCourseInstructor(addinstructorCourse.userId, addinstructorCourse.course_id);
+            await this.validateCourseInstructor(addinstructorCourse.token, addinstructorCourse.course_id);
 
             // Find user by email or username
             const user = await prisma.user.findFirst({
@@ -604,8 +619,9 @@ export class CoursesInstructorService {
                 }
             });
 
+            const decoded = jwt.decode(addinstructorCourse.token) as { id: number } | null;
             await auditService.logSync({
-                userId: addinstructorCourse.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.CREATE,
                 entityType: 'Course',
                 entityId: addinstructorCourse.course_id,
@@ -621,8 +637,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to add instructor to course', { error });
+            const decoded = jwt.decode(addinstructorCourse.token) as { id: number } | null;
             await auditService.logSync({
-                userId: addinstructorCourse.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: addinstructorCourse.course_id,
@@ -637,6 +654,7 @@ export class CoursesInstructorService {
 
     static async removeInstructorFromCourse(removeinstructorCourse: removeinstructorCourse): Promise<removeinstructorCourseResponse> {
         try {
+            const decoded = jwt.verify(removeinstructorCourse.token, config.jwt.secret) as { id: number; type: string };
             await prisma.courseInstructor.delete({
                 where: {
                     course_id_user_id: {
@@ -647,7 +665,7 @@ export class CoursesInstructorService {
             });
 
             await auditService.logSync({
-                userId: removeinstructorCourse.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.DELETE,
                 entityType: 'Course',
                 entityId: removeinstructorCourse.course_id,
@@ -664,8 +682,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to remove instructor from course', { error });
+            const decoded = jwt.decode(removeinstructorCourse.token) as { id: number } | null;
             await auditService.logSync({
-                userId: removeinstructorCourse.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: removeinstructorCourse.course_id,
@@ -680,6 +699,7 @@ export class CoursesInstructorService {
 
     static async listInstructorsOfCourse(listinstructorCourse: listinstructorCourse): Promise<listinstructorCourseResponse> {
         try {
+            const decoded = jwt.verify(listinstructorCourse.token, config.jwt.secret) as { id: number; type: string };
             const courseInstructors = await prisma.courseInstructor.findMany({
                 where: {
                     course_id: listinstructorCourse.course_id,
@@ -723,8 +743,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to retrieve instructors of course', { error });
+            const decoded = jwt.decode(listinstructorCourse.token) as { id: number } | null;
             await auditService.logSync({
-                userId: listinstructorCourse.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: listinstructorCourse.course_id,
@@ -739,6 +760,7 @@ export class CoursesInstructorService {
 
     static async setPrimaryInstructor(setprimaryCourseInstructor: setprimaryCourseInstructor): Promise<setprimaryCourseInstructorResponse> {
         try {
+            const decoded = jwt.verify(setprimaryCourseInstructor.token, config.jwt.secret) as { id: number; type: string };
             await prisma.courseInstructor.update({
                 where: {
                     course_id_user_id: {
@@ -752,7 +774,7 @@ export class CoursesInstructorService {
             });
 
             await auditService.logSync({
-                userId: setprimaryCourseInstructor.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.UPDATE,
                 entityType: 'Course',
                 entityId: setprimaryCourseInstructor.course_id,
@@ -769,8 +791,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error('Failed to set primary instructor', { error });
+            const decoded = jwt.decode(setprimaryCourseInstructor.token) as { id: number } | null;
             await auditService.logSync({
-                userId: setprimaryCourseInstructor.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: setprimaryCourseInstructor.course_id,
@@ -783,10 +806,11 @@ export class CoursesInstructorService {
         }
     }
 
-    static async validateCourseInstructor(userId: number, courseId: number): Promise<{ user_id: number; is_primary: boolean }> {
+    static async validateCourseInstructor(token: string, courseId: number): Promise<{ user_id: number; is_primary: boolean }> {
+        const decoded = jwt.verify(token, config.jwt.secret) as { id: number; type: string };
         const courseInstructor = await prisma.courseInstructor.findFirst({
             where: {
-                user_id: userId,
+                user_id: decoded.id,
                 course_id: courseId
             }
         });
@@ -815,10 +839,10 @@ export class CoursesInstructorService {
      */
     static async getEnrolledStudents(input: GetEnrolledStudentsInput): Promise<GetEnrolledStudentsResponse> {
         try {
-            const { userId, course_id, page = 1, limit = 20, search, status } = input;
+            const { token, course_id, page = 1, limit = 20, search, status } = input;
 
             // Validate instructor
-            await this.validateCourseInstructor(userId, course_id);
+            await this.validateCourseInstructor(token, course_id);
 
             // Build where clause
             const whereClause: any = { course_id };
@@ -893,8 +917,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error(`Error getting enrolled students: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: input.course_id,
@@ -913,10 +938,11 @@ export class CoursesInstructorService {
      */
     static async getQuizScores(input: GetQuizScoresInput): Promise<GetQuizScoresResponse> {
         try {
-            const { userId, course_id, lesson_id, page = 1, limit = 20, search, is_passed } = input;
+            const { token, course_id, lesson_id, page = 1, limit = 20, search, is_passed } = input;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Validate instructor
-            await this.validateCourseInstructor(userId, course_id);
+            await this.validateCourseInstructor(token, course_id);
 
             // Get lesson and verify it's a QUIZ type
             const lesson = await prisma.lesson.findUnique({
@@ -1069,8 +1095,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error(`Error getting quiz scores: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: input.course_id,
@@ -1089,10 +1116,10 @@ export class CoursesInstructorService {
      */
     static async getQuizAttemptDetail(input: GetQuizAttemptDetailInput): Promise<GetQuizAttemptDetailResponse> {
         try {
-            const { userId, course_id, lesson_id, student_id } = input;
+            const { token, course_id, lesson_id, student_id } = input;
 
             // Validate instructor
-            await this.validateCourseInstructor(userId, course_id);
+            await this.validateCourseInstructor(token, course_id);
 
             // Get lesson and verify it's a QUIZ type
             const lesson = await prisma.lesson.findUnique({
@@ -1192,8 +1219,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error(`Error getting quiz attempt detail: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: input.course_id,
@@ -1212,10 +1240,10 @@ export class CoursesInstructorService {
      */
     static async getEnrolledStudentDetail(input: GetEnrolledStudentDetailInput): Promise<GetEnrolledStudentDetailResponse> {
         try {
-            const { userId, course_id, student_id } = input;
+            const { token, course_id, student_id } = input;
 
             // Validate instructor
-            await this.validateCourseInstructor(userId, course_id);
+            await this.validateCourseInstructor(token, course_id);
 
             // Get student info
             const student = await prisma.user.findUnique({
@@ -1339,8 +1367,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error(`Error getting enrolled student detail: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: input.course_id,
@@ -1357,10 +1386,12 @@ export class CoursesInstructorService {
      * ดึงประวัติการขออนุมัติคอร์ส
      * Get course approval history for instructor to see rejection reasons
      */
-    static async getCourseApprovalHistory(userId: number, courseId: number): Promise<GetCourseApprovalHistoryResponse> {
+    static async getCourseApprovalHistory(token: string, courseId: number): Promise<GetCourseApprovalHistoryResponse> {
         try {
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
+
             // Validate instructor access
-            await this.validateCourseInstructor(userId, courseId);
+            await this.validateCourseInstructor(token, courseId);
 
             // Get course with approval history
             const course = await prisma.course.findUnique({
@@ -1403,8 +1434,9 @@ export class CoursesInstructorService {
             };
         } catch (error) {
             logger.error(`Error getting course approval history: ${error}`);
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || undefined,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: courseId,
@@ -1422,10 +1454,11 @@ export class CoursesInstructorService {
      */
     static async cloneCourse(input: CloneCourseInput): Promise<CloneCourseResponse> {
         try {
-            const { userId, course_id, title } = input;
+            const { token, course_id, title } = input;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Validate instructor
-            const courseInstructor = await this.validateCourseInstructor(userId, course_id);
+            const courseInstructor = await this.validateCourseInstructor(token, course_id);
             if (!courseInstructor) {
                 throw new ForbiddenError('You are not an instructor of this course');
             }
@@ -1475,7 +1508,7 @@ export class CoursesInstructorService {
                         is_free: originalCourse.is_free,
                         have_certificate: originalCourse.have_certificate,
                         status: 'DRAFT', // Reset status
-                        created_by: userId
+                        created_by: decoded.id
                     }
                 });
 
@@ -1483,7 +1516,7 @@ export class CoursesInstructorService {
                 await tx.courseInstructor.create({
                     data: {
                         course_id: createdCourse.id,
-                        user_id: userId,
+                        user_id: decoded.id,
                         is_primary: true
                     }
                 });
@@ -1556,7 +1589,7 @@ export class CoursesInstructorService {
                                     shuffle_questions: lesson.quiz.shuffle_questions,
                                     shuffle_choices: lesson.quiz.shuffle_choices,
                                     show_answers_after_completion: lesson.quiz.show_answers_after_completion,
-                                    created_by: userId
+                                    created_by: decoded.id
                                 }
                             });
 
@@ -1603,7 +1636,7 @@ export class CoursesInstructorService {
             });
 
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded.id,
                 action: AuditAction.CREATE,
                 entityType: 'Course',
                 entityId: newCourse.id,
@@ -1625,8 +1658,9 @@ export class CoursesInstructorService {
 
         } catch (error) {
             logger.error(`Error cloning course: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Course',
                 entityId: input.course_id,
@@ -1638,45 +1672,4 @@ export class CoursesInstructorService {
             throw error;
         }
     }
-
-    /**
-     * ดึงผู้เรียนทั้งหมดในทุกคอร์สของ instructor
-     * Get all enrolled students across all courses the instructor owns/teaches
-     */
-    static async getMyAllStudents(userId: number): Promise<GetAllMyStudentsResponse> {
-        try {
-            // หา course IDs ทั้งหมดที่ instructor สอน
-            const instructorCourses = await prisma.courseInstructor.findMany({
-                where: { user_id: userId },
-                select: { course_id: true }
-            });
-
-            const courseIds = instructorCourses.map(ci => ci.course_id);
-
-            if (courseIds.length === 0) {
-                return { code: 200, message: 'Students retrieved successfully', total_students: 0, total_completed: 0 };
-            }
-
-            // unique students ทั้งหมด
-            const uniqueStudents = await prisma.enrollment.groupBy({
-                by: ['user_id'],
-                where: { course_id: { in: courseIds } },
-            });
-
-            // จำนวน enrollment ที่ COMPLETED
-            const totalCompleted = await prisma.enrollment.count({
-                where: { course_id: { in: courseIds }, status: 'COMPLETED' }
-            });
-
-            return {
-                code: 200,
-                message: 'Students retrieved successfully',
-                total_students: uniqueStudents.length,
-                total_completed: totalCompleted,
-            };
-        } catch (error) {
-            logger.error(`Error getting all students: ${error}`);
-            throw error;
-        }
-    }
 }

Backend/src/services/CoursesStudent.service.ts

@@ -133,7 +133,7 @@ export class CoursesStudentService {
     async enrollCourse(input: EnrollCourseInput): Promise<EnrollCourseResponse> {
         try {
             const { course_id } = input;
-            const userId = input.userId;
+            const decoded = jwt.verify(input.token, config.jwt.secret) as { id: number; type: string };
 
             const course = await prisma.course.findUnique({
                 where: { id: course_id },
@@ -146,7 +146,7 @@ export class CoursesStudentService {
             const existingEnrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -159,7 +159,7 @@ export class CoursesStudentService {
             const enrollment = await prisma.enrollment.create({
                 data: {
                     course_id,
-                    user_id: userId,
+                    user_id: decoded.id,
                     status: 'ENROLLED',
                     enrolled_at: new Date(),
                 },
@@ -167,11 +167,11 @@ export class CoursesStudentService {
 
             // Audit log - ENROLL
             auditService.log({
-                userId: userId,
+                userId: decoded.id,
                 action: AuditAction.ENROLL,
                 entityType: 'Enrollment',
                 entityId: enrollment.id,
-                newValue: { course_id, user_id: userId, status: 'ENROLLED' }
+                newValue: { course_id, user_id: decoded.id, status: 'ENROLLED' }
             });
 
             return {
@@ -187,9 +187,9 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(`Error enrolling in course: ${error}`);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Enrollment',
                 entityId: 0,
@@ -206,13 +206,13 @@ export class CoursesStudentService {
 
     async GetEnrolledCourses(input: ListEnrolledCoursesInput): Promise<ListEnrolledCoursesResponse> {
         try {
-            // destructure input
+            const { token } = input;
             const page = input.page ?? 1;
             const limit = input.limit ?? 20;
-            const userId = input.userId;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; type: string };
             const enrollments = await prisma.enrollment.findMany({
                 where: {
-                    user_id: userId,
+                    user_id: decoded.id,
                 },
                 include: {
                     course: {
@@ -230,7 +230,7 @@ export class CoursesStudentService {
             });
             const total = await prisma.enrollment.count({
                 where: {
-                    user_id: userId,
+                    user_id: decoded.id,
                 },
             });
 
@@ -274,9 +274,9 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(error);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Enrollment',
                 entityId: 0,
@@ -290,8 +290,8 @@ export class CoursesStudentService {
     }
     async getCourseLearning(input: GetCourseLearningInput): Promise<GetCourseLearningResponse> {
         try {
-            const { course_id } = input;
+            const { token, course_id } = input;
-            const userId = input.userId;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; type: string };
 
             // Get course with chapters and lessons (basic info only)
             const course = await prisma.course.findUnique({
@@ -330,7 +330,7 @@ export class CoursesStudentService {
             const enrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -345,7 +345,7 @@ export class CoursesStudentService {
                 prisma.enrollment.update({
                     where: {
                         unique_enrollment: {
-                            user_id: userId,
+                            user_id: decoded.id,
                             course_id,
                         },
                     },
@@ -357,7 +357,7 @@ export class CoursesStudentService {
             const lessonIds = course.chapters.flatMap(ch => ch.lessons.map(l => l.id));
             const lessonProgress = await prisma.lessonProgress.findMany({
                 where: {
-                    user_id: userId,
+                    user_id: decoded.id,
                     lesson_id: { in: lessonIds },
                 },
             });
@@ -453,9 +453,9 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(error);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Enrollment',
                 entityId: 0,
@@ -470,8 +470,8 @@ export class CoursesStudentService {
 
     async getlessonContent(input: GetLessonContentInput): Promise<GetLessonContentResponse> {
         try {
-            const { course_id, lesson_id } = input;
+            const { token, course_id, lesson_id } = input;
-            const userId = input.userId;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; type: string };
 
             // Import MinIO functions
 
@@ -479,7 +479,7 @@ export class CoursesStudentService {
             const enrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -528,7 +528,7 @@ export class CoursesStudentService {
             const lessonProgress = await prisma.lessonProgress.findUnique({
                 where: {
                     user_id_lesson_id: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         lesson_id,
                     },
                 },
@@ -639,7 +639,7 @@ export class CoursesStudentService {
                 // Get latest quiz attempt for this user
                 latestQuizAttempt = await prisma.quizAttempt.findFirst({
                     where: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         quiz_id: lesson.quiz.id,
                     },
                     orderBy: {
@@ -726,9 +726,9 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(error);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Enrollment',
                 entityId: 0,
@@ -744,14 +744,14 @@ export class CoursesStudentService {
 
     async checkAccessLesson(input: CheckLessonAccessInput): Promise<CheckLessonAccessResponse> {
         try {
-            const { course_id, lesson_id } = input;
+            const { token, course_id, lesson_id } = input;
-            const userId = input.userId;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; type: string };
 
             // Check enrollment
             const enrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -845,7 +845,7 @@ export class CoursesStudentService {
             // Get user's progress for prerequisite lessons
             const prerequisiteProgress = await prisma.lessonProgress.findMany({
                 where: {
-                    user_id: userId,
+                    user_id: decoded.id,
                     lesson_id: { in: prerequisiteIds },
                 },
             });
@@ -879,7 +879,7 @@ export class CoursesStudentService {
                     // Check if user passed the quiz
                     const quizAttempt = await prisma.quizAttempt.findFirst({
                         where: {
-                            user_id: userId,
+                            user_id: decoded.id,
                             quiz_id: prereqLesson.quiz.id,
                             is_passed: true,
                         },
@@ -925,9 +925,9 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(error);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Enrollment',
                 entityId: 0,
@@ -942,8 +942,8 @@ export class CoursesStudentService {
 
     async getVideoProgress(input: GetVideoProgressInput): Promise<GetVideoProgressResponse> {
         try {
-            const { lesson_id } = input;
+            const { token, lesson_id } = input;
-            const userId = input.userId;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; type: string };
 
             // Get lesson to find course_id
             const lesson = await prisma.lesson.findUnique({
@@ -966,7 +966,7 @@ export class CoursesStudentService {
             const enrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -980,7 +980,7 @@ export class CoursesStudentService {
             const progress = await prisma.lessonProgress.findUnique({
                 where: {
                     user_id_lesson_id: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         lesson_id,
                     },
                 },
@@ -1010,9 +1010,9 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(error);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Enrollment',
                 entityId: 0,
@@ -1027,8 +1027,8 @@ export class CoursesStudentService {
 
     async saveVideoProgress(input: SaveVideoProgressInput): Promise<SaveVideoProgressResponse> {
         try {
-            const { lesson_id, video_progress_seconds, video_duration_seconds } = input;
+            const { token, lesson_id, video_progress_seconds, video_duration_seconds } = input;
-            const userId = input.userId;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; type: string };
 
             // Get lesson to find course_id
             const lesson = await prisma.lesson.findUnique({
@@ -1051,7 +1051,7 @@ export class CoursesStudentService {
             const enrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -1074,12 +1074,12 @@ export class CoursesStudentService {
             const progress = await prisma.lessonProgress.upsert({
                 where: {
                     user_id_lesson_id: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         lesson_id,
                     },
                 },
                 create: {
-                    user_id: userId,
+                    user_id: decoded.id,
                     lesson_id,
                     video_progress_seconds,
                     video_duration_seconds: video_duration_seconds ?? null,
@@ -1098,7 +1098,7 @@ export class CoursesStudentService {
             // If video completed, mark lesson as complete and update enrollment progress
             let enrollmentProgress: { progress_percentage: number; is_course_completed: boolean } | undefined;
             if (isCompleted) {
-                const result = await this.markLessonComplete(userId, lesson_id, course_id);
+                const result = await this.markLessonComplete(decoded.id, lesson_id, course_id);
                 enrollmentProgress = result.enrollmentProgress;
             }
 
@@ -1118,9 +1118,9 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(error);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Enrollment',
                 entityId: 0,
@@ -1135,8 +1135,8 @@ export class CoursesStudentService {
 
     async completeLesson(input: CompleteLessonInput): Promise<CompleteLessonResponse> {
         try {
-            const { lesson_id } = input;
+            const { token, lesson_id } = input;
-            const userId = input.userId;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; type: string };
 
             // Get lesson with chapter and course info
             const lesson = await prisma.lesson.findUnique({
@@ -1185,7 +1185,7 @@ export class CoursesStudentService {
             const enrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -1196,7 +1196,7 @@ export class CoursesStudentService {
             }
 
             // Mark lesson as complete and update enrollment progress
-            const { lessonProgress, enrollmentProgress } = await this.markLessonComplete(userId, lesson_id, course_id);
+            const { lessonProgress, enrollmentProgress } = await this.markLessonComplete(decoded.id, lesson_id, course_id);
             const { progress_percentage: course_progress_percentage, is_course_completed } = enrollmentProgress;
 
             // Find next lesson
@@ -1225,7 +1225,7 @@ export class CoursesStudentService {
                 // Check if certificate already exists
                 const existingCertificate = await prisma.certificate.findFirst({
                     where: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 });
@@ -1233,10 +1233,10 @@ export class CoursesStudentService {
                 if (!existingCertificate) {
                     await prisma.certificate.create({
                         data: {
-                            user_id: userId,
+                            user_id: decoded.id,
                             course_id,
                             enrollment_id: enrollment.id,
-                            file_path: `certificates/${course_id}/${userId}/${Date.now()}.pdf`,
+                            file_path: `certificates/${course_id}/${decoded.id}/${Date.now()}.pdf`,
                             issued_at: new Date(),
                         },
                     });
@@ -1261,9 +1261,9 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(`Error completing lesson: ${error}`);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'LessonProgress',
                 entityId: input.lesson_id,
@@ -1283,14 +1283,14 @@ export class CoursesStudentService {
      */
     async submitQuiz(input: SubmitQuizInput): Promise<SubmitQuizResponse> {
         try {
-            const { course_id, lesson_id, answers } = input;
+            const { token, course_id, lesson_id, answers } = input;
-            const userId = input.userId;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Check enrollment
             const enrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -1331,7 +1331,7 @@ export class CoursesStudentService {
             // Get previous attempt count
             const previousAttempts = await prisma.quizAttempt.count({
                 where: {
-                    user_id: userId,
+                    user_id: decoded.id,
                     quiz_id: quiz.id,
                 },
             });
@@ -1384,7 +1384,7 @@ export class CoursesStudentService {
             const now = new Date();
             const quizAttempt = await prisma.quizAttempt.create({
                 data: {
-                    user_id: userId,
+                    user_id: decoded.id,
                     quiz_id: quiz.id,
                     score: earnedScore,
                     total_questions: quiz.questions.length,
@@ -1400,7 +1400,7 @@ export class CoursesStudentService {
             // If passed, mark lesson as complete and update enrollment progress
             let enrollmentProgress: { progress_percentage: number; is_course_completed: boolean } | undefined;
             if (isPassed) {
-                const result = await this.markLessonComplete(userId, lesson_id, course_id);
+                const result = await this.markLessonComplete(decoded.id, lesson_id, course_id);
                 enrollmentProgress = result.enrollmentProgress;
             }
 
@@ -1429,9 +1429,9 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(`Error submitting quiz: ${error}`);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'QuizAttempt',
                 entityId: 0,
@@ -1452,14 +1452,14 @@ export class CoursesStudentService {
      */
     async getQuizAttempts(input: GetQuizAttemptsInput): Promise<GetQuizAttemptsResponse> {
         try {
-            const { course_id, lesson_id } = input;
+            const { token, course_id, lesson_id } = input;
-            const userId = input.userId;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Check enrollment
             const enrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -1494,7 +1494,7 @@ export class CoursesStudentService {
             // Get all quiz attempts for this user
             const attempts = await prisma.quizAttempt.findMany({
                 where: {
-                    user_id: userId,
+                    user_id: decoded.id,
                     quiz_id: lesson.quiz.id,
                 },
                 orderBy: { attempt_number: 'desc' },
@@ -1539,9 +1539,10 @@ export class CoursesStudentService {
             };
         } catch (error) {
             logger.error(error);
-            // userId from middleware
+            const decoded = jwt.decode(input.token) as { id: number } | null;
+            if (decoded?.id) {
                 await auditService.logSync({
-                userId: input.userId,
+                    userId: decoded.id,
                     action: AuditAction.ERROR,
                     entityType: 'QuizAttempt',
                     entityId: 0,
@@ -1552,6 +1553,7 @@ export class CoursesStudentService {
                         error: error instanceof Error ? error.message : String(error)
                     }
                 });
+            }
             throw error;
         }
     }

Backend/src/services/RecommendedCourses.service.ts

@@ -1,6 +1,8 @@
 import { prisma } from '../config/database';
+import { config } from '../config';
 import { logger } from '../config/logger';
 import { NotFoundError, ValidationError } from '../middleware/errorHandler';
+import jwt from 'jsonwebtoken';
 import { getPresignedUrl } from '../config/minio';
 import {
     ListApprovedCoursesResponse,
@@ -18,7 +20,7 @@ export class RecommendedCoursesService {
      * List all approved courses (for admin to manage recommendations)
      */
     static async listApprovedCourses(
-        userId: number,
+        token: string,
         filters?: { search?: string; categoryId?: number }
     ): Promise<ListApprovedCoursesResponse> {
         try {
@@ -106,8 +108,10 @@ export class RecommendedCoursesService {
             };
         } catch (error) {
             logger.error('Failed to list approved courses', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
+            if (decoded?.id) {
                 await auditService.logSync({
-                userId,
+                    userId: decoded.id,
                     action: AuditAction.ERROR,
                     entityType: 'RecommendedCourses',
                     entityId: 0,
@@ -116,6 +120,7 @@ export class RecommendedCoursesService {
                         error: error instanceof Error ? error.message : String(error)
                     }
                 });
+            }
             throw error;
         }
     }
@@ -123,7 +128,7 @@ export class RecommendedCoursesService {
     /**
      * Get course by ID (for admin to view details)
      */
-    static async getCourseById(userId: number, courseId: number): Promise<GetCourseByIdResponse> {
+    static async getCourseById(token: string, courseId: number): Promise<GetCourseByIdResponse> {
         try {
             const course = await prisma.course.findUnique({
                 where: { id: courseId },
@@ -208,8 +213,10 @@ export class RecommendedCoursesService {
             };
         } catch (error) {
             logger.error('Failed to get course by ID', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
+            if (decoded?.id) {
                 await auditService.logSync({
-                userId,
+                    userId: decoded.id,
                     action: AuditAction.ERROR,
                     entityType: 'RecommendedCourses',
                     entityId: 0,
@@ -218,6 +225,7 @@ export class RecommendedCoursesService {
                         error: error instanceof Error ? error.message : String(error)
                     }
                 });
+            }
             throw error;
         }
     }
@@ -226,11 +234,12 @@ export class RecommendedCoursesService {
      * Toggle course recommendation status
      */
     static async toggleRecommended(
-        userId: number,
+        token: string,
         courseId: number,
         isRecommended: boolean
     ): Promise<ToggleRecommendedResponse> {
         try {
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             const course = await prisma.course.findUnique({ where: { id: courseId } });
             if (!course) {
@@ -248,7 +257,7 @@ export class RecommendedCoursesService {
 
             // Audit log
             await auditService.logSync({
-                userId,
+                userId: decoded.id,
                 action: AuditAction.UPDATE,
                 entityType: 'Course',
                 entityId: courseId,
@@ -267,8 +276,9 @@ export class RecommendedCoursesService {
             };
         } catch (error) {
             logger.error('Failed to toggle recommended status', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'RecommendedCourses',
                 entityId: courseId,

Backend/src/services/announcements.service.ts

@@ -1,6 +1,8 @@
 import { prisma } from '../config/database';
+import { config } from '../config';
 import { logger } from '../config/logger';
-import { ForbiddenError, NotFoundError } from '../middleware/errorHandler';
+import { UnauthorizedError, ForbiddenError, NotFoundError } from '../middleware/errorHandler';
+import jwt from 'jsonwebtoken';
 import {
     ListAnnouncementResponse,
     CreateAnnouncementInput,
@@ -29,26 +31,27 @@ export class AnnouncementsService {
      */
     async listAnnouncement(input: ListAnnouncementInput): Promise<ListAnnouncementResponse> {
         try {
-            const { userId, course_id, page = 1, limit = 10 } = input;
+            const { token, course_id, page = 1, limit = 10 } = input;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; type: string };
 
             // Check user access - instructor, admin, or enrolled student
             const user = await prisma.user.findUnique({
-                where: { id: userId },
+                where: { id: decoded.id },
                 include: { role: true },
             });
-            if (!user) throw new ForbiddenError('User not found');
+            if (!user) throw new UnauthorizedError('Invalid token');
 
             // Admin can access all courses
             const isAdmin = user.role.code === 'ADMIN';
 
             // Check if instructor of this course
             const isInstructor = await prisma.courseInstructor.findFirst({
-                where: { course_id, user_id: userId },
+                where: { course_id, user_id: decoded.id },
             });
 
             // Check if enrolled student
             const isEnrolled = await prisma.enrollment.findFirst({
-                where: { course_id, user_id: userId },
+                where: { course_id, user_id: decoded.id },
             });
 
             if (!isAdmin && !isInstructor && !isEnrolled) throw new ForbiddenError('You do not have access to this course announcements');
@@ -127,8 +130,9 @@ export class AnnouncementsService {
             };
         } catch (error) {
             logger.error(`Error listing announcements: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Announcement',
                 entityId: 0,
@@ -146,10 +150,11 @@ export class AnnouncementsService {
      */
     async createAnnouncement(input: CreateAnnouncementInput): Promise<CreateAnnouncementResponse> {
         try {
-            const { userId, course_id, title, content, status, is_pinned, published_at, files } = input;
+            const { token, course_id, title, content, status, is_pinned, published_at, files } = input;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Validate instructor access
-            await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            await CoursesInstructorService.validateCourseInstructor(token, course_id);
 
             // Determine published_at: use provided value or default to now if status is PUBLISHED
             let finalPublishedAt: Date | null = null;
@@ -166,7 +171,7 @@ export class AnnouncementsService {
                     status: status as any,
                     is_pinned,
                     published_at: finalPublishedAt,
-                    created_by: userId,
+                    created_by: decoded.id,
                 },
             });
 
@@ -231,8 +236,9 @@ export class AnnouncementsService {
             };
         } catch (error) {
             logger.error(`Error creating announcement: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Announcement',
                 entityId: 0,
@@ -250,10 +256,11 @@ export class AnnouncementsService {
      */
     async updateAnnouncement(input: UpdateAnnouncementInput): Promise<UpdateAnnouncementResponse> {
         try {
-            const { userId, course_id, announcement_id, title, content, status, is_pinned, published_at } = input;
+            const { token, course_id, announcement_id, title, content, status, is_pinned, published_at } = input;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Validate instructor access
-            await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            await CoursesInstructorService.validateCourseInstructor(token, course_id);
 
             // Check announcement exists and belongs to course
             const existing = await prisma.announcement.findFirst({
@@ -282,7 +289,7 @@ export class AnnouncementsService {
                     status: status as any,
                     is_pinned,
                     published_at: finalPublishedAt,
-                    updated_by: userId,
+                    updated_by: decoded.id,
                 },
                 include: {
                     attachments: true,
@@ -313,8 +320,9 @@ export class AnnouncementsService {
             };
         } catch (error) {
             logger.error(`Error updating announcement: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Announcement',
                 entityId: 0,
@@ -332,10 +340,11 @@ export class AnnouncementsService {
      */
     async deleteAnnouncement(input: DeleteAnnouncementInput): Promise<DeleteAnnouncementResponse> {
         try {
-            const { userId, course_id, announcement_id } = input;
+            const { token, course_id, announcement_id } = input;
+            jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Validate instructor access
-            await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            await CoursesInstructorService.validateCourseInstructor(token, course_id);
 
             // Check announcement exists and belongs to course
             const existing = await prisma.announcement.findFirst({
@@ -367,8 +376,9 @@ export class AnnouncementsService {
             };
         } catch (error) {
             logger.error(`Error deleting announcement: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Announcement',
                 entityId: 0,
@@ -386,10 +396,11 @@ export class AnnouncementsService {
      */
     async uploadAttachment(input: UploadAnnouncementAttachmentInput): Promise<UploadAnnouncementAttachmentResponse> {
         try {
-            const { userId, course_id, announcement_id, file } = input;
+            const { token, course_id, announcement_id, file } = input;
+            jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Validate instructor access
-            await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            await CoursesInstructorService.validateCourseInstructor(token, course_id);
 
             // Check announcement exists and belongs to course
             const existing = await prisma.announcement.findFirst({
@@ -440,8 +451,9 @@ export class AnnouncementsService {
             };
         } catch (error) {
             logger.error(`Error uploading attachment: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Announcement',
                 entityId: 0,
@@ -459,10 +471,11 @@ export class AnnouncementsService {
      */
     async deleteAttachment(input: DeleteAnnouncementAttachmentInput): Promise<DeleteAnnouncementAttachmentResponse> {
         try {
-            const { userId, course_id, announcement_id, attachment_id } = input;
+            const { token, course_id, announcement_id, attachment_id } = input;
+            jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Validate instructor access
-            await CoursesInstructorService.validateCourseInstructor(userId, course_id);
+            await CoursesInstructorService.validateCourseInstructor(token, course_id);
 
             // Check attachment exists and belongs to announcement in this course
             const attachment = await prisma.announcementAttachment.findFirst({
@@ -495,8 +508,9 @@ export class AnnouncementsService {
             };
         } catch (error) {
             logger.error(`Error deleting attachment: ${error}`);
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'Announcement',
                 entityId: 0,

Backend/src/services/auth.service.ts

@@ -74,6 +74,7 @@ export class AuthService {
             data: {
                 token,
                 refreshToken,
+                user: await this.formatUserResponse(user)
             }
         };
     }

Backend/src/services/categories.service.ts

@@ -1,7 +1,10 @@
 import { prisma } from '../config/database';
 import { Prisma } from '@prisma/client';
+import { config } from '../config';
 import { logger } from '../config/logger';
+import jwt from 'jsonwebtoken';
 import { createCategory, createCategoryResponse, deleteCategoryResponse, updateCategory, updateCategoryResponse, ListCategoriesResponse, Category } from '../types/categories.type';
+import { UnauthorizedError, ValidationError, ForbiddenError } from '../middleware/errorHandler';
 import { auditService } from './audit.service';
 import { AuditAction } from '@prisma/client';
 
@@ -23,13 +26,14 @@ export class CategoryService {
         }
     }
 
-    async createCategory(userId: number, category: createCategory): Promise<createCategoryResponse> {
+    async createCategory(token: string, category: createCategory): Promise<createCategoryResponse> {
         try {
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; username: string; email: string; roleCode: string };
             const newCategory = await prisma.category.create({
                 data: category
             });
             auditService.log({
-                userId,
+                userId: decoded.id,
                 action: AuditAction.CREATE,
                 entityType: 'Category',
                 entityId: newCategory.id,
@@ -43,13 +47,13 @@ export class CategoryService {
                     name: newCategory.name as { th: string; en: string },
                     slug: newCategory.slug,
                     description: newCategory.description as { th: string; en: string },
-                    created_by: userId,
+                    created_by: decoded.id,
                 }
             };
         } catch (error) {
             logger.error('Failed to create category', { error });
             await auditService.logSync({
-                userId,
+                userId: 0,
                 action: AuditAction.ERROR,
                 entityType: 'Category',
                 entityId: 0,
@@ -62,14 +66,15 @@ export class CategoryService {
         }
     }
 
-    async updateCategory(userId: number, id: number, category: updateCategory): Promise<updateCategoryResponse> {
+    async updateCategory(token: string, id: number, category: updateCategory): Promise<updateCategoryResponse> {
         try {
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; username: string; email: string; roleCode: string };
             const updatedCategory = await prisma.category.update({
                 where: { id },
                 data: category
             });
             auditService.log({
-                userId,
+                userId: decoded.id,
                 action: AuditAction.UPDATE,
                 entityType: 'Category',
                 entityId: id,
@@ -83,13 +88,13 @@ export class CategoryService {
                     name: updatedCategory.name as { th: string; en: string },
                     slug: updatedCategory.slug,
                     description: updatedCategory.description as { th: string; en: string },
-                    updated_by: userId,
+                    updated_by: decoded.id,
                 }
             };
         } catch (error) {
             logger.error('Failed to update category', { error });
             await auditService.logSync({
-                userId,
+                userId: 0,
                 action: AuditAction.ERROR,
                 entityType: 'Category',
                 entityId: 0,
@@ -102,13 +107,14 @@ export class CategoryService {
         }
     }
 
-    async deleteCategory(userId: number, id: number): Promise<deleteCategoryResponse> {
+    async deleteCategory(token: string, id: number): Promise<deleteCategoryResponse> {
         try {
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; username: string; email: string; roleCode: string };
             const deletedCategory = await prisma.category.delete({
                 where: { id }
             });
             auditService.log({
-                userId,
+                userId: decoded.id,
                 action: AuditAction.DELETE,
                 entityType: 'Category',
                 entityId: id,
@@ -121,7 +127,7 @@ export class CategoryService {
         } catch (error) {
             logger.error('Failed to delete category', { error });
             await auditService.logSync({
-                userId,
+                userId: 0,
                 action: AuditAction.ERROR,
                 entityType: 'Category',
                 entityId: 0,

Backend/src/services/certificate.service.ts

@@ -1,6 +1,8 @@
 import { prisma } from '../config/database';
+import { config } from '../config';
 import { logger } from '../config/logger';
 import { NotFoundError, ForbiddenError, ValidationError } from '../middleware/errorHandler';
+import jwt from 'jsonwebtoken';
 import { PDFDocument, rgb } from 'pdf-lib';
 import fontkit from '@pdf-lib/fontkit';
 import * as fs from 'fs';
@@ -27,13 +29,14 @@ export class CertificateService {
      */
     async generateCertificate(input: GenerateCertificateInput): Promise<GenerateCertificateResponse> {
         try {
-            const { userId, course_id } = input;
+            const { token, course_id } = input;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             // Check enrollment and completion
             const enrollment = await prisma.enrollment.findUnique({
                 where: {
                     unique_enrollment: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         course_id,
                     },
                 },
@@ -62,7 +65,7 @@ export class CertificateService {
             // Check if certificate already exists
             const existingCertificate = await prisma.certificate.findFirst({
                 where: {
-                    user_id: userId,
+                    user_id: decoded.id,
                     course_id,
                 },
             });
@@ -100,13 +103,13 @@ export class CertificateService {
 
             // Upload to MinIO
             const timestamp = Date.now();
-            const filePath = `certificates/${course_id}/${userId}/${timestamp}.pdf`;
+            const filePath = `certificates/${course_id}/${decoded.id}/${timestamp}.pdf`;
             await uploadFile(filePath, Buffer.from(pdfBytes), 'application/pdf');
 
             // Save to database
             const certificate = await prisma.certificate.create({
                 data: {
-                    user_id: userId,
+                    user_id: decoded.id,
                     course_id,
                     enrollment_id: enrollment.id,
                     file_path: filePath,
@@ -115,7 +118,7 @@ export class CertificateService {
             });
 
             auditService.log({
-                userId,
+                userId: decoded.id,
                 action: AuditAction.CREATE,
                 entityType: 'Certificate',
                 entityId: certificate.id,
@@ -136,8 +139,9 @@ export class CertificateService {
             };
         } catch (error) {
             logger.error('Failed to generate certificate', { error });
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id,
                 action: AuditAction.ERROR,
                 entityType: 'Certificate',
                 entityId: 0,
@@ -156,11 +160,12 @@ export class CertificateService {
      */
     async getCertificate(input: GetCertificateInput): Promise<GetCertificateResponse> {
         try {
-            const { userId, course_id } = input;
+            const { token, course_id } = input;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             const certificate = await prisma.certificate.findFirst({
                 where: {
-                    user_id: userId,
+                    user_id: decoded.id,
                     course_id,
                 },
                 include: {
@@ -197,8 +202,9 @@ export class CertificateService {
             };
         } catch (error) {
             logger.error('Failed to get certificate', { error });
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id,
                 action: AuditAction.ERROR,
                 entityType: 'Certificate',
                 entityId: 0,
@@ -217,11 +223,12 @@ export class CertificateService {
      */
     async listMyCertificates(input: ListMyCertificatesInput): Promise<ListMyCertificatesResponse> {
         try {
-            const { userId } = input;
+            const { token } = input;
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
 
             const certificates = await prisma.certificate.findMany({
                 where: {
-                    user_id: userId,
+                    user_id: decoded.id,
                 },
                 include: {
                     enrollment: {
@@ -260,8 +267,9 @@ export class CertificateService {
             };
         } catch (error) {
             logger.error('Failed to list certificates', { error });
+            const decoded = jwt.decode(input.token) as { id: number } | null;
             await auditService.logSync({
-                userId: input.userId,
+                userId: decoded?.id,
                 action: AuditAction.ERROR,
                 entityType: 'Certificate',
                 entityId: 0,

Backend/src/services/user.service.ts

@@ -24,10 +24,15 @@ import { auditService } from './audit.service';
 import { AuditAction } from '@prisma/client';
 
 export class UserService {
-    async getUserProfile(userId: number): Promise<UserResponse> {
+    async getUserProfile(token: string): Promise<UserResponse> {
         try {
+            // Decode JWT token to get user ID
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; username: string; email: string; roleCode: string };
+
             const user = await prisma.user.findUnique({
-                where: { id: userId },
+                where: {
+                    id: decoded.id
+                },
                 include: {
                     profile: true,
                     role: true
@@ -63,6 +68,14 @@ export class UserService {
                 } : undefined
             };
         } catch (error) {
+            if (error instanceof jwt.JsonWebTokenError) {
+                logger.error('Invalid JWT token:', error);
+                throw new UnauthorizedError('Invalid token');
+            }
+            if (error instanceof jwt.TokenExpiredError) {
+                logger.error('JWT token expired:', error);
+                throw new UnauthorizedError('Token expired');
+            }
             logger.error('Error fetching user profile:', error);
             throw error;
         }
@@ -71,9 +84,12 @@ export class UserService {
     /**
      * Change user password
      */
-    async changePassword(userId: number, oldPassword: string, newPassword: string): Promise<ChangePasswordResponse> {
+    async changePassword(token: string, oldPassword: string, newPassword: string): Promise<ChangePasswordResponse> {
         try {
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            // Decode JWT token to get user ID
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; username: string; email: string; roleCode: string };
+
+            const user = await prisma.user.findUnique({ where: { id: decoded.id } });
             if (!user) throw new UnauthorizedError('User not found');
 
             // Check if account is deactivated
@@ -111,12 +127,21 @@ export class UserService {
                 message: 'Password changed successfully'
             };
         } catch (error) {
+            if (error instanceof jwt.JsonWebTokenError) {
+                logger.error('Invalid JWT token:', error);
+                throw new UnauthorizedError('Invalid token');
+            }
+            if (error instanceof jwt.TokenExpiredError) {
+                logger.error('JWT token expired:', error);
+                throw new UnauthorizedError('Token expired');
+            }
             logger.error('Failed to change password', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'User',
-                entityId: userId,
+                entityId: decoded?.id || 0,
                 metadata: {
                     operation: 'change_password',
                     error: error instanceof Error ? error.message : String(error)
@@ -129,9 +154,12 @@ export class UserService {
     /**
      * Update user profile
      */
-    async updateProfile(userId: number, profile: ProfileUpdate): Promise<ProfileUpdateResponse> {
+    async updateProfile(token: string, profile: ProfileUpdate): Promise<ProfileUpdateResponse> {
         try {
-            const user = await prisma.user.findUnique({ where: { id: userId } });
+            // Decode JWT token to get user ID
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; username: string; email: string; roleCode: string };
+
+            const user = await prisma.user.findUnique({ where: { id: decoded.id } });
             if (!user) throw new UnauthorizedError('User not found');
 
             // Check if account is deactivated
@@ -161,12 +189,21 @@ export class UserService {
                 }
             };
         } catch (error) {
+            if (error instanceof jwt.JsonWebTokenError) {
+                logger.error('Invalid JWT token:', error);
+                throw new UnauthorizedError('Invalid token');
+            }
+            if (error instanceof jwt.TokenExpiredError) {
+                logger.error('JWT token expired:', error);
+                throw new UnauthorizedError('Token expired');
+            }
             logger.error('Failed to update profile', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.UPDATE,
                 entityType: 'UserProfile',
-                entityId: userId,
+                entityId: decoded?.id || 0,
                 metadata: {
                     operation: 'update_profile',
                     error: error instanceof Error ? error.message : String(error)
@@ -176,8 +213,9 @@ export class UserService {
         }
     }
 
-    async getRoles(): Promise<rolesResponse> {
+    async getRoles(token: string): Promise<rolesResponse> {
         try {
+            jwt.verify(token, config.jwt.secret);
             const roles = await prisma.role.findMany({
                 select: {
                     id: true,
@@ -186,6 +224,14 @@ export class UserService {
             });
             return { roles };
         } catch (error) {
+            if (error instanceof jwt.TokenExpiredError) {
+                logger.error('JWT token expired:', error);
+                throw new UnauthorizedError('Token expired');
+            }
+            if (error instanceof jwt.JsonWebTokenError) {
+                logger.error('Invalid JWT token:', error);
+                throw new UnauthorizedError('Invalid token');
+            }
             logger.error('Failed to get roles', { error });
             throw error;
         }
@@ -194,11 +240,13 @@ export class UserService {
     /**
      * Upload avatar picture to MinIO
      */
-    async uploadAvatarPicture(userId: number, file: Express.Multer.File): Promise<updateAvatarResponse> {
+    async uploadAvatarPicture(token: string, file: Express.Multer.File): Promise<updateAvatarResponse> {
         try {
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number };
+
             // Check if user exists
             const user = await prisma.user.findUnique({
-                where: { id: userId },
+                where: { id: decoded.id },
                 include: { profile: true }
             });
 
@@ -217,7 +265,7 @@ export class UserService {
             const fileName = file.originalname || 'avatar';
             const extension = fileName.split('.').pop() || 'jpg';
             const safeFilename = `${timestamp}-${uniqueId}.${extension}`;
-            const filePath = `avatars/${userId}/${safeFilename}`;
+            const filePath = `avatars/${decoded.id}/${safeFilename}`;
 
             // Delete old avatar if exists
             if (user.profile?.avatar_url) {
@@ -237,13 +285,13 @@ export class UserService {
             // Update or create profile - store only file path
             if (user.profile) {
                 await prisma.userProfile.update({
-                    where: { user_id: userId },
+                    where: { user_id: decoded.id },
                     data: { avatar_url: filePath }
                 });
             } else {
                 await prisma.userProfile.create({
                     data: {
-                        user_id: userId,
+                        user_id: decoded.id,
                         avatar_url: filePath,
                         first_name: '',
                         last_name: ''
@@ -253,10 +301,10 @@ export class UserService {
 
             // Audit log - UPLOAD_AVATAR
             await auditService.logSync({
-                userId,
+                userId: decoded.id,
                 action: AuditAction.UPLOAD_FILE,
                 entityType: 'User',
-                entityId: userId,
+                entityId: decoded.id,
                 metadata: {
                     operation: 'upload_avatar',
                     filePath
@@ -270,17 +318,26 @@ export class UserService {
                 code: 200,
                 message: 'Avatar uploaded successfully',
                 data: {
-                    id: userId,
+                    id: decoded.id,
                     avatar_url: presignedUrl
                 }
             };
         } catch (error) {
+            if (error instanceof jwt.JsonWebTokenError) {
+                logger.error('Invalid JWT token:', error);
+                throw new UnauthorizedError('Invalid token');
+            }
+            if (error instanceof jwt.TokenExpiredError) {
+                logger.error('JWT token expired:', error);
+                throw new UnauthorizedError('Token expired');
+            }
             logger.error('Failed to upload avatar', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.UPLOAD_FILE,
                 entityType: 'UserProfile',
-                entityId: userId,
+                entityId: decoded?.id || 0,
                 metadata: {
                     operation: 'upload_avatar',
                     error: error instanceof Error ? error.message : String(error)
@@ -333,10 +390,12 @@ export class UserService {
     /**
      * Send verification email to user
      */
-    async sendVerifyEmail(userId: number): Promise<SendVerifyEmailResponse> {
+    async sendVerifyEmail(token: string): Promise<SendVerifyEmailResponse> {
         try {
+            const decoded = jwt.verify(token, config.jwt.secret) as { id: number; email: string; roleCode: string };
+
             const user = await prisma.user.findUnique({
-                where: { id: userId },
+                where: { id: decoded.id },
                 include: { role: true }
             });
 
@@ -394,12 +453,15 @@ export class UserService {
                 message: 'Verification email sent successfully'
             };
         } catch (error) {
+            if (error instanceof jwt.JsonWebTokenError) throw new UnauthorizedError('Invalid token');
+            if (error instanceof jwt.TokenExpiredError) throw new UnauthorizedError('Token expired');
             logger.error('Failed to send verification email', { error });
+            const decoded = jwt.decode(token) as { id: number } | null;
             await auditService.logSync({
-                userId,
+                userId: decoded?.id || 0,
                 action: AuditAction.ERROR,
                 entityType: 'UserProfile',
-                entityId: userId,
+                entityId: decoded?.id || 0,
                 metadata: {
                     operation: 'send_verification_email',
                     error: error instanceof Error ? error.message : String(error)

Backend/src/types/ChaptersLesson.typs.ts

@@ -98,18 +98,18 @@ export interface ChapterData {
 // ============================================
 
 export interface ChaptersRequest {
-    userId: number;
+    token: string;
     course_id: number;
 }
 
 export interface GetChapterRequest {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
 }
 
 export interface CreateChapterInput {
-    userId: number;
+    token: string;
     course_id: number;
     title: MultiLanguageText;
     description?: MultiLanguageText;
@@ -118,13 +118,13 @@ export interface CreateChapterInput {
 }
 
 export interface CreateChapterRequest {
-    userId: number;
+    token: string;
     course_id: number;
     data: CreateChapterInput;
 }
 
 export interface UpdateChapterInput {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
     title?: MultiLanguageText;
@@ -134,20 +134,20 @@ export interface UpdateChapterInput {
 }
 
 export interface UpdateChapterRequest {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
     data: UpdateChapterInput;
 }
 
 export interface DeleteChapterRequest {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
 }
 
 export interface ReorderChapterRequest {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
     sort_order: number;
@@ -199,7 +199,7 @@ export interface ReorderChapterResponse {
 // ============================================
 
 export interface GetLessonRequest {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
     lesson_id: number;
@@ -216,7 +216,7 @@ export interface UploadedFileInfo {
 }
 
 export interface CreateLessonInput {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
     title: MultiLanguageText;
@@ -293,7 +293,7 @@ export interface QuizChoiceData {
 }
 
 export interface CreateLessonRequest {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
     data: CreateLessonInput;
@@ -311,7 +311,7 @@ export interface UpdateLessonInput {
 }
 
 export interface UpdateLessonRequest {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
     lesson_id: number;
@@ -319,14 +319,14 @@ export interface UpdateLessonRequest {
 }
 
 export interface DeleteLessonRequest {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
     lesson_id: number;
 }
 
 export interface ReorderLessonsRequest {
-    userId: number;
+    token: string;
     course_id: number;
     chapter_id: number;
     lesson_id: number;
@@ -365,7 +365,7 @@ export interface UpdateLessonResponse {
  * Input for uploading video to a lesson
  */
 export interface UploadVideoInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     video: UploadedFileInfo;
@@ -375,7 +375,7 @@ export interface UploadVideoInput {
  * Input for updating (replacing) video in a lesson
  */
 export interface UpdateVideoInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     video: UploadedFileInfo;
@@ -385,7 +385,7 @@ export interface UpdateVideoInput {
  * Input for setting YouTube video to a lesson
  */
 export interface SetYouTubeVideoInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     youtube_video_id: string;
@@ -411,7 +411,7 @@ export interface YouTubeVideoResponse {
  * Input for uploading a single attachment to a lesson
  */
 export interface UploadAttachmentInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     attachment: UploadedFileInfo;
@@ -421,7 +421,7 @@ export interface UploadAttachmentInput {
  * Input for deleting an attachment from a lesson
  */
 export interface DeleteAttachmentInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     attachment_id: number;
@@ -490,7 +490,7 @@ export interface LessonWithDetailsResponse {
  * Input for adding quiz to an existing QUIZ lesson
  */
 export interface AddQuizToLessonInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     quiz_data: {
@@ -509,7 +509,7 @@ export interface AddQuizToLessonInput {
  * Input for adding a single question to a quiz lesson
  */
 export interface AddQuestionInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     question: MultiLanguageText;
@@ -532,7 +532,7 @@ export interface AddQuestionResponse {
  * Input for updating a question
  */
 export interface UpdateQuestionInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     question_id: number;
@@ -556,14 +556,14 @@ export interface UpdateQuestionResponse {
  * Input for deleting a question
  */
 export interface DeleteQuestionInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     question_id: number;
 }
 
 export interface ReorderQuestionInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     question_id: number;
@@ -588,7 +588,7 @@ export interface DeleteQuestionResponse {
  * Input for updating quiz settings
  */
 export interface UpdateQuizInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     title?: MultiLanguageText;

Backend/src/types/CoursesInstructor.types.ts

@@ -24,7 +24,7 @@ export interface createCourseResponse {
 }
 
 export interface ListMyCoursesInput {
-    userId: number;
+    token: string;
     status?: 'DRAFT' | 'PENDING' | 'APPROVED' | 'REJECTED' | 'ARCHIVED';
 }
 
@@ -42,7 +42,7 @@ export interface GetMyCourseResponse {
 }
 
 export interface getmyCourse {
-    userId: number;
+    token: string;
     course_id: number;
 }
 
@@ -94,13 +94,13 @@ export interface listCourseinstructorResponse {
 }
 
 export interface addinstructorCourse {
-    userId: number;
+    token: string;
     email_or_username: string;
     course_id: number;
 }
 
 export interface SearchInstructorInput {
-    userId: number;
+    token: string;
     query: string;
     course_id: number;
 }
@@ -145,12 +145,12 @@ export interface listinstructorCourseResponse {
 }
 
 export interface listinstructorCourse {
-    userId: number;
+    token: string;
     course_id: number;
 }
 
 export interface removeinstructorCourse {
-    userId: number;
+    token: string;
     user_id: number;
     course_id: number;
 }
@@ -161,7 +161,7 @@ export interface removeinstructorCourseResponse {
 }
 
 export interface setprimaryCourseInstructor {
-    userId: number;
+    token: string;
     user_id: number;
     course_id: number;
 }
@@ -172,12 +172,12 @@ export interface setprimaryCourseInstructorResponse {
 }
 
 export interface sendCourseForReview {
-    userId: number;
+    token: string;
     course_id: number;
 }
 
 export interface setCourseDraft {
-    userId: number;
+    token: string;
     course_id: number;
 }
 
@@ -220,7 +220,7 @@ export interface GetCourseApprovalsResponse {
 // ============================================
 
 export interface GetEnrolledStudentsInput {
-    userId: number;
+    token: string;
     course_id: number;
     page?: number;
     limit?: number;
@@ -254,7 +254,7 @@ export interface GetEnrolledStudentsResponse {
 // ============================================
 
 export interface GetQuizScoresInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     page?: number;
@@ -305,7 +305,7 @@ export interface GetQuizScoresResponse {
 // ============================================
 
 export interface GetQuizAttemptDetailInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     student_id: number;
@@ -353,7 +353,7 @@ export interface GetQuizAttemptDetailResponse {
 // ============================================
 
 export interface GetEnrolledStudentDetailInput {
-    userId: number;
+    token: string;
     course_id: number;
     student_id: number;
 }
@@ -435,7 +435,7 @@ export interface GetCourseApprovalHistoryResponse {
 }
 
 export interface CloneCourseInput {
-    userId: number;
+    token: string;
     course_id: number;
     title: MultiLanguageText;
 }
@@ -448,14 +448,3 @@ export interface CloneCourseResponse {
         title: MultiLanguageText;
     };
 }
-
-// ============================================
-// Get All Students across all instructor courses
-// ============================================
-
-export interface GetAllMyStudentsResponse {
-    code: number;
-    message: string;
-    total_students: number;
-    total_completed: number;
-}

Backend/src/types/CoursesStudent.types.ts

@@ -9,7 +9,7 @@ export type MultiLangText = MultiLanguageText;
 // ============================================
 
 export interface EnrollCourseInput {
-    userId: number;
+    token: string;
     course_id: number;
 }
 
@@ -26,7 +26,7 @@ export interface EnrollCourseResponse {
 }
 
 export interface ListEnrolledCoursesInput {
-    userId: number;
+    token: string;
     page?: number;
     limit?: number;
     status?: EnrollmentStatus;
@@ -64,7 +64,7 @@ export interface ListEnrolledCoursesResponse {
 // ============================================
 
 export interface GetCourseLearningInput {
-    userId: number;
+    token: string;
     course_id: number;
 }
 
@@ -126,7 +126,7 @@ export interface GetCourseLearningResponse {
 // ============================================
 
 export interface GetLessonContentInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
 }
@@ -204,7 +204,7 @@ export interface GetLessonContentResponse {
 // ============================================
 
 export interface CheckLessonAccessInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
 }
@@ -236,7 +236,7 @@ export interface CheckLessonAccessResponse {
 // ============================================
 
 export interface SaveVideoProgressInput {
-    userId: number;
+    token: string;
     lesson_id: number;
     video_progress_seconds: number;
     video_duration_seconds?: number;
@@ -258,7 +258,7 @@ export interface SaveVideoProgressResponse {
 }
 
 export interface GetVideoProgressInput {
-    userId: number;
+    token: string;
     lesson_id: number;
 }
 
@@ -281,7 +281,7 @@ export interface GetVideoProgressResponse {
 // ============================================
 
 export interface MarkLessonCompleteInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
 }
@@ -314,7 +314,7 @@ export interface EnrollCourseBody {
 }
 
 export interface CompleteLessonInput {
-    userId: number;
+    token: string;
     lesson_id: number;
 }
 
@@ -342,7 +342,7 @@ export interface QuizAnswerInput {
 }
 
 export interface SubmitQuizInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
     answers: QuizAnswerInput[];
@@ -384,7 +384,7 @@ export interface SubmitQuizResponse {
 // ============================================
 
 export interface GetQuizAttemptsInput {
-    userId: number;
+    token: string;
     course_id: number;
     lesson_id: number;
 }

Backend/src/types/announcements.types.ts

@@ -32,14 +32,14 @@ export interface ListAnnouncementResponse {
 }
 
 export interface ListAnnouncementInput{
-    userId: number;
+    token: string;
     course_id: number;
     page?: number;
     limit?: number;
 }
 
 export interface CreateAnnouncementInput{
-    userId: number;
+    token: string;
     course_id: number;
     title: MultiLanguageText;
     content: MultiLanguageText;
@@ -50,7 +50,7 @@ export interface CreateAnnouncementInput {
 }
 
 export interface UploadAnnouncementAttachmentInput{
-    userId: number;
+    token: string;
     course_id: number;
     announcement_id: number;
     file: File;
@@ -63,7 +63,7 @@ export interface UploadAnnouncementAttachmentResponse {
 }
 
 export interface DeleteAnnouncementAttachmentInput{
-    userId: number;
+    token: string;
     course_id: number;
     announcement_id: number;
     attachment_id: number;
@@ -81,7 +81,7 @@ export interface CreateAnnouncementResponse {
 }
 
 export interface UpdateAnnouncementInput{
-    userId: number;
+    token: string;
     course_id: number;
     announcement_id: number;
     title: MultiLanguageText;
@@ -99,7 +99,7 @@ export interface UpdateAnnouncementResponse {
 }
 
 export interface DeleteAnnouncementInput{
-    userId: number;
+    token: string;
     course_id: number;
     announcement_id: number;
 }

Backend/src/types/auth.types.ts

@@ -28,6 +28,7 @@ export interface LoginResponse {
     data: {
         token: string;
         refreshToken: string;
+        user: UserResponse;
     };
 }
 

Backend/src/types/certificate.types.ts

@@ -3,7 +3,7 @@
 // ============================================
 
 export interface GenerateCertificateInput {
-    userId: number;
+    token: string;
     course_id: number;
 }
 
@@ -19,7 +19,7 @@ export interface GenerateCertificateResponse {
 }
 
 export interface GetCertificateInput {
-    userId: number;
+    token: string;
     course_id: number;
 }
 
@@ -37,7 +37,7 @@ export interface GetCertificateResponse {
 }
 
 export interface ListMyCertificatesInput {
-    userId: number;
+    token: string;
 }
 
 export interface ListMyCertificatesResponse {

Backend/src/validators/ChaptersLesson.validator.ts

@@ -79,7 +79,7 @@ export const UpdateLessonValidator = Joi.object({
         'number.min': 'Duration must be at least 0'
     }),
     sort_order: Joi.number().integer().min(0).optional(),
-    prerequisite_lesson_ids: Joi.array().items(Joi.number().integer().positive()).allow(null).optional(),
+    prerequisite_lesson_ids: Joi.array().items(Joi.number().integer().positive()).optional(),
     is_published: Joi.boolean().optional()
 });
 

Backend/tests/tsconfig.json

@@ -1,14 +0,0 @@
-{
-    "extends": "../tsconfig.test.json",
-    "compilerOptions": {
-        "rootDir": "..",
-        "types": [
-            "node",
-            "jest"
-        ]
-    },
-    "include": [
-        "../src/**/*",
-        "./**/*"
-    ]
-}

Backend/tests/unit/validators/AdminCourseApproval.validator.test.ts

@@ -1,67 +0,0 @@
-import {
-    ApproveCourseValidator,
-    RejectCourseValidator,
-} from '@/validators/AdminCourseApproval.validator';
-
-describe('ApproveCourseValidator', () => {
-    it('should pass with no body (comment optional)', () => {
-        const { error } = ApproveCourseValidator.validate({});
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with optional comment', () => {
-        const { error } = ApproveCourseValidator.validate({
-            comment: 'Looks great!',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail when comment exceeds 1000 characters', () => {
-        const { error } = ApproveCourseValidator.validate({
-            comment: 'a'.repeat(1001),
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/must not exceed 1000/i);
-    });
-
-    it('should pass with comment exactly 1000 characters', () => {
-        const { error } = ApproveCourseValidator.validate({
-            comment: 'a'.repeat(1000),
-        });
-        expect(error).toBeUndefined();
-    });
-});
-
-describe('RejectCourseValidator', () => {
-    it('should pass with valid rejection comment', () => {
-        const { error } = RejectCourseValidator.validate({
-            comment: 'The content is incomplete and needs more details.',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without comment', () => {
-        const { error } = RejectCourseValidator.validate({});
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Comment is required when rejecting/i);
-    });
-
-    it('should fail when comment is too short (< 10 chars)', () => {
-        const { error } = RejectCourseValidator.validate({ comment: 'Too short' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/at least 10 characters/i);
-    });
-
-    it('should pass with exactly 10 characters', () => {
-        const { error } = RejectCourseValidator.validate({ comment: '1234567890' });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail when comment exceeds 1000 characters', () => {
-        const { error } = RejectCourseValidator.validate({
-            comment: 'a'.repeat(1001),
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/must not exceed 1000/i);
-    });
-});

Backend/tests/unit/validators/ChaptersLesson.validator.test.ts

@@ -1,263 +0,0 @@
-import {
-    CreateChapterValidator,
-    UpdateChapterValidator,
-    ReorderChapterValidator,
-    CreateLessonValidator,
-    UpdateLessonValidator,
-    ReorderLessonsValidator,
-    AddQuestionValidator,
-    UpdateQuizValidator,
-} from '@/validators/ChaptersLesson.validator';
-
-
-// ============================================================
-// Chapter Validators
-// ============================================================
-
-describe('CreateChapterValidator', () => {
-    it('should pass with valid data', () => {
-        const { error } = CreateChapterValidator.validate({
-            title: { th: 'บทที่ 1', en: 'Chapter 1' },
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with optional fields', () => {
-        const { error } = CreateChapterValidator.validate({
-            title: { th: 'บทที่ 1', en: 'Chapter 1' },
-            description: { th: 'คำอธิบาย', en: 'Description' },
-            sort_order: 0,
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail if title is missing', () => {
-        const { error } = CreateChapterValidator.validate({});
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if title.th is missing', () => {
-        const { error } = CreateChapterValidator.validate({
-            title: { en: 'Chapter 1' },
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if title.en is missing', () => {
-        const { error } = CreateChapterValidator.validate({
-            title: { th: 'บทที่ 1' },
-        });
-        expect(error).toBeDefined();
-    });
-});
-
-describe('UpdateChapterValidator', () => {
-    it('should pass with empty object (all fields optional)', () => {
-        const { error } = UpdateChapterValidator.validate({});
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with partial fields', () => {
-        const { error } = UpdateChapterValidator.validate({
-            is_published: true,
-        });
-        expect(error).toBeUndefined();
-    });
-});
-
-describe('ReorderChapterValidator', () => {
-    it('should pass with valid sort_order', () => {
-        const { error } = ReorderChapterValidator.validate({ sort_order: 0 });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without sort_order', () => {
-        const { error } = ReorderChapterValidator.validate({});
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Sort order is required/i);
-    });
-
-    it('should fail with negative sort_order', () => {
-        const { error } = ReorderChapterValidator.validate({ sort_order: -1 });
-        expect(error).toBeDefined();
-    });
-});
-
-// ============================================================
-// Lesson Validators
-// ============================================================
-
-describe('CreateLessonValidator', () => {
-    it('should pass with VIDEO type', () => {
-        const { error } = CreateLessonValidator.validate({
-            title: { th: 'บทเรียน 1', en: 'Lesson 1' },
-            type: 'VIDEO',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with QUIZ type', () => {
-        const { error } = CreateLessonValidator.validate({
-            title: { th: 'แบบทดสอบ', en: 'Quiz' },
-            type: 'QUIZ',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail with invalid type', () => {
-        const { error } = CreateLessonValidator.validate({
-            title: { th: 'บทเรียน', en: 'Lesson' },
-            type: 'DOCUMENT',
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail without title', () => {
-        const { error } = CreateLessonValidator.validate({ type: 'VIDEO' });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail without type', () => {
-        const { error } = CreateLessonValidator.validate({
-            title: { th: 'บทเรียน', en: 'Lesson' },
-        });
-        expect(error).toBeDefined();
-    });
-});
-
-describe('UpdateLessonValidator — prerequisite_lesson_ids', () => {
-    it('should pass with valid array of ids', () => {
-        const { error } = UpdateLessonValidator.validate({
-            prerequisite_lesson_ids: [1, 2, 3],
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with null (clear prerequisites)', () => {
-        const { error } = UpdateLessonValidator.validate({
-            prerequisite_lesson_ids: null,
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with empty array (clear prerequisites)', () => {
-        const { error } = UpdateLessonValidator.validate({
-            prerequisite_lesson_ids: [],
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass without the field (no change)', () => {
-        const { error } = UpdateLessonValidator.validate({});
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail with non-integer ids', () => {
-        const { error } = UpdateLessonValidator.validate({
-            prerequisite_lesson_ids: [1.5],
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail with negative ids', () => {
-        const { error } = UpdateLessonValidator.validate({
-            prerequisite_lesson_ids: [-1],
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail with string ids', () => {
-        const { error } = UpdateLessonValidator.validate({
-            prerequisite_lesson_ids: ['abc'],
-        });
-        expect(error).toBeDefined();
-    });
-});
-
-describe('ReorderLessonsValidator', () => {
-    it('should pass with valid data', () => {
-        const { error } = ReorderLessonsValidator.validate({
-            lesson_id: 1,
-            sort_order: 0,
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without lesson_id', () => {
-        const { error } = ReorderLessonsValidator.validate({ sort_order: 0 });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail without sort_order', () => {
-        const { error } = ReorderLessonsValidator.validate({ lesson_id: 1 });
-        expect(error).toBeDefined();
-    });
-});
-
-// ============================================================
-// Quiz Validators
-// ============================================================
-
-describe('AddQuestionValidator', () => {
-    it('should pass with MULTIPLE_CHOICE type + choices', () => {
-        const { error } = AddQuestionValidator.validate({
-            question: { th: 'ข้อที่ 1 คืออะไร?', en: 'What is question 1?' },
-            question_type: 'MULTIPLE_CHOICE',
-            choices: [
-                { text: { th: 'ก', en: 'A' }, is_correct: true },
-                { text: { th: 'ข', en: 'B' }, is_correct: false },
-            ],
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with TRUE_FALSE type without choices', () => {
-        const { error } = AddQuestionValidator.validate({
-            question: { th: 'ถูกหรือผิด?', en: 'True or False?' },
-            question_type: 'TRUE_FALSE',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail with invalid question_type', () => {
-        const { error } = AddQuestionValidator.validate({
-            question: { th: 'คำถาม', en: 'Question' },
-            question_type: 'ESSAY',
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail without question', () => {
-        const { error } = AddQuestionValidator.validate({
-            question_type: 'TRUE_FALSE',
-        });
-        expect(error).toBeDefined();
-    });
-});
-
-describe('UpdateQuizValidator', () => {
-    it('should pass with empty object (all optional)', () => {
-        const { error } = UpdateQuizValidator.validate({});
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with valid passing_score', () => {
-        const { error } = UpdateQuizValidator.validate({ passing_score: 70 });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail with passing_score > 100', () => {
-        const { error } = UpdateQuizValidator.validate({ passing_score: 101 });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail with passing_score < 0', () => {
-        const { error } = UpdateQuizValidator.validate({ passing_score: -1 });
-        expect(error).toBeDefined();
-    });
-
-    it('should pass with time_limit 0 (no limit)', () => {
-        const { error } = UpdateQuizValidator.validate({ time_limit: 0 });
-        expect(error).toBeUndefined();
-    });
-});

Backend/tests/unit/validators/CoursesInstructor.validator.test.ts

@@ -1,150 +0,0 @@
-import {
-    CreateCourseValidator,
-    UpdateCourseValidator,
-    CloneCourseValidator,
-    addInstructorCourseValidator,
-} from '@/validators/CoursesInstructor.validator';
-
-// ============================================================
-// addInstructorCourseValidator
-// ============================================================
-
-describe('addInstructorCourseValidator', () => {
-    it('should pass with valid user_id and course_id', () => {
-        const { error } = addInstructorCourseValidator.validate({
-            user_id: 1,
-            course_id: 2,
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without user_id', () => {
-        const { error } = addInstructorCourseValidator.validate({ course_id: 2 });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail without course_id', () => {
-        const { error } = addInstructorCourseValidator.validate({ user_id: 1 });
-        expect(error).toBeDefined();
-    });
-});
-
-// ============================================================
-// CreateCourseValidator
-// ============================================================
-
-describe('CreateCourseValidator', () => {
-    const validPayload = {
-        category_id: 1,
-        title: { th: 'คอร์สทดสอบ', en: 'Test Course' },
-        slug: 'test-course',
-        description: { th: 'คำอธิบาย', en: 'Description' },
-        price: 500,
-        is_free: false,
-        have_certificate: true,
-    };
-
-    it('should pass with all required fields', () => {
-        const { error } = CreateCourseValidator.validate(validPayload);
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail if title.th is missing', () => {
-        const { error } = CreateCourseValidator.validate({
-            ...validPayload,
-            title: { en: 'Test Course' },
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if slug is missing', () => {
-        const { error } = CreateCourseValidator.validate({
-            ...validPayload,
-            slug: undefined,
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if price is missing', () => {
-        const { error } = CreateCourseValidator.validate({
-            ...validPayload,
-            price: undefined,
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if is_free is missing', () => {
-        const { error } = CreateCourseValidator.validate({
-            ...validPayload,
-            is_free: undefined,
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should allow price = 0 (free course)', () => {
-        const { error } = CreateCourseValidator.validate({
-            ...validPayload,
-            price: 0,
-            is_free: true,
-        });
-        expect(error).toBeUndefined();
-    });
-});
-
-// ============================================================
-// UpdateCourseValidator
-// ============================================================
-
-describe('UpdateCourseValidator', () => {
-    it('should pass with empty object (all optional)', () => {
-        const { error } = UpdateCourseValidator.validate({});
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with partial update', () => {
-        const { error } = UpdateCourseValidator.validate({ price: 999 });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with title partial update (th only)', () => {
-        const { error } = UpdateCourseValidator.validate({
-            title: { th: 'ชื่อใหม่' },
-        });
-        expect(error).toBeUndefined();
-    });
-});
-
-// ============================================================
-// CloneCourseValidator
-// ============================================================
-
-describe('CloneCourseValidator', () => {
-    it('should pass with valid title', () => {
-        const { error } = CloneCourseValidator.validate({
-            title: { th: 'คอร์ส Copy', en: 'Course Copy' },
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without title.th', () => {
-        const { error } = CloneCourseValidator.validate({
-            title: { en: 'Course Copy' },
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Thai title is required/i);
-    });
-
-    it('should fail without title.en', () => {
-        const { error } = CloneCourseValidator.validate({
-            title: { th: 'คอร์ส Copy' },
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/English title is required/i);
-    });
-
-    it('should fail without title entirely', () => {
-        const { error } = CloneCourseValidator.validate({});
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Title is required/i);
-    });
-});

Backend/tests/unit/validators/CoursesStudent.validator.test.ts

@@ -1,96 +0,0 @@
-import {
-    SaveVideoProgressValidator,
-    SubmitQuizValidator,
-} from '@/validators/CoursesStudent.validator';
-
-describe('SaveVideoProgressValidator', () => {
-    it('should pass with required field only', () => {
-        const { error } = SaveVideoProgressValidator.validate({
-            video_progress_seconds: 60,
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with all fields', () => {
-        const { error } = SaveVideoProgressValidator.validate({
-            video_progress_seconds: 120,
-            video_duration_seconds: 600,
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with progress = 0 (start of video)', () => {
-        const { error } = SaveVideoProgressValidator.validate({
-            video_progress_seconds: 0,
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without video_progress_seconds', () => {
-        const { error } = SaveVideoProgressValidator.validate({});
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Video progress seconds is required/i);
-    });
-
-    it('should fail with negative progress', () => {
-        const { error } = SaveVideoProgressValidator.validate({
-            video_progress_seconds: -1,
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/at least 0/i);
-    });
-
-    it('should fail with negative video duration', () => {
-        const { error } = SaveVideoProgressValidator.validate({
-            video_progress_seconds: 10,
-            video_duration_seconds: -1,
-        });
-        expect(error).toBeDefined();
-    });
-});
-
-describe('SubmitQuizValidator', () => {
-    const validAnswer = { question_id: 1, choice_id: 2 };
-
-    it('should pass with valid answers', () => {
-        const { error } = SubmitQuizValidator.validate({
-            answers: [validAnswer, { question_id: 2, choice_id: 5 }],
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without answers', () => {
-        const { error } = SubmitQuizValidator.validate({});
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Answers are required/i);
-    });
-
-    it('should fail with empty answers array', () => {
-        const { error } = SubmitQuizValidator.validate({ answers: [] });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/At least one answer/i);
-    });
-
-    it('should fail if question_id is missing in an answer', () => {
-        const { error } = SubmitQuizValidator.validate({
-            answers: [{ choice_id: 2 }],
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Question ID is required/i);
-    });
-
-    it('should fail if choice_id is missing in an answer', () => {
-        const { error } = SubmitQuizValidator.validate({
-            answers: [{ question_id: 1 }],
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Choice ID is required/i);
-    });
-
-    it('should fail if question_id is not a positive integer', () => {
-        const { error } = SubmitQuizValidator.validate({
-            answers: [{ question_id: -1, choice_id: 1 }],
-        });
-        expect(error).toBeDefined();
-    });
-});

Backend/tests/unit/validators/Lessons.validator.test.ts

@@ -1,45 +0,0 @@
-import { SetYouTubeVideoValidator } from '@/validators/Lessons.validator';
-
-describe('SetYouTubeVideoValidator', () => {
-    it('should pass with valid youtube_video_id and video_title', () => {
-        const { error } = SetYouTubeVideoValidator.validate({
-            youtube_video_id: 'dQw4w9WgXcQ',
-            video_title: 'Introduction to TypeScript',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without youtube_video_id', () => {
-        const { error } = SetYouTubeVideoValidator.validate({
-            video_title: 'Intro to TS',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/YouTube video ID is required/i);
-    });
-
-    it('should fail with empty youtube_video_id string', () => {
-        const { error } = SetYouTubeVideoValidator.validate({
-            youtube_video_id: '',
-            video_title: 'Intro to TS',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/cannot be empty/i);
-    });
-
-    it('should fail without video_title', () => {
-        const { error } = SetYouTubeVideoValidator.validate({
-            youtube_video_id: 'dQw4w9WgXcQ',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Video title is required/i);
-    });
-
-    it('should fail with empty video_title string', () => {
-        const { error } = SetYouTubeVideoValidator.validate({
-            youtube_video_id: 'dQw4w9WgXcQ',
-            video_title: '',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/cannot be empty/i);
-    });
-});

Backend/tests/unit/validators/announcements.validator.test.ts

@@ -1,115 +0,0 @@
-import {
-    CreateAnnouncementValidator,
-    UpdateAnnouncementValidator,
-} from '@/validators/announcements.validator';
-
-describe('CreateAnnouncementValidator', () => {
-    const validPayload = {
-        title: { th: 'ประกาศใหม่', en: 'New Announcement' },
-        content: { th: 'เนื้อหา', en: 'Content' },
-        status: 'DRAFT',
-        is_pinned: false,
-    };
-
-    it('should pass with all required fields', () => {
-        const { error } = CreateAnnouncementValidator.validate(validPayload);
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with optional published_at as ISO date', () => {
-        const { error } = CreateAnnouncementValidator.validate({
-            ...validPayload,
-            published_at: '2026-03-01T00:00:00.000Z',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail with invalid published_at format', () => {
-        const { error } = CreateAnnouncementValidator.validate({
-            ...validPayload,
-            published_at: '01-03-2026',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/ISO date/i);
-    });
-
-    it('should fail with invalid status', () => {
-        const { error } = CreateAnnouncementValidator.validate({
-            ...validPayload,
-            status: 'HIDDEN',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/DRAFT, PUBLISHED, ARCHIVED/i);
-    });
-
-    it('should pass with PUBLISHED status', () => {
-        const { error } = CreateAnnouncementValidator.validate({
-            ...validPayload,
-            status: 'PUBLISHED',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with ARCHIVED status', () => {
-        const { error } = CreateAnnouncementValidator.validate({
-            ...validPayload,
-            status: 'ARCHIVED',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without title', () => {
-        const { error } = CreateAnnouncementValidator.validate({
-            ...validPayload,
-            title: undefined,
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Title is required/i);
-    });
-
-    it('should fail without content', () => {
-        const { error } = CreateAnnouncementValidator.validate({
-            ...validPayload,
-            content: undefined,
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Content is required/i);
-    });
-
-    it('should fail without is_pinned', () => {
-        const { error } = CreateAnnouncementValidator.validate({
-            ...validPayload,
-            is_pinned: undefined,
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/is_pinned is required/i);
-    });
-});
-
-describe('UpdateAnnouncementValidator', () => {
-    it('should pass with empty object (all optional)', () => {
-        const { error } = UpdateAnnouncementValidator.validate({});
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with partial update', () => {
-        const { error } = UpdateAnnouncementValidator.validate({
-            status: 'PUBLISHED',
-            is_pinned: true,
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail with invalid status', () => {
-        const { error } = UpdateAnnouncementValidator.validate({ status: 'DELETED' });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail with invalid published_at format', () => {
-        const { error } = UpdateAnnouncementValidator.validate({
-            published_at: 'not-a-date',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/ISO date/i);
-    });
-});

Backend/tests/unit/validators/auth.validator.test.ts

@@ -1,246 +0,0 @@
-import {
-    loginSchema,
-    registerSchema,
-    refreshTokenSchema,
-    resetPasswordSchema,
-    changePasswordSchema,
-    resetRequestSchema,
-} from '@/validators/auth.validator';
-
-// ============================================================
-// loginSchema
-// ============================================================
-
-describe('loginSchema', () => {
-    it('should pass with valid email and password', () => {
-        const { error } = loginSchema.validate({
-            email: 'user@example.com',
-            password: 'password123',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail with invalid email format', () => {
-        const { error } = loginSchema.validate({
-            email: 'not-an-email',
-            password: 'password123',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/valid email/i);
-    });
-
-    it('should fail without email', () => {
-        const { error } = loginSchema.validate({ password: 'password123' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Email is required/i);
-    });
-
-    it('should fail without password', () => {
-        const { error } = loginSchema.validate({ email: 'user@example.com' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Password is required/i);
-    });
-
-    it('should fail with password shorter than 6 characters', () => {
-        const { error } = loginSchema.validate({
-            email: 'user@example.com',
-            password: '12345',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/at least 6 characters/i);
-    });
-});
-
-// ============================================================
-// registerSchema
-// ============================================================
-
-describe('registerSchema', () => {
-    const validPayload = {
-        username: 'john_doe',
-        email: 'john@example.com',
-        password: 'securepass',
-        first_name: 'John',
-        last_name: 'Doe',
-        phone: '0812345678',
-    };
-
-    it('should pass with all required fields', () => {
-        const { error } = registerSchema.validate(validPayload);
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with optional prefix', () => {
-        const { error } = registerSchema.validate({
-            ...validPayload,
-            prefix: { th: 'นาย', en: 'Mr.' },
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail if username has invalid characters', () => {
-        const { error } = registerSchema.validate({
-            ...validPayload,
-            username: 'john doe!',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/letters, numbers, and underscores/i);
-    });
-
-    it('should fail if username is too short (< 3 chars)', () => {
-        const { error } = registerSchema.validate({
-            ...validPayload,
-            username: 'ab',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/at least 3 characters/i);
-    });
-
-    it('should fail if username is too long (> 50 chars)', () => {
-        const { error } = registerSchema.validate({
-            ...validPayload,
-            username: 'a'.repeat(51),
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/not exceed 50 characters/i);
-    });
-
-    it('should fail with invalid email', () => {
-        const { error } = registerSchema.validate({
-            ...validPayload,
-            email: 'bad-email',
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if phone is too short (< 10 chars)', () => {
-        const { error } = registerSchema.validate({
-            ...validPayload,
-            phone: '081234',
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail without first_name', () => {
-        const { error } = registerSchema.validate({
-            ...validPayload,
-            first_name: undefined,
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/First name is required/i);
-    });
-
-    it('should fail without last_name', () => {
-        const { error } = registerSchema.validate({
-            ...validPayload,
-            last_name: undefined,
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Last name is required/i);
-    });
-});
-
-// ============================================================
-// refreshTokenSchema
-// ============================================================
-
-describe('refreshTokenSchema', () => {
-    it('should pass with a valid refreshToken', () => {
-        const { error } = refreshTokenSchema.validate({
-            refreshToken: 'some-refresh-token-string',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without refreshToken', () => {
-        const { error } = refreshTokenSchema.validate({});
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Refresh token is required/i);
-    });
-});
-
-// ============================================================
-// resetPasswordSchema
-// ============================================================
-
-describe('resetPasswordSchema', () => {
-    it('should pass with valid token and password', () => {
-        const { error } = resetPasswordSchema.validate({
-            token: 'reset-token-abc',
-            password: 'newpassword',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without token', () => {
-        const { error } = resetPasswordSchema.validate({ password: 'newpassword' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Reset token is required/i);
-    });
-
-    it('should fail with password too short', () => {
-        const { error } = resetPasswordSchema.validate({
-            token: 'abc',
-            password: '12345',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/at least 6 characters/i);
-    });
-
-    it('should fail with password too long (> 100 chars)', () => {
-        const { error } = resetPasswordSchema.validate({
-            token: 'abc',
-            password: 'a'.repeat(101),
-        });
-        expect(error).toBeDefined();
-    });
-});
-
-// ============================================================
-// changePasswordSchema (auth)
-// ============================================================
-
-describe('changePasswordSchema (auth.validator)', () => {
-    it('should pass with valid old and new passwords', () => {
-        const { error } = changePasswordSchema.validate({
-            oldPassword: 'oldpass123',
-            newPassword: 'newpass456',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without oldPassword', () => {
-        const { error } = changePasswordSchema.validate({ newPassword: 'newpass456' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Password is required/i);
-    });
-
-    it('should fail without newPassword', () => {
-        const { error } = changePasswordSchema.validate({ oldPassword: 'oldpass123' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Password is required/i);
-    });
-});
-
-// ============================================================
-// resetRequestSchema
-// ============================================================
-
-describe('resetRequestSchema', () => {
-    it('should pass with valid email', () => {
-        const { error } = resetRequestSchema.validate({ email: 'user@example.com' });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without email', () => {
-        const { error } = resetRequestSchema.validate({});
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Email is required/i);
-    });
-
-    it('should fail with invalid email', () => {
-        const { error } = resetRequestSchema.validate({ email: 'not-email' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/valid email/i);
-    });
-});

Backend/tests/unit/validators/categories.validator.test.ts

@@ -1,121 +0,0 @@
-import {
-    CreateCategoryValidator,
-    UpdateCategoryValidator,
-} from '@/validators/categories.validator';
-
-describe('CreateCategoryValidator', () => {
-    const validPayload = {
-        name: { th: 'การพัฒนาเว็บ', en: 'Web Development' },
-        slug: 'web-development',
-        description: { th: 'หมวดหมู่การพัฒนาเว็บ', en: 'Web development category' },
-    };
-
-    it('should pass with all required fields', () => {
-        const { error } = CreateCategoryValidator.validate(validPayload);
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with optional created_by', () => {
-        const { error } = CreateCategoryValidator.validate({
-            ...validPayload,
-            created_by: 1,
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without name', () => {
-        const { error } = CreateCategoryValidator.validate({
-            ...validPayload,
-            name: undefined,
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Name is required/i);
-    });
-
-    it('should fail without name.th', () => {
-        const { error } = CreateCategoryValidator.validate({
-            ...validPayload,
-            name: { en: 'Web Development' },
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Thai name is required/i);
-    });
-
-    it('should fail without slug', () => {
-        const { error } = CreateCategoryValidator.validate({
-            ...validPayload,
-            slug: undefined,
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Slug is required/i);
-    });
-
-    it('should fail with invalid slug format (uppercase)', () => {
-        const { error } = CreateCategoryValidator.validate({
-            ...validPayload,
-            slug: 'Web-Development',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/lowercase with hyphens/i);
-    });
-
-    it('should fail with invalid slug format (spaces)', () => {
-        const { error } = CreateCategoryValidator.validate({
-            ...validPayload,
-            slug: 'web development',
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should pass with valid slug formats', () => {
-        const slugs = ['web', 'web-dev', 'web-development-101'];
-        for (const slug of slugs) {
-            const { error } = CreateCategoryValidator.validate({
-                ...validPayload,
-                slug,
-            });
-            expect(error).toBeUndefined();
-        }
-    });
-
-    it('should fail without description', () => {
-        const { error } = CreateCategoryValidator.validate({
-            ...validPayload,
-            description: undefined,
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Description is required/i);
-    });
-});
-
-describe('UpdateCategoryValidator', () => {
-    it('should pass with only required id', () => {
-        const { error } = UpdateCategoryValidator.validate({ id: 1 });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with all optional fields', () => {
-        const { error } = UpdateCategoryValidator.validate({
-            id: 1,
-            name: { th: 'ใหม่', en: 'New' },
-            slug: 'new-category',
-            description: { th: 'คำอธิบาย', en: 'Description' },
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without id', () => {
-        const { error } = UpdateCategoryValidator.validate({ name: { th: 'ใหม่', en: 'New' } });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Category ID is required/i);
-    });
-
-    it('should fail with invalid slug format', () => {
-        const { error } = UpdateCategoryValidator.validate({
-            id: 1,
-            slug: 'Invalid Slug!',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/lowercase with hyphens/i);
-    });
-});

Backend/tests/unit/validators/user.validator.test.ts

@@ -1,100 +0,0 @@
-import {
-    profileUpdateSchema,
-    changePasswordSchema,
-} from '@/validators/user.validator';
-
-describe('profileUpdateSchema', () => {
-    it('should pass with empty object (all optional)', () => {
-        const { error } = profileUpdateSchema.validate({});
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with all fields', () => {
-        const { error } = profileUpdateSchema.validate({
-            prefix: { th: 'นาย', en: 'Mr.' },
-            first_name: 'John',
-            last_name: 'Doe',
-            phone: '0812345678',
-            avatar_url: 'https://example.com/avatar.jpg',
-            birth_date: new Date('1990-01-01'),
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should pass with partial update (first_name only)', () => {
-        const { error } = profileUpdateSchema.validate({ first_name: 'Jane' });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail if first_name is empty string', () => {
-        const { error } = profileUpdateSchema.validate({ first_name: '' });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if first_name exceeds 100 characters', () => {
-        const { error } = profileUpdateSchema.validate({ first_name: 'a'.repeat(101) });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if phone is too short (< 10 chars)', () => {
-        const { error } = profileUpdateSchema.validate({ phone: '081234' });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if phone exceeds 15 characters', () => {
-        const { error } = profileUpdateSchema.validate({ phone: '1'.repeat(16) });
-        expect(error).toBeDefined();
-    });
-
-    it('should pass with valid birth_date', () => {
-        const { error } = profileUpdateSchema.validate({ birth_date: new Date('2000-06-15') });
-        expect(error).toBeUndefined();
-    });
-});
-
-describe('changePasswordSchema (user.validator)', () => {
-    it('should pass with valid old and new passwords', () => {
-        const { error } = changePasswordSchema.validate({
-            oldPassword: 'oldpass123',
-            newPassword: 'newpass456',
-        });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without oldPassword', () => {
-        const { error } = changePasswordSchema.validate({ newPassword: 'newpass456' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Old password is required/i);
-    });
-
-    it('should fail without newPassword', () => {
-        const { error } = changePasswordSchema.validate({ oldPassword: 'oldpass123' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/New password is required/i);
-    });
-
-    it('should fail if oldPassword is shorter than 6 chars', () => {
-        const { error } = changePasswordSchema.validate({
-            oldPassword: '12345',
-            newPassword: 'newpass456',
-        });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/at least 6 characters/i);
-    });
-
-    it('should fail if newPassword is shorter than 6 chars', () => {
-        const { error } = changePasswordSchema.validate({
-            oldPassword: 'oldpass123',
-            newPassword: '123',
-        });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail if oldPassword exceeds 100 characters', () => {
-        const { error } = changePasswordSchema.validate({
-            oldPassword: 'a'.repeat(101),
-            newPassword: 'newpass456',
-        });
-        expect(error).toBeDefined();
-    });
-});

Backend/tests/unit/validators/usermanagement.validator.test.ts

@@ -1,59 +0,0 @@
-import {
-    getUserByIdValidator,
-    updateUserRoleValidator,
-} from '@/validators/usermanagement.validator';
-
-describe('getUserByIdValidator', () => {
-    it('should pass with valid id', () => {
-        const { error } = getUserByIdValidator.validate({ id: 1 });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without id', () => {
-        const { error } = getUserByIdValidator.validate({});
-        expect(error).toBeDefined();
-    });
-
-    it('should fail with non-numeric id', () => {
-        const { error } = getUserByIdValidator.validate({ id: 'abc' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/ID must be a number/i);
-    });
-
-    it('should pass with id = 0', () => {
-        // Joi number() allows 0 by default unless positive() is specified
-        const { error } = getUserByIdValidator.validate({ id: 0 });
-        expect(error).toBeUndefined();
-    });
-});
-
-describe('updateUserRoleValidator', () => {
-    it('should pass with valid id and role_id', () => {
-        const { error } = updateUserRoleValidator.validate({ id: 1, role_id: 2 });
-        expect(error).toBeUndefined();
-    });
-
-    it('should fail without id', () => {
-        const { error } = updateUserRoleValidator.validate({ role_id: 2 });
-        expect(error).toBeDefined();
-    });
-
-    it('should fail without role_id', () => {
-        const { error } = updateUserRoleValidator.validate({ id: 1 });
-        expect(error).toBeDefined();
-        // Joi uses field name in message when custom messages don't match
-        expect(error?.details[0].message).toContain('role_id');
-    });
-
-    it('should fail with non-numeric role_id', () => {
-        const { error } = updateUserRoleValidator.validate({ id: 1, role_id: 'admin' });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/Role ID must be a number/i);
-    });
-
-    it('should fail with non-numeric id', () => {
-        const { error } = updateUserRoleValidator.validate({ id: 'abc', role_id: 1 });
-        expect(error).toBeDefined();
-        expect(error?.details[0].message).toMatch(/ID must be a number/i);
-    });
-});

Backend/tsconfig.test.json

@@ -1,20 +0,0 @@
-{
-    "extends": "./tsconfig.json",
-    "compilerOptions": {
-        "rootDir": ".",
-        "baseUrl": ".",
-        "paths": {
-            "@/*": [
-                "src/*"
-            ]
-        },
-        "types": [
-            "node",
-            "jest"
-        ]
-    },
-    "include": [
-        "src/**/*",
-        "tests/**/*"
-    ]
-}

Frontend-Learner/.nuxtrc

@@ -1 +0,0 @@
-setups.@nuxt/test-utils="4.0.0"

Frontend-Learner/app.vue

@@ -1,34 +1,27 @@
-<script setup lang="ts">
+<script setup>
-/**
+// ดึงฟังก์ชันจัดการ Authentication
- * @file app.vue
- * @description Root application component.
- * Handles initialization of authentication and theme settings.
- */
-
-// Initialize composables
 const { fetchUserProfile, isAuthenticated } = useAuth()
-const { isDark, set: setTheme } = useThemeMode()
 
-// App initialization logic
+// เมื่อ App เริ่มทำงาน (Mounted)
 onMounted(() => {
-  // 1. Fetch user profile if tokens exist
+  // 1. หากผู้ใช้ Login ค้างไว้ (มี Token) ให้ดึงข้อมูล Profile ล่าสุดทันที
   if (isAuthenticated.value) {
     fetchUserProfile()
   }
 
-  // 2. Initialize theme from persistent storage or system preference
+  // 2. ตรวจสอบและคืนค่า Theme (Dark/Light) จาก LocalStorage
   const savedTheme = localStorage.getItem('theme')
-  if (savedTheme) {
+  if (savedTheme === 'dark' || (!savedTheme && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-    setTheme(savedTheme === 'dark')
+    document.documentElement.classList.add('dark')
-  } else if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+  } else {
-    setTheme(true)
+    document.documentElement.classList.remove('dark')
   }
 })
 </script>
 
 <template>
-  <!-- แสดงแถบโหลดด้านบนจอ (Progress Bar) แทนการโหลดเต็มหน้าจอ -->
+  <!-- แสดง Loader ระหว่างเปลี่ยนหน้า หรือโหลดข้อมูล -->
-  <NuxtLoadingIndicator color="#2563EB" :height="4" />
+  <GlobalLoader />
   
   <!-- NuxtLayout: แสดง Layout ที่กำหนดในแต่ละเพจ (default: layouts/default.vue) -->
   <NuxtLayout>

Frontend-Learner/assets/css/main.css

@@ -113,9 +113,9 @@ body {
   background-attachment: fixed;
 }
 
-/* a {
+a {
   text-decoration: none;
-  color: #2563eb;
+  color: #3b82f6;
   transition: color 0.2s;
 }
 
@@ -129,7 +129,7 @@ a:hover {
 
 .dark a:hover {
   color: #93c5fd;
-} */
+}
 
 ul {
   list-style: none;
@@ -645,9 +645,9 @@ ul {
 .rounded {
   border-radius: var(--radius-md);
 }
-/* .border-b {
+.border-b {
   border-bottom: 1px solid var(--border-color);
-} */
+}
 .load-more-wrap {
   display: flex;
   justify-content: center;

Frontend-Learner/components/classroom/AnnouncementModal.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 /**
  * @file AnnouncementModal.vue
- * @description คอมโพเนนต์ Modal สำหรับแสดงประกาศของคอร์สเรียน (Modal component to display course announcements)
+ * @description Modal component to display course announcements
  */
 
 const props = defineProps<{
@@ -15,7 +15,7 @@ const emit = defineEmits<{
 
 const { locale, t } = useI18n()
 
-// ตัวช่วยจัดการข้อความหลายภาษา (Helper for localization)
+// Helper for localization
 const getLocalizedText = (text: any) => {
   if (!text) return ''
   if (typeof text === 'string') return text
@@ -49,7 +49,7 @@ const getLocalizedText = (text: any) => {
                         class="p-5 rounded-2xl bg-white dark:bg-slate-800 shadow-sm border border-gray-200 dark:border-white/5 transition-all hover:shadow-md relative overflow-hidden group"
                         :class="{'ring-2 ring-orange-200 dark:ring-orange-900/40 !bg-orange-50/50 dark:!bg-orange-900/20': ann.is_pinned}"
                      >
-                        <!-- ป้ายกำกับสำหรับข้อความที่ปักหมุดไว้ (Pinned Banner) -->
+                        <!-- Pinned Banner -->
                         <div v-if="ann.is_pinned" class="absolute top-0 right-0 p-3">
                             <q-icon name="push_pin" color="orange" size="18px" class="transform rotate-45" />
                         </div>

Frontend-Learner/components/classroom/CurriculumSidebar.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 /**
  * @file CurriculumSidebar.vue
- * @description คอมโพเนนต์แถบเมนูด้านข้างสำหรับแสดงหลักสูตรของคอร์สเรียน (บทเรียน & ตอนต่างๆ)
+ * @description Sidebar Component for displaying course curriculum (Chapters & Lessons)
- * จัดการการนำทางไปยังบทเรียน, แสดงสถานะการล็อค, และแจ้งเตือนประกาศที่ยังไม่ได้อ่าน
+ * Handles lesson navigation, locked status display, and unread announcement badge.
  */
 
 const props = defineProps<{
-  modelValue: boolean; // สถานะการเปิด/ปิดของ Sidebar (Sidebar open state - v-model)
+  modelValue: boolean; // Sidebar open state (v-model)
   courseData: any;
   currentLessonId?: number;
   isLoading: boolean;
@@ -21,10 +21,10 @@ const emit = defineEmits<{
 
 const { locale } = useI18n()
 
-// สถานะของส่วนที่ขยายได้ (State for expansion items)
+// State for expansion items
 const chapterOpenState = ref<Record<string, boolean>>({})
 
-// ตัวช่วยจัดการข้อความหลายภาษา (Helper for localization)
+// Helper for localization
 const getLocalizedText = (text: any) => {
   if (!text) return ''
   if (typeof text === 'string') return text
@@ -34,13 +34,13 @@ const getLocalizedText = (text: any) => {
   return text[currentLocale] || text.th || text.en || ''
 }
 
-// ตัวช่วยตรวจสอบว่าบทเรียนเรียนจบหรือยัง (Helper: Check if lesson is completed)
+// Helper: Check if lesson is completed
 const isLessonCompleted = (lesson: any) => {
     return lesson.is_completed === true || lesson.progress?.is_completed === true
 }
 
-// ตรวจสอบสถานะการสำเร็จของบท (Reactive Chapter Completion Status)
+// Reactive Chapter Completion Status
-// คำนวณเป็น Map ของ chapterId -> boolean (true ถ้าทุกบทเรียนย่อยเรียนจบแล้ว)
+// Computes a map of chapterId -> boolean (true if all lessons are completed)
 const chapterCompletionStatus = computed(() => {
     const status: Record<string, boolean> = {}
     if (!props.courseData || !props.courseData.chapters) return status
@@ -55,7 +55,7 @@ const chapterCompletionStatus = computed(() => {
     return status
 })
 
-// คำนวณความคืบหน้าแบบ Local (Local Progress Calculation)
+// Local Progress Calculation
 const progressPercentage = computed(() => {
   if (!props.courseData || !props.courseData.chapters) return 0
   let total = 0
@@ -69,7 +69,7 @@ const progressPercentage = computed(() => {
   return total > 0 ? Math.round((completed / total) * 100) : 0
 })
 
-// ขยายบทเรียนปัจจุบันอัตโนมัติ (Auto-expand chapter containing current lesson)
+// Auto-expand chapter containing current lesson
 watch(() => props.currentLessonId, (newId) => {
     if (newId && props.courseData?.chapters) {
         props.courseData.chapters.forEach((chapter: any) => {
@@ -81,7 +81,7 @@ watch(() => props.currentLessonId, (newId) => {
     }
 }, { immediate: true })
 
-// ตั้งค่าเริ่มต้นให้ทุกบทเรียนเปิดอยู่เมื่อโหลด (Initialize all chapters as open by default on load)
+// Initialize all chapters as open by default on load
 watch(() => props.courseData, (newData) => {
     if (newData?.chapters) {
         newData.chapters.forEach((chapter: any) => {
@@ -102,20 +102,20 @@ watch(() => props.courseData, (newData) => {
       side="right"
       :width="300"
       :breakpoint="1024"
-      class="bg-slate-50 dark:!bg-slate-900 shadow-xl"
+      class="bg-slate-50 dark:bg-slate-900 shadow-xl"
     >
-      <!-- คอนเทนเนอร์หลักบังคับใช้ความกว้างเต็มที่ (Main Container: Enforce Column Layout and Full Width) -->
+      <!-- Main Container: Enforce Column Layout and Full Width -->
-      <div v-if="courseData" class="flex flex-col w-full h-full overflow-hidden text-slate-900 dark:!text-white relative bg-slate-50 dark:!bg-slate-900">
+      <div v-if="courseData" class="flex flex-col w-full h-full overflow-hidden text-slate-900 dark:text-white relative">
         
-        <!-- 1. ส่วนหัว ด้านบนคงที่ (Header Section - Fixed at Top) -->
+        <!-- 1. Header Section (Fixed at Top) -->
-        <div class="flex-none p-5 border-b border-slate-200 dark:border-white/10 bg-white dark:!bg-slate-900 z-10 w-full">
+        <div class="flex-none p-5 border-b border-slate-200 dark:border-white/10 bg-white dark:bg-slate-900 z-10 w-full">
-           <h2 class="text-sm font-bold mb-4 line-clamp-2 leading-snug block w-full text-slate-900 dark:!text-white">{{ getLocalizedText(courseData.course.title) }}</h2>
+           <h2 class="text-sm font-bold mb-4 line-clamp-2 leading-snug block w-full">{{ getLocalizedText(courseData.course.title) }}</h2>
            
            <div class="flex justify-between items-center mb-2 w-full">
-            <span class="text-xs font-black uppercase tracking-widest text-slate-500 dark:!text-slate-400">{{ $t('course.progress') }}</span>
+            <span class="text-xs font-black uppercase tracking-widest text-slate-500 dark:text-slate-400">{{ $t('course.progress') }}</span>
-            <span class="text-sm font-black text-blue-600 dark:!text-blue-400">{{ progressPercentage }}%</span>
+            <span class="text-sm font-black text-blue-600 dark:text-blue-400">{{ progressPercentage }}%</span>
           </div>
-          <div class="h-2 w-full bg-slate-100 dark:!bg-slate-800 rounded-full overflow-hidden">
+          <div class="h-2 w-full bg-slate-100 dark:bg-slate-800 rounded-full overflow-hidden">
             <div 
               class="h-full bg-blue-600 dark:bg-blue-500 rounded-full transition-all duration-700 ease-out" 
               :style="{ width: `${progressPercentage}%` }"
@@ -123,77 +123,77 @@ watch(() => props.courseData, (newData) => {
           </div>
         </div>
 
-        <!-- 2. รายการหลักสูตร พื้นที่เลื่อนได้ (Curriculum List - Scrollable Area) -->
+        <!-- 2. Curriculum List (Scrollable Area) -->
-         <div class="flex-1 overflow-y-auto bg-slate-50 dark:!bg-slate-900 w-full p-4 space-y-3">
+         <div class="flex-1 overflow-y-auto bg-slate-50 dark:bg-[#0f1219] w-full p-4 space-y-3">
              <q-list class="block w-full">
                 <div v-for="(chapter, idx) in courseData.chapters" :key="chapter.id" class="block w-full mb-3">
-                    <!-- กล่องข้อมูลของบท (Chapter Accordion) -->
+                    <!-- Chapter Accordion -->
                     <q-expansion-item
                         v-model="chapterOpenState[chapter.id]"
-                        class="bg-white dark:!bg-slate-800 rounded-xl overflow-hidden shadow-sm border border-slate-200 dark:border-slate-700 w-full"
+                        class="bg-white dark:bg-[#1a1e29] rounded-xl overflow-hidden shadow-sm border border-slate-200 dark:border-slate-800 w-full"
-                        header-class="rounded-t-xl w-full text-slate-900 dark:!text-white"
+                        header-class="rounded-t-xl w-full"
-                        expand-icon-class="text-slate-400 dark:!text-slate-300"
+                        expand-icon-class="text-slate-400"
                     >
                         <template v-slot:header>
-                            <div class="flex items-center w-full py-3 text-slate-900 dark:!text-white">
+                            <div class="flex items-center w-full py-3 text-slate-900 dark:text-white">
                                 <div class="mr-3 flex-shrink-0">
-                                    <!-- ตัวบ่งชี้บทเรียน เครื่องหมายถูกหรือตัวเลข (Chapter Indicator - Check or Number) -->
+                                    <!-- Chapter Indicator (Check or Number) -->
                                     <div class="w-7 h-7 rounded-full border-2 flex items-center justify-center transition-colors font-bold"
                                          :class="chapterCompletionStatus[chapter.id]
-                                            ? 'border-green-500 text-green-500 bg-green-50 dark:!bg-green-500/10' 
+                                            ? 'border-green-500 text-green-500 bg-green-50 dark:bg-green-500/10' 
-                                            : 'border-slate-300 dark:!border-slate-600 text-slate-500 dark:!text-slate-400 bg-slate-100 dark:!bg-slate-700'">
+                                            : 'border-slate-300 dark:border-slate-600 text-slate-500 dark:text-slate-400 bg-slate-100 dark:bg-slate-800'">
                                         <q-icon v-if="chapterCompletionStatus[chapter.id]" name="check" size="14px" class="font-bold" />
                                         <span v-else class="text-[10px]">{{ Number(idx) + 1 }}</span>
                                     </div>
                                 </div>
-                                <!-- จัดการตัวอักษรที่ล้นเกินอย่างชัดเจน (Explicitly handle text overflow) -->
+                                <!-- Explicitly handle text overflow -->
                                 <div class="flex-1 min-w-0 pr-2 overflow-hidden">
                                     <div class="font-bold text-sm leading-tight mb-0.5 truncate block w-full">{{ getLocalizedText(chapter.title) }}</div>
-                                    <div class="text-[10px] text-slate-500 dark:!text-slate-400 font-normal truncate block w-full">
+                                    <div class="text-[10px] text-slate-500 dark:text-slate-400 font-normal truncate block w-full">
                                         {{ chapter.lessons.length }} {{ $t('course.lessonsUnit') }}
                                     </div>
                                 </div>
                             </div>
                         </template>
 
-                        <!-- รายการบทเรียนย่อย (Lessons List) -->
+                        <!-- Lessons List -->
-                        <div class="bg-slate-50 dark:!bg-slate-800/50 border-t border-slate-100 dark:border-slate-700 w-full">
+                        <div class="bg-slate-50 dark:bg-[#0f1219]/50 border-t border-slate-100 dark:border-slate-800 w-full">
                             <div 
                                 v-for="(lesson, lIdx) in chapter.lessons" 
                                 :key="lesson.id"
-                                class="flex items-center px-4 py-3 cursor-pointer transition-all border-l-4 hover:bg-slate-100 dark:hover:!bg-slate-700/50 w-full"
+                                class="flex items-center px-4 py-3 cursor-pointer transition-all border-l-4 hover:bg-slate-100 dark:hover:bg-slate-800/50 w-full"
                                 :class="currentLessonId === lesson.id 
-                                    ? 'border-blue-600 bg-blue-50 dark:!bg-blue-900/40' 
+                                    ? 'border-blue-600 bg-blue-50 dark:bg-blue-900/10' 
                                     : 'border-transparent'"
                                 @click="!lesson.is_locked && emit('select-lesson', lesson.id)"
                             >
-                                <!-- ไอคอนสถานะของบทเรียน (Lesson Status Icon) -->
+                                <!-- Lesson Status Icon -->
                                 <div class="mr-3 flex-shrink-0">
-                                    <!-- เรียนจบแล้ว (สำคัญที่สุด) (Completed - Takes Precedence) -->
+                                    <!-- Completed (Takes Precedence) -->
                                     <q-icon v-if="isLessonCompleted(lesson)" 
                                             name="check_circle" 
                                             class="text-green-500" 
                                             size="20px" 
                                     />
-                                    <!-- กำลังเรียนอยู่ (Active/Playing - If not completed) -->
+                                    <!-- Active/Playing (If not completed) -->
                                     <q-icon v-else-if="currentLessonId === lesson.id" 
                                             name="play_circle_filled" 
-                                            class="text-blue-600 dark:!text-blue-400 animate-pulse" 
+                                            class="text-blue-600 dark:text-blue-400 animate-pulse" 
                                             size="20px" 
                                     />
-                                    <!-- ถูกล็อคอยู่ (Locked) -->
+                                    <!-- Locked -->
                                     <q-icon v-else-if="lesson.is_locked" 
                                             name="lock" 
-                                            class="text-slate-400 dark:!text-slate-500 opacity-70" 
+                                            class="text-slate-400 opacity-70" 
                                             size="18px" 
                                     />
-                                    <!-- ยังไม่ได้เริ่ม (Not Started) -->
+                                    <!-- Not Started -->
                                     <div v-else class="w-[18px] h-[18px] rounded-full border-2 border-slate-300 dark:border-slate-600"></div>
                                 </div>
 
                                 <div class="flex-1 min-w-0 overflow-hidden">
                                     <div class="text-xs font-bold truncate leading-snug block w-full"
-                                        :class="currentLessonId === lesson.id ? 'text-blue-700 dark:!text-blue-300' : 'text-slate-600 dark:!text-slate-300'"
+                                        :class="currentLessonId === lesson.id ? 'text-blue-700 dark:text-blue-300' : 'text-slate-600 dark:text-slate-300'"
                                     >
                                         {{ getLocalizedText(lesson.title) }}
                                     </div>
@@ -214,7 +214,7 @@ watch(() => props.courseData, (newData) => {
 </template>
 
 <style scoped>
-/* สครอลบาร์ปรับแต่งเพื่อความสวยงาม (Custom scrollbar for better aesthetics) */
+/* Custom scrollbar for better aesthetics */
 ::-webkit-scrollbar {
   width: 4px;
 }

Frontend-Learner/components/classroom/VideoPlayer.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 /**
  * @file VideoPlayer.vue
- * @description คอมโพเนนต์เครื่องเล่นวิดีโอพร้อมด้วยตัวควบคุมแบบกำหนดเองตามการออกแบบ (Video Player Component with custom controls provided by design)
+ * @description Video Player Component with custom controls provided by design
  */
 
 const props = defineProps<{
@@ -22,7 +22,7 @@ const videoProgress = ref(0);
 const currentTime = ref(0);
 const duration = ref(0);
 
-// การตั้งค่าเกี่ยวกับสื่อ (Media Prefs)
+// Media Prefs
 const { volume, muted: isMuted, setVolume, setMuted, applyTo } = useMediaPrefs();
 
 const volumeIcon = computed(() => {
@@ -40,7 +40,7 @@ const formatTime = (time: number) => {
 const currentTimeDisplay = computed(() => formatTime(currentTime.value));
 const durationDisplay = computed(() => formatTime(duration.value || 0));
 
-// ตรรกะตัวช่วยสำหรับ YouTube (YouTube Helper Logic)
+// YouTube Helper Logic
 const isYoutube = computed(() => {
     const s = props.src.toLowerCase();
     return s.includes('youtube.com') || s.includes('youtu.be');
@@ -50,7 +50,7 @@ const youtubeEmbedUrl = computed(() => {
     if (!isYoutube.value) return '';
     let videoId = '';
     
-    // ดึงรหัสวิดีโอ (Extract Video ID)
+    // Extract Video ID
     if (props.src.includes('youtu.be')) {
         videoId = props.src.split('youtu.be/')[1]?.split('?')[0];
     } else {
@@ -58,18 +58,18 @@ const youtubeEmbedUrl = computed(() => {
         videoId = urlParams.get('v') || '';
     }
 
-    // คืนค่า URL สำหรับฝังพร้อมเปิดใช้งาน jsapi (Return Embed URL with enablejsapi=1)
+    // Return Embed URL with enablejsapi=1
     return `https://www.youtube.com/embed/${videoId}?enablejsapi=1&rel=0`;
 });
 
-// การติดตามผ่าน YouTube API (YouTube API Tracking)
+// YouTube API Tracking
 let ytPlayer: any = null;
 let ytInterval: any = null;
 
 const initYoutubeAPI = () => {
     if (!isYoutube.value || typeof window === 'undefined') return;
 
-    // โหลดสคริปต์ API หากยังไม่มี (Load API Script if not exists)
+    // Load API Script if not exists
     if (!(window as any).YT) {
         const tag = document.createElement('script');
         tag.src = "https://www.youtube.com/iframe_api";
@@ -83,7 +83,7 @@ const initYoutubeAPI = () => {
                 'onReady': (event: any) => {
                     duration.value = event.target.getDuration();
                     
-                    // ตรรกะการเล่นต่อสำหรับ YouTube (Resume Logic for YouTube)
+                    // Resume Logic for YouTube
                     if (props.initialSeekTime && props.initialSeekTime > 0) {
                         event.target.seekTo(props.initialSeekTime, true);
                     }
@@ -118,7 +118,7 @@ const startYTTracking = () => {
             currentTime.value = ytPlayer.getCurrentTime();
             emit('timeupdate', currentTime.value, duration.value);
         }
-    }, 1000); // ตรวจสอบทุกๆ วินาที (Check every second)
+    }, 1000); // Check every second
 };
 
 const stopYTTracking = () => {
@@ -145,7 +145,7 @@ onUnmounted(() => {
     destroyYoutubePlayer();
 });
 
-// เฝ้าดูการเปลี่ยนแปลงของ src เพื่อเริ่มต้นใหม่ (Watch for src change to re-init)
+// Watch for src change to re-init
 watch(() => props.src, (newSrc, oldSrc) => {
     if (newSrc !== oldSrc) {
         destroyYoutubePlayer();
@@ -174,8 +174,8 @@ const togglePlay = () => {
             playPromise.then(() => {
                 isPlaying.value = true;
             }).catch(error => {
-                // การเล่นอัตโนมัติถูกป้องกันหรือถูกขัดจังหวะ (Auto-play was prevented or play was interrupted)
+                // Auto-play was prevented or play was interrupted
-                // สามารถละเว้นข้อผิดพลาดนี้ได้อย่างปลอดภัย (We can safely ignore this error)
+                // We can safely ignore this error
                 console.log("Video play request handled:", error.name);
             });
         }
@@ -223,14 +223,14 @@ const handleVolumeChange = (val: any) => {
     setVolume(newVol);
 };
 
-// เปิดเผย video ref ให้คอมโพเนนต์แม่ควบคุมถ้าจำเป็น (Expose video ref for parent to control if needed)
+// Expose video ref for parent to control if needed
 defineExpose({
     videoRef,
     pause: () => videoRef.value?.pause(),
     currentTime: () => videoRef.value?.currentTime || 0
 });
 
-// เฝ้าดูการเปลี่ยนแปลงระดับเสียง/ปิดเสียง เพื่อนำไปใช้กับองค์ประกอบวิดีโอ (Watch for volume/mute changes to apply to video element)
+// Watch for volume/mute changes to apply to video element
 watch([volume, isMuted], () => {
     if (videoRef.value) applyTo(videoRef.value);
 });
@@ -238,7 +238,7 @@ watch([volume, isMuted], () => {
 
 <template>
     <div class="bg-black rounded-xl overflow-hidden shadow-2xl mb-6 aspect-video relative group ring-1 ring-white/10">
-        <!-- 1. เครื่องเล่น YouTube (YouTube Player) -->
+        <!-- 1. YouTube Player -->
         <iframe
             v-if="isYoutube"
             id="youtube-iframe"
@@ -249,7 +249,7 @@ watch([volume, isMuted], () => {
             allowfullscreen
         ></iframe>
 
-        <!-- 2. เครื่องเล่นวิดีโอ HTML5 มาตรฐาน (Standard HTML5 Video Player) -->
+        <!-- 2. Standard HTML5 Video Player -->
         <div v-else class="w-full h-full relative group/video cursor-pointer">
             <video
                 ref="videoRef"
@@ -262,9 +262,9 @@ watch([volume, isMuted], () => {
                 @ended="handleEnded"
             />
         
-            <!-- เลเยอร์ควบคุมแบบกำหนดเอง (Overlay) เฉพาะสำหรับวิดีโอ HTML5 เท่านั้น (Custom Controls Overlay (Only for HTML5 Video)) -->
+            <!-- Custom Controls Overlay (Only for HTML5 Video) -->
             <div class="absolute bottom-0 left-0 right-0 p-6 bg-gradient-to-t from-black/90 via-black/40 to-transparent transition-opacity opacity-0 group-hover/video:opacity-100 flex flex-col gap-3">
-                <!-- แถบแสดงความคืบหน้า (Progress Bar) -->
+                <!-- Progress Bar -->
                 <div class="relative flex-grow h-1.5 bg-white/20 rounded-full cursor-pointer group/progress overflow-hidden" @click="seek">
                     <div class="absolute top-0 left-0 h-full bg-blue-500 rounded-full group-hover/progress:bg-blue-400 transition-all shadow-[0_0_12px_rgba(59,130,246,0.6)]" :style="{ width: videoProgress + '%' }"></div>
                 </div>
@@ -275,7 +275,7 @@ watch([volume, isMuted], () => {
                     
                     <div class="flex-grow"></div>
 
-                    <!-- ตัวควบคุมระดับเสียง (Volume Control) -->
+                    <!-- Volume Control -->
                     <div class="flex items-center gap-2 group/volume relative">
                         <q-btn flat round dense :icon="volumeIcon" @click.stop="handleToggleMute" color="white" class="hover:scale-110 transition-transform" />
                         <div class="w-0 group-hover/volume:w-24 overflow-hidden transition-all duration-300 flex items-center bg-black/60 backdrop-blur-md rounded-full px-2">

Frontend-Learner/components/common/FormInput.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 /**
  * @file FormInput.vue
- * @description คอมโพเนนต์ช่องกรอกข้อมูล (Input) แบบนำกลับมาใช้ใหม่ได้ พร้อมรองรับข้อความป้ายกำกับ, จัดการข้อผิดพลาด และสถานะปิดใช้งาน/บังคับกรอก
+ * @description Reusable input component with label, error handling, and support for disabled/required states.
- * รองรับการสลับซ่อน/แสดงรหัสผ่าน
+ * Now supports password visibility toggle.
  */
 
 const props = defineProps<{
@@ -16,19 +16,19 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-  /** อัปเดตค่า v-model (Update v-model value) */
+  /** Update v-model value */
   'update:modelValue': [value: string]
 }>()
 
-// สถานะการซ่อน/แสดงรหัสผ่าน (Password visibility state)
+// Password visibility state
 const showPassword = ref(false)
 
-// ฟังก์ชันสำหรับสลับสถานะ (Toggle function)
+// Toggle function
 const togglePassword = () => {
   showPassword.value = !showPassword.value
 }
 
-// คำนวณประเภทของช่องกรอกข้อมูล بناءً pada state (Compute input type based on visibility state)
+// Compute input type based on visibility state
 const inputType = computed(() => {
   if (props.type === 'password') {
     return showPassword.value ? 'text' : 'password'
@@ -59,7 +59,7 @@ const updateValue = (event: Event) => {
         @input="updateValue"
       >
       
-      <!-- ปุ่มสลับซ่อน/แสดงรหัสผ่าน (Password Toggle Button) -->
+      <!-- Password Toggle Button -->
       <button
         v-if="type === 'password'"
         type="button"
@@ -67,13 +67,13 @@ const updateValue = (event: Event) => {
         @click="togglePassword"
         tabindex="-1"
       >
-        <!-- ไอคอนเปิดตา (แสดงรหัสผ่าน) (Eye Icon - Show) -->
+        <!-- Eye Icon (Show) -->
         <svg v-if="!showPassword" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
           <path d="M2 12s3-7 10-7 10 7 10 7-3 7-10 7-10-7-10-7Z"/>
           <circle cx="12" cy="12" r="3"/>
         </svg>
         
-        <!-- ไอคอนปิดตา (ซ่อนรหัสผ่าน) (Eye Off Icon - Hide) -->
+        <!-- Eye Off Icon (Hide) -->
         <svg v-else xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
           <path d="M9.88 9.88a3 3 0 1 0 4.24 4.24"/>
           <path d="M10.73 5.08A10.43 10.43 0 0 1 12 5c7 0 10 7 10 7a13.16 13.16 0 0 1-1.67 2.68"/>

Frontend-Learner/components/common/GlobalLoader.vue

@@ -1,20 +1,20 @@
 <script setup lang="ts">
 /**
  * @file GlobalLoader.vue
- * @description คอมโพเนนต์หน้าจอโหลดแบบเต็มจอ (Global full-screen loading) แสดงผลตอนเปลี่ยนหน้า
+ * @description Global full-screen loading overlay that triggers during page navigation.
- * พร้มแอนิเมชันโลโก้ขยับได้แบบพรีเมียม
+ * Uses a premium pulsing logo animation.
  */
 
 const nuxtApp = useNuxtApp()
 const isLoading = ref(false)
 
-// ดักจับจังหวะการเปลี่ยนหน้าผ่าย Nuxt hook (Hook into Nuxt page transitions)
+// Hook into Nuxt page transitions
 nuxtApp.hook('page:start', () => {
   isLoading.value = true
 })
 
 nuxtApp.hook('page:finish', () => {
-  // หน่วงเวลาเล็กน้อยเพื่อให้ไหลลื่น ไม่กระพริบเร็วไปหากหน้าโหลดเสร็จไว (Add a small delay for better UX)
+  // Add a small delay for better UX (prevents flickering on fast loads)
   setTimeout(() => {
     isLoading.value = false
   }, 500)
@@ -25,14 +25,14 @@ nuxtApp.hook('page:finish', () => {
   <Transition name="fade">
     <div v-if="isLoading" class="fixed inset-0 z-[99999] flex flex-col items-center justify-center bg-white dark:bg-[#0f172a] transition-colors duration-300">
       <div class="relative flex flex-col items-center">
-        <!-- กล่องโลโก้หลัก (Main Logo Box) -->
+        <!-- Main Logo Box -->
         <div class="w-20 h-20 bg-blue-50 dark:bg-blue-900/20 rounded-2xl flex items-center justify-center mb-6 animate-pulse-soft">
           <div class="w-12 h-12 bg-blue-600 rounded-xl flex items-center justify-center shadow-lg shadow-blue-600/30 animate-bounce-subtle">
             <span class="text-2xl font-black text-white">E</span>
           </div>
         </div>
         
-        <!-- ข้อความระหว่างโหลด (Loading Text) -->
+        <!-- Loading Text -->
         <div class="flex flex-col items-center gap-2">
           <h3 class="text-lg font-bold text-slate-800 dark:text-white tracking-wide">e-Learning</h3>
           <div class="flex gap-1">

Frontend-Learner/components/common/LanguageSwitcher.vue

@@ -1,13 +1,13 @@
 <script setup lang="ts">
 /**
  * @file LanguageSwitcher.vue
- * @description คอมโพเนนต์ตัวสลับภาษาใช้ปุ่ม Dropdown ของ Quasar
+ * @description Language switcher component using Quasar dropdown.
- * ใช้สลับระหว่างภาษาไทย (th) และภาษาอังกฤษ (en)
+ * Allows switching between Thai (th) and English (en) locales.
  */
 
 const { locale, setLocale, locales } = useI18n()
 
-// ดึงรายการภาษาที่มีอยู่พร้อมชื่อภาษา (Get available locales with their names)
+// Get available locales with their names
 const availableLocales = computed(() => {
   return (locales.value as Array<{ code: string; name: string }>).map((loc) => ({
     code: loc.code,
@@ -15,13 +15,13 @@ const availableLocales = computed(() => {
   }))
 })
 
-// ดึงพาธภาพธงชาติสำหรับภาษานั้นๆ (Get flag image path for a locale)
+// Get flag image path for a locale
 const getFlagPath = (code: string) => `/flags/${code}.png`
 
-// จัดการเมื่อเปลี่ยนภาษา (Handle locale change)
+// Handle locale change
 const changeLocale = async (code: string) => {
   await setLocale(code as 'th' | 'en')
-  // คุกกี้ (Cookie) จะถูกจัดการอัตโนมัติโดย @nuxtjs/i18n จากออปชัน detectBrowserLanguage.useCookie
+  // Cookie is automatically handled by @nuxtjs/i18n with detectBrowserLanguage.useCookie
 }
 </script>
 
@@ -32,7 +32,7 @@ const changeLocale = async (code: string) => {
     class="language-btn"
     :aria-label="$t('language.label')"
   >
-    <!-- แสดงธงชาติตามภาษาที่ใช้อยู่ (Show current locale flag) -->
+    <!-- Show current locale flag -->
     <img 
       :src="getFlagPath(locale)" 
       :alt="locale.toUpperCase()" 
@@ -178,7 +178,7 @@ const changeLocale = async (code: string) => {
 </style>
 
 <style>
-/* สไตล์ Global สำหรับเมนูที่ถูกข้ามไปแสดงผลที่อื่นด้วย Teleport (Global styles for teleported menu) */
+/* Global styles for teleported menu */
 .language-menu {
   border-radius: 16px;
   box-shadow: 0 10px 40px rgba(0, 0, 0, 0.15);

Frontend-Learner/components/common/LoadingSkeleton.vue

@@ -1,8 +1,4 @@
 <script setup lang="ts">
-/**
- * @file LoadingSkeleton.vue
- * @description คอมโพเนนต์ Skeleton สำหรับแสดงโครงร่างหน้าจอระหว่างรอโหลดข้อมูล (Loading Skeleton Component)
- */
 defineProps<{
   type?: 'text' | 'avatar' | 'card' | 'button'
   width?: string
@@ -13,7 +9,6 @@ defineProps<{
 
 <template>
   <div class="skeleton-wrapper">
-    <!-- กรณีเป็นโครงร่างประเภทการ์ด (Card type skeleton) -->
     <template v-if="type === 'card'">
       <div v-for="i in (count || 1)" :key="i" class="skeleton-card">
         <div class="skeleton skeleton-image"/>
@@ -25,17 +20,14 @@ defineProps<{
       </div>
     </template>
     
-    <!-- กรณีเป็นโครงร่างประเภทรูปโปรไฟล์ (Avatar type skeleton) -->
     <template v-else-if="type === 'avatar'">
       <div class="skeleton skeleton-avatar"/>
     </template>
     
-    <!-- กรณีเป็นโครงร่างประเภทปุ่มกด (Button type skeleton) -->
     <template v-else-if="type === 'button'">
       <div class="skeleton skeleton-button" :style="{ width: width || '120px' }"/>
     </template>
     
-    <!-- กรณีอื่นๆ จะแสดงเป็นบรรทัดข้อความ (Fallback/Text type skeleton) -->
     <template v-else>
       <div 
         v-for="i in (count || 1)" 

Frontend-Learner/components/common/LoadingSpinner.vue

@@ -1,8 +1,4 @@
 <script setup lang="ts">
-/**
- * @file LoadingSpinner.vue
- * @description ไอคอนหมุนแสดงการโหลด (Loading Spinner Component) เหมาะสำหรับใช้ตรงจุดเล็กๆ หรือตอนโหลดหน้าเว็บ
- */
 defineProps<{
   size?: 'sm' | 'md' | 'lg'
   text?: string

Frontend-Learner/components/course/CourseCard.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 /**
  * @file CourseCard.vue
- * @description คอมโพเนนต์การ์ดแสดงคอร์สเรียนมาตรฐาน (Standardized Course Card Component)
+ * @description Standardized Course Card Component.
- * วิธีใช้งาน: <CourseCard :id="1" title="..." ... />
+ * Usage: <CourseCard :id="1" title="..." ... />
  */
 
 interface CourseCardProps {
@@ -20,7 +20,7 @@ interface CourseCardProps {
   image?: string
   loading?: boolean
   
-  // ตัวควบคุมการแสดงปุ่มต่างๆ (Action Flags)
+  // Action Flags
   showViewDetails?: boolean
   showContinue?: boolean
   showCertificate?: boolean
@@ -57,9 +57,9 @@ const displayCategory = computed(() => getLocalizedText(props.category))
 </script>
 
 <template>
-  <div class="group relative flex flex-col bg-white dark:!bg-slate-900 rounded-3xl overflow-hidden border border-slate-200 dark:border-white/5 shadow-sm hover:shadow-xl dark:shadow-none hover:-translate-y-1 transition-all duration-300 h-full">
+  <div class="group relative flex flex-col bg-white dark:!bg-[#0f172a] rounded-3xl overflow-hidden border border-slate-200 dark:border-slate-800 shadow-sm hover:shadow-xl dark:shadow-none hover:-translate-y-1 transition-all duration-300 h-full">
     
-    <!-- ส่วนรูปหน้าปก (Thumbnail Section) -->
+    <!-- Thumbnail Section -->
     <div class="relative w-full aspect-video overflow-hidden">
       <img 
         v-if="image"
@@ -71,12 +71,12 @@ const displayCategory = computed(() => getLocalizedText(props.category))
          <q-icon name="image" size="48px" class="text-slate-300 dark:text-slate-600" />
       </div>
 
-      <!-- เลเยอร์ฟิลเตอร์ซ้อนทับ (Overlays) -->
+      <!-- Overlays -->
       <div class="absolute inset-0 bg-gradient-to-t from-slate-900/60 to-transparent opacity-0 group-hover:opacity-100 transition-opacity"></div>
       
 
 
-      <!-- ป้ายแสดงสถานะเรียนจบ (Completed Badge) -->
+      <!-- Completed Badge -->
       <div v-if="completed" class="absolute inset-0 bg-emerald-900/40 backdrop-blur-[2px] flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity duration-300">
          <span class="bg-emerald-500 text-white w-12 h-12 rounded-full flex items-center justify-center shadow-lg transform scale-75 group-hover:scale-100 transition-transform">
            <q-icon name="check" size="24px" />
@@ -84,9 +84,9 @@ const displayCategory = computed(() => getLocalizedText(props.category))
       </div>
     </div>
 
-    <!-- ส่วนเนื้อหาข้อมูล (Content Section) -->
+    <!-- Content Section -->
     <div class="p-6 flex flex-col flex-grow">
-      <!-- ข้อมูลประกอบย่อย เช่น บทเรียน/ระยะเวลา (Meta Info - Lessons/Duration) -->
+      <!-- Meta Info (Lessons/Duration) -->
       <div class="flex items-center gap-3 text-xs font-bold text-slate-500 dark:text-slate-400 mb-3 uppercase tracking-wider">
          <span v-if="lessons" class="flex items-center gap-1">
            <q-icon name="menu_book" size="14px" /> {{ lessons }} {{ $t('course.lessonsUnit') }}
@@ -96,18 +96,18 @@ const displayCategory = computed(() => getLocalizedText(props.category))
          </span>
       </div>
 
-      <!-- ชื่อคอร์ส (Title) -->
+      <!-- Title -->
       <h3 class="text-lg font-black text-slate-900 dark:text-white mb-2 line-clamp-2 leading-tight group-hover:text-blue-600 dark:group-hover:text-blue-400 transition-colors">
         {{ displayTitle }}
       </h3>
 
-      <!-- รายละเอียดเพิ่มเติม (Description) -->
+      <!-- Description -->
       <p v-if="displayDescription" class="text-sm text-slate-500 dark:text-slate-400 line-clamp-2 mb-6">
         {{ displayDescription }}
       </p>
 
       <div class="mt-auto pt-4">
-        <!-- หลอดความคืบหน้า (Progress Bar) -->
+        <!-- Progress Bar -->
         <div v-if="progress !== undefined && !completed && !hideProgress" class="mb-4">
           <div class="flex justify-between text-[10px] font-bold uppercase mb-1">
             <span class="text-slate-500 dark:text-slate-400">{{ $t('course.progress') }}</span>
@@ -118,19 +118,19 @@ const displayCategory = computed(() => getLocalizedText(props.category))
           </div>
         </div>
 
-        <!-- ปุ่มปฏิบัติการต่างๆ (Action Buttons) -->
+        <!-- Action Buttons -->
         <div v-if="!hideActions" class="flex flex-col gap-3">
-          <!-- ปุ่มดูรายละเอียด (ปุ่มรอง) (View Details - Secondary Action) -->
+          <!-- View Details (Secondary Action) -->
           <q-btn
             v-if="showViewDetails && !completed && !progress"
             flat
             rounded
-            class="w-full font-bold !text-blue-600 !bg-blue-50 hover:!bg-blue-100 dark:!bg-blue-500/10 dark:!text-blue-400 dark:hover:!bg-blue-500/20"
+            class="w-full font-bold !text-blue-600 !bg-blue-50 hover:!bg-blue-100 dark:!bg-blue-900/40 dark:!text-blue-300 dark:hover:!bg-blue-900/60"
             :label="$t('menu.viewDetails')"
             :to="`/course/${id}`"
           />
 
-          <!-- ปุ่มเรียนต่อ/เริ่มเรียน (ปุ่มหลัก) (Continue Learning - Primary Action) -->
+          <!-- Continue Learning (Primary Action) -->
           <q-btn
             v-if="showContinue || (progress && !completed) || (progress === 0 && !completed)"
             unelevated
@@ -142,7 +142,7 @@ const displayCategory = computed(() => getLocalizedText(props.category))
         </div>
 
         <div v-if="completed" class="space-y-2">
-            <!-- ปุ่มเรียนอีกครั้ง (Study Again) -->
+            <!-- Study Again -->
             <q-btn
               v-if="showStudyAgain"
               unelevated
@@ -152,7 +152,7 @@ const displayCategory = computed(() => getLocalizedText(props.category))
               :to="`/classroom/learning?course_id=${id}`"
             />
             
-            <!-- ปุ่มดาวน์โหลดใบรับรอง (Download Certificate) -->
+            <!-- Download Certificate -->
             <q-btn
               v-if="showCertificate"
               unelevated
@@ -168,5 +168,5 @@ const displayCategory = computed(() => getLocalizedText(props.category))
 </template>
 
 <style scoped>
-/* ใส่โค้ด CSS เพิ่มได้ถ้าต้องการครอบคลุมเฉพาะไฟล์นี้ (Scoped overrides if needed) */
+/* Scoped overrides if needed */
 </style>

Frontend-Learner/components/discovery/CategorySidebar.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 /**
  * @file CategorySidebar.vue
- * @description แถบเมนูด้านข้างสำหรับกรองคอร์สตามหมวดหมู่ (Sidebar for filtering courses by category)
+ * @description Sidebar for filtering courses by category
  */
 
 const props = defineProps<{
@@ -81,13 +81,13 @@ const toggleCategory = (id: number) => {
                                 {{ getLocalizedText(cat.name) }}
                             </span>
                             
-                            <!-- จุดแสดงสถานะเมื่อถูกเลือก (Active Indicator Dot) -->
+                            <!-- Active Indicator Dot -->
                             <div v-if="modelValue.includes(cat.id)" class="ml-auto w-1.5 h-1.5 rounded-full bg-blue-600 dark:bg-blue-400 shadow-lg shadow-blue-500/50"></div>
                         </div>
                     </div>
                 </div>
 
-                <!-- ปุ่มแสดงเพิ่มเติม/แสดงน้อยลง (Show More/Less Action) -->
+                <!-- Show More/Less Action -->
                 <div 
                     v-if="categories.length > 5"
                     @click="showAllCategories = !showAllCategories"

Frontend-Learner/components/discovery/CourseDetailView.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 /**
  * @file CourseDetailView.vue
- * @description แสดงรายละเอียดคอร์สแบบรวดเร็ว รวมถึงตัวอย่างวิดีโอ, หลักสูตร, และระบบการลงทะเบียน
+ * @description Quick view of course details including video preview, curriculum, and enroll logic
  */
 import { ref, computed } from 'vue'
 
@@ -51,9 +51,9 @@ const handleEnroll = () => {
     if(!props.course) return;
     enrollmentLoading.value = true;
     emit('enroll', props.course.id);
-    // สถานะ Loading ถูกจัดการโดยคอมโพเนนต์แม่ แต่ในคอมโพเนนต์นี้เรารีเซ็ตหลังจากส่ง event หรือเก็บไว้จนกว่า prop จะเปลี่ยน
+    // Loading state reset depends on parent, but locally we can reset after emit or keep until prop changes
-    // ในรูปแบบนี้ เราแค่ส่ง event ออกไป (just emit)
+    // In this pattern, we just emit.
-    setTimeout(() => enrollmentLoading.value = false, 2000); // ตั้งเวลารีเซ็ตเพื่อความปลอดภัย (Safety timeout)
+    setTimeout(() => enrollmentLoading.value = false, 2000); // Safety timeout
 };
 const instructorData = computed(() => {
     if (props.course?.instructors && props.course.instructors.length > 0) {
@@ -66,11 +66,16 @@ const instructorData = computed(() => {
 
 <template>
     <div class="animate-fade-in-up">
+        <div class="flex items-center gap-2 mb-8 group cursor-pointer" @click="emit('back')">
+            <q-icon name="arrow_back" size="20px" class="text-slate-400 group-hover:text-blue-600 transition-colors" />
+            <span class="text-sm font-bold text-slate-500 group-hover:text-blue-600 transition-colors uppercase tracking-widest">{{ $t('common.back') }}</span>
+        </div>
+
         <div class="grid grid-cols-1 lg:grid-cols-3 gap-8">
-            <!-- ด้านซ้าย: รายละเอียดเนื้อหา (Left: Content Detail) -->
+            <!-- Left: Content Detail -->
             <div class="lg:col-span-2 space-y-8">
                 
-                <!-- ส่วนแสดงตัวอย่างวิดีโอ (Video Preview Section) -->
+                <!-- Video Preview Section -->
                 <div class="relative aspect-video rounded-3xl overflow-hidden shadow-2xl group cursor-pointer bg-slate-900 border-4 border-white dark:border-slate-800 transition-transform duration-500 hover:scale-[1.01]">
                      <template v-if="course.media?.video_url">
                          <video 
@@ -81,19 +86,19 @@ const instructorData = computed(() => {
                              <source :src="course.media.video_url" type="video/mp4">
                              {{ $t('course.videoNotSupported') }}
                          </video>
-                         <!-- ปุ่มเล่นวิดีโอแบบปรับแต่งเองตอนยังไม่เล่น (Custom Play Overlay when not playing) -->
+                         <!-- Custom Play Overlay when not playing - simple version is often best -->
                      </template>
-                     <!-- แสดงรูปภาพสวยๆ กรณีที่ไม่มีวิดีโอ (Beautiful Image Showcase if no video) -->
+                     <!-- Beautiful Image Showcase if no video -->
                      <template v-else>
                          <div class="w-full h-full flex items-center justify-center relative overflow-hidden bg-slate-950 group">
-                             <!-- รูปพื้นหลังเบลอ (Blurred background fill) -->
+                             <!-- Blurred background fill -->
                              <img 
                                 v-if="course.thumbnail_url || course.cover_image"
                                 :src="course.thumbnail_url || course.cover_image"
                                 class="absolute inset-0 w-full h-full object-cover opacity-40 blur-2xl scale-125"
                              />
                              
-                             <!-- รูปหลักแบบคมชัด (Main Sharp Image) -->
+                             <!-- Main Sharp Image -->
                              <img 
                                 v-if="course.thumbnail_url || course.cover_image"
                                 :src="course.thumbnail_url || course.cover_image"
@@ -107,7 +112,7 @@ const instructorData = computed(() => {
                      </template>
                 </div>
 
-                <!-- ชื่อคอร์สและรายละเอียด (Course Title & Description) -->
+                <!-- Course Title & Description -->
                 <div>
                     <h1 class="text-3xl md:text-4xl font-extrabold text-slate-900 dark:text-white mb-4 leading-tight">
                         {{ getLocalizedText(course.title) }}
@@ -118,10 +123,10 @@ const instructorData = computed(() => {
                     </div>
                 </div>
 
-                <!-- รายละเอียดคอร์ส - รูแแบบหน้าเดียว (Course Detail - Single Page Layout) -->
+                <!-- Course Detail - Single Page Layout -->
                 <div class="space-y-10">
                     
-                    <!-- ข้อมูลผู้สอน (Instructor Info) -->
+                    <!-- Instructor Info -->
                     <div class="flex flex-col sm:flex-row gap-6 items-start sm:items-center pb-8 border-b border-slate-200 dark:border-slate-800">
                         <q-avatar size="64px">
                             <img :src="instructorData?.profile?.avatar_url || 'https://cdn.quasar.dev/img/boy-avatar.png'" />
@@ -135,7 +140,7 @@ const instructorData = computed(() => {
                         </div>
                     </div>
 
-                    <!-- รายละเอียดหลักสูตร / บทเรียน (Curriculum / Lesson Details) -->
+                    <!-- Curriculum / Lesson Details -->
                     <div>
                         <div class="flex items-center justify-between mb-6">
                             <h3 class="text-xl font-bold text-slate-900 dark:text-white">
@@ -148,7 +153,7 @@ const instructorData = computed(() => {
                         
                         <div class="space-y-4">
                              <div v-for="(chapter, idx) in course.chapters" :key="chapter.id" class="group">
-                                 <!-- ส่วนหัวของบท (Chapter Header) -->
+                                 <!-- Chapter Header -->
                                  <div class="px-6 py-4 bg-white dark:bg-slate-800 rounded-2xl border border-slate-200 dark:border-white/5 font-black text-slate-800 dark:text-white flex justify-between items-center mb-2 shadow-sm">
                                      <span class="flex items-center gap-3">
                                          <span class="w-7 h-7 flex items-center justify-center bg-slate-100 dark:bg-white/10 rounded-lg text-xs font-bold font-mono">{{ Number(idx) + 1 }}</span>
@@ -157,7 +162,7 @@ const instructorData = computed(() => {
                                      <span class="text-[10px] uppercase font-black tracking-widest text-slate-400 opacity-60">{{ chapter.lessons?.length || 0 }} {{ $t('course.lessonsUnit') }}</span>
                                  </div>
                                  
-                                 <!-- รายการบทเรียน (Lessons List) -->
+                                 <!-- Lessons List -->
                                  <div class="ml-4 pl-4 border-l-2 border-slate-100 dark:border-slate-800 space-y-1 mt-3">
                                      <div v-for="lesson in chapter.lessons" :key="lesson.id" class="px-5 py-3 flex items-center gap-3 text-sm text-slate-600 dark:text-slate-400 hover:bg-white dark:hover:bg-white/5 rounded-xl transition-all hover:translate-x-1">
                                          <div class="w-8 h-8 rounded-full flex items-center justify-center shrink-0" :class="lesson.type === 'VIDEO' ? 'bg-blue-50 text-blue-600 dark:bg-blue-500/10 dark:text-blue-400' : 'bg-orange-50 text-orange-600 dark:bg-orange-500/10 dark:text-orange-400'">
@@ -173,7 +178,7 @@ const instructorData = computed(() => {
                                  </div>
                             </div>
                             
-                            <!-- กรณีที่ไม่มีข้อมูล (Empty State) -->
+                            <!-- Empty State -->
                             <div v-if="!course.chapters || course.chapters.length === 0" class="flex flex-col items-center justify-center py-12 text-slate-400 dark:text-slate-500 bg-white/50 dark:bg-slate-900/50 rounded-2xl border-2 border-dashed border-slate-200 dark:border-slate-800">
                                  <q-icon name="menu_book" size="40px" class="mb-2 opacity-50" />
                                  <p class="text-sm font-medium">{{ $t('course.noContent') }}</p>
@@ -185,11 +190,11 @@ const instructorData = computed(() => {
 
             </div>
 
-            <!-- ด้านขวา: การ์ดลงทะเบียน (Right: Enrollment Card) -->
+            <!-- Right: Enrollment Card -->
             <div class="lg:col-span-1">
                  <div class="sticky top-24">
                      <div class="bg-white dark:bg-slate-900 rounded-3xl shadow-2xl shadow-blue-500/10 dark:shadow-none p-8 border border-slate-100 dark:border-white/5 relative overflow-hidden group">
-                           <!-- ลูกเล่นแสงพื้นหลังตกแต่ง (Decorative background glow) -->
+                           <!-- Decorative background glow -->
                            <div class="absolute -top-12 -right-12 w-48 h-48 bg-blue-500/10 rounded-full blur-3xl group-hover:bg-blue-500/20 transition-colors"></div>
                            
                            <div class="relative">

Frontend-Learner/components/layout/AppHeader.vue

@@ -1,116 +1,168 @@
 <script setup lang="ts">
 /**
  * @file AppHeader.vue
- * @description แถบเมนูด้านบนหลัก (Header) สำหรับหน้าแดชบอร์ด (Dashboard) ของระบบ EduLearn
+ * @description The main header for the authenticated application dashboard.
+ * Uses Quasar QToolbar.
  */
 
+import { ref, computed } from "vue";
+
 const props = defineProps<{
-  /** ควบคุมการแสดงผลของปุ่มเปิด/ปิดแถบเมนูด้านข้าง (Sidebar) */
+  /** Controls visibility of the sidebar toggle button */
   showSidebarToggle?: boolean;
+  /** Type of navigation links to display */
+  navType?: "public" | "learner";
 }>();
 
 const emit = defineEmits<{
-  /** ส่งสัญญาณ (Emit) เมื่อผู้ใช้คลิกที่ปุ่มแฮมเบอร์เกอร์เมนู */
+  /** Emitted when the hamburger menu is clicked */
   toggleSidebar: [];
+  /** Emitted when the mobile menu toggle is clicked */
+  toggleRightDrawer: [];
 }>();
 
-const { currentUser } = useAuth();
+const { t } = useI18n();
-const { locale, setLocale } = useI18n();
+const route = useRoute();
-const { isDark, set: setTheme } = useThemeMode();
+
+// Automatically determine navType based on route if not explicitly passed
+const navTypeComputed = computed(() => {
+  if (props.navType) return props.navType;
+  // Show learner nav for dashboard, browse, classroom, and course details
+  const learnerRoutes = ["/dashboard", "/browse", "/classroom", "/course"];
+  return learnerRoutes.some((r) => route.path.startsWith(r))
+    ? "learner"
+    : "public";
+});
 
-const toggleLanguage = () => {
-  setLocale(locale.value === 'th' ? 'en' : 'th');
-};
 
-const toggleTheme = () => {
-  setTheme(!isDark.value);
-};
 </script>
 
 <template>
-  <q-toolbar class="bg-white dark:!bg-[#020617] text-slate-900 dark:!text-white h-20 border-b border-slate-50 dark:border-slate-800/50 px-6">
+  <q-toolbar class="bg-white dark:!bg-[#0f172a] text-slate-900 dark:!text-white h-16 border-none p-0 overflow-visible">
+    <div class="w-full px-4 md:px-12 flex items-center h-full no-wrap relative">
       
-    <!-- ด้านซ้าย: ปุ่มย่อขยายแถบเมนูด้านข้าง (Hamburger Toggle) -->
+      <!-- Mobile Sidebar Toggle (For non-learner routes) -->
+      <q-btn
+        v-if="showSidebarToggle !== false && navTypeComputed !== 'learner' && $q.screen.lt.md"
+        flat
+        round
+        dense
+        icon="menu"
+        class="mr-2 text-gray-500"
+        @click="$emit('toggleSidebar')"
+      />
+
+      <!-- Branding: Logo + Name -->
+      <div
+        class="flex items-center gap-3 cursor-pointer group flex-shrink-0"
+        @click="navigateTo('/dashboard')"
+      >
+        <div class="w-10 h-10 rounded-xl bg-blue-600 flex items-center justify-center text-white font-black shadow-lg shadow-blue-600/30 group-hover:scale-110 transition-transform flex-shrink-0">
+          E
+        </div>
+        <div class="flex flex-col text-left">
+          <span class="font-black text-[15px] md:text-lg leading-none tracking-tight text-slate-900 dark:text-white group-hover:text-blue-600 transition-colors">E-Learning</span>
+          <span class="text-[9px] md:text-[10px] font-bold uppercase tracking-[0.2em] leading-none mt-1 text-slate-500">Platform</span>
+        </div>
+      </div>
+
+      <!-- Desktop Navigation -->
+      <nav class="header-desktop items-center gap-6 lg:gap-8 text-[14px] font-bold ml-12 flex-shrink-0 h-full">
+        <NuxtLink to="/dashboard" class="nav-link" exact-active-class="active">{{ $t("sidebar.overview") }}</NuxtLink>
+        <NuxtLink to="/browse/discovery" class="nav-link" active-class="active">{{ $t("landing.allCourses") }}</NuxtLink>
+        <NuxtLink to="/dashboard/my-courses" class="nav-link" exact-active-class="active">{{ $t("sidebar.myCourses") || 'คอร์สเรียนของฉัน' }}</NuxtLink>
+      </nav>
+
+      <q-space />
+
+      <!-- Right Section: Tools -->
+      <div class="flex items-center gap-2 flex-shrink-0 no-wrap">
+        
+        <!-- Desktop Only Tools -->
+        <div class="header-desktop items-center gap-4 flex-shrink-0">
+          <LanguageSwitcher />
+          <UserMenu />
+        </div>
+
+        <!-- Mobile/Tablet Tools Hidden (Moved to Drawer) -->
+        <!-- Just keep space between logo and hamburger -->
+
+        <!-- Mobile/Tablet Hamburger -->
         <q-btn
           flat
           round
           dense
           icon="menu"
-      class="text-slate-400 hover:text-blue-600 transition-colors"
+          class="header-mobile text-slate-700 dark:text-white bg-slate-100 dark:bg-slate-800 flex-shrink-0"
-      size="16px"
+          style="width: 40px; height: 40px; min-width: 40px;"
-      @click="$emit('toggleSidebar')"
+          @click="$emit('toggleRightDrawer')"
-    />
-
-    <q-space />
-
-    <!-- ส่วนการตั้งค่าทางด้านขวา (Right Section) -->
-    <div class="flex items-center gap-2 sm:gap-4 md:gap-6 no-wrap">
-      
-      <!-- ปุ่มสลับธีม (Theme Toggle) -->
-      <q-btn
-        flat
-        round
-        dense
-        :icon="isDark ? 'dark_mode' : 'light_mode'"
-        :class="isDark ? 'text-blue-400' : 'text-amber-500'"
-        class="transition-all active:scale-90"
-        size="12px"
-        @click="toggleTheme"
-      >
-        <q-tooltip>{{ isDark ? 'โหมดกลางคืน' : 'โหมดกลางวัน' }}</q-tooltip>
-      </q-btn>
-
-      <!-- ตัวสลับภาษาแบบแคปซูล (Language Switcher) -->
-      <div 
-        @click="toggleLanguage"
-        class="flex items-center bg-slate-50 dark:bg-slate-800/50 border border-slate-100 dark:border-slate-800 rounded-xl p-0.5 sm:p-1 cursor-pointer hover:bg-slate-100 transition-all font-bold text-[11px] sm:text-[13px] select-none"
-      >
-        <div :class="locale === 'th' ? 'bg-white dark:bg-slate-700 shadow-sm text-blue-600' : 'text-slate-400'" class="px-2 sm:px-3 py-1 rounded-lg transition-all">TH</div>
-        <div class="w-[1px] h-3 bg-slate-200 dark:bg-slate-700 mx-0.5"></div>
-        <div :class="locale === 'en' ? 'bg-white dark:bg-slate-700 shadow-sm text-blue-600' : 'text-slate-400'" class="px-2 sm:px-3 py-1 rounded-lg transition-all">EN</div>
-      </div>
-
-      <!-- เส้นคั่น (Divider) -->
-      <div class="hidden sm:block w-[1px] h-8 bg-slate-100 dark:bg-slate-800"></div>
-
-      <!-- ส่วนข้อมูลผู้ใช้งาน (User Profile) -->
-      <div class="flex items-center gap-3 cursor-pointer group" @click="navigateTo('/dashboard/profile')">
-        <!-- ชื่อและบทบาท (แสดงเฉพาะบนจอที่ใหญ่กว่า 600px) -->
-        <div class="user-info-text flex flex-col items-end text-right">
-          <span class="text-[15px] font-bold text-slate-900 dark:text-white leading-tight">
-            {{ currentUser?.firstName || 'User' }} {{ currentUser?.lastName || '' }}
-          </span>
-          <span class="text-[11px] text-slate-500 font-medium">{{ $t('common.student') }}</span>
-        </div>
-
-        <!-- รูปโปรไฟล์พร้อมวงแหวน Gradient นุ่มนวล -->
-        <div class="relative p-[3px] rounded-full bg-gradient-to-tr from-[#FFD1D1] via-[#E2E8FF] to-[#D1F7FF] dark:from-slate-800 dark:to-slate-700 transition-transform group-hover:scale-105">
-          <div class="bg-white dark:bg-[#020617] p-[1.5px] rounded-full shadow-sm">
-            <UserAvatar 
-              :photoURL="currentUser?.photoURL" 
-              :firstName="currentUser?.firstName" 
-              :lastName="currentUser?.lastName" 
-              size="40"
-              class="w-[40px] h-[40px]"
         />
       </div>
     </div>
-      </div>
-
-    </div>
   </q-toolbar>
 </template>
 
 <style scoped>
-/* บังคับให้ความสูงของ Header เท่ากันเสมอ (Ensure toolbar height is consistent) */
+/* High Priority Visibility Logic */
-:deep(.q-toolbar) {
+@media (max-width: 1023px) {
-  min-height: 80px;
+  .header-desktop {
-}
-
-/* ซ่อนชื่อผู้ใช้ไว้เฉพาะบนหน้าจอมือถือขนาดเล็กเท่านั้น (Hide user name only on small mobile screens) */
-@media (max-width: 600px) {
-  .user-info-text {
     display: none !important;
   }
+  .header-mobile {
+    display: flex !important;
+  }
+}
+
+@media (min-width: 1024px) {
+  .header-mobile {
+    display: none !important;
+  }
+  .header-desktop {
+    display: flex !important;
+  }
+}
+
+.nav-link {
+  color: #64748b; /* slate-500 */
+  text-decoration: none;
+  transition: all 0.3s ease;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  white-space: nowrap;
+  position: relative;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  padding: 0 4px;
+}
+
+.nav-link:hover {
+  color: #2563eb; /* blue-600 */
+}
+
+.nav-link.active {
+  color: #2563eb; /* blue-600 */
+}
+
+.nav-link::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  width: 0;
+  height: 3px;
+  background-color: #2563eb;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  transition: all 0.3s ease;
+  transform: translateX(-50%);
+}
+
+.nav-link.active::after {
+  width: 100%;
+}
+
+.router-link-active {
+  color: #2563eb !important;
 }
 </style>

Frontend-Learner/components/layout/AppSidebar.vue

@@ -1,145 +1,79 @@
 <script setup lang="ts">
 /**
  * @file AppSidebar.vue
- * @description เมนูด้านข้างสำหรับการนำทาง (Sidebar Navigation)
+ * @description Sidebar navigation for the authenticated dashboard.
+ * Uses Quasar QList for structure.
  */
 
-// 1. นำเข้า Composables และไลบรารี
+const { sidebarItems } = useNavItems()
-import { useQuasar } from 'quasar'
 const { t } = useI18n()
-const route = useRoute()
+const navItems = sidebarItems
-const $q = useQuasar()
-const { logout } = useAuth()
-const { isDark } = useThemeMode()
 
-// 2. กำหนดข้อมูลเมนูหลัก (Main Navigation)
-const menuItems = computed(() => [
-  { to: '/dashboard', icon: 'grid_view', label: t('sidebar.overview') },
-  { to: '/dashboard/my-courses', icon: 'book', label: t('sidebar.myCourses') }
-])
 
-// 3. กำหนดข้อมูลเมนูบัญชี (Account Navigation)
+const handleNavigate = (path: string) => {
-const accountItems = computed(() => [
+  if (import.meta.client) {
-  { to: '/dashboard/profile', icon: 'settings', label: t('userMenu.settings') }
+    window.location.href = path
-])
+  }
-
-// 4. ฟังก์ชันการออกจากระบบ (Logout Function)
-const handleLogout = () => {
-  $q.dialog({
-    title: t('auth.logoutConfirmTitle'),
-    message: t('auth.logoutConfirmMessage'),
-    cancel: {
-      flat: true,
-      color: isDark.value ? 'grey-4' : 'grey-7',
-      label: t('common.cancel')
-    },
-    ok: {
-      flat: false,
-      color: 'red-500',
-      label: t('auth.logout'),
-      unelevated: true
-    },
-    dark: isDark.value,
-    class: 'p-4 rounded-2xl text-slate-900 dark:text-white',
-    persistent: true
-  }).onOk(async () => {
-    await logout()
-  })
 }
 </script>
 
 <template>
-  <div class="flex flex-col h-full bg-white dark:!bg-[#04091a] px-4 py-6 border-r border-slate-100 dark:border-slate-800">
+  <div class="flex flex-col h-full bg-transparent border-r border-slate-200 dark:border-slate-800">
     
-    <!-- โลโก้แบรนด์ (Logo Section) -->
-    <div class="flex items-center gap-3 px-2 mb-10 transition-transform active:scale-95 cursor-pointer" @click="navigateTo('/dashboard')">
-      <div class="w-10 h-10 rounded-xl bg-blue-600 flex items-center justify-center shadow-lg shadow-blue-500/20">
-        <q-icon name="school" color="white" size="24px" />
-      </div>
-      <span class="text-[22px] font-black tracking-tight text-slate-800 dark:text-white">EduLearn</span>
-    </div>
 
-    <!-- การนำทางหลัก (Main Navigation) -->
+    <!-- Navigation Items -->
-    <div class="space-y-1 mb-8">
+    <q-list padding class="text-slate-600 dark:text-slate-400 flex-grow px-3 pt-6">
-      <NuxtLink 
+      <q-item 
-        v-for="item in menuItems" 
+        v-for="item in navItems" 
         :key="item.to" 
-        :to="item.to"
+        clickable 
-        class="flex items-center gap-4 px-4 py-3 rounded-2xl transition-all group relative nav-item"
+        v-ripple
-        :class="route.path === item.to ? 'active' : 'text-slate-500 hover:bg-slate-50 dark:hover:bg-slate-800 hover:text-slate-900 dark:hover:text-slate-200'"
+        @click="handleNavigate(item.to)"
+        class="rounded-xl mb-1 text-slate-700 dark:text-slate-200 hover:bg-slate-100 dark:hover:bg-white/5"
+        :class="{ 'sidebar-item--active': $route.path === item.to || ($route.path === '/dashboard' && item.to === '/dashboard') }"
       >
-        <q-icon :name="item.icon" size="24px" class="transition-colors" />
+        <q-item-section avatar>
-        <span class="font-bold text-[15px]">{{ item.label }}</span>
+          <q-icon :name="item.icon" size="22px" />
+        </q-item-section>
         
-        <!-- ตัวบ่งชี้หน้าปัจจุบัน (Active Indicator) -->
+        <q-item-section>
-        <div v-if="route.path === item.to" class="absolute left-0 top-1/2 -translate-y-1/2 w-1.5 h-6 bg-blue-600 rounded-r-full shadow-[2px_0_8px_rgba(37,99,235,0.4)]"></div>
+          <q-item-label class="font-bold text-sm">{{ $t(item.labelKey) }}</q-item-label>
-      </NuxtLink>
+        </q-item-section>
-    </div>
+      </q-item>
+    </q-list>
 
-    <!-- หมวดหมู่บัญชี (Account Section) -->
-    <div class="px-4 mb-4">
-      <span class="text-[12px] font-bold text-slate-400 uppercase tracking-widest">{{ $t('sidebar.accountGroup') }}</span>
-    </div>
-    <div class="space-y-1">
-      <NuxtLink 
-        v-for="item in accountItems" 
-        :key="item.to" 
-        :to="item.to"
-        class="flex items-center gap-4 px-4 py-3 rounded-2xl transition-all group nav-item"
-        :class="route.path === item.to ? 'active' : 'text-slate-500 hover:bg-slate-50 dark:hover:bg-slate-800 hover:text-slate-900 dark:hover:text-slate-200'"
-      >
-        <q-icon :name="item.icon" size="24px" />
-        <span class="font-bold text-[15px]">{{ item.label }}</span>
-      </NuxtLink>
-
-      <!-- ปุ่มออกจากระบบ (Logout Button) -->
-      <button 
-        @click="handleLogout"
-        class="w-full flex items-center gap-4 px-4 py-3 rounded-2xl transition-all text-red-500 hover:bg-red-50 dark:hover:bg-red-900/10 font-bold text-[15px] group"
-      >
-        <q-icon name="logout" size="24px" class="group-hover:translate-x-1 transition-transform" />
-        <span>{{ $t('userMenu.logout') }}</span>
-      </button>
-    </div>
-
-    <q-space />
-
-    <!-- การ์ดโปรโมชั่น (Promo Card) -->
-    <div class="mt-auto p-5 rounded-[2rem] bg-slate-50 dark:bg-slate-800/50 border border-slate-100 dark:border-slate-800 relative overflow-hidden group">
-      <div class="relative z-10">
-        <h4 class="font-black text-slate-800 dark:text-white text-sm mb-1">{{ $t('sidebar.promoTitle') }}</h4>
-        <p class="text-[11px] text-slate-500 dark:text-slate-400 mb-4">{{ $t('sidebar.promoSubtitle') }}</p>
-        <q-btn
-          unelevated
-          class="full-width rounded-xl bg-blue-600 hover:bg-blue-700 text-white font-bold py-2.5 no-caps transition-all active:scale-95 text-xs shadow-md shadow-blue-500/20"
-          @click="navigateTo('/browse/discovery')"
-        >
-          {{ $t('sidebar.learnMore') }}
-        </q-btn>
-      </div>
-      
-      <!-- การตกแต่งพื้นหลังแบบจางๆ (Subtle background decoration) -->
-      <div class="absolute -right-2 -bottom-2 w-16 h-16 bg-blue-500/5 rounded-full blur-xl"></div>
-    </div>
   </div>
 </template>
 
 <style scoped>
-.nav-item.active {
+.sidebar-item--active {
-  background: #EFF6FF;
+  background: #eff6ff !important; /* blue-50 */
-  color: #2563EB;
+  color: #1d4ed8 !important;       /* blue-700 */
+  position: relative;
 }
 
-.dark .nav-item.active {
+.sidebar-item--active::before {
-  background: rgba(37,99,235,0.1);
+  content: '';
-  color: #60A5FA;
+  position: absolute;
+  left: 0;
+  top: 15%;
+  height: 70%;
+  width: 4px;
+  background: #2563eb;
+  border-radius: 0 4px 4px 0;
 }
 
-.nav-item.active .q-icon {
+/* Dark Mode Active State Enhancement */
-  color: #2563EB;
+.dark .sidebar-item--active {
+  background: rgba(59, 130, 246, 0.12) !important;
+  color: #60a5fa !important;     /* blue-400 */
 }
 
-.dark .nav-item.active .q-icon {
+.dark .sidebar-item--active .q-icon {
-  color: #60A5FA;
+  color: #60a5fa !important;      /* blue-400 */
+}
+
+.dark .sidebar-item--active::before {
+  background: #3b82f6;
 }
 </style>

Frontend-Learner/components/layout/LandingFooter.vue

@@ -1,48 +1,45 @@
 <script setup lang="ts">
 /**
  * @file LandingFooter.vue
- * @description ส่วนท้ายของหน้าแรก (Footer component for the landing page)
+ * @description Footer component for the landing page - Adjusted to Image 2 (E-Learning Platform Branding)
  */
 </script>
 
 <template>
-  <footer class="bg-white pt-16 pb-8 border-t border-slate-200">
+  <footer class="bg-slate-50 pt-16 pb-8 border-t border-slate-200">
     <div class="container mx-auto px-6 md:px-12">
       <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-8 mb-12 text-left">
-        <!-- โลโก้และชื่อแบรนด์ (Brand) -->
+        <!-- Brand -->
         <div class="space-y-6">
-           <NuxtLink to="/" class="flex items-center gap-3 group">
+          <div class="flex items-center gap-3">
-              <div class="bg-blue-600 text-white font-black rounded-full px-6 w-10 h-10 flex items-center justify-center group-hover:scale-110 transition-transform">
+            <div class="w-12 h-12 rounded-xl bg-blue-600 flex items-center justify-center text-white font-black shadow-lg shadow-blue-600/30 shrink-0">
-                <q-icon name="o_school" size="24px" />
+              E
             </div>
             <div class="flex flex-col">
-                <span class="font-bold text-lg leading-none tracking-tight transition-colors text-slate-900">
+              <span class="font-black text-lg leading-none tracking-tight text-slate-900">E-Learning</span>
-                  EduLearn
+              <span class="text-[10px] font-bold uppercase tracking-[0.2em] leading-none mt-1 text-slate-500">Platform</span>
-                </span>
+            </div>
-                <span class="text-[10px] text-slate-500 font-semibold uppercase tracking-[0.4em] leading-none mt-0.5 transition-colors">
-                  Platform
-                </span>
           </div>
-            </NuxtLink>
           <p class="text-slate-500 text-sm leading-relaxed max-w-xs">
             แพลตฟอร์มการเรียนรู้ออนไลน์ที่มุ่งเน้นการพัฒนาทักษะดิจิทัลสำหรับคนรุ่นใหม่ เรียนรู้ได้ทุกที่ ทุกเวลา กับผู้เชี่ยวชาญตัวจริง
           </p>
         </div>
 
-        <!-- ลิงก์ต่างๆ (Links) -->
+        <!-- Links -->
         <div class="lg:pl-8">
-          <h4 class="font-bold text-slate-900 mb-6 text-base tracking-tight">คอร์สเรียน</h4>
+          <h4 class="font-bold text-slate-900 mb-6 text-base">คอร์สเรียน</h4>
-          <ul class="space-y-3 text-sm text-slate-500 flex flex-col gap-2">
+          <ul class="space-y-3 text-sm text-slate-500">
-            <li class=""><NuxtLink to="/browse" class="hover:text-blue-600 transition-colors inline-block">คอร์สทั้งหมด</NuxtLink></li>
+            <li><NuxtLink to="/browse" class="hover:text-blue-600 transition-colors inline-block">คอร์สทั้งหมด</NuxtLink></li>
+            <li><NuxtLink to="/browse/recommended" class="hover:text-blue-600 transition-colors inline-block">คอร์สแนะนำ</NuxtLink></li>
             <li><a href="#" class="hover:text-blue-600 transition-colors inline-block">โปรโมชั่น</a></li>
             <li><a href="#" class="hover:text-blue-600 transition-colors inline-block">สำหรับองค์กร</a></li>
           </ul>
         </div>
 
-        <!-- การสนับสนุนผู้ใช้ (Support) -->
+        <!-- Support -->
         <div>
           <h4 class="font-bold text-slate-900 mb-6 text-base">ช่วยเหลือ</h4>
-          <ul class="space-y-3 text-sm text-slate-500 flex flex-col gap-2">
+          <ul class="space-y-3 text-sm text-slate-500">
             <li><a href="#" class="hover:text-blue-600 transition-colors inline-block">คำถามที่พบบ่อย (FAQ)</a></li>
             <li><a href="#" class="hover:text-blue-600 transition-colors inline-block">วิธีการใช้งาน</a></li>
             <li><a href="#" class="hover:text-blue-600 transition-colors inline-block">เงื่อนไขการใช้งาน</a></li>
@@ -50,33 +47,39 @@
           </ul>
         </div>
 
-        <!-- ข้อมูลการติดต่อ (Contact) -->
+        <!-- Contact (Bronco Hourse Data) -->
         <div class="space-y-6">
           <h4 class="font-bold text-slate-900 text-base">ติดต่อเรา</h4>
           <div class="flex flex-col gap-5">
-            <!-- สถานที่ตั้ง (Location) -->
+            <!-- Location -->
             <div class="flex flex-row items-start gap-4 flex-nowrap">
-              <q-icon name="o_location_on" size="20px" color="slate-800" />
+              <div class="w-10 h-10 rounded-xl bg-blue-50 flex items-center justify-center shrink-0 text-blue-600 shadow-sm">
+                 <q-icon name="location_on" size="20px" />
+              </div>
               <div class="flex flex-col gap-1 min-w-0">
-                <span class="font-semibold text-slate-800 text-sm leading-tight">Bronco Hourse</span>
+                <span class="font-bold text-slate-900 text-sm leading-tight pt-1">Bronco Hourse</span>
                 <p class="text-slate-500 text-[11px] leading-relaxed">
                   74/2 Wiang Kaew Road, Tambon Si Phum, Amphoe Mueang Chiang Mai, Chang Wat Chiang Mai 50200
                 </p>
               </div>
             </div>
 
-            <!-- เบอร์โทรศัพท์ (Phone) -->
+            <!-- Phone -->
             <div class="flex flex-row items-center gap-4 flex-nowrap">
-              <q-icon name="o_phone" size="18px" color="slate-800" />
+              <div class="w-10 h-10 rounded-xl bg-blue-50 flex items-center justify-center shrink-0 text-blue-600 shadow-sm">
-              <a href="tel:052-076-025" class="font-semibold text-slate-800 text-sm hover:text-blue-600 transition-colors truncate">
+                 <q-icon name="phone" size="18px" />
+              </div>
+              <a href="tel:052-076-025" class="text-slate-600 hover:text-blue-600 font-semibold text-sm transition-colors truncate">
                 052-076-025
               </a>
             </div>
 
-            <!-- อีเมล (Email) -->
+            <!-- Email -->
             <div class="flex flex-row items-center gap-4 flex-nowrap">
-              <q-icon name="o_email" size="18px" color="slate-800" />
+              <div class="w-10 h-10 rounded-xl bg-blue-50 flex items-center justify-center shrink-0 text-blue-600 shadow-sm">
-              <a href="mailto:info@chamomind.com" class="font-semibold text-slate-800 text-sm hover:text-blue-600 transition-colors truncate">
+                 <q-icon name="email" size="18px" />
+              </div>
+              <a href="mailto:info@chamomind.com" class="text-slate-600 hover:text-blue-600 font-semibold text-sm transition-colors truncate">
                 info@chamomind.com
               </a>
             </div>
@@ -84,7 +87,7 @@
         </div>
       </div>
 
-      <!-- แถบด้านล่างสำหรับสงวนลิขสิทธิ์ (Bottom Bar - Centered Copyright) -->
+      <!-- Bottom Bar (Centered Copyright) -->
       <div class="pt-8 border-t border-slate-200 text-center">
         <p class="text-sm text-slate-400 font-medium tracking-wide">
           Copyright © CHAMOMIND CO., LTD. 2023

Frontend-Learner/components/layout/LandingHeader.vue

@@ -1,22 +1,22 @@
 <script setup lang="ts">
 /**
  * @file LandingHeader.vue
- * @description คอมโพเนนต์แถบเมนูด้านบน (Header Navigation) สำหรับหน้า Landing Page และหน้าเปิดอื่นๆ
+ * @description The main header for the public landing pages.
- * รองรับการเปลี่ยนภาษา เปลี่ยนโหมดสว่าง/มืด และเข้าถึงเมนูผู้ใช้ (Profile/Logout)
+ * Features a transparent background that becomes solid/glass upon scrolling.
+ * Responsive: Collapses into a drawer on mobile (md breakpoint).
  */
 
-// ติดตามสถานะการเลื่อนเมาส์ (scroll) เพื่อปรับรูปแบบของ Header
+// Track scrolling state to adjust header styling
 const isScrolled = ref(false)
 const { isAuthenticated } = useAuth()
-// สถานะเมนูสำหรับหน้าจอมือถือ (Mobile Drawer State)
+// Mobile Drawer State
-// ตัวแปรควบคุมการเปิด/ปิดเมนูบนหน้าจอขนาดเล็ก (Mobile Drawer)
 const mobileMenuOpen = ref(false)
 
 const handleScroll = () => {
   isScrolled.value = window.scrollY > 20
 }
 
-// ปิดการเลื่อนหน้าเว็บ (Lock body scroll) เมื่อเปิดเมนูบนมือถือ
+// Lock body scroll when mobile menu is open
 watch(mobileMenuOpen, (isOpen) => {
   if (isOpen) {
     document.body.style.overflow = 'hidden'
@@ -31,34 +31,34 @@ onMounted(() => {
 
 onUnmounted(() => {
   window.removeEventListener('scroll', handleScroll)
-  document.body.style.overflow = '' // คืนค่าเริ่มต้น (Cleanup)
+  document.body.style.overflow = '' // Cleanup
 })
 </script>
 
 <template>
   <!-- 
-    คอนเทนเนอร์ของ Header (Header Container)
+    Header Container 
-    - เปลี่ยนจากสีใส (transparent) เป็นเอฟเฟกต์กระจก (glass effect) เมื่อเลื่อนเมาส์ลง
+    - Transitions between transparent and glass effect based on scroll.
   -->
   <header 
-    class="fixed top-0 left-0 right-0 z-[100] transition-all"
+    class="fixed top-0 left-0 right-0 z-[100] transition-all duration-300"
-    :class="[isScrolled ? 'h-20 glass-nav shadow-lg' : 'h-20 bg-transparent duration-300 border-b border-b-grey-7 ']"
+    :class="[isScrolled ? 'h-16 glass-nav shadow-lg' : 'h-24 bg-transparent']"
   >
-    <div class="container mx-auto px-6 md:px-12 h-full flex items-center justify-between">
+    <div class="container mx-auto px-6 md:px-12 h-full flex items-center justify-start">
-      <!-- ด้านซ้าย: โลโก้แบรนด์ (Left Section: Logo) -->
+      <!-- Left Section: Logo -->
       <NuxtLink to="/" class="flex items-center gap-3 group">
-        <div class="bg-blue-600 text-white font-black rounded-full px-6 w-10 h-10 flex items-center justify-center group-hover:scale-110 transition-transform">
+        <div class="bg-blue-600 text-white font-black rounded-xl w-10 h-10 flex items-center justify-center shadow-lg shadow-blue-600/30 group-hover:scale-110 transition-transform">
-          <q-icon name="o_school" size="24px" />
+          E
         </div>
         <div class="flex flex-col">
           <span 
-            class="font-bold text-lg leading-none tracking-tight transition-colors"
+            class="font-black text-lg leading-none tracking-tight transition-colors"
             :class="[isScrolled ? 'text-white' : 'text-slate-900 group-hover:text-blue-600']"
           >
-            EduLearn
+            E-Learning
           </span>
           <span 
-            class="text-[10px] font-semibold uppercase tracking-[0.4em] leading-none mt-0.5 transition-colors"
+            class="text-[10px] font-bold uppercase tracking-[0.2em] leading-none mt-1 transition-colors"
             :class="[isScrolled ? 'text-slate-400' : 'text-slate-500']"
           >
             Platform
@@ -66,12 +66,12 @@ onUnmounted(() => {
         </div>
       </NuxtLink>
 
-      <!-- การนำทางสำหรับเดสก์ท็อป (แสดงผลเป็นค่าเริ่มต้น, ซ่อนบนมือถือผ่าน CSS  'desktop-nav') -->
+      <!-- Desktop Navigation (Visible by default, hidden on mobile via CSS 'desktop-nav') -->
-     <!--  <nav class="flex desktop-nav items-center gap-8 text-[16px] font-medium">
+      <nav class="flex desktop-nav items-center gap-8 text-sm font-bold ml-12">
         <NuxtLink 
           to="/browse" 
           class="transition-colors relative group py-2"
-          :class="[isScrolled ? 'text-white hover:text-white' : 'text-grey-8 hover:text-blue-600']"
+          :class="[isScrolled ? 'text-slate-300 hover:text-white' : 'text-slate-600 hover:text-blue-600']"
         >
           {{ $t('sidebar.onlineCourses') }}
           <span class="absolute bottom-0 left-0 w-0 h-0.5 bg-blue-600 transition-all group-hover:w-full"/>
@@ -79,31 +79,29 @@ onUnmounted(() => {
         <NuxtLink 
           to="/browse/recommended" 
           class="transition-colors relative group py-2"
-          :class="[isScrolled ? 'text-white hover:text-white' : 'text-grey-8 hover:text-blue-600']"
+          :class="[isScrolled ? 'text-slate-300 hover:text-white' : 'text-slate-600 hover:text-blue-600']"
         >
           {{ $t('sidebar.recommendedCourses') }}
           <span class="absolute bottom-0 left-0 w-0 h-0.5 bg-blue-600 transition-all group-hover:w-full"/>
         </NuxtLink>
-      </nav> -->
+      </nav>
 
-
+      <!-- Desktop Action Buttons (Visible by default, hidden on mobile via CSS 'desktop-nav') -->
-
+      <div class="flex desktop-nav items-center gap-4 ml-auto">
-      <!-- ปุ่มปฏิบัติการสำหรับเดสก์ท็อป (แสดงผลเป็นค่าเริ่มต้น, ซ่อนบนมือถือผ่าน CSS 'desktop-nav') -->
-      <div class="flex desktop-nav items-center gap-4">
         <template v-if="!isAuthenticated">
-          <!-- ปุ่มเข้าสู่ระบบ (Login Button) -->
+          <!-- Login Button -->
           <NuxtLink 
             to="/auth/login" 
-            class="px-5 py-4 rounded-full text-slate-700 font-semibold text-sm  transition-all hover:-translate-y-0.5"
+            class="px-6 py-2.5 rounded-xl font-bold text-sm border-2 transition-all hover:-translate-y-0.5"
-            :class="[isScrolled ? 'border-white/20 text-white hover:bg-white/10' : 'border-white text-grey-9 bg-white hover:bg-blue-100 hover:border-blue-200']"
+            :class="[isScrolled ? 'border-white/20 text-white hover:bg-white/10' : 'border-blue-100 text-blue-600 bg-blue-50 hover:bg-blue-100 hover:border-blue-200']"
           >
             {{ $t('auth.login') }}
           </NuxtLink>
           
-          <!-- ปุ่มสมัครสมาชิก (Register Button) -->
+          <!-- Register Button -->
           <NuxtLink 
             to="/auth/register" 
-            class="px-5 py-4 rounded-full bg-blue-600 text-white font-semibold text-sm   hover:shadow-blue-600/40 hover:-translate-y-0.5 transition-all"
+            class="px-6 py-2.5 rounded-xl font-bold text-sm text-white bg-gradient-to-br from-blue-600 to-indigo-600 shadow-lg shadow-blue-600/20 hover:shadow-blue-600/40 hover:-translate-y-0.5 transition-all"
           >
             {{ $t('auth.getStarted') }}
           </NuxtLink>
@@ -112,14 +110,14 @@ onUnmounted(() => {
         <template v-else>
           <NuxtLink 
             to="/dashboard" 
-            class="bg-blue-600 text-white font-semibold text-sm px-5 py-4 rounded-full  hover:shadow-blue-600/40 hover:-translate-y-0.5 transition-all"
+            class="px-6 py-2.5 rounded-xl font-bold text-sm text-white bg-gradient-to-br from-blue-600 to-indigo-600 shadow-lg shadow-blue-600/20 hover:shadow-blue-600/40 hover:-translate-y-0.5 transition-all"
           >
              {{ $t('landing.goToDashboard') }}
           </NuxtLink>
         </template>
       </div>
 
-      <!-- ปุ่มเปิดเมนูบนมือถือ (แสดงผลเฉพาะบน Mobile) -->
+      <!-- Mobile Menu Button (Visible on Mobile) -->
       <button 
         class="md:hidden mobile-toggle ml-auto relative z-[120] w-10 h-10 flex items-center justify-center rounded-full transition-colors"
         :class="[isScrolled ? 'text-white hover:bg-white/10' : 'text-slate-900 hover:bg-slate-100', mobileMenuOpen ? 'text-slate-900 z-[120]' : '']"
@@ -131,7 +129,7 @@ onUnmounted(() => {
     </div>
   </header>
 
-  <!-- ลิ้นชักเมนูด้านข้างสำหรับมือถือ (Mobile Navigation Drawer - แยกส่วนไปยัง body เพื่อไม่ให้มีปัญหา z-index หรือถูกบัง) -->
+  <!-- Mobile Navigation Drawer (Teleported to body to avoid z-index/clipping issues with Header) -->
   <Teleport to="body">
     <div v-if="mobileMenuOpen">
       <div 
@@ -145,7 +143,7 @@ onUnmounted(() => {
         :class="[mobileMenuOpen ? 'translate-x-0' : 'translate-x-full']"
       >
         <div class="p-6 pt-8 flex flex-col gap-6 h-full overflow-y-auto relative">
-          <!-- ปุ่มปิดเมนู (Close Button) -->
+          <!-- Close Button -->
           <button 
             class="absolute top-6 right-6 w-8 h-8 flex items-center justify-center rounded-full bg-slate-100 text-slate-500 hover:bg-slate-200 transition-colors"
             @click="mobileMenuOpen = false"
@@ -153,7 +151,7 @@ onUnmounted(() => {
             <q-icon name="close" size="20px" />
           </button>
 
-          <!-- ลิงก์สำหรับมือถือ (Mobile Links) -->
+          <!-- Mobile Links -->
           <nav class="flex flex-col gap-2 mt-8">
             <NuxtLink 
               to="/" 
@@ -171,6 +169,14 @@ onUnmounted(() => {
               {{ $t('sidebar.onlineCourses') }}
               <q-icon name="chevron_right" size="20px" class="text-slate-400" />
             </NuxtLink>
+            <NuxtLink 
+              to="/browse/recommended" 
+              class="flex items-center justify-between p-4 rounded-xl hover:bg-slate-50 text-slate-700 font-bold transition-colors"
+              @click="mobileMenuOpen = false"
+            >
+              {{ $t('sidebar.recommendedCourses') }}
+              <q-icon name="chevron_right" size="20px" class="text-slate-400" />
+            </NuxtLink>
           </nav>
 
           <div class="mt-auto pb-8 border-t border-slate-100 pt-8">
@@ -209,14 +215,14 @@ onUnmounted(() => {
 </template>
 
 <style scoped>
-/* เอฟเฟกต์ Glassmorphism สำหรับ Header ตอนเลื่อนเมาส์ลง */
+/* Glassmorphism Effect for Scrolled Header */
 .glass-nav {
-  background: rgba(15, 23, 42, 0.95); /* พื้นหลังเข้มขึ้นเพื่อให้อ่านตัวหนังสือชัดเจน */
+  background: rgba(15, 23, 42, 0.95); /* Darker background for legibility */
   backdrop-filter: blur(16px);
   border-bottom: 1px solid rgba(255, 255, 255, 0.05);
 }
 
-/* สไตล์ปุ่มหลัก (Primary Button) แบบพรีเมียม */
+/* Premium Primary Button Styling */
 .btn-primary-premium {
   background: linear-gradient(135deg, #3b82f6 0%, #2563eb 100%);
   color: white;
@@ -235,7 +241,7 @@ onUnmounted(() => {
   box-shadow: 0 8px 20px -4px rgba(37, 99, 235, 0.5);
 }
 
-/* สไตล์ปุ่มดรอง (Secondary Button) แบบพรีเมียม */
+/* Secondary Premium Button Styling */
 .btn-secondary-premium {
   padding: 0.75rem 1.5rem;
   border-radius: 0.75rem;
@@ -259,11 +265,11 @@ onUnmounted(() => {
 }
 
 /* 
-  โลจิกบังคับการแสดงผล เพื่อแก้ปัญหาการคอมไฟล์ของ Tailwind 
+  Force Visibility Logic to bypass potential Tailwind Build issues 
-  ยืนยันว่าส่วน Desktop และ Mobile เลย์เอาต์แยกจากกันอย่างชัดเจน
+  Ensures Desktop and Mobile parts are strictly separated
 */
 .desktop-nav {
-  display: flex; /* แสดงผลเป็นค่าเริ่มต้น */
+  display: flex; /* Default to visible */
 }
 
 @media (max-width: 767.98px) {

Frontend-Learner/components/layout/MobileNav.vue

@@ -31,7 +31,7 @@ const handleNavigate = (path: string) => {
 </template>
 
 <style scoped>
-/* เงาด้านบนแบบบางๆ เพื่อแบ่งส่วนล่างให้ชัดเจนขึ้น (Optional shadow for better separation) */
+/* Optional shadow for better separation */
 .shadow-up-1 {
   box-shadow: 0 -1px 3px rgba(0,0,0,0.05);
 }

Frontend-Learner/components/profile/PasswordChangeForm.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 /**
  * @file PasswordChangeForm.vue
- * @description ฟอร์มสำหรับเปลี่ยนรหัสผ่านของผู้ใช้ (From for changing user password)
+ * @description From for changing user password
  */
 
 const props = defineProps<{
@@ -36,8 +36,8 @@ const showConfirmPassword = ref(false);
 <template>
     <div :class="[!flat ? 'card-premium p-6 md:p-8' : '']" class="h-fit">
         <div v-if="!flat" class="flex items-center gap-3 mb-8">
-            <div class="w-10 h-10 rounded-xl bg-blue-50 dark:bg-blue-900/30 flex items-center justify-center">
+            <div class="w-10 h-10 rounded-xl bg-amber-50 dark:bg-amber-900/30 flex items-center justify-center">
-                <q-icon name="lock" class="text-blue-600 dark:text-blue-400 text-xl" />
+                <q-icon name="lock" class="text-amber-600 dark:text-amber-400 text-xl" />
             </div>
             <h2 class="text-xl font-black text-slate-900 dark:text-white">
                 {{ $t('profile.security') }}
@@ -118,8 +118,8 @@ const showConfirmPassword = ref(false);
             type="submit"
                 unelevated
                 rounded
-                class="w-full py-3 font-bold text-base shadow-lg shadow-blue-500/20"
+                class="w-full py-3 font-bold text-base shadow-lg shadow-amber-500/20"
-                style="background: linear-gradient(135deg, #2563eb 0%, #1d4ed8 100%); color: white;"
+                style="background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%); color: white;"
                 :label="$t('profile.changePasswordBtn')"
                 :loading="loading"
             />
@@ -130,12 +130,7 @@ const showConfirmPassword = ref(false);
 
 <style scoped>
 .card-premium {
-  background-color: white;
+  @apply bg-white dark:bg-[#1e293b] border-slate-200 dark:border-white/5;
-  border-color: #e2e8f0;
-}
-:global(.dark) .card-premium {
-  background-color: #1e293b;
-  border-color: rgba(255, 255, 255, 0.05);
   border-radius: 1.5rem;
   border-width: 1px;
   box-shadow: 0 10px 30px -5px rgba(0, 0, 0, 0.05);

Frontend-Learner/components/profile/ProfileEditForm.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 /**
  * @file ProfileEditForm.vue
- * @description ฟอร์มสำหรับแก้ไขข้อมูลส่วนตัวของผู้ใช้ (Form for editing user personal information)
+ * @description From for editing user personal information
  */
 
 const props = defineProps<{
@@ -93,14 +93,14 @@ const onPhoneKeydown = (e: KeyboardEvent) => {
                 <div class="absolute inset-0 bg-black/40 rounded-2xl flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity">
                     <q-icon name="camera_alt" class="text-white text-xl" />
                 </div>
-                <!-- ช่องเลือกไฟล์ที่ถูกซ่อนไว้ (Hidden Input) -->
+                <!-- Hidden Input -->
                 <input ref="fileInput" type="file" class="hidden" accept="image/*" @change="handleFileUpload" >
             </div>
             
             <div class="flex flex-col gap-2">
             <div class="font-bold text-slate-900 dark:text-white mb-1">{{ $t('profile.yourAvatar') }}</div>
             
-            <!-- แถวปุ่มกด (Buttons Row) -->
+            <!-- Buttons Row -->
                 <div class="flex items-center gap-3">
                 <template v-if="modelValue.photoURL">
                     <q-btn 
@@ -124,7 +124,7 @@ const onPhoneKeydown = (e: KeyboardEvent) => {
                 </template>
                 </div>
 
-            <!-- ข้อความจำกัดขนาดไฟล์ (Add Limit Text) -->
+            <!-- Add Limit Text -->
             <div class="mt-1 text-xs text-slate-500 dark:text-slate-400">
                 {{ $t('profile.uploadLimit') }}
             </div>
@@ -248,12 +248,7 @@ const onPhoneKeydown = (e: KeyboardEvent) => {
 
 <style scoped>
 .card-premium {
-  background-color: white;
+  @apply bg-white dark:bg-[#1e293b] border-slate-200 dark:border-white/5;
-  border-color: #e2e8f0;
-}
-:global(.dark) .card-premium {
-  background-color: #1e293b;
-  border-color: rgba(255, 255, 255, 0.05);
   border-radius: 1.5rem;
   border-width: 1px;
   box-shadow: 0 10px 30px -5px rgba(0, 0, 0, 0.05);

Frontend-Learner/components/user/UserAvatar.vue

@@ -1,8 +1,4 @@
 <script setup lang="ts">
-/**
- * @file UserAvatar.vue
- * @description คอมโพเนนต์แสดงรูปโปรไฟล์ผู้ใช้ หากไม่มีรูปจะแสดงตัวอักษรย่อของชื่อ
- */
 const props = defineProps<{
   size?: number | string
   photoURL?: string
@@ -23,7 +19,7 @@ const avatarSize = computed(() => {
 const initials = computed(() => {
   const getFirstChar = (name?: string) => {
     if (!name) return ''
-    // สำหรับชื่อภาษาไทย ถ้าตัวอักษรแรกเป็นสระนำหน้า (เ แ โ ใ ไ) ให้ข้ามไปเอาพยัญชนะ
+    // For Thai names, if the first char is a leading vowel (เ แ โ ใ ไ), skip it to get the consonant
     const leadingVowels = ['เ', 'แ', 'โ', 'ใ', 'ไ']
     if (leadingVowels.includes(name.charAt(0)) && name.length > 1) {
       return name.charAt(1)
@@ -40,7 +36,7 @@ const handleImageError = () => {
   imageError.value = true
 }
 
-// รีเซ็ตสถานะข้อผิดพลาดเมื่อรูปโปรไฟล์เปลี่ยน (Watch for photoURL changes to reset error state)
+// Watch for photoURL changes to reset error state
 watch(() => props.photoURL, () => {
   imageError.value = false
 })

Frontend-Learner/components/user/UserMenu.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 /**
  * @file UserMenu.vue
- * @description คอมโพเนนต์เมนู Dropdown ของโปรไฟล์ผู้ใช้ ใช้ Quasar
+ * @description User profile dropdown menu component using Quasar.
  */
 
 import { ref, computed, onMounted } from 'vue'
@@ -12,7 +12,7 @@ const { currentUser, logout } = useAuth()
 const { t } = useI18n()
 const $q = useQuasar()
 
-// จัดการการเปลี่ยนธีมแบบรวมศูนย์ (Use centralized theme management)
+// Use centralized theme management
 const { isDark, set } = useThemeMode()
 
 const isHydrated = ref(false)
@@ -21,7 +21,7 @@ onMounted(() => {
   isHydrated.value = true
 })
 
-// ตัวอักษรย่อของผู้ใช้ (User Initials)
+// User Initials
 const userInitials = computed(() => {
   if (!currentUser.value) return ''
   const f = currentUser.value.firstName?.charAt(0).toUpperCase() || 'U'

Frontend-Learner/composables/useAuth.ts

@@ -1,4 +1,45 @@
-import type { User, LoginResponse, RegisterPayload } from '@/types/auth'
+
+// Interface สำหรับข้อมูลผู้ใช้งาน (User)
+interface User {
+  id: number
+  username: string
+  email: string
+  email_verified_at?: string | null
+  created_at?: string
+  updated_at?: string
+  role: {
+    code: string // เช่น 'STUDENT', 'INSTRUCTOR', 'ADMIN'
+    name: { th: string; en: string }
+  }
+  profile?: {
+    prefix: { th: string; en: string }
+    first_name: string
+    last_name: string
+    phone: string | null
+    avatar_url: string | null
+  }
+}
+
+
+
+// Interface สำหรับข้อมูลตอบกลับตอน Login
+interface loginResponse {
+  token: string
+  refreshToken: string
+  user: User
+  profile: User['profile']
+}
+
+// Interface สำหรับข้อมูลที่ใช้ลงทะเบียน
+interface RegisterPayload {
+  username: string
+  email: string
+  password: string
+  first_name: string
+  last_name: string
+  prefix: { th: string; en: string }
+  phone: string
+}
 
 // ==========================================
 // Composable: useAuth

Frontend-Learner/composables/useCategory.ts

@@ -1,21 +1,18 @@
-/**
+// Interface สำหรับข้อมูลหมวดหมู่ (Category)
- * @interface Category
- * @description โครงสร้างข้อมูลหมวดหมู่ (Category)
- */
 export interface Category {
   id: number
-  name: { // ชื่อหมวดหมู่รองรับ 2 ภาษา
+  name: {
     th: string
     en: string
     [key: string]: string
   }
-  slug: string // Slug สำหรับใช้งานบน URL
+  slug: string
-  description: { // รายละเอียดหมวดหมู่
+  description: {
     th: string
     en: string
     [key: string]: string
   }
-  icon: string // ไอคอนของหมวดหมู่อ้างอิงจาก Material Icons
+  icon: string
   sort_order: number
   is_active: boolean
   created_at: string
@@ -23,7 +20,7 @@ export interface Category {
 }
 
 export interface CategoryData {
-  total: number // จำนวนหมวดหมู่ทั้งหมด
+  total: number
   categories: Category[]
 }
 
@@ -33,24 +30,18 @@ interface CategoryResponse {
   data: CategoryData
 }
 
-/**
+// Composable สำหรับจัดการข้อมูลหมวดหมู่
- * @composable useCategory
- * @description จัดการข้อมูลหมวดหมู่ (Categories) การดึงข้อมูล และการจัดการ Cache (เก็บข้อมูลจำลองชั่วคราว)
- */
 export const useCategory = () => {
   const config = useRuntimeConfig()
   const API_BASE_URL = config.public.apiBase as string
   const { token } = useAuth()
 
-  // เก็บ Cache การดึงข้อมูลหมวดหมู่ในระดับ Global (ใช้ข้าม Component ได้โดยไม่ต้องโหลดใหม่)
+  // ใช้ useState เพื่อเก็บ Cached Data ระดับ Global (แชร์กันทุก Component)
   const categoriesState = useState<Category[]>('categories_cache', () => [])
   const isLoaded = useState<boolean>('categories_loaded', () => false)
 
-  /**
+  // ฟังก์ชันดึงข้อมูลหมวดหมู่ทั้งหมด
-   * @function fetchCategories
+  // Endpoint: GET /categories
-   * @description ดึงรายการหมวดหมู่ทั้งหมดจาก API (GET /categories) 
-   * หากมีแคชอยู่แล้วจะดึงจาก State ทันที แต่อาจบังคับให้โหลดใหม่ (forceRefresh) ได้
-   */
   const fetchCategories = async (forceRefresh = false) => {
     // ถ้ามีข้อมูลอยู่แล้วและไม่สั่งบังคับโหลดใหม่ ให้ใช้ข้อมูลเดิมทันที
     if (isLoaded.value && !forceRefresh && categoriesState.value.length > 0) {
@@ -71,7 +62,7 @@ export const useCategory = () => {
 
       const categories = response.data?.categories || []
       
-      // บันทึกรายการหมวดหมู่ลง State Cache
+      // เก็บข้อมูลลง State
       categoriesState.value = categories
       isLoaded.value = true
 
@@ -83,9 +74,9 @@ export const useCategory = () => {
     } catch (err: any) {
       console.error('Fetch categories failed:', err)
       
-      // กรณีเกิด Error 429 ระบบจะทำการหน่วงเวลา (1.5 วิ) และลองโหลดข้อมูลใหม่อีก 1 ครั้ง (Retry)
+      // Retry logic for 429 Too Many Requests
       if (err.statusCode === 429 || err.status === 429) {
-          await new Promise(resolve => setTimeout(resolve, 1500)); // หน่วงเวลา 1.5 วินาที
+          await new Promise(resolve => setTimeout(resolve, 1500)); // Wait 1.5s
           try {
                 const retryRes = await $fetch<CategoryResponse>(`${API_BASE_URL}/categories`, {
                   method: 'GET',

Frontend-Learner/composables/useCourse.ts

@@ -1,14 +1,151 @@
-import type { 
+// Interface สำหรับข้อมูลคอร์สเรียน (Public Course Data)
-    Course, 
+export interface Course {
-    CourseResponse, 
+  id: number
-    SingleCourseResponse, 
+  title: string | { th: string; en: string } // รองรับ 2 ภาษา
-    EnrolledCourse, 
+  slug: string
-    EnrolledCourseResponse, 
+  description: string | { th: string; en: string }
-    QuizAnswerSubmission, 
+  thumbnail_url: string
-    QuizSubmitRequest, 
+  price: string
-    QuizResult, 
+  is_free: boolean
-    Certificate 
+  original_price?: string
-} from '@/types/course'
+  have_certificate: boolean
+  status: string // DRAFT, PUBLISHED
+  category_id: number
+  created_at?: string
+  updated_at?: string
+  created_by?: number
+  updated_by?: number
+  approved_at?: string
+  approved_by?: number
+  rejection_reason?: string
+  enrolled?: boolean
+  total_lessons?: number
+  
+
+  rating?: string
+  lessons?: number | string
+  levelType?: 'neutral' | 'warning' | 'success' // ใช้สำหรับการแสดงผล Badge ระดับความยาก (Frontend Logic)
+  
+  // โครงสร้างบทเรียน (Chapters & Lessons)
+  chapters?: {
+    id: number
+    title: string | { th: string; en: string }
+    lessons: {
+      id: number
+      title: string | { th: string; en: string }
+      duration_minutes: number
+      video_url?: string
+    }[]
+  }[]
+
+  // ข้อมูลผู้สอนและเจ้าของคอร์ส
+  creator?: {
+    id: number
+    username: string
+    email: string
+    profile: {
+      first_name: string
+      last_name: string
+      avatar_url: string
+    }
+  }
+  instructors?: {
+    user_id: number
+    is_primary: boolean
+    user: {
+      id: number
+      username: string
+      email: string
+      profile: {
+        first_name: string
+        last_name: string
+        avatar_url: string
+      }
+    }
+  }[]
+}
+
+interface CourseResponse {
+  code: number
+  message: string
+  data: Course[]
+  total: number
+  page?: number
+  limit?: number
+  totalPages?: number
+}
+
+interface SingleCourseResponse {
+  code: number
+  message: string
+  data: Course
+}
+
+// Interface สำหรับคอร์สที่ผู้ใช้ลงทะเบียนเรียนแล้ว (My Course)
+export interface EnrolledCourse {
+    id: number
+    course_id: number
+    course: Course
+    status: 'ENROLLED' | 'IN_PROGRESS' | 'COMPLETED' | 'DROPPED'
+    progress_percentage: number
+    enrolled_at: string
+    started_at?: string
+    completed_at?: string
+    last_accessed_at?: string
+}
+
+interface EnrolledCourseResponse {
+    code: number
+    message: string
+    data: EnrolledCourse[]
+    total: number
+    page: number
+    limit: number
+}
+
+// Interface สำหรับการส่งคำตอบแบบทดสอบ (Quiz Submission)
+export interface QuizAnswerSubmission {
+    question_id: number
+    choice_id: number
+}
+
+export interface QuizSubmitRequest {
+    answers: QuizAnswerSubmission[]
+}
+
+// Interface สำหรับผลลัพธ์การสอบ (Quiz Result)
+export interface QuizResult {
+    answers_review: {
+        score: number
+        is_correct: boolean
+        correct_choice_id: number
+        selected_choice_id: number
+        question_id: number
+    }[]
+    completed_at: string
+    started_at: string
+    attempt_number: number
+    passing_score: number
+    is_passed: boolean
+    correct_answers: number
+    total_questions: number
+    total_score: number
+    score: number
+    quiz_id: number
+    attempt_id: number
+}
+
+// Interface สำหรับ Certificate
+export interface Certificate {
+    certificate_id: number
+    course_id: number
+    course_title: {
+        en: string
+        th: string
+    }
+    issued_at: string
+    download_url: string
+}
 
 // ==========================================
 // Composable: useCourse

Frontend-Learner/composables/useFormValidation.ts

@@ -1,7 +1,3 @@
-/**
- * @interface ValidationRule
- * @description กฎการตรวจสอบความถูกต้องของฟิลด์ (เช่น บังคับกรอก, เช็คความยาว, ตรวจอีเมล)
- */
 export interface ValidationRule {
   required?: boolean
   minLength?: number
@@ -12,18 +8,10 @@ export interface ValidationRule {
   custom?: (value: string) => string | null
 }
 
-/**
- * @interface FieldErrors
- * @description รูปแบบการเก็บข้อผิดพลาด (Key ของฟิลด์ คู่กับข้อความแจ้งเตือน)
- */
 export interface FieldErrors {
   [key: string]: string
 }
 
-/**
- * @composable useFormValidation
- * @description ใช้สำหรับตรวจสอบความถูกต้อง (Validate) ของข้อมูลในแบบฟอร์ม
- */
 export function useFormValidation() {
   const errors = ref<FieldErrors>({})
 
@@ -64,7 +52,6 @@ export function useFormValidation() {
     return null
   }
 
-  // ฟังก์ชันหลักที่เอาแบบฟอร์ม (formData) มาตรวจกับเช็คลิสต์ทั้งหมด (validationRules)
   const validate = (
     formData: Record<string, string>,
     validationRules: Record<string, { rules: ValidationRule; label: string; messages?: Record<string, string> }>
@@ -80,18 +67,14 @@ export function useFormValidation() {
       }
     }
 
-    // บันทึกข้อผิดพลาดที่พบทั้งหมดลงใน State
     errors.value = newErrors
-    // คืนค่าบอกว่า "ฟอร์มนี้ผ่านทั้งหมดไหม" (true คือผ่านหมด)
     return isValid
   }
 
-  // ฟังก์ชันลบข้อผิดพลาดทิ้งทั้งหมด (สำหรับตอนเริ่มกรอกใหม่)
   const clearErrors = () => {
     errors.value = {}
   }
 
-  // ฟังก์ชันลบข้อผิดพลาดเฉพาะฟิลด์ที่กำหนด
   const clearFieldError = (field: string) => {
     if (errors.value[field]) {
       // eslint-disable-next-line @typescript-eslint/no-dynamic-delete

Frontend-Learner/composables/useMediaPrefs.ts

@@ -1,27 +1,22 @@
-/**
- * @composable useMediaPrefs
- * @description จัดการตั้งค่าระดับเสียงและสถานะปิดเสียง (Mute) ของวิดีโอ/สื่อ
- * โดยจะเก็บค่าแยกตามบัญชีผู้ใช้งาน และสั่งประยุกต์ใช้กับ <video> ให้อัตโนมัติ
- */
 export const useMediaPrefs = () => {
-    // 1. สถานะส่วนกลาง (Global State)
+    // 1. Global State
-    // ใช้ useState เพื่อแชร์ค่าเดียวกันทั่วหน้าเว็บ (เช่น เปลี่ยนหน้าแล้วระดับเสียงยังคงที่)
+    // ใช้ useState เพื่อแชร์ค่าเดียวกันทั่วทั้ง App (เช่น เปลี่ยนหน้าแล้วเสียงยังเท่าเดิม)
     const volume = useState<number>('media_prefs_volume', () => 1)
     const muted = useState<boolean>('media_prefs_muted', () => false)
     
     const { user } = useAuth()
 
-    // 2. ฟังก์ชันช่วยสร้าง Key สำหรับ Storage (เก็บแยกตาม User)
+    // 2. Storage Key Helper (User Specific)
     const getStorageKey = () => {
         const userId = user.value?.id || 'guest'
         return `media:prefs:v1:${userId}`
     }
 
-    // 3. ระบบบันทึกการตั้งค่าลงเบราว์เซอร์ (Throttled เพื่อไม่ให้บันทึกถี่เกินไป)
+    // 3. Save Logic (Throttled)
     let saveTimeout: ReturnType<typeof setTimeout> | null = null
     
     const save = () => {
-        if (import.meta.server) return // เลี่ยงไม่ได้ต้องทำงานบนฝั่ง Client เท่านั้น
+        if (import.meta.server) return
 
         if (saveTimeout) clearTimeout(saveTimeout)
         saveTimeout = setTimeout(() => {
@@ -34,12 +29,12 @@ export const useMediaPrefs = () => {
                 }
                 localStorage.setItem(key, JSON.stringify(data))
             } catch (e) {
-                console.error('ไม่สามารถบันทึกการตั้งค่าสื่อได้', e)
+                console.error('Failed to save media prefs', e)
             }
-        }, 500) // หน่วงเวลา 500ms
+        }, 500) // Throttle 500ms
     }
 
-    // 4. ระบบโหลดการตั้งค่าเก่าขึ้นมา (Load Logic)
+    // 4. Load Logic
     const load = () => {
         if (import.meta.server) return
         
@@ -56,20 +51,20 @@ export const useMediaPrefs = () => {
                 }
             }
         } catch (e) {
-            console.error('ไม่สามารถโหลดการตั้งค่าสื่อได้', e)
+            console.error('Failed to load media prefs', e)
         }
     }
 
-    // 5. ฟังก์ชันสำหรับอัปเดตและสั่งบันทึกการตั้งค่า (Setters)
+    // 5. Setters (With Logic)
     const setVolume = (val: number) => {
         const clamped = Math.max(0, Math.min(1, val))
         volume.value = clamped
         
-        // ยกเลิกปิดเสียงอัตโนมัติ ถ้าระดับเสียงเพิ่มขึ้นจาก 0
+        // Auto unmute if volume increased from 0
         if (clamped > 0 && muted.value) {
             muted.value = false
         }
-        // ปิดเสียงอัตโนมัติ ถ้าระดับเสียงกลายเป็น 0
+        // Auto mute if volume set to 0
         if (clamped === 0 && !muted.value) {
             muted.value = true
         }
@@ -80,7 +75,7 @@ export const useMediaPrefs = () => {
     const setMuted = (val: boolean) => {
         muted.value = val
         
-        // หากผู้ใช้กดยกเลิกการปิดเสียงขณะที่ระดับเสียงเคยเป็น 0 ควรตั้งค่าเริ่มต้นให้เป็น 1
+        // Logic: Unmuting should restore volume if it was 0
         if (!val && volume.value === 0) {
             volume.value = 1
         }
@@ -88,15 +83,15 @@ export const useMediaPrefs = () => {
         save()
     }
 
-    // 6. ฟังก์ชันจับคู่ใช้กับการเล่นสื่อ (ตย. <video ref="videoEl"> -> applyTo(videoEl.value))
+    // 6. Apply & Bind to Element (The Magic)
     const applyTo = (el: HTMLMediaElement | null | undefined) => {
         if (!el) return () => {}
 
-        // ใส่ค่าตั้งต้นให้กับออบเจ็กต์สื่อ
+        // Initial Apply
         el.volume = volume.value
         el.muted = muted.value
 
-        // A. สังเกตการเปลี่ยนแปลงจาก State -> เพื่อส่งไปอัปเดต Element สื่อ
+        // A. Watch State -> Update Element
         const stopVolWatch = watch(volume, (v) => {
             if (Math.abs(el.volume - v) > 0.01) el.volume = v
         })
@@ -104,9 +99,9 @@ export const useMediaPrefs = () => {
             if (el.muted !== m) el.muted = m
         })
 
-        // B. สังเกตการเปลี่ยนแปลงจาก Element (เช่น ผู้ใช้กดปุ่มเร่งเสียงในวิดีโอตรงๆ) -> เพื่อเอาค่ามาอัปเดต State 
+        // B. Listen Element -> Update State (e.g. Native Controls)
         const onVolumeChange = () => {
-            // อัปเดตเฉพาะเมื่อมีความแตกต่างเพื่อหลีกเลี่ยง Loop อนันต์
+            // Update state only if diff allows (prevent loop)
             if (Math.abs(el.volume - volume.value) > 0.01) {
                 volume.value = el.volume
                 save()
@@ -118,7 +113,7 @@ export const useMediaPrefs = () => {
         }
         el.addEventListener('volumechange', onVolumeChange)
 
-        // ฟังก์ชันล้างค่าเพื่อเลิกติดตาม (Cleanup แบบส่งกลับ (Return))
+        // Cleanup function
         return () => {
             stopVolWatch()
             stopMutedWatch()
@@ -126,11 +121,11 @@ export const useMediaPrefs = () => {
         }
     }
 
-    // 7. จังหวะวงจรชีวิตตอนโหลดเสร็จและระบบ Sync
+    // 7. Lifecycle & Sync
     if (import.meta.client) {
         onMounted(() => {
             load()
-            // ระบบ Sync กับแท็บหรือหน้าต่างเดียวกันหากถูกเปิดไว้
+            // Cross-tab sync
             window.addEventListener('storage', (e) => {
                 if (e.key === getStorageKey()) {
                     load()

Frontend-Learner/composables/useNavItems.ts

@@ -1,19 +1,17 @@
 /**
  * @file useNavItems.ts
- * @description ศูนย์รวมจัดการเมนูนำทาง (Navigation Items) เพื่อให้ใช้ข้อมูลชุดเดียวกันทั้งเว็บ
+ * @description Single Source of Truth for navigation items used across the app (Sidebar, Mobile Nav, User Menu).
- * (เช่น เมนูด้านข้าง, เมนูบนมือถือ, และเมนูโปรไฟล์ผู้ใช้)
  */
 
 export interface NavItem {
-  to: string           // ลิงก์ปลายทาง
+  to: string
-  labelKey: string     // คีย์ภาษาสำหรับ i18n
+  labelKey: string
-  icon: string         // ไอคอนจาก Material Icons
+  icon: string
-  showOn: ('sidebar' | 'mobile' | 'userMenu')[] // กำหนดให้โชว์ที่ส่วนไหนบ้าง
+  showOn: ('sidebar' | 'mobile' | 'userMenu')[]
-  roles?: string[]     // กำหนดสิทธิ์ผู้ใช้ที่จะเห็น (ถ้ามี)
+  roles?: string[]
 }
 
 export const useNavItems = () => {
-  // เมนูทั้งหมดในระบบ กำหนดไว้ที่เดียว
   const allNavItems: NavItem[] = [
     {
       to: '/dashboard',
@@ -65,7 +63,6 @@ export const useNavItems = () => {
     }
   ]
 
-  // คัดกรองเมนูที่จะเอาไปแสดงแต่ละตำแหน่ง
   const sidebarItems = computed(() => allNavItems.filter(item => item.showOn.includes('sidebar')))
   const mobileItems = computed(() => allNavItems.filter(item => item.showOn.includes('mobile')))
   const userMenuItems = computed(() => allNavItems.filter(item => item.showOn.includes('userMenu')))

Frontend-Learner/composables/useQuizRunner.ts

@@ -19,107 +19,95 @@ export interface AnswerState {
 
 /**
  * @composable useQuizRunner
- * @description จัดการ State (สถานะ) และ Logic สำหรับการทำแบบทดสอบ (Quiz)
+ * @description Manages the state and logic for running a quiz activity.
- * ครอบคลุมการแสดงคำถาม, บันทึกคำตอบ, และตรวจสอบการข้ามคำถาม
  */
 export const useQuizRunner = () => {
-  // ================= State (สถานะเก็บค่าต่างๆ ของข้อสอบ) =================
+  // State
-  const questions = useState<QuizQuestion[]>('quiz-questions', () => []); // เก็บรายการคำถามทั้งหมด
+  const questions = useState<QuizQuestion[]>('quiz-questions', () => []);
-  const answers = useState<Record<number, AnswerState>>('quiz-answers', () => ({})); // เก็บคำตอบที่ผู้ใช้ตอบ แยกตาม ID คำถาม
+  const answers = useState<Record<number, AnswerState>>('quiz-answers', () => ({}));
-  const currentQuestionIndex = useState<number>('quiz-current-index', () => 0); // ลำดับคำถามที่กำลังทำอยู่ปัจจุบัน (เริ่มที่ 0)
+  const currentQuestionIndex = useState<number>('quiz-current-index', () => 0);
-  const loading = useState<boolean>('quiz-loading', () => false); // สถานะตอนกำลังกดเซฟหรือโหลดข้อมูล
+  const loading = useState<boolean>('quiz-loading', () => false);
-  const lastError = useState<string | null>('quiz-error', () => null); // เก็บข้อความแจ้งเตือนข้อผิดพลาดล่าสุด
+  const lastError = useState<string | null>('quiz-error', () => null);
 
-  // ================= Getters (ดึงค่าที่ถูกประมวลผลแล้ว) =================
+  // Getters
-  const currentQuestion = computed(() => questions.value[currentQuestionIndex.value]); // ดึงคำถามข้อปัจจุบัน
+  const currentQuestion = computed(() => questions.value[currentQuestionIndex.value]);
   
-  const currentAnswer = computed(() => { // ดึงคำตอบในข้อปัจจุบัน
+  const currentAnswer = computed(() => {
     if (!currentQuestion.value) return null;
     return answers.value[currentQuestion.value.id];
   });
 
-  const totalQuestions = computed(() => questions.value.length); // จำนวนคำถามทั้งหมดในแบบทดสอบ
+  const totalQuestions = computed(() => questions.value.length);
-  const isLastQuestion = computed(() => currentQuestionIndex.value === questions.value.length - 1); // เช็คว่าใช่คำถามข้อสุดท้ายหรือไม่
+  const isLastQuestion = computed(() => currentQuestionIndex.value === questions.value.length - 1);
-  const isFirstQuestion = computed(() => currentQuestionIndex.value === 0); // เช็คว่าใช่คำถามข้อแรกหรือไม่
+  const isFirstQuestion = computed(() => currentQuestionIndex.value === 0);
 
-  // ================= Actions (ฟังก์ชันหลักสำหรับการทำงาน) =================
+  // Actions
-  
-  // ฟังก์ชันเริ่มต้นสร้าง/โหลดข้อสอบ (กำหนดโครงสร้างพื้นฐาน)
   function initQuiz(quizData: any) {
     if (!quizData || !quizData.questions) return;
     
     questions.value = quizData.questions; 
-    currentQuestionIndex.value = 0; // รีเซ็ตไปที่ข้อ 1 ใหม่
+    currentQuestionIndex.value = 0;
     answers.value = {};
     lastError.value = null;
 
-    // เตรียมโครงสร้างคำตอบรองรับทุกข้อ
     questions.value.forEach(q => {
       answers.value[q.id] = {
         questionId: q.id,
         value: null,
-        is_saved: false, // บันทึกและส่ง API เรียบร้อยหรือยัง
+        is_saved: false,
-        status: 'not_started', // สถานะเริ่มต้นของคำถาม
+        status: 'not_started',
-        touched: false, // ผู้ใช้เคยเปิดเข้ามาดูข้อนีัหรือยัง
+        touched: false,
       };
     });
 
-    // เริ่มต้นบันทึกเวลา/เข้าสู่ข้อที่ 1 ทันทีเมื่ออธิบายเสร็จ
     if (questions.value.length > 0) {
       enterQuestion(questions.value[0].id);
     }
   }
 
-  // ฟังก์ชันสลับสถานะเมื่อกดเข้ามาที่คำถามนั้นๆ
   function enterQuestion(qId: number) {
     const ans = answers.value[qId];
     if (ans) {
       ans.touched = true;
       if (ans.status === 'not_started' || ans.status === 'skipped') {
-         ans.status = 'in_progress'; // เปลี่ยนสถานะเป็น 'กำลังทำ'
+         ans.status = 'in_progress';
       }
     }
   }
 
-  // ตรวจสอบเงื่อนไขว่าผู้ใช้สามารถออกจากคำถามปัจจุบันไปยังข้ออื่นได้หรือไม่
   function canLeaveCurrent(): { allowed: boolean; reason?: string } {
     if (!currentQuestion.value) return { allowed: true };
     const q = currentQuestion.value;
     const a = answers.value[q.id];
     
-    // สามารถออกได้ถ้าคำถามทำถูกหรือโจทย์อนุญาตให้ข้ามได้
     if (a.status === 'completed' || a.is_saved) return { allowed: true };
     if (q.is_skippable) return { allowed: true };
     
-    // บังคับให้ตอบถ้าไม่ได้อนุญาตให้ข้าม และไม่ได้ตอบ
     if (!a.is_saved && a.value === null) {
-      return { allowed: false, reason: 'ต้องการคำตอบสำหรับข้อบังคับนี้' };
+      return { allowed: false, reason: 'This question is required.' };
     }
 
     return { allowed: true };
   }
 
-  // ฟังก์ชันอัปเดตค่าตัวเลือกที่ผู้ใช้กดเลือกในข้อปัจจุบัน
   function updateAnswer(val: any) {
      if (!currentQuestion.value) return;
      const qId = currentQuestion.value.id;
      answers.value[qId].value = val;
      
-     // หากมีแก้ไขคำตอบหลังจากกดเซฟไปแล้ว ให้เปลี่ยนสถานะให้ระบบรู้ว่าต้องเซฟใหม่
      if (answers.value[qId].is_saved) {
         answers.value[qId].is_saved = false;
         answers.value[qId].status = 'in_progress';
      }
   }
 
-  // ล็อกและบันทึกข้อสอบเมื่อกดปุ่ม "ตกลง/ส่งคำตอบ" สำหรับข้อนั้นๆ
   async function saveCurrentAnswer() {
     if (!currentQuestion.value) return;
     const qId = currentQuestion.value.id;
     const ans = answers.value[qId];
 
     if (ans.value === null) {
-      lastError.value = "กรุณาเลือกคำตอบอย่างน้อย 1 ตัวเลือก";
+      lastError.value = "Please provide an answer.";
       return false;
     }
 
@@ -127,34 +115,30 @@ export const useQuizRunner = () => {
     lastError.value = null;
 
     try {
-      // หมายเหตุ: การเชื่อมต่อ API หลักต้องทำที่ไฟล์ component, ตัวนี้จัดการแค่เรื่อง State
       ans.is_saved = true;
-      ans.status = 'completed'; // มาร์คว่าเป็นข้อที่ทำเสร็จแล้ว
+      ans.status = 'completed';
       ans.last_saved_at = new Date().toISOString();
       return true;
     } catch (e) {
-      lastError.value = "เกิดข้อผิดพลาดในการบันทึกคำตอบ";
+      lastError.value = "Failed to save answer.";
       return false;
     } finally {
       loading.value = false;
     }
   }
 
-  // วินิจฉัยก่อนสั่งผู้ใช้ย้ายไปยังคำถามอื่นหน้าอื่นตามดัชนีระบุ
   function handleLeaveLogic(targetIndex: number) {
     if (targetIndex === currentQuestionIndex.value) return;
 
-    // ตรวจสอบขั้นสุดท้าย ป้องกันคนคลิกแอบหนีข้อที่บังคับทำ
     const check = canLeaveCurrent();
     if (!check.allowed) {
-      lastError.value = check.reason || "จำเป็นต้องตอบข้อนี้ก่อนข้าม";
+      lastError.value = check.reason || "Required question.";
       return false;
     }
 
     const currQ = currentQuestion.value;
     if (currQ) {
         const currAns = answers.value[currQ.id];
-        // หากผู้ใช้ทิ้งขว้างโดยที่ไม่บังคับ ให้ทิ้งสถานะเป็นข้าม ('skipped')
         if (currAns.status !== 'completed' && !currAns.is_saved) {
           currAns.status = 'skipped';
         }
@@ -163,7 +147,6 @@ export const useQuizRunner = () => {
     currentQuestionIndex.value = targetIndex;
     lastError.value = null;
 
-    // ติดตามสถานะ 'touched' ในข้อใหม่ที่เข้าไปล่าสุด
     if (questions.value[targetIndex]) {
        enterQuestion(questions.value[targetIndex].id);
     }

Frontend-Learner/composables/useThemeMode.ts

@@ -1,41 +1,26 @@
 import { useQuasar } from 'quasar'
 
-/**
- * @composable useThemeMode
- * @description จัดการระบบโหมดสว่าง/มืด (Light/Dark Theme) ของแพลตฟอร์ม
- * ครอบคลุมการสั่งบันทึกการตั้งค่า, เปลี่ยนคลาส Tailwind และ Sync ซิงก์กับ Quasar UI
- */
 export const useThemeMode = () => {
   const $q = useQuasar()
 
-  // สถานะเริ่มต้นของโหมดมืด (สำหรับการทำ SSR ถูกเซ็ตเป็น false (สว่าง) ไว้ก่อน)
+  // deterministic on SSR: default = light
   const isDark = useState<boolean>('theme:isDark', () => false)
 
-  // ฟังก์ชันใช้คลาสกับ Tag <html> เพื่อให้ Tailwind หรือ CSS รันโหมดมืด
   const applyTheme = (value: boolean) => {
-    if (!process.client) return // หากทำงานฝั่งเซิร์ฟเวอร์ จะไม่สั่งให้รัน DOM
+    if (!process.client) return
-    
-    // สลับคลาส 'dark' หรือปิด
     document.documentElement.classList.toggle('dark', value)
-    
-    // สั่งให้ Quasar (UI Framework) ปรับโหมดสีให้ตรงกัน (มืด/สว่าง)
     $q.dark.set(value)
-    
-    // บันทึกการตั้งค่าลงเครื่องระยะยาวเบราว์เซอร์
     localStorage.setItem('theme', value ? 'dark' : 'light')
   }
 
 
 
-  // จับตาดูเมื่อตัวแปรเปลี่ยนค่าค่อยทำการเปลี่ยนโหมดบนหน้าจอ
   watch(isDark, (v) => applyTheme(v))
 
-  // ฟังก์ชันสั่งสลับโหมด ไปมา (Toggle)
   const toggle = () => {
     isDark.value = !isDark.value
   }
 
-  // ฟังก์ชันสำหรับกำหนดตั้งค่าโหมดแบบเจาะจง
   const set = (v: boolean) => {
     isDark.value = v
   }

Frontend-Learner/constants/landing.ts

@@ -1,43 +0,0 @@
-/**
- * @file landing.ts
- * @description ข้อมูลคงที่ (Static data) แบบจำลองที่เอาไว้แสดงผลบนหน้า Landing page
- */
-
-export const CATEGORY_CARDS = [
-  { 
-    title: 'โปรแกรมมิ่ง', 
-    desc: 'เชี่ยวชาญการเขียนโค้ดและพัฒนาซอฟต์แวร์', 
-    icon: 'o_code', 
-    slug: 'programming',
-  },
-  { 
-    title: 'การออกแบบ', 
-    desc: 'ทักษะ UI/UX และการออกแบบระดับมือโปร', 
-    icon: 'o_palette', 
-    slug: 'design',
-  },
-  { 
-    title: 'ธุรกิจ', 
-    desc: 'ทักษะการจัดการและความเป็นผู้นำสากล', 
-    icon: 'o_business_center', 
-    slug: 'business',
-  }
-]
-
-export const WHY_CHOOSE_US = [
-  {
-    title: 'ผู้สอนเชี่ยวชาญ',
-    desc: 'เรียนรู้จากผู้นำในอุตสาหกรรมที่มีประสบการณ์การทำงานหลายปีในบริษัทเทคโนโลยีชั้นนำระดับโลก',
-    icon: 'o_groups',
-  },
-  {
-    title: 'การเรียนรู้ที่ยืดหยุ่น',
-    desc: 'เรียนตามจังหวะของคุณเอง ได้ทุกที่ทุกเวลา เข้าถึงเนื้อหาคอร์สที่สมัครเรียนได้ตลอดชีพ',
-    icon: 'o_schedule',
-  },
-  {
-    title: 'ประกาศนียบัตรเมื่อเรียนจบ',
-    desc: 'รับวุฒิบัตรที่เป็นที่ยอมรับเพื่อเสริมพอร์ตโฟลิโอระดับมืออาชีพของคุณและแชร์ลง LinkedIn ได้โดยตรง',
-    icon: 'o_verified',
-  }
-]

Frontend-Learner/i18n/locales/en.json

@@ -24,8 +24,7 @@
     "emptyLibraryDesc": "Start learning new things today. Browse interesting courses to develop your skills.",
     "viewAllCourses": "View All Courses",
     "recommendedCourses": "Recommended Courses",
-    "noRecommended": "No recommended courses found",
+    "noRecommended": "No recommended courses found"
-    "moreCourses": "More Courses"
   },
   "menu": {
     "continueLearning": "Continue Learning",
@@ -88,14 +87,10 @@
     "overview": "Home",
     "myCourses": "My Courses",
     "browseCourses": "Browse Courses",
-    "onlineCourses": "All Courses",
+    "onlineCourses": "Online Courses",
     "recommendedCourses": "Recommended Courses",
     "announcements": "Announcements",
-    "profile": "My Profile",
+    "profile": "My Profile"
-    "accountGroup": "Account",
-    "promoTitle": "Find the right course",
-    "promoSubtitle": "Level up your skills",
-    "learnMore": "Learn More"
   },
   "discovery": {
     "title": "All Courses",
@@ -103,9 +98,6 @@
     "sortRecent": "Sort by: Recent",
     "sortPopular": "Popular",
     "categoryTitle": "Categories",
-    "design": "Design",
-    "programming": "Programming",
-    "business": "Business",
     "showMore": "Show More",
     "showLess": "Show Less",
     "emptyTitle": "No courses found",
@@ -115,22 +107,15 @@
     "backToCatalog": "Back to Catalog",
     "selectable": "Selected",
     "foundTotal": "Found Total",
-    "items": "items",
+    "items": "items"
-    "subtitle": "Choose to learn new skills from our curated quality courses",
-    "searchBtn": "Search"
   },
   "myCourses": {
-    "title": "My Courses",
-    "subtitle": "Track your progress and continue learning from where you left off",
-    "searchPlaceholder": "Search my courses...",
     "filterAll": "All",
     "filterProgress": "In Progress",
     "filterCompleted": "Completed",
     "emptyTitle": "No courses in this category",
     "emptyDesc": "You don't have any courses here yet. Browse our catalog to find interesting courses.",
-    "goToDiscovery": "Go to Courses",
+    "goToDiscovery": "Go to Courses"
-    "searchNoResult": "No matching courses found",
-    "searchNoResultDesc": "Try changing category or your search term"
   },
   "enrollment": {
     "successTitle": "Enrollment Successful!",
@@ -159,7 +144,7 @@
     "accountDetails": "Account Details",
     "editPersonalDesc": "Edit Personal Information",
     "yourAvatar": "Your Profile Photo",
-    "avatarHint": "Only JPG, PNG",
+    "avatarHint": "PNG, JPG only",
     "uploadNew": "Upload New Photo",
     "changeAvatar": "Change Profile Photo",
     "removeAvatar": "Remove Profile Photo",
@@ -190,15 +175,7 @@
     "emailVerified": "Email Verified",
     "myCertificates": "My Certificates",
     "viewCertificate": "View Certificate",
-    "issuedAt": "Issued at",
+    "issuedAt": "Issued at"
-    "publicInfo": "Information visible to the public on the platform",
-    "uploading": "Uploading...",
-    "selectPrefix": "Select Prefix",
-    "verifyNow": "Click to verify email",
-    "verifying": "Sending...",
-    "saving": "Saving...",
-    "securitySubtitle": "Manage password and account access",
-    "password": "Password"
   },
   "userMenu": {
     "home": "Home",
@@ -221,9 +198,7 @@
     "emailVerifiedDesc": "Your account has been successfully verified.",
     "invalidToken": "Invalid verification token",
     "tokenExpired": "Token expired or invalid",
-    "logout": "Log Out",
+    "logout": "Log Out"
-    "logoutConfirmTitle": "Confirm Logout",
-    "logoutConfirmMessage": "Are you sure you want to log out of the system?"
   },
   "language": {
     "label": "Language / ภาษา",
@@ -234,7 +209,6 @@
     "newBadge": "New",
     "popularBadge": "Popular",
     "save": "Save",
-    "saveChanges": "Save Changes",
     "ok": "OK",
     "close": "Close",
     "cancel": "Cancel",
@@ -248,9 +222,7 @@
     "backToHome": "Back to Home",
     "error": "Error",
     "loading": "Loading",
-    "items": "Items",
+    "items": "Items"
-    "student": "Student",
-    "latest": "Latest"
   },
   "classroom": {
     "backToDashboard": "Back to My Courses",

Frontend-Learner/i18n/locales/th.json

@@ -24,8 +24,7 @@
     "emptyLibraryDesc": "เริ่มเรียนรู้สิ่งใหม่ๆ วันนี้ เลือกดูคอร์สเรียนที่น่าสนใจเพื่อพัฒนาทักษะของคุณ",
     "viewAllCourses": "ดูคอร์สเรียนทั้งหมด",
     "recommendedCourses": "คอร์สแนะนำ",
-    "noRecommended": "ไม่พบข้อมูลคอร์สแนะนำ",
+    "noRecommended": "ไม่พบข้อมูลคอร์สแนะนำ"
-    "moreCourses": "คอร์สเพิ่มเติม"
   },
   "menu": {
     "continueLearning": "เรียนต่อจากเดิม",
@@ -88,14 +87,10 @@
     "overview": "หน้าหลัก",
     "myCourses": "คอร์สของฉัน",
     "browseCourses": "ค้นหาคอร์ส",
-    "onlineCourses": "คอร์สเรียนทั้งหมด",
+    "onlineCourses": "คอร์สออนไลน์",
     "recommendedCourses": "คอร์สเรียนแนะนำ",
     "announcements": "ข่าวประกาศ",
-    "profile": "บัญชีผู้ใช้",
+    "profile": "บัญชีผู้ใช้"
-    "accountGroup": "บัญชี",
-    "promoTitle": "ค้นหาคอร์สที่ใช่",
-    "promoSubtitle": "ยกระดับทักษะของคุณ",
-    "learnMore": "เรียนรู้เพิ่มเติม"
   },
   "discovery": {
     "title": "รายการคอร์สทั้งหมด",
@@ -103,9 +98,6 @@
     "sortRecent": "เรียงตาม: ล่าสุด",
     "sortPopular": "ยอดนิยม",
     "categoryTitle": "หมวดหมู่",
-    "design": "การออกแบบ",
-    "programming": "การเขียนโปรแกรม",
-    "business": "ธุรกิจ",
     "showMore": "แสดงเพิ่มเติม",
     "showLess": "แสดงน้อยลง",
     "emptyTitle": "ไม่พบผลการค้นหา",
@@ -116,21 +108,15 @@
     "selectable": "รายการที่เลือก",
     "foundTotal": "พบทั้งหมด",
     "items": "รายการ",
-    "subtitle": "เลือกเรียนรู้ทักษะใหม่ๆ จากหลักสูตรคุณภาพที่คัดสรรมาเพื่อคุณ",
+    "subtitle": "เลือกเรียนรู้ทักษะใหม่ๆ จากหลักสูตรคุณภาพที่คัดสรรมาเพื่อคุณ"
-    "searchBtn": "ค้นหา"
   },
   "myCourses": {
-    "title": "คอร์สของฉัน",
-    "subtitle": "ติดตามความคืบหน้าและเรียนรู้ต่อจากจุดที่ค้างไว้",
-    "searchPlaceholder": "ค้นหาชื่อคอร์สของฉัน...",
     "filterAll": "ทั้งหมด",
     "filterProgress": "กำลังเรียน",
     "filterCompleted": "เรียนจบแล้ว",
     "emptyTitle": "ยังไม่มีคอร์สในหมวดหมู่นี้",
     "emptyDesc": "คุณยังไม่มีคอร์สเรียนในส่วนนี้ ลองเลือกดูคอร์สที่น่าสนใจในระบบของเรา",
-    "goToDiscovery": "ไปที่รายการคอร์ส",
+    "goToDiscovery": "ไปที่รายการคอร์ส"
-    "searchNoResult": "ไม่พบคอร์สที่สอดคล้อง",
-    "searchNoResultDesc": "ลองเปลี่ยนหมวดหมู่หรือคำค้นหาของคุณ"
   },
   "enrollment": {
     "successTitle": "ลงทะเบียนสำเร็จ!",
@@ -159,7 +145,7 @@
     "accountDetails": "รายละเอียดบัญชี",
     "editPersonalDesc": "แก้ไขข้อมูลส่วนตัว",
     "yourAvatar": "รูปโปรไฟล์ของคุณ",
-    "avatarHint": "เฉพาะไฟล์ JPG, PNG",
+    "avatarHint": "เฉพาะไฟล์ png , jpg",
     "uploadNew": "อัพโหลดรูปโปรไฟล์",
     "changeAvatar": "เปลี่ยนรูปโปรไฟล์",
     "removeAvatar": "ลบรูปโปรไฟล์",
@@ -190,15 +176,7 @@
     "emailVerified": "ยืนยันอีเมลเสร็จสิ้น",
     "myCertificates": "ประกาศนียบัตรของฉัน",
     "viewCertificate": "ดูประกาศนียบัตร",
-    "issuedAt": "ออกเมื่อ",
+    "issuedAt": "ออกเมื่อ"
-    "publicInfo": "ข้อมูลที่แสดงต่อสาธารณะบนแพลตฟอร์ม",
-    "uploading": "กำลังอัปโหลด...",
-    "selectPrefix": "เลือกคำนำหน้า",
-    "verifyNow": "คลิกเพื่อยืนยันอีเมล",
-    "verifying": "กำลังส่ง...",
-    "saving": "กำลังบันทึก...",
-    "securitySubtitle": "จัดการรหัสผ่านและการเข้าถึงบัญชี",
-    "password": "รหัสผ่าน"
   },
   "userMenu": {
     "home": "หน้าหลัก",
@@ -209,7 +187,7 @@
     "logout": "ออกจากระบบ"
   },
   "landing": {
-    "allCourses": "คอร์สเรียนทั้งหมด",
+    "allCourses": "คอร์สทั้งหมด",
     "discovery": "ค้นพบ",
     "goToDashboard": "เข้าสู่หน้าจัดการเรียน"
   },
@@ -221,9 +199,7 @@
     "emailVerifiedDesc": "บัญชีของคุณได้รับการยืนยันเรียบร้อยแล้ว",
     "invalidToken": "Token ยืนยันตัวตนไม่ถูกต้อง",
     "tokenExpired": "Token หมดอายุหรือล้มเหลว",
-    "logout": "ออกจากระบบ",
+    "logout": "ออกจากระบบ"
-    "logoutConfirmTitle": "ยืนยันการออกจากระบบ",
-    "logoutConfirmMessage": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?"
   },
   "language": {
     "label": "ภาษา / Language",
@@ -234,7 +210,6 @@
     "newBadge": "ใหม่",
     "popularBadge": "ยอดนิยม",
     "save": "บันทึก",
-    "saveChanges": "บันทึกการเปลี่ยนแปลง",
     "ok": "ตกลง",
     "close": "ปิด",
     "cancel": "ยกเลิก",
@@ -248,9 +223,7 @@
     "backToHome": "กลับสู่หน้าหลัก",
     "error": "เกิดข้อผิดพลาด",
     "loading": "กำลังโหลด",
-    "items": "รายการ",
+    "items": "รายการ"
-    "student": "นักเรียน",
-    "latest": "ล่าสุด"
   },
   "classroom": {
     "backToDashboard": "กลับไปคอร์สของฉัน",

Frontend-Learner/layouts/auth.vue

@@ -19,7 +19,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <!-- Auth Shell: ครอบคลุมการแสดงผลหน้าสำหรับเข้าสู่ระบบหรือสมัครสมาชิก -->
+  <!-- Auth Shell: Wrapper for authentication pages (Login, Register, etc.) -->
   <div class="auth-shell bg-white w-full min-h-screen">
     <slot />
   </div>

Frontend-Learner/layouts/dashboard-index.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 /**
  * @file dashboard-index.vue
- * @description เลย์เอาต์สำหรับหน้าแรกของ Dashboard (ไม่มีแผงเมนูด้านข้างเพื่อเน้นพื้นที่เนื้อหา)
+ * @description Layout for the Dashboard Index page, without the sidebar.
- * ใช้โครงสร้างจาก Quasar QLayout เพื่อให้รองรับ Responsive
+ * Uses Quasar QLayout for responsive structure.
  */
 
-// เปิดใช้คอมโพสซิเบิลจัดการธีมแบบ Global
+// Initialize global theme management
 useThemeMode()
 
 const { currentUser, logout } = useAuth()
@@ -18,7 +18,7 @@ const toggleRightDrawer = () => {
 
 <template>
   <q-layout view="hHh lpR fFf" class="bg-slate-50 dark:!bg-[#020617] text-slate-900 dark:!text-slate-50">
-    <!-- แถบด้านบนของโครงสร้าง (Header) -->
+    <!-- Header -->
     <q-header
       class="bg-white/80 dark:!bg-[#0f172a]/80 backdrop-blur-md text-slate-900 dark:!text-white"
     >
@@ -29,7 +29,7 @@ const toggleRightDrawer = () => {
       />
     </q-header>
 
-    <!-- แถบลิ้นชักมือถือหลัก (เมนูรวมทุกอย่างเมื่อปัดหน้าจอ/กดไอคอนบนสัดส่วนเล็ก) -->
+    <!-- Master Mobile Drawer (The Everything Hub) -->
     <q-drawer
       v-model="rightDrawerOpen"
       side="right"
@@ -39,7 +39,7 @@ const toggleRightDrawer = () => {
       :width="300"
     >
       <div class="flex flex-col h-full bg-white dark:bg-[#0f172a]">
-        <!-- 1. ส่วนบัญชีผู้ใช้ (Account Section) ดีไซน์พรีเมียม -->
+        <!-- 1. Account Section (Premium Look) -->
         <div class="p-6 bg-slate-50/50 dark:bg-slate-800/30 border-b border-slate-100 dark:border-slate-800">
           <div class="flex items-center justify-between mb-8">
              <div class="flex items-center gap-3">
@@ -62,10 +62,10 @@ const toggleRightDrawer = () => {
           </div>
         </div>
 
-        <!-- 2. ศูนย์รวมเมนูและเนื้อหา (Integrated Content Hub) -->
+        <!-- 2. Integrated Content Hub -->
         <div class="flex-grow overflow-y-auto pt-4">
           <q-list padding class="text-slate-600 dark:text-slate-300">
-            <!-- การนำทาง (Navigation) -->
+            <!-- Navigation -->
             <q-item-label header class="text-[11px] font-black tracking-[0.2em] text-slate-400 uppercase px-6 pb-2">เมนูหลัก</q-item-label>
             
             <q-item to="/dashboard" clickable v-ripple class="px-6 py-4" active-class="bg-blue-50 text-blue-600 dark:bg-blue-900/20 dark:text-blue-400 font-bold" @click="rightDrawerOpen = false">
@@ -85,10 +85,10 @@ const toggleRightDrawer = () => {
 
             <q-separator class="my-4 mx-6 opacity-50" />
 
-            <!-- เครื่องมือทั่วไปและการตั้งค่าระบบ -->
+            <!-- Tools & Settings -->
             <q-item-label header class="text-[11px] font-black tracking-[0.2em] text-slate-400 uppercase px-6 pb-2">เครื่องมือและการตั้งค่า</q-item-label>
             
-            <!-- ปุ่มสลับภาษา -->
+            <!-- Language Selection -->
             <q-item class="px-6 py-2">
               <q-item-section avatar><q-icon name="language" size="22px" /></q-item-section>
               <q-item-section>
@@ -99,7 +99,7 @@ const toggleRightDrawer = () => {
               </q-item-section>
             </q-item>
 
-            <!-- เปิดปิดโหมดมืด (Dark Mode Toggle) -->
+            <!-- Dark Mode Toggle -->
             <q-item class="px-6 py-2">
               <q-item-section avatar><q-icon :name="isDark ? 'dark_mode' : 'light_mode'" size="22px" /></q-item-section>
               <q-item-section>
@@ -121,7 +121,7 @@ const toggleRightDrawer = () => {
           </q-list>
         </div>
 
-        <!-- 3. ส่วนล่างสุด เช่น ล็อกเอาต์ หรือระบุเวอร์ชันระบบ -->
+        <!-- 3. Bottom Actions -->
         <div class="p-6 mt-auto border-t border-slate-100 dark:border-slate-800">
           <q-btn
             unelevated
@@ -138,16 +138,18 @@ const toggleRightDrawer = () => {
       </div>
     </q-drawer>
 
-    <!-- หมายเหตุ: สำหรับหน้านี้ จะไม่ได้มีการโชว์ Sidebar ที่เป็นลิ้นชักซ้าย -->
+    <!-- Sidebar Removed for this layout -->
 
-    <!-- พื้นที่แสดงเนื้อหาหลัก -->
+    <!-- Main Content -->
     <q-page-container>
       <q-page class="relative">
         <slot />
       </q-page>
     </q-page-container>
 
-    <!-- เมนูปุ่มกดล่างหน้าจอบนมือถือ (สำหรับช่วยให้เข้าถึงหน้าหลักได้ไวขึ้น) -->
+    <!-- Mobile Bottom Nav - Optional, keeping it consistent with default but maybe not needed if full width?
+         If we remove sidebar, we might still want mobile nav if it's main navigation.
+         Let's keep it for now as it doesn't hurt. -->
     <q-footer
       v-if="$q.screen.lt.md"
       class="!bg-white dark:!bg-[#1e293b] text-primary"

Frontend-Learner/layouts/default.vue

@@ -1,66 +1,181 @@
 <script setup lang="ts">
 /**
  * @file default.vue
- * @description เลย์เอาต์หลัก (Master Layout) สำหรับผู้ใช้งานที่เข้าสู่ระบบแล้ว 
+ * @description Layout หลักสำหรับหน้าเว็บของผู้ใช้ (Authenticated Users)
- * ประกอบด้วยแถบเมนูด้านบน (Header), แถบเมนูด้านข้าง (Sidebar) และพื้นที่เนื้อหา
+ * Uses Quasar QLayout for responsive structure.
  */
 
+// Initialize global theme management
 useThemeMode()
 
-const leftDrawerOpen = ref(true)
+const { currentUser, logout } = useAuth()
+const { isDark, set: setTheme } = useThemeMode()
+const leftDrawerOpen = ref(false)
+const rightDrawerOpen = ref(false)
 
 const toggleLeftDrawer = () => {
   leftDrawerOpen.value = !leftDrawerOpen.value
 }
 
+const toggleRightDrawer = () => {
+  rightDrawerOpen.value = !rightDrawerOpen.value
+}
+
 const route = useRoute()
-// ระบุว่า path ไหนบ้างที่ให้แสดงแถบเมนูด้านข้าง (Sidebar)
+// Automatically hide sidebar for learner routes
-const isDashboardRoute = computed(() => {
+const shouldHideSidebar = computed(() => {
-  const routes = ['/dashboard', '/browse', '/classroom', '/course']
+  const silentRoutes = ['/dashboard', '/browse', '/classroom', '/course']
-  return routes.some(r => route.path.startsWith(r))
+  return silentRoutes.some(r => route.path.startsWith(r))
 })
 </script>
 
 <template>
-  <q-layout view="lHh Lpr lFf" class="bg-[#F8FAFC] dark:!bg-[#020617] text-slate-900 dark:!text-slate-50">
+  <q-layout view="hHh LpR lFf" class="bg-slate-50 dark:!bg-[#020617] text-slate-900 dark:!text-slate-50">
-    
+    <!-- Header -->
-    <!-- ส่วนหัว (Header) -->
     <q-header
-      class="bg-transparent text-slate-900 dark:!text-white border-none shadow-none"
+      class="bg-white/80 dark:!bg-[#0f172a]/80 backdrop-blur-md text-slate-900 dark:!text-white border-none shadow-none"
     >
-      <AppHeader @toggleSidebar="toggleLeftDrawer" />
+      <AppHeader 
+        @toggleSidebar="toggleLeftDrawer" 
+        @toggleRightDrawer="toggleRightDrawer"
+        :showSidebarToggle="!shouldHideSidebar" 
+      />
     </q-header>
 
-    <!-- แถบเมนูด้านข้าง (Navigation Sidebar) -->
+    <!-- Sidebar (Drawer - Desktop Left) -->
     <q-drawer
+      v-if="!shouldHideSidebar"
       v-model="leftDrawerOpen"
       show-if-above
       :width="280"
-      side="left"
+      class="bg-white dark:!bg-[#0f172a]"
-      bordered
-      class="bg-white dark:!bg-[#0f172a] border-none"
     >
       <AppSidebar />
     </q-drawer>
 
-    <!-- พื้นที่แสดงเนื้อหาหลัก (Main Content Area) -->
+    <!-- Master Mobile Drawer (The Everything Hub) -->
-    <q-page-container>
+    <q-drawer
-      <q-page class="px-3 py-6 md:p-8">
+      v-model="rightDrawerOpen"
-        <div class="max-w-[1600px] mx-auto">
+      side="right"
-          <slot />
+      overlay
+      bordered
+      class="bg-white dark:!bg-[#0f172a]"
+      :width="300"
+    >
+      <div class="flex flex-col h-full bg-white dark:bg-[#0f172a]">
+        <!-- 1. Account Section -->
+        <div class="p-6 bg-slate-50/50 dark:bg-slate-800/30 border-b border-slate-100 dark:border-slate-800">
+          <div class="flex items-center justify-between mb-8">
+             <div class="flex items-center gap-3">
+               <div class="w-8 h-8 rounded-lg bg-blue-600 flex items-center justify-center text-white font-black">E</div>
+               <span class="font-black text-lg text-slate-900 dark:text-white">E-Learning</span>
             </div>
+            <q-btn flat round dense icon="close" class="text-slate-400" @click="rightDrawerOpen = false" />
+          </div>
+
+          <div class="flex items-center gap-4 py-2">
+            <q-avatar size="64px" class="shadow-lg border-2 border-white dark:border-slate-700">
+              <img :src="currentUser?.photoURL || 'https://cdn.quasar.dev/img/avatar.png'" />
+            </q-avatar>
+            <div class="overflow-hidden">
+              <p class="font-bold text-slate-900 dark:text-white mb-0 truncate text-lg">
+                {{ currentUser?.firstName || 'Guest' }} {{ currentUser?.lastName || '' }}
+              </p>
+              <p class="text-xs text-slate-500 dark:text-slate-400 truncate">{{ currentUser?.email || 'e-learning@platform.com' }}</p>
+            </div>
+          </div>
+        </div>
+
+        <!-- 2. Integrated Content Hub -->
+        <div class="flex-grow overflow-y-auto pt-4">
+          <q-list padding class="text-slate-600 dark:text-slate-300">
+            <!-- Navigation -->
+            <q-item-label header class="text-[11px] font-black tracking-[0.2em] text-slate-400 uppercase px-6 pb-2">เมนูหลัก</q-item-label>
+            
+            <q-item to="/dashboard" clickable v-ripple class="px-6 py-4" active-class="bg-blue-50 text-blue-600 dark:bg-blue-900/20 dark:text-blue-400 font-bold" @click="rightDrawerOpen = false">
+              <q-item-section avatar><q-icon name="dashboard" size="24px" /></q-item-section>
+              <q-item-section><span class="text-[15px] font-bold">{{ $t("sidebar.overview") }}</span></q-item-section>
+            </q-item>
+            
+            <q-item to="/browse/discovery" clickable v-ripple class="px-6 py-4" active-class="bg-blue-50 text-blue-600 dark:bg-blue-900/20 dark:text-blue-400 font-bold" @click="rightDrawerOpen = false">
+              <q-item-section avatar><q-icon name="explore" size="24px" /></q-item-section>
+              <q-item-section><span class="text-[15px] font-bold">{{ $t("landing.allCourses") }}</span></q-item-section>
+            </q-item>
+            
+            <q-item to="/dashboard/my-courses" clickable v-ripple class="px-6 py-4" active-class="bg-blue-50 text-blue-600 dark:bg-blue-900/20 dark:text-blue-400 font-bold" @click="rightDrawerOpen = false">
+              <q-item-section avatar><q-icon name="school" size="24px" /></q-item-section>
+              <q-item-section><span class="text-[15px] font-bold">{{ $t("sidebar.myCourses") || 'คอร์สเรียนของฉัน' }}</span></q-item-section>
+            </q-item>
+
+            <q-separator class="my-4 mx-6 opacity-50" />
+
+            <!-- Tools & Settings -->
+            <q-item-label header class="text-[11px] font-black tracking-[0.2em] text-slate-400 uppercase px-6 pb-2">เครื่องมือและการตั้งค่า</q-item-label>
+            
+            <!-- Language Selection -->
+            <q-item class="px-6 py-2">
+              <q-item-section avatar><q-icon name="language" size="22px" /></q-item-section>
+              <q-item-section>
+                <div class="flex items-center justify-between">
+                  <span class="font-bold text-[14px]">ภาษา</span>
+                  <LanguageSwitcher dense />
+                </div>
+              </q-item-section>
+            </q-item>
+
+            <!-- Dark Mode Toggle -->
+            <q-item class="px-6 py-2">
+              <q-item-section avatar><q-icon :name="isDark ? 'dark_mode' : 'light_mode'" size="22px" /></q-item-section>
+              <q-item-section>
+                <div class="flex items-center justify-between">
+                  <span class="font-bold text-[14px]">โหมดกลางคืน</span>
+                  <q-toggle
+                    :model-value="isDark"
+                    @update:model-value="setTheme"
+                    color="blue"
+                  />
+                </div>
+              </q-item-section>
+            </q-item>
+
+            <q-item clickable v-ripple @click="navigateTo('/dashboard/profile'); rightDrawerOpen = false" class="px-6 py-4">
+              <q-item-section avatar><q-icon name="person_outline" size="24px" /></q-item-section>
+              <q-item-section><span class="font-bold text-[15px]">จัดการโปรไฟล์</span></q-item-section>
+            </q-item>
+          </q-list>
+        </div>
+
+        <!-- 3. Bottom Actions -->
+        <div class="p-6 mt-auto border-t border-slate-100 dark:border-slate-800">
+          <q-btn
+            unelevated
+            class="full-width rounded-xl bg-red-50 text-red-600 dark:bg-red-900/20 dark:text-red-400 font-bold py-3 no-caps transition-all active:scale-95"
+            @click="logout"
+          >
+            <q-icon name="logout" size="20px" class="mr-2" />
+            ออกจากระบบ
+          </q-btn>
+          <div class="text-center mt-6">
+            <span class="text-[10px] font-bold uppercase tracking-[0.2em] text-slate-300 dark:text-slate-600">E-Learning Platform v1.0</span>
+          </div>
+        </div>
+      </div>
+    </q-drawer>
+
+    <!-- Main Content -->
+    <q-page-container>
+      <q-page class="relative">
+        <slot />
       </q-page>
     </q-page-container>
 
+
   </q-layout>
 </template>
 
 <style>
-/* Global Layout Adjustments */
+/* Ensure fonts are applied */
-.q-drawer--bordered {
+.font-inter {
-  border-right: 1px solid rgba(0,0,0,0.05) !important;
+  font-family: var(--font-main);
-}
-.dark .q-drawer--bordered {
-  border-right: 1px solid rgba(255,255,255,0.05) !important;
 }
 </style>

Frontend-Learner/layouts/landing.vue

@@ -23,20 +23,20 @@ onMounted(() => {
   <q-layout view="lHh LpR lFf" class="bg-white text-slate-900">
 
     
-    <!-- ส่วนหัวของเพจ (แบบโปร่งใส และซ้อนทับให้โชว์เนื้อหาพื้นหลังได้) -->
+    <!-- Header (Transparent & Overlay) -->
     <q-header class="bg-transparent" style="height: auto;">
       <LandingHeader />
     </q-header>
 
-    <!-- ส่วนเนื้อหาหลัก -->
+    <!-- Main Content -->
-    <!-- แทรก style padding-top: 0 บังคับให้เนื้อหาใต้ Header ชนชิดด้านบนสุด (ทำเป็น Hero section สวยๆ) -->
+    <!-- padding-top: 0 forces content to go under the header (Hero effect) -->
     <q-page-container style="padding-top: 0 !important;">
       <q-page>
         <slot />
       </q-page>
     </q-page-container>
 
-    <!-- ส่วนท้ายของเพจ -->
+    <!-- Footer -->
     <LandingFooter />
 
 

Frontend-Learner/nuxt.config.ts

@@ -33,11 +33,8 @@ export default defineNuxtConfig({
 
   // การตั้งค่า Quasar Framework
   quasar: {
-    iconSet: 'material-icons-outlined',
     extras: {
-      fontIcons: [
+      fontIcons: ["material-icons"],
-        "material-icons", 
-        "material-icons-outlined"] // ใช้ไอคอน Material Icons, material-icons-outlined
     },
     plugins: ["Notify", "Dialog"], // เปิดใช้ Plugin Notify และ Dialog
     config: {

Frontend-Learner/package.json

@@ -19,14 +19,9 @@
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^1.12.1",
-    "@nuxt/test-utils": "^4.0.0",
     "@nuxtjs/i18n": "^10.2.1",
-    "@playwright/test": "^1.58.2",
     "@types/node": "^22.19.8",
-    "@vue/test-utils": "^2.4.6",
     "eslint": "^9.39.2",
-    "jsdom": "^28.1.0",
+    "typescript": "^5.4.5"
-    "typescript": "^5.4.5",
-    "vitest": "^4.0.18"
   }
 }

Frontend-Learner/pages/auth/login.vue

@@ -23,7 +23,7 @@ const isLoading = ref(false)
 const rememberMe = ref(false)
 const showPassword = ref(false)
 
-// ข้อมูลฟอร์มสำหรับเก็บค่าอีเมลและรหัสผ่าน
+// Form data model
 const loginForm = reactive({
   email: '',
   password: ''
@@ -31,7 +31,7 @@ const loginForm = reactive({
 
 type LoginField = keyof typeof loginForm
 
-// การตั้งค่ากฎการตรวจสอบ (Validation Rules)
+// Validation rules definition
 // กำหนดกฎการตรวจสอบข้อมูล (Validation Rules)
 const loginRules = {
   email: {
@@ -108,12 +108,12 @@ const handleLogin = async () => {
   }
 
 
-  // แสดงข้อผิดพลาดตามช่องหรือแสดงข้อผิดพลาดรวม (เพื่อความปลอดภัย)
+  // Show error on specific fields
-  // กรณีเข้าสู่ระบบไม่สำเร็จ
+  // Show generic error for security (or specific if role mismatch)
   if (result.error === 'Email ไม่ถูกต้อง') {
-     errors.value.email = result.error // กรณี Role ไม่ตรงกัน
+     errors.value.email = result.error // Role mismatch case
   } else {
-     // ข้อผิดพลาดแบบเหมาสำหรับปัญหาการเข้าสู่ระบบทั่วไป (เช่น รหัสผิด, ไม่พบผู้ใช้)
+     // Generic login failure (401, 404, etc.)
      const msg = 'กรุณาเช็ค Email หรือ รหัสผ่านใหม่อีกครั้ง'
      errors.value.email = msg
      errors.value.password = msg
@@ -147,7 +147,7 @@ onMounted(() => {
      ========================================== -->
     <div class="w-full max-w-[460px] relative z-10 slide-up">
       
-       <!-- ส่วนหัวโปรไฟล์ / โลโก้ (Header / Logo) -->
+       <!-- Header / Logo -->
        <div class="text-center mb-8">
           <div class="inline-flex items-center justify-center w-14 h-14 rounded-2xl bg-gradient-to-tr from-blue-600 to-indigo-600 text-white shadow-lg shadow-blue-600/20 mb-6">
              <span class="font-black text-2xl">E</span>
@@ -158,10 +158,10 @@ onMounted(() => {
 
       <div class="bg-white rounded-[2rem] p-8 md:p-10 shadow-xl shadow-slate-200/50 border border-slate-100 relative overflow-hidden">
         
-        <!-- ฟอร์มเข้าสู่ระบบ (Login Form) -->
+        <!-- Form -->
         <form @submit.prevent="handleLogin" class="flex flex-col gap-5">
           
-          <!-- ช่องกรอกอีเมล (Email Input) -->
+          <!-- Email Input -->
           <div>
             <label class="block text-sm font-semibold text-slate-700 mb-2 ml-1">อีเมล</label>
             <div class="relative group">
@@ -180,7 +180,7 @@ onMounted(() => {
             <span v-if="errors.email" class="text-xs text-red-500 font-medium ml-1 mt-1 block slide-up-sm">{{ errors.email }}</span>
           </div>
 
-          <!-- ช่องกรอกรหัสผ่าน (Password Input) -->
+          <!-- Password Input -->
           <div>
             <label class="block text-sm font-semibold text-slate-700 mb-2 ml-1">รหัสผ่าน</label>
             <div class="relative group">
@@ -206,7 +206,7 @@ onMounted(() => {
             <span v-if="errors.password" class="text-xs text-red-500 font-medium ml-1 mt-1 block slide-up-sm">{{ errors.password }}</span>
           </div>
 
-          <!-- ตัวเลือกเพิ่มเติม (จดจำฉัน, ลืมรหัสผ่าน) (Options) -->
+          <!-- Options -->
           <div class="flex items-center justify-between mt-1">
              <label class="flex items-center gap-2.5 cursor-pointer group select-none">
                <div class="relative flex items-center">
@@ -227,7 +227,7 @@ onMounted(() => {
              </NuxtLink>
           </div>
 
-          <!-- ปุ่มยืนยันเข้าสู่ระบบ (Submit Button) -->
+          <!-- Submit Button -->
           <button 
             type="submit" 
             :disabled="isLoading"
@@ -237,24 +237,17 @@ onMounted(() => {
             <div v-else class="w-5 h-5 border-2 border-white/30 border-t-white rounded-full animate-spin"></div>
           </button>
 
-          <!-- กล่องแนะนำบัญชีสำหรับทดสอบ (Test Credentials Box) -->
-          <div class="mt-4 p-5 bg-blue-50/50 border border-blue-100 rounded-2xl flex flex-col items-center gap-2 animate-fade-in">
-             <div class="text-[11px] font-black uppercase tracking-[0.2em] text-blue-600 mb-1">บัญชีสำหรับทดสอบ (Test Account)</div>
-             <div class="flex flex-col items-center gap-1">
-                <div class="text-base font-black text-slate-900 select-all cursor-copy hover:text-blue-600 transition-colors">
-                   studentedtest@example.com
-                </div>
-                <div class="flex items-center gap-2">
-                   <span class="text-[11px] font-black uppercase tracking-wider text-slate-600">Password:</span>
-                   <span class="text-base font-black select-all cursor-copy hover:text-blue-600 transition-colors text-slate-900">admin123</span>
-                </div>
-             </div>
-          </div>
-
         </form>
 
-        <!-- ลิงก์สำหรับสมัครสมาชิกใหม่ (Register Link) -->
+        <!-- Divider -->
-        <div class="text-center mt-8">
+        <div class="my-8 flex items-center gap-4">
+           <div class="h-px bg-slate-200 flex-1"></div>
+           <span class="text-slate-400 text-xs font-medium uppercase tracking-wider">หรือ</span>
+           <div class="h-px bg-slate-200 flex-1"></div>
+        </div>
+
+        <!-- Register Link -->
+        <div class="text-center">
             <p class="text-slate-600 text-sm">
                ยังไม่มีบัญชีสมาชิก? 
                <NuxtLink to="/auth/register" class="font-bold text-blue-600 hover:text-blue-700 transition-colors ml-1">
@@ -265,7 +258,7 @@ onMounted(() => {
 
       </div>
 
-      <!-- ลิงก์ย้อนกลับ (Back Link) -->
+      <!-- Back Link -->
        <div class="mt-8 text-center text-slate-500">
            <NuxtLink to="/" class="inline-flex items-center gap-2 text-sm font-medium hover:text-slate-800 transition-colors group px-4 py-2 rounded-lg hover:bg-white/50">
              <span class="group-hover:-translate-x-1 transition-transform">←</span> กลับไปหน้าแรก
@@ -276,7 +269,7 @@ onMounted(() => {
 </template>
 
 <style scoped>
-/* เอฟเฟกต์การเคลื่อนไหว (Animations) */
+/* Animations */
 @keyframes pulse-slow {
   0%, 100% { opacity: 0.3; transform: scale(1); }
   50% { opacity: 0.5; transform: scale(1.15); }

Frontend-Learner/pages/browse/discovery.vue

@@ -1,7 +1,9 @@
 <script setup lang="ts">
 /**
  * @file discovery.vue
- * @description Course Discovery / Catalog Page matching Figma Desktop Layout.
+ * @description Course Discovery / Catalog Page.
+ * Allows users to browse, filter, and view details of available courses.
+ * Includes a toggleable detailed view for course previews.
  */
 
 definePageMeta({
@@ -13,19 +15,11 @@ useHead({
   title: "รายการคอร์ส - e-Learning",
 });
 
-const { t, locale } = useI18n();
+// ==========================================
-const { currentUser } = useAuth();
+// 1. State Management
-const $q = useQuasar();
-const { fetchCategories } = useCategory();
-const { fetchCourses, fetchCourseById, enrollCourse, getLocalizedText } = useCourse();
-
 const showDetail = ref(false);
 const searchQuery = ref("");
-const activeCategory = ref<number | 'all'>('all');
+const selectedCategoryIds = ref<number[]>([]);
-const viewMode = ref<'grid' | 'list'>('grid');
-const sortBy = ref('ยอดนิยม');
-const sortOptions = ['ยอดนิยม', 'ล่าสุด', 'ราคาต่ำ-สูงสุด', 'ราคาสูง-ต่ำสุด'];
-
 const categories = ref<any[]>([]);
 const courses = ref<any[]>([]);
 const selectedCourse = ref<any>(null);
@@ -34,43 +28,47 @@ const isLoading = ref(false);
 const isLoadingDetail = ref(false);
 const isEnrolling = ref(false);
 
+// Pagination State
 const currentPage = ref(1);
 const totalPages = ref(1);
 const itemsPerPage = 12;
 
-const getCategoryIcon = (name: any) => {
+const { t, locale } = useI18n();
-   const text = getLocalizedText(name) || ''
+const { currentUser } = useAuth();
-   if (text.includes('เว็บ') || text.includes('Web') || text.includes('โปรแกรม') || text.includes('Program') || text.includes('โค้ด')) return 'code'
+const $q = useQuasar();
-   if (text.includes('ออกแบบ') || text.includes('Design') || text.includes('UI')) return 'palette'
+const { fetchCategories } = useCategory();
-   if (text.includes('ธุรกิจ') || text.includes('Business') || text.includes('การตลาด') || text.includes('Market')) return 'trending_up'
+const { fetchCourses, fetchCourseById, enrollCourse, getLocalizedText } =
-   if (text.includes('ข้อมูล') || text.includes('Data') || text.includes('วิเคราะ') || text.includes('Sci')) return 'storage'
+  useCourse();
-   return 'category'
+
+// 2. Computed Properties
+const sortOption = ref(t("discovery.sortRecent"));
+const sortOptions = computed(() => [t("discovery.sortRecent")]);
+
+const filteredCourses = computed(() => {
+  let result = courses.value;
+
+  // If more than 1 category is selected, we still do client-side filtering
+  // because the API currently only supports one category_id at a time.
+  if (selectedCategoryIds.value.length > 1) {
+    result = result.filter((c) =>
+      selectedCategoryIds.value.includes(c.category_id),
+    );
   }
 
-const formatPrice = (course: any) => {
+  if (searchQuery.value) {
-    if (course.is_free) return 'ฟรี';
+    const query = searchQuery.value.toLowerCase();
-    if (!course.price) return 'ฟรี';
+    result = result.filter((c) => {
-    return `฿${parseFloat(course.price).toLocaleString()}`;
+      const title = getLocalizedText(c.title).toLowerCase();
-};
+      const desc = getLocalizedText(c.description).toLowerCase();
-
+      return title.includes(query) || (desc && desc.includes(query));
-const getInstructorName = (course: any) => {
+    });
-    let user = null;
-    if (course.instructors && course.instructors.length > 0) {
-        const primary = course.instructors.find((i: any) => i.is_primary);
-        user = primary ? primary.user : course.instructors[0].user;
-    } else {
-        user = course.creator || course.instructor;
   }
+  return result;
+});
 
-    if (user?.profile?.first_name) {
+// 3. Helper Functions
-        return `${user.profile.first_name} ${user.profile.last_name || ''}`.trim();
-    }
-    if (user?.first_name) {
-        return `${user.first_name} ${user.last_name || ''}`.trim();
-    }
-    return user?.username || 'ผู้สอน';
-};
 
+// 4. API Actions
 const loadCategories = async () => {
   const res = await fetchCategories();
   if (res.success) categories.value = res.data || [];
@@ -78,7 +76,12 @@ const loadCategories = async () => {
 
 const loadCourses = async (page = 1) => {
   isLoading.value = true;
-  const categoryId = activeCategory.value === 'all' ? undefined : activeCategory.value as number;
+
+  // Use server-side filtering if exactly one category is selected
+  const categoryId =
+    selectedCategoryIds.value.length === 1
+      ? selectedCategoryIds.value[0]
+      : undefined;
 
   const res = await fetchCourses({
     category_id: categoryId,
@@ -89,17 +92,7 @@ const loadCourses = async (page = 1) => {
   });
 
   if (res.success) {
-    courses.value = (res.data || []).map(c => {
+    courses.value = res.data || [];
-       const cat = categories.value.find(cat => cat.id === c.category_id);
-       return {
-          ...c,
-          category_name: cat ? getLocalizedText(cat.name) : '',
-          instructor_name: getInstructorName(c),
-          formatted_price: formatPrice(c),
-          rating: c.rating || '4.9',
-          reviews_count: c.total_lessons ? c.total_lessons * 123 : Math.floor(Math.random() * 2000) + 100
-       }
-    });
     totalPages.value = res.totalPages || 1;
     currentPage.value = res.page || 1;
   }
@@ -133,175 +126,231 @@ const handleEnroll = async (id: number) => {
   isEnrolling.value = false;
 };
 
+// Watch for category selection changes to reload courses
 watch(
-  activeCategory,
+  selectedCategoryIds,
   () => {
     currentPage.value = 1;
     loadCourses(1);
-  }
+  },
+  { deep: true },
 );
 
-onMounted(async () => {
+const toggleCategory = (id: number) => {
-  await loadCategories();
+  const index = selectedCategoryIds.value.indexOf(id);
-  
+  if (index === -1) {
-  // Check if category_id or course_id is in query
+    selectedCategoryIds.value.push(id);
-  const route = useRoute();
+  } else {
-  if (route.query.category_id) {
+    selectedCategoryIds.value.splice(index, 1);
-    activeCategory.value = Number(route.query.category_id);
   }
+};
 
-  await loadCourses(1);
+onMounted(() => {
-
+  loadCategories();
-  if (route.query.course_id) {
+  loadCourses();
-    selectCourse(Number(route.query.course_id));
-  }
 });
 </script>
 
 <template>
-  <div class="bg-[#F8F9FA] dark:bg-[#020617] min-h-screen p-4 md:p-8 transition-colors duration-300">
+  <div class="page-container">
-    <div class="max-w-[1240px] mx-auto">
+    <!-- CATALOG VIEW: Browse courses -->
-        <!-- ส่วนของการค้นหาคอร์ส (Catalog View) -->
+    <div v-if="!showDetail">
-        <div v-if="!showDetail" class="bg-white dark:bg-slate-900 rounded-[2rem] p-6 md:p-8 shadow-[0_2px_15px_rgb(0,0,0,0.02)] border border-slate-100 dark:border-slate-800 min-h-[500px] mb-12">
+      <!-- Top Header Area -->
+      <!-- New Enhanced Search Section (Image 1 Style) -->
+      <div class="bg-blue-50/50 dark:bg-blue-900/10 rounded-[2.5rem] p-8 md:p-10 mb-8 border border-blue-100/50 dark:border-blue-500/10 transition-colors duration-300">
+        <div class="flex items-center gap-4 mb-2">
+          <span class="w-2 h-8 bg-blue-600 rounded-full shadow-lg shadow-blue-500/30"></span>
+          <h1 class="text-2xl md:text-3xl font-black text-slate-900 dark:text-white">
+            {{ $t("discovery.title") }}
+          </h1>
+        </div>
+        <p class="text-slate-500 dark:text-slate-400 font-medium mb-8">
+          {{ $t("discovery.subtitle") }}
+        </p>
         
-            <!-- ส่วนหัวและการค้นหา -->
+        <div class="flex flex-col md:flex-row gap-4">
-            <div class="flex flex-col md:flex-row md:items-center justify-between gap-6 mb-8">
+          <!-- Search Input -->
-               <h2 class="text-[1.35rem] font-bold text-slate-900 dark:text-white tracking-tight">คอร์สเรียนทั้งหมด</h2>
+          <div class="relative flex-1 group">
-               <div class="flex flex-wrap sm:flex-nowrap items-center gap-3 w-full md:w-auto">
+            <div class="absolute left-5 top-1/2 -translate-y-1/2 text-slate-400 group-focus-within:text-blue-600 transition-colors">
-                  <div class="relative w-full sm:w-[260px] flex-1">
+              <q-icon name="search" size="24px" />
-                     <q-icon name="search" size="18px" class="absolute left-4 top-1/2 -translate-y-1/2 text-slate-400 group-focus-within:text-[#3B6BE8]" />
-                     <input v-model="searchQuery" @keyup.enter="loadCourses(1)" class="w-full bg-slate-100 dark:bg-slate-800 border-none rounded-xl py-2.5 pl-11 pr-4 text-sm font-medium text-slate-700 dark:text-slate-200 placeholder:text-slate-400 focus:ring-2 focus:ring-blue-500/20 outline-none transition-all shadow-sm" placeholder="ค้นหาคอร์ส..." />
             </div>
-                  <div class="flex items-center gap-2 shrink-0">
+            <input 
-                     <button @click="viewMode = 'grid'" :class="viewMode === 'grid' ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-[#3B6BE8]' : 'bg-white border-slate-200 dark:bg-slate-800 dark:border-slate-700 text-slate-400 hover:bg-slate-50'" class="w-[42px] h-[42px] flex items-center justify-center rounded-xl border transition-colors outline-none"><q-icon name="grid_view" size="20px" /></button>
+              v-model="searchQuery"
-                     <button @click="viewMode = 'list'" :class="viewMode === 'list' ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-[#3B6BE8]' : 'bg-white border-slate-200 dark:bg-slate-800 dark:border-slate-700 text-slate-400 hover:bg-slate-50'" class="w-[42px] h-[42px] flex items-center justify-center rounded-xl border transition-colors outline-none"><q-icon name="view_list" size="20px" /></button>
+              type="text" 
+              :placeholder="$t('discovery.searchPlaceholder') || 'ค้นหาคอร์สที่น่าสนใจที่นี่...'"
+              class="w-full pl-14 pr-6 py-3.5 bg-white dark:bg-slate-800 border-2 border-transparent rounded-2xl text-slate-900 dark:text-white placeholder-slate-400 focus:outline-none focus:border-blue-500/20 focus:ring-4 focus:ring-blue-500/5 transition-all text-base font-medium shadow-sm"
+              @keyup.enter="loadCourses(1)"
+            />
           </div>
+          
+          <!-- Search Button -->
+          <q-btn 
+            unelevated
+            color="primary"
+            class="px-8 h-[52px] rounded-2xl font-black shadow-lg shadow-blue-600/20 hover:scale-[1.02] transition-transform"
+            no-caps
+            @click="loadCourses(1)"
+          >
+            <div class="flex items-center gap-2">
+              <q-icon name="search" size="20px" />
+              <span class="text-base">ค้นหา</span>
+            </div>
+          </q-btn>
         </div>
       </div>
 
-            <!-- Filters Category -->
+      <div class="flex items-center justify-between mb-4 px-2">
-            <div class="flex flex-col xl:flex-row xl:items-center justify-between gap-4 mb-10 w-full relative">
+        <div class="text-slate-500 dark:text-slate-400 text-sm font-bold uppercase tracking-wider">
-                <!-- Figma Style: Separate pill buttons -->
+          {{ $t("discovery.foundTotal") }} <span class="text-blue-600">{{ filteredCourses.length }}</span> {{ $t("discovery.items") }}
-                <div class="flex flex-wrap items-center gap-3 w-full xl:w-auto">
-                   <button 
-                     @click="activeCategory = 'all'"
-                     :class="activeCategory === 'all' ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-transparent font-bold' : 'bg-white dark:bg-transparent border-slate-200 dark:border-slate-700 text-slate-800 dark:text-slate-300 hover:border-slate-300 font-medium'"
-                     class="px-5 py-2.5 rounded-full border text-[13px] sm:text-[14px] flex items-center justify-center gap-2 transition-all outline-none">
-                     <q-icon name="check_circle_outline" size="18px" :class="activeCategory === 'all' ? 'text-[#3B6BE8]' : 'text-slate-400'"/> ทั้งหมด
-                   </button>
-                   
-                   <button 
-                     v-for="cat in categories" :key="cat.id"
-                     @click="activeCategory = cat.id"
-                     :class="activeCategory === cat.id ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-transparent font-bold' : 'bg-white dark:bg-transparent border-slate-200 dark:border-slate-700 text-slate-800 dark:text-slate-300 hover:border-slate-300 font-medium'"
-                     class="px-5 py-2.5 rounded-full border text-[13px] sm:text-[14px] flex items-center justify-center gap-2 transition-all outline-none bg-transparent">
-                     <q-icon :name="getCategoryIcon(cat.name)" size="18px" :class="activeCategory === cat.id ? 'text-[#3B6BE8]' : 'text-slate-600 dark:text-slate-400'"/>
-                     {{ getLocalizedText(cat.name) }}
-                   </button>
-                </div>
-                
-
-            </div>
-
-            <!-- Loader -->
-            <div v-if="isLoading" class="flex justify-center py-24">
-               <q-spinner size="3rem" color="primary" />
-            </div>
-
-            <div v-else-if="courses.length > 0">
-               <!-- GRID VIEW -->
-               <div v-if="viewMode === 'grid'" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6">
-                  <div v-for="course in courses" :key="course.id" class="flex flex-col rounded-[1.5rem] bg-white dark:bg-slate-900 border border-slate-100 dark:border-slate-800 overflow-hidden shadow-[0_2px_10px_rgb(0,0,0,0.03)] hover:shadow-[0_8px_30px_rgb(0,0,0,0.08)] transition-all duration-300 group cursor-pointer" @click="selectCourse(course.id)">
-                     <!-- Thumbnail -->
-                     <div class="relative w-full aspect-[16/10] bg-slate-100 dark:bg-slate-800 overflow-hidden">
-                        <img :src="course.thumbnail_url" class="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500" />
-                        <div v-if="course.category_name" class="absolute top-3 left-3 bg-white/95 dark:bg-slate-900/95 backdrop-blur-md text-[#3B6BE8] dark:text-blue-400 font-bold text-[10px] px-3.5 py-1 rounded-full shadow-sm" style="border-radius: 9999px; padding: 4px 12px;">
-                           {{ course.category_name }}
         </div>
       </div>
 
-                     <!-- Body -->
+      <!-- Unified Filter Section: Categories -->
-                     <div class="p-5 flex flex-col flex-1">
+        <div
-                        <h3 class="font-bold text-slate-900 dark:text-white text-[15px] leading-snug line-clamp-2 mb-2">{{ getLocalizedText(course.title) }}</h3>
+          class="bg-white dark:bg-slate-900/50 p-2 rounded-2xl border border-slate-100 dark:border-white/5 inline-flex flex-wrap items-center gap-1.5 shadow-sm"
-                        
+        >
-
+          <q-btn
-                        
+            flat
-                        <div class="mt-auto flex items-center justify-between">
+            rounded
-                            <div class="font-[900] text-[18px]" :class="course.is_free ? 'text-green-500' : 'text-[#2563EB] dark:text-blue-400'">
+            dense
-                                {{ course.formatted_price }}
+            class="px-5 py-2 font-bold transition-all text-[11px] uppercase tracking-wider"
-                            </div>
+            :class="
-                            <!-- Eye icon circle button -->
+              selectedCategoryIds.length === 0
-                            <button class="w-[38px] h-[38px] rounded-full bg-slate-50 dark:bg-slate-800 text-slate-400 dark:text-slate-500 flex items-center justify-center hover:bg-blue-50 hover:text-blue-600 dark:hover:bg-slate-700 border border-slate-100 dark:border-slate-700 transition-colors shadow-sm outline-none">
+                ? 'bg-blue-600 text-white shadow-md shadow-blue-600/20'
-                                <q-icon name="visibility" size="18px" />
+                : 'text-slate-600 dark:text-slate-400 hover:bg-slate-50 dark:hover:bg-slate-800'
-                            </button>
+            "
-                        </div>
+            @click="selectedCategoryIds = []"
-                     </div>
+            :label="$t('discovery.showAll')"
-                  </div>
+          />
+          <q-btn
+            v-for="cat in categories"
+            :key="cat.id"
+            flat
+            rounded
+            dense
+            class="px-5 py-2 font-bold transition-all text-[11px] uppercase tracking-wider"
+            :class="
+              selectedCategoryIds.includes(cat.id)
+                ? 'bg-blue-600 text-white shadow-md shadow-blue-600/20'
+                : 'text-slate-600 dark:text-slate-400 hover:bg-slate-50 dark:hover:bg-slate-800'
+            "
+            @click="toggleCategory(cat.id)"
+            :label="getLocalizedText(cat.name)"
+          />
         </div>
 
-               <!-- LIST VIEW -->
+      <!-- Main Layout: Grid Only -->
-               <div v-else class="flex flex-col gap-5">
+      <div class="w-full">
-                  <div v-for="course in courses" :key="course.id" class="flex flex-col sm:flex-row rounded-[1.5rem] bg-white dark:bg-slate-900 border border-slate-100 dark:border-slate-800 p-3 sm:p-4 gap-4 sm:gap-6 shadow-sm hover:shadow-[0_8px_30px_rgb(0,0,0,0.06)] transition-all duration-300 group cursor-pointer" @click="selectCourse(course.id)">
+        <div v-if="filteredCourses.length > 0" class="flex flex-col gap-12">
-                     <div class="relative w-full sm:w-[260px] aspect-[16/10] sm:aspect-auto sm:h-[160px] rounded-[1rem] bg-slate-100 dark:bg-slate-800 overflow-hidden shrink-0">
+          <div
-                        <img :src="course.thumbnail_url" class="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500" />
+            class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-8"
-                        <div v-if="course.category_name" class="absolute top-3 left-3 bg-white/95 dark:bg-slate-900/95 backdrop-blur-md text-[#3B6BE8] dark:text-blue-400 font-bold text-[10px] px-3.5 py-1.5 rounded-full shadow-sm" style="border-radius: 9999px; padding: 4px 12px;">
+          >
-                           {{ course.category_name }}
+            <CourseCard
-                        </div>
+              v-for="course in filteredCourses"
-                     </div>
+              :key="course.id"
-                     <div class="flex flex-col flex-1 py-1">
+              v-bind="{ ...course, image: course.thumbnail_url }"
-                        <div class="flex-1">
+              show-view-details
-                            <h3 class="font-bold text-slate-900 dark:text-white text-[16px] md:text-[18px] leading-snug line-clamp-2 md:line-clamp-1 mb-2">{{ getLocalizedText(course.title) }}</h3>
+              @view-details="selectCourse(course.id)"
-
+            />
-                        </div>
-                        <div class="mt-4 sm:mt-auto flex items-center justify-between">
-                            <div class="font-[900] text-[20px]" :class="course.is_free ? 'text-green-500' : 'text-[#2563EB] dark:text-blue-400'">
-                                {{ course.formatted_price }}
-                            </div>
-                            <button class="px-6 py-2 rounded-full bg-slate-50 text-slate-600 dark:bg-slate-800 dark:text-slate-300 font-bold text-[13px] flex items-center gap-2 hover:bg-blue-50 border border-slate-100 dark:border-slate-700 hover:text-blue-600 transition-colors">
-                                <q-icon name="visibility" size="16px" /> ดูรายละเอียด
-                            </button>
-                        </div>
-                     </div>
-                  </div>
           </div>
 
-               <!-- Pagination -->
+          <!-- Pagination Controls -->
-               <div v-if="totalPages > 1" class="flex justify-center pt-8 pb-4">
+          <div v-if="totalPages > 1" class="flex justify-center pb-10">
-                  <q-pagination v-model="currentPage" :max="totalPages" :max-pages="6" boundary-numbers direction-links color="primary" flat active-design="unelevated" active-color="primary" @update:model-value="loadCourses"/>
+            <q-pagination
+              v-model="currentPage"
+              :max="totalPages"
+              :max-pages="6"
+              boundary-numbers
+              direction-links
+              color="primary"
+              flat
+              active-design="unelevated"
+              active-color="primary"
+              @update:model-value="loadCourses"
+            />
           </div>
         </div>
 
         <!-- Empty State -->
-            <div v-else class="flex flex-col items-center justify-center py-20 bg-white dark:bg-slate-900/40 rounded-3xl border border-dashed border-slate-200 dark:border-slate-800">
+        <div
-               <q-icon name="search_off" size="64px" class="text-slate-300 dark:text-slate-600 mb-4" />
+          v-else
-               <h3 class="text-xl font-bold text-slate-900 dark:text-white mb-2">{{ $t("discovery.emptyTitle") }}</h3>
+          class="flex flex-col items-center justify-center py-20 bg-white dark:bg-slate-800/50 rounded-3xl border-2 border-dashed border-slate-200 dark:border-slate-700 shadow-sm"
-               <p class="text-slate-500 dark:text-slate-400 text-center max-w-md">{{ $t("discovery.emptyDesc") }}</p>
+        >
-               <button class="mt-6 font-bold text-blue-600 hover:text-blue-700 transition-colors" @click="searchQuery = ''; activeCategory = 'all';">
+          <q-icon
+            name="search_off"
+            size="64px"
+            class="text-slate-300 dark:text-slate-600 mb-4"
+          />
+          <h3 class="text-xl font-bold text-slate-900 dark:text-white mb-2">
+            {{ $t("discovery.emptyTitle") }}
+          </h3>
+          <p class="text-slate-500 dark:text-slate-400 text-center max-w-md">
+            {{ $t("discovery.emptyDesc") }}
+          </p>
+          <button
+            class="mt-6 font-bold text-blue-600 hover:text-blue-700 dark:hover:text-blue-400 transition-colors"
+            @click="
+              searchQuery = '';
+              selectedCategoryIds = [];
+            "
+          >
             {{ $t("discovery.showAll") }}
           </button>
         </div>
       </div>
+    </div>
 
     <!-- COURSE DETAIL VIEW: Detailed information about a specific course -->
     <div v-else>
-          <button @click="showDetail = false" class="inline-flex items-center gap-2 text-slate-600 dark:text-white hover:text-blue-600 dark:hover:text-blue-300 mb-6 transition-all font-black text-lg md:text-xl group">
+      <button
-            <q-icon name="arrow_back" size="24px" class="transition-transform group-hover:-translate-x-1" />
+        @click="showDetail = false"
+        class="inline-flex items-center gap-2 text-slate-600 dark:text-white hover:text-blue-600 dark:hover:text-blue-300 mb-6 transition-all font-black text-lg md:text-xl group"
+      >
+        <q-icon
+          name="arrow_back"
+          size="24px"
+          class="transition-transform group-hover:-translate-x-1"
+        />
         {{ $t("discovery.backToCatalog") }}
       </button>
-          <div v-if="isLoadingDetail" class="flex justify-center py-20"><q-spinner size="3rem" color="primary" /></div>
+
-          <CourseDetailView v-else-if="selectedCourse" :course="selectedCourse" :user="currentUser" @back="showDetail = false" @enroll="handleEnroll"/>
+      <div v-if="isLoadingDetail" class="flex justify-center py-20">
+        <q-spinner size="3rem" color="primary" />
       </div>
+
+      <CourseDetailView
+        v-else-if="selectedCourse"
+        :course="selectedCourse"
+        :user="currentUser"
+        @back="showDetail = false"
+        @enroll="handleEnroll"
+      />
     </div>
   </div>
 </template>
 
 <style scoped>
-/* Disable default scrollbar for filter container */
+/* Standard overrides for Quasar inputs to match Tailwind theme */
-.scrollbar-hide::-webkit-scrollbar {
+.search-input :deep(.q-field__control) {
-    display: none;
+  border-radius: 9999px; /* Full rounded pill */
+  background-color: white !important;
+  transition: all 0.3s ease;
 }
-.scrollbar-hide {
+
-    -ms-overflow-style: none;
+.dark .search-input :deep(.q-field__control) {
-    scrollbar-width: none;
+  background-color: #1e293b !important; /* slate-800: Inner card depth */
+  border-color: rgba(255, 255, 255, 0.1) !important;
+}
+
+.search-input :deep(.q-field__native) {
+  color: #0f172a !important; /* slate-900: Dark text for light mode */
+}
+
+.dark .search-input :deep(.q-field__native) {
+  color: white !important;
+}
+
+.search-input :deep(.q-field__shadow) {
+  box-shadow: none !important;
 }
 </style>

Frontend-Learner/pages/browse/index.vue

@@ -1,22 +1,26 @@
 <script setup lang="ts">
 /**
- * @file index.vue
+ * @file courses.vue
- * @description หน้าแสดงคอร์สเรียนทั้งหมดในรูปแบบแคตตาล็อกสาธารณะ
+ * @description Page displaying all available courses in a public catalog format.
- * ดีไซน์ปรับให้ทันสมัยเพื่อดึงดูดผู้ใช้งานใหม่
+ * Matches the premium dark theme of the landing page.
  */
 
+// Define page metadata using the landing layout (dark theme default)
 definePageMeta({
   layout: 'landing'
 })
 
+// Set the HTML head title for SEO
 useHead({
   title: 'คอร์สทั้งหมด - E-Learning System'
 })
 
+// Reactive state for the search input
 const searchQuery = ref('')
 const { fetchCourses } = useCourse()
 const { fetchCategories, categories } = useCategory()
 
+// Helper to handle localized text
 const getLocalizedText = (text: string | { th: string; en: string } | undefined) => {
   if (!text) return ''
   if (typeof text === 'string') return text
@@ -26,6 +30,7 @@ const getLocalizedText = (text: string | { th: string; en: string } | undefined)
 const route = useRoute()
 const router = useRouter()
 
+// State for selected category
 const selectedCategory = ref((route.query.category as string) || 'all')
 
 const selectCategory = (slug: string) => {
@@ -36,234 +41,357 @@ const selectCategory = (slug: string) => {
   }
 }
 
+// Watch route query to sync state
 watch(() => route.query.category, (newCategory) => {
   selectedCategory.value = (newCategory as string) || 'all'
 })
 
-const getCategoryIcon = (name: any) => {
+// Specific labels mapping as requested
-   const text = getLocalizedText(name) || ''
+const categoryLabels: Record<string, string> = {
-   if (text.includes('เว็บ') || text.includes('Web') || text.includes('โปรแกรม') || text.includes('Program') || text.includes('โค้ด')) return 'code'
+  all: "ทั้งหมด",
-   if (text.includes('ออกแบบ') || text.includes('Design') || text.includes('UI')) return 'palette'
+  programming: "การเขียนโปรแกรม",
-   if (text.includes('ธุรกิจ') || text.includes('Business') || text.includes('การตลาด') || text.includes('Market')) return 'trending_up'
+  design: "การออกแบบ",
-   if (text.includes('ข้อมูล') || text.includes('Data') || text.includes('วิเคราะ') || text.includes('Sci')) return 'storage'
+  business: "ธุรกิจ"
-   return 'category'
 }
 
+const getCategoryLabel = (category: any) => {
+  if (categoryLabels[category.slug]) {
+    return categoryLabels[category.slug]
+  }
+  return getLocalizedText(category.name)
+}
+
+// Fetch categories on mount
 await useAsyncData('categories-list', () => fetchCategories())
 
-const { data: coursesResponse, pending: isLoading, error, refresh } = await useAsyncData(
+// Fetch courses from API (reactive to selectedCategory)
+const { data: coursesResponse, error, refresh } = await useAsyncData(
   'browse-courses-list', 
   () => {
     const params: any = {}
+    console.log('Fetching courses. Selected Category:', selectedCategory.value)
+    
     if (selectedCategory.value !== 'all') {
       const category = categories.value.find(c => c.slug === selectedCategory.value)
+      console.log('Found Category:', category)
+      
       if (category) {
         params.category_id = category.id
       }
     }
+    
+    console.log('Params being sent to fetchCourses:', params)
     return fetchCourses(params)
   }
 )
 
-watch(selectedCategory, () => { refresh() })
+// Watch for category changes and refresh data
-
+watch(selectedCategory, (newVal) => {
-const formatPrice = (course: any) => {
+    console.log('Selected Category Changed to:', newVal)
-    if (course.is_free) return 'ฟรี';
+    refresh()
-    if (!course.price) return 'ฟรี';
-    return `฿${parseFloat(course.price).toLocaleString()}`;
-}
-
-const getInstructorName = (course: any) => {
-    let user = null;
-    if (course.instructors && course.instructors.length > 0) {
-        const primary = course.instructors.find((i: any) => i.is_primary);
-        user = primary ? primary.user : course.instructors[0].user;
-    } else {
-        user = course.creator || course.instructor;
-    }
-    
-    if (user?.profile?.first_name) {
-        return `${user.profile.first_name} ${user.profile.last_name || ''}`.trim();
-    }
-    if (user?.first_name) {
-        return `${user.first_name} ${user.last_name || ''}`.trim();
-    }
-    return user?.username || 'ผู้สอน';
-}
-
-const courses = computed(() => {
-  if (coursesResponse.value?.success && coursesResponse.value.data) {
-    return coursesResponse.value.data.map((c: any) => {
-       const cat = categories.value.find((cat: any) => cat.id === c.category_id);
-       return {
-          ...c,
-          category_name: cat ? getLocalizedText(cat.name) : '',
-          instructor_name: getInstructorName(c),
-          formatted_price: formatPrice(c),
-          rating: c.rating || '4.9',
-          reviews_count: c.total_lessons ? c.total_lessons * 123 : Math.floor(Math.random() * 2000) + 100
-       }
 })
+
+// Ref for the scroll container
+const categoryScroll = ref<HTMLElement | null>(null)
+
+// Computed property for courses list from API response
+const courses = computed(() => {
+  if (coursesResponse.value?.success) {
+    return coursesResponse.value.data
   }
   return []
 })
 
+/**
+ * @computed filteredCourses
+ * @description Filters the courses list based on the search query.
+ * Checks both the course title and description (case-insensitive).
+ */
 const filteredCourses = computed(() => {
   const list = courses.value || []
   if (!searchQuery.value) return list
   
   const query = searchQuery.value.toLowerCase()
-  return list.filter((c: any) => {
+  return list.filter(c => {
     const title = getLocalizedText(c.title).toLowerCase()
     const desc = getLocalizedText(c.description).toLowerCase()
     return title.includes(query) || desc.includes(query)
   })
 })
-
-const viewMode = ref<'grid' | 'list'>('grid')
 </script>
 
 <template>
-  <div class="bg-[#F8F9FA] dark:bg-[#020617] min-h-screen pt-32 pb-20 px-4 md:px-8 transition-colors duration-300">
+  <!-- Main Container: Dark Theme Base -->
-    <div class="max-w-[1240px] mx-auto">
+  <div class="relative min-h-screen text-slate-600  bg-slate-50  transition-colors">
-        <!-- มุมมองแคตตาล็อกแสดงคอร์ส (Catalog View) -->
-        <div class="bg-white dark:bg-slate-900 rounded-[2rem] p-6 md:p-8 shadow-[0_2px_15px_rgb(0,0,0,0.02)] border border-slate-100 dark:border-slate-800 min-h-[500px] mb-12">
      
-            <!-- ส่วนหัวและการค้นหา -->
+     <!-- ==========================================
-            <div class="flex flex-col md:flex-row md:items-center justify-between gap-6 mb-8">
+          BACKGROUND EFFECTS
-               <h2 class="text-[1.35rem] font-bold text-slate-900 dark:text-white tracking-tight">คอร์สเรียนทั้งหมด</h2>
+          Ambient glows matching the index.vue theme
-               <div class="flex flex-wrap sm:flex-nowrap items-center gap-3 w-full md:w-auto">
+     ========================================== -->
-                  <div class="relative w-full sm:w-[260px] flex-1">
+     <div class="fixed inset-0 overflow-hidden pointer-events-none -z-10">
-                     <q-icon name="search" size="18px" class="absolute left-4 top-1/2 -translate-y-1/2 text-slate-400 group-focus-within:text-[#3B6BE8]" />
+      <div class="absolute top-[-20%] right-[-10%] w-[60%] h-[60%] rounded-full bg-blue-600/10 blur-[140px] animate-pulse-slow"/>
-                     <input v-model="searchQuery" class="w-full bg-slate-100 dark:bg-slate-800 border-none rounded-xl py-2.5 pl-11 pr-4 text-sm font-medium text-slate-700 dark:text-slate-200 placeholder:text-slate-400 focus:ring-2 focus:ring-blue-500/20 outline-none transition-all shadow-sm" placeholder="ค้นหาคอร์ส..." />
+      <div class="absolute bottom-[-20%] left-[-10%] w-[60%] h-[60%] rounded-full bg-indigo-600/10 blur-[140px] animate-pulse-slow" style="animation-delay: 3s;"/>
     </div>
-                  <div class="flex items-center gap-2 shrink-0">
+
-                     <button @click="viewMode = 'grid'" :class="viewMode === 'grid' ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-[#3B6BE8]' : 'bg-white border-slate-200 dark:bg-slate-800 dark:border-slate-700 text-slate-400 hover:bg-slate-50'" class="w-[42px] h-[42px] flex items-center justify-center rounded-xl border transition-colors outline-none"><q-icon name="grid_view" size="20px" /></button>
+    <!-- ==========================================
-                     <button @click="viewMode = 'list'" :class="viewMode === 'list' ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-[#3B6BE8]' : 'bg-white border-slate-200 dark:bg-slate-800 dark:border-slate-700 text-slate-400 hover:bg-slate-50'" class="w-[42px] h-[42px] flex items-center justify-center rounded-xl border transition-colors outline-none"><q-icon name="view_list" size="20px" /></button>
+          HERO SECTION
+          Title and subtitle area
+     ========================================== -->
+    <section class="relative pt-32 pb-20 px-6 overflow-hidden">
+      <div class="container mx-auto max-w-6xl text-center relative z-10">
+        <!-- Tagline Badge -->
+
+        <!-- Main Title -->
+        <h1 class="text-4xl md:text-6xl font-black text-slate-900 mb-6 tracking-tight py-2 slide-up leading-[1.2] overflow-visible" style="animation-delay: 0.1s;">
+          คอร์สเรียน<span class="text-gradient-cyan">ทั้งหมด</span>
+        </h1>
+        <!-- Subtitle -->
+        <p class="text-slate-400 text-xl max-w-2xl mx-auto leading-relaxed slide-up" style="animation-delay: 0.2s;">
+          เริ่มต้นอัปสกิลของคุณวันนี้ด้วยหลักสูตรคุณภาพที่ออกแบบโดยผู้เชี่ยวชาญในอุตสาหกรรม
+        </p>
       </div>
+    </section>
+
+    <!-- ==========================================
+          SEARCH & GRID SECTION
+     ========================================== -->
+    <!-- ==========================================
+          SEARCH & GRID SECTION
+     ========================================== -->
+    <section class="container mx-auto max-w-[1440px] px-6 pb-20">
+       
+       <!-- Content Frame Container -->
+       <div class="glass-premium rounded-[3rem] p-8 md:p-12 shadow-xl shadow-blue-900/5">
+        
+          <!-- New Enhanced Search Section (Image 2 Style) -->
+          <div class="bg-blue-50/50 rounded-[2.5rem] p-8 md:p-10 mb-6 border border-blue-100/50">
+            <h2 class="text-2xl md:text-3xl font-black text-slate-900 mb-2">คอร์สเรียนทั้งหมด</h2>
+            <p class="text-slate-500 font-medium mb-8">พัฒนาทักษะใหม่ๆ กับผู้เชี่ยวชาญจากทั่วโลก</p>
+            
+            <div class="flex flex-col md:flex-row gap-4">
+              <!-- Search Input -->
+              <div class="relative flex-1 group">
+                <div class="absolute left-5 top-1/2 -translate-y-1/2 text-slate-400 group-focus-within:text-blue-600 transition-colors">
+                  <q-icon name="search" size="24px" />
+                </div>
+                <input 
+                  v-model="searchQuery"
+                  type="text" 
+                  placeholder="ค้นหาชื่อคอร์ส..."
+                  class="w-full pl-14 pr-6 py-4 bg-white border-2 border-transparent rounded-2xl text-slate-900 placeholder-slate-400 focus:outline-none focus:border-blue-500/20 focus:ring-4 focus:ring-blue-500/5 transition-all text-lg font-medium shadow-sm"
+                />
+              </div>
+              
+              <!-- Search Button -->
+              <q-btn 
+                unelevated
+                color="primary"
+                class="px-4 h-16 rounded-2xl font-black shadow-lg shadow-blue-600/20 hover:scale-[1.02] transition-transform"
+                no-caps
+              >
+                <div class="flex items-center gap-2">
+                  <q-icon name="search" size="20px" />
+                  <span class="text-base">ค้นหา</span>
+                </div>
+              </q-btn>
             </div>
           </div>
 
-            <!-- ตัวกรองหมวดหมู่ (Filters Category) -->
+
-            <div class="flex flex-col xl:flex-row xl:items-center justify-between gap-4 mb-10 w-full relative">
+
-                <div class="flex flex-wrap items-center gap-3 w-full xl:w-auto">
+          <!-- Category Filter Tabs with Scroll Buttons -->
+          <div class="relative mb-8">
+            <!-- Left Scroll Button -->
             <button 
+              class="absolute left-0 top-1/2 -translate-y-1/2 z-10 w-10 h-10 rounded-full bg-white shadow-md border border-slate-100 flex items-center justify-center text-slate-500 hover:text-blue-600 transition-all md:hidden"
+              @click="categoryScroll?.scrollBy({ left: -200, behavior: 'smooth' })"
+            >
+              <q-icon name="chevron_left" size="24px" />
+            </button>
+
+            <!-- Scrollable Container -->
+            <div 
+              ref="categoryScroll"
+              class="flex items-center gap-3 overflow-x-auto pb-2 no-scrollbar px-1 scroll-smooth"
+            >
+              <button 
+                class="px-6 py-2.5 rounded-full font-bold text-sm transition-all whitespace-nowrap border-2 flex-shrink-0"
+                :class="selectedCategory === 'all' ? 'bg-blue-600 text-white border-blue-600 shadow-lg shadow-blue-600/30' : 'bg-white border-slate-100 text-slate-500 hover:border-slate-300'"
                 @click="selectCategory('all')"
-                     :class="selectedCategory === 'all' ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-transparent font-bold' : 'bg-white dark:bg-transparent border-slate-200 dark:border-slate-700 text-slate-800 dark:text-slate-300 hover:border-slate-300 font-medium'"
+              >
-                     class="px-5 py-2.5 rounded-full border text-[13px] sm:text-[14px] flex items-center justify-center gap-2 transition-all outline-none">
+                {{ categoryLabels.all }}
-                     <q-icon name="check_circle_outline" size="18px" :class="selectedCategory === 'all' ? 'text-[#3B6BE8]' : 'text-slate-400'"/> ทั้งหมด
               </button>
-                   
               <button 
-                     v-for="cat in categories" :key="cat.id"
+                v-for="category in categories" 
-                     @click="selectCategory(cat.slug)"
+                :key="category.id"
-                     :class="selectedCategory === cat.slug ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-transparent font-bold' : 'bg-white dark:bg-transparent border-slate-200 dark:border-slate-700 text-slate-800 dark:text-slate-300 hover:border-slate-300 font-medium'"
+                class="px-6 py-2.5 rounded-full font-bold text-sm transition-all whitespace-nowrap border-2 flex-shrink-0"
-                     class="px-5 py-2.5 rounded-full border text-[13px] sm:text-[14px] flex items-center justify-center gap-2 transition-all outline-none bg-transparent">
+                :class="selectedCategory === category.slug ? 'bg-blue-600 text-white border-blue-600 shadow-lg shadow-blue-600/30' : 'bg-white border-slate-100 text-slate-500 hover:border-slate-300'"
-                     <q-icon :name="getCategoryIcon(cat.name)" size="18px" :class="selectedCategory === cat.slug ? 'text-[#3B6BE8]' : 'text-slate-600 dark:text-slate-400'"/>
+                @click="selectCategory(category.slug)"
-                     {{ getLocalizedText(cat.name) }}
+              >
+                {{ getCategoryLabel(category) }}
               </button>
             </div>
-            </div>
 
-            <!-- ตัวแสดงการโหลด (Loader) -->
+            <!-- Right Scroll Button -->
-            <div v-if="isLoading" class="flex justify-center py-24">
+             <button 
-               <q-spinner size="3rem" color="primary" />
+              class="absolute right-0 top-1/2 -translate-y-1/2 z-10 w-10 h-10 rounded-full bg-white shadow-md border border-slate-100 flex items-center justify-center text-slate-500 hover:text-blue-600 transition-all md:hidden"
-            </div>
+              @click="categoryScroll?.scrollBy({ left: 200, behavior: 'smooth' })"
-
+            >
-            <div v-else-if="filteredCourses.length > 0">
+              <q-icon name="chevron_right" size="24px" />
-               <!-- มุมมองแบบกริด (GRID VIEW) -->
-               <div v-if="viewMode === 'grid'" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6">
-                  <NuxtLink v-for="course in filteredCourses" :key="course.id" :to="`/course/${course.id}`" class="flex flex-col rounded-[1.5rem] bg-white dark:bg-slate-900 border border-slate-100 dark:border-slate-800 overflow-hidden shadow-[0_2px_10px_rgb(0,0,0,0.03)] hover:shadow-[0_8px_30px_rgb(0,0,0,0.08)] transition-all duration-300 group cursor-pointer">
-                     <!-- รูปหน้าปก (Thumbnail) -->
-                     <div class="relative w-full aspect-[16/10] bg-slate-100 dark:bg-slate-800 overflow-hidden">
-                        <img :src="course.thumbnail_url" class="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500" />
-                        <div v-if="course.category_name" class="absolute top-3 left-3 bg-white/95 dark:bg-slate-900/95 backdrop-blur-md text-[#3B6BE8] dark:text-blue-400 font-bold text-[10px] px-3.5 py-1 rounded-full shadow-sm" style="border-radius: 9999px; padding: 4px 12px;">
-                           {{ course.category_name }}
-                        </div>
-                     </div>
-                     
-                     <!-- เนื้อหาคอร์ส (Body) -->
-                     <div class="p-5 flex flex-col flex-1">
-                        <h3 class="font-bold text-slate-900 dark:text-white text-[15px] leading-snug line-clamp-2 mb-2 group-hover:text-blue-600 transition-colors">{{ getLocalizedText(course.title) }}</h3>
-                        
-                        <div class="flex items-center gap-2 mb-4">
-                           <span class="text-[12px] text-slate-500 font-medium">โดย {{ course.instructor_name }}</span>
-                        </div>
-
-                        <div class="flex items-center gap-1.5 mb-5">
-                             <q-icon name="star" class="text-amber-400" size="16px" />
-                             <span class="text-[13px] font-bold text-slate-800 dark:text-slate-200">{{ course.rating }}</span>
-                             <span class="text-[12px] text-slate-400">({{ course.reviews_count.toLocaleString() }} นักเรียน)</span>
-                        </div>
-                        
-                        <div class="mt-auto flex items-center justify-between">
-                            <div class="font-[900] text-[18px]" :class="course.is_free ? 'text-green-500' : 'text-[#2563EB] dark:text-blue-400'">
-                                {{ course.formatted_price }}
-                            </div>
-                            <!-- ปุ่มกดรูปตาเพื่อดูรายละเอียด (Eye icon circle button) -->
-                            <button class="w-[38px] h-[38px] rounded-full bg-slate-50 dark:bg-slate-800 text-slate-400 dark:text-slate-500 flex items-center justify-center hover:bg-blue-50 hover:text-blue-600 dark:hover:bg-slate-700 border border-slate-100 dark:border-slate-700 transition-colors shadow-sm outline-none">
-                                <q-icon name="visibility" size="18px" />
             </button>
           </div>
+
+
+          <!-- Course Grid (Updated to 4 cols) -->
+          <div v-if="filteredCourses.length > 0" class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6">
+            <div 
+              v-for="(course, index) in filteredCourses" 
+              :key="course.id" 
+              class="glass-card group flex flex-col h-full hover:-translate-y-2 transition-transform duration-500 slide-up"
+              :style="{ animationDelay: `${0.1 * (index + 1)}s` }"
+            >
+              <!-- Card Image -->
+              <div class="h-48 bg-gradient-to-br from-slate-800 to-slate-900 relative overflow-hidden group-hover:opacity-90 transition-opacity">
+                <img 
+                  v-if="course.thumbnail_url" 
+                  :src="course.thumbnail_url" 
+                  :alt="getLocalizedText(course.title)"
+                  class="w-full h-full object-cover transition-transform duration-500 group-hover:scale-110"
+                  @error="(e) => (e.target as HTMLImageElement).style.display = 'none'" 
+                />
+                <div 
+                  v-else 
+                  class="absolute inset-0 flex items-center justify-center bg-gradient-to-br from-slate-800 to-slate-900"
+                >
                 </div>
-                  </NuxtLink>
               </div>
 
-               <!-- มุมมองแบบรายการ (LIST VIEW) -->
+              <!-- Card Content Body -->
-               <div v-else class="flex flex-col gap-5">
+              <div class="p-6 flex-1 flex flex-col border-t border-slate-100 ">
-                  <NuxtLink v-for="course in filteredCourses" :key="course.id" :to="`/course/${course.id}`" class="flex flex-col sm:flex-row rounded-[1.5rem] bg-white dark:bg-slate-900 border border-slate-100 dark:border-slate-800 p-3 sm:p-4 gap-4 sm:gap-6 shadow-sm hover:shadow-[0_8px_30px_rgb(0,0,0,0.06)] transition-all duration-300 group cursor-pointer">
+                <h3 class="text-xl font-bold text-slate-900  mb-2 leading-snug group-hover:text-blue-600  transition-colors line-clamp-2">
-                     <div class="relative w-full sm:w-[260px] aspect-[16/10] sm:aspect-auto sm:h-[160px] rounded-[1rem] bg-slate-100 dark:bg-slate-800 overflow-hidden shrink-0">
+                  {{ getLocalizedText(course.title) }}
-                        <img :src="course.thumbnail_url" class="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500" />
+                </h3>
-                        <div v-if="course.category_name" class="absolute top-3 left-3 bg-white/95 dark:bg-slate-900/95 backdrop-blur-md text-[#3B6BE8] dark:text-blue-400 font-bold text-[10px] px-3.5 py-1.5 rounded-full shadow-sm" style="border-radius: 9999px; padding: 4px 12px;">
+                <p class="text-slate-500  text-xs mb-6 line-clamp-2 leading-relaxed flex-1">
-                           {{ course.category_name }}
+                  {{ getLocalizedText(course.description) }}
-                        </div>
+                </p>
-                     </div>
+
-                     <div class="flex flex-col flex-1 py-1">
+                <!-- Card Footer -->
-                        <div class="flex-1">
+                <div class="pt-4 border-t border-slate-100  flex items-center justify-between mt-auto">
-                            <h3 class="font-bold text-slate-900 dark:text-white text-[16px] md:text-[18px] leading-snug line-clamp-2 md:line-clamp-1 mb-2 group-hover:text-blue-600 transition-colors">{{ getLocalizedText(course.title) }}</h3>
+                  <span class="text-lg font-black text-blue-600  tracking-tight">
-                            <div class="flex items-center gap-2 mb-3">
+                    {{ course.is_free ? 'ฟรี' : course.price }}
-                               <span class="text-[13px] text-slate-500 font-medium">โดย {{ course.instructor_name }}</span>
+                  </span>
-                            </div>
+                  <NuxtLink 
-                            <div class="flex items-center gap-1.5 mb-2">
+                    :to="`/course/${course.id}`" 
-                                 <q-icon name="star" class="text-amber-400" size="16px" />
+                    class="px-4 py-2 bg-slate-50  hover:bg-blue-600 text-slate-600  hover:text-white rounded-lg text-xs font-bold transition-all border border-slate-200  hover:border-blue-500/50"
-                                 <span class="text-[13px] font-bold text-slate-800 dark:text-slate-200">{{ course.rating }}</span>
+                  >
-                                 <span class="text-[12px] text-slate-400">({{ course.reviews_count.toLocaleString() }} นักเรียน)</span>
+                    ดูรายละเอียด
-                            </div>
-                        </div>
-                        <div class="mt-4 sm:mt-auto flex items-center justify-between">
-                            <div class="font-[900] text-[20px]" :class="course.is_free ? 'text-green-500' : 'text-[#2563EB] dark:text-blue-400'">
-                                {{ course.formatted_price }}
-                            </div>
-                            <button class="px-6 py-2 rounded-full bg-slate-50 text-slate-600 dark:bg-slate-800 dark:text-slate-300 font-bold text-[13px] flex items-center gap-2 hover:bg-blue-50 border border-slate-100 dark:border-slate-700 hover:text-blue-600 transition-colors">
-                                <q-icon name="visibility" size="16px" /> ดูรายละเอียด
-                            </button>
-                        </div>
-                     </div>
                   </NuxtLink>
                 </div>
               </div>
+            </div>
+          </div>
 
-            <!-- กรณีไม่พบข้อมูลคอร์ส (Empty State) -->
+          <!-- Empty State (No Results) -->
-            <div v-else class="flex flex-col items-center justify-center py-20 bg-white dark:bg-slate-900/40 rounded-3xl border border-dashed border-slate-200 dark:border-slate-800">
+          <div v-else class="text-center py-20">
-               <q-icon name="search_off" size="64px" class="text-slate-300 dark:text-slate-600 mb-4" />
+            <div class="text-6xl mb-6 opacity-50 animate-bounce">🔭</div>
-               <h3 class="text-xl font-bold text-slate-900 dark:text-white mb-2">{{ searchQuery ? 'ไม่พบคอร์สที่คุณค้นหา' : 'ไม่มีคอร์สในหมวดหมู่นี้' }}</h3>
+            <h2 class="text-2xl font-black text-slate-900  mb-3">ไม่พบคอร์สที่คุณค้นหา</h2>
-               <p class="text-slate-500 dark:text-slate-400 text-center max-w-md">ลองใช้คำค้นหาอื่น หรือเลือกหมวดหมู่อื่นเพื่อดูคอร์สที่เรามีให้บริการ</p>
+            <p class="text-slate-400 mb-8 max-w-md mx-auto">
-               <button class="mt-6 font-bold text-blue-600 hover:text-blue-700 transition-colors" @click="searchQuery = ''; selectedCategory = 'all';">
+              ลองใช้คำค้นหาอื่น หรือดูคอร์สทั้งหมดที่เรามีให้บริการ
+            </p>
+            <button 
+              class="px-6 py-3 bg-blue-600 hover:bg-blue-500 text-white rounded-xl font-bold transition-all shadow-lg shadow-blue-600/20" 
+              @click="searchQuery = ''"
+            >
               แสดงคอร์สทั้งหมด
             </button>
           </div>
+
        </div>
+    </section>
+
+    <!-- ==========================================
+          CTA SECTION
+          Call to action to register
+     ========================================== -->
+    <section class="py-24 relative overflow-hidden">
+       <!-- Background Decoration -->
+       <div class="absolute inset-0 bg-gradient-to-b from-transparent to-blue-50/80 pointer-events-none -z-10"/>
+       <div class="absolute bottom-0 left-1/2 -translate-x-1/2 w-[800px] h-[400px] bg-blue-400/10 blur-[120px] rounded-full -z-10 pointer-events-none"/>
+      
+      <div class="container mx-auto max-w-4xl text-center relative z-10 px-6">
+        <h2 class="text-4xl md:text-5xl font-black text-slate-900  mb-6 tracking-tight">
+          พร้อมจะเริ่มต้นแล้วหรือยัง?
+        </h2>
+        <p class="text-slate-500 text-lg md:text-xl mb-10 max-w-2xl mx-auto leading-relaxed">
+          ลงทะเบียนฟรีวันนี้เพื่อเข้าถึงบทเรียนพื้นฐาน และติดตามความคืบหน้าการเรียนของคุณได้ทันที ไม่มีค่าใช้จ่ายแอบแฝง
+        </p>
+        <NuxtLink 
+          to="/auth/register" 
+          class="inline-flex items-center gap-3 px-10 py-5 bg-gradient-to-r from-blue-600 to-indigo-600 hover:from-blue-500 hover:to-indigo-500 text-white rounded-2xl text-lg font-black shadow-2xl shadow-blue-900/40 hover:scale-105 transition-all duration-300"
+        >
+          <span></span>
+          <span>สมัครสมาชิกฟรี</span>
+        </NuxtLink>
       </div>
+    </section>
   </div>
 </template>
 
 <style scoped>
-/* ปิดการแสดงแถบเลื่อนบนคอนเทนเนอร์ของตัวกรอง (Disable default scrollbar for filter container) */
+/* 
-.no-scrollbar::-webkit-scrollbar {
+  MATCHING INDEX.VUE STYLES
-    display: none;
+  These styles ensure consistency with the landing page theme.
+*/
+
+/* Gradient Text Effect (Cyan to Blue) */
+.text-gradient-cyan {
+  background: linear-gradient(135deg, #22d3ee 0%, #3b82f6 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  background-clip: text;
+  display: inline-block;
+  padding: 0.5em 0.2em;
+  margin: -0.5em -0.2em;
+  vertical-align: baseline;
 }
-.no-scrollbar {
+
-    -ms-overflow-style: none;
+/* Premium Glass Effect for Containers */
-    scrollbar-width: none;
+.glass-premium {
+  background: rgba(255, 255, 255, 0.7);
+  backdrop-filter: blur(40px);
+  border: 1px solid rgba(255, 255, 255, 0.5);
+}
+
+
+/* Glass Card Style for Course Items */
+.glass-card {
+  background: white;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  border-radius: 2rem;
+  overflow: hidden;
+  box-shadow: 0 10px 30px rgba(0,0,0,0.05);
+}
+
+
+
+/* Slow Pulse Animation for Background Glows */
+@keyframes pulse-slow {
+  0%, 100% { opacity: 0.1; transform: scale(1); }
+  50% { opacity: 0.15; transform: scale(1.15); }
+}
+
+.animate-pulse-slow {
+  animation: pulse-slow 10s linear infinite;
+}
+
+/* Slide Up Entrance Animation */
+@keyframes slide-up {
+  from { opacity: 0; transform: translateY(30px); }
+  to { opacity: 1; transform: translateY(0); }
+}
+
+.slide-up {
+  animation: slide-up 0.8s cubic-bezier(0.2, 0.8, 0.2, 1) forwards;
+  opacity: 0;
 }
 </style>

Frontend-Learner/pages/classroom/learning.vue

@@ -22,7 +22,7 @@ const { user } = useAuth()
 const { fetchCourseLearningInfo, fetchLessonContent, saveVideoProgress, checkLessonAccess, fetchVideoProgress, fetchCourseAnnouncements, markLessonComplete, getLocalizedText } = useCourse()
 const $q = useQuasar()
 
-// การจัดการสถานะ (State management)
+// State management
 const sidebarOpen = ref(false)
 const courseId = computed(() => Number(route.query.course_id))
 
@@ -31,11 +31,11 @@ const courseId = computed(() => Number(route.query.course_id))
 // ==========================================
 // courseData: เก็บข้อมูลโครงสร้างคอร์ส (บทเรียนต่างๆ)
 const courseData = ref<any>(null)
-const announcements = ref<any[]>([]) // สถานะของประกาศ (Announcements state)
+const announcements = ref<any[]>([]) // Announcements state
-const showAnnouncementsModal = ref(false) // สถานะของป๊อปอัป (Modal state)
+const showAnnouncementsModal = ref(false) // Modal state
-const hasUnreadAnnouncements = ref(false) // ติดตามสถานะที่ยังไม่ได้อ่าน (Unread state tracking)
+const hasUnreadAnnouncements = ref(false) // Unread state tracking
 
-// ฟังก์ชันช่วยเหลือสำหรับเก็บสถานะการอ่านถาวร (Helper for persistent read status)
+// Helper for persistent read status
 const getAnnouncementStorageKey = () => {
     if (!user.value?.id || !courseId.value) return ''
     return `read_announcements:${user.value.id}:${courseId.value}`
@@ -61,17 +61,17 @@ const checkUnreadAnnouncements = () => {
     const lastReadDate = new Date(lastRead).getTime()
     const hasNew = announcements.value.some(a => {
         const annDate = new Date(a.created_at || Date.now()).getTime()
-        // ตรวจสอบว่าประกาศใหม่กว่าที่อ่านครั้งล่าสุดหรือไม่ (Check if announcement is strictly newer than last read)
+        // Check if announcement is strictly newer than last read
         return annDate > lastReadDate
     })
     
     hasUnreadAnnouncements.value = hasNew
 }
 
-// ฟังก์ชันจัดการเมื่อเปิดประกาศ (Handler for opening announcements)
+// Handler for opening announcements
 const handleOpenAnnouncements = () => {
     showAnnouncementsModal.value = true
-    hasUnreadAnnouncements.value = false // ลบป้ายแจ้งเตือนเมื่อคลิก (Clear unread badge on click)
+    hasUnreadAnnouncements.value = false // Clear unread badge on click
     
     const key = getAnnouncementStorageKey()
     if (key) {
@@ -98,7 +98,7 @@ const toggleSidebar = () => {
   sidebarOpen.value = !sidebarOpen.value
 }
 
-// การจัดการตรรกะจำนวนครั้งในการทำแบบทดสอบ (Logic Quiz Attempt Management)
+// Logic Quiz Attempt Management
 const quizStatus = computed(() => {
   if (!currentLesson.value || currentLesson.value.type !== 'QUIZ' || !currentLesson.value.quiz) return null
   
@@ -106,7 +106,7 @@ const quizStatus = computed(() => {
   const latestAttempt = quiz.latest_attempt
   const allowMultiple = quiz.allow_multiple_attempts
 
-  // หากยังไม่เคยทดสอบ (If never attempted)
+  // If never attempted
   if (!latestAttempt) {
     return {
       canStart: true,
@@ -116,7 +116,7 @@ const quizStatus = computed(() => {
     }
   }
 
-  // หากอนุญาตให้ทดสอบได้หลายครั้ง (If multiple attempts allowed)
+  // If multiple attempts allowed
   if (allowMultiple) {
     return {
       canStart: true,
@@ -128,8 +128,8 @@ const quizStatus = computed(() => {
     }
   }
 
-  // ไม่อนุญาตให้สอบได้หลายครั้ง (allowMultiple is false (Single attempt only))
+  // allowMultiple is false (Single attempt only)
-  // ล็อกแบบทดสอบหลังทำเสร็จไม่ว่าจะผ่านหรือไม่ผ่าน (Lock the quiz regardless of pass/fail once attempted)
+  // Lock the quiz regardless of pass/fail once attempted
   return {
     canStart: false,
     label: latestAttempt.is_passed ? t('quiz.passedStatus') : t('quiz.failedStatus'),
@@ -145,7 +145,7 @@ const handleStartQuiz = () => {
 
     const quiz = currentLesson.value.quiz
     
-    // หากทำได้ครั้งเดียวและนี่เป็นครั้งแรก (If multiple attempts are disabled and it's the first time)
+    // If multiple attempts are disabled and it's the first time
     if (!quiz.allow_multiple_attempts && !quiz.latest_attempt) {
         $q.dialog({
             title: `<div class="text-slate-900 dark:text-white font-black text-xl">${t('quiz.warningTitle')}</div>`,
@@ -193,18 +193,18 @@ const resetAndNavigate = (path: string) => {
         }
     }
     
-    // 2. ลบข้อมูลใน localStorage ทั้งหมด (Clear all localStorage)
+    // 2. Clear all localStorage
     localStorage.clear()
     
-    // 3. คืนค่าเฉพาะคีย์ที่อนุญาต (Restore ONLY whitelisted keys)
+    // 3. Restore ONLY whitelisted keys
     Object.keys(whitelist).forEach(key => {
         localStorage.setItem(key, whitelist[key])
     })
     
-    // 4. บังคับโหลดหน้าเว็บใหม่ไปยังเส้นทางใหม่ (Force hard reload to the new path)
+    // 4. Force hard reload to the new path
     window.location.href = path
   } else {
-    // การทำงานสำรองสำหรับ SSR (SSR Fallback)
+    // SSR Fallback
     router.push(path)
   }
 }
@@ -213,13 +213,13 @@ const resetAndNavigate = (path: string) => {
 const handleLessonSelect = (lessonId: number) => {
   if (currentLesson.value?.id === lessonId) return
   
-  // 1. อัปเดตพารามิเตอร์ใน URL (Update URL query params)
+  // 1. Update URL query params
   router.push({ query: { ...route.query, lesson_id: lessonId.toString() } })
   
-  // 2. โหลดเนื้อหาโดยไม่ต้องรีเฟรชหน้าเว็บ (Load content without refresh)
+  // 2. Load content without refresh
   loadLesson(lessonId)
   
-  // ปิดแถบด้านข้างบนมือถือ (Close sidebar on mobile)
+  // Close sidebar on mobile
   if (sidebarOpen.value) {
     sidebarOpen.value = false
   }
@@ -245,7 +245,7 @@ const loadCourseData = async () => {
     if (res.success) {
       courseData.value = res.data
       
-      // ตรรกะการโหลดอัตโนมัติ: เช็ค URL ก่อน หากไม่มีให้โหลดบทเรียนแรก (Auto-load logic: Check URL first, fallback to first available lesson)
+      // Auto-load logic: Check URL first, fallback to first available lesson
       const urlLessonId = route.query.lesson_id ? Number(route.query.lesson_id) : null
       
       if (urlLessonId) {
@@ -258,7 +258,7 @@ const loadCourseData = async () => {
           }
       }
 
-      // ดึงข้อมูลประกาศของคอร์สเรียน (Fetch Course Announcements)
+      // Fetch Course Announcements
       const annRes = await fetchCourseAnnouncements(courseId.value)
       if (annRes.success) {
           announcements.value = annRes.data || []
@@ -275,7 +275,7 @@ const loadCourseData = async () => {
 const loadLesson = async (lessonId: number) => {
   if (currentLesson.value?.id === lessonId) return
   
-  // ล้างสถานะวิดีโอเดิมเพื่อบังคับตั้งค่าใหม่ (Clear previous video state & unload component to force reset)
+  // Clear previous video state & unload component to force reset
   isPlaying.value = false
   videoProgress.value = 0
   currentTime.value = 0
@@ -285,16 +285,16 @@ const loadLesson = async (lessonId: number) => {
   lastSavedTimestamp.value = 0
   lastLocalSaveTimestamp.value = 0
   currentDuration.value = 0
-  currentLesson.value = null // ตัวนี้จะทำการซ่อนวิดีโอและซ่อนเนื้อหา (This will unmount VideoPlayer and hide content)
+  currentLesson.value = null // This will unmount VideoPlayer and hide content
   
   isLessonLoading.value = true
   try {
-    // ป้องกันไว้ก่อน: ตรวจสอบสิทธิ์การเข้าถึง (Optional: Check access first)
+    // Optional: Check access first
     const accessRes = await checkLessonAccess(courseId.value, lessonId)
     if (accessRes.success && !accessRes.data.is_accessible) {
         let msg = t('classroom.notAvailable')
         
-        // จัดการเหตุผลล็อกเฉพาะจุด (Handle specific lock reasons)
+        // Handle specific lock reasons
         if (accessRes.data.lock_reason) {
             msg = accessRes.data.lock_reason
         } else if (accessRes.data.required_quiz_pass && !accessRes.data.required_quiz_pass.is_passed) {
@@ -314,32 +314,32 @@ const loadLesson = async (lessonId: number) => {
         return
     }
 
-    // 1. ดึงข้อมูลเนื้อหา (Fetch content)
+    // 1. Fetch content
     const res = await fetchLessonContent(courseId.value, lessonId)
     if (res.success) {
       currentLesson.value = res.data
       
-      // กำหนดค่าออบเจ็กต์ความคืบหน้าหากไม่มี (สำคัญสำหรับผู้ใช้ใหม่) (Initialize progress object if missing)
+      // Initialize progress object if missing (Critical for New Users)
       if (!currentLesson.value.progress) {
           currentLesson.value.progress = {}
       }
       
-      // อัปเดตสถานะสำเร็จของบทเรียนบน UI อย่างปลอดภัย (Update Lesson Completion UI status safely)
+      // Update Lesson Completion UI status safely
       if (currentLesson.value?.progress?.is_completed && courseData.value) {
           for (const chapter of courseData.value.chapters) {
               const lesson = chapter.lessons.find((l: any) => l.id === lessonId)
               if (lesson) {
                   if (!lesson.progress) lesson.progress = {}
                   lesson.progress.is_completed = true
-                  lesson.is_completed = true // ตั้งค่าสถานะสำเร็จให้เป็นมาตรฐาน (Standardize completion property)
+                  lesson.is_completed = true // Standardize completion property
                   break
               }
           }
       }
 
-      // 2. ดึงความคืบหน้าเริ่มต้นเพื่อเล่นต่อ (Fetch Initial Progress (Resume Playback))
+      // 2. Fetch Initial Progress (Resume Playback)
       if (currentLesson.value.type === 'VIDEO') {
-           // หากเรียนจบแล้ว ให้ล้างจุดที่ดูล่าสุดเพื่อดูใหม่ได้ (If already completed, clear local resume point to allow fresh re-watch)
+           // If already completed, clear local resume point to allow fresh re-watch
            const isCompleted = currentLesson.value.progress?.is_completed || false
            
            if (isCompleted) {
@@ -351,7 +351,7 @@ const loadLesson = async (lessonId: number) => {
                maxWatchedTime.value = 0
                currentTime.value = 0
            } else {
-               // ถ้ายังเรียนไม่จบ? กลับไปเล่นจากจุดเดิม (Not completed? Resume from where we left off)
+               // Not completed? Resume from where we left off
                const progressRes = await fetchVideoProgress(lessonId)
                let serverProgress = 0
                if (progressRes.success && progressRes.data?.video_progress_seconds) {
@@ -379,24 +379,24 @@ const loadLesson = async (lessonId: number) => {
   }
 }
 
-// ข้อมูลอ้างอิงวิดีโอ (Video Player Ref (Component))
+// Video Player Ref (Component)
 const videoPlayerComp = ref(null)
 
-// สถานะความก้าวหน้าและวิดีโอ (Video & Progress State)
+// Video & Progress State
 const initialSeekTime = ref(0)
-const maxWatchedTime = ref(0) // การติดตามแบบไม่ย้อนกลับ (Anti-rewind monotonic tracking)
+const maxWatchedTime = ref(0) // Anti-rewind monotonic tracking
 const lastSavedTime = ref(-1)
-const lastSavedTimestamp = ref(0) // เวลาบันทึกในเซิร์ฟเวอร์ (Server throttle timestamp)
+const lastSavedTimestamp = ref(0) // Server throttle timestamp
-const lastLocalSaveTimestamp = ref(0) // เวลาบันทึกในเครื่อง (Local throttle timestamp)
+const lastLocalSaveTimestamp = ref(0) // Local throttle timestamp
-const currentDuration = ref(0) // ติดตามเวลาของวิดีโอ (Track duration for save logic)
+const currentDuration = ref(0) // Track duration for save logic
 
-// ฟังก์ชันช่วยเหลือ: ชื่อคีย์สำหรับ Local Storage (Helper: Get Local Storage Key)
+// Helper: Get Local Storage Key
 const getLocalProgressKey = (lessonId: number) => {
     if (!user.value?.id) return null
     return `progress:${user.value.id}:${lessonId}`
 }
 
-// ฟังก์ชันช่วยเหลือ: ดึงความคืบหน้าจากเครื่อง (Helper: Get Local Progress)
+// Helper: Get Local Progress
 const getLocalProgress = (lessonId: number): number => {
     try {
         const key = getLocalProgressKey(lessonId)
@@ -408,7 +408,7 @@ const getLocalProgress = (lessonId: number): number => {
     }
 }
 
-// ฟังก์ชันช่วยเหลือ: บันทึกลงเครื่อง (Helper: Save to Local Storage)
+// Helper: Save to Local Storage
 const saveLocalProgress = (lessonId: number, time: number) => {
     try {
         const key = getLocalProgressKey(lessonId)
@@ -416,31 +416,31 @@ const saveLocalProgress = (lessonId: number, time: number) => {
            localStorage.setItem(key, time.toString())
         }
     } catch (e) {
-        // ข้ามกรณีเกิดข้อผิดพลาดในการบันทึก (Ignore storage errors)
+        // Ignore storage errors
     }
 }
 
-// ฟังก์ชันจัดการเวลาของวิดีโอ (จาก Component) (Handler: Video Time Update (from Component))
+// Handler: Video Time Update (from Component)
 const handleVideoTimeUpdate = (cTime: number, dur: number) => {
   currentDuration.value = dur || 0
   
-  // อัปเดตความคืบหน้าแบบทางเดียว (Update Monotonic Progress)
+  // Update Monotonic Progress
   if (cTime > maxWatchedTime.value) {
       maxWatchedTime.value = cTime
   }
   
-  // ตรรกะ: บันทึกเป็นระยะ (Logic: Periodic Save) 
+  // Logic: Periodic Save 
   if (currentLesson.value?.id) {
       const now = Date.now()
       
-      // 1. การหน่วงเวลาบันทึกในเครื่อง (5 วินาที) (Local Save Throttle (5 seconds))
+      // 1. Local Save Throttle (5 seconds)
       if (now - lastLocalSaveTimestamp.value > 5000) {
           saveLocalProgress(currentLesson.value.id, maxWatchedTime.value)
           lastLocalSaveTimestamp.value = now
       }
       
-      // 2. การหน่วงเวลาบันทึกบนเซิร์ฟเวอร์ (จัดการใน performSaveProgress)
+      // 2. Server Save Throttle (handled inside performSaveProgress)
-      // หมายเหตุ: เราไม่เช็ค isPlaying ตรงนี้เพราะถ้าเวลาเดินแปลว่าเล่นอยู่ (Note: We don't check isPlaying here because if time is updating, it IS playing.)
+      // Note: We don't check isPlaying here because if time is updating, it IS playing.
       performSaveProgress(false, false)
   }
 }
@@ -451,49 +451,49 @@ const onVideoMetadataLoaded = (duration: number) => {
     }
 }
 
-const isCompleting = ref(false) // ตัวแปรกันการแย่งกันทำงานตอนเรียนจบ (Flag to prevent race conditions during completion)
+const isCompleting = ref(false) // Flag to prevent race conditions during completion
 
 // -----------------------------------------------------
-// ระบบบันทึกความคืบหน้าที่แข็งแกร่ง (ไฮบริด: ในเครื่อง + เซิร์ฟเวอร์) (ROBUST PROGRESS SAVING SYSTEM (Hybrid: Local + Server))
+// ROBUST PROGRESS SAVING SYSTEM (Hybrid: Local + Server)
 // -----------------------------------------------------
 
-// ฟังก์ชันหลักสำหรับบันทึกลงเซิร์ฟเวอร์ (Main Server Save Function)
+// Main Server Save Function
 const performSaveProgress = async (force: boolean = false, keepalive: boolean = false) => {
     const lesson = currentLesson.value
     if (!lesson || lesson.type !== 'VIDEO') return
     
-    // ทำให้แน่ใจว่ามีออบเจ็กต์ความคืบหน้าอยู่ (Ensure progress object exists)
+    // Ensure progress object exists
     if (!lesson.progress) lesson.progress = {}
 
-    // 1. ป้องกันเมื่อดูจบแล้ว: ไม่ต้องบันทึกอีกถ้าดูจบไปแล้ว (Completed Guard: Stop everything if already completed)
+    // 1. Completed Guard: Stop everything if already completed
     if (lesson.progress.is_completed) return
 
-    // 2. ป้องกันการเรียกซ้ำ: ไม่ทำงานถ้ากำลังบันทึกเวลาจบอยู่ (Race Condition Guard: Stop if currently completing)
+    // 2. Race Condition Guard: Stop if currently completing
     if (isCompleting.value) return
 
     const now = Date.now()
-    const maxSec = Math.floor(maxWatchedTime.value) // ใช้เวลาที่ดูไปมากที่สุด (Use max watched time)
+    const maxSec = Math.floor(maxWatchedTime.value) // Use max watched time
     const durationSec = Math.floor(currentDuration.value || 0)
 
-    // 3. ตรวจสอบการเดินหน้า: ยอมให้บันทึก 0 ได้ถ้าเป็นการบันทึกครั้งแรก (lastSavedTime is -1) (Monotonic Check: Allow saving 0 if it's the very first save)
+    // 3. Monotonic Check: Allow saving 0 if it's the very first save (lastSavedTime is -1)
     if (!force) {
         if (lastSavedTime.value === -1) {
-            // บันทึกครั้งแรก: ยอมรับ 0 หรือมากกว่า (First time save: allow 0 or more)
+            // First time save: allow 0 or more
             if (maxSec < 0) return 
         } else if (maxSec <= lastSavedTime.value) {
-            // การบันทึกครั้งถัดไป: ต้องมากกว่าครั้งล่าสุด (Subsequent saves: must be greater than last saved)
+            // Subsequent saves: must be greater than last saved
             return
         }
     }
     
-    // 4. ตรวจสอบการหน่วงเวลา: เซิร์ฟเวอร์ (15 วินาที) (Throttle Check: Server Throttle (15 seconds))
+    // 4. Throttle Check: Server Throttle (15 seconds)
     if (!force && (now - lastSavedTimestamp.value < 15000)) return
 
-    // เตรียมบันทึก (Prepare for Save)
+    // Prepare for Save
     lastSavedTime.value = maxSec 
     lastSavedTimestamp.value = now
 
-    // เช็คว่าการบันทึกนี้จะทำให้จบบทเรียนหรือไม่ (เช่น 100% หรือบังคับจบ) (Check if this save might complete the lesson)
+    // Check if this save might complete the lesson (e.g. 100% or forced end)
     const isFinishing = force || (durationSec > 0 && maxSec >= durationSec)
     
     if (isFinishing) {
@@ -503,8 +503,8 @@ const performSaveProgress = async (force: boolean = false, keepalive: boolean =
     try {
         const res = await saveVideoProgress(lesson.id, maxSec, durationSec, keepalive)
         
-        // จัดการเมื่อดูจบ (กลยุทธ์เฉพาะฝั่งหน้าเว็บ: ให้ผ่านที่ 95%) (Handle Completion (Frontend-only strategy: 95% threshold))
+        // Handle Completion (Frontend-only strategy: 95% threshold)
-        // เพื่อให้เครื่องหมายถูกขึ้นที่ 95% ตรงกับหลังบ้าน (This ensures the checkmark appears at 95% to match backend.)
+        // This ensures the checkmark appears at 95% to match backend.
         const progressPercentage = durationSec > 0 ? (maxSec / durationSec) : 0
         const isCompletedNow = res.success && (res.data?.is_completed || progressPercentage >= 0.95)
 
@@ -513,7 +513,7 @@ const performSaveProgress = async (force: boolean = false, keepalive: boolean =
              markLessonAsCompletedLocally(lesson.id)
              if (lesson.progress) lesson.progress.is_completed = true
              
-             // หากเพิ่งเรียนจบใหม่ ให้โหลดเนื้อหาใหม่เพื่อปลดล็อกบทถัดไป (If newly completed, reload course data to unlock next lesson in sidebar)
+             // If newly completed, reload course data to unlock next lesson in sidebar
              if (!wasAlreadyCompleted) {
                  await loadCourseData()
              }
@@ -527,13 +527,13 @@ const performSaveProgress = async (force: boolean = false, keepalive: boolean =
     }
 }
 
-// ฟังก์ชันช่วยเหลือสำหรับอัปเดตแถบด้านข้าง (Helper to update Sidebar UI)
+// Helper to update Sidebar UI
 const markLessonAsCompletedLocally = (lessonId: number) => {
     if (courseData.value) {
         for (const chapter of courseData.value.chapters) {
             const lesson = chapter.lessons.find((l: any) => l.id === lessonId)
             if (lesson) {
-                // สอดคล้องกับโครงสร้าง API (Compatible with API structure)
+                // Compatible with API structure
                 lesson.is_completed = true
                 if (!lesson.progress) lesson.progress = {}
                 lesson.progress.is_completed = true
@@ -547,11 +547,11 @@ const videoSrc = computed(() => {
   if (!currentLesson.value) return ''
   let url = ''
   
-  // ใช่ video_url โดยตรงจาก API ก่อน (Use explicit video_url from API first)
+  // Use explicit video_url from API first
   if (currentLesson.value.video_url) {
     url = currentLesson.value.video_url
   } else {
-    // สำรอง (ตรรกะแบบเก่า)
+    // Fallback (deprecated logic)
     const content = getLocalizedText(currentLesson.value.content)
     if (content && (content.startsWith('http') || content.startsWith('/')) && !content.includes(' ')) {
       url = content
@@ -560,7 +560,7 @@ const videoSrc = computed(() => {
 
   if (!url) return ''
 
-  // รองรับการเล่นต่อสำหรับ YouTube (Support Resume for YouTube)
+  // Support Resume for YouTube
   const isYoutube = url.toLowerCase().includes('youtube.com') || url.toLowerCase().includes('youtu.be')
   if (isYoutube && initialSeekTime.value > 0) {
       const separator = url.includes('?') ? '&' : '?'
@@ -575,7 +575,7 @@ const onVideoEnded = async () => {
     const lesson = currentLesson.value
     if (!lesson) return
 
-    // ล้าง localStorage เนื่องจากดจบแล้ว (Clear local storage on end since it's completed)
+    // Clear local storage on end since it's completed
     const key = getLocalProgressKey(lesson.id)
     if (key && typeof window !== 'undefined') {
         localStorage.removeItem(key)
@@ -598,7 +598,7 @@ onMounted(() => {
 })
 
 onBeforeUnmount(() => {
-  // ล้างสถานะเมื่อออกจากหน้าเพื่อให้หน้าเหมือนใหม่ตอนกลับมา (Clear state when leaving the page to ensure fresh start on return)
+  // Clear state when leaving the page to ensure fresh start on return
   courseData.value = null
   currentLesson.value = null
 })
@@ -665,7 +665,7 @@ onBeforeUnmount(() => {
       </q-toolbar>
     </q-header>
 
-    <!-- แถบด้านข้าง (บทเรียน) - วางชิดขวาผ่านพร็อพพ์ -->
+    <!-- Sidebar (Curriculum) - Positioned Right via component prop -->
     <CurriculumSidebar
       v-model="sidebarOpen"
       :courseData="courseData"
@@ -676,14 +676,14 @@ onBeforeUnmount(() => {
       @open-announcements="handleOpenAnnouncements"
     />
 
-    <!-- พื้นที่เนื้อหาหลัก (Main Content) -->
+    <!-- Main Content -->
     <q-page-container class="bg-white dark:bg-slate-900">
       <q-page class="flex flex-col h-full bg-slate-50 dark:bg-[#0B0F1A]">
-         <!-- กรอบวิดีโอและพื้นที่เนื้อหา (Video Player & Content Area) -->
+         <!-- Video Player & Content Area -->
          <div class="w-full h-full p-4 md:p-6 flex-grow overflow-y-auto">
-            <!-- 1. สถานะกำลังโหลด (โครงสร้างเสมือน (Skeleton) สมบูรณ์แบบ) (LOADING STATE (Comprehensive Skeleton)) -->
+            <!-- 1. LOADING STATE (Comprehensive Skeleton) -->
             <div v-if="isLessonLoading" class="animate-fade-in">
-                <!-- โครงภาพวิดีโอ (Video Skeleton) -->
+                <!-- Video Skeleton -->
                 <div class="aspect-video bg-slate-200 dark:bg-slate-800 rounded-3xl animate-pulse flex items-center justify-center mb-10 overflow-hidden relative shadow-xl focus:outline-none">
                     <img 
                         v-if="courseData?.course?.thumbnail_url"
@@ -697,7 +697,7 @@ onBeforeUnmount(() => {
                     </div>
                 </div>
                 
-                <!-- โครงข้อมูล (Info Skeleton) -->
+                <!-- Info Skeleton -->
                 <div class="bg-white dark:bg-slate-800/50 p-8 rounded-3xl border border-slate-100 dark:border-white/5 shadow-sm">
                     <div class="h-10 bg-slate-200 dark:bg-slate-800 rounded-xl w-3/4 mb-4 animate-pulse"></div>
                     <div class="h-4 bg-slate-100 dark:bg-slate-800 rounded-lg w-full mb-2 animate-pulse"></div>
@@ -705,9 +705,9 @@ onBeforeUnmount(() => {
                 </div>
             </div>
             
-            <!-- 2. สถานะพร้อมใช้งาน (ข้อมูลบทเรียนจริง) (READY STATE (Real Lesson Content)) -->
+            <!-- 2. READY STATE (Real Lesson Content) -->
             <div v-else-if="currentLesson" class="animate-fade-in">
-                <!-- ส่วนการเล่นวิดีโอ (Video Player) -->
+                <!-- Video Player -->
                 <VideoPlayer
                    v-if="videoSrc"
                    ref="videoPlayerComp"
@@ -719,7 +719,7 @@ onBeforeUnmount(() => {
                    @loadedmetadata="(d: number) => onVideoMetadataLoaded(d)"
                 />
             
-              <!-- ข้อมูลบทเรียน (Lesson Info) -->
+              <!-- Lesson Info -->
               <div class="bg-[var(--bg-surface)] p-6 md:p-8 rounded-3xl shadow-sm border border-[var(--border-color)]">
                 <!-- ใช้สีจากตัวแปรกลาง: จะแยกโหมดให้อัตโนมัติ (สว่าง=ดำ / มืด=ขาว) -->
                 <div class="flex items-start justify-between gap-4 mb-4">
@@ -728,7 +728,7 @@ onBeforeUnmount(() => {
                 
                 <p class="text-slate-600 dark:text-slate-400 text-base md:text-lg leading-relaxed mb-6" v-if="currentLesson.description">{{ getLocalizedText(currentLesson.description) }}</p>
                 
-                <!-- ช่องบทเรียน (Text/HTML) (Lesson Content Area) -->
+                <!-- Lesson Content Area (Text/HTML) -->
                 <div v-if="currentLesson.type === 'QUIZ'" class="p-8 bg-gradient-to-br from-blue-50/50 to-indigo-50/50 dark:from-slate-800/50 dark:to-slate-900/50 rounded-2xl border border-blue-100 dark:border-white/5 text-center">
                     <div class="bg-white dark:bg-slate-800 w-20 h-20 rounded-full flex items-center justify-center mx-auto mb-4 shadow-sm text-blue-500 dark:text-blue-400 border dark:border-white/10">
                         <q-icon name="quiz" size="40px" />
@@ -783,7 +783,7 @@ onBeforeUnmount(() => {
                     <div v-html="getLocalizedText(currentLesson.content)" class="leading-relaxed text-slate-800 dark:text-slate-200"></div>
                 </div>
 
-                <!-- ส่วนเอกสารแนบ (Attachments Section) -->
+                <!-- Attachments Section -->
                 <div v-if="currentLesson.attachments && currentLesson.attachments.length > 0" class="mt-8 pt-6 border-t border-gray-100 dark:border-white/5">
                     <h3 class="text-lg font-bold mb-4 text-slate-900 dark:text-white flex items-center gap-2">
                         <div class="w-8 h-8 rounded-lg bg-orange-100 dark:bg-orange-900/30 text-orange-600 flex items-center justify-center">

Frontend-Learner/pages/classroom/quiz.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 /**
  * @file quiz.vue
- * @description หน้าสำหรับทำแบบทดสอบ (Quiz Interface)
+ * @description Quiz Interface.
- * จัดการวงจรชีวิตของการทำแบบทดสอบทั้งหมด: เริ่มต้น -> ทำข้อสอบ -> ผลลัพธ์ -> ทบทวน
+ * Manages the entire quiz lifecycle: Start -> Taking -> Results -> Review.
- * มีฟีเจอร์จับเวลา การนำทางระหว่างคำถาม และการวิเคราะห์ผลลัพธ์อย่างละเอียด
+ * Features a timer, question navigation, and detailed result analysis.
  */
 
 definePageMeta({
@@ -17,7 +17,7 @@ const router = useRouter()
 const $q = useQuasar()
 const { fetchCourseLearningInfo, fetchLessonContent, submitQuiz: apiSubmitQuiz, markLessonComplete } = useCourse()
 
-// การจัดการสถานะ (State Management)
+// State Management
 const currentScreen = ref<'start' | 'taking' | 'result' | 'review'>('start')
 const timeLeft = ref(0) 
 let timerInterval: ReturnType<typeof setInterval> | null = null
@@ -30,24 +30,20 @@ const quizData = ref<any>(null)
 const isLoading = ref(true)
 const isSubmitting = ref(false)
 
-// สถานะขณะทำแบบทดสอบ (Quiz Taking State)
+// Quiz Taking State
 const currentQuestionIndex = ref(0)
-const userAnswers = ref<Record<number, number>>({}) // ID คำถาม -> ID คำตอบ (questionId -> choiceId)
+const userAnswers = ref<Record<number, number>>({}) // questionId -> choiceId
-const visitedQuestions = ref<Set<number>>(new Set()) // ติดตามข้อที่เคยเปิดดูแล้ว (Track visited indices)
+const visitedQuestions = ref<Set<number>>(new Set()) // Track visited indices
 const quizResult = ref<any>(null)
 
-const questionPageSize = 10
+// Tracking visited questions
-const questionPage = ref(0)
-
-// ติดตามคำถามที่เปิดดูแล้ว (Tracking visited questions)
 watch(currentQuestionIndex, (newVal) => {
     visitedQuestions.value.add(newVal)
-    questionPage.value = Math.floor(newVal / questionPageSize)
 }, { immediate: true })
 
-// ฟังก์ชันช่วยเหลือ: ดึงคลาสสีสำหรับสถานะคำถาม (Helper: Get Status Color Class)
+// Helper: Get Status Color Class
 const getQuestionStatusClass = (index: number, questionId: number) => {
-    // 1. ข้อปัจจุบัน = สีฟ้า (Current = Blue)
+    // 1. Current = Blue
     if (index === currentQuestionIndex.value) {
         return 'bg-blue-500 text-white border-blue-600 ring-2 ring-blue-200 dark:ring-blue-900'
     }
@@ -55,29 +51,32 @@ const getQuestionStatusClass = (index: number, questionId: number) => {
     const hasAnswer = userAnswers.value[questionId] !== undefined
     const isVisited = visitedQuestions.value.has(index)
 
-    // 2. ตอบแล้ว = สีเขียว (Completed = Green)
+    // 2. Completed = Green
     if (hasAnswer) {
         return 'bg-emerald-500 text-white border-emerald-600'
     }
 
-    // 3. ข้าม = สีส้ม (เปิดดูแล้วแต่ยังไม่ตอบ) (Skipped = Orange (Visited but no answer))
+    // 3. Skipped = Orange (Visited but no answer)
-    // หมายเหตุ: ตามคำนิยามของการข้าม หากคลิกแล้วหน้าเว็บไม่บันทึกข้อมูลจะถือว่าเป็นการข้าม
+    // Note: If we are strictly following "Skipped" definition:
-    // ในขั้นตอนนี้การดูเฉยๆ แล้วผ่านถือเป็นการข้ามเช่นกัน
+    // "user pressed Skip or moved forward on a skippable question without saving an answer"
+    // In this linear flow, merely visiting and leaving empty counts as skipped.
     if (isVisited && !hasAnswer) {
         return 'bg-orange-500 text-white border-orange-600'
     }
 
-    // 4. ยังไม่เริ่ม = สีเทา (Not Started = Grey)
+    // 4. Not Started = Grey
     return 'bg-slate-200 text-slate-400 border-slate-300 dark:bg-white/5 dark:border-white/5 dark:text-slate-600 hover:bg-slate-300 dark:hover:bg-white/10'
 }
 
 const jumpToQuestion = (targetIndex: number) => {
     if (targetIndex === currentQuestionIndex.value) return
     
-    // ตรวจสอบก่อนออกจากข้อปัจจุบัน (Validation before leaving current)
+    // Validation before leaving current (same logic as Next)
     if (targetIndex > currentQuestionIndex.value) {
-         // หากข้ามไปข้างหน้า จะต้องตรวจสอบว่าข้อปัจจุบันทำไปถึงไหนแล้ว 
+         // If jumping forward, we must validate the CURRENT question requirements
-         // ควรบังคับให้คลิกคำตอบก่อนจึงข้ามได้ (เงื่อนไขสำหรับคำถามที่ไม่ให้ข้าม)
+         // unless we treat grid jumps as free navigation? 
+         // Req: "user cannot go Next until the question is answered and saved" (if not skippable).
+         // So we must check restriction on the current spot before leaving.
          const isAnswered = userAnswers.value[currentQuestion.value.id] !== undefined
          const isSkippable = quizData.value?.is_skippable
          
@@ -92,35 +91,12 @@ const jumpToQuestion = (targetIndex: number) => {
          }
     }
     
-    // อนุญาตให้ย้อนกลับได้อย่างอิสระ (If jumping backward? Usually allowed freely.)
+    // If jumping backward? Usually allowed freely.
     
     currentQuestionIndex.value = targetIndex
 }
 
-const totalQuestionPages = computed(() => Math.ceil(totalQuestions.value / questionPageSize))
+// Computed
-
-const visibleQuestions = computed(() => {
-    if (!quizData.value?.questions) return []
-    const start = questionPage.value * questionPageSize
-    return quizData.value.questions.slice(start, start + questionPageSize).map((q: any, i: number) => ({
-        ...q,
-        originalIndex: start + i
-    }))
-})
-
-const nextQuestionPage = () => {
-    if (questionPage.value < totalQuestionPages.value - 1) {
-        questionPage.value++
-    }
-}
-
-const prevQuestionPage = () => {
-    if (questionPage.value > 0) {
-        questionPage.value--
-    }
-}
-
-// ตัวแปรแบบ Computed (Computed Properties)
 const currentQuestion = computed(() => {
     if (!quizData.value || !quizData.value.questions) return null
     return quizData.value.questions[currentQuestionIndex.value]
@@ -140,7 +116,7 @@ const timerDisplay = computed(() => {
   return `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`
 })
 
-// ฟังก์ชันช่วยเหลือสำหรับการแปลภาษา (Helper for localization)
+// Helper for localization
 const getLocalizedText = (text: any) => {
   if (!text) return ''
   if (typeof text === 'string') return text
@@ -150,7 +126,7 @@ const getLocalizedText = (text: any) => {
 
 const lessonProgress = ref<any>(null)
 
-// โหลดข้อมูล (Data Fetching)
+// Data Fetching
 const loadData = async () => {
     isLoading.value = true
     try {
@@ -162,9 +138,9 @@ const loadData = async () => {
         if (courseId && lessonId) {
             const lessonRes = await fetchLessonContent(courseId, lessonId)
             if (lessonRes.success) {
-                // กำหนดข้อมูลแบบทดสอบ (Determine if data is directly the quiz or nested)
+                // Determine if data is directly the quiz or nested
                 quizData.value = lessonRes.data.quiz || lessonRes.data
-                lessonProgress.value = lessonRes.progress // บันทึกความคืบหน้า (Capture progress)
+                lessonProgress.value = lessonRes.progress // Capture progress
                 if (quizData.value?.time_limit) {
                     timeLeft.value = quizData.value.time_limit * 60
                 }
@@ -177,7 +153,7 @@ const loadData = async () => {
     }
 }
 
-// ฟังก์ชันช่วยสุ่มเรียงลำดับอาร์เรย์ (Helper for shuffling)
+// Helper for shuffling
 const shuffleArray = <T>(array: T[]): T[] => {
     return array
         .map(value => ({ value, sort: Math.random() }))
@@ -185,18 +161,18 @@ const shuffleArray = <T>(array: T[]): T[] => {
         .map(({ value }) => value)
 }
 
-// การกระทำในแบบทดสอบ (Quiz Actions)
+// Quiz Actions
 const startQuiz = () => {
-  // รีเซ็ตข้อมูลโดยคัดลอกใหม่เพื่อนำมาสุ่ม (Deep copy to reset and apply shuffle)
+  // Deep copy to reset and apply shuffle
   const rawQuiz = JSON.parse(JSON.stringify(quizData.value))
   
   if (rawQuiz) {
-      // สุ่มคำถาม (Shuffle Questions)
+      // Shuffle Questions
       if (rawQuiz.shuffle_questions && rawQuiz.questions) {
           rawQuiz.questions = shuffleArray(rawQuiz.questions)
       }
       
-      // สุ่มตัวเลือกคำตอบ (Shuffle Choices)
+      // Shuffle Choices
       if (rawQuiz.shuffle_choices && rawQuiz.questions) {
           rawQuiz.questions.forEach((q: any) => {
               if (q.choices) {
@@ -204,7 +180,7 @@ const startQuiz = () => {
               }
           })
       }
-      // อัปเดตข้อมูลให้เป็นแบบสุ่ม (Update state with shuffled data)
+      // Update state with shuffled data
       quizData.value = rawQuiz
   }
 
@@ -220,7 +196,7 @@ const startQuiz = () => {
       }, 1000)
   }
   
-  // ทำเครื่องหมายข้อแรกว่าเปิดดูแล้ว (Mark first as visited)
+  // Mark first as visited
   visitedQuestions.value = new Set([0])
 }
 
@@ -233,12 +209,12 @@ const selectAnswer = (choiceId: number) => {
 const nextQuestion = () => {
     if (!currentQuestion.value) return
 
-    // อนุญาตให้ข้ามได้หากโหมดข้ามเปิดอยู่ หรือ ตอบแล้ว (Allow skip if quiz is skippable or question is answered)
+    // Allow skip if quiz is skippable or question is answered
     const isAnswered = userAnswers.value[currentQuestion.value.id] !== undefined
     const isSkippable = quizData.value?.is_skippable
 
     if (!isAnswered && !isSkippable) {
-        // แสดงข้อความเตือน (Show warning)
+        // Show warning
         $q.notify({
             type: 'warning',
             message: t('quiz.pleaseSelectAnswer', 'กรุณาเลือกคำตอบ'),
@@ -265,7 +241,7 @@ const retryQuiz = () => {
 }
 
 const submitQuiz = async (auto = false) => {
-  // 1. ตรวจสอบก่อนว่าทำครบทุกข้อหรือยัง (Manual Validation: Check if all questions are answered)
+  // 1. Manual Validation: Check if all questions are answered
   if (!auto) {
      const answeredCount = Object.keys(userAnswers.value).length
      if (answeredCount < totalQuestions.value) {
@@ -278,7 +254,7 @@ const submitQuiz = async (auto = false) => {
         return
      }
 
-     // หน้าต่างยืนยันส่งข้อสอบแบบสวยงาม (Premium Confirmation before submission)
+     // Premium Confirmation before submission
      $q.dialog({
          title: `<div class="text-slate-900 dark:text-white font-black text-xl">${t('quiz.warningTitle')}</div>`,
          message: `<div class="text-slate-600 dark:text-slate-300 text-base leading-relaxed mt-2">${t('quiz.submitConfirm')}</div>`,
@@ -309,33 +285,33 @@ const submitQuiz = async (auto = false) => {
 }
 
 const processSubmitQuiz = async (auto = false) => {
-  // 2. เริ่มขั้นตอนการส่งข้อสอบ (Start Submission Process)
+  // 2. Start Submission Process
   if (timerInterval) clearInterval(timerInterval)
   
   isSubmitting.value = true
-  currentScreen.value = 'result' // เปลี่ยนหน้าไปที่หน้าสรุปผล (Switch to result screen to show progress)
+  currentScreen.value = 'result' // Switch to result screen to show progress
   
   try {
-      // เตรียมข้อมูลยิง API (Prepare Payload)
+      // Prepare Payload
       const answersPayload = Object.entries(userAnswers.value).map(([qId, cId]) => ({
           question_id: Number(qId),
           choice_id: cId
       }))
 
-      // ตรวจสอบว่าเคยผ่านแล้วหรือไม่ (Check if already passed)
+      // Check if already passed
       const alreadyPassed = lessonProgress.value?.is_passed || lessonProgress.value?.is_completed || false
 
-      // เรียก API (Call API)
+      // Call API
       const res = await apiSubmitQuiz(courseId, lessonId, answersPayload, alreadyPassed)
       
       if (res.success && res.data) {
           quizResult.value = res.data
-          // อัปเดตข้อมูลบนเว็บหากผ่านแบบทดสอบ (Update local progress if passed and not previously passed)
+          // Update local progress if passed and not previously passed
           if (res.data.is_passed && !alreadyPassed) {
              if (lessonProgress.value) lessonProgress.value.is_passed = true
           }
       } else {
-          // การจัดการเมื่อเกิดข้อผิดพลาดฉุกเฉิน (Fallback error handling)
+          // Fallback error handling
           $q.notify({
               type: 'negative',
               message: res.error || 'Failed to submit quiz'
@@ -388,14 +364,14 @@ const reviewQuiz = () => {
     currentScreen.value = 'review'
 }
 
-// เปลี่ยน ID เป็นตัวอักษรเพื่อความสวยงาม (A, B, C...) (Helper to get choice label (A, B, C...))
+// Helper to get choice label (A, B, C...)
 const getChoiceLabel = (index: number) => {
     return String.fromCharCode(65 + index) // 65 is 'A'
 }
 
 const getCorrectChoiceId = (questionId: number) => {
     if (!quizResult.value?.answers_review) return null
-    // เช็คข้อมูลก่อนพัง (Type checking for safety)
+    // Type checking for safety
     const review = Array.isArray(quizResult.value.answers_review) 
         ? quizResult.value.answers_review.find((r: any) => r.question_id === questionId)
         : null
@@ -408,7 +384,7 @@ const getCorrectChoiceId = (questionId: number) => {
     <q-page-container>
       <q-page>
         <div class="quiz-shell min-h-screen bg-slate-50 dark:bg-[#0b0f1a] text-slate-900 dark:text-slate-200 antialiased selection:bg-blue-500/20 transition-colors">
-    <!-- ส่วนหัว (Header) -->
+    <!-- Header -->
     <header class="h-14 bg-white dark:!bg-[var(--bg-surface)] fixed top-0 inset-x-0 z-[100] flex items-center px-6 border-b border-slate-200 dark:border-white/5 transition-colors">
       <div class="flex items-center w-full justify-between">
         <div class="flex items-center">
@@ -434,7 +410,7 @@ const getCorrectChoiceId = (questionId: number) => {
       </div>
     </header>
 
-    <!-- พื้นที่เนื้อหาหลัก (Main Content Area) -->
+    <!-- Main Content Area -->
     <main class="pt-14 h-screen flex items-center justify-center overflow-y-auto px-4 custom-scrollbar">
       
       <div v-if="isLoading" class="flex flex-col items-center gap-4">
@@ -459,9 +435,9 @@ const getCorrectChoiceId = (questionId: number) => {
       </div>
 
       <template v-else>
-          <!-- 1. หน้าเริ่มต้น (START SCREEN) -->
+          <!-- 1. START SCREEN -->
           <div v-if="currentScreen === 'start'" class="w-full max-w-[640px] animate-fade-in py-12">
-             <!-- ... (หน้าแรกยังคงเหมือนเดิม แปะไว้เป็น reference) ... -->
+             <!-- ... (Start Screen is unchanged but needs to be here for context) ... -->
              <div class="bg-white dark:!bg-[#1e293b] border border-slate-200 dark:border-white/5 rounded-[32px] p-8 md:p-14 shadow-lg dark:shadow-2xl relative overflow-hidden transition-colors">
                
                <div class="flex justify-center mb-10">
@@ -483,7 +459,7 @@ const getCorrectChoiceId = (questionId: number) => {
                  </p>
                </div>
 
-               <!-- กล่องคำแนะนำ (Instruction Box) -->
+               <!-- Instruction Box -->
                <div class="bg-slate-50 dark:bg-[#0b121f]/80 p-8 rounded-3xl mb-8 border border-slate-100 dark:border-white/5">
                   <h3 class="text-[12px] font-black text-slate-500 dark:text-slate-400 mb-6 uppercase tracking-[0.2em] flex items-center gap-2">
                      {{ $t('quiz.instructionTitle') }}
@@ -507,58 +483,35 @@ const getCorrectChoiceId = (questionId: number) => {
              </div>
           </div>
 
-          <!-- 2. หน้าทำแบบทดสอบ (TAKING SCREEN) -->
+          <!-- 2. TAKING SCREEN -->
+          <!-- 2. TAKING SCREEN -->
           <div v-if="currentScreen === 'taking'" class="w-full max-w-[840px] animate-fade-in py-12">
              <div v-if="currentQuestion" class="bg-white dark:!bg-[#1e293b] border border-slate-200 dark:border-white/5 rounded-[32px] p-8 md:p-12 shadow-xl relative overflow-hidden">
 
-                 <!-- แถบความคืบหน้า (Progress Bar) -->
+                 <!-- Progress Bar -->
                  <div class="absolute top-0 left-0 right-0 h-1.5 bg-slate-100 dark:bg-white/5">
                      <div class="h-full bg-blue-500 transition-all duration-300" :style="{ width: ((currentQuestionIndex + 1) / totalQuestions) * 100 + '%' }"></div>
                  </div>
 
-                 <!-- แผนที่คำถาม / การเปลี่ยนหน้า (Question Map / Pagination) -->
+                 <!-- Question Map / Pagination -->
-                 <div class="flex items-center justify-center gap-2 mb-8 mt-4 select-none bg-slate-50 dark:bg-[#0b121f]/50 p-2 rounded-2xl border border-slate-100 dark:border-white/5 w-fit mx-auto">
+                 <div class="flex flex-wrap gap-2 mb-8 mt-4">
-                     <!-- ปุ่มย้อนกลับ (หน้าก่อนหน้า) -->
                      <button
-                        v-if="totalQuestionPages > 1" 
+                         v-for="(q, idx) in quizData?.questions"
-                        @click="prevQuestionPage" 
-                        :disabled="questionPage === 0"
-                        class="w-8 h-8 md:w-10 md:h-10 rounded-lg flex items-center justify-center transition-all flex-shrink-0"
-                        :class="questionPage === 0 ? 'text-slate-300 dark:text-slate-600 bg-transparent cursor-not-allowed' : 'text-slate-600 dark:text-slate-300 bg-white dark:bg-[#1e293b] hover:bg-slate-200 dark:hover:bg-white/10 shadow-sm border border-slate-200 dark:border-white/10 text-lg hover:-translate-x-0.5'"
-                     >
-                         <q-icon name="chevron_left" />
-                     </button>
-                     
-                     <div class="flex flex-wrap items-center justify-center gap-2">
-                         <button
-                             v-for="q in visibleQuestions"
                          :key="q.id"
-                             @click="jumpToQuestion(q.originalIndex)"
+                         @click="jumpToQuestion(Number(idx))"
                          class="w-8 h-8 md:w-10 md:h-10 rounded-lg flex items-center justify-center text-xs md:text-sm font-bold transition-all border"
-                             :class="getQuestionStatusClass(q.originalIndex, q.id)"
+                         :class="getQuestionStatusClass(Number(idx), q.id)"
                      >
-                             {{ q.originalIndex + 1 }}
+                         {{ Number(idx) + 1 }}
                      </button>
                  </div>
 
-                     <!-- ปุ่มถัดไป (หน้าถัดไป) -->
+                 <!-- Question Title -->
-                     <button 
-                        v-if="totalQuestionPages > 1" 
-                        @click="nextQuestionPage" 
-                        :disabled="questionPage === totalQuestionPages - 1"
-                        class="w-8 h-8 md:w-10 md:h-10 rounded-lg flex items-center justify-center transition-all flex-shrink-0"
-                        :class="questionPage === totalQuestionPages - 1 ? 'text-slate-300 dark:text-slate-600 bg-slate-100 dark:bg-white/5 cursor-not-allowed' : 'text-slate-600 dark:text-slate-300 bg-white dark:bg-[#1e293b] hover:bg-slate-100 dark:hover:bg-white/10 shadow-sm border border-slate-200 dark:border-white/10 text-lg hover:translate-x-0.5'"
-                     >
-                         <q-icon name="chevron_right" />
-                     </button>
-                 </div>
-
-                 <!-- ชื่อคำถาม (Question Title) -->
                  <h3 class="text-xl md:text-2xl font-bold text-slate-900 dark:text-white mb-10 leading-relaxed">
                      {{ getLocalizedText(currentQuestion.question) }}
                  </h3>
 
-                 <!-- ส่วนการเลือกคำตอบ (Choices) -->
+                 <!-- Choices -->
                  <div class="flex flex-col gap-4 mb-12">
                      <button 
                          v-for="choice in currentQuestion.choices" 
@@ -580,7 +533,7 @@ const getCorrectChoiceId = (questionId: number) => {
 
 
 
-                 <!-- ปุ่มควบคุมต่างๆ (Controls) -->
+                 <!-- Controls -->
                  <div class="flex justify-between items-center pt-8 border-t border-slate-100 dark:border-white/5">
                      <button 
                          @click="prevQuestion" 
@@ -610,7 +563,7 @@ const getCorrectChoiceId = (questionId: number) => {
 
 
 
-           <!-- 3. หน้าผลลัพธ์การทำแบบทดสอบ (RESULT SCREEN) -->
+           <!-- 3. RESULT SCREEN -->
           <div v-if="currentScreen === 'result'" class="w-full max-w-[640px] animate-fade-in py-12">
              <div class="bg-white dark:!bg-[#1e293b] border border-slate-200 dark:border-white/5 rounded-[40px] p-10 shadow-2xl text-center relative overflow-hidden">
                  
@@ -633,7 +586,7 @@ const getCorrectChoiceId = (questionId: number) => {
                      </p>
                  </div>
 
-                 <!-- บัตรแสดงคะแนน (Score Card) -->
+                 <!-- Score Card -->
                  <div class="bg-slate-50 dark:bg-[#0b121f] rounded-3xl p-6 mb-8 flex items-center justify-around border border-slate-100 dark:border-white/5">
                      <div class="text-center">
                          <div class="text-xs font-black text-slate-400 uppercase tracking-widest mb-1">{{ $t('quiz.scoreLabel') }}</div>
@@ -673,7 +626,7 @@ const getCorrectChoiceId = (questionId: number) => {
              </div>
           </div>
 
-          <!-- 4. หน้าทบทวนข้อสอบ (REVIEW SCREEN) -->
+          <!-- 4. REVIEW SCREEN -->
           <div v-if="currentScreen === 'review'" class="w-full max-w-[840px] animate-fade-in py-12 pb-24">
              <div class="space-y-6">
                  <div 
@@ -699,7 +652,7 @@ const getCorrectChoiceId = (questionId: number) => {
                                       'border-slate-100 dark:border-white/5 opacity-80 dark:opacity-40': userAnswers[question.id] !== choice.id && choice.id !== getCorrectChoiceId(question.id)
                                   }"
                                 >
-                                    <!-- ไอคอนสถานะ (Indicator Icon) -->
+                                    <!-- Indicator Icon -->
                                     <div 
                                       class="w-8 h-8 rounded-full flex items-center justify-center flex-shrink-0 font-bold text-sm border-2"
                                       :class="{
@@ -715,7 +668,7 @@ const getCorrectChoiceId = (questionId: number) => {
 
                                     <span class="font-medium text-slate-700 dark:text-slate-300">{{ getLocalizedText(choice.text) }}</span>
                                     
-                                    <!-- ป้ายแสดงสถานะ (Label Badge) -->
+                                    <!-- Label Badge -->
                                     <div v-if="choice.id === getCorrectChoiceId(question.id)" class="ml-auto px-2 py-0.5 bg-emerald-100 dark:bg-emerald-500/20 text-emerald-700 dark:text-emerald-300 text-xs font-bold rounded uppercase tracking-wider">
                                         {{ $t('quiz.correctLabel', 'Correct') }}
                                     </div>
@@ -742,11 +695,11 @@ const getCorrectChoiceId = (questionId: number) => {
     </main>
 
 
-        </div> <!-- ปิดส่วนเปลือกข้อสอบ (Close quiz-shell) -->
+        </div> <!-- Close quiz-shell -->
 
 
-       <!-- ป๊อปอัปแผนที่คำถาม (เดสก์ท็อป) - อยู่นอกพื้นที่ทำงานปกติ (Question Navigator Sidebar/Floating (Desktop) - Outside Main Flow) -->
+       <!-- Question Navigator Sidebar/Floating (Desktop) - Outside Main Flow -->
-       <!-- ใช้งาน QPageSticky ให้ถูกที่ (Using QPageSticky properly inside q-page/q-layout context we added) -->
+       <!-- Using QPageSticky properly inside q-page/q-layout context we added -->
       <q-page-sticky
         v-if="false"
         position="top-right"

Frontend-Learner/pages/course/[id].vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 /**
  * @file [id].vue
- * @description หน้าแสดงรายละเอียดคอร์ส (Dynamic Course Detail Page)
+ * @description Dynamic Course Detail Page.
- * ดึงข้อมูลคอร์สเรียนตาม ID ที่ส่งมาใน URL และมีปุ่มสำหรับចុះทะเบียน
+ * Displays detailed information about a specific course based on the ID.
  */
 
 definePageMeta({
@@ -114,7 +114,7 @@ useHead({
         />
       </div>
       
-      <!-- ส่วนแสดงผลขณะโหลดข้อมูลหรือเกิดข้อผิดพลาด (Loading / Error State) -->
+      <!-- Loading / Error State -->
       <div v-else class="text-center py-20">
          <div v-if="error" class="text-red-500 mb-4">
              <p class="font-bold">เกิดข้อผิดพลาดในการโหลดข้อมูล</p>

Frontend-Learner/pages/dashboard/announcements.vue

@@ -1,17 +1,17 @@
 <script setup lang="ts">
 /**
  * @file announcements.vue
- * @description หน้าแสดงประกาศระบบและข่าวสารเกี่ยวกับคอร์สเรียน (Page displaying system and course-related announcements.)
+ * @description Page displaying system and course-related announcements.
- * ใช้เลย์เอาต์เริ่มต้นและต้องตรวจสอบสิทธิ์ (Uses the default layout and requires authentication.)
+ * Uses the default layout and requires authentication.
  */
 
-// ข้อมูล metadata ของหน้า: ใช้เลย์เอาต์ 'default' และระบบตรวจสอบสิทธิ์ 'auth' (Define page metadata: usage of 'default' layout and 'auth' middleware)
+// Define page metadata: usage of 'default' layout and 'auth' middleware
 definePageMeta({
   layout: 'default',
   middleware: 'auth'
 })
 
-// กำหนดชื่อหัวหน้าเว็บสำหรับ SEO (Set page title for SEO)
+// Set page title for SEO
 useHead({
   title: 'ประกาศ - e-Learning'
 })
@@ -19,22 +19,22 @@ useHead({
 
 <template>
   <div class="page-container">
-    <!-- ส่วนหัวหน้าเว็บ (Page Header) -->
+    <!-- Page Header -->
     <h1 class="text-3xl font-black mb-10 text-slate-900 dark:text-white">ประกาศ</h1>
 
     <!-- 
-      โครงสร้างหลัก: กริด 12 คอลัมน์ (Main Layout: 12-column Grid)
+      Main Layout: 12-column Grid 
-      - คอลัมน์ซ้าย (span-8): เนื้อหาประกาศหลัก (Left Column: Main announcements content)
+      - Left Column (span-8): Main announcements content
-      - คอลัมน์ขวา (span-4): แถบหมวดหมู่/ตัวกรอง (Right Column: Categories/Filter sidebar)
+      - Right Column (span-4): Categories/Filter sidebar
     -->
     <div class="grid-12">
       
       <!-- ==========================================
-           พื้นที่เนื้อหาหลัก (ด้านซ้าย) (MAIN CONTENT AREA (Left))
+           MAIN CONTENT AREA (Left)
       ========================================== -->
       <div class="col-span-8">
         
-        <!-- หน้าที่ 1: ประกาศระบบสำคัญ (Feature 1: Critical System Announcement) -->
+        <!-- Feature 1: Critical System Announcement -->
         <div class="card mb-6">
           <div class="flex items-center gap-2 mb-2">
             <span class="status-pill status-warning">สำคัญ</span>
@@ -42,13 +42,13 @@ useHead({
           </div>
           <h2 class="text-xl font-bold mb-4 text-slate-900 dark:text-white">แจ้งปิดปรับปรุงระบบ</h2>
           <p class="mb-4">เราจะทำการปิดปรับปรุงระบบในวันที่ 25 ธ.ค. เวลา 02:00 - 04:00 น. ขออภัยในความไม่สะดวก</p>
-          <!-- ส่วนแนบไฟล์ (Attachment Block) -->
+          <!-- Attachment Block -->
           <div class="flex items-center gap-2 p-3 rounded" style="background: var(--neutral-50); border: 1px solid var(--border-color); width: fit-content;">
             <span>📎</span> <span class="text-sm font-bold">ตารางการปิดปรับปรุง.pdf</span>
           </div>
         </div>
 
-        <!-- ประกาศ: อัปเดตคอร์ส UX/UI (Announcement: UX/UI Course Update) -->
+        <!-- Announcement: UX/UI Course Update -->
         <div class="card mb-4" style="border-left: 4px solid var(--primary);">
           <div class="flex justify-between items-start mb-2" style="flex-wrap: wrap; gap: 8px;">
             <div>
@@ -61,7 +61,7 @@ useHead({
           <NuxtLink to="/browse/discovery" class="text-sm" style="color: var(--primary);">ดูรายละเอียดคอร์ส</NuxtLink>
         </div>
 
-        <!-- ประกาศ: เอกสารประกอบการเรียนด้านการเข้าถึงเว็บ (WCAG) (Announcement: Accessibility (WCAG) Material) -->
+        <!-- Announcement: Accessibility (WCAG) Material -->
         <div class="card mb-4" style="border-left: 4px solid var(--success);">
           <div class="flex justify-between items-start mb-2" style="flex-wrap: wrap; gap: 8px;">
             <div>
@@ -71,13 +71,13 @@ useHead({
             <span class="text-sm text-slate-600 dark:text-slate-400">22 ธ.ค. 2024</span>
           </div>
           <p class="text-slate-700 dark:text-slate-300 mb-2">เราได้เพิ่มไฟล์ PDF สรุปเกณฑ์ WCAG 2.2 ในส่วนของเอกสารประกอบการเรียนแล้ว...</p>
-          <!-- ไฟล์แนบแบบเล็ก (Small Attachment) -->
+          <!-- Small Attachment -->
           <div class="flex items-center gap-2 p-2 rounded mt-2" style="background: var(--neutral-50); border: 1px dotted var(--border-color); width: fit-content;">
             <span>📄</span> <span class="text-xs">WCAG_2.2_Summary.pdf</span>
           </div>
         </div>
 
-        <!-- ประกาศ: อัปเดตคอร์ส React (Announcement: React Course Update) -->
+        <!-- Announcement: React Course Update -->
         <div class="card mb-4" style="border-left: 4px solid var(--warning);">
           <div class="flex justify-between items-start mb-2" style="flex-wrap: wrap; gap: 8px;">
             <div>
@@ -90,7 +90,7 @@ useHead({
           <NuxtLink to="/classroom/learning" class="btn btn-secondary text-sm" style="width: fit-content;">เข้าสู่บทเรียน</NuxtLink>
         </div>
 
-        <!-- ประกาศ: คอร์สใหม่ทั่วไป (Announcement: General New Course) -->
+        <!-- Announcement: General New Course -->
         <div class="card mb-4">
           <div class="flex justify-between items-start mb-2" style="flex-wrap: wrap; gap: 8px;">
             <h3 class="font-bold text-slate-900 dark:text-white">คอร์สใหม่: Advanced Python</h3>
@@ -100,7 +100,7 @@ useHead({
           <a href="#" class="text-sm" style="color: var(--primary);">อ่านเพิ่มเติม</a>
         </div>
 
-        <!-- ประกาศ: อัปเดตแพลตฟอร์ม (Announcement: Platform Update) -->
+        <!-- Announcement: Platform Update -->
         <div class="card mb-4">
           <div class="flex justify-between items-start mb-2" style="flex-wrap: wrap; gap: 8px;">
             <h3 class="font-bold text-slate-900 dark:text-white">ยินดีต้อนรับสู่ดีไซน์ใหม่!</h3>
@@ -112,24 +112,24 @@ useHead({
       </div>
 
       <!-- ==========================================
-           แถบด้านข้าง (ด้านขวา) (SIDEBAR (Right))
+           SIDEBAR (Right)
-           ตัวกรองหมวดหมู่ (Category Filters)
+           Category Filters
       ========================================== -->
       <div class="col-span-4">
         <div class="card">
           <h3 class="font-bold mb-4 text-slate-900 dark:text-white">หมวดหมู่</h3>
           <ul class="flex flex-col gap-2">
-            <!-- ตัวเลือกตัวกรอง: ทั้งหมด (Filter Option: All) -->
+            <!-- Filter Option: All -->
             <li class="flex justify-between items-center p-2 rounded cursor-pointer" style="background: var(--neutral-50);">
               <span>ทั้งหมด</span>
               <span class="text-muted">15</span>
             </li>
-            <!-- ตัวเลือกตัวกรอง: อัปเดตระบบ (Filter Option: System Updates) -->
+            <!-- Filter Option: System Updates -->
             <li class="flex justify-between items-center p-2 rounded cursor-pointer">
               <span>อัปเดตระบบ</span>
               <span class="text-muted">3</span>
             </li>
-            <!-- ตัวเลือกตัวกรอง: ข่าวสารคอร์ส (Filter Option: Course News) -->
+            <!-- Filter Option: Course News -->
             <li class="flex justify-between items-center p-2 rounded cursor-pointer">
               <span>ข่าวสารคอร์ส</span>
               <span class="text-muted">11</span>

Frontend-Learner/pages/dashboard/index.vue

@@ -1,46 +1,44 @@
 <script setup lang="ts">
 /**
  * @file index.vue
- * @description หน้าหลักแดชบอร์ด (Dashboard Home)
+ * @description Dashboard Home Page matching FutureSkill design
  */
 
-// 1. นำเข้าระบบและกำหนด MetaData
 definePageMeta({
   layout: "default",
   middleware: "auth",
 });
 
 useHead({
-  title: "Dashboard - e-Learning Platform",
+  title: "Dashboard - FutureSkill Clone",
 });
 
-// 2. เรียกใช้งาน Composables
 const { currentUser } = useAuth();
 const { fetchCourses, fetchEnrolledCourses, getLocalizedText } = useCourse();
 const { fetchCategories } = useCategory();
 const { t } = useI18n();
 
-// 3. กำหนดสถานะ (State)
+// State
 const enrolledCourses = ref<any[]>([]);
 const recommendedCourses = ref<any[]>([]);
 const libraryCourses = ref<any[]>([]);
 const categories = ref<any[]>([]);
+
 const isLoading = ref(true);
 
-// 4. การจัดการโหลดข้อมูล (Data Initialization)
+// Initial Data Fetch
 onMounted(async () => {
   isLoading.value = true;
   try {
-    const [catRes, enrollRes, courseRes, allCoursesRes] = await Promise.all([
+    const [catRes, enrollRes, courseRes] = await Promise.all([
       fetchCategories(),
-      fetchEnrolledCourses({ limit: 10 }), // ดึงข้อมูลคอร์สที่ลงทะเบียนไว้
+      fetchEnrolledCourses({ limit: 10 }), // Fetch more enrolled courses for library section
       fetchCourses({
         limit: 3,
         random: true,
         forceRefresh: true,
         is_recommended: true,
-      }), // ดึงข้อมูลคอร์สแนะนำ
+      }), // Fetch 3 Recommended Courses
-      fetchCourses({ limit: 1000 }) // สำหรับแมปหมวดหมู่
     ]);
 
     if (catRes.success) {
@@ -50,44 +48,36 @@ onMounted(async () => {
     const catMap = new Map();
     categories.value.forEach((c: any) => catMap.set(c.id, c.name));
 
-    const catIdMap = new Map();
+    // Map Enrolled Courses
-    if (allCoursesRes && allCoursesRes.success && allCoursesRes.data) {
-        allCoursesRes.data.forEach((c: any) => catIdMap.set(c.id, c.category_id));
-    }
-
-    // จัดการข้อมูลคอร์สที่ลงทะเบียน (Mapping Enrolled Courses)
     if (enrollRes.success && enrollRes.data) {
+      // Sort by last_accessed_at descending (Newest first)
       const sortedEnrollments = [...enrollRes.data].sort((a, b) => {
         const dateA = new Date(a.last_accessed_at || a.enrolled_at).getTime();
         const dateB = new Date(b.last_accessed_at || b.enrolled_at).getTime();
         return dateB - dateA;
       });
 
-      enrolledCourses.value = sortedEnrollments.map((item: any) => {
+      enrolledCourses.value = sortedEnrollments.map((item: any) => ({
-        const mappedCategoryId = catIdMap.get(item.course.id) || item.course.category_id;
-        
-        return {
         id: item.course_id,
         title: item.course.title,
         thumbnail_url: item.course.thumbnail_url,
         progress: item.progress_percentage || 0,
-          total_lessons: item.course.total_lessons || 0,
+        total_lessons: item.course.total_lessons || 10,
         completed_lessons: Math.floor(
-            (item.progress_percentage / 100) * (item.course.total_lessons || 0),
+          (item.progress_percentage / 100) * (item.course.total_lessons || 10),
         ),
-          category: catMap.get(mappedCategoryId),
+        // For CourseCard compatibility in library section
+        category: catMap.get(item.course.category_id),
         lessons: item.course.total_lessons || 0,
         image: item.course.thumbnail_url,
         enrolled: true,
-          instructor: item.course.creator || item.course.instructor,
+      }));
-          last_accessed: item.last_accessed_at || item.enrolled_at
-        };
-      });
 
+      // Update libraryCourses with only 2 courses
       libraryCourses.value = enrolledCourses.value.slice(0, 2);
     }
 
-    // จัดการข้อมูลคอร์สแนะนำ (Mapping Recommended Courses)
+    // Map Recommended Courses
     if (courseRes.success && courseRes.data) {
       recommendedCourses.value = courseRes.data.map((c: any) => ({
         id: c.id,
@@ -108,215 +98,328 @@ onMounted(async () => {
   }
 });
 
-// 5. ตัวแปร Computed และฟังก์ชันเสริม
+// Helper for "Continue Learning" Hero Card
 const heroCourse = computed(() => enrolledCourses.value[0] || null);
 const sideCourses = computed(() => enrolledCourses.value.slice(1, 3));
-
-const navigateToCategory = (catName: string) => {
-  const cat = categories.value.find(c => getLocalizedText(c.name) === catName);
-  if (cat) {
-    navigateTo(`/browse/discovery?category_id=${cat.id}`);
-  } else {
-    navigateTo(`/browse/discovery`);
-  }
-}
 </script>
 
 <template>
-  <div class="bg-[#F8F9FA] dark:bg-[#020617] min-h-screen font-inter p-4 md:p-8 transition-colors duration-300">
+  <div class="bg-[#F8F9FA] dark:bg-[#020617] min-h-screen font-inter pb-20 transition-colors duration-300">
-    <div class="max-w-[1400px] mx-auto grid grid-cols-1 xl:grid-cols-3 gap-8">
+    <div class="container mx-auto px-6 md:px-12 space-y-16 mt-10">
+      <!-- 1. Dashboard Hero Banner (Refined) -->
+      <section
+        class="relative overflow-hidden bg-gradient-to-br from-white to-slate-50 dark:from-slate-900 dark:to-slate-950 rounded-[2rem] py-10 md:py-14 px-8 md:px-12 shadow-sm border border-slate-100 dark:border-slate-800 flex flex-col items-center text-center transition-colors duration-300"
+      >
+        <!-- Subtle Decorative Elements -->
+        <div
+          class="absolute top-[-20%] left-[-10%] w-[300px] h-[300px] bg-blue-500/5 dark:bg-blue-500/10 rounded-full blur-3xl -z-10"
+        />
+        <div
+          class="absolute bottom-[-20%] right-[-10%] w-[300px] h-[300px] bg-indigo-500/5 dark:bg-indigo-500/10 rounded-full blur-3xl -z-10"
+        />
 
-      <!-- คอลัมน์ซ้าย (เนื้อหาหลัก) -->
+        <div class="max-w-2xl space-y-6 relative z-10">
-      <div class="xl:col-span-2 space-y-6">
+          <h1
+            class="text-3xl md:text-4xl lg:text-5xl font-bold text-slate-900 dark:text-white leading-[1.5] tracking-tight"
+          >
+            {{ $t("dashboard.heroTitle") }}
+            <span class="inline-block text-blue-600 dark:text-blue-400 mt-1 md:mt-2">{{
+              $t("dashboard.heroSubtitle")
+            }}</span>
+          </h1>
 
-        <!-- ป้ายต้อนรับ (Welcome Banner) -->
+          <p
-        <div class="bg-[#3B6BE8] rounded-[2rem] p-6 md:p-10 relative overflow-hidden text-white shadow-[0_8px_30px_rgb(59,107,232,0.2)]">
+            class="text-slate-500 dark:text-slate-400 font-medium text-base md:text-lg max-w-xl mx-auto leading-relaxed"
-           <!-- ลวดลายพื้นหลังและดาวตกแต่ง -->
+          >
-           <div class="absolute inset-0 bg-grid-pattern opacity-10 md:opacity-20 pointer-events-none"></div>
+            {{ $t("dashboard.heroDesc") }}
-           <div class="absolute right-5 md:right-10 top-1/2 -translate-y-1/2 w-20 h-20 md:w-28 md:h-28 border border-white/20 rounded-[1.5rem] md:rounded-[2rem] flex items-center justify-center rotate-12 bg-white/5 backdrop-blur-sm opacity-30 md:opacity-100">
-             <q-icon name="auto_awesome" size="32px" md-size="48px" class="text-white" />
-           </div>
-
-           <div class="relative z-10 max-w-lg">
-             <h1 class="text-2xl md:text-4xl font-bold mb-2 md:mb-3 tracking-tight">{{ $t('dashboard.welcomeTitle') }} {{ currentUser?.firstName || 'User' }} !</h1>
-             <p class="text-blue-100/90 text-[13px] md:text-[15px] leading-relaxed mb-6 md:mb-8 font-medium">
-               {{ $t('dashboard.welcomeSubtitle') }}
           </p>
-             <button @click="navigateTo('/browse/discovery')" class="bg-white text-[#3B6BE8] font-bold px-5 py-2.5 md:px-6 md:py-3 rounded-full text-xs md:text-sm flex items-center gap-2 hover:bg-slate-50 hover:scale-105 shadow-md transition-all">
-               {{ $t('dashboard.moreCourses') }} <q-icon name="chevron_right" size="16px" />
-             </button>
-           </div>
-        </div>
 
-        <!-- การ์ดหมวดหมู่ด่วน (3 Stats Cards) -->
+          <div class="flex flex-wrap justify-center gap-4 pt-4">
-        <div class="grid grid-cols-1 sm:grid-cols-3 gap-4">
+            <q-btn
-           <!-- การออกแบบ -->
+              unelevated
-            <div @click="navigateToCategory('การออกแบบ')" class="bg-white dark:!bg-slate-900 rounded-[1.5rem] p-5 flex items-center gap-4 shadow-sm border border-slate-100 dark:border-slate-800 transition-all hover:scale-105 hover:shadow-md cursor-pointer">
+              rounded
-               <div class="w-12 h-12 rounded-2xl bg-[#E9EFFD] dark:bg-blue-900/30 text-[#3B6BE8] flex items-center justify-center shrink-0">
+              color="primary"
-                  <q-icon name="palette" size="24px" />
+              :label="$t('dashboard.goToMyCourses')"
-               </div>
+              class="px-8 h-[48px] font-bold no-caps shadow-lg shadow-blue-500/10 hover:-translate-y-0.5 transition-all text-sm"
-               <div>
+              to="/dashboard/my-courses"
-                  <h3 class="font-bold text-slate-800 dark:text-slate-200 text-sm">{{ $t('discovery.design') }}</h3>
+            />
-               </div>
+            <q-btn
-            </div>
+              outline
-           <!-- การเขียนโปรแกรม -->
+              rounded
-            <div @click="navigateToCategory('การเขียนโปรแกรม')" class="bg-white dark:!bg-slate-900 rounded-[1.5rem] p-5 flex items-center gap-4 shadow-sm border border-slate-100 dark:border-slate-800 transition-all hover:scale-105 hover:shadow-md cursor-pointer">
+              color="primary"
-               <div class="w-12 h-12 rounded-2xl bg-[#FFF3EB] dark:bg-orange-900/30 text-[#FF8A4C] flex items-center justify-center shrink-0">
+              :label="$t('dashboard.searchNewCourses')"
-                  <q-icon name="code" size="24px" />
+              class="px-8 h-[48px] font-bold no-caps hover:bg-white dark:hover:bg-slate-800 transition-all border-1 text-sm dark:text-white dark:border-slate-600"
-               </div>
+              style="border-width: 1.5px"
-               <div>
+              to="/browse/discovery"
-                  <h3 class="font-bold text-slate-800 dark:text-slate-200 text-sm">{{ $t('discovery.programming') }}</h3>
+            />
-               </div>
-            </div>
-           <!-- ธุรกิจ -->
-            <div @click="navigateToCategory('ธุรกิจ')" class="bg-white dark:!bg-slate-900 rounded-[1.5rem] p-5 flex items-center gap-4 shadow-sm border border-slate-100 dark:border-slate-800 transition-all hover:scale-105 hover:shadow-md cursor-pointer">
-               <div class="w-12 h-12 rounded-2xl bg-[#EBFAF6] dark:bg-emerald-900/30 text-[#10B981] flex items-center justify-center shrink-0">
-                  <q-icon name="work_outline" size="24px" />
-               </div>
-               <div>
-                  <h3 class="font-bold text-slate-800 dark:text-slate-200 text-sm">{{ $t('discovery.business') }}</h3>
-               </div>
           </div>
         </div>
+      </section>
 
-        <!-- ส่วนเรียนต่อจากครั้งก่อน (Continue Learning) -->
+      <!-- 2. Continue Learning Section -->
-        <div class="bg-white dark:!bg-slate-900 rounded-[2rem] p-6 md:p-8 shadow-sm border border-slate-100 dark:border-slate-800 transition-colors">
+      <section v-if="enrolledCourses.length > 0">
-          <div class="flex items-center justify-between mb-6">
+        <div class="flex justify-between items-end mb-6">
-             <h2 class="text-[1.35rem] font-bold text-slate-900 dark:text-white tracking-tight">{{ $t('dashboard.continueLearningTitle') }}</h2>
+          <h2 class="text-xl md:text-2xl font-bold text-[#2D2D2D] dark:text-white transition-colors">
-             <NuxtLink to="/dashboard/my-courses" class="text-[#3B6BE8] font-bold text-sm flex items-center gap-1 hover:underline">
+            {{ $t("dashboard.continueLearningTitle") }}
-               {{ $t('dashboard.viewAll') }}
+          </h2>
+          <NuxtLink
+            to="/dashboard/my-courses"
+            class="text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300 font-medium text-sm flex items-center gap-1 transition-colors"
+          >
+            {{ $t("dashboard.myCourses") }}
+            <q-icon name="arrow_forward" size="16px" />
           </NuxtLink>
         </div>
 
-          <div v-if="heroCourse" class="bg-[#F8F9FA] dark:bg-slate-800/50 rounded-3xl p-4 md:p-6 flex flex-col md:flex-row gap-6 md:gap-8 items-center border border-slate-100 dark:border-slate-800">
+        <div class="grid grid-cols-1 lg:grid-cols-2 gap-6 items-start">
-             <div class="w-full md:w-[35%] aspect-[4/3] rounded-[1.5rem] overflow-hidden flex-shrink-0 bg-slate-200">
+          <!-- Hero Card (Left) -->
-                <img :src="heroCourse.thumbnail_url" class="w-full h-full object-cover" />
+          <div
-             </div>
+            v-if="heroCourse"
-             
+            class="relative group cursor-pointer rounded-2xl overflow-hidden bg-white dark:bg-[#1e293b] shadow-sm border border-gray-100 dark:border-slate-700 hover:shadow-md transition-all h-[260px] md:h-[320px]"
-             <div class="flex-1 w-full flex flex-col">
+            @click="
-                <div class="flex items-center justify-between mb-3">
+              navigateTo(`/classroom/learning?course_id=${heroCourse.id}`)
-                   <!-- ป้ายบอกหมวดหมู่ (Category Badge) -->
+            "
-                   <div v-if="heroCourse.category">
+          >
-                      <span class="bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] dark:text-blue-400 px-3 py-1 rounded-full text-[11px] font-bold tracking-wide">{{ getLocalizedText(heroCourse.category) }}</span>
+            <img
-                   </div>
+              :src="heroCourse.thumbnail_url"
-                   <div v-else></div>
+              class="w-full h-full object-cover brightness-75 group-hover:brightness-90 transition-all duration-500"
-                   <span class="text-slate-400 dark:text-slate-400 text-xs flex items-center gap-1.5 font-medium" v-if="heroCourse.last_accessed">
-                     <q-icon name="schedule" size="14px" /> {{ $t('common.latest') }} {{ new Date(heroCourse.last_accessed).toLocaleDateString('th-TH', { day: 'numeric', month: 'short' }) }}
-                   </span>
-                </div>
-                
-                <h3 class="text-2xl font-bold text-slate-900 dark:text-white mb-2 leading-snug line-clamp-2">
-                  {{ getLocalizedText(heroCourse.title) || 'Advanced UI/UX Design มาสเตอร์คลาส' }}
-                </h3>
-                <!-- ไม่แสดงเลขบทเรียนตามที่ได้รับคำขอมา (Removed Lesson Title/Number as per request) -->
-                
-                <div class="mb-6 mt-4">
-                   <div class="flex justify-between text-[13px] font-bold mb-2">
-                      <span class="text-[#3B6BE8] dark:text-blue-400">{{ $t('course.progress') }}: {{ heroCourse.progress || 0 }}%</span>
-                   </div>
-                   <div class="h-2.5 w-full bg-slate-200 dark:bg-slate-700 rounded-full overflow-hidden">
-                      <div class="h-full bg-[#3B6BE8] rounded-full transition-all duration-500" :style="{ width: `${heroCourse.progress || 0}%` }"></div>
-                   </div>
-                </div>
-                
-                <div class="flex items-center justify-between mt-auto">
-                   <div class="flex items-center gap-3" v-if="heroCourse.instructor">
-                      <div class="w-10 h-10 rounded-full bg-orange-100 overflow-hidden shrink-0 border border-slate-200 dark:border-slate-700">
-                         <img :src="heroCourse.instructor.profile_image_url || heroCourse.instructor.photoURL || `https://api.dicebear.com/7.x/avataaars/svg?seed=${heroCourse.instructor.username || 'Inst'}`" class="w-full h-full object-cover" />
-                      </div>
-                      <div>
-                         <p class="font-bold text-slate-900 dark:text-white text-[13px] leading-tight mb-0.5">
-                           {{ heroCourse.instructor.firstName || heroCourse.instructor.first_name ? `${heroCourse.instructor.firstName || heroCourse.instructor.first_name} ${heroCourse.instructor.lastName || heroCourse.instructor.last_name || ''}` : heroCourse.instructor.username || 'ผู้สอน' }}
-                         </p>
-                         <p class="text-slate-500 dark:text-slate-400 text-[11px] font-medium line-clamp-1">{{ heroCourse.instructor.bio || heroCourse.instructor.role?.name?.th || 'Instructor' }}</p>
-                      </div>
-                   </div>
-                   <div v-else class="flex items-center gap-3"></div>
-                   <button @click="navigateTo(`/classroom/learning?course_id=${heroCourse.id}`)" class="bg-[#3B6BE8] hover:bg-blue-700 text-white px-5 py-2.5 rounded-full font-bold text-sm flex items-center gap-2 shadow-lg shadow-blue-500/20 transition-all hover:scale-105 shrink-0">
-                      <q-icon name="play_circle" size="18px" /> {{ $t('course.continueLearning') }}
-                   </button>
-                </div>
-             </div>
-          </div>
-          
-          <div v-else class="bg-[#F8F9FA] dark:bg-slate-800/50 rounded-3xl p-10 flex items-center justify-center text-slate-400 border border-dashed border-slate-200 dark:border-slate-700">
-             ไม่มีคอร์สเรียนปัจจุบัน
-          </div>
-        </div>
-      </div>
-      
-      <!-- คอลัมน์ขวา (แถบข้อมูลโปรไฟล์และคอร์สแนะนำ) -->
-      <div class="xl:col-span-1 space-y-6">
-         <!-- วิดเจ็ตโปรไฟล์ผู้ใช้ -->
-         <div class="bg-white dark:!bg-slate-900 rounded-[2rem] p-8 shadow-sm border border-slate-100 dark:border-slate-800 text-center flex flex-col items-center relative overflow-hidden transition-colors">
-            <!-- พื้นหลังตกแต่ง (decorative bg) -->
-            <div class="absolute top-0 left-0 right-0 h-24 bg-gradient-to-b from-[#F8FAFC] to-white dark:from-slate-800 dark:to-slate-900"></div>
-
-            <div class="relative z-10 w-24 h-24 rounded-full bg-white dark:bg-slate-800 mb-4 shadow-md flex items-center justify-center">
-               <UserAvatar 
-                  :photo-u-r-l="currentUser?.photoURL" 
-                  :first-name="currentUser?.firstName || 'ผู้ใช้งาน'" 
-                  :last-name="currentUser?.lastName" 
-                  size="88"
-                  class="rounded-full object-cover"
             />
 
+            <div
+              class="absolute inset-0 bg-gradient-to-t from-black/80 via-black/30 to-transparent p-8 flex flex-col justify-end"
+            >
+              <h3
+                class="text-white text-2xl font-bold mb-4 line-clamp-2 leading-snug shadow-black/50 drop-shadow-sm"
+              >
+                {{ getLocalizedText(heroCourse.title) }}
+              </h3>
+
+              <!-- Progress -->
+              <div class="w-full">
+                <div class="flex justify-end text-gray-300 text-xs mb-2">
+                  <span>{{ heroCourse.progress }}%</span>
+                </div>
+                <div
+                  class="h-1.5 w-full bg-white/20 rounded-full overflow-hidden"
+                >
+                  <div
+                    class="h-full rounded-full transition-all duration-500"
+                    :class="
+                      heroCourse.progress === 100
+                        ? 'bg-emerald-500'
+                        : 'bg-blue-500'
+                    "
+                    :style="{ width: `${heroCourse.progress}%` }"
+                  ></div>
+                </div>
+                <div class="mt-4 flex justify-end">
+                  <span
+                    class="font-bold text-sm hover:underline transition-colors"
+                    :class="
+                      heroCourse.progress === 100
+                        ? 'text-emerald-400'
+                        : 'text-white'
+                    "
+                  >
+                    {{
+                      heroCourse.progress === 100
+                        ? $t("dashboard.studyAgain")
+                        : $t("dashboard.continue")
+                    }}
+                  </span>
+                </div>
+              </div>
+            </div>
           </div>
 
-            <h2 class="text-xl font-bold text-slate-900 dark:text-white relative z-10 tracking-tight">
+          <!-- Side List (Right) -->
-              {{ currentUser?.firstName ? `${currentUser.firstName} ${currentUser.lastName || ''}` : 'ผู้ใช้งาน' }}
+          <div class="flex flex-col gap-4">
+            <div
+              v-for="course in sideCourses"
+              :key="course.id"
+              class="flex-1 bg-white dark:bg-[#1e293b] rounded-2xl p-4 border border-gray-100 dark:border-slate-700 shadow-sm hover:shadow-md transition-all flex gap-4 items-center"
+            >
+              <div class="w-32 h-20 rounded-xl overflow-hidden flex-shrink-0">
+                <img
+                  :src="course.thumbnail_url"
+                  class="w-full h-full object-cover"
+                />
+              </div>
+              <div
+                class="flex-grow min-w-0 flex flex-col justify-between h-full py-1"
+              >
+                <h4 class="text-gray-800 dark:text-slate-200 font-bold text-sm line-clamp-2 mb-2 transition-colors">
+                  {{ getLocalizedText(course.title) }}
+                </h4>
+
+                <div class="mt-auto">
+                  <div
+                    class="h-1.5 w-full bg-gray-100 dark:bg-slate-700 rounded-full overflow-hidden mb-2"
+                  >
+                    <div
+                      class="h-full rounded-full transition-all duration-500"
+                      :class="
+                        course.progress === 100
+                          ? 'bg-emerald-500'
+                          : 'bg-blue-600'
+                      "
+                      :style="{ width: `${course.progress}%` }"
+                    ></div>
+                  </div>
+                  <div class="flex justify-end items-center text-xs">
+                    <span
+                      class="font-bold cursor-pointer hover:underline transition-colors"
+                      :class="
+                        course.progress === 100
+                          ? 'text-emerald-600 dark:text-emerald-400'
+                          : 'text-blue-600 dark:text-blue-400'
+                      "
+                      @click="
+                        navigateTo(`/classroom/learning?course_id=${course.id}`)
+                      "
+                    >
+                      {{
+                        course.progress === 100
+                          ? $t("dashboard.studyAgain")
+                          : $t("dashboard.continue")
+                      }}
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <!-- Empty State Placeholder if less than 2 side courses -->
+            <div
+              v-if="sideCourses.length < 2"
+              class="flex-1 bg-gray-50 dark:bg-[#1e293b]/50 rounded-2xl border border-dashed border-gray-200 dark:border-slate-700 flex items-center justify-center text-gray-400 dark:text-slate-500 text-sm transition-colors"
+            >
+              {{ $t("dashboard.startNewCourse") }}
+            </div>
+          </div>
+        </div>
+      </section>
+
+      <!-- 3. Knowledge Library -->
+      <section>
+        <div class="mb-6">
+          <h2 class="text-xl md:text-2xl font-bold text-[#2D2D2D] dark:text-white mb-1 transition-colors">
+            {{ $t("dashboard.knowledgeLibrary") }}
           </h2>
-            <p class="text-slate-500 dark:text-slate-400 text-xs mt-1 relative z-10 font-medium tracking-wide">{{ $t('common.student') }}</p>
+          <p class="text-gray-500 dark:text-slate-400 text-sm transition-colors">
+            {{ $t("dashboard.libraryDesc") }}
+          </p>
+        </div>
 
-            <div class="flex w-full gap-3 mt-7 relative z-10 px-2">
+        <!-- Content when courses exist -->
-                <div class="flex-1 bg-[#F8FAFC] dark:bg-slate-800 rounded-2xl p-3.5 flex flex-col items-center justify-center transition-colors shadow-sm">
+        <div
-                   <span class="text-[1.35rem] font-black text-[#3B6BE8] dark:text-blue-400 mb-1 leading-none">{{ enrolledCourses.length || 0 }}</span>
+          v-if="libraryCourses.length > 0"
-                   <span class="text-slate-400 text-[10px] font-bold tracking-wider">{{ $t('sidebar.onlineCourses') }}</span>
+          class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-6"
-                </div>
+        >
-                <div class="flex-1 bg-[#F8FAFC] dark:bg-slate-800 rounded-2xl p-3.5 flex flex-col items-center justify-center transition-colors shadow-sm">
+          <!-- Course Cards -->
-                   <span class="text-[1.35rem] font-black text-[#10B981] dark:text-emerald-400 mb-1 leading-none z-10">{{ enrolledCourses.filter(c => c.progress >= 100).length || 0 }}</span>
+          <CourseCard
-                   <span class="text-slate-400 text-[10px] font-bold tracking-wider z-10">{{ $t('myCourses.filterCompleted') }}</span>
+            v-for="course in libraryCourses"
-                </div>
+            :key="course.id"
+            v-bind="course"
+            :image="course.thumbnail_url"
+            hide-progress
+            hide-actions
+            class="h-full md:col-span-1"
+          />
+
+          <!-- CTA Card (Large) -->
+          <div
+            class="bg-white dark:bg-[#1e293b] rounded-3xl border border-gray-100 dark:border-slate-700 shadow-sm p-8 flex flex-col items-center justify-center text-center h-full min-h-[300px] hover:shadow-md transition-all group"
+          >
+            <p class="text-gray-600 dark:text-slate-300 font-medium mb-6 mt-4 transition-colors">
+              {{ $t("dashboard.chooseLibrary") }}
+            </p>
+            <q-btn
+              flat
+              rounded
+              no-caps
+              class="text-blue-600 hover:bg-blue-50 dark:text-blue-400 dark:hover:bg-blue-900/30 px-6 py-2 font-bold group-hover:scale-105 transition-transform"
+              to="/dashboard/my-courses"
+            >
+              {{ $t("dashboard.viewAll") }}
+              <q-icon name="arrow_forward" size="18px" class="ml-2" />
+            </q-btn>
           </div>
         </div>
 
-         <!-- วิดเจ็ตคอร์สแนะนำ -->
+        <!-- Empty State when no courses -->
-         <div v-if="recommendedCourses.length > 0" class="bg-white dark:!bg-slate-900 rounded-[2rem] p-6 shadow-sm border border-slate-100 dark:border-slate-800 transition-colors">
+        <div
-             <h2 class="text-[1.1rem] font-bold text-slate-900 dark:text-white mb-5 tracking-tight flex items-center justify-between">
+          v-else
-               {{ $t('dashboard.recommendedCourses') }}
+          class="bg-white dark:bg-[#1e293b] rounded-3xl border border-dashed border-gray-200 dark:border-slate-700 p-12 flex flex-col items-center justify-center text-center min-h-[300px] transition-colors"
+        >
+          <div class="bg-blue-50 dark:bg-blue-900/20 p-6 rounded-full mb-6 transition-colors">
+            <q-icon name="school" size="48px" class="text-blue-200 dark:text-blue-400" />
+          </div>
+          <h3 class="text-xl font-bold text-gray-800 dark:text-white mb-2 transition-colors">
+            {{ $t("dashboard.emptyLibraryTitle") }}
+          </h3>
+          <p class="text-gray-500 dark:text-slate-400 mb-8 max-w-md transition-colors">
+            {{ $t("dashboard.emptyLibraryDesc") }}
+          </p>
+          <q-btn
+            unelevated
+            rounded
+            no-caps
+            class="bg-blue-600 text-white px-8 py-3 font-bold hover:bg-blue-700 shadow-lg shadow-blue-500/20 transition-all hover:scale-105"
+            to="/browse/discovery"
+          >
+            {{ $t("dashboard.viewAllCourses") }}
+          </q-btn>
+        </div>
+      </section>
+
+      <!-- 5. Recommended Courses -->
+      <section class="pb-20">
+        <div class="mb-6">
+          <h2 class="text-xl md:text-2xl font-bold text-[#2D2D2D] dark:text-white text-left transition-colors">
+            {{ $t("dashboard.recommendedCourses") }}
           </h2>
-            <div class="flex flex-col gap-5">
-               <div v-for="course in recommendedCourses.slice(0, 3)" :key="course.id" class="flex gap-4 group cursor-pointer transition-all" @click="navigateTo(`/browse/discovery?course_id=${course.id}`)">
-                  <!-- รูปหน้าปก (Thumbnail) -->
-                  <div class="w-24 h-[68px] rounded-xl overflow-hidden bg-slate-100 shrink-0 relative shadow-sm">
-                     <img :src="course.image" class="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500" />
-                  </div>
-                  <!-- ข้อมูลคอร์ส (Info) -->
-                  <div class="flex-1 flex flex-col justify-center min-w-0">
-                     <h3 class="font-bold text-[13px] text-slate-900 dark:text-white leading-snug line-clamp-2 mb-1.5 group-hover:text-[#3B6BE8] transition-colors pr-1">{{ getLocalizedText(course.title) }}</h3>
-                     <div class="flex items-center justify-between mt-auto">
-                        <span class="text-slate-500 dark:text-slate-400 text-[11px] font-medium bg-slate-100 dark:bg-slate-800 px-2 py-0.5 rounded text-ellipsis overflow-hidden whitespace-nowrap max-w-[80px]">{{ getLocalizedText(course.category) || 'อื่นๆ' }}</span>
-                        <span v-if="course.is_free" class="text-[#10B981] font-bold text-[12px]">ฟรี</span>
-                        <span v-else class="text-[#3B6BE8] font-bold text-[12px]">฿{{ Number(course.price).toLocaleString() }}</span>
-                     </div>
-                  </div>
-               </div>
         </div>
 
-             <button @click="navigateTo('/browse/discovery')" class="w-full mt-6 py-2.5 rounded-xl text-[13px] font-bold text-[#3B6BE8] dark:text-blue-400 bg-blue-50 dark:bg-blue-900/30 hover:bg-blue-100 dark:hover:bg-blue-900/50 transition-colors">
+        <!-- Recommended Grid (3 columns) -->
-                {{ $t('dashboard.viewAllCourses') }}
+        <div
-             </button>
+          class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6 animate-fade-in"
+        >
+          <CourseCard
+            v-for="course in recommendedCourses"
+            :key="course.id"
+            v-bind="course"
+          />
         </div>
+
+        <!-- Loading State -->
+        <div
+          v-if="recommendedCourses.length === 0 && !isLoading"
+          class="flex justify-center py-10 opacity-50"
+        >
+          <div class="text-gray-400 dark:text-slate-500">{{ $t("dashboard.noRecommended") }}</div>
         </div>
+      </section>
     </div>
   </div>
 </template>
 
 <style scoped>
-.bg-grid-pattern {
+/* Scoped specific styles */
-  background-image: 
+.animate-fade-in {
-    linear-gradient(to right, rgba(255,255,255,0.08) 1px, transparent 1px),
+  animation: fadeIn 0.5s ease-out;
-    linear-gradient(to bottom, rgba(255,255,255,0.08) 1px, transparent 1px);
+}
-  background-size: 24px 24px;
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+:deep(.q-btn) {
+  text-transform: none; /* Prevent uppercase in Q-Btns */
 }
 </style>

Frontend-Learner/pages/dashboard/my-courses.vue

@@ -1,369 +1,303 @@
 <script setup lang="ts">
 /**
  * @file my-courses.vue
- * @description หน้าคอร์สของฉัน (My Enrolled Courses)
+ * @description My Courses Page.
+ * Displays enrolled courses with filters for progress/completed.
+ * Handles enrollment success modals and certificate downloads.
  */
 
-// 1. นำเข้าระบบและกำหนด MetaData
 definePageMeta({
   layout: 'default',
   middleware: 'auth'
 })
 
-const { t, locale } = useI18n()
+useHead({
+  title: 'คอร์สของฉัน - e-Learning'
+})
+
 const route = useRoute()
-const quasar = useQuasar()
-useHead({ title: `${t('sidebar.myCourses') || 'My Courses'} - e-Learning Platform` })
-
-// 2. เรียกใช้งาน Composables
-const { fetchEnrolledCourses, getCertificate, generateCertificate, fetchCourses } = useCourse()
-const { fetchCategories } = useCategory()
-
-// 3. กำหนดสถานะ (State)
-const enrolledCourses = ref<any[]>([])
-const allCategories = ref<any[]>([])
-const isLoading = ref(false)
-const searchQuery = ref('')
-const activeCategory = ref<number | 'all'>('all')
-const viewMode = ref<'grid' | 'list'>('grid')
 const showEnrollModal = ref(false)
+const activeFilter = ref<'all' | 'progress' | 'completed'>('all')
+const searchQuery = ref('')
 
-// 4. ฟังก์ชันเสริม (Helper Functions)
+
-const getLocalizedText = (text: any) => {
+// Check URL query parameters to show 'Enrollment Success' modal
+onMounted(() => {
+  if (route.query.enrolled) {
+    showEnrollModal.value = true
+  }
+})
+
+const { locale } = useI18n()
+
+// Helper to get localized text
+const getLocalizedText = (text: string | { th: string; en: string } | undefined) => {
   if (!text) return ''
   if (typeof text === 'string') return text
+  
   const currentLocale = locale.value as 'th' | 'en'
   return text[currentLocale] || text.th || text.en || ''
 }
 
-const getCategoryIcon = (name: any) => {
+// Data Handling
-   const text = getLocalizedText(name) || ''
+const { fetchEnrolledCourses, getCertificate, generateCertificate } = useCourse()
-   if (text.includes('เว็บ') || text.includes('Web') || text.includes('โปรแกรม') || text.includes('Program') || text.includes('โค้ด')) return 'code'
+const enrolledCourses = ref<any[]>([])
-   if (text.includes('ออกแบบ') || text.includes('Design') || text.includes('UI')) return 'palette'
+const isLoading = ref(false)
-   if (text.includes('ธุรกิจ') || text.includes('Business') || text.includes('การตลาด') || text.includes('Market')) return 'trending_up'
+const isDownloadingCert = ref(false)
-   if (text.includes('ข้อมูล') || text.includes('Data') || text.includes('วิเคราะ') || text.includes('Sci')) return 'storage'
-   return 'category'
-}
 
-// 5. การจัดการโหลดข้อมูล (Data Loading)
+const loadEnrolledCourses = async () => {
-const loadData = async () => {
   isLoading.value = true
-    try {
+  // FIX: For 'progress' tab, we want both ENROLLED and IN_PROGRESS.
-        const [catRes, courseRes, allCoursesRes] = await Promise.all([
+  // Since API takes single status, we fetch ALL and filter locally for 'progress'.
-            fetchCategories(),
+  const apiStatus = activeFilter.value === 'completed' 
-            fetchEnrolledCourses({}),
+      ? 'COMPLETED' 
-            fetchCourses({ limit: 1000 })
+      : undefined // 'all' or 'progress' -> fetch all
-        ])
 
-        if (catRes.success) allCategories.value = catRes.data || []
+  const res = await fetchEnrolledCourses({ 
-        const catMap = new Map()
+    status: apiStatus
-        allCategories.value.forEach(c => catMap.set(c.id, c))
+  })
 
-        const catIdMap = new Map()
+  if (res.success) {
-        if (allCoursesRes && allCoursesRes.success && allCoursesRes.data) {
+    let courses = (res.data || [])
-            allCoursesRes.data.forEach((c: any) => catIdMap.set(c.id, c.category_id))
+
+    // Local filter to ensure UI consistency regardless of backend filtering
+    if (activeFilter.value === 'progress') {
+        courses = courses.filter(c => c.status !== 'COMPLETED')
+    } else if (activeFilter.value === 'completed') {
+        courses = courses.filter(c => c.status === 'COMPLETED')
     }
 
-        if (courseRes.success && courseRes.data) {
+    enrolledCourses.value = courses.map(item => ({
-            enrolledCourses.value = courseRes.data.map(item => {
-               const mappedCategoryId = catIdMap.get(item.course.id) || item.course.category_id
-               const cat = catMap.get(mappedCategoryId)
-               
-               // ตรรกะการหาชื่อผู้สอน (Instructor Name Logic)
-               let instName = t('course.instructor')
-               let user = null;
-               if (item.course.instructors && item.course.instructors.length > 0) {
-                   const primary = item.course.instructors.find((i: any) => i.is_primary);
-                   user = primary ? primary.user : item.course.instructors[0].user;
-               } else {
-                   user = item.course.creator || (item.course as any).instructor;
-               }
-               
-               if (user?.profile?.first_name) {
-                   instName = `${user.profile.first_name} ${user.profile.last_name || ''}`.trim();
-               } else if (user?.first_name) {
-                   instName = `${user.first_name} ${user.last_name || ''}`.trim();
-               } else if (user?.username) {
-                   instName = user.username;
-               }
-
-               return {
       id: item.course_id, 
       enrollment_id: item.id,
       title: item.course.title,
       progress: item.progress_percentage || 0, 
-                 lessons: item.course.total_lessons || 10,
+      lessons: item.course.total_lessons || 0,
       completed: item.status === 'COMPLETED',
-                 thumbnail_url: item.course.thumbnail_url,
+      thumbnail_url: item.course.thumbnail_url 
-                 category_id: mappedCategoryId,
+    }))
-                 category_name: cat ? getLocalizedText(cat.name) : '',
-                 instructor_name: instName
   }
-            })
-        }
-    } catch (err) {
-        console.error("Failed to load enrolled courses", err)
-    } finally {
   isLoading.value = false
 }
-}
 
-// 6. ตัวแปร Computed (Computed Properties)
+// Watch filter changes to reload
-const uniqueCategories = computed(() => {
+watch(activeFilter, () => {
-    const ids = Array.from(new Set(enrolledCourses.value.map(c => c.category_id)))
+  loadEnrolledCourses()
-    return allCategories.value.filter(c => ids.includes(c.id))
-})
-
-const inProgressCourses = computed(() => {
-    return enrolledCourses.value.filter(c => !c.completed && c.progress >= 0 && c.progress < 100).reverse()
 })
 
+// Client-side Search Filtering
 const filteredEnrolledCourses = computed(() => {
-    let result = enrolledCourses.value
+  if (!searchQuery.value) return enrolledCourses.value
-    if (activeCategory.value !== 'all') {
-        result = result.filter(c => c.category_id === activeCategory.value)
-    }
-    if (searchQuery.value) {
   const query = searchQuery.value.toLowerCase()
-        result = result.filter(c => getLocalizedText(c.title).toLowerCase().includes(query))
+  return enrolledCourses.value.filter(c => {
-    }
+    const title = getLocalizedText(c.title).toLowerCase()
-    return result
+    return title.includes(query)
   })
+})
+
+onMounted(() => {
+  if (route.query.enrolled) {
+    showEnrollModal.value = true
+  }
+  loadEnrolledCourses()
+})
+
+// Certificate Handling
+const downloadingCourseId = ref<number | null>(null)
+// Certificate Handling
+
+const downloadCertificate = async (course: any) => {
+  if (!course) return
+  downloadingCourseId.value = course.id
+  
+  try {
+      // 1. Try to GET existing certificate
+      let res = await getCertificate(course.id)
+
+      // 2. If not found (or error), try to GENERATE new one
+      if (!res.success) {
+         res = await generateCertificate(course.id)
+      }
+
+      // 3. Handle Result
+      if (res.success && res.data) {
+          const cert = res.data
+          if (cert.download_url) {
+              window.open(cert.download_url, '_blank')
+          } else {
+              // Fallback if no URL but success (maybe show message)
+              console.warn('Certificate ready but no URL')
+          }
+      } else {
+           // Silent fail or minimal log, or maybe use a toast if available, but avoid $q if undefined
+           console.error(res.error || 'Failed to get certificate')
+      }
+  } catch (e) {
+      console.error(e)
+  } finally {
+      downloadingCourseId.value = null
+  }
+}
 
 const validCourseId = computed(() => {
     const cid = route.query.course_id
     if (!cid || cid === 'undefined' || cid === 'null' || cid === 'NaN') return null
     return cid
 })
-
-// 7. ฟังก์ชันการทำงาน (Actions)
-const handleDownloadCertificate = async (courseId: number) => {
-    try {
-        quasar.notify({ message: t('common.loading') + '...', color: 'info' })
-        const genRes = await generateCertificate(courseId)
-        if (genRes.success && genRes.data?.download_url) {
-            window.open(genRes.data.download_url, '_blank')
-        } else {
-            throw new Error(genRes.error || t('common.error'))
-        }
-    } catch (err: any) {
-        quasar.notify({ message: err.message || t('common.error'), color: 'negative' })
-    }
-}
-
-// 8. Lifecycle Hooks
-onMounted(() => {
-  if (route.query.enrolled) showEnrollModal.value = true
-  loadData()
-})
 </script>
 
 <template>
-  <div class="bg-[#F8F9FA] dark:bg-[#020617] min-h-screen p-4 md:p-8 transition-colors duration-300">
+  <div class="page-container">
-    <div class="max-w-[1240px] mx-auto">
 
-      <!-- Section 1: เรียนต่อจากครั้งก่อน (Continue Learning) -->
+
-      <div v-if="inProgressCourses.length > 0 && !searchQuery" class="bg-white dark:!bg-slate-900 rounded-[2rem] p-6 md:p-8 shadow-[0_2px_15px_rgb(0,0,0,0.02)] border border-slate-100 dark:border-slate-800 mb-8 transition-all">
+    <!-- Page Header & Filters (Unified Layout) -->
-        <div class="flex items-center gap-2.5 mb-6">
+    <!-- New Enhanced Search Section (Image 2 Style) -->
-          <q-icon name="play_circle_outline" size="26px" class="text-[#3B6BE8]" />
+    <div class="bg-blue-50/50 dark:bg-blue-900/10 rounded-[2.5rem] p-8 md:p-10 mb-6 border border-blue-100/50 dark:border-blue-500/10">
-          <h2 class="text-[1.35rem] font-bold text-slate-900 dark:text-white tracking-tight">{{ $t('dashboard.continueLearningTitle') }}</h2>
+      <h2 class="text-2xl md:text-3xl font-black text-slate-900 dark:text-white mb-2">คอร์สของฉัน</h2>
+      <p class="text-slate-500 dark:text-slate-400 font-medium mb-8">ติดตามความคืบหน้าและเรียนรู้ต่อจากจุดที่ค้างไว้</p>
+      
+      <div class="flex flex-col md:flex-row gap-4">
+        <!-- Search Input -->
+        <div class="relative flex-1 group">
+          <div class="absolute left-5 top-1/2 -translate-y-1/2 text-slate-400 group-focus-within:text-blue-600 transition-colors">
+            <q-icon name="search" size="24px" />
+          </div>
+          <input 
+            v-model="searchQuery"
+            type="text" 
+            placeholder="ค้นหาชื่อคอร์สของฉัน..."
+            class="w-full pl-14 pr-6 py-3.5 bg-white dark:bg-slate-800 border-2 border-transparent rounded-2xl text-slate-900 dark:text-white placeholder-slate-400 focus:outline-none focus:border-blue-500/20 focus:ring-4 focus:ring-blue-500/5 transition-all text-base font-medium shadow-sm"
+          />
         </div>
         
-        <div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
+        <!-- Search Button -->
-          <div v-for="course in inProgressCourses.slice(0, 2)" :key="course.id" class="border border-slate-100 dark:border-slate-800 rounded-3xl p-4 flex flex-col sm:flex-row gap-5 items-center bg-[#F8FAFC] dark:bg-slate-800/50 hover:border-blue-100 dark:hover:border-blue-900/50 transition-colors">
+        <q-btn 
-            <!-- ส่วนรูปภาพหน้าปก (Image) -->
+          unelevated
-            <div class="w-full sm:w-[160px] h-[120px] rounded-[1.25rem] overflow-hidden bg-slate-200 shrink-0 relative group">
+          color="primary"
-               <img :src="course.thumbnail_url" class="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500"/>
+          class="px-8 h-[52px] rounded-2xl font-black shadow-lg shadow-blue-600/20 hover:scale-[1.02] transition-transform"
-               <!-- เลเยอร์เล่นวิดีโอด่วน (Quick play overlay) -->
+          no-caps
-               <div @click="navigateTo(`/classroom/learning?course_id=${course.id}`)" class="absolute inset-0 bg-black/40 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center cursor-pointer">
+        >
-                  <div class="bg-white/30 backdrop-blur-md rounded-full w-10 h-10 flex flex-col items-center justify-center">
+          <div class="flex items-center gap-2">
-                      <q-icon name="play_arrow" color="white" size="20px" class="ml-0.5" />
+            <q-icon name="search" size="20px" />
-                  </div>
+            <span class="text-base">ค้นหา</span>
-               </div>
-            </div>
-            <!-- ส่วนข้อมูลเนื้อหา (Info) -->
-            <div class="flex-1 flex flex-col justify-center min-w-0 py-1 w-full">
-               <div class="mb-2" v-if="course.category_name">
-                  <span class="bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] dark:text-blue-400 px-3.5 py-1.5 rounded-full text-[10px] font-bold tracking-wide">{{ course.category_name }}</span>
-               </div>
-               <h3 class="font-bold text-slate-900 dark:text-white text-[14px] leading-snug line-clamp-2 mb-4 pr-2">{{ getLocalizedText(course.title) }}</h3>
-               
-               <div class="flex items-center justify-between gap-4 mt-auto">
-                  <div class="flex-1">
-                     <div class="flex items-center gap-2 text-[11px] font-bold text-slate-700 dark:text-slate-300 mb-1.5 tracking-wide">
-                        {{ $t('course.progress') }}: {{ course.progress }}%
-                     </div>
-                     <div class="h-[6px] w-full bg-slate-200 dark:bg-slate-700 rounded-full overflow-hidden">
-                        <div class="h-full bg-[#3B6BE8] rounded-full transition-all duration-500" :style="{ width: `${course.progress}%` }"></div>
-                     </div>
-                  </div>
-                  <button @click="navigateTo(`/classroom/learning?course_id=${course.id}`)" class="bg-[#3B6BE8] hover:bg-blue-700 text-white rounded-full px-5 py-2 text-[12px] font-bold shrink-0 shadow-md shadow-blue-500/20 transition-transform hover:scale-105 outline-none">{{ $t('dashboard.continue') }}</button>
-               </div>
-            </div>
           </div>
+        </q-btn>
       </div>
     </div>
 
-      <!-- ส่วนที่ 2: คอร์สของฉัน (My Courses) -->
+    <div class="flex flex-col md:flex-row md:items-center justify-between gap-4 mb-8">
-      <div class="bg-white dark:!bg-slate-900 rounded-[2rem] p-6 md:p-8 shadow-[0_2px_15px_rgb(0,0,0,0.02)] border border-slate-100 dark:border-slate-800 min-h-[500px] mb-12">
+       <!-- Filter Tabs (Horizontal Bar) -->
-        <!-- ส่วนหัวและการค้นหา -->
+       <div class="bg-white dark:bg-slate-900/50 p-1.5 rounded-2xl border border-slate-100 dark:border-white/5 inline-flex items-center gap-1 shadow-sm">
-        <div class="flex flex-col md:flex-row md:items-center justify-between gap-6 mb-8">
+         <q-btn
-          <h2 class="text-[1.35rem] font-bold text-slate-900 dark:text-white tracking-tight">{{ $t('myCourses.title') }}</h2>
+           v-for="filter in ['all', 'progress', 'completed']"
-          <div class="flex flex-wrap sm:flex-nowrap items-center gap-3 w-full md:w-auto">
+           :key="filter"
-            <div class="relative w-full sm:w-[260px] flex-1">
+           @click="activeFilter = filter as any"
-              <q-icon name="search" size="18px" class="absolute left-4 top-1/2 -translate-y-1/2 text-slate-400 group-focus-within:text-[#3B6BE8]" />
+           flat
-              <input v-model="searchQuery" class="w-full bg-slate-100 dark:bg-slate-800 border-none rounded-xl py-2.5 pl-11 pr-4 text-sm font-medium text-slate-700 dark:text-slate-200 placeholder:text-slate-400 focus:ring-2 focus:ring-blue-500/20 outline-none transition-all shadow-sm" :placeholder="$t('myCourses.searchPlaceholder')" />
+           rounded
-            </div>
+           dense
-            <div class="flex items-center gap-2 shrink-0">
+           class="px-5 py-2 font-bold transition-all text-[11px] uppercase tracking-wider"
-              <button @click="viewMode = 'grid'" :class="viewMode === 'grid' ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-[#3B6BE8]' : 'bg-white border-slate-200 dark:bg-slate-800 dark:border-slate-700 text-slate-400 hover:bg-slate-50'" class="w-[42px] h-[42px] flex items-center justify-center rounded-xl border transition-colors outline-none"><q-icon name="grid_view" size="20px" /></button>
+           :class="activeFilter === filter ? 'bg-blue-600 text-white shadow-md shadow-blue-600/20' : 'text-slate-600 dark:text-slate-400 hover:bg-slate-50 dark:hover:bg-slate-800'"
-              <button @click="viewMode = 'list'" :class="viewMode === 'list' ? 'bg-[#E9EFFD] dark:bg-blue-900/40 text-[#3B6BE8] border-[#3B6BE8]' : 'bg-white border-slate-200 dark:bg-slate-800 dark:border-slate-700 text-slate-400 hover:bg-slate-50'" class="w-[42px] h-[42px] flex items-center justify-center rounded-xl border transition-colors outline-none"><q-icon name="view_list" size="20px" /></button>
+           :label="$t(`myCourses.filter${filter.charAt(0).toUpperCase() + filter.slice(1)}`)"
-            </div>
+         />
-          </div>
-        </div>
-
-        <!-- ตัวกรองหมวดหมู่ (แบบเลื่อนแนวนอนบนมือถือ) -->
-        <div class="mb-8 w-full overflow-hidden">
-          <div class="flex flex-nowrap items-center gap-3 overflow-x-auto scrollbar-hide pb-2 -mx-1 px-1">
-                <button 
-                  @click="activeCategory = 'all'"
-                  :class="activeCategory === 'all' ? 'bg-[#3B6BE8] text-white border-transparent' : 'bg-white dark:bg-slate-800 border-slate-200 dark:border-slate-700 text-slate-700 dark:text-slate-300 hover:border-slate-300'"
-                  class="px-5 py-2.5 rounded-xl border text-[13px] sm:text-[14px] flex items-center justify-center gap-2 transition-all outline-none whitespace-nowrap font-bold shadow-sm">
-                  <q-icon name="apps" size="18px" /> {{ $t('myCourses.filterAll') }}
-                </button>
-                
-                <button 
-                  v-for="cat in uniqueCategories" :key="cat.id"
-                  @click="activeCategory = cat.id"
-                  :class="activeCategory === cat.id ? 'bg-[#3B6BE8] text-white border-transparent' : 'bg-white dark:bg-slate-800 border-slate-200 dark:border-slate-700 text-slate-700 dark:text-slate-300 hover:border-slate-300'"
-                  class="px-5 py-2.5 rounded-xl border text-[13px] sm:text-[14px] flex items-center justify-center gap-2 transition-all outline-none whitespace-nowrap font-bold shadow-sm">
-                  <q-icon :name="getCategoryIcon(cat.name)" size="18px" />
-                  {{ getLocalizedText(cat.name) }}
-                </button>
        </div>
     </div>
 
-        <!-- Active View -->
+    <!-- Courses Grid -->
-        <div v-if="isLoading" class="flex justify-center py-24">
+    <div v-if="isLoading" class="flex justify-center py-20">
        <q-spinner size="3rem" color="primary" />
     </div>
-        
+    <div v-else class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
-        <div v-else-if="filteredEnrolledCourses.length > 0">
+      <template v-for="course in filteredEnrolledCourses" :key="course.id">
-           
+        <!-- In Progress Course Card -->
-           <!-- หมวดแสดงสไตล์กริดตาราง (GRID VIEW) -->
+        <CourseCard 
-           <div v-if="viewMode === 'grid'" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6">
+          v-if="!course.completed"
-              <div v-for="course in filteredEnrolledCourses" :key="course.id" class="flex flex-col rounded-[1.5rem] bg-white dark:!bg-slate-900 border border-slate-100 dark:border-slate-800 overflow-hidden shadow-sm hover:shadow-[0_8px_30px_rgb(0,0,0,0.06)] transition-all duration-300 group cursor-pointer" @click="navigateTo(`/classroom/learning?course_id=${course.id}`)">
+          :id="course.id"
-                 <!-- ส่วนรูปภาพหน้าปก (Thumbnail) -->
+          :title="course.title"
-                 <div class="relative w-full aspect-[4/3] bg-slate-100 dark:bg-slate-800 overflow-hidden">
+          :progress="course.progress"
-                    <img :src="course.thumbnail_url" class="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500" />
+          :image="course.thumbnail_url"
-                    <!-- ป้ายหมวดหมู่บนมุมซ้ายของรูป (Badge inside Image Map Top Left) -->
+          show-continue
-                    <div v-if="course.category_name" class="absolute top-3 left-3 bg-white/95 dark:bg-slate-900/95 backdrop-blur-md text-[#3B6BE8] dark:text-blue-400 font-bold text-[10px] px-3.5 py-1 rounded-full shadow-sm">
+          :show-view-details="false"
-                       {{ course.category_name }}
+        />
-                    </div>
+        <!-- Completed Course Card -->
+        <CourseCard 
+          v-else
+          :id="course.id"
+          :title="course.title"
+          :progress="100"
+          :image="course.thumbnail_url"
+          :completed="true"
+          show-certificate
+          show-study-again
+          :show-view-details="false"
+          :loading="downloadingCourseId === course.id"
+          @view-certificate="downloadCertificate(course)"
+        />
+      </template>
     </div>
 
-                 <!-- ตัวการ์ด (Card Body) -->
+    <!-- Empty State -->
-                 <div class="p-5 flex flex-col flex-1">
+    <div v-if="!isLoading && filteredEnrolledCourses.length === 0" class="flex flex-col items-center justify-center py-20 bg-slate-50 dark:bg-slate-800/50 rounded-3xl border-2 border-dashed border-slate-200 dark:border-slate-700 mt-4">
-                    <h3 class="font-bold text-slate-900 dark:text-white text-[14px] leading-snug line-clamp-2 mb-3">{{ getLocalizedText(course.title) }}</h3>
+      <q-icon v-if="searchQuery" name="search_off" size="64px" class="text-slate-300 dark:text-slate-600 mb-4" />
-                    
+      <h3 class="text-xl font-bold text-slate-900 dark:text-white mb-2">
-
+        {{ searchQuery ? $t('discovery.emptyTitle') : $t('myCourses.emptyTitle') }}
-                    
+      </h3>
-                    <div class="mt-auto flex items-center justify-between gap-4">
+      <p class="text-slate-500 dark:text-slate-400 text-center max-w-md">
-                       <div class="flex-1">
+        {{ searchQuery ? $t('discovery.emptyDesc') : $t('myCourses.emptyDesc') }}
-                          <div class="text-[10px] font-bold text-slate-700 dark:text-slate-300 mb-1.5 tracking-wide">{{ $t('course.progress') }}: {{ course.progress }}%</div>
+      </p>
-                           <div class="h-[6px] w-full bg-slate-200 dark:bg-slate-700 rounded-full overflow-hidden">
+      <NuxtLink v-if="!searchQuery" to="/browse/discovery" class="mt-6 px-6 py-2 bg-blue-600 text-white rounded-lg font-bold hover:bg-blue-700 transition-colors">{{ $t('myCourses.goToDiscovery') }}</NuxtLink>
-                              <div class="h-full rounded-full transition-all duration-500" :class="course.completed ? 'bg-green-500' : 'bg-[#3B6BE8] dark:bg-blue-400'" :style="{ width: `${course.progress}%` }"></div>
+      <button v-else class="mt-4 font-bold text-blue-600 hover:text-blue-700 transition-colors" @click="searchQuery = ''">
-                           </div>
+        {{ $t('discovery.showAll') }}
-                       </div>
-                        <div class="flex flex-col sm:flex-row items-stretch sm:items-center gap-2 mt-3 sm:mt-0">
-                            <!-- ปุ่มดาวน์โหลดใบเซอร์ (Certificate Button) -->
-                            <button v-if="course.completed" @click.stop="handleDownloadCertificate(course.id)" class="border border-green-100 bg-green-50 text-green-600 dark:border-green-900/50 dark:bg-green-900/30 dark:text-green-400 rounded-full px-3 py-1.5 text-[11px] font-bold hover:bg-green-100 dark:hover:bg-green-900/50 transition-colors shrink-0 flex items-center justify-center gap-1">
-                              <q-icon name="workspace_premium" size="14px" /> {{ $t('course.certificate') }}
-                            </button>
-                            <!-- ปุ่มเรียนต่อหรือเรียนซ้ำ (Continue/Replay Button) -->
-                            <button class="bg-[#3B6BE8] text-white border-transparent hover:bg-blue-700 shadow-sm rounded-full px-5 py-1.5 text-[11px] font-bold transition-colors shrink-0 text-center cursor-pointer">
-                               {{ course.completed ? $t('course.studyAgain') : $t('dashboard.continue') }}
       </button>
     </div>
-                    </div>
-                 </div>
-              </div>
-           </div>
 
-           <!-- หมวดแสดงสไตล์บรรทัดรายการ (LIST VIEW) -->
+    <!-- MODAL: Enrollment Success -->
-           <div v-else class="flex flex-col gap-4">
-              <div v-for="course in filteredEnrolledCourses" :key="course.id" class="flex flex-col sm:flex-row items-center rounded-[1.5rem] bg-white dark:!bg-slate-900 border border-slate-100 dark:border-slate-800 p-4 gap-6 shadow-sm hover:shadow-[0_8px_30px_rgb(0,0,0,0.06)] transition-all duration-300 cursor-pointer group" @click="navigateTo(`/classroom/learning?course_id=${course.id}`)">
-                 
-                 <!-- ส่วนภาพหน้าปกด้านซ้าย (Thumbnail Left) -->
-                 <div class="relative w-full sm:w-[240px] aspect-[16/10] sm:aspect-auto sm:h-[130px] rounded-2xl bg-slate-100 dark:bg-slate-800 overflow-hidden shrink-0">
-                    <img :src="course.thumbnail_url" class="w-full h-full object-cover group-hover:scale-105 transition-transform duration-500" />
-                    <!-- ป้ายหมวดหมู่ในรูปภาพ (Badge inside Image) -->
-                    <div v-if="course.category_name" class="absolute top-2.5 left-2.5 bg-white/95 dark:bg-slate-900/95 backdrop-blur-md text-[#3B6BE8] dark:text-blue-400 font-bold text-[10px] px-3.5 py-1 rounded-full shadow-sm">
-                       {{ course.category_name }}
-                    </div>
-                 </div>
-
-                 <!-- เนื้อหาอยู่ทางขวา (Content Right) -->
-                 <div class="flex-1 w-full flex flex-col md:flex-row gap-6 md:items-center">
-                    
-                    <div class="flex-1 min-w-0">
-                        <h3 class="font-bold text-slate-900 dark:text-white text-[15px] leading-snug line-clamp-2 mb-3 pr-4">{{ getLocalizedText(course.title) }}</h3>
-
-                    </div>
-
-                    <!-- โซนความคืบหน้าและปุ่มกด (Progress and Button Zone) -->
-                    <div class="flex md:flex-col items-center md:items-end justify-between md:justify-center gap-4 shrink-0 md:w-[200px]">
-                        <div class="w-full max-w-[140px] md:max-w-full">
-                           <div class="flex justify-between items-center text-[11px] font-bold text-slate-700 dark:text-slate-300 mb-2 tracking-wide">
-                              <span>{{ $t('course.progress') }}:</span>
-                              <span>{{ course.progress }}%</span>
-                           </div>
-                           <div class="h-[6px] w-full bg-slate-200 dark:bg-slate-700 rounded-full overflow-hidden">
-                              <div class="h-full rounded-full transition-all duration-500" :class="course.completed ? 'bg-green-500' : 'bg-[#3B6BE8] dark:bg-blue-400'" :style="{ width: `${course.progress}%` }"></div>
-                           </div>
-                        </div>
-
-                        <div class="flex flex-col items-stretch md:items-end gap-2 mt-3 sm:mt-0 w-full sm:w-auto">
-                            <!-- ปุ่มดาวน์โหลดใบเซอร์ (Certificate Button) -->
-                            <button v-if="course.completed" @click.stop="handleDownloadCertificate(course.id)" class="border border-green-100 bg-green-50 text-green-600 dark:border-green-900/50 dark:bg-green-900/30 dark:text-green-400 rounded-full px-4 py-2 text-[12px] font-bold hover:bg-green-100 dark:hover:bg-green-900/50 transition-colors shrink-0 flex items-center justify-center gap-1 w-full sm:w-auto">
-                              <q-icon name="workspace_premium" size="16px" /> {{ $t('course.downloadCertificate') }}
-                            </button>
-                            <!-- ปุ่มเรียนต่อหรือเรียนซ้ำ (Continue/Replay Button) -->
-                            <button class="bg-[#3B6BE8] text-white border-transparent hover:bg-blue-700 shadow-sm rounded-full px-6 py-2 text-[12px] font-bold transition-colors shrink-0 text-center w-full sm:w-auto cursor-pointer">
-                              {{ course.completed ? $t('course.studyAgain') : $t('dashboard.continue') }}
-                            </button>
-                        </div>
-                    </div>
-                 </div>
-                 
-              </div>
-           </div>
-
-        </div>
-        
-        <!-- กรณีที่ค้นหา/กรองแล้วไม่พบข้อมูล (Empty filter state) -->
-        <div v-else class="flex flex-col items-center justify-center py-20">
-          <q-icon name="search_off" size="48px" class="text-slate-300 dark:text-slate-600 mb-4" />
-          <h3 class="text-lg font-bold text-slate-900 dark:text-white mb-2">{{ $t('myCourses.searchNoResult') }}</h3>
-          <p class="text-slate-500 dark:text-slate-400 text-sm">{{ $t('myCourses.searchNoResultDesc') }}</p>
-        </div>
-      </div>
-    
-    </div>
-
-    <!-- หน้าต่างแจ้งเตือน: ลงทะเบียนสำเร็จ (MODAL: Enrollment Success) -->
     <q-dialog v-model="showEnrollModal" backdrop-filter="blur(4px)">
       <q-card class="rounded-[1.5rem] shadow-2xl p-8 max-w-sm w-full text-center relative overflow-hidden bg-white dark:bg-slate-800">
         <div class="absolute top-0 left-0 w-full h-2 bg-gradient-to-r from-green-400 to-emerald-600"></div>
-        <div class="w-16 h-16 bg-green-100 dark:bg-green-900/30 text-green-600 dark:text-green-400 rounded-full flex items-center justify-center text-3xl mx-auto mb-6">✓</div>
+        <div class="w-16 h-16 bg-green-100 dark:bg-green-900/30 text-green-600 dark:text-green-400 rounded-full flex items-center justify-center text-3xl mx-auto mb-6">
+          ✓
+        </div>
         <h2 class="text-2xl font-bold mb-2 text-slate-900 dark:text-white">{{ $t('enrollment.successTitle') }}</h2>
         <p class="text-slate-500 dark:text-slate-400 mb-8">{{ $t('enrollment.successDesc') }}</p>
         <div class="flex flex-col gap-3">
-          <q-btn v-if="validCourseId" :to="`/classroom/learning?course_id=${validCourseId}`" unelevated rounded color="primary" class="w-full py-3 text-lg font-bold shadow-lg" :label="$t('enrollment.startNow')" />
+          <q-btn
-          <q-btn v-else unelevated rounded color="primary" class="w-full py-3 text-lg font-bold shadow-lg" :label="$t('common.close')" @click="showEnrollModal = false" />
+            v-if="validCourseId"
-          <q-btn v-if="validCourseId" flat rounded color="grey-7" class="w-full py-3 font-bold" :label="$t('enrollment.later')" @click="showEnrollModal = false" />
+            :to="`/classroom/learning?course_id=${validCourseId}`"
+            unelevated
+            rounded
+            color="primary"
+            class="w-full py-3 text-lg font-bold shadow-lg"
+            :label="$t('enrollment.startNow')"
+          />
+           <q-btn
+            v-else
+            unelevated
+            rounded
+            color="primary"
+            class="w-full py-3 text-lg font-bold shadow-lg"
+            :label="$t('common.close')" 
+            @click="showEnrollModal = false"
+          />
+          <q-btn
+            v-if="validCourseId"
+            flat
+            rounded
+            color="grey-7"
+            class="w-full py-3 font-bold"
+            :label="$t('enrollment.later')"
+            @click="showEnrollModal = false"
+          />
         </div>
       </q-card>
     </q-dialog>
 
+
   </div>
 </template>
+
+<style scoped>
+/* Custom Font for Signature/Name if desired */
+.font-handwriting {
+  font-family: 'Dancing Script', cursive, serif; /* Fallback */
+}
+</style>

Frontend-Learner/pages/dashboard/profile.vue

@@ -4,15 +4,13 @@ definePageMeta({
   middleware: 'auth'
 })
 
-const { locale, t } = useI18n()
+useHead({
+  title: 'ตั้งค่าบัญชี - e-Learning'
+})
+
 const { currentUser, updateUserProfile, changePassword, uploadAvatar, sendVerifyEmail, fetchUserProfile } = useAuth()
 const { getLocalizedText } = useCourse()
-import { useQuasar } from 'quasar'
+const { locale, t } = useI18n()
-const $q = useQuasar()
-
-useHead({
-  title: `${t('userMenu.settings')} - e-Learning`
-})
 
 
 
@@ -59,30 +57,23 @@ const passwordForm = reactive({
   confirmPassword: ''
 })
 
-const showPasswordModal = ref(false)
-const showPassword = reactive({
-  current: false,
-  new: false,
-  confirm: false
-})
 
+// Rules have been moved to components
 
-// กฎต่างๆ ถูกย้ายไปที่คอมโพเนนต์แล้ว (Rules have been moved to components)
+const fileInput = ref<HTMLInputElement | null>(null) // Used in view mode (outside component)
-
-const fileInput = ref<HTMLInputElement | null>(null) // ใช้ในโหมดมุมมอง (อยู่นอกคอมโพเนนต์) (Used in view mode (outside component))
 
 const toggleEdit = (edit: boolean) => {
   isEditing.value = edit
 }
 
-// อัปเดตให้รับออบเจ็กต์ File ได้โดยตรง (หรือ Event สำหรับความเข้ากันได้ของโหมดมุมมองหากจำเป็น) (Updated to accept File object directly (or Event for view mode compatibility if needed))
+// Updated to accept File object directly (or Event for view mode compatibility if needed)
 const handleFileUpload = async (fileOrEvent: File | Event) => {
   let file: File | null = null
 
   if (fileOrEvent instanceof File) {
     file = fileOrEvent
   } else {
-    // การทำงานสำรองสำหรับอีเวนต์ input change แบบเนทีฟ (Fallback for native input change event)
+    // Fallback for native input change event
     const target = (fileOrEvent as Event).target as HTMLInputElement
     if (target.files && target.files[0]) {
       file = target.files[0]
@@ -104,15 +95,14 @@ const handleFileUpload = async (fileOrEvent: File | Event) => {
 
     if (result.success && result.data?.avatar_url) {
        userData.value.photoURL = result.data.avatar_url
-       $q.notify({ type: 'positive', message: 'อัปเดตรูปโปรไฟล์สำเร็จ', position: 'top' })
     } else {
        console.error('Upload failed:', result.error)
-       $q.notify({ type: 'negative', message: result.error || t('profile.updateError') || 'อัปเดตรูปโปรไฟล์ไม่สำเร็จ', position: 'top' })
+       alert(result.error || t('profile.updateError'))
     }
   }
 }
 
-// เรียกการอัปโหลดเมื่อคลิกที่รูปโปรไฟล์ในโหมด View (Trigger upload for VIEW mode avatar click)
+// Trigger upload for VIEW mode avatar click
 const triggerUpload = () => {
     fileInput.value?.click()
 }
@@ -141,9 +131,9 @@ const handleUpdateProfile = async () => {
   const result = await updateUserProfile(payload)
   
   if (result?.success) {
-    $q.notify({ type: 'positive', message: t('profile.updateSuccess'), position: 'top' })
+    // success logic
   } else {
-    $q.notify({ type: 'negative', message: result?.error || t('profile.updateError'), position: 'top' })
+    alert(result?.error || t('profile.updateError'))
   }
   
   isProfileSaving.value = false
@@ -155,19 +145,19 @@ const handleSendVerifyEmail = async () => {
   isSendingVerify.value = false
   
   if (result.success) {
-    $q.notify({ type: 'positive', message: result.message || t('profile.verifyEmailSuccess') || 'ส่งอีเมลยืนยันสำเร็จ', position: 'top' })
+    alert(result.message || t('profile.verifyEmailSuccess') || 'ส่งอีเมลยืนยันสำเร็จ')
   } else {
     if (result.code === 400) {
-        $q.notify({ type: 'warning', message: t('profile.emailAlreadyVerified') || 'อีเมลของคุณได้รับการยืนยันแล้ว', position: 'top' })
+        alert(t('profile.emailAlreadyVerified') || 'อีเมลของคุณได้รับการยืนยันแล้ว')
     } else {
-        $q.notify({ type: 'negative', message: result.error || t('profile.verifyEmailError') || 'ส่งอีเมลไม่สำเร็จ', position: 'top' })
+        alert(result.error || t('profile.verifyEmailError') || 'ส่งอีเมลไม่สำเร็จ')
     }
   }
 }
 
 const handleUpdatePassword = async () => {
   if (passwordForm.newPassword !== passwordForm.confirmPassword) {
-    $q.notify({ type: 'negative', message: 'รหัสผ่านใหม่ไม่ตรงกัน', position: 'top' })
+    alert('รหัสผ่านใหม่ไม่ตรงกัน')
     return
   }
   
@@ -179,19 +169,18 @@ const handleUpdatePassword = async () => {
   })
 
   if (result.success) {
-    $q.notify({ type: 'positive', message: t('profile.passwordSuccess') || 'เปลี่ยนรหัสผ่านสำเร็จ', position: 'top' })
+    alert(t('profile.passwordSuccess'))
     passwordForm.currentPassword = ''
     passwordForm.newPassword = ''
     passwordForm.confirmPassword = ''
-    showPasswordModal.value = false
   } else {
-    $q.notify({ type: 'negative', message: result.error || t('profile.passwordError') || 'เปลี่ยนรหัสผ่านไม่สำเร็จ', position: 'top' })
+    alert(result.error || t('profile.passwordError'))
   }
   
   isPasswordSaving.value = false
 }
 
-// เฝ้าดูการเปลี่ยนแปลงในสถานะผู้ใช้ส่วนกลาง (เช่น หลังจากอัปโหลดรูปโปรไฟล์หรืออัปเดตข้อมูลส่วนตัว) (Watch for changes in global user state (e.g. after avatar upload or profile update))
+// Watch for changes in global user state (e.g. after avatar upload or profile update)
 watch(() => currentUser.value, (newUser) => {
   if (newUser) {
     userData.value.photoURL = newUser.photoURL || ''
@@ -214,215 +203,169 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="page-container bg-[#F8F9FA] dark:bg-[#020617] transition-colors duration-300 min-h-screen">
+  <div class="page-container bg-[#F8F9FA] dark:bg-[#020617] min-h-screen transition-colors duration-300">
+    
+    <div class="flex items-center justify-between mb-8">
+      <div class="flex items-center gap-4">
+        <q-btn
+          v-if="isHydrated && isEditing"
+          flat
+          round
+          icon="arrow_back"
+          class="text-slate-600 dark:text-white hover:bg-slate-100 dark:hover:bg-slate-800"
+          @click="toggleEdit(false)"
+        />
+        <div class="flex items-start gap-4">
+          <span class="w-1.5 h-10 md:h-12 bg-blue-600 rounded-full shadow-lg shadow-blue-500/50 mt-1 flex-shrink-0"></span>
+          <div>
+            <h1 class="text-3xl md:text-4xl font-black text-slate-900 dark:text-white leading-tight">
+              {{ (isHydrated && isEditing) ? $t('profile.editProfile') : $t('profile.myProfile') }}
+            </h1>
+          </div>
+        </div>
+      </div>
+
+      <div class="min-h-9 flex items-center">
+        <q-btn
+          v-if="isHydrated && !isEditing"
+          unelevated
+          rounded
+          color="primary"
+          class="font-bold shadow-lg shadow-blue-500/20"
+          icon="edit"
+          :label="$t('profile.editProfile')"
+          @click="toggleEdit(true)"
+        />
+        <div
+          v-else-if="!isHydrated"
+          class="h-9 w-24 rounded-md bg-slate-200 dark:bg-slate-700 animate-pulse"
+        />
+      </div>
+    </div>
 
     <div v-if="!isHydrated" class="flex justify-center py-20">
        <q-spinner size="3rem" color="primary" />
     </div>
 
-    <!-- การตั้งค่าโปรไฟล์หลัก (MAIN PROFILE SETTINGS) -->
+    <div v-else class="max-w-4xl mx-auto pb-20">
-    <div v-else class="max-w-5xl mx-auto pb-20 fade-in pt-4">
       
-      <!-- บัตรข้อมูลโปรไฟล์ (Profile Card) -->
+      <!-- VIEW MODE: Premium Card with Banner -->
-      <div class="bg-white dark:!bg-slate-900 border border-slate-200 dark:border-slate-800 rounded-2xl shadow-sm mb-6 overflow-hidden">
+      <div v-if="!isEditing" class="bg-white dark:bg-[#1e293b] border border-slate-200 dark:border-slate-700/50 rounded-3xl shadow-xl dark:shadow-none overflow-hidden fade-in min-h-[500px] flex flex-col transition-colors duration-300">
-        <div class="p-8 border-b border-slate-200 dark:border-slate-800">
+        
-          <h2 class="text-xl font-bold text-slate-900 dark:text-white">{{ $t('profile.myProfile') }}</h2>
+        <!-- Identity Header (Banner & Avatar) -->
-          <p class="text-slate-500 dark:text-slate-400 text-sm mt-1">{{ $t('profile.publicInfo') }}</p>
+        <div class="relative">
+          <div class="h-40 bg-gradient-to-r from-blue-700 via-blue-600 to-indigo-700 relative overflow-hidden">
+             <!-- Abstract Patterns -->
+             <div class="absolute inset-0 opacity-10">
+                <div class="absolute -top-10 -right-10 w-64 h-64 rounded-full bg-white blur-3xl"></div>
+                <div class="absolute -bottom-10 -left-10 w-48 h-48 rounded-full bg-indigo-300 blur-3xl"></div>
+             </div>
           </div>
           
-        <div class="p-8">
+          <div class="px-8 md:px-12 flex flex-col md:flex-row items-center md:items-end gap-8 md:gap-12 -mt-12 pb-8 relative z-10">
-           <!-- ส่วนอัปโหลดรูปโปรไฟล์ -->
+            <div class="relative group flex-shrink-0">
-           <div class="flex flex-col sm:flex-row items-center sm:items-center gap-6 mb-10 text-center sm:text-left">
-              <div class="relative cursor-pointer" @click="triggerUpload">
               <UserAvatar 
                 :photo-u-r-l="userData.photoURL" 
                 :first-name="userData.firstName" 
                 :last-name="userData.lastName" 
-                  size="100"
+                size="140"
-                  class="rounded-full bg-slate-100 dark:bg-slate-800 object-cover border-4 border-slate-50 dark:border-slate-800"
+                class="border-[6px] border-white dark:border-[#1e293b] shadow-2xl rounded-[2.5rem] bg-white dark:bg-slate-800 transition-colors duration-300"
               />
-                <div class="absolute bottom-0 right-0 bg-[#3B6BE8] text-white p-1.5 rounded-full border-2 border-white dark:border-slate-900 hover:bg-blue-700 transition flex items-center justify-center">
-                  <q-icon name="edit" size="14px" />
             </div>
-                <input type="file" ref="fileInput" class="hidden" accept="image/jpeg, image/png, image/gif" @change="handleFileUpload" />
+            
+            <div class="text-center md:text-left pt-4 md:pt-0 flex-grow min-w-0">
+              <h2 class="text-3xl md:text-4xl font-black text-slate-900 dark:text-white mb-2 leading-tight tracking-tight break-words">
+                {{ userData.firstName }} {{ userData.lastName }}
+              </h2>
+              <div class="flex flex-wrap items-center justify-center md:justify-start gap-4">
+                  <div class="flex items-center gap-2 text-slate-500 dark:text-slate-400 font-bold bg-slate-50 dark:bg-slate-800/50 px-3 py-1.5 rounded-xl border border-slate-100 dark:border-slate-700">
+                      <q-icon name="alternate_email" size="xs" class="text-blue-500" />
+                      <span class="text-sm">{{ userData.email }}</span>
+                  </div>
+                  <div class="flex items-center gap-2 text-slate-500 dark:text-slate-400 font-bold bg-slate-50 dark:bg-slate-800/50 px-3 py-1.5 rounded-xl border border-slate-100 dark:border-slate-700">
+                      <q-icon name="verified_user" size="xs" :class="userData.emailVerifiedAt ? 'text-green-500' : 'text-amber-500'" />
+                      <span class="text-sm">{{ userData.emailVerifiedAt ? $t('profile.emailVerified') : $t('profile.verifyEmail') }}</span>
+                  </div>
+              </div>
             </div>
-              <div class="flex flex-col items-center sm:items-start">
-                <button @click="triggerUpload" class="bg-[#3B6BE8] hover:bg-blue-700 text-white px-5 py-2.5 rounded-lg text-sm font-bold transition mb-2 shadow-sm whitespace-nowrap">
-                  <span v-if="isProfileSaving"><q-spinner size="18px" /> {{ $t('profile.uploading') }}</span>
-                  <span v-else>{{ $t('profile.changeAvatar') }}</span>
-                </button>
-                <p class="text-slate-500 dark:text-slate-400 text-xs mt-1">{{ $t('profile.avatarHint') }}</p>
           </div>
         </div>
 
-           <!-- ฟิลด์ข้อมูลฟอร์ม (แบ่งเป็น 2 คอลัมน์) (Form Inputs (2 Column Grid)) -->
+        <!-- View Details Content -->
-           <div class="grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-6 mb-4">
+        <div class="p-8 md:p-12 flex-grow">
-               <div class="md:col-span-2 relative">
+           <div class="max-w-3xl mx-auto h-full fade-in">
-                  <label class="block text-[13px] font-bold text-slate-700 dark:text-slate-300 mb-2">{{ $t('profile.prefix') }}</label>
+              <h3 class="text-sm font-black text-slate-700 dark:text-slate-300 uppercase tracking-widest flex items-center gap-2 mb-8">
-                  <select v-model="userData.prefix" class="w-full bg-slate-50 dark:bg-slate-800 border border-slate-200 dark:border-slate-700 px-4 py-3 rounded-lg focus:outline-none focus:border-[#3B6BE8] transition text-sm font-medium text-slate-900 dark:text-white appearance-none cursor-pointer">
+                 <span class="w-2 h-2 bg-blue-600 rounded-full"></span> {{ $t('profile.accountDetails') }}
-                     <option value="" disabled>{{ $t('profile.selectPrefix') }}</option>
+              </h3>
-                     <option value="นาย">{{ $t('profile.mr') }}</option>
+              <div class="grid grid-cols-1 md:grid-cols-2 gap-x-12 gap-y-8">
-                     <option value="นาง">{{ $t('profile.mrs') }}</option>
+                 <div class="flex items-center gap-4 group">
-                     <option value="นางสาว">{{ $t('profile.miss') }}</option>
+                    <div class="w-12 h-12 rounded-2xl bg-blue-50 dark:bg-blue-900/20 flex items-center justify-center text-blue-600 dark:text-blue-400 group-hover:scale-110 transition-transform">
-                  </select>
+                       <q-icon name="smartphone" size="24px" />
-                  <div class="pointer-events-none absolute bottom-0 right-0 flex items-center px-4 h-11 text-slate-500">
-                     <q-icon name="arrow_drop_down" size="24px" />
-                  </div>
                     </div>
                     <div>
-                  <label class="block text-[13px] font-bold text-slate-700 dark:text-slate-300 mb-2">{{ $t('profile.firstName') }}-{{ $t('profile.lastName') }}</label>
+                       <div class="text-[10px] font-black text-slate-500 dark:text-slate-400 uppercase tracking-wider mb-0.5">{{ $t('profile.phone') }}</div>
-                  <div class="flex gap-3">
+                       <div class="text-lg font-bold text-slate-900 dark:text-white tracking-tight">{{ userData.phone || '-' }}</div>
-                     <input type="text" v-model="userData.firstName" class="w-full bg-slate-50 dark:bg-slate-800 border border-slate-200 dark:border-slate-700 px-4 py-3 rounded-lg focus:outline-none focus:border-[#3B6BE8] transition text-sm font-medium text-slate-900 dark:text-white" :placeholder="$t('profile.firstName')" />
-                     <input type="text" v-model="userData.lastName" class="w-full bg-slate-50 dark:bg-slate-800 border border-slate-200 dark:border-slate-700 px-4 py-3 rounded-lg focus:outline-none focus:border-[#3B6BE8] transition text-sm font-medium text-slate-900 dark:text-white" :placeholder="$t('profile.lastName')" />
                     </div>
                  </div>
+                 <div class="flex items-center gap-4 group">
+                    <div class="w-12 h-12 rounded-2xl bg-indigo-50 dark:bg-indigo-900/20 flex items-center justify-center text-indigo-600 dark:text-indigo-400 group-hover:scale-110 transition-transform">
+                       <q-icon name="calendar_today" size="24px" />
+                    </div>
                     <div>
-                  <div class="flex items-center justify-between mb-2">
+                       <div class="text-[10px] font-black text-slate-500 dark:text-slate-400 uppercase tracking-wider mb-0.5">{{ $t('profile.joinedAt') }}</div>
-                     <label class="block text-[13px] font-bold text-slate-700 dark:text-slate-300">{{ $t('profile.email') }}</label>
+                       <div class="text-lg font-bold text-slate-900 dark:text-white tracking-tight">{{ formatDate(userData.createdAt) }}</div>
-                     <div v-if="userData.emailVerifiedAt" class="flex items-center gap-1 text-green-500 text-xs font-bold">
-                         <q-icon name="verified_user" size="14px" /> {{ $t('profile.emailVerified') }}
-                     </div>
-                     <button v-else @click="handleSendVerifyEmail" :disabled="isSendingVerify" class="flex items-center gap-1 text-amber-500 hover:text-amber-600 text-xs font-bold transition">
-                         <q-icon name="warning" size="14px" /> <span v-if="isSendingVerify"><q-spinner size="xs" /> {{ $t('profile.verifying') }}</span><span v-else class="underline">{{ $t('profile.verifyNow') }}</span>
-                     </button>
-                  </div>
-                 <input type="email" v-model="userData.email" class="w-full bg-slate-50 dark:bg-slate-800 border border-slate-200 dark:border-slate-700 px-4 py-3 rounded-lg focus:outline-none transition text-sm font-medium text-slate-500 dark:text-slate-400" disabled />
-              </div>
-               <div>
-                  <label class="block text-[13px] font-bold text-slate-700 dark:text-slate-300 mb-2">{{ $t('profile.phone') }}</label>
-                  <input type="tel" v-model="userData.phone" class="w-full bg-slate-50 dark:bg-slate-800 border border-slate-200 dark:border-slate-700 px-4 py-3 rounded-lg focus:outline-none focus:border-[#3B6BE8] transition text-sm font-medium text-slate-900 dark:text-white" placeholder="08x-xxx-xxxx" />
-               </div>
-               <div>
-                  <label class="block text-[13px] font-bold text-slate-700 dark:text-slate-300 mb-2">{{ $t('profile.joinedAt') }}</label>
-                  <input type="text" :value="formatDate(userData.createdAt)" class="w-full bg-slate-50 dark:bg-slate-800 border border-slate-200 dark:border-slate-700 px-4 py-3 rounded-lg focus:outline-none transition text-sm font-medium text-slate-500 dark:text-slate-400" disabled />
                     </div>
                  </div>
-
               </div>
-        
-        <!-- ปุ่มกดยืนยันต่างๆ (Footer Buttons) -->
-        <div class="px-6 sm:px-8 py-5 border-t border-slate-200 dark:border-slate-800 flex flex-col sm:flex-row justify-center sm:justify-end gap-3 items-center bg-white dark:!bg-slate-900">
-           <button class="w-full sm:w-auto text-[13px] font-bold text-slate-600 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white px-4 py-2 transition order-2 sm:order-1" @click="fetchUserProfile(true)">{{ $t('common.cancel') }}</button>
-           <button @click="handleUpdateProfile" :disabled="isProfileSaving" class="w-full sm:w-auto bg-[#3B6BE8] hover:bg-blue-700 text-white px-6 py-2.5 rounded-lg text-[13px] font-bold transition shadow-sm disabled:opacity-50 order-1 sm:order-2">
-             <span v-if="isProfileSaving"><q-spinner size="18px" color="white" class="mr-1" /> {{ $t('profile.saving') }}</span>
-             <span v-else>{{ $t('common.saveChanges') }}</span>
-           </button>
-        </div>
-      </div>
-
-      <!-- การ์ดความปลอดภัย (Security Card) -->
-      <div class="bg-white dark:!bg-slate-900 border border-slate-200 dark:border-slate-800 rounded-2xl shadow-sm overflow-hidden">
-        <div class="p-8 border-b border-slate-200 dark:border-slate-800">
-          <h2 class="text-xl font-bold text-slate-900 dark:text-white">{{ $t('profile.security') }}</h2>
-          <p class="text-slate-500 dark:text-slate-400 text-sm mt-1">{{ $t('profile.securitySubtitle') }}</p>
-        </div>
-        
-        <div class="px-6 sm:px-8 py-8 sm:py-10">
-          <div class="p-5 sm:p-6 rounded-2xl bg-slate-50 dark:bg-slate-800/50 border border-slate-100 dark:border-slate-800 flex flex-col sm:flex-row items-center sm:items-center justify-between gap-6 text-center sm:text-left">
-            <div class="flex flex-col sm:flex-row items-center gap-4">
-              <div class="w-12 h-12 rounded-xl bg-blue-100 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400 flex items-center justify-center shrink-0">
-                <q-icon name="key" size="24px" />
-              </div>
-              <div>
-                <h3 class="font-bold text-slate-900 dark:text-white text-[15px] sm:text-[16px]">{{ $t('profile.password') }}</h3>
-                <p class="text-slate-500 dark:text-slate-400 text-xs mt-0.5 sm:mt-1">{{ $t('profile.securitySubtitle') }}</p>
-              </div>
-            </div>
-            <button @click="showPasswordModal = true" class="w-full sm:w-auto bg-[#3B6BE8] hover:bg-blue-700 text-white px-6 py-2.5 rounded-lg text-sm font-bold transition shadow-sm shadow-blue-500/10">
-              {{ $t('profile.changePasswordBtn') }}
-            </button>
            </div>
         </div>
       </div>
 
-    </div>
+      <!-- EDIT MODE: Tabs and Forms (Clean Layout) -->
-
+      <div v-else class="fade-in">
-    <!-- โมดอลเปลี่ยนรหัสผ่าน (Password Modal) -->
+          <!-- Tab Selector -->
-    <q-dialog v-model="showPasswordModal">
+          <div class="flex justify-center mb-8">
-      <q-card class="w-full max-w-md rounded-2xl p-2 dark:bg-slate-900 shadow-xl">
+            <div class="bg-white dark:bg-[#1e293b] p-1.5 rounded-2xl flex items-center gap-1 border border-slate-200 dark:border-slate-700 shadow-sm">
-        <q-form @submit="handleUpdatePassword">
+                <button 
-          <q-card-section class="flex items-center justify-between pb-2">
+                  @click="activeTab = 'general'"
-            <div class="text-xl font-bold text-slate-900 dark:text-white">{{ $t('profile.changePasswordBtn') }}</div>
+                  class="px-6 md:px-8 py-3 rounded-xl font-black text-xs uppercase tracking-widest transition-all flex items-center gap-2"
-            <q-btn icon="close" flat round dense v-close-popup class="text-slate-500" />
+                  :class="activeTab === 'general' ? 'bg-blue-50 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400 shadow-sm scale-100' : 'text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-200 scale-95 opacity-70'"
-          </q-card-section>
-
-          <q-card-section class="pt-2">
-            <div class="space-y-1">
-               <div>
-                <label class="block text-[13px] font-bold text-slate-700 dark:text-slate-300 mb-1">{{ $t('profile.currentPassword') }}</label>
-                <q-input
-                  v-model="passwordForm.currentPassword"
-                  :type="showPassword.current ? 'text' : 'password'"
-                  outlined 
-                  dense
-                  class="custom-pwd-input"
-                  :rules="[val => !!val || $t('common.required')]"
                 >
-                  <template v-slot:append>
+                  <q-icon name="person_outline" size="18px" /> {{ $t('profile.generalInfo') }}
-                    <q-icon
+                </button>
-                      :name="showPassword.current ? 'visibility_off' : 'visibility'"
+                <button 
-                      class="cursor-pointer text-slate-400"
+                  @click="activeTab = 'security'"
-                      @click="showPassword.current = !showPassword.current"
+                  class="px-6 md:px-8 py-3 rounded-xl font-black text-xs uppercase tracking-widest transition-all flex items-center gap-2"
-                    />
+                  :class="activeTab === 'security' ? 'bg-amber-50 dark:bg-amber-900/30 text-amber-600 dark:text-amber-400 shadow-sm scale-100' : 'text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-200 scale-95 opacity-70'"
-                  </template>
-                </q-input>
-              </div>
-              
-               <div>
-                <label class="block text-[13px] font-bold text-slate-700 dark:text-slate-300 mb-1">{{ $t('profile.newPassword') }}</label>
-                <q-input
-                  v-model="passwordForm.newPassword"
-                  :type="showPassword.new ? 'text' : 'password'"
-                  outlined 
-                  dense
-                  class="custom-pwd-input"
-                  :rules="[
-                    val => !!val || $t('common.required'),
-                    val => val.length >= 6 || $t('profile.newPasswordHint')
-                  ]"
                 >
-                  <template v-slot:append>
+                  <q-icon name="lock_open" size="18px" /> {{ $t('profile.security') }}
-                    <q-icon
+                </button>
-                      :name="showPassword.new ? 'visibility_off' : 'visibility'"
+            </div>
-                      class="cursor-pointer text-slate-400"
-                      @click="showPassword.new = !showPassword.new"
-                    />
-                  </template>
-                </q-input>
           </div>
           
-               <div>
+          <!-- Edit Content -->
-                <label class="block text-[13px] font-bold text-slate-700 dark:text-slate-300 mb-1">{{ $t('profile.confirmNewPassword') }}</label>
+          <div class="max-w-3xl mx-auto">
-                <q-input
+              <div v-if="activeTab === 'general'" class="bg-white dark:bg-[#1e293b] border border-slate-200 dark:border-slate-700/50 rounded-3xl shadow-xl dark:shadow-none p-6 md:p-10">
-                  v-model="passwordForm.confirmPassword"
+                  <ProfileEditForm
-                  :type="showPassword.confirm ? 'text' : 'password'"
+                      v-model="userData"
-                  outlined 
+                      :loading="isProfileSaving"
-                  dense
+                      :verifying="isSendingVerify"
-                  class="custom-pwd-input"
+                      @submit="handleUpdateProfile"
-                  :rules="[
+                      @upload="handleFileUpload"
-                    val => !!val || $t('common.required'),
+                      @verify="handleSendVerifyEmail"
-                    val => val === passwordForm.newPassword || $t('common.passwordsDoNotMatch')
+                  />
-                  ]"
+              </div>
-                >
+              <div v-else class="bg-white dark:bg-[#1e293b] border border-slate-200 dark:border-slate-700/50 rounded-3xl shadow-xl dark:shadow-none p-6 md:p-10">
-                  <template v-slot:append>
+                  <PasswordChangeForm
-                    <q-icon
+                      v-model="passwordForm"
-                      :name="showPassword.confirm ? 'visibility_off' : 'visibility'"
+                      :loading="isPasswordSaving"
-                      class="cursor-pointer text-slate-400"
+                      @submit="handleUpdatePassword"
-                      @click="showPassword.confirm = !showPassword.confirm"
                   />
-                  </template>
-                </q-input>
               </div>
           </div>
-          </q-card-section>
+      </div>
       
-          <q-card-actions align="right" class="pt-2 pb-2 px-4">
+    </div>
-            <q-btn flat :label="$t('common.cancel')" color="grey-7" v-close-popup class="font-bold text-[13px]" />
-            <q-btn type="submit" unelevated color="primary" :label="$t('common.save')" :loading="isPasswordSaving" class="font-bold rounded-lg px-4 text-[13px]" />
-          </q-card-actions>
-        </q-form>
-      </q-card>
-    </q-dialog>
 
   </div>
 </template>
@@ -432,13 +375,7 @@ onMounted(async () => {
   color: white;
 }
 
-.custom-pwd-input :deep(.q-field__control) {
+/* Removed card-premium and dark mode overrides as we used utility classes */
-  border-radius: 8px;
-  background-color: #f8fafc;
-}
-.dark .custom-pwd-input :deep(.q-field__control) {
-  background-color: #1e293b;
-}
 
 .fade-in {
   animation: fadeIn 0.4s ease-out forwards;

Frontend-Learner/pages/index.vue

@@ -13,29 +13,47 @@ useHead({
   title: 'E-Learning System - ระบบการเรียนการสอนออนไลน์'
 })
 
-import { CATEGORY_CARDS, WHY_CHOOSE_US } from '@/constants/landing'
-
 const { fetchCategories } = useCategory()
 const { fetchCourses, getLocalizedText } = useCourse()
 const { user } = useAuth()
 
-const categoryCards = CATEGORY_CARDS
+const stepOneCards = [
-const whyChooseUs = WHY_CHOOSE_US
+  { title: 'AI Foundations', desc: 'เข้าใจพื้นฐาน AI ใช้งานจริงได้ทุกสายงาน', bgClass: 'bg-slate-900', textClass: 'text-white', arrowClass: 'text-white/60 border-white/20 group-hover:text-slate-900', categorySlug: 'programming' },
+  { title: 'Data Analyst', desc: 'เรียนจนทำ Dashboard วิเคราะห์ Data ได้เลย', bgClass: 'bg-amber-500', textClass: 'text-slate-900', arrowClass: 'text-slate-900/40 border-slate-900/10 group-hover:text-amber-500', categorySlug: 'business' },
+  { title: 'Front-End Web Developer', desc: 'เขียนเว็บสวย ใช้งานได้จริงตั้งแต่หน้าแรก', bgClass: 'bg-orange-500', textClass: 'text-white', arrowClass: 'text-white/60 border-white/20 group-hover:text-orange-500', categorySlug: 'programming' },
+  { title: 'UX/UI Designer', desc: 'ต่อยอดทำ Portfolio ไม่มีประสบการณ์ก็เรียนได้', bgClass: 'bg-pink-600', textClass: 'text-white', arrowClass: 'text-white/60 border-white/20 group-hover:text-pink-600', categorySlug: 'design' },
+  { title: 'Product Manager', desc: 'เก็บทุกทักษะ ปั้น Product วางแผนแบบมือโปร', bgClass: 'bg-teal-500', textClass: 'text-white', arrowClass: 'text-white/60 border-white/20 group-hover:text-teal-500', categorySlug: 'business' },
+  { title: 'Back-End Developer', desc: 'เข้าใจโครงสร้างระบบและฐานข้อมูลหลังบ้าน', bgClass: 'bg-blue-600', textClass: 'text-white', arrowClass: 'text-white/60 border-white/20 group-hover:text-blue-600', categorySlug: 'programming' },
+  { title: 'Supply Chain & Logistics', desc: 'ใช้ Data วางแผนโลจิสติกส์ได้อย่างมีประสิทธิภาพ', bgClass: 'bg-slate-700', textClass: 'text-white', arrowClass: 'text-white/60 border-white/20 group-hover:text-slate-700', categorySlug: 'business' }
+]
 
-// ระดับความยาก (Level)
+const learningStyles = [
-const levelModel = ref('ระดับทั้งหมด')
+  { 
-const levelOptions = ['ระดับทั้งหมด','ระดับเริ่มต้น', 'ระดับกลาง', 'ระดับสูง']
+    title: 'คอร์สออนไลน์', icon: 'desktop_windows', type: 'ONLINE',
+    subtitle: 'เรียนได้ทุกที่ ทุกเวลา', desc: 'คัดสรรเนื้อหาคุณภาพจากผู้เชี่ยวชาญ\nพร้อมให้คุณเริ่มต้นเรียนรู้ได้ทันที', 
+    time: 'เข้าถึงได้ตลอดชีพ',
+    features: ['เนื้อหาครบทุกประเด็นสำคัญ', 'โจทย์ตัวอย่างและแบบฝึกหัด', 'เรียนซ้ำได้ไม่จำกัด', 'ใบเซอร์ทิฟิเคตหลังเรียนจบ'],
+    iconBg: 'bg-blue-50', iconColor: 'text-blue-600', titleClass: 'text-blue-700',
+    btnClass: 'bg-indigo-900 text-white hover:bg-indigo-800'
+  }
+]
+
+const promoCategories = [
+  { title: 'Data', desc: 'เรียนรู้และฝึกฝนกระบวนการคิดสร้างมูลค่าให้ธุรกิจด้วยข้อมูล', icon: 'analytics' },
+  { title: 'Design', desc: 'ออกแบบ Digital Product เพื่อให้ผู้ใช้งานได้รับประสบการณ์ที่ดีที่สุด', icon: 'palette' },
+  { title: 'Tech', desc: 'พร้อมเป็นที่ต้องการของตลาดแรงงานด้วยทักษะการเขียนโปรแกรม', icon: 'code' },
+  { title: 'Business', desc: 'พลิกโฉมธุรกิจในยุคดิจิทัลด้วยการเข้าถึงลูกค้าในช่องทางและเวลาที่เหมาะสม', icon: 'trending_up' }
+]
 
 const categories = ref<any[]>([])
 const topCourses = ref<any[]>([])
 const selectedCategory = ref('all')
 const isLoading = ref(false)
 const currentSlide = ref(0)
-
 const courseChunks = computed(() => {
   const chunkSize = 4
   const chunks = []
-  if (!topCourses.value || topCourses.value.length === 0) return []
+  if (!topCourses.value) return []
   for (let i = 0; i < topCourses.value.length; i += chunkSize) {
     chunks.push(topCourses.value.slice(i, i + chunkSize))
   }
@@ -47,7 +65,7 @@ const loadData = async () => {
     try {
         const [catRes, courseRes] = await Promise.all([
             fetchCategories(),
-            fetchCourses({ limit: 12, forceRefresh: true })
+            fetchCourses({ limit: 8, forceRefresh: true })
         ])
         
         if (catRes.success) categories.value = catRes.data || []
@@ -59,19 +77,6 @@ const loadData = async () => {
     }
 }
 
-const getCategoryIcon = (categoryName: string) => {
-   if (!categoryName) return 'o_category'
-   const text = categoryName.toLowerCase()
-   
-   if (text.includes('ออกแบบ') || text.includes('design')) return 'o_palette'
-   if (text.includes('โปรแกรม') || text.includes('code') || text.includes('dev')) return 'o_terminal'
-   if (text.includes('ธุรกิจ') || text.includes('business') || text.includes('การตลาด') || text.includes('market')) return 'o_storefront'
-   if (text.includes('ภาษา') || text.includes('language')) return 'o_language'
-   if (text.includes('ข้อมูล') || text.includes('data')) return 'o_analytics'
-   
-   return 'o_interests'
-}
-
 const goBrowse = (slug: string) => {
     navigateTo({ path: '/browse', query: { category: slug } })
 }
@@ -79,7 +84,7 @@ const goBrowse = (slug: string) => {
 watch(selectedCategory, async (newVal) => {
     isLoading.value = true
     try {
-        const params: any = { limit: 12 }
+        const params: any = { limit: 8 }
         if (newVal !== 'all') {
             const category = categories.value.find(c => c.slug === newVal)
             if (category) {
@@ -105,41 +110,41 @@ onMounted(() => {
 
 <template>
   <div class="landing-page bg-white min-h-screen">
-    <!-- Section 1: Hero Section -->
+    <!-- Hero Section -->
-    <section class="container mx-auto py-24 md:py-24 lg:py-28 px-6 lg:px-12 pb-16">
+    <header class="relative pt-32 pb-16 md:pt-40 md:pb-20 overflow-hidden bg-white">
-      <div class="flex flex-col lg:flex-row items-center gap-10 lg:gap-10 justify-between animate-fade-in">
+      <!-- Decorative Background -->
-        <!-- ด้านซ้าย: ข้อความและปุ่มกด (Left Content) -->
+      <div class="absolute top-0 right-0 w-[45%] h-[105%] bg-blue-50/50 rounded-bl-[12rem] -z-10 animate-fade-in"/>
-        <div class="flex flex-col items-start gap-6 flex-1 max-w-2xl ">
-          <!-- หัวข้อหลัก (Heading) -->
-          <h1 class="text-4xl sm:text-5xl lg:text-[55px] font-bold leading-tight lg:leading-[66px] slide-up" style="animation-delay: 0.2s;">
-            <span class="text-slate-900">ขยายขอบเขตความรู้ของคุณ</span><br>
-            <span class="text-blue-600">ด้วยการเรียนรู้ออนไลน์</span>
-          </h1>
       
-          <!-- คำอธิบายรอง (Subtitle) -->
+      <div class="container mx-auto px-6 md:px-12 grid grid-cols-1 md:grid-cols-2 items-center gap-16">
-          <p class="text-slate-500 text-lg sm:text-xl leading-relaxed slide-up" style="animation-delay: 0.3s;">
+        <div class="hero-left slide-up">
-            จุดประกายความรู้ของคุณ และเริ่มต้นอัปสกิลกับผู้เชี่ยวชาญ
+          <div class="flex items-center gap-3 mb-8 text-blue-600">
-            ในอุตสาหกรรมที่มีความรู้รอบด้านหลากหลายในหลายสาขา
+            <q-icon name="stars" size="28px" />
-            เรียนได้ทุกที่ ทุกเวลา
+            <span class="text-sm font-black tracking-widest uppercase">E-Learning Platform</span>
+          </div>
+          <h1 class="text-4xl md:text-5xl lg:text-7xl font-bold text-slate-900 leading-[1.2] mb-8 tracking-normal">
+            คอร์สเรียนออนไลน์<br><span class="text-blue-600">เพิ่มทักษะ</span>ยุคดิจิทัล
+          </h1>
+          <p class="text-slate-500 text-lg md:text-xl font-medium mb-12 leading-relaxed max-w-xl slide-up" style="animation-delay: 0.1s;">
+            แหล่งรวมคอร์สออนไลน์คุณภาพสูงที่จะช่วยอัปสกิลให้คุณทำงานเก่งขึ้น พัฒนาทักษะที่ตลาดต้องการ พร้อมให้คุณก้าวไปข้างหน้าได้อย่างมั่นใจ!
           </p>
 
-        <!-- ปุ่มกดต่างๆ (Buttons) -->
+          <!-- Search Bar Pill -->
-          <div class=" w-full flex flex-col sm:flex-row items-center gap-4 pt-5 slide-up" style="animation-delay: 0.4s;">
+          <div class="flex flex-col sm:flex-row gap-4 mb-10 slide-up" style="animation-delay: 0.2s;">
             <q-btn 
               unelevated 
               rounded 
-              color="blue-600" 
+              color="primary" 
-              label="ดูคอร์สเรียน" 
+              label="ดูคอร์สเรียนทั้งหมด" 
-              class="px-10 py-4 w-full sm:w-auto rounded-3xl font-semibold text-white text-lg shadow-xl shadow-blue-600/20 transition-transform"
+              class="px-10 h-16 font-black text-white text-xl shadow-xl shadow-blue-600/20 hover:scale-105 transition-transform"
               no-caps
               to="/browse"
             />
             <q-btn 
               outline
               rounded 
+              color="primary" 
               label="สมัครสมาชิกฟรี" 
-              color="grey-8"
+              class="px-10 h-16 font-black text-xl border-2 hover:bg-blue-50"
-              class="px-10 py-4 w-full sm:w-auto btn-user rounded-3xl font-semibold text-lg hover:bg-blue-50 "
               no-caps
               to="/auth/register"
               v-if="!user"
@@ -147,171 +152,192 @@ onMounted(() => {
           </div>
         </div>
 
-        <!-- ด้านขวา: รูปภาพฮีโร่ (Right - Hero Image) -->
+        <!-- Hero Visual Showcase -->
-        <div class="flex-1 w-full max-w-lg md:max-w-md lg:max-w-xl pl-0 py-10">
+        <div class="hero-right flex justify-center md:justify-end items-center slide-up" style="animation-delay: 0.2s;">
-          <div class="relative rounded-2xl overflow-hidden shadow-[0_25px_50px_-12px_rgba(0,0,0,0.25)] aspect-square">
+          <div class="relative w-full max-w-xl">
+            <!-- Main Illustration -->
+            <div class="relative z-10 animate-float">
               <img 
-              src="https://api.builder.io/api/v1/image/assets/TEMP/11ba9b46c799fac950967377f8158fa942c1a6b8?width=1184"
+                src="/img/elearning.png" 
-              alt="Students collaborating"
+                alt="E-Learning Illustration"
-              class="w-full h-full object-cover"
+                class="w-full h-auto drop-shadow-2xl"
               />
-            <div class="absolute inset-0 bg-gradient-to-t from-black/40 via-transparent to-transparent" />
+            </div>
 
-            <!-- ส่วนทับซ้อนสำหรับทำโมเดลการ์ดคอร์ส (Course Card Overlay) -->
+            <!-- Decorative shapes behind the image -->
-            <!-- <div class="absolute bottom-5 left-5 right-5">
+            <div class="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[120%] h-[120%] bg-blue-50/50 rounded-full blur-3xl -z-10" />
-              <div class="bg-white/85 backdrop-blur-sm border border-white/20 rounded-3xl px-6 py-5">
+            <div class="absolute -top-10 -left-10 w-32 h-32 bg-amber-100 rounded-[3rem] -z-10 animate-pulse" />
-                <div class="flex items-center gap-4">
+            <div class="absolute -bottom-10 -right-10 w-48 h-48 bg-blue-100 rounded-full -z-10 animate-pulse" style="animation-delay: -2s;" />
-                  <div class="flex-shrink-0 w-9 h-9 flex items-center justify-center rounded-2xl bg-blue-600/20">
-                    <q-icon name="o_play_circle" size="25px" class="text-blue-600" />
-                  </div>
-                  <div class="flex flex-col">
-                    <span class="text-slate-900 font-bold text-sm leading-5">
-                      เรียนรู้การออกแบบ UI/UX
-                    </span>
-                    <span class="text-slate-500 text-xs leading-4 mt-0.5">
-                      คอร์สวิดีโอ • 12 บทเรียน
-                    </span>
           </div>
         </div>
       </div>
-            </div> -->
+    </header>
-          </div>
-        </div>
-      </div>
-    </section>
 
-    <!-- Section 2: ทำไมต้องเลือกแพลตฟอร์มของเรา -->
+    <section class="pt-16 pb-12 md:pt-24 md:pb-20 bg-white">
-    <section class="pt-20 pb-14 bg-white relative flex-col">
       <div class="container mx-auto px-6 lg:px-12">
-        <!-- หัวข้อหลัก (Heading) -->
         <div class="text-center mb-16 slide-up">
-          <h2 class="text-4xl md:text-[2.4rem] font-bold text-slate-900 mb-6">
+          <h2 class="text-3xl md:text-5xl font-bold text-slate-900 mb-6 px-4">
-            ทำไมต้องเลือกแพลตฟอร์มของเรา?
+            เพราะ “ก้าวแรก” ของการพัฒนาตัวเอง ท้าทายเสมอ
           </h2>
-          <p class="text-slate-500 text-base font-normal md:text-xl max-w-3xl mx-auto leading-relaxed">
+          <p class="text-slate-500 text-lg md:text-xl font-medium max-w-3xl mx-auto leading-relaxed">
-            เรามีเครื่องมือและความเชี่ยวชาญที่จะช่วยให้คุณประสบความสำเร็จในการเปลี่ยนสายอาชีพและการสร้างทักษะระดับมืออาชีพ
+            เราจึงตั้งใจออกแบบบทเรียนให้ <span class="text-blue-600 font-bold">‘เข้าใจง่าย’</span> และ <span class="text-blue-600 font-bold">‘นำไปใช้ได้จริง’</span> เพื่อให้ทุกก้าวของคุณ มั่นคงและไปถึงเป้าหมายได้สำเร็จ
           </p>
         </div>
 
-        <!-- โซนแนะนำแบบการ์ดแนวนอน (Horizontal Cards) -->
+        <!-- Grid Container (Bento Layout) -->
-        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
+        <div class="relative">
-          <div v-for="(item, i) in whyChooseUs" :key="i"
+          <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
-               class="slide-up p-10 rounded-2xl bg-[#F8FAFC] border border-[#f1f2f9] hover:border-[#2463eb61] hover:bg-white transition-all duration-500 group"
+            <div v-for="(card, i) in stepOneCards" :key="i" 
-               :style="`animation-delay: ${i * 0.1}s`"
+                 class="group cursor-pointer rounded-3xl p-6 flex flex-col justify-between transition-all hover:-translate-y-1 shadow-lg hover:shadow-2xl overflow-hidden relative"
+                 :class="[
+                   card.bgClass,
+                   i === 0 ? 'lg:row-span-2 min-h-[380px]' : 'min-h-[220px]'
+                 ]"
+                 @click="goBrowse(card.categorySlug)"
             >
-            <div class="w-14 h-14 rounded-full bg-[#E3EBFA] flex items-center justify-center mb-5 transition-transform group-hover:scale-110 duration-500">
+              <!-- Background Accent -->
-              <q-icon :name="item.icon" size="28px" class="text-blue-600" />
+              <div class="absolute top-0 right-0 w-32 h-32 bg-white/5 rounded-full -translate-y-1/2 translate-x-1/2" />
+              
+              <div>
+                <span class="text-[10px] font-bold uppercase tracking-[0.15em] opacity-80 mb-3 block" :class="card.textClass === 'text-white' ? 'text-white/80' : 'text-slate-900/60'">ก้าวแรกของ</span>
+                <h3 class="text-2xl font-bold leading-tight tracking-tight mb-2" :class="card.textClass">{{ card.title }}</h3>
+              </div>
+              
+              <div class="space-y-4 relative z-10">
+                <p class="text-sm font-medium leading-relaxed opacity-90" :class="card.textClass">{{ card.desc }}</p>
+                <div class="flex justify-end">
+                  <div class="w-10 h-10 rounded-full border border-white/20 flex items-center justify-center transition-all bg-white/10 group-hover:bg-white/20 group-hover:scale-105 backdrop-blur-sm"
+                       :class="[i === 0 ? 'w-12 h-12' : '']">
+                     <q-icon name="arrow_forward" :size="i === 0 ? '24px' : '20px'" :class="card.textClass" />
+                  </div>
+                </div>
+              </div>
             </div>
-            <h3 class="text-[1.3rem] font-bold text-slate-900 group-hover:text-blue-600 transition-colors">
-              {{ item.title }}
-            </h3>
-            <p class="text-slate-500 text-lg leading-relaxed ">
-              {{ item.desc }}
-            </p>
           </div>
         </div>
       </div>
     </section>
 
-    <!-- Section 3: เลือกเรียนตามเรื่องที่คุณสนใจ -->
+    <!-- Section 2: "Value Proposition" - Why Online Learning here? -->
-    <section class="py-20 md:py-24 bg-white">
+    <section class="pt-12 pb-12 md:pt-20 md:pb-20 bg-white relative overflow-hidden">
+      <!-- Decorative background blur -->
+      <div class="absolute top-1/2 left-0 -translate-y-1/2 w-96 h-96 bg-blue-100/50 rounded-full blur-[100px] -z-10" />
+      
       <div class="container mx-auto px-6 lg:px-12">
-        <!-- หัวข้อ (Heading) -->
+        <div class="grid grid-cols-1 lg:grid-cols-2 gap-20 items-center">
-        <div class="mb-12 slide-up">
+          <!-- Left side: Visual representation -->
-          <h2 class="text-[1.4rem] text-3xl md:text-4xl font-semibold text-slate-900 px-4">
+          <div class="relative slide-up">
-            เลือกเรียนตามเรื่องที่คุณสนใจ
+            <div class="relative z-10 bg-gradient-to-br from-blue-600 to-indigo-700 rounded-[4rem] p-12 md:p-20 shadow-3xl overflow-hidden group">
-          </h2>
+              <!-- Animated background shapes -->
-        </div>
+              <div class="absolute top-0 right-0 w-64 h-64 bg-white/10 rounded-full -translate-y-1/2 translate-x-1/2 group-hover:scale-110 transition-transform duration-1000" />
+              <div class="absolute bottom-0 left-0 w-48 h-48 bg-amber-400/20 rounded-full translate-y-1/2 -translate-x-1/2" />
               
-        <!-- โซนหมวดหมู่แบบการ์ดแนวนอน (Horizontal Cards) -->
+              <div class="relative z-20 flex flex-col items-center text-center text-white">
-        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 justify-center gap-6 px-4">
+                <div class="w-24 h-24 md:w-32 md:h-32 bg-white/20 backdrop-blur-md rounded-[2.5rem] flex items-center justify-center mb-8 shadow-inner">
-          <div v-for="(card, i) in categoryCards" :key="i"
+                  <q-icon name="laptop_mac" size="64px" class="text-white" />
-               class="cursor-pointer bg-white rounded-3xl p-6 border border-slate-200/80 shadow-[0px_1px_2px_0px_rgba(0,0,0,0.05)] hover:shadow-2xl hover:shadow-blue-600/5 hover:-translate-y-1 hover:border-[#2463eb61] transition-all duration-500 flex items-center gap-5"
-               @click="goBrowse(card.slug)"
-          >
-            <!-- กล่องไอคอน (Icon Box) -->
-            <div class="flex-shrink-0 w-16 h-16 rounded-2xl flex items-center justify-center bg-slate-50 group-hover:scale-110 transition-transform duration-500">
-              <q-icon :name="card.icon" size="35px" class="text-blue-600" />
                 </div>
-
+                <h3 class="text-3xl md:text-5xl font-black leading-[1.2] md:leading-[1.15] tracking-tight mb-0 pt-1 overflow-visible">
-            <!-- เนื้อหาข้อความ (Content) -->
+                  คอร์สออนไลน์<br class="hidden md:block" />
-            <div class="flex-grow pr-2">
+                  ที่ออกแบบมาสำหรับคุณ
-              <h3 class="text-lg md:text-xl font-bold text-slate-900 mb-1 group-hover:text-blue-600 transition-colors leading-tight">
-                {{ card.title }}
                 </h3>
-              <p class="text-slate-600 text-xs md:text-sm leading-relaxed opacity-70">
+                <p class="mt-5 text-blue-100/90 text-base md:text-lg font-medium leading-relaxed max-w-md">
-                {{ card.desc }}
+                  เรียนรู้ทักษะใหม่จากผู้เชี่ยวชาญตัวจริง พร้อมเนื้อหาที่เข้มข้นและใช้งานได้จริง
+                </p>
+              </div>
+            </div>
+            
+            <!-- Floating Stats pill -->
+            <div class="absolute -bottom-10 -right-6 md:right-10 z-30 bg-white p-6 rounded-3xl shadow-2xl animate-float">
+              <div class="flex items-center gap-4">
+                <div class="w-12 h-12 rounded-2xl bg-amber-50 flex items-center justify-center text-amber-600">
+                  <q-icon name="query_builder" size="28px" />
+                </div>
+                <div>
+                  <div class="text-xs font-bold text-slate-400 uppercase tracking-tighter">Access Status</div>
+                  <div class="text-xl font-black text-slate-900">เข้าถึงได้ตลอดชีพ</div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- Right side: Content & Benefits -->
+          <div class="slide-up" style="animation-delay: 0.2s;">
+            <div class="mb-12">
+              <span class="inline-flex items-center px-5 py-2 rounded-full bg-blue-50 text-blue-600 text-xs md:text-sm font-extrabold uppercase tracking-widest mb-5 border border-blue-100">
+                Premium Learning Experience
+              </span>
+              <h2 class="text-4xl md:text-6xl font-bold text-slate-900 leading-[1.2] md:leading-[1.2] tracking-tight mb-0 pt-1 overflow-visible">
+                ก้าวข้ามทุกขีดจำกัด<br />
+                ด้วยการเรียนรู้ที่ <span class="text-blue-600">“อิสระ”</span>
+              </h2>
+              <p class="mt-6 text-slate-500 text-lg md:text-xl font-medium leading-relaxed max-w-2xl">
+                เราคัดสรรและคราฟต์ทุกคอร์สเรียนเพื่อให้มั่นใจว่าคุณจะได้รับประสบการณ์การเรียนรู้ที่ดีที่สุด ไม่ว่าจะอยู่ที่ไหนหรือเวลาใดก็ตาม
               </p>
             </div>
 
-            <!-- ลูกศรชี้ขวา (Arrow) -->
+            <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mb-12">
-            <div class="gt-xs flex-shrink-0 text-slate-300 group-hover:text-blue-600 transition-colors transform group-hover:translate-x-1 duration-300">
+              <div v-for="(feature, f) in learningStyles[0].features" :key="f" 
-              <q-icon name="chevron_right" size="24px" />
+                   class="flex items-center gap-4 p-5 rounded-3xl bg-slate-50 border border-slate-100 group hover:border-blue-200 hover:bg-white hover:shadow-xl transition-all duration-300"
+              >
+                <div class="flex-shrink-0 w-10 h-10 rounded-full bg-white flex items-center justify-center text-green-500 shadow-sm group-hover:bg-green-500 group-hover:text-white transition-colors">
+                  <q-icon name="check" size="20px" />
                 </div>
+                <span class="text-base font-black text-slate-700 leading-snug">{{ feature }}</span>
+              </div>
+            </div>
+
+            <q-btn 
+              unelevated 
+              rounded 
+              color="primary"
+              label="เริ่มต้นบทเรียนแรกของคุณ"
+              class="px-12 h-20 font-black text-xl md:text-2xl transition-all shadow-xl hover:shadow-2xl hover:-translate-y-1"
+              no-caps
+              :to="user ? '/browse' : '/auth/login'"
+            />
           </div>
         </div>
       </div>
     </section>
 
+
+
     <!-- Section 4: "คอร์สออนไลน์" -->
-    <section class="py-12 md:py-24 bg-slate-50">
+    <section class="pt-12 pb-24 md:pt-20 md:pb-40 bg-slate-50/50">
       <div class="container mx-auto px-6 lg:px-12">
-        <!-- หัวข้อหลักและลิงก์เพิ่มเติม (Heading) -->
+        <div class="flex flex-col md:flex-row items-start md:items-end justify-between mb-12 gap-8">
-        <div class="flex flex-col md:flex-row items-start md:items-end justify-between mb-5 gap-8">
           <div class="slide-up">
-            <h2 class="text-4xl md:text-[2.4rem] font-bold text-slate-900 mb-4">คอร์สออนไลน์</h2>
+            <h2 class="text-3xl md:text-5xl font-bold text-slate-900 mb-4">คอร์สออนไลน์</h2>
+            <p class="text-slate-500 font-bold text-lg">เริ่มต้นเรียนรู้ทักษะใหม่ด้วยคอร์สคุณภาพจากผู้เชี่ยวชาญ</p>
           </div>
-          <NuxtLink to="/browse" class="flex items-center py-3 text-lg rounded-full font-bold ">
+          <NuxtLink to="/browse" class="flex items-center gap-3 px-8 py-3 rounded-full border-2 border-blue-600 text-blue-700 font-bold hover:bg-blue-600 hover:text-white transition-all slide-up">
-            <span class="text-blue-600 hover:text-blue-500 ">ดูคอร์สทั้งหมด</span>
+            คอร์สออนไลน์ทั้งหมด <q-icon name="arrow_forward" size="20px" />
-            <q-icon name="arrow_forward" size="15px" class="text-blue-600 ml-2" />
           </NuxtLink>
         </div>
 
-        <!-- แถวตัวกรองคอร์ส (Filters Row) -->
+        <!-- Filter Tabs / Pills -->
-        <div class="flex items-center gap-2 mb-8 overflow-x-auto no-scrollbar slide-up justify-between">
+        <div class="flex items-center gap-4 mb-8 overflow-x-auto pb-6 no-scrollbar slide-up">
-          <!-- ตัวกรองหมวดหมู่คอร์ส (Category Filters) -->
-          <div class="flex items-center gap-2">
           <button 
-              class="py-2 px-5 rounded-full font-medium text-lg transition-all whitespace-nowrap border-2"
+            class="px-8 py-3 rounded-full font-black text-base transition-all whitespace-nowrap border-2"
-              :class="selectedCategory === 'all' ? 'bg-blue-600 text-white border-blue-600 font-semibold' : 'bg-white border-slate-100 text-slate-700 hover:border-slate-300'"
+            :class="selectedCategory === 'all' ? 'bg-blue-600 text-white border-blue-600 shadow-lg shadow-blue-600/30' : 'bg-white border-slate-100 text-slate-500 hover:border-slate-300'"
             @click="selectedCategory = 'all'"
           >
-              <q-icon name="o_check_circle" size="20px" class="mr-1" />
             ทั้งหมด
           </button>
-
           <button 
             v-for="category in categories" 
             :key="category.id"
-              class="py-2 px-5 rounded-full font-medium text-lg transition-all whitespace-nowrap border-[1.5px]"
+            class="px-8 py-3 rounded-full font-black text-base transition-all whitespace-nowrap border-2"
-              :class="selectedCategory === category.slug ? 'bg-blue-600 text-white border-blue-600 font-semibold' : 'bg-white border-slate-200 text-slate-700 hover:border-slate-300'"
+            :class="selectedCategory === category.slug ? 'bg-blue-600 text-white border-blue-600 shadow-lg shadow-blue-600/30' : 'bg-white border-slate-100 text-slate-500 hover:border-slate-300'"
             @click="selectedCategory = category.slug"
           >
-              <q-icon :name="getCategoryIcon(getLocalizedText(category.name))" size="20px" class="mr-1" />
             {{ getLocalizedText(category.name) }}
           </button>
         </div>
 
-          <!-- Level Dropdown -->
+        <!-- Courses Carousel -->
-          <!-- <div class="flex items-center gap-2 font-medium">
+        <div v-if="isLoading" class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-10">
-            <q-select 
+          <div v-for="i in 4" :key="i" class="bg-white rounded-[3rem] h-[480px] animate-pulse" />
-                borderless 
-                v-model="levelModel" 
-                :options="levelOptions" 
-                dropdown-icon="o_keyboard_arrow_down"  
-                class="text-lg" 
-                popup-content-class="rounded-lg text-lg shadow-sm text-slate-700"
-            >
-              <template v-slot:before>
-                <div class="text-slate-700 text-lg">ระดับความยาก:</div>
-              </template>
-            </q-select>
-          </div> -->
-        </div>
-
-        <!-- ระบบเลื่อนสไลด์ดูคอร์ส (Courses Carousel) -->
-        <div v-if="isLoading" class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
-          <div v-for="i in 4" :key="i" class="bg-white rounded-2xl h-[450px] animate-pulse" />
         </div>
         
         <div v-else class="relative group/carousel slide-up">
@@ -330,68 +356,19 @@ onMounted(() => {
               v-for="(chunk, pageIndex) in courseChunks" 
               :key="pageIndex" 
               :name="pageIndex" 
-              class="p-0"
+              class="p-4"
             >
-              <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
+              <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-10">
-                <div 
+                <CourseCard 
                   v-for="course in chunk" 
                   :key="course.id" 
-                  class="flex flex-col flex-1 min-w-0 rounded-2xl border border-slate-100 bg-white shadow-sm overflow-hidden hover:shadow-lg hover:-translate-y-1 transition-all duration-300 cursor-pointer"
+                  v-bind="{ ...course, image: course.thumbnail_url }"
-                  @click="navigateTo(`/course/${course.id}`)"
-                >
-                  <!-- รูปภาพหน้าปกคอร์ส (Image) -->
-                  <div class="relative flex-shrink-0">
-                    <img
-                      v-if="course.thumbnail_url"
-                      :src="course.thumbnail_url"
-                      :alt="getLocalizedText(course.title)"
-                      class="w-full h-[150px] sm:h-[180px] lg:h-[200px] object-cover"
                 />
-                    <div v-else class="w-full h-[150px] sm:h-[180px] lg:h-[200px] bg-slate-100 flex items-center justify-center">
-                        <q-icon name="o_image" size="40px" class="text-slate-300" />
-                    </div>
-                  </div>
-
-                  <!-- เนื้อหาของคอร์ส (Content) -->
-                  <div class="flex flex-col flex-1 p-6">
-
-
-                    <!-- ชื่อคอร์ส (Title) -->
-                    <h3 class="text-[#0F172A] font-semibold text-lg leading-snug mb-2 line-clamp-2">
-                      {{ getLocalizedText(course.title) }}
-                    </h3>
-
-                    <!-- รายละเอียดแบบย่อ (Description) -->
-                    <p class="text-slate-500 text-sm leading-relaxed mb-4 flex-1 line-clamp-2">
-                      {{ getLocalizedText(course.description) }}
-                    </p>
-
-
-
-                   <!-- ส่วนแถบราคาและปุ่มกด (Price + Button) -->
-                    <div class="flex items-center justify-between pt-6 border-t border-slate-100 gap-2">
-                        <div class="flex flex-col">
-                            <span v-if="course.price > 0" class="text-[#0F172A] font-bold text-xl">
-                                {{ course.price.toLocaleString() }}.-
-                            </span>
-                            <span v-else class="text-green-600 font-bold text-xl">
-                                ฟรี
-                            </span>
-                        </div>
-                      <button class="flex items-center gap-2 px-4 py-2 rounded-full bg-[#2463EB]/10 hover:bg-[#2463EB]/20 transition-colors">
-                        <q-icon name="o_remove_red_eye" size="18px" class="text-[#2463EB]" />
-                        <span class="text-[#2463EB] font-medium text-sm">
-                          รายละเอียด
-                        </span>
-                      </button>
-                    </div>
-                  </div>
-                </div>
               </div>
             </q-carousel-slide>
           </q-carousel>
 
-           <!-- ระบบนำทางสไลด์แบบกำหนดเอง (Custom Carousel Navigation) -->
+           <!-- Custom Carousel Navigation -->
             <button 
               v-if="courseChunks.length > 1"
               class="absolute -left-4 md:-left-12 top-1/2 -translate-y-1/2 z-10 w-12 h-12 rounded-full bg-white shadow-xl border border-slate-100 flex items-center justify-center text-slate-500 hover:text-blue-600 transition-all hover:scale-110"
@@ -413,55 +390,11 @@ onMounted(() => {
         </div>
       </div>
     </section>
-
-    <!-- Section 5: "พร้อมเริ่มต้นการเรียนรู้แล้วหรือยัง" -->
-    <section class="py-16 md:py-24 bg-white">
-      <div class="max-w-7xl mx-auto px-6 lg:px-12">
-        <div class="bg-blue-600 rounded-3xl px-8 py-20 md:px-18 text-center relative overflow-hidden">
-          <div class="gradient-background">
-            <div class="gradient-sphere sphere-1"></div>
-            <div class="gradient-sphere sphere-2"></div>
-            <div class="gradient-sphere sphere-3"></div>
-          </div>
-          <div class="grid-overlay"></div>
-          <div class="relative z-10">
-            <h2 class="text-3xl sm:text-4xl font-bold text-white mb-4">
-              พร้อมเริ่มต้นการเรียนรู้แล้วหรือยัง?
-            </h2>
-            <p class="text-blue-100 text-lg mb-8 max-w-xl mx-auto">
-              อัปสกิลและรับทักษะที่คุณต้องการเพื่อก้าวหน้าในระดับมืออาชีพ 
-              เปิดประสบการณ์การเรียนรู้รูปแบบใหม่ สมัครเลยวันนี้เพื่อเริ่มต้นเข้าสู่บทเรียน
-            </p>
-            <div class="flex flex-wrap justify-center gap-4">
-              <q-btn 
-                unelevated 
-                rounded 
-                class="px-8 py-4 bg-white font-bold rounded-3xl hover:bg-slate-50 transition-colors"
-                no-caps
-                size="18px"
-                to="/browse"
-              >
-                <div class="text-blue-600">สำรวจคอร์สเรียน</div>
-              </q-btn>
-              <q-btn 
-                outline
-                rounded 
-                label="สมัครฟรีวันนี้" 
-                color="white"
-                class="px-8 py-4 font-bold rounded-3xl hover:bg-white/10 transition-colors"
-                no-caps
-                size="18px"
-                to="/auth/register"
-                v-if="!user"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    </section>
   </div>
 </template>
 
+
+
 <style scoped>
 .landing-page {
   font-family: var(--font-main);
@@ -486,6 +419,15 @@ onMounted(() => {
   opacity: 0;
 }
 
+@keyframes float {
+  0%, 100% { transform: translateY(0) rotate(0); }
+  50% { transform: translateY(-20px) rotate(5deg); }
+}
+
+.animate-float {
+  animation: float 6s ease-in-out infinite;
+}
+
 @keyframes fade-in {
   from { opacity: 0; }
   to { opacity: 1; }
@@ -495,80 +437,26 @@ onMounted(() => {
   animation: fade-in 1s ease-out forwards;
 }
 
-/* Hero Right Hover State */
+/* Typography Overrides */
-.hero-right:hover .relative {
+h1, h2, h3 {
-    transform: translateY(-10px);
+  letter-spacing: normal;
-    transition: transform 0.5s ease;
 }
 
-.gradient-background {
+/* Hover effects */
-  position: absolute;
+.hero-right:hover .animate-float {
-  top: 0;
+  animation-play-state: paused;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1;
-  overflow: hidden;
 }
 
-.gradient-sphere {
+/* Responsive Grid Adjustments */
-  position: absolute;
+@media (max-width: 1200px) {
-  border-radius: 50%;
+  .career-cards-grid {
-  filter: blur(60px);
+    grid-template-columns: repeat(4, 1fr);
+  }
 }
 
-.sphere-1 {
+@media (max-width: 768px) {
-  width: 30vw;
+  .career-cards-grid {
-  height: 30vw;
+    grid-template-columns: repeat(2, 1fr);
-  background: linear-gradient(40deg, rgba(255, 255, 255, 0.41), rgba(255, 255, 255, 0.164));
-  top: 10%;
-  left: -30%;
-  animation: float-1 15s ease-in-out infinite alternate;
   }
-
-.sphere-2 {
-  width: 45vw;
-  height: 45vw;
-  background: linear-gradient(240deg, rgba(16, 33, 121, 0.245), rgba(155, 169, 239, 0.263));
-  bottom: -20%;
-  right: -35%;
-  animation: float-2 18s ease-in-out infinite alternate;
-}
-
-.sphere-3 {
-  width: 30vw;
-  height: 30vw;
-  background: linear-gradient(120deg, rgba(133, 89, 255, 0.5), rgba(98, 216, 249, 0.3));
-  top: 60%;
-  left: 20%;
-  animation: float-3 20s ease-in-out infinite alternate;
-}
-
-@keyframes float-1 {
-  0% { transform: translate(0, 0) scale(1); }
-  100% { transform: translate(10%, 10%) scale(1.1); }
-}
-
-@keyframes float-2 {
-  0% { transform: translate(0, 0) scale(1); }
-  100% { transform: translate(-10%, -5%) scale(1.15); }
-}
-
-@keyframes float-3 {
-  0% { transform: translate(0, 0) scale(1); opacity: 0.3; }
-  100% { transform: translate(-5%, 10%) scale(1.05); opacity: 0.6; }
-}
-
-.grid-overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-size: 40px 40px;
-  background-image: 
-      linear-gradient(to right, rgba(255, 255, 255, 0.05) 1px, transparent 1px),
-      linear-gradient(to bottom, rgba(255, 255, 255, 0.05) 1px, transparent 1px);
-  z-index: 2;
 }
 </style>

Frontend-Learner/pages/quiz/[id].vue

@@ -2,7 +2,7 @@
   <div class="min-h-screen bg-gray-50 p-4 md:p-8">
     <div class="max-w-4xl mx-auto">
       
-      <!-- ส่วนหัว / ชื่อเรื่อง (Header / Title) -->
+      <!-- Header / Title -->
       <div class="mb-6 flex items-center justify-between">
         <div>
           <h1 class="text-2xl font-bold text-gray-800">Quiz Runner</h1>
@@ -16,7 +16,7 @@
 
       <div class="grid grid-cols-1 lg:grid-cols-12 gap-6">
         
-        <!-- แถบด้านข้าง: ตัวนำทางคำถาม (Sidebar: Question Navigator) -->
+        <!-- Sidebar: Question Navigator -->
         <div class="lg:col-span-3 order-2 lg:order-1">
           <QCard class="bg-white shadow-sm sticky top-4">
             <QCardSection>
@@ -33,7 +33,7 @@
                 </button>
               </div>
               
-              <!-- คำอธิบายสัญลักษณ์ (Legend) -->
+              <!-- Legend -->
               <div class="mt-6 space-y-2 text-xs text-gray-600">
                 <div class="flex items-center gap-2"><div class="w-3 h-3 rounded-full bg-blue-500"></div> Current</div>
                 <div class="flex items-center gap-2"><div class="w-3 h-3 rounded-full bg-green-500"></div> Completed</div>
@@ -44,11 +44,11 @@
           </QCard>
         </div>
 
-        <!-- เนื้อหาหลัก: คำถาม (Main Content: Question) -->
+        <!-- Main Content: Question -->
         <div class="lg:col-span-9 order-1 lg:order-2">
           <QCard v-if="store.currentQuestion" class="bg-white shadow-md min-h-[400px] flex flex-col">
             
-            <!-- ส่วนหัวคำถาม (Question Header) -->
+            <!-- Question Header -->
             <QCardSection class="bg-gray-50 border-b border-gray-100 py-4">
               <div class="flex justify-between items-start">
                 <div>
@@ -57,18 +57,18 @@
                   </QBadge>
                   <h2 class="text-xl font-medium text-gray-800">
                     <span class="text-gray-400 mr-2">{{ store.currentQuestionIndex + 1 }}.</span>
-                    {{ getLocalizedString(store.currentQuestion.question) }}
+                    {{ store.currentQuestion.title }}
                   </h2>
                 </div>
               </div>
             </QCardSection>
 
-            <!-- ส่วนเนื้อหาคำถาม (Question Body) -->
+            <!-- Question Body -->
             <QCardSection class="flex-grow py-8 px-6">
               
-              <!-- เลือกคำตอบเดียว (Single Choice) -->
+              <!-- Single Choice -->
               <div v-if="store.currentQuestion.type === 'single'">
-                <div v-for="opt in store.currentQuestion.choices" :key="opt.id" 
+                <div v-for="opt in store.currentQuestion.options" :key="opt.id" 
                      class="mb-3 p-3 border rounded-lg hover:bg-blue-50 cursor-pointer transition-colors"
                      :class="{ 'border-blue-500 bg-blue-50': currentVal === opt.id, 'border-gray-200': currentVal !== opt.id }"
                      @click="handleInput(opt.id)">
@@ -77,14 +77,14 @@
                          :class="{ 'border-blue-500': currentVal === opt.id, 'border-gray-300': currentVal !== opt.id }">
                       <div v-if="currentVal === opt.id" class="w-2.5 h-2.5 rounded-full bg-blue-500"></div>
                     </div>
-                    <span class="text-gray-700">{{ getLocalizedString(opt.text) }}</span>
+                    <span class="text-gray-700">{{ opt.label }}</span>
                   </div>
                 </div>
               </div>
 
-              <!-- เลือกหลายคำตอบ (Multiple Choice) -->
+              <!-- Multiple Choice -->
               <div v-else-if="store.currentQuestion.type === 'multiple'">
-                <div v-for="opt in store.currentQuestion.choices" :key="opt.id" 
+                <div v-for="opt in store.currentQuestion.options" :key="opt.id" 
                      class="mb-3 p-3 border rounded-lg hover:bg-blue-50 cursor-pointer transition-colors"
                      :class="{ 'border-blue-500 bg-blue-50': isSelected(opt.id), 'border-gray-200': !isSelected(opt.id) }"
                      @click="toggleSelection(opt.id)">
@@ -93,12 +93,12 @@
                          :class="{ 'border-blue-500 bg-blue-500': isSelected(opt.id), 'border-gray-300': !isSelected(opt.id) }">
                       <QIcon v-if="isSelected(opt.id)" name="check" class="text-white text-xs" />
                     </div>
-                    <span class="text-gray-700">{{ getLocalizedString(opt.text) }}</span>
+                    <span class="text-gray-700">{{ opt.label }}</span>
                   </div>
                 </div>
               </div>
 
-              <!-- พิมพ์ข้อความ (Text Input) -->
+              <!-- Text Input -->
               <div v-else-if="store.currentQuestion.type === 'text'">
                 <QInput
                   v-model="textModel"
@@ -113,7 +113,7 @@
 
             </QCardSection>
 
-            <!-- แบนเนอร์แสดงข้อผิดพลาด (Error Banner) -->
+            <!-- Error Banner -->
             <QBanner v-if="store.lastError" class="bg-red-50 text-red-600 px-6 py-2 border-t border-red-100">
               <template v-slot:avatar>
                 <QIcon name="warning" color="red" />
@@ -121,7 +121,7 @@
               {{ store.lastError }}
             </QBanner>
 
-            <!-- ส่วนท้ายปุ่มกดต่างๆ (Actions Footer) -->
+            <!-- Actions Footer -->
             <QCardSection class="border-t border-gray-100 bg-gray-50 p-4 flex flex-wrap gap-4 items-center justify-between">
               
               <QBtn
@@ -140,7 +140,7 @@
                   flat
                   color="orange-8"
                   label="Skip for now"
-                  @click="store.nextQuestion()"
+                  @click="store.skipQuestion()"
                   no-caps
                 />
 
@@ -178,11 +178,11 @@
 <script setup lang="ts">
 import { computed, ref, onMounted, watch, reactive } from 'vue';
 import { useRoute } from 'vue-router';
-// คอมโพสิเบิลถูกนำเข้าอัตโนมัติใน Nuxt (Composable is auto-imported in Nuxt)
+// Composable is auto-imported in Nuxt
 // import { useQuizRunner } from '@/composables/useQuizRunner'; 
 
 const route = useRoute();
-// ห่อหุ้มใน reactive เพื่อแกะค่า refs ทำให้เหมือนพฤติกรรม Pinia store สำหรับ template (Wrap in reactive to unwrap refs, mimicking Pinia store behavior for template)
+// Wrap in reactive to unwrap refs, mimicking Pinia store behavior for template
 const store = reactive(useQuizRunner());
 
 onMounted(() => {
@@ -190,16 +190,7 @@ onMounted(() => {
   store.initQuiz(quizId);
 });
 
-// -- ตัวช่วยสำหรับการจัดการการป้อนข้อมูล (Helpers for Input Handling) --
+// -- Helpers for Input Handling --
-
-// ฟังก์ชันช่วยเหลือสำหรับแปลภาษา (Helper to safely format text)
-const getLocalizedString = (val: any): string => {
-  if (typeof val === 'string') return val;
-  if (val && typeof val === 'object') {
-    return val.th || val.en || String(val);
-  }
-  return String(val || '');
-}
 
 const currentVal = computed(() => {
   return store.currentAnswer?.value;
@@ -209,23 +200,23 @@ const isSaved = computed(() => {
   return store.currentAnswer?.is_saved;
 });
 
-// เลือกคำตอบเดียว (Single Choice)
+// Single Choice
-function handleInput(val: number) {
+function handleInput(val: string) {
   store.updateAnswer(val);
 }
 
-// พิมพ์ข้อความ (Text Choice)
+// Text Choice
 const textModel = ref('');
-// จับตาดูการเปลี่ยนแปลงคำถามเพื่อล้างค่า (Watch for question changes to reset text model)
+// Watch for question changes to reset text model
 watch(
   () => store.currentQuestionIndex,
   () => {
     if (store.currentQuestion?.type === 'text') {
        textModel.value = (store.currentAnswer?.value as string) || '';
     }
-    // ล้างข้อผิดพลาดเมื่อเปลี่ยนคำถาม (Clear error when changing question)
+    // Clear error when changing question
     store.lastError = null;
-    // เลื่อนหน้าจอขึ้นบนสุด (Scroll to top)
+    // Scroll to top
     if (typeof window !== 'undefined') {
        window.scrollTo({ top: 0, behavior: 'smooth' });
     }
@@ -233,7 +224,7 @@ watch(
   { immediate: true }
 );
 
-// จับตาดูข้อผิดพลาดเพื่อเลื่อนหน้าจอไปยังฟิลด์นั้น (Watch for error to scroll to error/field)
+// Watch for error to scroll to error/field
 watch(
   () => store.lastError,
   (newVal) => {
@@ -254,8 +245,8 @@ function handleTextInput(val: string | number | null) {
   store.updateAnswer(val as string);
 }
 
-// เลือกหลายคำตอบ (Multiple Choice)
+// Multiple Choice
-function isSelected(id: number) {
+function isSelected(id: string) {
   const val = store.currentAnswer?.value;
   if (Array.isArray(val)) {
     return val.includes(id);
@@ -263,9 +254,9 @@ function isSelected(id: number) {
   return false;
 }
 
-function toggleSelection(id: number) {
+function toggleSelection(id: string) {
   const val = store.currentAnswer?.value;
-  let currentArr: number[] = [];
+  let currentArr: string[] = [];
   if (Array.isArray(val)) {
     currentArr = [...val];
   }
@@ -279,10 +270,10 @@ function toggleSelection(id: number) {
   store.updateAnswer(currentArr);
 }
 
-// -- ตัวช่วยสำหรับการจัดแต่งทรง (Helpers for Styling) --
+// -- Helpers for Styling --
 
 function getIndicatorClass(index: number, qId: number) {
-  // 1. ปัจจุบัน = สีน้ำเงิน (Current = Blue)
+  // 1. Current = Blue
   if (index === store.currentQuestionIndex) {
     return 'bg-blue-500 text-white border-blue-600';
   }
@@ -295,8 +286,7 @@ function getIndicatorClass(index: number, qId: number) {
     case 'skipped':
       return 'bg-orange-500 text-white border-orange-600';
     case 'in_progress':
-      // กรณีที่เป็น in_progress แต่ไม่ใช่คำถามปัจจุบัน (จริงๆ เกิดยากตามตรรกะที่เข้มงวด แต่เผื่อไว้ก่อน) 
+      // If it's in_progress but NOT current (should be rare/impossible with strict logic, but handled)
-      // (If it's in_progress but NOT current (should be rare/impossible with strict logic, but handled))
       return 'bg-blue-200 text-blue-800 border-blue-300'; 
     case 'not_started':
     default:
@@ -307,5 +297,5 @@ function getIndicatorClass(index: number, qId: number) {
 </script>
 
 <style scoped>
-/* ส่วนเสริม: ทรานสิชั่น (Optional: Transitions) */
+/* Optional: Transitions */
 </style>

Frontend-Learner/pages/reset-password.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 /**
  * @file reset-password.vue
- * @description หน้าตั้งรหัสผ่านใหม่ (Reset Password Page.
+ * @description Reset Password Page.
- * อนุญาตให้ผู้ใช้ตั้งรหัสผ่านใหม่หลังจากยืนยันลิงก์อีเมล)
+ * Allows user to set a new password after verifying their email link (simulated).
  */
 
 definePageMeta({
@@ -44,9 +44,9 @@ const handlePasswordInput = (field: keyof typeof resetForm, val: string) => {
   resetForm[field] = val
   if (/[\u0E00-\u0E7F]/.test(val)) {
     if (field === 'password') errors.value.password = 'ห้ามใส่ภาษาไทย'
-    // ไม่จำเป็นต้องแจ้งเตือน confirmPassword แยกต่างหากถ้ามันแค่ต้องตรงกัน แต่เพื่อให้สอดคล้องกันเราก็ควรทำ (We don't necessarily need to flag confirmPassword individually if it just needs to match, but let's be consistent if we want)
+    // We don't necessarily need to flag confirmPassword individually if it just needs to match, but let's be consistent if we want
   } else {
-    // ลบข้อผิดพลาดถ้าเป็น "ห้ามใส่ภาษาไทย" (Clear error if it was "Thai characters")
+    // Clear error if it was "Thai characters"
     if (field === 'password' && errors.value.password === 'ห้ามใส่ภาษาไทย') {
       clearFieldError('password')
     }
@@ -63,7 +63,7 @@ onMounted(() => {
 const resetPassword = async () => {
   if (!validate(resetForm, resetRules)) return
   
-  // ดึงโทเคนจาก URL query (Extract token from query)
+  // Extract token from query
   const token = route.query.token as string
 
   if (!token) {
@@ -92,7 +92,7 @@ const resetPassword = async () => {
 <template>
   <div class="relative min-h-screen w-full flex items-center justify-center p-4 overflow-hidden bg-slate-50 transition-colors">
     <!-- ==========================================
-          เอฟเฟกต์พื้นหลัง (แสดงเฉพาะโหมดสว่าง) (BACKGROUND EFFECTS (Light Mode Only))
+          BACKGROUND EFFECTS (Light Mode Only)
      ========================================== -->
     <div class="fixed inset-0 overflow-hidden pointer-events-none -z-10">
        <div class="absolute inset-0 bg-gradient-to-br from-white via-slate-50 to-blue-50/50"></div>
@@ -101,11 +101,11 @@ const resetPassword = async () => {
     </div>
 
     <!-- ==========================================
-          การ์ดตั้งรหัสผ่านใหม่ (RESET PASSWORD CARD)
+          RESET PASSWORD CARD
      ========================================== -->
     <div class="w-full max-w-[460px] relative z-10 slide-up">
       
-       <!-- หัวข้อ / โลโก้ (Header / Logo) -->
+       <!-- Header / Logo -->
        <div class="text-center mb-8">
           <div class="inline-flex items-center justify-center w-14 h-14 rounded-2xl bg-gradient-to-tr from-blue-600 to-indigo-600 text-white shadow-lg shadow-blue-600/20 mb-6">
              <span class="font-black text-2xl">E</span>
@@ -116,10 +116,10 @@ const resetPassword = async () => {
 
       <div class="bg-white rounded-[2rem] p-8 md:p-10 shadow-xl shadow-slate-200/50 border border-slate-100 relative overflow-hidden">
         
-        <!-- ฟอร์ม (Form) -->
+        <!-- Form -->
         <form @submit.prevent="resetPassword" class="flex flex-col gap-6">
           
-          <!-- รหัสผ่านใหม่ (New Password) -->
+          <!-- New Password -->
           <div>
             <label class="block text-sm font-semibold text-slate-700 mb-2 ml-1">รหัสผ่านใหม่ <span class="text-red-500">*</span></label>
             <div class="relative group">
@@ -145,7 +145,7 @@ const resetPassword = async () => {
             <span v-if="errors.password" class="text-xs text-red-500 font-medium ml-1 mt-1 block slide-up-sm">{{ errors.password }}</span>
           </div>
 
-          <!-- ยืนยันรหัสผ่านใหม่ (Confirm Password) -->
+          <!-- Confirm Password -->
           <div>
             <label class="block text-sm font-semibold text-slate-700 mb-2 ml-1">ยืนยันรหัสผ่านใหม่ <span class="text-red-500">*</span></label>
             <div class="relative group">
@@ -171,7 +171,7 @@ const resetPassword = async () => {
             <span v-if="errors.confirmPassword" class="text-xs text-red-500 font-medium ml-1 mt-1 block slide-up-sm">{{ errors.confirmPassword }}</span>
           </div>
 
-          <!-- ปุ่มยืนยัน (Submit Button) -->
+          <!-- Submit Button -->
           <button 
             type="submit" 
             :disabled="isLoading"
@@ -183,7 +183,7 @@ const resetPassword = async () => {
         </form>
       </div>
 
-      <!-- ลิงก์ย้อนกลับ (Back Link) -->
+      <!-- Back Link -->
        <div class="mt-8 text-center text-slate-500">
            <NuxtLink to="/auth/login" class="inline-flex items-center gap-2 text-sm font-medium hover:text-slate-800 transition-colors group px-4 py-2 rounded-lg hover:bg-white/50">
              <span class="group-hover:-translate-x-1 transition-transform">←</span> กลับไปหน้าเข้าสู่ระบบ

Frontend-Learner/pages/verify-email.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 /**
  * @file verify-email.vue
- * @description หน้าสำหรับกระบวนการยืนยันอีเมล (Page for handling email verification process.
+ * @description Page for handling email verification process.
- * แสดงสถานะกำลังโหลดระหว่างประมวลผลโทเคน จากนั้นแสดงข้อความสำเร็จหรือข้อผิดพลาด)
+ * Displays loading state while processing token, then shows success or error message.
  */
 
 definePageMeta({
-  layout: 'auth'
+  layout: 'default'
 })
 
 const route = useRoute()
@@ -28,7 +28,7 @@ onMounted(async () => {
         return
     }
 
-    // เรียกใช้ API เพื่อยืนยัน (Call verify API)
+    // Call verify API
     const result = await verifyEmail(token)
     
     isLoading.value = false
@@ -39,7 +39,7 @@ onMounted(async () => {
         isSuccess.value = false
         if (result.code === 400) {
              errorMessage.value = t('profile.emailAlreadyVerified')
-             // หากยืนยันแล้วให้แสดงสถานะสำเร็จพร้อมด้วยข้อความเฉพาะ (If already verified, show success state with specific message)
+             // If already verified, show success state with specific message
              isSuccess.value = true 
         } else if (result.code === 401) {
             errorMessage.value = t('auth.tokenExpired')
@@ -58,7 +58,7 @@ const navigateToHome = () => {
   <div class="min-h-screen flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8 bg-slate-50 dark:bg-[#0f172a]">
     <div class="auth-card max-w-md w-full space-y-8 p-8 rounded-2xl text-center">
       
-      <!-- สถานะกำลังโหลด (Loading State) -->
+      <!-- Loading State -->
       <div v-if="isLoading" class="flex flex-col items-center justify-center py-8">
         <q-spinner-dots size="4rem" color="primary" />
         <h2 class="mt-6 text-xl font-bold text-slate-900 dark:text-white animate-pulse">
@@ -66,10 +66,10 @@ const navigateToHome = () => {
         </h2>
       </div>
 
-      <!-- สถานะสำเร็จ (Success State) -->
+      <!-- Success State -->
       <div v-else-if="isSuccess" class="flex flex-col items-center animate-bounce-in">
-        <div class="w-24 h-24 rounded-full bg-green-500 flex items-center justify-center mb-10 shadow-lg shadow-green-500/20">
+        <div class="w-24 h-24 rounded-full bg-green-100 dark:bg-green-900/30 flex items-center justify-center mb-6">
-           <q-icon name="check" class="text-5xl text-white font-black" />
+           <q-icon name="check_circle" class="text-6xl text-green-500" />
         </div>
         
         <h2 class="text-3xl font-black text-slate-900 dark:text-white mb-2">
@@ -89,7 +89,7 @@ const navigateToHome = () => {
         />
       </div>
 
-      <!-- สถานะข้อผิดพลาด (Error State) -->
+      <!-- Error State -->
       <div v-else class="flex flex-col items-center animate-shake">
          <div class="w-24 h-24 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center mb-6">
            <q-icon name="error" class="text-6xl text-red-500" />
@@ -126,15 +126,11 @@ const navigateToHome = () => {
 }
 
 .auth-card {
-  background-color: white;
+  @apply bg-white border-slate-100 shadow-xl;
-  border-color: #f1f5f9;
-  box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
   border-width: 1px;
 }
-:global(.dark) .auth-card {
+.dark .auth-card {
-  background-color: #1e293b;
+  @apply bg-[#1e293b] border-white/5 shadow-none;
-  border-color: rgba(255, 255, 255, 0.05);
-  box-shadow: none;
 }
 
 @keyframes bounceIn {