diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
deleted file mode 100644
index 5526a8d..0000000
--- a/.github/workflows/build.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: build to DockerHub
-run-name: build ${{ github.actor }}
-on:
-  push:
-    tags:
-      - "edm-[0-9]+.[0-9]+.[0-9]+"
-  workflow_dispatch:
-
-env:
-  DOCKERHUB_REGISTRY: docker.io
-  IMAGE_NAME: hrms-edm
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Generate Version
-        id: gen_ver
-        run: |
-          if [[ $GITHUB_REF == 'refs/heads/'* ]]; then
-            BRANCH_NAME="${GITHUB_REF##*/}"
-            IMAGE_VER="$BRANCH_NAME-$(date +%Y%m%d)-${GITHUB_SHA::7}"
-          else
-            IMAGE_VER="pr-${GITHUB_SHA::7}"
-          fi
-          echo "{\"version\":\"$IMAGE_VER\", \"date\":\"$(date +"%Y-%m-%d_%T")\",\"ref\":\"$GITHUB_REF\", \"sha\":\"$GITHUB_SHA\" }" > ./Services/server/src/version.json
-          echo "image_ver=$IMAGE_VER" >> $GITHUB_OUTPUT
-          echo "Build version: $IMAGE_VER"
-          cat ./Services/server/src/version.json
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push to DockerHub
-        uses: docker/build-push-action@v3
-        with:
-          context: ./Services
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }}
-            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
-          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
-
-      - name: Notify Discord Success
-        if: success()
-        run: |
-          curl -H "Content-Type: application/json" \
-          -X POST \
-          -d '{
-            "embeds": [{
-              "title": "✅ Build Success!",
-              "description": "**Details:**\n- Image: `${{ secrets.DOCKERHUB_USERNAME }}/${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Branch: `${{ github.ref_name }}`\n- Built by: `${{github.actor}}`",
-              "color": 3066993,
-              "footer": {
-                "text": "Build Notification",
-                "icon_url": "https://example.com/success-icon.png"
-              },
-              "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-            }]
-          }' \
-          ${{ secrets.DISCORD_WEBHOOK }}
-
-      - name: Notify Discord Failure
-        if: failure()
-        run: |
-          curl -H "Content-Type: application/json" \
-          -X POST \
-          -d '{
-            "embeds": [{
-              "title": "❌ Build Failed!",
-              "description": "**Details:**\n- Image: `${{ secrets.DOCKERHUB_USERNAME }}/${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Branch: `${{ github.ref_name }}`\n- Attempted by: `${{github.actor}}`",
-              "color": 15158332,
-              "footer": {
-                "text": "Build Notification",
-                "icon_url": "https://example.com/failure-icon.png"
-              },
-              "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-            }]
-          }' \
-          ${{ secrets.DISCORD_WEBHOOK }}
diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
deleted file mode 100644
index 012135c..0000000
--- a/.onedev-buildspec.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-version: 37
-jobs:
-- name: CI for UAT
-  steps:
-  - !CheckoutStep
-    name: checkout code
-    cloneCredential: !DefaultCredential {}
-    withLfs: false
-    withSubmodules: false
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !GenerateChecksumStep
-    name: generate package checksum
-    files: package-lock.json yarn.lock
-    targetFile: checksum
-    condition: NEVER
-  - !SetupCacheStep
-    name: set up npm cache
-    key: node_modules_@file:checksum@
-    loadKeys:
-    - node_modules
-    paths:
-    - node_modules
-    uploadStrategy: UPLOAD_IF_NOT_HIT
-    condition: NEVER
-  - !SetBuildVersionStep
-    name: set build version
-    buildVersion: '@tag@'
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !CommandStep
-    name: build & test
-    runInContainer: true
-    image: node
-    interpreter: !DefaultInterpreter
-      commands: |
-        npm install
-        npm run build
-    useTTY: true
-    condition: NEVER
-  - !BuildImageStep
-    name: build docker image
-    dockerfile: ./Services/Dockerfile
-    output: !RegistryOutput
-      tags: hrms-git.chin.in.th/bma-hrms/hrms-edm:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-edm:latest
-    platforms: linux/amd64
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  triggers:
-  - !TagCreateTrigger
-    tags: uat-*
-    branches: main
-  retryCondition: never
-  maxRetries: 3
-  retryDelay: 30
-  timeout: 14400
-- name: CI for PROD
-  steps:
-  - !CheckoutStep
-    name: checkout code
-    cloneCredential: !DefaultCredential {}
-    withLfs: false
-    withSubmodules: false
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !GenerateChecksumStep
-    name: generate package checksum
-    files: package-lock.json yarn.lock
-    targetFile: checksum
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !SetupCacheStep
-    name: set up npm cache
-    key: node_modules_@file:checksum@
-    loadKeys:
-    - node_modules
-    paths:
-    - node_modules
-    uploadStrategy: UPLOAD_IF_NOT_HIT
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !SetBuildVersionStep
-    name: set build version
-    buildVersion: '@tag@'
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !CommandStep
-    name: build & test
-    runInContainer: true
-    image: node
-    interpreter: !DefaultInterpreter
-      commands: |
-        npm install
-        npm run build
-    useTTY: true
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !BuildImageStep
-    name: build docker image
-    dockerfile: ./docker/Dockerfile
-    output: !RegistryOutput
-      tags: hrms-git.bangkok.go.th/bma-hrms/hrms-edm:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-edm:latest
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  triggers:
-  - !TagCreateTrigger
-    tags: prod-*
-    branches: main
-  retryCondition: never
-  maxRetries: 3
-  retryDelay: 30
-  timeout: 14400
diff --git a/Services/client/src/router/index.ts b/Services/client/src/router/index.ts
index 446941f..32534ef 100644
--- a/Services/client/src/router/index.ts
+++ b/Services/client/src/router/index.ts
@@ -29,14 +29,10 @@ const router = createRouter({
       name: 'AdminModule',
       component: () => import('@/views/MainLayout.vue'),
       beforeEnter: async (_to, _from, next) => {
-        console.log('AdminModule - beforeEnter')
         const token = await getToken()
-        console.log(token)
 
         if (token) {
-          console.log('11111')
           const roles = getRole()
-          console.log(roles)
 
           if (
             token &&