From 6b9bdcc85dc7e0b486cb46be70dc8c7e5bfed782 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 26 Sep 2024 23:18:41 +0530
Subject: [PATCH 01/40] add loader

---
 src/DeleteShopAccountSetting.vue | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 6c1f1ebb..26c38631 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,6 +1,9 @@
 <template>
 	<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
-		<div>
+		 <div v-if="isLoading" class="spinner-container">
+            <div class="spinner"></div> <!-- Spinner component -->
+        </div>
+		<div v-else>>
 			<p>
 				{{
 					t(appName, 'We are going to proceed with your cloud account suppression.')
@@ -283,4 +286,29 @@ input#shop-alternate-email:disabled {
 #delete-account-settings .checkbox-radio-switch--disabled .checkbox-radio-switch__label:hover{
 	background-color: unset;
 }
+.spinner-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100px; 
+}
+
+.spinner {
+    border: 4px solid rgba(0, 0, 0, 0.1);
+    border-left-color: #09f;
+    border-radius: 50%;
+    width: 40px;
+    height: 40px;
+    animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
 </style>
-- 
GitLab


From c49169ef4cae6cc51bbafeda57224b90788f94cb Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 26 Sep 2024 23:26:31 +0530
Subject: [PATCH 02/40] add loader

---
 src/DeleteShopAccountSetting.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 26c38631..941200f2 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,9 +1,10 @@
 <template>
 	<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
-		 <div v-if="isLoading" class="spinner-container">
-            <div class="spinner"></div> <!-- Spinner component -->
-        </div>
-		<div v-else>>
+		<div v-if="isLoading" class="spinner-container">
+			<div class="spinner" /> <!-- Spinner component -->
+		</div>
+		<div v-else>
+			>
 			<p>
 				{{
 					t(appName, 'We are going to proceed with your cloud account suppression.')
@@ -290,7 +291,7 @@ input#shop-alternate-email:disabled {
     display: flex;
     justify-content: center;
     align-items: center;
-    height: 100px; 
+    height: 100px;
 }
 
 .spinner {
-- 
GitLab


From 329af68855ead1d6965a10f08078075b41be5f12 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 10:58:57 +0530
Subject: [PATCH 03/40] loading

---
 src/DeleteShopAccountSetting.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 941200f2..e0ca9c51 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -4,7 +4,6 @@
 			<div class="spinner" /> <!-- Spinner component -->
 		</div>
 		<div v-else>
-			>
 			<p>
 				{{
 					t(appName, 'We are going to proceed with your cloud account suppression.')
@@ -90,6 +89,7 @@ export default {
 			showError: false,
 			allowDelete: true,
 			ordersDescription: '',
+			 isLoading: false,
 		}
 	},
 	computed: {
@@ -161,6 +161,7 @@ export default {
 		},
 		async getShopUsers() {
 			try {
+				this.isLoading = true // Start loading
 				const url = generateUrl(
 					`/apps/${this.appName}/shop-accounts/users`,
 				)
@@ -175,6 +176,8 @@ export default {
 					)
 					this.allowDelete = false
 				}
+			} finally {
+				this.isLoading = false // Stop loading
 			}
 			this.disableOrEnableDeleteAccount()
 		},
@@ -311,5 +314,4 @@ input#shop-alternate-email:disabled {
         transform: rotate(360deg);
     }
 }
-
 </style>
-- 
GitLab


From 52cf87d2c5e9bd92029a8b7fc1b5413f4c70a2a0 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 14:29:48 +0530
Subject: [PATCH 04/40] temporary change

---
 .gitlab-ci.yml | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08326169..8303275b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,104 @@ stages:
   - deploy
 
 variables:
+
+  CONTAINER_IMAGE: ubuntu
+  CONTAINER_TAG: focal
+  CONTAINER_NAME: nextcloud
+  APP_NAME: oidc_login
+  OCC_ENABLE_AFTER_DEPLOY: 'true'
+  APP_PATH: ''
+  
+.deploy:nextcloud-app-by-checkout:
+  stage: deploy
+  # assuming all deployment will happen with sames image
+  image: $CONTAINER_IMAGE:$CONTAINER_TAG
+  # assuming we will need to add SSH for all deployment
+  before_script:
+    - echo "FAIL" > .job_status
+    - mkdir $HOME/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
+    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
+    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
+    - chmod 600 ~/.ssh/id_ed25519
+    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
+    - apt-get update && apt-get install -y openssh-client rsync
+  script:
+    # print var to confirm
+    - echo "Deploying $APP_NAME to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
+    # clone repo to /tmp
+    - |
+      ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT
+      git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME}
+      if $OCC_ENABLE_AFTER_DEPLOY = 'true'
+      then
+        sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME}
+      fi
+      sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/${APP_PATH}
+      if $OCC_ENABLE_AFTER_DEPLOY = 'true'
+      then
+        sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_NAME}
+      fi
+      EOT
+    - echo "SUCCESS" > .job_status
+  after_script:
+    # reading job status, checking it and implementing additional steps
+    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
+
+deploy:dev01:
+  extends: .deploy:nextcloud-app-by-checkout
+  when: manual
+  only:
+    - /^dev\/.*$/
+    - main
+    - murena-main
+  environment:
+    name: dev/01
+    url: https://dev.eeo.one/
+  variables:
+    CONTAINER_NAME: dev01_nextcloud
+
+deploy:dev02:
+  extends: .deploy:nextcloud-app-by-checkout
+  when: manual
+  only:
+    - /^dev\/.*$/
+    - main
+    - murena-main
+  environment:
+    name: dev/02
+    url: https://ecloud02.dev.eeo.one
+  variables:
+    DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH
+    CONTAINER_NAME: dev02_nextcloud
+
+deploy:dev03:
+  extends: .deploy:nextcloud-app-by-checkout
+  when: manual
+  only:
+    - /^dev\/.*$/
+    - main
+    - murena-main
+  environment:
+    name: dev/03
+    url: https://ecloud03.dev.eeo.one
+  variables:
+    CONTAINER_NAME: dev03_nextcloud
+
+deploy:staging:
+  extends: .deploy:nextcloud-app-by-checkout
+  when: manual
+  only:
+    - main
+    - murena-main
+    - production
+    - tags
+    - dev/access-tokens
+  environment:
+    name: staging/01
+    url: https://eeo.one
     TO_PACKAGE: 'appinfo l10n lib templates js img css'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
