diff --git a/.eslintrc.js b/.eslintrc.js
index 515df2a..77c5405 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -15,6 +15,7 @@ module.exports = {
'react',
],
rules: {
+ 'jsx-a11y/control-has-associated-label': 'off',
'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
'react/forbid-prop-types': [0, {}],
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml
new file mode 100644
index 0000000..65c1654
--- /dev/null
+++ b/.github/workflows/deploy-gitworker.yml
@@ -0,0 +1,65 @@
+name: Build and Deploy to the Admin Portal VM
+
+on:
+ pull_request:
+ branches:
+ - master
+ types: [closed]
+
+jobs:
+ deploy:
+ if: github.event.pull_request.merged == true
+ runs-on: ubuntu-20.04
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ - name: Set up SSH key
+ run: |
+ mkdir -p ~/.ssh
+ echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
+ chmod 600 ~/.ssh/id_rsa
+ ssh-keyscan -t rsa $VM_IP >> ~/.ssh/known_hosts
+ env:
+ SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+ VM_IP: ${{ secrets.VM_IP }}
+
+ - name: Install nvm
+ run: |
+ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
+ source ~/.nvm/nvm.sh
+ nvm install 19
+
+ - name: Update code on VM
+ run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && git pull origin feature/gitworkflow"
+ env:
+ SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+ VM_IP: ${{ secrets.VM_IP }}
+ VM_USERNAME: ${{ secrets.VM_USERNAME }}
+
+ - name: Check node version
+ run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin"
+ env:
+ SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+ VM_IP: ${{ secrets.VM_IP }}
+ VM_USERNAME: ${{ secrets.VM_USERNAME }}
+
+ - name: Build code on VM
+ run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && source ~/.nvm/nvm.sh && nvm use 19 && yarn run build"
+ env:
+ SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+ VM_IP: ${{ secrets.VM_IP }}
+ VM_USERNAME: ${{ secrets.VM_USERNAME }}
+
+ - name: Restart Nginx server
+ run: ssh $VM_USERNAME@$VM_IP "sudo systemctl restart nginx"
+ env:
+ SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+ VM_IP: ${{ secrets.VM_IP }}
+ VM_USERNAME: ${{ secrets.VM_USERNAME }}
+
+ - name: Clean up SSH key
+ run: |
+ rm -f ~/.ssh/id_rsa
+ env:
+ SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
\ No newline at end of file
diff --git a/src/Pages/LoginPage/index.js b/src/Pages/LoginPage/index.js
index 20359b2..c4948c5 100644
--- a/src/Pages/LoginPage/index.js
+++ b/src/Pages/LoginPage/index.js
@@ -60,7 +60,7 @@ export default function LoginPage() {