From 29b9e6dbe773cdad5183b963604a58d89299a4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 20:56:55 +0300 Subject: [PATCH 01/14] Update github action file --- .github/workflows/ensan-project.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/ensan-project.yml diff --git a/.github/workflows/ensan-project.yml b/.github/workflows/ensan-project.yml deleted file mode 100644 index 4f7137486..000000000 --- a/.github/workflows/ensan-project.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Ensan Project - Pull Code - -on: - workflow_dispatch: - -jobs: - deploy_master_server: - name: Deploy to Master - runs-on: ensan-client-project-runner - if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - - sudo chmod +x ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} - From acf0589654eafbacc8a02e514e41b1b0c20bc4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 20:57:18 +0300 Subject: [PATCH 02/14] Update github action file --- .github/workflows/cyber-project.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/cyber-project.yml diff --git a/.github/workflows/cyber-project.yml b/.github/workflows/cyber-project.yml deleted file mode 100644 index ebd5cbe6e..000000000 --- a/.github/workflows/cyber-project.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Cyber Project - Pull Code - -on: - workflow_dispatch: - -jobs: - deploy_master_server: - name: Deploy to Master - runs-on: cyber-client-project-runner - if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - - sudo chmod +x ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} - From c9404eee8f7e22704c8d1d87cc2e1bf5e095cda0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 20:57:36 +0300 Subject: [PATCH 03/14] Update github action file --- .github/workflows/twahod-project.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/workflows/twahod-project.yml diff --git a/.github/workflows/twahod-project.yml b/.github/workflows/twahod-project.yml deleted file mode 100644 index 92fac8b42..000000000 --- a/.github/workflows/twahod-project.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Twahod Project - Pull Code - -on: - workflow_dispatch: - -jobs: - deploy_master_server: - name: Deploy to Master - runs-on: twahod-client-project-runner - if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - - sudo chmod +x ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.TWAHOD_PROJECT_USER }} ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }} ${{ secrets.TWAHOD_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} From 47f409dbe2b36d80f0602e8fcfbbd780ba390d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 20:58:36 +0300 Subject: [PATCH 04/14] Update github action file --- .github/workflows/kaz-library-project.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/kaz-library-project.yml diff --git a/.github/workflows/kaz-library-project.yml b/.github/workflows/kaz-library-project.yml deleted file mode 100644 index 58f31bd1c..000000000 --- a/.github/workflows/kaz-library-project.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: KAZ-Library Project - Pull Code - -on: - workflow_dispatch: - -jobs: - deploy_master_server: - name: Deploy to Master - runs-on: kaz-library-project-runner - if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - - sudo chmod +x ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.KAZ_PROJECT_USER }} ${{ secrets.KAZ_STANDARD_FOLDER_PATH }} ${{ secrets.KAZ_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} - From b0bbb5e81972707add983c6f7d4bf282d6f74a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 20:59:37 +0300 Subject: [PATCH 05/14] Update github action file --- .github/workflows/helpdesk-project.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/helpdesk-project.yml diff --git a/.github/workflows/helpdesk-project.yml b/.github/workflows/helpdesk-project.yml deleted file mode 100644 index b9855ba96..000000000 --- a/.github/workflows/helpdesk-project.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: HELPDESK Project - Pull Code - -on: - workflow_dispatch: - -jobs: - deploy_master_server: - name: Deploy to Master - runs-on: helpdesk_server - if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - - sudo chmod +x ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} - From 52b31594235a0a71b51ef2933e9869c19a79becd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 21:03:17 +0300 Subject: [PATCH 06/14] Update github action file --- .github/workflows/app-server.yml | 38 ++++++++++---------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/.github/workflows/app-server.yml b/.github/workflows/app-server.yml index ef5a51578..1a8dd60fb 100644 --- a/.github/workflows/app-server.yml +++ b/.github/workflows/app-server.yml @@ -1,12 +1,5 @@ name: App Server - Pull Code -# This Server contain many services: -# - Cyber project (dev - preprod) -# - Ensan project (dev - preprod) -# - Odex25-General Project (dev - preprod) -# - ODEX25_STANDARD Project (dev - preprod - prod) -# - Twahod Project (dev - preprod) -# - Helpdesk Project (dev - preprod) on: push: branches: @@ -51,30 +44,23 @@ on: - preprod_openeducat_erp-14.0.1.0 - preprod_odex25_ensan - workflow_dispatch: + workflow_dispatch: + inputs: + environment: + description: 'Select Server' + required: true + type: choice + options: + - dev + - preprod + default: dev jobs: - # deploy_master_server: - # name: Deploy to Master - # runs-on: app-sever-project-runner - # if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') - # steps: - # - name: Checkout And Restart Project - # run: | - # echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - - # sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh - # sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_APP_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} - # if [ $? -eq 0 ]; then - # echo "** [INFO] "MASTER" services have been restarted." - # else - # echo "** [ERROR] Failed to restart "MASTER" services." - # fi deploy_preprod_server: name: Deploy to Preprod runs-on: app-sever-project-runner - if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/preprod_odex25_ensan' + if: (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/preprod_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'prepord') steps: - name: Checkout And Restart Project run: | @@ -92,7 +78,7 @@ jobs: deploy_test_server: name: Deploy to Test runs-on: app-sever-project-runner - if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/dev_odex25_ensan' + if: (github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/dev_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'dev') steps: - name: Checkout And Restart Project run: | From 57a4783159bda544d288a995a67eac0725237f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 21:05:51 +0300 Subject: [PATCH 07/14] Update github action file --- .github/workflows/production_pull_code.yml | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .github/workflows/production_pull_code.yml diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml new file mode 100644 index 000000000..bae407651 --- /dev/null +++ b/.github/workflows/production_pull_code.yml @@ -0,0 +1,76 @@ +name: Production Projects - Pull Code + +on: + workflow_dispatch: + inputs: + environment: + description: 'Select Project Prod Server' + required: true + type: choice + options: + - Cyber-Security-Project + - Ensan-Project + - Helpdesk-Khabir-Project + - King-AbdelAziz-Library-Project + - Twahod-Project + default: Helpdesk-Khabir-Project + +jobs: +# Cyber Project + cyber_master_server: + name: Deploy to Cyber Master + runs-on: cyber-client-project-runner + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Cyber-Security-Project' + steps: + - name: Checkout And Restart Project + run: | + sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + +# Ensan Project + ensan_master_server: + name: Deploy to Ensan Master + runs-on: ensan-client-project-runner + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Ensan-Project' + steps: + - name: Checkout And Restart Project + run: | + sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + +# Helpdesk Project + helpdesk_maser_server: + name: Deploy to Helpdesk Master + runs-on: helpdesk_server + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Helpdesk-Khabir-Project' + steps: + - name: Checkout And Restart Project + run: | + sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + +# King Abdel Aziz Lobrary project + kaz_master_server: + name: Deploy to Master + runs-on: kaz-library-project-runner + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'King-AbdelAziz-Library-Project' + steps: + - name: Checkout And Restart Project + run: | + sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + +# Twahod project + twahod_master_server: + name: Deploy to Master + runs-on: twahod-client-project-runner + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Twahod-Project' + steps: + - name: Checkout And Restart Project + run: | + sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + +# if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') + + From ac610508c36f1c7ed7a31f23e119e660f95c11b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 21:21:54 +0300 Subject: [PATCH 08/14] Update github action file --- .github/workflows/app-server.yml | 93 -------------------------------- 1 file changed, 93 deletions(-) delete mode 100644 .github/workflows/app-server.yml diff --git a/.github/workflows/app-server.yml b/.github/workflows/app-server.yml deleted file mode 100644 index 1a8dd60fb..000000000 --- a/.github/workflows/app-server.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: App Server - Pull Code - -on: - push: - branches: - - dev_odex-event - - dev_odex25_accounting - - dev_odex25_base - - dev_odex25_dms - - dev_odex25_fleet - - dev_odex25_ENSAN - - dev_odex25_hr - - dev_odex25_inventory - - dev_odex25_maintenance - - dev_odex25_mobile - - dev_odex25_pos - - dev_odex25_project - - dev_odex25_purchase - - dev_odex25_realstate - - dev_odex25_sales - - dev_odex25_survey - - dev_odex25_transactions - - dev_odex25_website - - dev_openeducat_erp-14.0.1.0 - - dev_odex25_ensan - - preprod_odex-event - - preprod_odex25_accounting - - preprod_odex25_base - - preprod_odex25_dms - - preprod_odex25_fleet - - preprod_odex25_ENSAN - - preprod_odex25_hr - - preprod_odex25_inventory - - preprod_odex25_maintenance - - preprod_odex25_mobile - - preprod_odex25_pos - - preprod_odex25_project - - preprod_odex25_purchase - - preprod_odex25_realstate - - preprod_odex25_sales - - preprod_odex25_survey - - preprod_odex25_transactions - - preprod_odex25_website - - preprod_openeducat_erp-14.0.1.0 - - preprod_odex25_ensan - - workflow_dispatch: - inputs: - environment: - description: 'Select Server' - required: true - type: choice - options: - - dev - - preprod - default: dev - -jobs: - - deploy_preprod_server: - name: Deploy to Preprod - runs-on: app-sever-project-runner - if: (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/preprod_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'prepord') - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - - sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/} - sudo systemctl restart ${{ secrets.ENSAN_APP_PREPROD_SERVICE }} ${{ secrets.ODEX25_GENERAL_PREPROD_SERVICE }} ${{ secrets.ODEX25_STANDARD_PREPROD_SERVICE }} ${{ secrets.TWAHOD_APP_PREPROD_SERVICE }} ${{ secrets.ODEX25_DEMO_PREPROD_SERVICE }} ${{ secrets.HELPDESK_PREPROD_SERVICE }} ${{ secrets.TRAHUM_PREPROD_SERVICE }} - if [ $? -eq 0 ]; then - echo "** [INFO] "PREPROD" services have been restarted." - else - echo "** [ERROR] Failed to restart "PREPROD" services." - fi - - deploy_test_server: - name: Deploy to Test - runs-on: app-sever-project-runner - if: (github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/dev_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'dev') - steps: - - name: Checkout And Restart Project - run: | - echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/} - sudo systemctl restart ${{ secrets.ENSAN_APP_TEST_SERVICE }} ${{ secrets.ODEX25_GENERAL_TEST_SERVICE }} ${{ secrets.ODEX25_STANDARD_TEST_SERVICE }} ${{ secrets.TWAHOD_APP_TEST_SERVICE }} ${{ secrets.HELPDESK_TEST_SERVICE }} ${{ secrets.KAZ_LIBRARY_TEST_SERVICE }} ${{ secrets.TRAHUM_TEST_SERVICE }} - if [ $? -eq 0 ]; then - echo "** [INFO] "DEV" services have been restarted." - else - echo "** [ERROR] Failed to restart "DEV" services." - fi From 0dc9bbd22042f404d559b92ec2e6a6c8736b39a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 21:25:55 +0300 Subject: [PATCH 09/14] Update github action file --- .github/workflows/dev-preprod-servers.yml | 90 +++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 .github/workflows/dev-preprod-servers.yml diff --git a/.github/workflows/dev-preprod-servers.yml b/.github/workflows/dev-preprod-servers.yml new file mode 100644 index 000000000..0bf89a78a --- /dev/null +++ b/.github/workflows/dev-preprod-servers.yml @@ -0,0 +1,90 @@ +name: Dev/Preprod Servers - Pull Code + +on: + push: + branches: + - dev_odex-event + - dev_odex25_accounting + - dev_odex25_base + - dev_odex25_dms + - dev_odex25_fleet + - dev_odex25_ENSAN + - dev_odex25_hr + - dev_odex25_inventory + - dev_odex25_maintenance + - dev_odex25_mobile + - dev_odex25_pos + - dev_odex25_project + - dev_odex25_purchase + - dev_odex25_realstate + - dev_odex25_sales + - dev_odex25_survey + - dev_odex25_transactions + - dev_odex25_website + - dev_openeducat_erp-14.0.1.0 + - dev_odex25_ensan + - preprod_odex-event + - preprod_odex25_accounting + - preprod_odex25_base + - preprod_odex25_dms + - preprod_odex25_fleet + - preprod_odex25_ENSAN + - preprod_odex25_hr + - preprod_odex25_inventory + - preprod_odex25_maintenance + - preprod_odex25_mobile + - preprod_odex25_pos + - preprod_odex25_project + - preprod_odex25_purchase + - preprod_odex25_realstate + - preprod_odex25_sales + - preprod_odex25_survey + - preprod_odex25_transactions + - preprod_odex25_website + - preprod_openeducat_erp-14.0.1.0 + - preprod_odex25_ensan + + workflow_dispatch: + inputs: + environment: + description: 'Select Server' + required: true + type: choice + options: + - dev + - preprod + default: dev + +jobs: + + deploy_preprod_server: + name: Deploy to Preprod Servers + runs-on: app-sever-project-runner + if: (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/preprod_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'prepord') + steps: + - name: Checkout And Restart Project + run: | + sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/preprod_pull_standard_code.sh + sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/preprod_pull_standard_code.sh + sudo systemctl restart ${{ secrets.ENSAN_APP_PREPROD_SERVICE }} ${{ secrets.ODEX25_GENERAL_PREPROD_SERVICE }} ${{ secrets.ODEX25_STANDARD_PREPROD_SERVICE }} ${{ secrets.TWAHOD_APP_PREPROD_SERVICE }} ${{ secrets.ODEX25_DEMO_PREPROD_SERVICE }} ${{ secrets.HELPDESK_PREPROD_SERVICE }} ${{ secrets.TRAHUM_PREPROD_SERVICE }} ${{ secrets.CYBER_APP_PREPROD_SERVICE }} + if [ $? -eq 0 ]; then + echo "** [INFO] "PREPROD" services have been restarted." + else + echo "** [ERROR] Failed to restart "PREPROD" services." + fi + + deploy_test_server: + name: Deploy to Dev Servers + runs-on: app-sever-project-runner + if: (github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/dev_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'dev') + steps: + - name: Checkout And Restart Project + run: | + sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/dev_pull_standard_code.sh + sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/dev_pull_standard_code.sh + sudo systemctl restart ${{ secrets.ENSAN_APP_TEST_SERVICE }} ${{ secrets.ODEX25_GENERAL_TEST_SERVICE }} ${{ secrets.ODEX25_STANDARD_TEST_SERVICE }} ${{ secrets.TWAHOD_APP_TEST_SERVICE }} ${{ secrets.HELPDESK_TEST_SERVICE }} ${{ secrets.KAZ_LIBRARY_TEST_SERVICE }} ${{ secrets.TRAHUM_TEST_SERVICE }} ${{ secrets.CYBER_APP_TEST_SERVICE }} + if [ $? -eq 0 ]; then + echo "** [INFO] "DEV" services have been restarted." + else + echo "** [ERROR] Failed to restart "DEV" services." + fi From 1ebb0c34f0442ffbcd1c85ad10d851156669f749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Thu, 14 Nov 2024 21:39:17 +0300 Subject: [PATCH 10/14] Update github action file --- .github/workflows/dev-preprod-servers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-preprod-servers.yml b/.github/workflows/dev-preprod-servers.yml index 0bf89a78a..2f5b76802 100644 --- a/.github/workflows/dev-preprod-servers.yml +++ b/.github/workflows/dev-preprod-servers.yml @@ -60,7 +60,7 @@ jobs: deploy_preprod_server: name: Deploy to Preprod Servers runs-on: app-sever-project-runner - if: (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/preprod_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'prepord') + if: (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/preprod_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'preprod') steps: - name: Checkout And Restart Project run: | From 4b5be82e4d3c8d1fc3fc29003ed11d78b3150664 Mon Sep 17 00:00:00 2001 From: AHIDev Date: Sun, 17 Nov 2024 13:08:49 +0400 Subject: [PATCH 11/14] [UPD] update on backend theme --- .../static/src/scss/navbar.scss | 6 +- .../static/src/scss/theme.scss | 1681 +---------------- .../static/src/scss/web.scss | 148 +- 3 files changed, 125 insertions(+), 1710 deletions(-) diff --git a/odex25_base/expert_std_backend_theme/static/src/scss/navbar.scss b/odex25_base/expert_std_backend_theme/static/src/scss/navbar.scss index 5b2d2e413..cddb7b0c9 100644 --- a/odex25_base/expert_std_backend_theme/static/src/scss/navbar.scss +++ b/odex25_base/expert_std_backend_theme/static/src/scss/navbar.scss @@ -1,6 +1,6 @@ -ul.o_menu_sections{ - margin-right: 30px; -} +// ul.o_menu_sections{ +// margin-right: 30px; +// } .o_user_menu_mobile{ display: none; diff --git a/odex25_base/expert_std_backend_theme/static/src/scss/theme.scss b/odex25_base/expert_std_backend_theme/static/src/scss/theme.scss index a98ce1720..9c9e4ea7d 100644 --- a/odex25_base/expert_std_backend_theme/static/src/scss/theme.scss +++ b/odex25_base/expert_std_backend_theme/static/src/scss/theme.scss @@ -1,6 +1,6 @@ //Top Bar body { - font-family: 'Poppins', sans-serif !important; + font-family: "Poppins", sans-serif !important; background-color: #f8f8fb; } a { @@ -12,17 +12,17 @@ a:hover { a.btn { height: auto !important; } -.o_main_navbar{ - color: $text_white !important; - border:1px !important; +.o_main_navbar { + color: $text_white !important; + border: 1px !important; } .o_searchview_facet_label { - background-color: $bg_main !important; - color: $text_white !important; - border:1px !important; + background-color: $bg_main !important; + color: $text_white !important; + border: 1px !important; } -.o_menu_sections, .o_menu_systray{ - +.o_menu_sections, +.o_menu_systray { } // .o_web_client > header{ // background: $bg_main !important; @@ -35,38 +35,43 @@ a.btn { font-size: 16px !important; } .o_main_navbar { - height: 65px; - display: flex; - justify-content: space-between; - align-items: center; - border-bottom: 0px solid #5f5e97 !important; - -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; - box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// background-color: $bg_main !important; + height: 65px; + display: flex; + align-items: center; + border-bottom: 0px solid #5f5e97 !important; + -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18, 38, 63, 0.03) !important; + box-shadow: 0 0.75rem 1.5rem rgba(18, 38, 63, 0.03) !important; + + ul{ + &:last-child{ + margin-left: auto; + } + } } .top_heading { - display: flex; - justify-content: center; - align-items: center; + display: flex; + justify-content: center; + align-items: center; } .top_heading ul { - margin-bottom: 0 !important; + margin-bottom: 0 !important; } .top_heading > a { - margin-left: 10px; - font-size: 20px; + margin-left: 10px; + font-size: 20px; } .top_heading li { - list-style: none; + list-style: none; } -.o-no-caret > i, button[aria-pressed="true"] { +.o-no-caret > i, +button[aria-pressed="true"] { color: $text_white !important; } -.o_main_navbar > ul > li > a, .o_main_navbar > ul > li > label { +.o_main_navbar > ul > li > a, +.o_main_navbar > ul > li > label { height: 46px; - padding: 0 5px; color: $text_white !important; line-height: 46px; } @@ -76,7 +81,7 @@ a.btn { .topbar_icon .fa { color: $text_white !important; - font-size: 20px !important + font-size: 20px !important; } .o_main_navbar .o_user_menu .oe_topbar_avatar { @@ -84,1558 +89,8 @@ a.btn { width: 35px; } -// .o_MessagingMenu_counter { -// background-color: #556ee6; -// color: #fff !important; -// } -// .o_mail_systray_item .o_notification_counter { -// background: #556ee6 !important; -// } - -// .o_control_panel { -// background: #f8f8fb !important; -// border:none !important; -// } - -// .o_searchview { -// border: 1px solid #ddd; -// height: 38px; -// padding-left: 12px; -// padding-right: 20px; -// -webkit-box-shadow: none; -// box-shadow: none; -// border-radius: 5px; -// padding-top: 6px; -// } -// .o_searchview .o_searchview_icon { -// position: absolute; -// top: 11px; -// left: auto; -// bottom: auto; -// right: 8px; -// } -// .o_searchview .o_searchview_facet { -// border: 1px solid #ddd; -// background: #f8f8fb; -// border-radius: 10px; -// padding: 0 4px; -// } -// .o_cp_bottom_right span.o_dropdown_title { -// color: #555b6d; -// } -// .o_cp_bottom_left .o_form_button_cancel { -// margin-right: 5px !important; -// padding: 6px 8px !important; -// color: #fff !important; -// background-color: #f46a6a !important; -// border-color: #f46a6a !important; -// } -// .o_cp_bottom_left .o_form_button_cancel:hover { -// background-color: #cf5a5a !important; -// border-color: #c35555 !important; -// } -// .o_control_panel { -// border-bottom: none important; -// margin: 15px 15px 0 15px; -// background-color: #ffffff !important; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// border-radius: 5px; -// } - -// .o_form_view, -// .o_widget_Discuss { -// background: #f8f8fb; -// } -// .o_form_statusbar .o_statusbar_buttons .btn { -// margin-right: 15px !important; -// } -// .o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child):before, .o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child):after { -// border-top: 21px solid transparent !important; -// border-bottom: 17px solid transparent !important; -// } -// .o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child):before { -// right: -11px; -// border-left-color: $primary_accent; -// } -//Top Bar End - -// Button -// .btn { -// display: inline-block; -// font-weight: 400 !important; -// line-height: 1.5 !important; -// color: #495057; -// text-align: center; -// vertical-align: middle; -// cursor: pointer; -// -webkit-user-select: none; -// -moz-user-select: none; -// -ms-user-select: none; -// user-select: none; -// background-color: transparent; -// border: 1px solid transparent; -// padding: 6px 15px !important; -// border-radius: 4px !important; -// -webkit-transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out; -// transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out; -// transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out; -// transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out; -// height: 40px !important; -// margin-bottom: 2px; -// } -// .btn-primary { -// color: #fff !important; -// background-color: $primary_accent !important; -// border-color: $primary_accent !important; -// } -// .btn-primary:hover { -// color: #fff !important; -// background-color: $primary_hover !important; -// border-color: #4458b8 !important; -// } -// .btn-primary:active { -// color: #fff !important; -// background-color: #4458b8 !important; -// border-color: #4053ad !important; -// } -// .btn-check:focus+.btn-primary, .btn-primary:focus { -// color: #fff; -// background-color: #485ec4 !important; -// border-color: #4458b8 !important; -// -webkit-box-shadow: 0 0 0 .15rem rgba(111,132,234,.5) !important; -// box-shadow: 0 0 0 .15rem rgba(111,132,234,.5) !important; -// } -// .btn-primary i,.btn-primary span { -// color: #fff !important; -// } -// .btn-secondary { -// color: #fff !important; -// background-color: #74788d !important; -// border-color: #74788d !important; -// } -// .btn-secondary:hover { -// color: #fff !important; -// background-color: #636678 !important; -// border-color: #5d6071 !important; -// } -// .btn-secondary:active { -// color: #fff; -// background-color: #5d6071 !important; -// border-color: #575a6a !important; -// } -// .btn-check:focus+.btn-secondary, .btn-secondary:focus { -// color: #fff; -// background-color: #636678 !important; -// border-color: #5d6071 !important; -// -webkit-box-shadow: 0 0 0 .15rem rgba(137,140,158,.5) !important; -// box-shadow: 0 0 0 .15rem rgba(137,140,158,.5) !important; -// } -// .btn-secondary i,.btn-secondary span { -// color: #fff !important; -// } -// .btn-info { -// color: #fff !important; -// background-color: #50a5f1 !important; -// border-color: #50a5f1 !important; -// } -// .btn-info:hover { -// color: #fff !important; -// background-color: #448ccd !important; -// border-color: #4084c1 !important; -// } -// button[name="action_cancel"], -// button[name="button_cancel"], -// button[special="cancel"] { -// color: #fff !important; -// background-color: #f46a6a !important; -// border-color: #f46a6a !important; -// } -// button[name="action_cancel"]:hover, -// button[name="button_cancel"]:hover, -// button[special="cancel"]:hover { -// background-color: #cf5a5a !important; -// border-color: #c35555 !important; -// } -// button[name="action_cancel"]:active, -// button[name="button_cancel"]:active, -// button[special="cancel"]:active { -// color: #fff !important; -// background-color: #c35555 !important; -// border-color: #b75050 !important; -// } -// button[name="action_cancel"]:focus, -// button[name="button_cancel"]:focus, -// button[special="cancel"]:focus { -// color: #fff !important; -// background-color: #cf5a5a !important; -// border-color: #c35555 !important; -// -webkit-box-shadow: 0 0 0 0.15rem rgba(246,128,128,.50) !important; -// box-shadow: 0 0 0 0.15rem rgba(246,128,128,.50) !important; -// } -// button[name="update_module"] { -// margin-right: 2px; -// } - -// .btn-warning, -// button[name="action_uninstall"] { -// color: #fff !important; -// background-color: #f1b44c !important; -// border-color: #f1b44c !important; -// } -// .btn-warning:hover, -// button[name="action_uninstall"]:hover { -// color: #fff !important; -// background-color: #cd9941 !important; -// border-color: #c1903d !important; -// } -// .btn-warning:active, -// button[name="action_uninstall"]:active { -// color: #fff !important; -// background-color: #c1903d !important; -// border-color: #b58739 !important; -// } -// .btn-warning:focus, -// button[name="action_uninstall"]:focus { -// color: #fff !important; -// background-color: #cd9941 !important; -// border-color: #c1903d !important; -// -webkit-box-shadow: 0 0 0 0.15rem rgba(243,191,103,.50) !important; -// box-shadow: 0 0 0 0.15rem rgba(243,191,1,.50) !important; -// } - -// .o_statusbar_status .o_arrow_button.btn-secondary { -// border: solid 1px #556ee6 !important; -// color: #556ee6 !important; -// background-color: #fff !important; -// } -// .o_statusbar_status .o_arrow_button.btn-secondary:hover:after { -// border-color: #fff !important; -// } -// .o_statusbar_status .o_arrow_button.btn-primary { -// border: solid 1px #556ee6 !important; -// color: #fff !important; -// } -// .o_cp_bottom_right .btn-secondary { -// background: #fff; -// border-color: #dddddd !important; -// margin-right: 5px !important; -// padding : 6px 8px !important; -// } -// .o_cp_bottom_left .o_form_button_create { -// color: #fff !important; -// background-color: #74788d !important; -// border-color: #74788d !important; -// padding: 5px 15px !important; -// } - -// .o_web_settings_invite { -// margin-left: 7px; -// position: relative; -// top: -1px; -// } -// .o_form_view .oe_button_box .btn.oe_stat_button { -// height: 44px !important; -// opacity: 1 !important; -// border-radius: 0px !important; -// } -// .oe_module_action .btn { -// height: auto !important; -// } -// .o_cp_buttons a.btn { -// display: flex !important; -// align-items: center; -// } -// button.fa.fa-external-link.btn.btn-secondary.o_external_button { -// padding: 2px !important; -// color: #74788d !important; -// background: none !important; -// } -// .o_statusbar_status.o_field_widget.o_readonly_modifier .btn { -// margin-right: 0 !important; -// } -// .btn-group .btn { -// margin-right: 3px; -// } -// .o_Composer_actionButton.o-last.o-has-current-partner-avatar.o-composer-is-compact { -// height: 48px !important; -// border-bottom-left-radius: 0px !important; -// border-top-left-radius: 0px !important; -// } -// .oe_right .btn { -// margin-left: 2px; -// } -//Button End - -//table -// .table-sm th, .table-sm td { -// padding: 0.5rem; -// } -// tr.o_data_row { -// font-size: 15px; -// } -// .o_list_view .table-responsive .table thead tr:nth-child(1) th { -// position: sticky; -// top: 0; -// z-index: 999; -// background-color: #ffffff !important; -// } -// th.o_list_record_selector { -// color: #495057 !important; -// border-color: #eff2f7 !important; -// background-color: #f8f9fa !important; -// } -// .table>:not(caption)>*>* { -// padding: 1rem 1rem; -// background-color: var(--bs-table-bg); -// border-bottom-width: 1px; -// -webkit-box-shadow: inset 0 0 0 9999px var(--bs-table-accent-bg); -// box-shadow: inset 0 0 0 9999px var(--bs-table-accent-bg); -// } -// .o_list_view .o_list_table thead > tr > th:not(.o_list_record_selector).o_list_number_th { -// text-align: left !important; -// } -// .o_list_view .o_list_table thead > tr > th:not(.o_list_record_selector) { -// border-left: none !important; -// } -// .table thead th { -// vertical-align: bottom; -// border-bottom: none; -// } -// .table th { -// border-top: 1px solid #fff !important; -// } -// .o_list_view .o_list_table tfoot { -// background-color: #fff !important; -// } -// .o_list_view .table-responsive .o_list_table tfoot tr:nth-child(1) td { -// background-color: #fff !important; -// } -// .o_list_view .o_list_table tr:focus-within, -// .o_list_view .o_list_table.table-striped tr:focus-within { -// background-color: #fff !important; -// } -// Table End - -// Checkbox -// .custom-checkbox label { -// position: relative; -// cursor: pointer; -// } - -// .custom-checkbox label:before { -// content:''; -// -webkit-appearance: none; -// background-color: transparent; -// border: 1px solid #0079bf; -// box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05), inset 0px -15px 10px -12px rgba(0, 0, 0, 0.05); -// padding: 10px; -// display: inline-block; -// position: relative; -// vertical-align: middle; -// cursor: pointer; -// margin-right: 5px; -// margin-top: 0px; -// } - -// .custom-checkbox input:checked + label:after { -// content: ''; -// display: block; -// position: absolute; -// top: 2px; -// left: 9px; -// width: 6px; -// height: 14px; -// border: solid #0079bf; -// border-width: 0 2px 2px 0; -// transform: rotate(45deg); -// } - -// .custom-checkbox label::before { -// content: ''; -// -webkit--webkit-appearance: none; -// -moz-appearance: none; -// appearance: none; -// background-color: transparent; -// box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05), inset 0px -15px 10px -12px rgba(0, 0, 0, 0.05); -// padding: 10px; -// display: inline-block; -// position: relative; -// vertical-align: middle; -// cursor: pointer; -// margin-right: 5px; -// } -// .custom-control-label::before { -// position: absolute; -// top: 0px !important; -// left: 1px !important; -// display: block; -// width: 1rem; -// height: 1rem; -// pointer-events: none; -// content: ""; -// background-color: #FFFFFF; -// border: 1px solid rgba(0,0,0,.25) !important; -// box-shadow: none !important; -// border-radius: 5 !important; -// margin-top: -5px; -// } -// .custom-checkbox { -// padding-left: 0rem !important; -// } - -// .custom-checkbox .custom-control-input:disabled:checked ~ .custom-control-label::before { -// background-color: $primary_accent; -// } - -// .custom-checkbox input:checked + label::after { -// content: ''; -// display: block; -// position: absolute; -// top: 1px; -// left: 9px; -// width: 6px; -// height: 14px; -// border: solid #fff; -// border-width: 0 2px 2px 0; -// transform: rotate(45deg); -// } -// .dropdown-item .custom-checkbox input:checked + label::after { -// content: ''; -// display: block; -// position: absolute; -// top: 1px; -// left: 19px; -// width: 6px; -// height: 14px; -// border: solid #fff; -// border-width: 0 2px 2px 0; -// transform: rotate(45deg); -// } - -// .custom-control-input:checked ~ .custom-control-label::before { -// color: #ffffff; -// background-color: #556ee6; -// border-color: #556ee6; -// } -// .custom-control.custom-checkbox .custom-control-input:not(:checked):not(:indeterminate) ~ .custom-control-label:before { -// background: none; -// outline: none !important; -// } - -// .o_list_selection_box { -// display: inline-block; -// padding: 0.375rem 0.75rem; -// vertical-align: middle; -// border: 1px solid rgba(85,110,230,.25)!important; -// background-color: rgba(85,110,230,.25)!important; -// color: $primary_accent !important; -// border-radius: 5px; -// } -// .o_radio_input + .custom-control-label::before { -// position: absolute !important; -// top: 8.5px !important; -// left: -1.5rem !important; -// display: block !important; -// width: 1rem !important; -// height: 1rem !important; -// pointer-events: none !important; -// content: "" !important; -// background-color: #FFFFFF !important; -// border: #adb5bd solid 1px !important; -// } -// .custom-radio .custom-control-input:checked ~ .custom-control-label::after { -// background: $primary_accent !important; -// border-radius: 30px; -// } -// Checkbox End - -//sheet -// .o_form_view .o_form_sheet_bg { -// border-bottom: none; -// background: #ffffff !important; -// box-shadow: none !important; -// border-radius: 5px; -// padding: 10px; -// } -// .o_form_view .o_form_sheet_bg > .o_form_sheet { -// min-width: 650px; -// max-width: initial; -// min-height: 330px; -// border: 1px solid #c8c8d3; -// box-shadow: none !important; -// background: white; -// margin: 4.8px auto; -// padding: 24px; -// padding-right: 16px; -// padding-left: 16px; -// border-radius: 5px; -// } -// .o_form_view .o_form_statusbar { -// position: relative; -// display: -webkit-box; -// display: -webkit-flex; -// display: flex; -// justify-content: space-between; -// padding-left: 5px; -// border-bottom: none !important; -// background-color: white; -// border-radius: 5px; -// } -// .o_required_modifier > .o_input_dropdown > .ui-autocomplete-input { -// border-left: solid 3px #f46a6a !important; -// } -//sheet end - -//Discuss -// .o_Discuss { -// padding: 15px !important; -// background: #f5f5f9 !important; -// } - -// .o_Discuss .o_DiscussSidebar { -// background-color: #ffffff !important; -// color: #dee2e6 !important; -// border-radius: 5px; -// margin-right: 10px !important; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } - -// .o_DiscussSidebar_item.o-active { -// color: #f46a6a !important; -// font-weight: 500 !important; -// } -// .o_DiscussSidebarItem:hover { -// background: none !important; -// } -// .o_DiscussSidebarItem { -// cursor: pointer !important; -// color: #74788d !important; -// line-height: 24px !important; -// padding: 10px 5px !important; -// } -// .o_DiscussSidebarItem_activeIndicator.o-item-active { -// background: none !important; -// } -// .o_DiscussSidebar_item.o-active .fa { -// color: #f46a6a !important; -// } -// .o_widget_Discuss .o_Discuss_content { -// border-top: none !important; -// background-color: #ffffff !important; -// border-radius: 5px; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// } -// .o_DiscussSidebarItem_counter { -// background-color: #f46a6a !important; -// color: #fff !important; -// } -// .o_ThreadIcon_online { -// color: #34c38f; -// } -// .o_Message_prettyBody table th { -// color: $primary_accent !important; -// } -// .o_Message_prettyBody table thead tr td { -// background-color: $primary_hover !important; -// } -// Discuss End - -//Chatter @form -// .o_FormRenderer_chatterContainer { -// max-width: initial; -// margin-top: 15px !important; -// padding: 0 !important; -// border-radius: 5px; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } -// .o_ChatterContainer { -// padding: 10px; -// background: #fff; -// border-radius: 5px; -// } -// .o_Discuss .o_Message .o_Message_prettyBody p a { -// background: $primary_accent !important; -// } -// .o_Message.o-not-discussion { -// background-color: #eff2f7; -// margin: 5px; -// border-radius: 5px; -// border-bottom: none; -// } -// .o_Composer { -// background-color: #fff; -// border-radius: 0 0 5px 5px; -// border: none !important; -// } -//Chatter @form Ends - -//Chatter mini starts -// .o_ChatWindow { -// background-color: #fff !important; -// border-radius: 5px 5px 0 0 !important; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.25) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .25) !important; -// } -// .o_PartnerImStatusIcon_icon.o-offline { -// color: #495057 !important; -// } -// .o_PartnerImStatusIcon_icon.o-online { -// color: #34c38f !important; -// } -// .o_PartnerImStatusIcon_innerBackground { -// color: white !important; -// } -// i.o_PartnerImStatusIcon_outerBackground.fa.fa-circle.fa-stack-1x { -// color: #fff !important; -// } -// .o_ChatWindowHeader_item.o_ChatWindowHeader_rightArea .fa { -// color: #fff !important; -// } -// .o_ChatWindowHeader { -// background-color: #556ee6; -// color: white !important; -// } -//Chatter mini ends - -// Tabs Start -// .nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link { -// border: none; -// border-bottom: solid; -// font-weight: bold; -// background: $primary_accent !important; -// color: #ffffff !important; -// border-radius: 5px; -// } -// .nav-link { -// display: block; -// padding: 1rem 2rem; -// } -// .o_form_view .o_notebook { -// clear: both; -// margin-top: 25px; -// } -// .nav-tabs { -// border-bottom: none; -// } -// .nav-tabs .nav-link { -// border: 1px solid #e3e3e3; -// border-top-left-radius: 3px; -// border-top-right-radius: 3px; -// border-bottom: none !important; -// } -// .nav-item > a { -// color: #555b6d !important; -// } -// .nav-link:hover, .nav-link:focus { -// border: 1px solid #e9e9e9 !important; -// border-bottom: none !important; -// } -// ul.sidebar_menu .nav-link:hover,ul.sidebar_menu .nav-link:focus { -// border: none !important; -// border-bottom: none !important; -// } - -// TAbs End - -//font color -// .o_horizontal_separator { -// color: #495057 !important; -// } -// .btn-link { -// font-weight: 400; -// color: $primary_accent !important; -// text-decoration: none; -// } -// .o_activity_view .o_record_selector { -// color: #34c38f; -// } -//font color ends - -//form -// input { -// display: block; -// width: 100%; -// height: 40px !important; -// padding: 10px 20px; -// font-size: 13px; -// font-weight: 400; -// line-height: 1.5; -// color: #495057; -// background-color: #fff; -// background-clip: padding-box; -// border: 1px solid #ced4da !important; -// -webkit-appearance: none; -// -moz-appearance: none; -// appearance: none; -// border-radius: .25rem; -// -webkit-transition: border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out; -// transition: border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out; -// transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; -// transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out; -// box-shadow: none !important; -// margin-bottom:10px !important; -// } -// select { -// width: 100%; -// height: 40px !important; -// padding: 10px 20px; -// font-size: 13px; -// font-weight: 400; -// line-height: 1.5; -// color: #495057; -// background-color: #fff; -// background-clip: padding-box; -// border: 1px solid #ced4da !important; -// border-radius: .25rem; -// -webkit-transition: border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out; -// transition: border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out; -// transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; -// transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out; -// box-shadow: none !important; -// margin-bottom:10px !important; -// } -// .o_field_widget .o_input_dropdown .o_dropdown_button { -// position: absolute; -// top: 6px; -// left: auto; -// bottom: auto; -// right: 9px; -// } -// .o_datepicker .o_datepicker_button { -// position: absolute; -// top: 6px; -// left: auto; -// bottom: auto; -// right: 9px; -// pointer-events: none; -// } -// .o_input { -// border: solid 1px #ced4da !important; -// color: #495057 !important; -// } -// .o_form_view .oe_button_box .btn.oe_stat_button > .o_stat_info .o_stat_value, -// .o_form_view .oe_button_box .btn.oe_stat_button > span .o_stat_value { -// color: #556ee6; -// } -// .o_form_view .oe_button_box .oe_stat_button .o_button_icon { -// color: #556ee6; -// } -//form end - -//search view -// .o_searchview input.o_searchview_input { -// border: none !important; -// height: auto !important; -// margin: 0 !important; -// } -// .o_base_settings .o_control_panel .o_panel .o_setting_search .searchIcon { -// top: 9px; -// right: 10px; -// } -// .o_base_settings .o_control_panel .o_panel .o_setting_search .searchInput { -// padding: 10px 15px; -// } -//search view end - -//settings page -// .o_web_settings_invite { -// margin-left: 7px; -// } - -// .o_setting_container { -// background: #f8f8fb; -// padding: 15px 0 0 0; -// } -// .o_base_settings .o_control_panel { -// margin: 0; -// } -// .settings { -// margin-left: 15px; -// background-color: #ffffff !important; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// border-radius: 5px; -// } -// .settings_tab { -// background-color: #ffffff !important; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// border-radius: 5px; -// } -// .o_base_settings .o_setting_container .settings_tab .selected, -// .o_base_settings .o_setting_container .settings_tab .selected span { -// box-shadow: none !important; -// color: #f46a6a !important; -// font-weight: 500 !important; -// background: none !important; -// } -// .o_base_settings .o_setting_container .settings_tab .tab { -// color: #74788d !important; -// } -// .o_setting_container .o_field_widget.o_field_many2one.o_with_button.oe_inline { -// margin-left: 15px !important; -// } -//settings page end - -//scrollbar starts -// ::-webkit-scrollbar-track { -// -webkit-box-shadow: inset 0 0 3px rgba(0,0,0,.19); -// border-radius: 10px; -// background-color: #F5F5F5; -// } -// ::-webkit-scrollbar { -// width: 12px; -// background-color: #F5F5F5; -// } -// ::-webkit-scrollbar-thumb { -// border-radius: 10px; -// -webkit-box-shadow: inset 0 0 3px rgba(0,0,0,.2); -// background-color: #c9ccd6; -// } -//scrollbar ends - -//common starts -// .o_content { -// margin: 15px; -// border-radius: 5px; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// background-color: #f8f8fb; -// } -// .o_action{ -// background: #f8f8fb; -// } -//common ends - -//kanban_view starts -// .o_kanban_view { -// border-radius: 5px; -// background: #fff; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } -// .o_kanban_view.o_kanban_ungrouped .o_kanban_record { -// border-radius: 5px; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } -// .o_kanban_view .o_kanban_group { -// background: #fff; -// border-radius: 5px; -// margin-right: 10px; -// } -// .o_kanban_view.o_kanban_grouped { -// background-color: #f8f8fb; -// } -// .o_kanban_view.o_kanban_grouped .o_kanban_record, .o_kanban_view.o_kanban_grouped .o_kanban_quick_create { -// border-radius: 5px; -// margin-bottom: 10px; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } -// .o_kanban_view.o_kanban_dashboard .o_kanban_record .o_kanban_card_header + .container.o_kanban_card_content .o_kanban_primary_bottom.bottom_block { -// border-bottom-left-radius: 5px; -// border-bottom-right-radius: 5px; -// background: rgba(85,110,230,.25) !important; -// } -// .o_kanban_view .o_kanban_record.o_kanban_record_has_image_fill .o_kanban_image_fill_left { -// border-bottom-left-radius: 5px; -// border-top-left-radius: 5px; -// } -// .o_kanban_record::after { -// border-bottom-left-radius: 5px; -// border-top-left-radius: 5px; -// } -// .o_kanban_quick_create .o_form_view, -// .o_kanban_quick_create .o_action, -// .o_kanban_quick_create .o_content { -// background: #fff; -// margin: 0px; -// -webkit-box-shadow: none !important; -// box-shadow: none !important; -// } -// .o_kanban_view .o_kanban_content .bg-primary { -// border-radius: 5px 0 0 5px; -// } -//kanban_view ends - -//Apps menu starts -// .o_search_panel { -// border-right: none; -// background-color: #ffffff; -// border-radius: 5px; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } -// .list-group-item-action { -// width: 100%; -// color: #74788d; -// text-align: inherit; -// } -// .list-group-item-action:hover, .list-group-item-action:focus { -// color: none !important; -// background: none !important; -// } -// .o_search_panel .list-group-item header.active { -// background: none !important; -// color: #f46a6a !important; -// font-weight: 500 !important; -// } -// .o_controller_with_searchpanel .o_renderer_with_searchpanel { -// margin-left: 15px; -// } -//Apps menu ends - -//Website app starts -// .o_dashboards .o_website_dashboard { -// background-color: #ffffff !important; -// } -// .o_dashboards .o_website_dashboard div.o_box { -// box-shadow: none !important; -// } -// .o_inner_box { -// background-color: $primary_accent !important; -// border-radius: 5px; -// } -// .o_inner_box:hover { -// background-color: $primary_hover !important; -// } -//Website app ends - -//Purchase app starts -// td.o_main { -// background-color: $primary_accent !important; -// border-radius: 5px; -// } -// td.o_main:hover { -// background-color: $primary_hover !important; -// } -// .o_purchase_dashboard .table > thead > tr > td, -// .o_purchase_dashboard .table tbody > tr > td { -// border-radius: 5px; -// } -//Purchase app ends - -//input inside colour starts -// select, input { -// color: #4c4c4c !important; -// } -// .o_required_modifier > .o_input_dropdown > .ui-autocomplete-input { -// color: #4c4c4c !important; -// } -// .o_required_modifier.o_input, .o_required_modifier.o_input { -// color: #4c4c4c !important; -// } -// .o_datepicker.o_field_date.o_field_widget.o_required_modifier > input { -// color: #4c4c4c !important; -// } -//input inside colour ends - -//welcome demo starts -// .o_onboarding_container.collapse.show { -// border-radius: 5px !important; -// margin: 15px 15px 0px 15px; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } -// .o_onboarding.o_onboarding_blue, -// .o_onboarding.o_onboarding_blue .o_onboarding_step_title, -// .o_onboarding.o_onboarding_blue .o_onboarding_step_action, -// .o_onboarding.o_onboarding_blue a.o_onboarding_all_done, -// .o_onboarding.o_onboarding_blue .o_onboarding_all_done > .fa, -// .o_onboarding.o_onboarding_blue .o_onboarding_btn_close { -// border-radius: 5px; -// } -// .o_onboarding { -// border-radius: 5px; -// } -//welcome demo ends - -//modal starts -// .modal.o_technical_modal .modal-content { -// border-radius: 5px; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// background-color: #fff; -// background-clip: padding-box; -// border: 1px solid #f6f6f6; -// } -// .modal.o_technical_modal .modal-content .o_form_view, -// .modal.o_technical_modal .modal-content .o_content, -// .modal.o_technical_modal .modal-content .o_action { -// background-color: #fff !important;; -// -webkit-box-shadow: none !important; -// box-shadow: none !important; -// } -// .modal.show .modal-dialog { -// display: -webkit-box; -// display: -webkit-flex; -// display: flex; -// align-items: center; -// min-height: calc(100% - 1rem); -// } -// .modal .o_form_view .o_group .o_field_widget { -// width: 98% !important; -// } -//modal ends - -//Calendar starts -// .o_calendar_view { -// background: #fff; -// } -//Calendar ends - -//expense starts -// .o_content .o_expense_container { -// background: #fff; -// } -//expense ends - -//lunch starts -// .o_lunch_content .o_lunch_banner { -// border-bottom: none !important; -// background-color: #fff !important; -// margin: 0 15px 10px 15px; -// border-radius: 5px; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } -//lunch ends - -//kiosk starts -// .o_hr_attendance_kiosk_backdrop { -// background-color: #f8f8fb !important; -// } -// .o_hr_attendance_kiosk_mode { -// background-color: #fff !important; -// border-radius: 0 0 5px 5px !important; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } -// .o_hr_attendance_kiosk_mode .o_hr_attendance_user_badge { -// border-radius: 5px 5px 0 0 !important; -// border-top: none !important; -// background: rgba(85,110,230,.25) !important; -// } -// .o_hr_attendance_sign_in_out_icon.fa-sign-in { -// color: #fff !important; -// background-color: $primary_accent !important; -// border-color: $primary_accent !important; -// } -// .o_hr_attendance_sign_in_out_icon.fa-sign-in:hover { -// color: #fff !important; -// background-color: $primary_hover !important; -// border-color: #4458b8 !important; -// } -// .o_hr_attendance_sign_in_out_icon.fa-sign-in:active { -// color: #fff !important; -// background-color: #4458b8 !important; -// border-color: #4053ad !important; -// } -// .o_hr_attendance_sign_in_out_icon.fa-sign-in:focus { -// color: #fff; -// background-color: #485ec4 !important; -// border-color: #4458b8 !important; -// -webkit-box-shadow: 0 0 0 .15rem rgba(111,132,234,.5) !important; -// box-shadow: 0 0 0 .15rem rgba(111,132,234,.5) !important; -// } -// .o_hr_attendance_kiosk_mode h3.mt0.mb0.text-muted { -// color: $primary_accent !important; -// } -// .o_hr_attendance_button_employees div.mb16.mt16 { -// margin-top: 4px !important; -// } -//kiosk ends - -//timeoff starts -// .o_timeoff_container { -// background: #fff; -// } -//timeoff ends - -//project .fa colours starts -// .o_mail_activity .o_activity_color_planned { -// color: #34c38f !important; -// } -// .o_mail_activity .o_activity_color_overdue { -// color: #f46a6a !important; -// } -// .o_field_widget.o_priority > .o_priority_star.fa-star { -// color: #f1b44c !important; -// } -//project .fa colours ends - -//sale status icon starts -// .bg-primary { -// background-color: $primary_accent !important; -// } -// .bg-secondary { -// background-color: $secondary_accent !important; -// } -// .bg-success-light { -// color: #1f7556 !important; -// background-color: #d6f3e9 !important; -// } -// .bg-info-light { -// color: #306391 !important; -// background-color: #dcedfc !important; -// } -// .bg-danger-light { -// background-color: #fde1e1 !important; -// color: #924040 !important; -// } -// .bg-warning-light { -// background-color: #fcf0db !important; -// color: #916c2e !important; -// } -// .o_field_widget.o_field_badge { -// color: #464855; -// background-color: #e3e4e8; -// } -//sale status icon end - -//stock icon colors starts -// .o_list_view .o_list_table .text-danger, -// .o_list_view .o_list_table .oe_import .alert.text-error, -// .oe_import .o_list_view .o_list_table .alert.text-error { -// color: #f46a6a !important; -// } -// .text-danger { -// color: #f1b44c !important; -// } -// .text-warning { -// color: #f1b44c !important; -// } -// .text-error { -// color: #f46a6a !important; -// } -// .text-success { -// color: #34c38f !important; -// } -//stock icon colors ends - -//badges starts -// .badge-primary { -// background-color: #556ee6 !important; -// } -// .badge-secondary { -// background-color: #74788d; -// } -// .badge-success { -// background-color: #34c38f; -// } -// .badge-info { -// background-color: #50a5f1; -// } -// .badge-danger { -// background-color: #f46a6a; -// } -// .badge-warning { -// background-color: #f1b44c; -// } -// .badge-dark { -// background-color: #343a40; -// } -// .bg-success { -// background-color: #34c38f !important; -// } -// .bg-success-full { -// background-color: #34c38f !important; -// } -// .bg-warning-full { -// background-color: #f1b44c !important; -// } -// .bg-danger-full { -// background-color: #f46a6a; -// } -// .o-planned { -// color: #34c38f !important; -// } -// .o-overdue { -// color: #f46a6a !important; -// } -// .o_progressbar_complete { -// background-color: #34c38f !important; -// } -//badges ends - -//alert starts -// .alert-warning { -// color: #916c2e; -// background-color: #fcf0db; -// border-color: #fbe9c9; -// } -// .alert-danger { -// color: #924040; -// background-color: #fde1e1; -// border-color: #fcd2d2; -// } -// .alert-success { -// color: #1f7556; -// background-color: #d6f3e9; -// border-color: #c2eddd; -// } -// .alert-info { -// color: #306391; -// background-color: #dcedfc; -// border-color: #cbe4fb; -// } -// .toast { -// border-radius: 5px !important; -// color: #924040 !important; -// background-color: #fde1e1 !important; -// border-color: #fcd2d2 !important; -// -webkit-box-shadow: 0 0.75rem 1.5rem rgba(18,38,63,.03) !important; -// box-shadow: 0 0.75rem 1.5rem rgba(18,38,63, .03) !important; -// } -// .toast-header { -// border-bottom: 1px solid #fcd2d2 !important; -// color: #924040 !important; -// background-color: #fde1e1 !important; -// border-color: #fcd2d2 !important; -// } -// .toast-body { -// color: #924040 !important; -// background-color: #fde1e1 !important; -// border-color: #fcd2d2 !important; -// } -// .o_notification_manager { -// top: auto !important; -// bottom: 30px !important; -// } -//alert ends - -//recruitment starts -// div.o_boolean_toggle.custom-control.custom-checkbox > label.custom-control-label::before, -// div.o_boolean_toggle.custom-control.custom-checkbox > label.custom-control-label::after { -// left: 0.1rem !important; -// } -// div.o_boolean_toggle.custom-control.custom-checkbox > input.custom-control-input:checked + label.custom-control-label::after { -// top: 1.5px !important; -// } -// div.o_boolean_toggle.custom-control.custom-checkbox > label.custom-control-label::after { -// top: 1px; -// } -// .o_kanban_view.o_kanban_dashboard.o_hr_recruitment_kanban .ribbon span { -// background-color: #556ee6; -// } -// .o_kanban_view.o_kanban_dashboard.o_hr_recruitment_kanban.o_kanban_ungrouped .o_kanban_record:not(.o_kanban_ghost) { -// height: 197px; -// } -//recruitment ends - -//note editor starts -// .note-popover .popover .popover-body, .panel-heading.note-toolbar { -// padding: 5px !important; -// border-bottom: none !important; -// background: rgba(85, 110, 230, 0.25) !important; -// border-radius: 5px 5px 0 0 ; -// } -// .note-editor .note-statusbar { -// border-radius: 0 0 5px 5px; -// } -// .wysiwyg_iframe, .note-editor { -// // border: 1px solid #556ee640 !important; -// border-radius: 5px; -// } -//note editor ends - -//progress starts -// .oe_kanban_content .progress .progress-bar { -// background-color: #556ee6; -// } -// .progress-bar.bg-muted-full { -// background-color: #dee2e6; -// } -//progress ends - -//email marketing starts -// .o_domain_node.o_domain_tree.o_domain_selector > .o_domain_debug_container { -// background: rgba(85, 110, 230, 0.25); -// color: #000; -// } -// .o_domain_node.o_domain_tree.o_domain_selector > .o_domain_debug_container > input { -// background: rgba(85, 110, 230, 0.25); -// } -// .o_field_widget.o_field_domain.o_inline_mode.o_edit_mode > .o_field_domain_panel { -// top: -18px; -// } -// .o_domain_node .o_domain_selector_row > .o_domain_node_control_panel { -// top: 5px; -// } -// .o_mail_emojis_dropdown { -// bottom: 50px; -// } -//emal marketing ends - -// menu+ color starts -.o_main_navbar > ul > li.o_extra_menu_items.show > ul > li > a { - background-color: #74788d; -} -.o_main_navbar > ul > li.o_extra_menu_items.show > ul > li > a.dropdown-toggle { - background-color: #abadba; -} -//menu+ color ends - -//top menu bar starts -// nav.o_main_navbar.small_nav { -// display: flex; -// flex-wrap: wrap; -// justify-content: right; -// height: auto; -// } - -ul.o_menu_systray.topbar_icon { - // margin-left: auto; - flex: none; -} -.o_main_navbar .o_user_menu > a { - display: flex; - align-items: center; -} -.oe_topbar_name { - max-width: 300px; - margin-left: 5px; - white-space: nowrap; - overflow: hidden; -} -ul.o_menu_sections { - padding-left: 20px; - margin-right: auto; -} -@media (max-width: 1371px){ - nav.o_main_navbar { - display: flex; - // flex-wrap: wrap; - justify-content: space-between; - height: auto; - } - ul.o_menu_systray.topbar_icon { - // margin-left: auto; - flex: none; - } -} -//top menu bar ends - -//datetimepicker starts -// .datepicker td, -// .datepicker td a, -// .datepicker th, -// .datepicker span { -// padding: 0.5rem !important; -// } -// div.dropdown-menu.bootstrap-datetimepicker-widget{ -// width: auto !important; -// } -//datetimepicker ends - -//groupby color starts -// .o_list_view tbody > tr.o_group_header { -// background-image: none !important; -// } -// .table-striped tbody tr.o_group_header:nth-of-type(odd) { -// background-color: rgba(85,110,230,0.17); -// } -// .table-striped tbody tr.o_group_header:hover { -// background-color: rgba(85,110,230,0.23); -// } -//groupby color ends - - - - -//Mee - -// .o_dropdown .o_dropdown_title{ -// padding : 0px; -// } - - -// .o_searchview .o_searchview_input_container .o_searchview_facet { -// display: -webkit-box; -// display: -webkit-flex; -// display: flex; -// -webkit-box-flex: 0; -// -webkit-flex: 0 0 auto; -// flex: 0 0 auto; -// margin: 1px 3px 0 0; -// max-width: 100%; -// position: relative; -// height: 24px !important; -// justify-content: center !important; -// align-items: center !important; -// } - -// .o_searchview_input { -// padding: 0 5px !important; -// } - - -// .o_menu_brand { -// font-size: 20px !important; -// color: $text_white !important; -// } - - -// .o_main_navbar > a:hover { -// background-color: #fff !important; -// } - - -// .o_content > .o_list_view > .table-responsive > .table:not(.o_list_table_grouped) > tbody > tr:not(.o_list_table_grouped) > td { -// padding: 15px 4px; -// } - - -// @media (min-width: 992px) and (max-width: 1533.98px){ -// .o_form_view .oe_button_box, .o_form_view .o_notebook > .o_notebook_headers{ -// margin-left: -16px !important; -// margin-right: -16px !important; -// } -// } - -// .o_form_view .o_field_widget.o_field_one2many > div, .o_form_view .o_field_widget.o_field_many2many > div { -// width: 100%; -// padding: 0 15px; -// } - - -// .reminder_day { -// display: flex; -// flex-wrap: nowrap; -// } - - -// .o_home_menu_background { -// background: linear-gradient(-135deg,#1867b9 0,#9d3be0 100%) !important; -// background-size: auto, auto; -// } - -// .o_group_buttons .btn { -// margin-right: 5px; -// } - -// .btn.btn-link.o-kanban-button-new { -// background: #74788d !important; -// border: solid 2px #74788d !important; -// color: #fff !important; -// } - - -// .o_gantt_button_scale.btn.btn-secondary { -// margin-right: 2px; -// } - -// div.o_input > .o_input { -// margin-bottom: 0 !important; -// background: none; -// } -// .o_input.p-0 { -// padding-left: 3px !important; -// } - -// .o_form_view .o_form_uri { -// display: inline-block; -// color: #556ee6 !important; -// } - -// .o_search_panel .list-group-item .o_search_panel_label_title{ -// color: unset !important; -// } - - -// .o_menu_search_input{ -// margin-top: 1rem; -// border: none !important; -// } - -// .o_NotificationGroup_date{ -// color: #556ee6; -// } - -// .o_ThreadPreview_date{ -// color: #556ee6; -// } - -// .timesheet-timer button.btn_start_timer { -// color: #FFFFFF; -// background-color: #544FEA; -// border-color: #544FEA; -// text-transform: uppercase; -// } - -// .timesheet-timer button.btn_start_timer:hover { -// color: #FFFFFF; -// background-color: #0854aa;; -// border-color: #0854aa;; -// } - - -// .o_account_reports_page .account_report_line_name a { -// color: #556ee6; -// } - -// .o_list_view .o_list_table.o_list_table_grouped > tbody > tr.o_group_header.o_group_has_content:hover{ -// color: #556ee6; -// } - -// .o_list_view .o_list_table.o_list_table_grouped > tbody > tr.o_group_header.o_group_has_content.o_group_open:focus{ -// color: #556ee6 !important; -// } - -// .o_list_view .o_list_table.o_list_table_grouped > tbody > tr.o_group_header.o_group_has_content.o_group_open:hover{ -// color: #556ee6 !important; -// } - -// .o_list_view .o_list_table.o_list_table_grouped > tbody > tr.o_group_header.o_group_has_content.o_group_open:active{ -// color: #556ee6 !important; -// } - -// .o_list_view .o_list_table.o_list_table_grouped > tbody > tr.o_group_header.o_group_has_content.o_group_open:visited{ -// color: #556ee6 !important; -// } - -// .o_list_view .o_list_table.o_list_table_grouped > tbody > tr.o_group_header.o_group_has_content.o_group_open:focus-within{ -// color: #556ee6 !important; -// } - -// .o_list_view .o_list_table.o_list_table_grouped > tbody > tr.o_group_header.o_group_has_content.o_group_open:target{ -// color: #556ee6 !important; -// } - - -// .o_list_view .o_list_table.o_list_table_grouped > tbody > tr.o_group_header.o_group_has_content{ - -// &:hover{ -// color: #556ee6 !important; -// } -// &:visited{ -// color: #556ee6 !important; -// } -// &:focus{ -// color: #556ee6 !important; -// } -// &:focus-within{ -// color: #556ee6 !important; -// } -// &:active{ -// color: #556ee6 !important; -// } -// } - -// .o_Discuss .o_Message .o_Message_prettyBody p a { -// background: #556ee6 !important; -// color: white; -// } - - - //Responsive starts -@media (max-width:992px) { +@media (max-width: 992px) { .o_action_manager.sidebar_margin { margin: 0 !important; } @@ -1649,9 +104,8 @@ ul.o_menu_sections { .sidebar_panel .sidebar_close { display: block !important; } - } -@media (max-width:767px){ +@media (max-width: 767px) { .o_main_navbar > ul.o_menu_systray { position: static !important; height: auto !important; @@ -1659,7 +113,7 @@ ul.o_menu_sections { display: flex; } } -@media (max-width:480px) { +@media (max-width: 480px) { ul.o_menu_apps { padding-left: 25px; } @@ -1669,8 +123,10 @@ ul.o_menu_sections { .o_control_panel > div { flex-wrap: wrap; } - .o_cp_top_left, .o_cp_top_right, - .o_cp_bottom_left, .o_cp_bottom_right { + .o_cp_top_left, + .o_cp_top_right, + .o_cp_bottom_left, + .o_cp_bottom_right { width: 100%; } .o_widget_Discuss .o_Discuss.o-mobile:not(.o-adding-item) { @@ -1697,7 +153,7 @@ ul.o_menu_sections { right: auto !important; left: 0px; } - ul.o_menu_systray.topbar_icon .dropdown-menu.show{ + ul.o_menu_systray.topbar_icon .dropdown-menu.show { left: 0px !important; right: auto !important; } @@ -1718,8 +174,14 @@ ul.o_menu_sections { padding: 2px 10px !important; height: 35px !important; } - .o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child):before, - .o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child):after { + .o_form_view + .o_form_statusbar + > .o_statusbar_status + > .o_arrow_button:not(:first-child):before, + .o_form_view + .o_form_statusbar + > .o_statusbar_status + > .o_arrow_button:not(:first-child):after { border-top: 17px solid transparent !important; border-bottom: 16px solid transparent !important; } @@ -1734,7 +196,10 @@ ul.o_menu_sections { .o_form_statusbar .o_statusbar_buttons .btn { margin-right: 5px !important; } - .o_control_panel .o_cp_bottom_left > .o_cp_action_menus .o_dropdown_toggler_btn { + .o_control_panel + .o_cp_bottom_left + > .o_cp_action_menus + .o_dropdown_toggler_btn { margin-right: 3px; } .o_form_view .o_form_sheet_bg > .o_form_sheet { @@ -1743,7 +208,10 @@ ul.o_menu_sections { .nav-tabs .nav-link { padding: 8px; } - .modal.o_technical_modal.o_modal_full .modal-dialog .modal-content .modal-header { + .modal.o_technical_modal.o_modal_full + .modal-dialog + .modal-content + .modal-header { background: $primary_accent; } .o_form_view .o_group .o_group_col_6 { @@ -1752,29 +220,33 @@ ul.o_menu_sections { .o_kanban_view.o_kanban_ungrouped .o_kanban_record { flex-wrap: wrap; } - .o_kanban_view .o_kanban_record.o_kanban_record_has_image_fill .o_kanban_image_fill_left { + .o_kanban_view + .o_kanban_record.o_kanban_record_has_image_fill + .o_kanban_image_fill_left { border-radius: 5px; } - .o_field_widget.o_field_image .o_form_image_controls > .fa.o_select_file_button { + .o_field_widget.o_field_image + .o_form_image_controls + > .fa.o_select_file_button { background: #74788d; } } -@media (max-width:390px){ -.o_main_navbar .o_switch_company_menu > a .oe_topbar_name { - display: inline-block; - max-width: 110px !important; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - vertical-align: top; -} +@media (max-width: 390px) { + .o_main_navbar .o_switch_company_menu > a .oe_topbar_name { + display: inline-block; + max-width: 110px !important; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: top; + } } .badge { border: 1px solid #556ee6; } -@media (max-width: 768px){ - .o_main_navbar{ +@media (max-width: 768px) { + .o_main_navbar { display: flex !important; justify-content: space-between !important; } @@ -1788,15 +260,14 @@ ul.o_menu_sections { margin-top: -9px; } } -@media (max-width: 480px){ +@media (max-width: 480px) { .o_control_panel > .o_cp_bottom { -webkit-flex-wrap: nowrap !important; flex-wrap: nowrap !important; } } - .o_MobileMessagingNavbar_tab.o-active { color: #556ee6; } -//Responsive ends \ No newline at end of file +//Responsive ends diff --git a/odex25_base/expert_std_backend_theme/static/src/scss/web.scss b/odex25_base/expert_std_backend_theme/static/src/scss/web.scss index 9ed285e6f..cdf7ee61f 100644 --- a/odex25_base/expert_std_backend_theme/static/src/scss/web.scss +++ b/odex25_base/expert_std_backend_theme/static/src/scss/web.scss @@ -2,18 +2,18 @@ font-family: "bukra"; font-style: normal; font-weight: 400; - src: url(/expert_std_backend_theme/static/src/fonts/29ltbukraregular.otf) + src: url(../fonts/29ltbukraregular.otf) format("opentype"), - url(/expert_std_backend_theme/static/src/fonts/29ltbukralight.ttf) + url(../fonts/29ltbukralight.ttf) format("truetype"); } @font-face { font-family: "bukra"; font-style: normal; font-weight: 700; - src: url(/expert_std_backend_theme/static/src/fonts/29ltbukrabold.otf) + src: url(../fonts/29ltbukrabold.otf) format("opentype"), - url(/expert_std_backend_theme/static/src/fonts/alfont_com_خط-بكرا-عريض.ttf) + url(../fonts/alfont_com_خط-بكرا-عريض.ttf) format("truetype"); } .rtl *:not(.fa), @@ -69,7 +69,7 @@ body { .o_MessageList_emptyTitle.o-neutral-face-icon:before, .o_view_nocontent .o_nocontent_help .o_view_nocontent_smiling_face:before { background: transparent - url(/expert_std_backend_theme/static/src/img/smiling_face.svg) no-repeat + url(../img/smiling_face.svg) no-repeat center; } @@ -97,8 +97,8 @@ body.o_home_menu_background header .o_main_navbar { background: transparent !important; } -.o_onboarding.o_onboarding_blue .o_onboarding_wrap{ - background: $sidebar_bg; +.o_search_panel .list-group-item .list-group-item-action.active .o_search_panel_label_title{ + color: #FFFFFF !important; } @media screen and (max-width: 319px) { @@ -361,18 +361,6 @@ body.o_home_menu_background header .o_main_navbar { header.active { background: $sidebar_bg; } - .o_web_client - .o_action_manager - .o_action - .o_content - .o_search_panel - .o_search_panel_section - ul.o_search_panel_field - li - header.active - label { - color: white; - } .o_web_client .o_action_manager .o_action @@ -706,11 +694,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -1321,11 +1305,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -1936,11 +1916,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -1970,10 +1946,10 @@ body.o_home_menu_background header .o_main_navbar { .o_web_client header .o_main_navbar a.o_menu_brand:hover { background-color: $primary_accent; } - .o_web_client header .o_main_navbar ul.o_menu_sections { - display: flex; - flex-wrap: nowrap; - } + // .o_web_client header .o_main_navbar ul.o_menu_sections { + // display: flex; + // flex-wrap: nowrap; + // } .o_web_client header .o_main_navbar ul.o_menu_sections li a { color: white; } @@ -2425,11 +2401,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -2560,11 +2532,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -2594,10 +2562,10 @@ body.o_home_menu_background header .o_main_navbar { .o_web_client header .o_main_navbar a.o_menu_brand:hover { background-color: $primary_accent; } - .o_web_client header .o_main_navbar ul.o_menu_sections { - display: flex; - flex-wrap: nowrap; - } + // .o_web_client header .o_main_navbar ul.o_menu_sections { + // display: flex; + // flex-wrap: nowrap; + // } .o_web_client header .o_main_navbar ul.o_menu_sections li a { color: white; } @@ -3087,11 +3055,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -3121,10 +3085,10 @@ body.o_home_menu_background header .o_main_navbar { .o_web_client header .o_main_navbar a.o_menu_brand:hover { background-color: $primary_accent; } - .o_web_client header .o_main_navbar ul.o_menu_sections { - display: flex; - flex-wrap: nowrap; - } + // .o_web_client header .o_main_navbar ul.o_menu_sections { + // display: flex; + // flex-wrap: nowrap; + // } .o_web_client header .o_main_navbar ul.o_menu_sections li a { color: white; } @@ -3613,11 +3577,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -3647,10 +3607,10 @@ body.o_home_menu_background header .o_main_navbar { .o_web_client header .o_main_navbar a.o_menu_brand:hover { background-color: $primary_accent; } - .o_web_client header .o_main_navbar ul.o_menu_sections { - display: flex; - flex-wrap: nowrap; - } + // .o_web_client header .o_main_navbar ul.o_menu_sections { + // display: flex; + // flex-wrap: nowrap; + // } .o_web_client header .o_main_navbar ul.o_menu_sections li a { color: white; } @@ -4127,11 +4087,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -4161,10 +4117,10 @@ body.o_home_menu_background header .o_main_navbar { .o_web_client header .o_main_navbar a.o_menu_brand:hover { background-color: $primary_accent; } - .o_web_client header .o_main_navbar ul.o_menu_sections { - display: flex; - flex-wrap: nowrap; - } + // .o_web_client header .o_main_navbar ul.o_menu_sections { + // display: flex; + // flex-wrap: nowrap; + // } .o_web_client header .o_main_navbar ul.o_menu_sections li a { color: white; } @@ -4604,11 +4560,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -4637,10 +4589,10 @@ body.o_home_menu_background header .o_main_navbar { .o_web_client header .o_main_navbar a.o_menu_brand:hover { background-color: $primary_accent; } - .o_web_client header .o_main_navbar ul.o_menu_sections { - display: flex; - flex-wrap: nowrap; - } + // .o_web_client header .o_main_navbar ul.o_menu_sections { + // display: flex; + // flex-wrap: nowrap; + // } .o_web_client header .o_main_navbar ul.o_menu_sections li a { color: white; } @@ -5080,11 +5032,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } @@ -5113,10 +5061,10 @@ body.o_home_menu_background header .o_main_navbar { .o_web_client header .o_main_navbar a.o_menu_brand:hover { background-color: $primary_accent; } - .o_web_client header .o_main_navbar ul.o_menu_sections { - display: flex; - flex-wrap: nowrap; - } + // .o_web_client header .o_main_navbar ul.o_menu_sections { + // display: flex; + // flex-wrap: nowrap; + // } .o_web_client header .o_main_navbar ul.o_menu_sections li a { color: white; } @@ -5556,11 +5504,7 @@ body.o_home_menu_background header .o_main_navbar { .settings .app_settings_block h2 { - background: linear-gradient( - -270deg, - #134779 0%, - #1a6ab7 75% - ) !important; + background: $sidebar_bg; color: white !important; font-weight: 500 !important; } From 424bb4c0b0a650a772e0980d2485ccc74b53b703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Mon, 18 Nov 2024 13:27:50 +0300 Subject: [PATCH 12/14] Update github action file --- .github/workflows/production_pull_code.yml | 57 +++++++++++++--------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml index bae407651..f1d9f142a 100644 --- a/.github/workflows/production_pull_code.yml +++ b/.github/workflows/production_pull_code.yml @@ -20,56 +20,67 @@ jobs: cyber_master_server: name: Deploy to Cyber Master runs-on: cyber-client-project-runner - if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Cyber-Security-Project' + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Ensan-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') + # if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Cyber-Security-Project' steps: - name: Checkout And Restart Project run: | - sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh - sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh - + # sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + # sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + sudo chmod +x ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} + # Ensan Project ensan_master_server: - name: Deploy to Ensan Master + name: Deploy to Master runs-on: ensan-client-project-runner - if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Ensan-Project' + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Ensan-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') steps: - name: Checkout And Restart Project - run: | - sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh - sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh - + run: | + echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" + + sudo chmod +x ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} + # Helpdesk Project helpdesk_maser_server: - name: Deploy to Helpdesk Master + name: Deploy to Master runs-on: helpdesk_server - if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Helpdesk-Khabir-Project' + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Helpdesk-Khabir-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') steps: - name: Checkout And Restart Project - run: | - sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh - sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + run: | + echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" + + sudo chmod +x ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} # King Abdel Aziz Lobrary project kaz_master_server: name: Deploy to Master runs-on: kaz-library-project-runner - if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'King-AbdelAziz-Library-Project' + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'King-AbdelAziz-Library-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') steps: - name: Checkout And Restart Project - run: | - sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh - sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + run: | + echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" + + sudo chmod +x ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.KAZ_PROJECT_USER }} ${{ secrets.KAZ_STANDARD_FOLDER_PATH }} ${{ secrets.KAZ_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} # Twahod project twahod_master_server: name: Deploy to Master runs-on: twahod-client-project-runner - if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Twahod-Project' + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Twahod-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') steps: - name: Checkout And Restart Project - run: | - sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh - sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + run: | + echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" + + sudo chmod +x ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.TWAHOD_PROJECT_USER }} ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }} ${{ secrets.TWAHOD_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} # if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') From 6f8ccd60efddcaf0e5875edab2890c15726309e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Mon, 18 Nov 2024 15:04:06 +0300 Subject: [PATCH 13/14] Update github action file --- .github/workflows/production_pull_code.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml index f1d9f142a..76d9d68c7 100644 --- a/.github/workflows/production_pull_code.yml +++ b/.github/workflows/production_pull_code.yml @@ -13,7 +13,6 @@ on: - Helpdesk-Khabir-Project - King-AbdelAziz-Library-Project - Twahod-Project - default: Helpdesk-Khabir-Project jobs: # Cyber Project @@ -25,14 +24,14 @@ jobs: steps: - name: Checkout And Restart Project run: | - # sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh - # sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/pull_standard_code.sh + echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" + sudo chmod +x ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh sudo ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} # Ensan Project ensan_master_server: - name: Deploy to Master + name: Deploy to Ensan Master runs-on: ensan-client-project-runner if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Ensan-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') steps: @@ -45,7 +44,7 @@ jobs: # Helpdesk Project helpdesk_maser_server: - name: Deploy to Master + name: Deploy to Helpdesk Master runs-on: helpdesk_server if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Helpdesk-Khabir-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') steps: @@ -58,7 +57,7 @@ jobs: # King Abdel Aziz Lobrary project kaz_master_server: - name: Deploy to Master + name: Deploy to KAZ Master runs-on: kaz-library-project-runner if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'King-AbdelAziz-Library-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') steps: @@ -71,7 +70,7 @@ jobs: # Twahod project twahod_master_server: - name: Deploy to Master + name: Deploy to Twahod Master runs-on: twahod-client-project-runner if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Twahod-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') steps: From bb049e5e9c33a7a6291bfdce4b1936f7611d5c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Mon, 18 Nov 2024 15:15:44 +0300 Subject: [PATCH 14/14] Update github action file --- .github/workflows/production_pull_code.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml index 76d9d68c7..e140affea 100644 --- a/.github/workflows/production_pull_code.yml +++ b/.github/workflows/production_pull_code.yml @@ -19,7 +19,7 @@ jobs: cyber_master_server: name: Deploy to Cyber Master runs-on: cyber-client-project-runner - if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Ensan-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') + if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Cyber-Security-Project' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/master_odex25_ensan') # if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Cyber-Security-Project' steps: - name: Checkout And Restart Project