-- 
GitLab


From e15b7262eda250ae5937826ea3fed8747d08feee Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 14:31:54 +0530
Subject: [PATCH 05/40] temporary change

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8303275b..92f87893 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ variables:
   CONTAINER_IMAGE: ubuntu
   CONTAINER_TAG: focal
   CONTAINER_NAME: nextcloud
-  APP_NAME: oidc_login
+  APP_NAME: ecloud-accounts
   OCC_ENABLE_AFTER_DEPLOY: 'true'
   APP_PATH: ''
   
-- 
GitLab


From 77640aadee53d2df81cf4b85b3d3cf15d73bfe02 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 14:32:44 +0530
Subject: [PATCH 06/40] check

---
 .gitlab-ci.yml | 98 --------------------------------------------------
 1 file changed, 98 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92f87893..08326169 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,104 +6,6 @@ stages:
   - deploy
 
 variables:
-
-  CONTAINER_IMAGE: ubuntu
-  CONTAINER_TAG: focal
-  CONTAINER_NAME: nextcloud
-  APP_NAME: ecloud-accounts
-  OCC_ENABLE_AFTER_DEPLOY: 'true'
-  APP_PATH: ''
-  
-.deploy:nextcloud-app-by-checkout:
-  stage: deploy
-  # assuming all deployment will happen with sames image
-  image: $CONTAINER_IMAGE:$CONTAINER_TAG
-  # assuming we will need to add SSH for all deployment
-  before_script:
-    - echo "FAIL" > .job_status
-    - mkdir $HOME/.ssh
-    - chmod 700 ~/.ssh
-    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
-    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
-    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
-    - chmod 600 ~/.ssh/id_ed25519
-    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
-    - apt-get update && apt-get install -y openssh-client rsync
-  script:
-    # print var to confirm
-    - echo "Deploying $APP_NAME to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
-    # clone repo to /tmp
-    - |
-      ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT
-      git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME}
-      if $OCC_ENABLE_AFTER_DEPLOY = 'true'
-      then
-        sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME}
-      fi
-      sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/${APP_PATH}
-      if $OCC_ENABLE_AFTER_DEPLOY = 'true'
-      then
-        sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_NAME}
-      fi
-      EOT
-    - echo "SUCCESS" > .job_status
-  after_script:
-    # reading job status, checking it and implementing additional steps
-    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
-    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
-
-deploy:dev01:
-  extends: .deploy:nextcloud-app-by-checkout
-  when: manual
-  only:
-    - /^dev\/.*$/
-    - main
-    - murena-main
-  environment:
-    name: dev/01
-    url: https://dev.eeo.one/
-  variables:
-    CONTAINER_NAME: dev01_nextcloud
-
-deploy:dev02:
-  extends: .deploy:nextcloud-app-by-checkout
-  when: manual
-  only:
-    - /^dev\/.*$/
-    - main
-    - murena-main
-  environment:
-    name: dev/02
-    url: https://ecloud02.dev.eeo.one
-  variables:
-    DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH
-    CONTAINER_NAME: dev02_nextcloud
-
-deploy:dev03:
-  extends: .deploy:nextcloud-app-by-checkout
-  when: manual
-  only:
-    - /^dev\/.*$/
-    - main
-    - murena-main
-  environment:
-    name: dev/03
-    url: https://ecloud03.dev.eeo.one
-  variables:
-    CONTAINER_NAME: dev03_nextcloud
-
-deploy:staging:
-  extends: .deploy:nextcloud-app-by-checkout
-  when: manual
-  only:
-    - main
-    - murena-main
-    - production
-    - tags
-    - dev/access-tokens
-  environment:
-    name: staging/01
-    url: https://eeo.one
     TO_PACKAGE: 'appinfo l10n lib templates js img css'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
-- 
GitLab


From a4e368ccc011afb134579f429a565d84c6d495e5 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 14:46:44 +0530
Subject: [PATCH 07/40] change .gitlab yml

---
 .gitlab-ci.yml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08326169..d48e4a15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,12 @@ stages:
 
 variables:
     TO_PACKAGE: 'appinfo l10n lib templates js img css'
+    CONTAINER_IMAGE: ubuntu
+    CONTAINER_TAG: focal
+    CONTAINER_NAME: nextcloud
+    APP_NAME: $CI_PROJECT_NAME
+    OCC_ENABLE_AFTER_DEPLOY: 'true'
+    APP_PATH: ''
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
@@ -23,6 +29,58 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "populate-code-climate-default-config.yml"
+.deploy:nextcloud-app-by-checkout:
+  stage: deploy
+  # assuming all deployment will happen with sames image
+  image: $CONTAINER_IMAGE:$CONTAINER_TAG
+  # assuming we will need to add SSH for all deployment
+  before_script:
+    - echo "FAIL" > .job_status
+    - mkdir $HOME/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
+    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
+    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
+    - chmod 600 ~/.ssh/id_ed25519
+    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
+    - apt-get update && apt-get install -y openssh-client rsync
+  script:
+    # print var to confirm
+    - echo "Deploying $APP_NAME to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
+    # clone repo to /tmp
+    - |
+      ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT
+      git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME}
+      if $OCC_ENABLE_AFTER_DEPLOY = 'true'
+      then
+        sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME}
+      fi
+      sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/${APP_PATH}
+      if $OCC_ENABLE_AFTER_DEPLOY = 'true'
+      then
+        sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_NAME}
+      fi
+      EOT
+    - echo "SUCCESS" > .job_status
+  after_script:
+    # reading job status, checking it and implementing additional steps
+    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
+
+
+
+deploy:staging:
+  extends: .deploy:nextcloud-app-by-checkout
+  when: manual
+  only:
+    - main
+    - murena-main
+    - production
+    - tags
+    - dev/account-delete-changes
+  environment:
+    name: staging/01
+    url: https://eeo.one
 
 build-vendor:
   stage: build
-- 
GitLab


From ca2bb2f5fe30681df38410e16537de883927afd3 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 14:47:18 +0530
Subject: [PATCH 08/40] change .gitlab yml

---
 .gitlab-ci.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d48e4a15..60f37afb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,17 +81,3 @@ deploy:staging:
   environment:
     name: staging/01
     url: https://eeo.one
-
-build-vendor:
-  stage: build
-  extends: .composer:base
-  needs: ["build-frontend"]
-  before_script:
-    - composer install --no-dev
-  script:
-    - cp -a vendor dist/${APP_NAME}
-    - find dist/${APP_NAME} -type d -exec chmod 755 {} \;
-    - find dist/${APP_NAME} -type f -exec chmod 644 {} \;
-  artifacts:
-    paths:
-      - dist/
-- 
GitLab


From c0d3d5c271d5d7d56daa05f4702dbde966663438 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 14:54:42 +0530
Subject: [PATCH 09/40] change .gitlab yml

---
 .gitlab-ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60f37afb..65495dde 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,3 @@
-stages:
-  - test
-  - build
-  - performance
-  - dast
-  - deploy
 
 variables:
     TO_PACKAGE: 'appinfo l10n lib templates js img css'
-- 
GitLab


From 78fb6f435462b40793dea98bcfd7994af75c8f51 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 15:05:10 +0530
Subject: [PATCH 10/40] change .gitlab yml

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65495dde..48559414 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,14 +64,13 @@ include:
 
 
 deploy:staging:
-  extends: .deploy:nextcloud-app-by-checkout
-  when: manual
+  extends: .deploy:nextcloud-app
   only:
     - main
     - murena-main
     - production
     - tags
-    - dev/account-delete-changes
+    - dev/fix-slowness
   environment:
     name: staging/01
     url: https://eeo.one
-- 
GitLab


From 2e6c256021da7d616c8d68df93715302ef2adc40 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 15:06:13 +0530
Subject: [PATCH 11/40] change .gitlab yml

---
 .gitlab-ci.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48559414..b5669feb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,12 +65,17 @@ include:
 
 deploy:staging:
   extends: .deploy:nextcloud-app
-  only:
-    - main
-    - murena-main
-    - production
-    - tags
-    - dev/fix-slowness
+   rules:
+    - if: $CI_COMMIT_BRANCH == "main"
+      when: manual
+    - if: $CI_COMMIT_BRANCH == "murena-main"
+      when: manual
+    - if: $CI_COMMIT_BRANCH == "production"
+      when: manual
+     - if: $CI_COMMIT_BRANCH == "dev/fix-slowness"
+      when: manual  
+    - if: $CI_COMMIT_TAG
+      when: manual
   environment:
     name: staging/01
     url: https://eeo.one
-- 
GitLab


From 6d3f450d059410b81605ecf36eb6ee2a129456dc Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 15:07:26 +0530
Subject: [PATCH 12/40] change .gitlab yml

---
 .gitlab-ci.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5669feb..0dbb2ebb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,20 +62,19 @@ include:
     - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
 
 
-
 deploy:staging:
   extends: .deploy:nextcloud-app
-   rules:
+  rules:
     - if: $CI_COMMIT_BRANCH == "main"
       when: manual
     - if: $CI_COMMIT_BRANCH == "murena-main"
       when: manual
     - if: $CI_COMMIT_BRANCH == "production"
       when: manual
-     - if: $CI_COMMIT_BRANCH == "dev/fix-slowness"
-      when: manual  
     - if: $CI_COMMIT_TAG
       when: manual
+    - if: $CI_COMMIT_BRANCH == "dev/fix-slowness"
+      when: manual   
   environment:
     name: staging/01
-    url: https://eeo.one
+    url: $ENV_URL
-- 
GitLab


From 243fd60603046369b631201bcfaa4ff7734c9fe4 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 15:08:28 +0530
Subject: [PATCH 13/40] change .gitlab yml

---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0dbb2ebb..1cd47294 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,11 @@
 
+stages:
+  - test
+  - build
+  - performance
+  - dast
+  - deploy
+  
 variables:
     TO_PACKAGE: 'appinfo l10n lib templates js img css'
     CONTAINER_IMAGE: ubuntu
-- 
GitLab


From c7c7afc2be2a237f3e8967a09560c2163a60c422 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 15:43:31 +0530
Subject: [PATCH 14/40] change .gitlab yml

---
 src/DeleteShopAccountSetting.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index e0ca9c51..9763a759 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,6 +1,7 @@
 <template>
 	<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
 		<div v-if="isLoading" class="spinner-container">
+		This is test text
 			<div class="spinner" /> <!-- Spinner component -->
 		</div>
 		<div v-else>
-- 
GitLab


From 2c9d0e69c1bcb9035abfbc3dde79620afa2d47a7 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 15:55:07 +0530
Subject: [PATCH 15/40] lint fix

---
 src/DeleteShopAccountSetting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 9763a759..fdf460a7 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,7 +1,7 @@
 <template>
 	<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
 		<div v-if="isLoading" class="spinner-container">
-		This is test text
+			This is test text
 			<div class="spinner" /> <!-- Spinner component -->
 		</div>
 		<div v-else>
-- 
GitLab


From 94c4cc19aa00ba87ab94d08cb85a9e6a85a8dc20 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 16:13:28 +0530
Subject: [PATCH 16/40] visible true

---
 src/DeleteShopAccountSetting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index fdf460a7..59e8a5ad 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -90,7 +90,7 @@ export default {
 			showError: false,
 			allowDelete: true,
 			ordersDescription: '',
-			 isLoading: false,
+			 isLoading: true,
 		}
 	},
 	computed: {
-- 
GitLab


From f9e73eda8cdc7b3c863963b8ca1a860aadf789a3 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 16:42:43 +0530
Subject: [PATCH 17/40] add logger

---
 src/DeleteShopAccountSetting.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 59e8a5ad..9ca97d13 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -90,7 +90,7 @@ export default {
 			showError: false,
 			allowDelete: true,
 			ordersDescription: '',
-			 isLoading: true,
+			isLoading: true,
 		}
 	},
 	computed: {
@@ -109,7 +109,11 @@ export default {
 		},
 	},
 	mounted() {
+		// eslint-disable-next-line no-console
+		console.log(this.isLoading)
 		this.getShopUsers()
+		// eslint-disable-next-line no-console
+		console.log(this.isLoading)
 	},
 	methods: {
 		async disableOrEnableDeleteAccount() {
-- 
GitLab


From f6630d6a2f918879c593654e5d94b0aa2b702aa7 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 17:57:22 +0530
Subject: [PATCH 18/40] remove extra code from gitlab

---
 .gitlab-ci.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cd47294..b8ad8c49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,6 @@ variables:
     CONTAINER_NAME: nextcloud
     APP_NAME: $CI_PROJECT_NAME
     OCC_ENABLE_AFTER_DEPLOY: 'true'
-    APP_PATH: ''
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
@@ -63,10 +62,7 @@ include:
       fi
       EOT
     - echo "SUCCESS" > .job_status
-  after_script:
-    # reading job status, checking it and implementing additional steps
-    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
-    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
+
 
 
 deploy:staging:
-- 
GitLab


From 9b1f0d9643cb50a17cf7459205b81e9a3033bb74 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 17:59:17 +0530
Subject: [PATCH 19/40] remove extra code from gitlab

---
 .gitlab-ci.yml | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8ad8c49..aee6bfba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,11 +8,6 @@ stages:
   
 variables:
     TO_PACKAGE: 'appinfo l10n lib templates js img css'
-    CONTAINER_IMAGE: ubuntu
-    CONTAINER_TAG: focal
-    CONTAINER_NAME: nextcloud
-    APP_NAME: $CI_PROJECT_NAME
-    OCC_ENABLE_AFTER_DEPLOY: 'true'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
@@ -29,41 +24,6 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "populate-code-climate-default-config.yml"
-.deploy:nextcloud-app-by-checkout:
-  stage: deploy
-  # assuming all deployment will happen with sames image
-  image: $CONTAINER_IMAGE:$CONTAINER_TAG
-  # assuming we will need to add SSH for all deployment
-  before_script:
-    - echo "FAIL" > .job_status
-    - mkdir $HOME/.ssh
-    - chmod 700 ~/.ssh
-    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
-    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
-    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
-    - chmod 600 ~/.ssh/id_ed25519
-    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
-    - apt-get update && apt-get install -y openssh-client rsync
-  script:
-    # print var to confirm
-    - echo "Deploying $APP_NAME to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
-    # clone repo to /tmp
-    - |
-      ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT
-      git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME}
-      if $OCC_ENABLE_AFTER_DEPLOY = 'true'
-      then
-        sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME}
-      fi
-      sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/${APP_PATH}
-      if $OCC_ENABLE_AFTER_DEPLOY = 'true'
-      then
-        sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_NAME}
-      fi
-      EOT
-    - echo "SUCCESS" > .job_status
-
-
 
 deploy:staging:
   extends: .deploy:nextcloud-app
-- 
GitLab


From 529e028c5db6cf64b9ecbfd0cd177d22dd2e01ef Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 27 Sep 2024 23:55:15 +0530
Subject: [PATCH 20/40] add loading

---
 src/DeleteShopAccountSetting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 9ca97d13..b42f2963 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -182,7 +182,7 @@ export default {
 					this.allowDelete = false
 				}
 			} finally {
-				this.isLoading = false // Stop loading
+				this.isLoading = true // Stop loading
 			}
 			this.disableOrEnableDeleteAccount()
 		},
-- 
GitLab


From 43d8b37d0b237d703b8f21eeb70eed53e62dc24d Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Sat, 28 Sep 2024 00:11:48 +0530
Subject: [PATCH 21/40] add loading

---
 src/DeleteShopAccountSetting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index b42f2963..9ca97d13 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -182,7 +182,7 @@ export default {
 					this.allowDelete = false
 				}
 			} finally {
-				this.isLoading = true // Stop loading
+				this.isLoading = false // Stop loading
 			}
 			this.disableOrEnableDeleteAccount()
 		},
-- 
GitLab


From ab3e8795f4c7c6afb9d5a7aa52a75db3a92620cd Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Sat, 28 Sep 2024 00:40:31 +0530
Subject: [PATCH 22/40] add loading

---
 src/DeleteShopAccountSetting.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 9ca97d13..005e4186 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -109,11 +109,7 @@ export default {
 		},
 	},
 	mounted() {
-		// eslint-disable-next-line no-console
-		console.log(this.isLoading)
 		this.getShopUsers()
-		// eslint-disable-next-line no-console
-		console.log(this.isLoading)
 	},
 	methods: {
 		async disableOrEnableDeleteAccount() {
@@ -166,7 +162,11 @@ export default {
 		},
 		async getShopUsers() {
 			try {
+				// eslint-disable-next-line no-console
+				console.log(this.isLoading)
 				this.isLoading = true // Start loading
+				// eslint-disable-next-line no-console
+				console.log(this.isLoading)
 				const url = generateUrl(
 					`/apps/${this.appName}/shop-accounts/users`,
 				)
@@ -183,7 +183,11 @@ export default {
 				}
 			} finally {
 				this.isLoading = false // Stop loading
+				// eslint-disable-next-line no-console
+				console.log(this.isLoading)
 			}
+			// eslint-disable-next-line no-console
+			console.log(this.isLoading)
 			this.disableOrEnableDeleteAccount()
 		},
 		async updateDeleteShopPreference() {
-- 
GitLab


From dd44ef911bdb4e92778efce85e5dc48c3c1dd872 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Sat, 28 Sep 2024 00:54:01 +0530
Subject: [PATCH 23/40] add loading

---
 src/DeleteShopAccountSetting.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 005e4186..9af0dd6d 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -170,6 +170,7 @@ export default {
 				const url = generateUrl(
 					`/apps/${this.appName}/shop-accounts/users`,
 				)
+				await new Promise(resolve => setTimeout(resolve, 5000))
 				const { data } = await Axios.get(url)
 				this.shopUsers = data
 				this.setOrderDescription()
-- 
GitLab


From 01da4deccc76336db2b9b8bdb5779899b322976d Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 30 Sep 2024 10:45:30 +0530
Subject: [PATCH 24/40] add loading next tick

---
 src/DeleteShopAccountSetting.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 9af0dd6d..aca138bb 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -165,6 +165,7 @@ export default {
 				// eslint-disable-next-line no-console
 				console.log(this.isLoading)
 				this.isLoading = true // Start loading
+				await this.$nextTick();
 				// eslint-disable-next-line no-console
 				console.log(this.isLoading)
 				const url = generateUrl(
-- 
GitLab


From 4fe3d22edf73c9de010c6d10ea5ebdfa1ab88e62 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 30 Sep 2024 10:53:07 +0530
Subject: [PATCH 25/40] add loading next tick

---
 src/DeleteShopAccountSetting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index aca138bb..4053ad7b 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -165,7 +165,7 @@ export default {
 				// eslint-disable-next-line no-console
 				console.log(this.isLoading)
 				this.isLoading = true // Start loading
-				await this.$nextTick();
+				await this.$nextTick()
 				// eslint-disable-next-line no-console
 				console.log(this.isLoading)
 				const url = generateUrl(
-- 
GitLab


From 4cb5743695435ec7b3a3b88d285795b86d95e6b7 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 30 Sep 2024 11:17:38 +0530
Subject: [PATCH 26/40] add else if

---
 src/DeleteShopAccountSetting.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 4053ad7b..1ae334da 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,10 +1,10 @@
 <template>
-	<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
+	<SettingsSection :name="t(appName, 'Options')">
 		<div v-if="isLoading" class="spinner-container">
 			This is test text
 			<div class="spinner" /> <!-- Spinner component -->
 		</div>
-		<div v-else>
+		<div v-else-if="shopUsers.length > 0">
 			<p>
 				{{
 					t(appName, 'We are going to proceed with your cloud account suppression.')
-- 
GitLab


From 7aed9be4984cdae6bfa4205468ffb49a16f36825 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 30 Sep 2024 11:27:51 +0530
Subject: [PATCH 27/40] add else if

---
 src/DeleteShopAccountSetting.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 1ae334da..e712c676 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,8 +1,7 @@
 <template>
 	<SettingsSection :name="t(appName, 'Options')">
 		<div v-if="isLoading" class="spinner-container">
-			This is test text
-			<div class="spinner" /> <!-- Spinner component -->
+			<div class="spinner" />
 		</div>
 		<div v-else-if="shopUsers.length > 0">
 			<p>
-- 
GitLab


From 2d2bed7195dd49b65fbccb77ab102d20aad453f8 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 30 Sep 2024 11:46:47 +0530
Subject: [PATCH 28/40] moved loader out

---
 src/DeleteShopAccountSetting.vue | 118 +++++++++++++++----------------
 1 file changed, 57 insertions(+), 61 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index e712c676..b03f31ac 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,66 +1,68 @@
 <template>
-	<SettingsSection :name="t(appName, 'Options')">
+	<div>
 		<div v-if="isLoading" class="spinner-container">
-			<div class="spinner" />
+			<div class="spinner" /> <!-- Spinner component -->
 		</div>
-		<div v-else-if="shopUsers.length > 0">
-			<p>
-				{{
-					t(appName, 'We are going to proceed with your cloud account suppression.')
-				}}
-				<span v-if="!hasActiveSubscription">
+		<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
+			<div>
+				<p>
 					{{
-						t(appName, 'Check the box below if you also want to delete the associated shop account(s).')
+						t(appName, 'We are going to proceed with your cloud account suppression.')
 					}}
-				</span>
-			</p>
+					<span v-if="!hasActiveSubscription">
+						{{
+							t(appName, 'Check the box below if you also want to delete the associated shop account(s).')
+						}}
+					</span>
+				</p>
 
-			<p><span v-if="orderCount > 0" v-html="ordersDescription" /></p>
-			<p v-if="hasActiveSubscription">
-				<b>
-					{{
-						t(appName, 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.')
-					}}
-				</b>
-			</p>
+				<p><span v-if="orderCount > 0" v-html="ordersDescription" /></p>
+				<p v-if="hasActiveSubscription">
+					<b>
+						{{
+							t(appName, 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.')
+						}}
+					</b>
+				</p>
 
-			<form @submit.prevent>
-				<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
-					<div class="delete-shop-input">
-						<CheckboxRadioSwitch id="shop-accounts_confirm"
-							:checked.sync="deleteShopAccount"
-							:disabled="hasActiveSubscription || !allowDelete"
-							@update:checked="updateDeleteShopPreference">
-							{{
-								t(
-									appName,
-									"I also want to delete my shop account"
-								)
-							}}
-						</CheckboxRadioSwitch>
-					</div>
-					<div v-if="!deleteShopAccount" class="delete-shop-input">
-						<label for="shop-alternate-email">
-							{{
-								t(
-									appName,
-									"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop."
-								)
-							}}
-						</label>
-						<input id="shop-alternate-email"
-							v-model="shopEmailPostDelete"
-							type="email"
-							name="shop-alternate-email"
-							:placeholder="t(appName, 'Email Address')"
-							class="form-control"
-							:disabled="hasActiveSubscription || !allowDelete"
-							@blur="updateEmailPostDelete($event)">
+				<form @submit.prevent>
+					<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
+						<div class="delete-shop-input">
+							<CheckboxRadioSwitch id="shop-accounts_confirm"
+								:checked.sync="deleteShopAccount"
+								:disabled="hasActiveSubscription || !allowDelete"
+								@update:checked="updateDeleteShopPreference">
+								{{
+									t(
+										appName,
+										"I also want to delete my shop account"
+									)
+								}}
+							</CheckboxRadioSwitch>
+						</div>
+						<div v-if="!deleteShopAccount" class="delete-shop-input">
+							<label for="shop-alternate-email">
+								{{
+									t(
+										appName,
+										"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop."
+									)
+								}}
+							</label>
+							<input id="shop-alternate-email"
+								v-model="shopEmailPostDelete"
+								type="email"
+								name="shop-alternate-email"
+								:placeholder="t(appName, 'Email Address')"
+								class="form-control"
+								:disabled="hasActiveSubscription || !allowDelete"
+								@blur="updateEmailPostDelete($event)">
+						</div>
 					</div>
-				</div>
-			</form>
-		</div>
-	</SettingsSection>
+				</form>
+			</div>
+		</SettingsSection>
+	</div>
 </template>
 
 <script>
@@ -164,13 +166,11 @@ export default {
 				// eslint-disable-next-line no-console
 				console.log(this.isLoading)
 				this.isLoading = true // Start loading
-				await this.$nextTick()
 				// eslint-disable-next-line no-console
 				console.log(this.isLoading)
 				const url = generateUrl(
 					`/apps/${this.appName}/shop-accounts/users`,
 				)
-				await new Promise(resolve => setTimeout(resolve, 5000))
 				const { data } = await Axios.get(url)
 				this.shopUsers = data
 				this.setOrderDescription()
@@ -184,11 +184,7 @@ export default {
 				}
 			} finally {
 				this.isLoading = false // Stop loading
-				// eslint-disable-next-line no-console
-				console.log(this.isLoading)
 			}
-			// eslint-disable-next-line no-console
-			console.log(this.isLoading)
 			this.disableOrEnableDeleteAccount()
 		},
 		async updateDeleteShopPreference() {
-- 
GitLab


From 3ddd5ea78260787b1718335a9a89258417fe4c63 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 30 Sep 2024 12:14:11 +0530
Subject: [PATCH 29/40] set color

---
 src/DeleteShopAccountSetting.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index b03f31ac..d17dcf93 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -163,11 +163,7 @@ export default {
 		},
 		async getShopUsers() {
 			try {
-				// eslint-disable-next-line no-console
-				console.log(this.isLoading)
-				this.isLoading = true // Start loading
-				// eslint-disable-next-line no-console
-				console.log(this.isLoading)
+				this.isLoading = true
 				const url = generateUrl(
 					`/apps/${this.appName}/shop-accounts/users`,
 				)
@@ -183,7 +179,7 @@ export default {
 					this.allowDelete = false
 				}
 			} finally {
-				this.isLoading = false // Stop loading
+				this.isLoading = false
 			}
 			this.disableOrEnableDeleteAccount()
 		},
@@ -305,7 +301,7 @@ input#shop-alternate-email:disabled {
 
 .spinner {
     border: 4px solid rgba(0, 0, 0, 0.1);
-    border-left-color: #09f;
+    border-left-color: var(--color-primary-element);
     border-radius: 50%;
     width: 40px;
     height: 40px;
-- 
GitLab


From 57f05ed2c9e362931d2d34fed84a088a572dd848 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 30 Sep 2024 12:15:37 +0530
Subject: [PATCH 30/40] loader moved down

---
 src/DeleteShopAccountSetting.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index d17dcf93..6b9c0d1c 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -297,6 +297,7 @@ input#shop-alternate-email:disabled {
     justify-content: center;
     align-items: center;
     height: 100px;
+	margin-top: 50px;
 }
 
 .spinner {
-- 
GitLab


From 7153195c8e6669ad5ef89341ab1cd0f1384cb1ea Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 30 Sep 2024 13:48:02 +0530
Subject: [PATCH 31/40] added vendor

---
 .gitlab-ci.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aee6bfba..75874474 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,20 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "populate-code-climate-default-config.yml"
-
+    
+build-vendor:
+  stage: build
+  extends: .composer:base
+  needs: ["build-frontend"]
+  before_script:
+    - composer install --no-dev
+  script:
+    - cp -a vendor dist/${APP_NAME}
+    - find dist/${APP_NAME} -type d -exec chmod 755 {} \;
+    - find dist/${APP_NAME} -type f -exec chmod 644 {} \;
+  artifacts:
+    paths:
+      - dist/
 deploy:staging:
   extends: .deploy:nextcloud-app
   rules:
-- 
GitLab


From d598d2695373840df3bcf4c63cc7be1f871a677c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 1 Oct 2024 11:50:43 +0530
Subject: [PATCH 32/40] second loader

---
 src/DeleteShopAccountSetting.vue | 3 +++
 src/delete-account-listeners.js  | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 6b9c0d1c..4e7367d4 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -62,6 +62,9 @@
 				</form>
 			</div>
 		</SettingsSection>
+		<div id="delete-my-account-loader" class="spinner-container">
+			<div class="spinner" /> <!-- Spinner component -->
+		</div>
 	</div>
 </template>
 
diff --git a/src/delete-account-listeners.js b/src/delete-account-listeners.js
index f5461b73..afb65519 100644
--- a/src/delete-account-listeners.js
+++ b/src/delete-account-listeners.js
@@ -4,16 +4,20 @@ document.addEventListener('DOMContentLoaded', function() {
 	const checkboxSpanSelector = '#delete-account-settings span.checkbox-radio-switch'
 	const disabledClass = 'checkbox-radio-switch--disabled'
 	const deleteAccountSectionId = '#delete-account-settings-section'
+	const deleteMyAccountLoader = '#delete-my-account-loader'
+
 	// Disable initially
 	document.querySelector(checkboxSelector).disabled = true
 	document.querySelector(buttonSelector).disabled = true
 	document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
 
 	const elem = document.getElementById('body-settings')
+	document.querySelector(deleteMyAccountLoader).style.visibility = 'visible'
 	elem.addEventListener('disable-delete-account', function() {
 	  document.querySelector(checkboxSelector).disabled = true
 	  document.querySelector(buttonSelector).disabled = true
 	  document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
+	  document.querySelector(deleteMyAccountLoader).style.visibility = 'visible'
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'hidden'
 	})
 
@@ -22,6 +26,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	  const enableDeleteAccount = document.querySelector(checkboxSelector).checked
 	  document.querySelector(buttonSelector).disabled = !enableDeleteAccount
 	  document.querySelector(checkboxSpanSelector).classList.remove(disabledClass)
+	  document.querySelector(deleteMyAccountLoader).style.visibility = 'hidden'
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'visible'
 	})
 })
-- 
GitLab


From 802ec2a3f7e88ae0681c58c320435bba166d0425 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 1 Oct 2024 12:10:43 +0530
Subject: [PATCH 33/40] second loader

---
 src/delete-account-listeners.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/delete-account-listeners.js b/src/delete-account-listeners.js
index afb65519..770867e4 100644
--- a/src/delete-account-listeners.js
+++ b/src/delete-account-listeners.js
@@ -12,12 +12,12 @@ document.addEventListener('DOMContentLoaded', function() {
 	document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
 
 	const elem = document.getElementById('body-settings')
-	document.querySelector(deleteMyAccountLoader).style.visibility = 'visible'
+	document.querySelector(deleteMyAccountLoader).style.display = 'block'
 	elem.addEventListener('disable-delete-account', function() {
 	  document.querySelector(checkboxSelector).disabled = true
 	  document.querySelector(buttonSelector).disabled = true
 	  document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
-	  document.querySelector(deleteMyAccountLoader).style.visibility = 'visible'
+	  document.querySelector(deleteMyAccountLoader).style.display = 'block'
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'hidden'
 	})
 
@@ -26,7 +26,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	  const enableDeleteAccount = document.querySelector(checkboxSelector).checked
 	  document.querySelector(buttonSelector).disabled = !enableDeleteAccount
 	  document.querySelector(checkboxSpanSelector).classList.remove(disabledClass)
-	  document.querySelector(deleteMyAccountLoader).style.visibility = 'hidden'
+	  document.querySelector(deleteMyAccountLoader).style.display = 'none'
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'visible'
 	})
 })
-- 
GitLab


From 12d2d1e64f89d320994befdadb4cefafab043fcb Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 1 Oct 2024 13:10:47 +0530
Subject: [PATCH 34/40] added extra css for display block

---
 src/DeleteShopAccountSetting.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 4e7367d4..83cf9cc3 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -320,4 +320,9 @@ input#shop-alternate-email:disabled {
         transform: rotate(360deg);
     }
 }
+#delete-my-account-loader {
+	margin-left: auto;
+    margin-right: auto;
+    width: 50%;
+}	
 </style>
-- 
GitLab


From 5ce675bbc97340c8524670147963c3585d7f163e Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 1 Oct 2024 13:17:04 +0530
Subject: [PATCH 35/40] lint fix

---
 src/DeleteShopAccountSetting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 83cf9cc3..7a8552f3 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -324,5 +324,5 @@ input#shop-alternate-email:disabled {
 	margin-left: auto;
     margin-right: auto;
     width: 50%;
-}	
+}
 </style>
-- 
GitLab


From 5a9d27ef5440ca88a899ed56543ec1d4c76f3686 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 1 Oct 2024 13:56:45 +0530
Subject: [PATCH 36/40] alignment fix

---
 src/DeleteShopAccountSetting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 7a8552f3..520dfd47 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -323,6 +323,6 @@ input#shop-alternate-email:disabled {
 #delete-my-account-loader {
 	margin-left: auto;
     margin-right: auto;
-    width: 50%;
+    width: 40px;
 }
 </style>
-- 
GitLab


From 13227fc5f9401dd2a9b39b791d81c204908b030a Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 1 Oct 2024 14:38:30 +0530
Subject: [PATCH 37/40] removed extra loader

---
 src/DeleteShopAccountSetting.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 520dfd47..cdb8409f 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,8 +1,5 @@
 <template>
 	<div>
-		<div v-if="isLoading" class="spinner-container">
-			<div class="spinner" /> <!-- Spinner component -->
-		</div>
 		<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
 			<div>
 				<p>
@@ -94,7 +91,6 @@ export default {
 			showError: false,
 			allowDelete: true,
 			ordersDescription: '',
-			isLoading: true,
 		}
 	},
 	computed: {
@@ -166,7 +162,6 @@ export default {
 		},
 		async getShopUsers() {
 			try {
-				this.isLoading = true
 				const url = generateUrl(
 					`/apps/${this.appName}/shop-accounts/users`,
 				)
@@ -181,8 +176,6 @@ export default {
 					)
 					this.allowDelete = false
 				}
-			} finally {
-				this.isLoading = false
 			}
 			this.disableOrEnableDeleteAccount()
 		},
-- 
GitLab


From 4eea8334a7158f34af8cc1ec02166fdedbc7d732 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 1 Oct 2024 15:10:26 +0530
Subject: [PATCH 38/40] used NCLoadingIcon

---
 src/DeleteShopAccountSetting.vue | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index cdb8409f..f7bf2b5a 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -60,7 +60,7 @@
 			</div>
 		</SettingsSection>
 		<div id="delete-my-account-loader" class="spinner-container">
-			<div class="spinner" /> <!-- Spinner component -->
+			<NcLoadingIcon :size="40" />
 		</div>
 	</div>
 </template>
@@ -72,6 +72,7 @@ import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 
 const APPLICATION_NAME = 'ecloud-accounts'
 
@@ -80,6 +81,7 @@ export default {
 	components: {
 		SettingsSection,
 		CheckboxRadioSwitch,
+		NcLoadingIcon,
 	},
 	data() {
 		return {
@@ -296,23 +298,6 @@ input#shop-alternate-email:disabled {
 	margin-top: 50px;
 }
 
-.spinner {
-    border: 4px solid rgba(0, 0, 0, 0.1);
-    border-left-color: var(--color-primary-element);
-    border-radius: 50%;
-    width: 40px;
-    height: 40px;
-    animation: spin 1s linear infinite;
-}
-
-@keyframes spin {
-    0% {
-        transform: rotate(0deg);
-    }
-    100% {
-        transform: rotate(360deg);
-    }
-}
 #delete-my-account-loader {
 	margin-left: auto;
     margin-right: auto;
-- 
GitLab


From 09c77a6b3c910fd957a1e5a102f5ff0850113b52 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 1 Oct 2024 15:49:15 +0530
Subject: [PATCH 39/40] css fix

---
 src/DeleteShopAccountSetting.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index f7bf2b5a..7c28a59c 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -291,16 +291,16 @@ input#shop-alternate-email:disabled {
 	background-color: unset;
 }
 .spinner-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100px;
 	margin-top: 50px;
 }
 
 #delete-my-account-loader {
 	margin-left: auto;
-    margin-right: auto;
-    width: 40px;
+	margin-right: auto;
+	width: 40px;
 }
 </style>
-- 
GitLab


From 7daaf6e862f991b05ac6c157c36ffbe254e26a1d Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 2 Oct 2024 16:09:13 +0530
Subject: [PATCH 40/40] revert pipeline change

---
 .gitlab-ci.yml | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75874474..08326169 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,10 @@
-
 stages:
   - test
   - build
   - performance
   - dast
   - deploy
-  
+
 variables:
     TO_PACKAGE: 'appinfo l10n lib templates js img css'
 include:
@@ -24,7 +23,7 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "populate-code-climate-default-config.yml"
-    
+
 build-vendor:
   stage: build
   extends: .composer:base
@@ -38,19 +37,3 @@ build-vendor:
   artifacts:
     paths:
       - dist/
-deploy:staging:
-  extends: .deploy:nextcloud-app
-  rules:
-    - if: $CI_COMMIT_BRANCH == "main"
-      when: manual
-    - if: $CI_COMMIT_BRANCH == "murena-main"
-      when: manual
-    - if: $CI_COMMIT_BRANCH == "production"
-      when: manual
-    - if: $CI_COMMIT_TAG
-      when: manual
-    - if: $CI_COMMIT_BRANCH == "dev/fix-slowness"
-      when: manual   
-  environment:
-    name: staging/01
-    url: $ENV_URL
-- 
GitLab