From 7df4f83351fa261671ae0f3d462ecff2db9612dc Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Wed, 3 May 2023 14:10:14 +0530
Subject: [PATCH 01/21] 3.1.0 version

---
 appinfo/info.xml  | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index a695b9fa..dc5aa25c 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -10,7 +10,7 @@
     <description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.
     It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.
     This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/package-lock.json b/package-lock.json
index a153f139..5077e57f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "ecloud-accounts",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "ecloud-accounts",
-			"version": "3.0.0",
+			"version": "3.1.0",
 			"dependencies": {
 				"@nextcloud/axios": "^2.1.0",
 				"@nextcloud/dialogs": "^3.2.0",
diff --git a/package.json b/package.json
index c3b7f007..83b8a14f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ecloud-accounts",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"description": "App for ecloud account management.",
 	"repository": {
 		"type": "git",
-- 
GitLab


From 671ecc707fe425b260009cd3d3dcaee1ac4b24a0 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Fri, 5 May 2023 01:56:36 +0530
Subject: [PATCH 02/21] vue code

---
 appinfo/routes.php                    |   8 +-
 css/style.css                         |  68 -------
 lib/Controller/BetaUserController.php |  29 ++-
 lib/Settings/BetaUserSetting.php      |  14 --
 src/BecomeBetaUser.vue                | 276 ++++++++++++++++++++++++++
 src/beta-user-setting.js              |  90 +--------
 templates/become_beta_user.php        |  29 +--
 templates/opt_out_beta_user.php       |  49 -----
 8 files changed, 316 insertions(+), 247 deletions(-)
 delete mode 100644 css/style.css
 create mode 100644 src/BecomeBetaUser.vue
 delete mode 100644 templates/opt_out_beta_user.php

diff --git a/appinfo/routes.php b/appinfo/routes.php
index b4eb6822..36a01f8b 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -16,14 +16,18 @@ return ['routes' => [
 	],
 	[
 		'name' => 'beta_user#remove_user_in_group',
-		'url' => '/beta/update', 'verb' => 'DELETE'
+		'url' => '/beta/remove', 'verb' => 'GET'
 	],
 	[
 		'name' => 'beta_user#add_user_in_group',
-		'url' => '/beta/update', 'verb' => 'POST'
+		'url' => '/beta/add', 'verb' => 'GET'
 	],
 	[
 		'name' => 'beta_user#submit_issue',
 		'url' => '/issue/submit', 'verb' => 'POST'
+	],
+	[
+		'name' => 'beta_user#check_user_in_group',
+		'url' => '/beta/check', 'verb' => 'GET'
 	]
 ]];
diff --git a/css/style.css b/css/style.css
deleted file mode 100644
index 1c850421..00000000
--- a/css/style.css
+++ /dev/null
@@ -1,68 +0,0 @@
-.alert {
-	position: relative;
-	margin-top: 1rem;
-	margin-bottom: 1rem;
-	border: 1px solid transparent;
-	border-radius: 0.25rem;
-	width: fit-content;
-}
-
-.alert-success {
-	color: #155724;
-	background-color: #d4edda;
-	border-color: #c3e6cb;
-	padding: 0.75rem 1.25rem;
-}
-
-.alert-fail {
-	color: #721c24;
-	background-color: #f8d7da;
-	border-color: #f5c6cb;
-	padding: 0.75rem 1.25rem;
-}
-
-#issue-submit-form #title,
-#issue-submit-form textarea {
-	width: 450px;
-}
-
-#issue-submit-form textarea {
-	height: 100px;
-}
-
-#issue-submit-form textarea:hover {
-	border-color: var(--color-primary-element) !important;
-}
-
-.mt-20 {
-	margin-top: 20px !important;
-}
-
-#beta-form .btn-optout {
-	background-color: white;
-	color: var(--color-delete);
-	border-color: var(--color-delete);
-}
-
-#beta-form .width300,
-#issue-submit-form .width300 {
-	width: 300px;
-}
-
-.color-red {
-	color: red;
-}
-
-ul.beta-apps {
-	list-style: none;
-	margin-left: 0;
-	padding-left: 1em;
-}
-
-ul.beta-apps > li:before {
-	display: inline-block;
-	content: '-';
-	width: 1em;
-	margin-left: -1em;
-}
-
diff --git a/lib/Controller/BetaUserController.php b/lib/Controller/BetaUserController.php
index ac6b06c6..70722202 100644
--- a/lib/Controller/BetaUserController.php
+++ b/lib/Controller/BetaUserController.php
@@ -15,7 +15,7 @@ use OCP\IUserSession;
 use OCP\ILogger;
 use OCP\Mail\IMailer;
 use OCP\Util;
-
+use OCP\App\IAppManager;
 class BetaUserController extends Controller {
 	protected $appName;
 	protected $request;
@@ -33,7 +33,8 @@ class BetaUserController extends Controller {
 		IUserManager $userManager,
 		IGroupManager $groupManager,
 		IUserSession $userSession,
-		IMailer $mailer
+		IMailer $mailer,
+		IAppManager $appManager
 	) {
 		parent::__construct($AppName, $request);
 		$this->appName = $AppName;
@@ -44,6 +45,7 @@ class BetaUserController extends Controller {
 		$this->userSession = $userSession;
 		$this->groupManager = $groupManager;
 		$this->mailer = $mailer;
+		$this->appManager = $appManager;
 	}
 
 	/**
@@ -101,4 +103,27 @@ class BetaUserController extends Controller {
 
 		return true;
 	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function checkUserInGroup() {
+		$uid = $this->userSession->getUser()->getUID();
+		$betaGroupName = $this->config->getSystemValue("beta_group_name");
+		$group = $this->groupManager->get($betaGroupName);
+		$betaGroupApps = $this->appManager->getEnabledAppsForGroup($group);
+		$betaApps = [];
+		foreach ($betaGroupApps as $app) {
+			$appEnabledGroups = $this->config->getAppValue($app, 'enabled', 'no');
+			if (str_contains($appEnabledGroups, $betaGroupName)) {
+				$info = $this->appManager->getAppInfo($app);
+				$betaApps[] = $info['name'];
+			}
+		}
+		if ($this->groupManager->isInGroup($uid, $betaGroupName)) {
+			return ['isBetaUser' => true, 'betaApps' => $betaApps];
+		}
+		return ['isBetaUser' => false, 'betaApps' => $betaApps];
+	}
 }
diff --git a/lib/Settings/BetaUserSetting.php b/lib/Settings/BetaUserSetting.php
index 696d9433..a5746fb1 100644
--- a/lib/Settings/BetaUserSetting.php
+++ b/lib/Settings/BetaUserSetting.php
@@ -49,22 +49,8 @@ class BetaUserSetting implements ISettings {
 	}
 
 	public function getForm(): TemplateResponse {
-		$uid = $this->userSession->getUser()->getUID();
-		$betaGroupName = $this->config->getSystemValue("beta_group_name");
 		$this->util->addScript($this->appName, $this->appName . '-beta-user-setting');
-		$group = $this->groupManager->get($betaGroupName);
-		$betaGroupApps = $this->appManager->getEnabledAppsForGroup($group);
 		$betaApps = [];
-		foreach ($betaGroupApps as $app) {
-			$appEnabledGroups = $this->config->getAppValue($app, 'enabled', 'no');
-			if (str_contains($appEnabledGroups, $betaGroupName)) {
-				$info = $this->appManager->getAppInfo($app);
-				$betaApps[] = $info['name'];
-			}
-		}
-		if ($this->groupManager->isInGroup($uid, $betaGroupName)) {
-			return new TemplateResponse($this->appName, 'opt_out_beta_user', ['betaApps' => $betaApps], '');
-		}
 		return new TemplateResponse($this->appName, 'become_beta_user', ['betaApps' => $betaApps], '');
 	}
 
diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
new file mode 100644
index 00000000..53c375ea
--- /dev/null
+++ b/src/BecomeBetaUser.vue
@@ -0,0 +1,276 @@
+<template>
+	<SettingsSection>
+		<div id="message" :class="messageClass" v-html="message" />
+		<div v-if="!isBetaUser" class="section">
+			<h2>
+				{{
+					t('ecloud-accounts', 'Do you want to become a beta user?')
+				}}
+			</h2>
+			<p class="settings-hint">
+				{{
+					t('ecloud-accounts', 'You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')
+				}}
+			</p>
+			<p class="settings-hint">
+				{{
+					t('ecloud-accounts', 'To get a preview of our new features you need to become part of our beta users.To do so, simply click on the button below.You can opt out of beta features at anytime.')
+				}}
+			</p>
+			<div id="groups" class="aliases-info">
+				<input type="button"
+					class="width300"
+					:value="becomeBetaUserButtonLabel"
+					@click="becomeBetaUser()">
+			</div>
+			<div class="margin-top-10">
+				<p class="settings-hint">
+					{{ t('ecloud-accounts', 'Here is the list of currently available beta features: ') }}
+				</p>
+				<ul class="beta-apps settings-hint">
+					<li v-for="app in betaApps" :key="app">
+						{{ app }}
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div v-if="isBetaUser" class="section">
+			<h2>
+				{{ t('ecloud-accounts','You are part of the beta users.') }}
+			</h2>
+			<p class="settings-hint">
+				{{ t('ecloud-accounts','Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.') }}
+			</p>
+			<div>
+				<p class="settings-hint">
+					{{ t('ecloud-accounts','Here is the list of currently available beta features:') }}
+				</p>
+				<ul class="beta-apps settings-hint">
+					<li v-for="app in betaApps" :key="app">
+						{{ app }}
+					</li>
+				</ul>
+			</div>
+			<form id="issue-submit-form" class="mt-20" @submit="submitFeedback">
+				<p>
+					<label id="title_label" for="title">
+						<b>
+							{{ t('ecloud-accounts','Title') }} <sup class="color-red">*</sup>
+						</b>
+					</label>
+				</p>
+				<p>
+					<input id="title"
+						v-model="title"
+						type="text"
+						:placeholder="summaryOfFeedbackPlaceholderText">
+				</p>
+				<p class="mt-20">
+					<label id="description_label" for="description">
+						<b>
+							{{ t('ecloud-accounts','Description') }} <sup class="color-red">*</sup>
+						</b>
+					</label>
+				</p>
+				<p>
+					<textarea id="description" v-model="description" :placeholder="moreDetailsPlaceholderText" />
+				</p>
+				<p class="mt-20">
+					<input type="submit"
+						:value="submitButtonLabel"
+						class="width300"
+						:disabled="isDisabled">
+				</p>
+			</form>
+			<p class="settings-hint mt-20">
+				{{ t('ecloud-accounts','Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!') }}
+			</p>
+
+			<div id="beta-form">
+				<input type="submit"
+					class="width300 btn-optout"
+					:value="optOutBetaUserButtonLabel"
+					@click="optOutFromBetaUser()">
+			</div>
+		</div>
+	</SettingsSection>
+</template>
+
+<script>
+import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection.js'
+import Axios from '@nextcloud/axios'
+import { generateUrl } from '@nextcloud/router'
+
+export default {
+	name: 'BecomeBetaUser',
+	components: {
+		SettingsSection,
+	},
+	data() {
+		return {
+			appName: 'ecloud-accounts',
+			summaryOfFeedbackPlaceholderText: t('ecloud-accounts', 'Summary of your feedback'),
+			moreDetailsPlaceholderText: t('ecloud-accounts', 'Please give us as many details as possible'),
+			becomeBetaUserButtonLabel: this.t('ecloud-accounts', 'Become a beta user'),
+			optOutBetaUserButtonLabel: t('ecloud-accounts', 'Opt out of beta features'),
+			submitButtonLabel: t('ecloud-accounts', 'Submit'),
+			loading: true,
+			isBetaUser: false,
+			betaApps: [],
+			title: '',
+			description: '',
+			messageClass: '',
+			message: '',
+		}
+	},
+	computed: {
+		isDisabled() {
+			return (this.description === '' || this.title === '')
+		},
+	},
+	created() {
+		try {
+			this.getBetaDetail()
+		} catch (e) {
+			console.error('Error fetching initial state', e)
+		}
+	},
+	methods: {
+		async getBetaDetail() {
+			try {
+				const url = generateUrl(
+					`/apps/${this.appName}/beta/check`
+				)
+				const { status, data } = await Axios.get(url)
+				if (status === 200) {
+					this.isBetaUser = data.isBetaUser
+					this.betaApps = data.betaApps
+				}
+				if (status === 400) {
+					this.enableDeleteAccountEvent()
+				}
+			} catch (e) {
+			}
+		},
+		async becomeBetaUser() {
+			try {
+				const url = generateUrl(
+					`/apps/${this.appName}/beta/add`
+				)
+				const { status } = await Axios.get(url)
+				if (status === 200) {
+					this.isBetaUser = true
+					this.message = t('ecloud-accounts', 'Congratulations! You\'ve successfully been added to the beta users.')
+					this.messageClass = 'alert-success'
+				}
+			} catch (e) {
+				this.message = t('ecloud-accounts', 'Something went wrong.')
+				this.messageClass = 'alert-fail'
+			}
+		},
+		async optOutFromBetaUser() {
+			try {
+				const url = generateUrl(
+					`/apps/${this.appName}/beta/remove`
+				)
+				const { status } = await Axios.get(url)
+				if (status === 200) {
+					this.isBetaUser = false
+					this.message = t('ecloud-accounts', 'You no longer have access to experimental features.')
+					this.messageClass = 'alert-success'
+				}
+			} catch (e) {
+				this.message = t('ecloud-accounts', 'Something went wrong.')
+				this.messageClass = 'alert-fail'
+			}
+		},
+		async submitFeedback(e) {
+			e.preventDefault()
+			try {
+				const url = generateUrl(
+					`/apps/${this.appName}/issue/submit`
+				)
+				const { status } = await Axios.post(url, { title: this.title, description: this.description })
+				if (status === 200) {
+					this.message = t('ecloud-accounts', 'Issue submitted successfully.')
+					this.messageClass = 'alert-success'
+					this.description = ''
+					this.title = ''
+				}
+			} catch (e) {
+				this.message = t('ecloud-accounts', 'Something went wrong.')
+				this.messageClass = 'alert-fail'
+			}
+		},
+	},
+}
+</script>
+<style>
+.alert {
+	position: relative;
+	margin-top: 1rem;
+	margin-bottom: 1rem;
+	border: 1px solid transparent;
+	border-radius: 0.25rem;
+	width: fit-content;
+}
+
+.alert-success {
+	color: #155724;
+	background-color: #d4edda;
+	border-color: #c3e6cb;
+	padding: 0.75rem 1.25rem;
+}
+
+.alert-fail {
+	color: #721c24;
+	background-color: #f8d7da;
+	border-color: #f5c6cb;
+	padding: 0.75rem 1.25rem;
+}
+
+#issue-submit-form #title,
+#issue-submit-form textarea {
+	width: 450px;
+}
+
+#issue-submit-form textarea {
+	height: 100px;
+}
+
+#issue-submit-form textarea:hover {
+	border-color: var(--color-primary-element) !important;
+}
+
+.mt-20 {
+	margin-top: 20px !important;
+}
+
+#beta-form .btn-optout {
+	background-color: white;
+	color: var(--color-delete);
+	border-color: var(--color-delete);
+}
+
+#beta-form .width300,
+#issue-submit-form .width300 {
+	width: 300px;
+}
+
+.color-red {
+	color: red;
+}
+
+ul.beta-apps {
+	list-style: none;
+	margin-left: 0;
+	padding-left: 1em;
+}
+
+ul.beta-apps > li:before {
+	display: inline-block;
+	content: '-';
+	width: 1em;
+	margin-left: -1em;
+}
+</style>
diff --git a/src/beta-user-setting.js b/src/beta-user-setting.js
index dc4aee17..06e3d92f 100644
--- a/src/beta-user-setting.js
+++ b/src/beta-user-setting.js
@@ -1,86 +1,8 @@
-/*
- * Copyright 2022 - Murena SAS - tous droits réservés
- */
-/* global $ */
-$(function() {
-	$('#beta-form').submit(function(event) {
-		event.preventDefault()
+import Vue from 'vue'
+import './common.js'
+import BecomeBetaUser from './BecomeBetaUser.vue'
 
-		$('#beta-form [type="submit"]').attr('disabled', true)
-		const registerType = $('#beta').val()
-		const url_ = OC.generateUrl('/apps/ecloud-accounts/beta/update')
-
-		$.ajax({
-			url: url_,
-			method: (registerType === 'deregister') ? 'DELETE' : 'POST',
-			success(result) {
-				let message_ = ''
-				if (result) {
-					if (registerType === 'deregister') {
-						message_ = t('ecloud-accounts', 'You no longer have access to experimental features.')
-					} else {
-						message_ = t('ecloud-accounts', 'Congratulations! You\'ve successfully been added to the beta users.')
-					}
-					$('#message').addClass('alert-success')
-				} else {
-					message_ = t('ecloud-accounts', 'Something went wrong.')
-					$('#message').addClass('alert-fail')
-				}
-				$('#message').html(message_)
-				setTimeout(function() {
-					window.location.reload()
-				}, 2000)
-			},
-			error(request, msg, error) {
-				$('#message').addClass('alert-fail')
-				$('#message').html(t('ecloud-accounts', 'Something went wrong here.'))
-			},
-		})
-	})
-
-	$('#title, #description').on('input', function() {
-		$(this).parent().find('.error-msg').remove()
-	})
-
-	$('#issue-submit-form').submit(function(event) {
-		event.preventDefault()
-
-		const url_ = OC.generateUrl('/apps/ecloud-accounts/issue/submit')
-		$('.error-msg').remove()
-		if ($('#title').val() === '' || $('#description').val() === '') {
-			if ($('#title').val() === '') {
-				$('#title').parent().append('<div class="error-msg color-red width300">' + t('ecloud-accounts', 'Title is mandatory.') + '</div>')
-			}
-			if ($('#description').val() === '') {
-				$('#description').parent().append('<div class="error-msg color-red width300">' + t('ecloud-accounts', 'Description is mandatory.') + '</div>')
-			}
-			return
-		}
-		$('#issue-submit-form [type="submit"]').attr('disabled', true)
-
-		$.ajax({
-			url: url_,
-			method: 'POST',
-			data: $(this).serializeArray(),
-			success(result) {
-				let message_ = ''
-				if (result) {
-					message_ = t('ecloud-accounts', 'Issue submitted successfully.')
-					$('#issue_message').addClass('alert-success')
-				} else {
-					message_ = t('ecloud-accounts', 'Something went wrong.')
-					$('#issue_message').addClass('alert-fail')
-				}
-				$('#issue_message').html(message_)
-				setTimeout(function() {
-					window.location.reload()
-				}, 2000)
-
-			},
-			error(request, msg, error) {
-				$('#issue_message').addClass('alert-fail')
-				$('#issue_message').html(t('ecloud-accounts', 'Something went wrong.'))
-			},
-		})
-	})
+export default new Vue({
+	el: '#become-beta-user',
+	render: h => h(BecomeBetaUser),
 })
diff --git a/templates/become_beta_user.php b/templates/become_beta_user.php
index 6d9b82b0..81bb79b0 100644
--- a/templates/become_beta_user.php
+++ b/templates/become_beta_user.php
@@ -1,28 +1 @@
-<?php
-style('ecloud-accounts', 'style');
-?>
-
-<div id="email-main">
-	<div id="email-content">
-		<div class="section">
-			<h2><?php p($l->t('Do you want to become a beta user?')); ?></h2>
-			<p class="settings-hint"><?php p($l->t('You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')) ?></p>
-			<p class="settings-hint"><?php p($l->t('To get a preview of our new features you need to become part of our beta users. To do so, simply click on the button below. You can opt out of beta features at anytime.')) ?></p>
-			<div id="groups" class="aliases-info">
-				<form id="beta-form">
-					<input name="beta" id="beta" type="hidden" value="register">
-					<input type="submit" class="width300" value="<?= p($l->t('Become a beta user')) ?>" />
-				</form>
-			</div>
-			<div id="message" class="alert"></div>
-			<div class="margin-top-10">
-				<p class="settings-hint"><?php p($l->t('Here is the list of currently available beta features:')) ?></p>
-				<ul class="beta-apps settings-hint">
-					<?php foreach ($betaApps as $app) { ?>
-					<li><?= $app ?></li>
-					<?php } ?>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
+<div id="become-beta-user"></div>
\ No newline at end of file
diff --git a/templates/opt_out_beta_user.php b/templates/opt_out_beta_user.php
deleted file mode 100644
index d77c7698..00000000
--- a/templates/opt_out_beta_user.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-style('ecloud-accounts', 'style');
-?>
-
-<div id="email-main">
-	<div id="email-content">
-		<div class="section">
-			<h2><?php p($l->t('You are part of the beta users.')); ?></h2>
-			<p class="settings-hint">
-				<?php p($l->t('Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.')); ?>
-			</p>
-			<div>
-				<p class="settings-hint"><?php p($l->t('Here is the list of currently available beta features:')) ?></p>
-				<ul class="beta-apps settings-hint">
-					<?php foreach ($betaApps as $app) { ?>
-						<li><?= $app ?></li>
-					<?php } ?>
-				</ul>
-			</div>
-			<form id="issue-submit-form" class="mt-20">
-				<p>
-					<label for="title" id="title_label"><b><?php p($l->t('Title')); ?> <sup class="color-red">*</sup></b></label>
-				</p>
-				<p>
-					<input type="text" id="title" name="title" placeholder="<?php p($l->t('Summary of your feedback')); ?>">
-				</p>
-				<p class="mt-20">
-					<label for="description" id="description_label"><b><?php p($l->t('Description')); ?> <sup class="color-red">*</sup></b></label>
-				</p>
-				<p>
-					<textarea id="description" name="description" placeholder="<?php p($l->t('Please give us as many details as possible')); ?>"></textarea>
-				</p>
-				<p class="mt-20">
-					<input type="submit" value="<?php p($l->t('Submit')) ?>" class="width300" />
-				</p>
-				<div id="issue_message" class="alert"></div>
-			</form>
-			<p class="settings-hint mt-20"><?php p($l->t('Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!')) ?></p>
-
-			<div id="groups" class="aliases-info">
-				<form id="beta-form">
-					<input name="beta" id="beta" type="hidden" value="deregister">
-					<input type="submit" class="width300 btn-optout" value="<?= p($l->t('Opt out of beta features')) ?>" />
-				</form>
-			</div>
-			<div id="message" class="alert"></div>
-		</div>
-	</div>
-</div>
-- 
GitLab


From 60659ffac5c2a021e0a7fc03b92a0df2e25d8ab7 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Fri, 5 May 2023 01:58:12 +0530
Subject: [PATCH 03/21] removed loader

---
 src/BecomeBetaUser.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index 53c375ea..c1eae8d4 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -114,7 +114,6 @@ export default {
 			becomeBetaUserButtonLabel: this.t('ecloud-accounts', 'Become a beta user'),
 			optOutBetaUserButtonLabel: t('ecloud-accounts', 'Opt out of beta features'),
 			submitButtonLabel: t('ecloud-accounts', 'Submit'),
-			loading: true,
 			isBetaUser: false,
 			betaApps: [],
 			title: '',
-- 
GitLab


From 5666a20604991642fb9e7b59bae8473c6137638a Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Fri, 5 May 2023 02:04:13 +0530
Subject: [PATCH 04/21] php fixer

---
 lib/Controller/BetaUserController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Controller/BetaUserController.php b/lib/Controller/BetaUserController.php
index 70722202..947ac6ce 100644
--- a/lib/Controller/BetaUserController.php
+++ b/lib/Controller/BetaUserController.php
@@ -16,6 +16,7 @@ use OCP\ILogger;
 use OCP\Mail\IMailer;
 use OCP\Util;
 use OCP\App\IAppManager;
+
 class BetaUserController extends Controller {
 	protected $appName;
 	protected $request;
-- 
GitLab


From 995c058ca2583cbf166e79997901baf545b68187 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Fri, 5 May 2023 02:07:03 +0530
Subject: [PATCH 05/21] removed css

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a29b6313..6119917f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-    TO_PACKAGE: 'appinfo css l10n lib templates js img'
+    TO_PACKAGE: 'appinfo l10n lib templates js img'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
-- 
GitLab


From 53cdf5fd0820dd73959cc7909669f47a594ee8f0 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Sat, 6 May 2023 09:41:50 +0530
Subject: [PATCH 06/21] added toast

---
 src/BecomeBetaUser.vue | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index c1eae8d4..de4db2fb 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -1,6 +1,5 @@
 <template>
 	<SettingsSection>
-		<div id="message" :class="messageClass" v-html="message" />
 		<div v-if="!isBetaUser" class="section">
 			<h2>
 				{{
@@ -100,6 +99,7 @@
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection.js'
 import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
+import { showSuccess, showError } from '@nextcloud/dialogs'
 
 export default {
 	name: 'BecomeBetaUser',
@@ -118,8 +118,6 @@ export default {
 			betaApps: [],
 			title: '',
 			description: '',
-			messageClass: '',
-			message: '',
 		}
 	},
 	computed: {
@@ -159,12 +157,10 @@ export default {
 				const { status } = await Axios.get(url)
 				if (status === 200) {
 					this.isBetaUser = true
-					this.message = t('ecloud-accounts', 'Congratulations! You\'ve successfully been added to the beta users.')
-					this.messageClass = 'alert-success'
+					showSuccess(t('ecloud-accounts', 'Congratulations! You\'ve successfully been added to the beta users.'))
 				}
 			} catch (e) {
-				this.message = t('ecloud-accounts', 'Something went wrong.')
-				this.messageClass = 'alert-fail'
+				showError(t('ecloud-accounts', 'Something went wrong.'))
 			}
 		},
 		async optOutFromBetaUser() {
@@ -175,12 +171,10 @@ export default {
 				const { status } = await Axios.get(url)
 				if (status === 200) {
 					this.isBetaUser = false
-					this.message = t('ecloud-accounts', 'You no longer have access to experimental features.')
-					this.messageClass = 'alert-success'
+					showSuccess(t('ecloud-accounts', 'You no longer have access to experimental features.'))
 				}
 			} catch (e) {
-				this.message = t('ecloud-accounts', 'Something went wrong.')
-				this.messageClass = 'alert-fail'
+				showError(t('ecloud-accounts', 'Something went wrong.'))
 			}
 		},
 		async submitFeedback(e) {
@@ -191,14 +185,12 @@ export default {
 				)
 				const { status } = await Axios.post(url, { title: this.title, description: this.description })
 				if (status === 200) {
-					this.message = t('ecloud-accounts', 'Issue submitted successfully.')
-					this.messageClass = 'alert-success'
+					showSuccess(t('ecloud-accounts', 'Issue submitted successfully.'))
 					this.description = ''
 					this.title = ''
 				}
 			} catch (e) {
-				this.message = t('ecloud-accounts', 'Something went wrong.')
-				this.messageClass = 'alert-fail'
+				showError(t('ecloud-accounts', 'Something went wrong.'))
 			}
 		},
 	},
-- 
GitLab


From e714a67cba956e5c6f73819e6e4fce35e2f05582 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Sat, 6 May 2023 09:54:40 +0530
Subject: [PATCH 07/21] added loader

---
 lib/Controller/BetaUserController.php        |   2 +
 lib/Settings/BetaUserSetting.php             |   3 +-
 src/BecomeBetaUser.vue                       | 181 ++++++++++---------
 templates/{become_beta_user.php => beta.php} |   0
 4 files changed, 99 insertions(+), 87 deletions(-)
 rename templates/{become_beta_user.php => beta.php} (100%)

diff --git a/lib/Controller/BetaUserController.php b/lib/Controller/BetaUserController.php
index 947ac6ce..6dd115ed 100644
--- a/lib/Controller/BetaUserController.php
+++ b/lib/Controller/BetaUserController.php
@@ -25,6 +25,8 @@ class BetaUserController extends Controller {
 	protected $groupManager;
 	protected $mailer;
 	private $userSession;
+	private $appManager;
+	private $logger;
 
 	public function __construct(
 		$AppName,
diff --git a/lib/Settings/BetaUserSetting.php b/lib/Settings/BetaUserSetting.php
index a5746fb1..8e2568c9 100644
--- a/lib/Settings/BetaUserSetting.php
+++ b/lib/Settings/BetaUserSetting.php
@@ -50,8 +50,7 @@ class BetaUserSetting implements ISettings {
 
 	public function getForm(): TemplateResponse {
 		$this->util->addScript($this->appName, $this->appName . '-beta-user-setting');
-		$betaApps = [];
-		return new TemplateResponse($this->appName, 'become_beta_user', ['betaApps' => $betaApps], '');
+		return new TemplateResponse($this->appName, 'beta');
 	}
 
 	public function getSection(): ?string {
diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index de4db2fb..d105f719 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -1,95 +1,102 @@
 <template>
 	<SettingsSection>
-		<div v-if="!isBetaUser" class="section">
-			<h2>
-				{{
-					t('ecloud-accounts', 'Do you want to become a beta user?')
-				}}
-			</h2>
-			<p class="settings-hint">
-				{{
-					t('ecloud-accounts', 'You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')
-				}}
-			</p>
-			<p class="settings-hint">
-				{{
-					t('ecloud-accounts', 'To get a preview of our new features you need to become part of our beta users.To do so, simply click on the button below.You can opt out of beta features at anytime.')
-				}}
-			</p>
-			<div id="groups" class="aliases-info">
-				<input type="button"
-					class="width300"
-					:value="becomeBetaUserButtonLabel"
-					@click="becomeBetaUser()">
-			</div>
-			<div class="margin-top-10">
+		<p v-if="loading">
+			{{
+				t('ecloud-accounts', 'Loading...')
+			}}
+		</p>
+		<div v-else>
+			<div v-if="!isBetaUser" class="section padding-0">
+				<h2>
+					{{
+						t('ecloud-accounts', 'Do you want to become a beta user?')
+					}}
+				</h2>
 				<p class="settings-hint">
-					{{ t('ecloud-accounts', 'Here is the list of currently available beta features: ') }}
+					{{
+						t('ecloud-accounts', 'You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')
+					}}
 				</p>
-				<ul class="beta-apps settings-hint">
-					<li v-for="app in betaApps" :key="app">
-						{{ app }}
-					</li>
-				</ul>
-			</div>
-		</div>
-		<div v-if="isBetaUser" class="section">
-			<h2>
-				{{ t('ecloud-accounts','You are part of the beta users.') }}
-			</h2>
-			<p class="settings-hint">
-				{{ t('ecloud-accounts','Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.') }}
-			</p>
-			<div>
 				<p class="settings-hint">
-					{{ t('ecloud-accounts','Here is the list of currently available beta features:') }}
+					{{
+						t('ecloud-accounts', 'To get a preview of our new features you need to become part of our beta users.To do so, simply click on the button below.You can opt out of beta features at anytime.')
+					}}
 				</p>
-				<ul class="beta-apps settings-hint">
-					<li v-for="app in betaApps" :key="app">
-						{{ app }}
-					</li>
-				</ul>
+				<div id="groups" class="aliases-info">
+					<input type="button"
+						class="width300"
+						:value="becomeBetaUserButtonLabel"
+						@click="becomeBetaUser()">
+				</div>
+				<div class="margin-top-10">
+					<p class="settings-hint">
+						{{ t('ecloud-accounts', 'Here is the list of currently available beta features: ') }}
+					</p>
+					<ul class="beta-apps settings-hint">
+						<li v-for="app in betaApps" :key="app">
+							{{ app }}
+						</li>
+					</ul>
+				</div>
 			</div>
-			<form id="issue-submit-form" class="mt-20" @submit="submitFeedback">
-				<p>
-					<label id="title_label" for="title">
-						<b>
-							{{ t('ecloud-accounts','Title') }} <sup class="color-red">*</sup>
-						</b>
-					</label>
-				</p>
-				<p>
-					<input id="title"
-						v-model="title"
-						type="text"
-						:placeholder="summaryOfFeedbackPlaceholderText">
-				</p>
-				<p class="mt-20">
-					<label id="description_label" for="description">
-						<b>
-							{{ t('ecloud-accounts','Description') }} <sup class="color-red">*</sup>
-						</b>
-					</label>
-				</p>
-				<p>
-					<textarea id="description" v-model="description" :placeholder="moreDetailsPlaceholderText" />
+			<div v-if="isBetaUser" class="section padding-0">
+				<h2>
+					{{ t('ecloud-accounts','You are part of the beta users.') }}
+				</h2>
+				<p class="settings-hint">
+					{{ t('ecloud-accounts','Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.') }}
 				</p>
-				<p class="mt-20">
-					<input type="submit"
-						:value="submitButtonLabel"
-						class="width300"
-						:disabled="isDisabled">
+				<div>
+					<p class="settings-hint">
+						{{ t('ecloud-accounts','Here is the list of currently available beta features:') }}
+					</p>
+					<ul class="beta-apps settings-hint">
+						<li v-for="app in betaApps" :key="app">
+							{{ app }}
+						</li>
+					</ul>
+				</div>
+				<form id="issue-submit-form" class="mt-20" @submit="submitFeedback">
+					<p>
+						<label id="title_label" for="title">
+							<b>
+								{{ t('ecloud-accounts','Title') }} <sup class="color-red">*</sup>
+							</b>
+						</label>
+					</p>
+					<p>
+						<input id="title"
+							v-model="title"
+							type="text"
+							:placeholder="summaryOfFeedbackPlaceholderText">
+					</p>
+					<p class="mt-20">
+						<label id="description_label" for="description">
+							<b>
+								{{ t('ecloud-accounts','Description') }} <sup class="color-red">*</sup>
+							</b>
+						</label>
+					</p>
+					<p>
+						<textarea id="description" v-model="description" :placeholder="moreDetailsPlaceholderText" />
+					</p>
+					<p class="mt-20">
+						<input type="submit"
+							:value="submitButtonLabel"
+							class="width300"
+							:disabled="isDisabled">
+					</p>
+				</form>
+				<p class="settings-hint mt-20">
+					{{ t('ecloud-accounts','Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!') }}
 				</p>
-			</form>
-			<p class="settings-hint mt-20">
-				{{ t('ecloud-accounts','Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!') }}
-			</p>
 
-			<div id="beta-form">
-				<input type="submit"
-					class="width300 btn-optout"
-					:value="optOutBetaUserButtonLabel"
-					@click="optOutFromBetaUser()">
+				<div id="beta-form">
+					<input type="submit"
+						class="width300 btn-optout"
+						:value="optOutBetaUserButtonLabel"
+						@click="optOutFromBetaUser()">
+				</div>
 			</div>
 		</div>
 	</SettingsSection>
@@ -118,6 +125,7 @@ export default {
 			betaApps: [],
 			title: '',
 			description: '',
+			loading: true,
 		}
 	},
 	computed: {
@@ -143,10 +151,9 @@ export default {
 					this.isBetaUser = data.isBetaUser
 					this.betaApps = data.betaApps
 				}
-				if (status === 400) {
-					this.enableDeleteAccountEvent()
-				}
+				this.loading = false
 			} catch (e) {
+				this.loading = false
 			}
 		},
 		async becomeBetaUser() {
@@ -264,4 +271,8 @@ ul.beta-apps > li:before {
 	width: 1em;
 	margin-left: -1em;
 }
+
+.padding-0{
+	padding: 0;
+}
 </style>
diff --git a/templates/become_beta_user.php b/templates/beta.php
similarity index 100%
rename from templates/become_beta_user.php
rename to templates/beta.php
-- 
GitLab


From 1852c57ee07b7299ee3f941c85504f679bf4a233 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Mon, 8 May 2023 23:19:14 -0700
Subject: [PATCH 08/21] added load and removed api

---
 appinfo/routes.php                    |   4 -
 lib/Controller/BetaUserController.php |  33 +----
 lib/Service/BetaUserService.php       |  48 +++++++
 lib/Settings/BetaUserSetting.php      |  33 ++---
 src/BecomeBetaUser.vue                | 189 ++++++++++++--------------
 5 files changed, 147 insertions(+), 160 deletions(-)
 create mode 100644 lib/Service/BetaUserService.php

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 36a01f8b..24d57502 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -25,9 +25,5 @@ return ['routes' => [
 	[
 		'name' => 'beta_user#submit_issue',
 		'url' => '/issue/submit', 'verb' => 'POST'
-	],
-	[
-		'name' => 'beta_user#check_user_in_group',
-		'url' => '/beta/check', 'verb' => 'GET'
 	]
 ]];
diff --git a/lib/Controller/BetaUserController.php b/lib/Controller/BetaUserController.php
index 6dd115ed..1f92f0d6 100644
--- a/lib/Controller/BetaUserController.php
+++ b/lib/Controller/BetaUserController.php
@@ -12,10 +12,8 @@ use OCP\IConfig;
 use OCP\IUserManager;
 use OCP\IGroupManager;
 use OCP\IUserSession;
-use OCP\ILogger;
 use OCP\Mail\IMailer;
 use OCP\Util;
-use OCP\App\IAppManager;
 
 class BetaUserController extends Controller {
 	protected $appName;
@@ -25,30 +23,24 @@ class BetaUserController extends Controller {
 	protected $groupManager;
 	protected $mailer;
 	private $userSession;
-	private $appManager;
-	private $logger;
 
 	public function __construct(
 		$AppName,
 		IRequest $request,
 		IConfig $config,
-		ILogger $logger,
 		IUserManager $userManager,
 		IGroupManager $groupManager,
 		IUserSession $userSession,
-		IMailer $mailer,
-		IAppManager $appManager
+		IMailer $mailer
 	) {
 		parent::__construct($AppName, $request);
 		$this->appName = $AppName;
 		$this->request = $request;
 		$this->config = $config;
-		$this->logger = $logger;
 		$this->userManager = $userManager;
 		$this->userSession = $userSession;
 		$this->groupManager = $groupManager;
 		$this->mailer = $mailer;
-		$this->appManager = $appManager;
 	}
 
 	/**
@@ -106,27 +98,4 @@ class BetaUserController extends Controller {
 
 		return true;
 	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function checkUserInGroup() {
-		$uid = $this->userSession->getUser()->getUID();
-		$betaGroupName = $this->config->getSystemValue("beta_group_name");
-		$group = $this->groupManager->get($betaGroupName);
-		$betaGroupApps = $this->appManager->getEnabledAppsForGroup($group);
-		$betaApps = [];
-		foreach ($betaGroupApps as $app) {
-			$appEnabledGroups = $this->config->getAppValue($app, 'enabled', 'no');
-			if (str_contains($appEnabledGroups, $betaGroupName)) {
-				$info = $this->appManager->getAppInfo($app);
-				$betaApps[] = $info['name'];
-			}
-		}
-		if ($this->groupManager->isInGroup($uid, $betaGroupName)) {
-			return ['isBetaUser' => true, 'betaApps' => $betaApps];
-		}
-		return ['isBetaUser' => false, 'betaApps' => $betaApps];
-	}
 }
diff --git a/lib/Service/BetaUserService.php b/lib/Service/BetaUserService.php
new file mode 100644
index 00000000..6591c390
--- /dev/null
+++ b/lib/Service/BetaUserService.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Service;
+
+use OCP\IConfig;
+use OCP\IGroupManager;
+use OCP\IUserSession;
+use OCP\App\IAppManager;
+
+class BetaUserService {
+	private $config;
+	private $appManager;
+	protected $groupManager;
+	private $userSession;
+
+	public function __construct(
+		IConfig $config,
+		IGroupManager $groupManager,
+		IUserSession $userSession,
+		IAppManager $appManager
+	) {
+		$this->config = $config;
+		$this->groupManager = $groupManager;
+		$this->userSession = $userSession;
+		$this->appManager = $appManager;
+	}
+
+	public function getBetaUserStatusAndApps() {
+		$uid = $this->userSession->getUser()->getUID();
+		$betaGroupName = $this->config->getSystemValue("beta_group_name");
+		$group = $this->groupManager->get($betaGroupName);
+		$betaGroupApps = $this->appManager->getEnabledAppsForGroup($group);
+		$betaApps = [];
+		foreach ($betaGroupApps as $app) {
+			$appEnabledGroups = $this->config->getAppValue($app, 'enabled', 'no');
+			if (str_contains($appEnabledGroups, $betaGroupName)) {
+				$info = $this->appManager->getAppInfo($app);
+				$betaApps[] = $info['name'];
+			}
+		}
+		if ($this->groupManager->isInGroup($uid, $betaGroupName)) {
+			return ['isBetaUser' => true, 'betaApps' => $betaApps];
+		}
+		return ['isBetaUser' => false, 'betaApps' => $betaApps];
+	}
+}
diff --git a/lib/Settings/BetaUserSetting.php b/lib/Settings/BetaUserSetting.php
index 8e2568c9..6b2c6bf5 100644
--- a/lib/Settings/BetaUserSetting.php
+++ b/lib/Settings/BetaUserSetting.php
@@ -6,49 +6,44 @@ namespace OCA\EcloudAccounts\Settings;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IGroupManager;
-use OCP\IUserSession;
 use OCP\Settings\ISettings;
 use OCP\Util;
 use OCP\IConfig;
-use OCP\App\IAppManager;
 use OCP\ILogger;
+use OCP\AppFramework\Services\IInitialState;
+use OCA\EcloudAccounts\Service\BetaUserService;
 
 class BetaUserSetting implements ISettings {
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IGroupManager */
 	protected $groupManager;
-
-	/** @var Util */
 	protected $util;
-
-	private $appName;
-
-	private $appManager;
-
-	/** @var ILogger */
 	private $logger;
+	private $initialState;
+	private $config;
+	private $appName;
+	private $betaUserService;
 
 	public function __construct(
 		$appName,
-		IUserSession $userSession,
 		IGroupManager $groupManager,
 		Util $util,
 		IConfig $config,
-		IAppManager $appManager,
-		ILogger $logger
+		ILogger $logger,
+		IInitialState $initialState,
+		BetaUserService $betaUserService
 	) {
-		$this->userSession = $userSession;
 		$this->groupManager = $groupManager;
 		$this->appName = $appName;
 		$this->config = $config;
 		$this->util = $util;
-		$this->appManager = $appManager;
 		$this->logger = $logger;
+		$this->initialState = $initialState;
+		$this->betaUserService = $betaUserService;
 	}
 
 	public function getForm(): TemplateResponse {
+		$betaDetails = $this->betaUserService->getBetaUserStatusAndApps();
+		$this->initialState->provideInitialState('is_beta_user', $betaDetails['isBetaUser']);
+		$this->initialState->provideInitialState('beta_apps', $betaDetails['betaApps']);
 		$this->util->addScript($this->appName, $this->appName . '-beta-user-setting');
 		return new TemplateResponse($this->appName, 'beta');
 	}
diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index d105f719..fd1ee515 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -1,108 +1,101 @@
 <template>
 	<SettingsSection>
-		<p v-if="loading">
-			{{
-				t('ecloud-accounts', 'Loading...')
-			}}
-		</p>
-		<div v-else>
-			<div v-if="!isBetaUser" class="section padding-0">
-				<h2>
-					{{
-						t('ecloud-accounts', 'Do you want to become a beta user?')
-					}}
-				</h2>
+		<div v-if="!isBetaUser" class="section padding-0">
+			<h2>
+				{{
+					t('ecloud-accounts', 'Do you want to become a beta user?')
+				}}
+			</h2>
+			<p class="settings-hint">
+				{{
+					t('ecloud-accounts', 'You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')
+				}}
+			</p>
+			<p class="settings-hint">
+				{{
+					t('ecloud-accounts', 'To get a preview of our new features you need to become part of our beta users.To do so, simply click on the button below.You can opt out of beta features at anytime.')
+				}}
+			</p>
+			<div id="groups" class="aliases-info">
+				<input type="button"
+					class="width300"
+					:value="becomeBetaUserButtonLabel"
+					@click="becomeBetaUser()">
+			</div>
+			<div class="margin-top-10">
 				<p class="settings-hint">
-					{{
-						t('ecloud-accounts', 'You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')
-					}}
+					{{ t('ecloud-accounts', 'Here is the list of currently available beta features: ') }}
 				</p>
+				<ul class="beta-apps settings-hint">
+					<li v-for="app in betaApps" :key="app">
+						{{ app }}
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div v-if="isBetaUser" class="section padding-0">
+			<h2>
+				{{ t('ecloud-accounts','You are part of the beta users.') }}
+			</h2>
+			<p class="settings-hint">
+				{{ t('ecloud-accounts','Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.') }}
+			</p>
+			<div>
 				<p class="settings-hint">
-					{{
-						t('ecloud-accounts', 'To get a preview of our new features you need to become part of our beta users.To do so, simply click on the button below.You can opt out of beta features at anytime.')
-					}}
+					{{ t('ecloud-accounts','Here is the list of currently available beta features:') }}
 				</p>
-				<div id="groups" class="aliases-info">
-					<input type="button"
-						class="width300"
-						:value="becomeBetaUserButtonLabel"
-						@click="becomeBetaUser()">
-				</div>
-				<div class="margin-top-10">
-					<p class="settings-hint">
-						{{ t('ecloud-accounts', 'Here is the list of currently available beta features: ') }}
-					</p>
-					<ul class="beta-apps settings-hint">
-						<li v-for="app in betaApps" :key="app">
-							{{ app }}
-						</li>
-					</ul>
-				</div>
+				<ul class="beta-apps settings-hint">
+					<li v-for="app in betaApps" :key="app">
+						{{ app }}
+					</li>
+				</ul>
 			</div>
-			<div v-if="isBetaUser" class="section padding-0">
-				<h2>
-					{{ t('ecloud-accounts','You are part of the beta users.') }}
-				</h2>
-				<p class="settings-hint">
-					{{ t('ecloud-accounts','Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.') }}
+			<form id="issue-submit-form" class="mt-20" @submit="submitFeedback">
+				<p>
+					<label id="title_label" for="title">
+						<b>
+							{{ t('ecloud-accounts','Title') }} <sup class="color-red">*</sup>
+						</b>
+					</label>
 				</p>
-				<div>
-					<p class="settings-hint">
-						{{ t('ecloud-accounts','Here is the list of currently available beta features:') }}
-					</p>
-					<ul class="beta-apps settings-hint">
-						<li v-for="app in betaApps" :key="app">
-							{{ app }}
-						</li>
-					</ul>
-				</div>
-				<form id="issue-submit-form" class="mt-20" @submit="submitFeedback">
-					<p>
-						<label id="title_label" for="title">
-							<b>
-								{{ t('ecloud-accounts','Title') }} <sup class="color-red">*</sup>
-							</b>
-						</label>
-					</p>
-					<p>
-						<input id="title"
-							v-model="title"
-							type="text"
-							:placeholder="summaryOfFeedbackPlaceholderText">
-					</p>
-					<p class="mt-20">
-						<label id="description_label" for="description">
-							<b>
-								{{ t('ecloud-accounts','Description') }} <sup class="color-red">*</sup>
-							</b>
-						</label>
-					</p>
-					<p>
-						<textarea id="description" v-model="description" :placeholder="moreDetailsPlaceholderText" />
-					</p>
-					<p class="mt-20">
-						<input type="submit"
-							:value="submitButtonLabel"
-							class="width300"
-							:disabled="isDisabled">
-					</p>
-				</form>
-				<p class="settings-hint mt-20">
-					{{ t('ecloud-accounts','Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!') }}
+				<p>
+					<input id="title"
+						v-model="title"
+						type="text"
+						:placeholder="summaryOfFeedbackPlaceholderText">
 				</p>
-
-				<div id="beta-form">
+				<p class="mt-20">
+					<label id="description_label" for="description">
+						<b>
+							{{ t('ecloud-accounts','Description') }} <sup class="color-red">*</sup>
+						</b>
+					</label>
+				</p>
+				<p>
+					<textarea id="description" v-model="description" :placeholder="moreDetailsPlaceholderText" />
+				</p>
+				<p class="mt-20">
 					<input type="submit"
-						class="width300 btn-optout"
-						:value="optOutBetaUserButtonLabel"
-						@click="optOutFromBetaUser()">
-				</div>
+						:value="submitButtonLabel"
+						class="width300"
+						:disabled="isDisabled">
+				</p>
+			</form>
+			<p class="settings-hint mt-20">
+				{{ t('ecloud-accounts','Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!') }}
+			</p>
+			<div id="beta-form">
+				<input type="submit"
+					class="width300 btn-optout"
+					:value="optOutBetaUserButtonLabel"
+					@click="optOutFromBetaUser()">
 			</div>
 		</div>
 	</SettingsSection>
 </template>
 
 <script>
+import { loadState } from '@nextcloud/initial-state'
 import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection.js'
 import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
@@ -135,27 +128,13 @@ export default {
 	},
 	created() {
 		try {
-			this.getBetaDetail()
+			this.isBetaUser = loadState(this.appName, 'is_beta_user')
+			this.betaApps = loadState(this.appName, 'beta_apps')
 		} catch (e) {
 			console.error('Error fetching initial state', e)
 		}
 	},
 	methods: {
-		async getBetaDetail() {
-			try {
-				const url = generateUrl(
-					`/apps/${this.appName}/beta/check`
-				)
-				const { status, data } = await Axios.get(url)
-				if (status === 200) {
-					this.isBetaUser = data.isBetaUser
-					this.betaApps = data.betaApps
-				}
-				this.loading = false
-			} catch (e) {
-				this.loading = false
-			}
-		},
 		async becomeBetaUser() {
 			try {
 				const url = generateUrl(
-- 
GitLab


From fd6ab476d0d04812c80193f9e3a96021d3c5e246 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Mon, 8 May 2023 23:29:16 -0700
Subject: [PATCH 09/21] beta apps

---
 lib/Service/BetaUserService.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/Service/BetaUserService.php b/lib/Service/BetaUserService.php
index 6591c390..b6226301 100644
--- a/lib/Service/BetaUserService.php
+++ b/lib/Service/BetaUserService.php
@@ -26,7 +26,12 @@ class BetaUserService {
 		$this->userSession = $userSession;
 		$this->appManager = $appManager;
 	}
-
+	
+	/**
+	 * Method getBetaUserStatusAndApps is used to get beta user status and beta apps
+	 *
+	 * @return void
+	 */
 	public function getBetaUserStatusAndApps() {
 		$uid = $this->userSession->getUser()->getUID();
 		$betaGroupName = $this->config->getSystemValue("beta_group_name");
-- 
GitLab


From 3657bad8056a47b81fd7b7111e4103711665e9e6 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Mon, 8 May 2023 23:35:03 -0700
Subject: [PATCH 10/21] added two methods instead one

---
 lib/Service/BetaUserService.php  | 24 +++++++++++++++++-------
 lib/Settings/BetaUserSetting.php |  7 ++++---
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/lib/Service/BetaUserService.php b/lib/Service/BetaUserService.php
index b6226301..3f6f84d2 100644
--- a/lib/Service/BetaUserService.php
+++ b/lib/Service/BetaUserService.php
@@ -26,14 +26,27 @@ class BetaUserService {
 		$this->userSession = $userSession;
 		$this->appManager = $appManager;
 	}
-	
+		
 	/**
-	 * Method getBetaUserStatusAndApps is used to get beta user status and beta apps
+	 * Method getBetaUserStatus used to get beta user status
 	 *
 	 * @return void
 	 */
-	public function getBetaUserStatusAndApps() {
+	public function getBetaUserStatus() {
 		$uid = $this->userSession->getUser()->getUID();
+		$betaGroupName = $this->config->getSystemValue("beta_group_name");
+		if ($this->groupManager->isInGroup($uid, $betaGroupName)) {
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Method getBetaApps used to get beta apps
+	 *
+	 * @return void
+	 */
+	public function getBetaApps() {
 		$betaGroupName = $this->config->getSystemValue("beta_group_name");
 		$group = $this->groupManager->get($betaGroupName);
 		$betaGroupApps = $this->appManager->getEnabledAppsForGroup($group);
@@ -45,9 +58,6 @@ class BetaUserService {
 				$betaApps[] = $info['name'];
 			}
 		}
-		if ($this->groupManager->isInGroup($uid, $betaGroupName)) {
-			return ['isBetaUser' => true, 'betaApps' => $betaApps];
-		}
-		return ['isBetaUser' => false, 'betaApps' => $betaApps];
+		return $betaApps;
 	}
 }
diff --git a/lib/Settings/BetaUserSetting.php b/lib/Settings/BetaUserSetting.php
index 6b2c6bf5..0597effe 100644
--- a/lib/Settings/BetaUserSetting.php
+++ b/lib/Settings/BetaUserSetting.php
@@ -41,9 +41,10 @@ class BetaUserSetting implements ISettings {
 	}
 
 	public function getForm(): TemplateResponse {
-		$betaDetails = $this->betaUserService->getBetaUserStatusAndApps();
-		$this->initialState->provideInitialState('is_beta_user', $betaDetails['isBetaUser']);
-		$this->initialState->provideInitialState('beta_apps', $betaDetails['betaApps']);
+		$betaUserStatus = $this->betaUserService->getBetaUserStatus();
+		$betaApps = $this->betaUserService->getBetaApps();
+		$this->initialState->provideInitialState('is_beta_user', $betaUserStatus);
+		$this->initialState->provideInitialState('beta_apps', $betaApps);
 		$this->util->addScript($this->appName, $this->appName . '-beta-user-setting');
 		return new TemplateResponse($this->appName, 'beta');
 	}
-- 
GitLab


From 0764f304f7aacc833ead86e60a3e61f7d56db620 Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Mon, 8 May 2023 12:32:04 +0000
Subject: [PATCH 11/21] TOS User registration data store

---
 lib/Controller/UserController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index dd87f13e..975e7aa7 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -65,7 +65,7 @@ class UserController extends ApiController {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB'): DataResponse {
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', bool $tosAccepted = false): DataResponse {
 		$response = new DataResponse();
 
 		if (!$this->checkAppCredentials($token)) {
@@ -87,7 +87,7 @@ class UserController extends ApiController {
 
 		$user->setEMailAddress($email);
 		$user->setQuota($quota);
-
+		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', intval($tosAccepted));
 		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		if (!$recoveryEmailUpdated) {
 			return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-- 
GitLab


From baef67dbff171b8bc13cf57c81343dac089d5c53 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Tue, 9 May 2023 16:05:15 -0700
Subject: [PATCH 12/21] temp change

---
 lib/Controller/BetaUserController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Controller/BetaUserController.php b/lib/Controller/BetaUserController.php
index 1f92f0d6..d635b0e8 100644
--- a/lib/Controller/BetaUserController.php
+++ b/lib/Controller/BetaUserController.php
@@ -82,7 +82,6 @@ class BetaUserController extends Controller {
 		$fromEmail = $user->getEMailAddress();
 		$fromName = $user->getDisplayName();
 
-
 		$template = $this->mailer->createEMailTemplate('betauser.SubmitGitIssue', []);
 		$template->addHeader();
 		$template->setSubject($title);
-- 
GitLab


From 465968d5d6f61e62a94e5e7e5c0e3e1bb4fffa2c Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Tue, 9 May 2023 16:11:39 -0700
Subject: [PATCH 13/21] temo

---
 lib/Controller/BetaUserController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Controller/BetaUserController.php b/lib/Controller/BetaUserController.php
index d635b0e8..be1b970f 100644
--- a/lib/Controller/BetaUserController.php
+++ b/lib/Controller/BetaUserController.php
@@ -94,7 +94,6 @@ class BetaUserController extends Controller {
 		$message->useTemplate($template);
 
 		$this->mailer->send($message);
-
 		return true;
 	}
 }
-- 
GitLab


From 0b653eff5e01a37778ab8963e95d442e070fddc9 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Fri, 12 May 2023 00:47:51 -0700
Subject: [PATCH 14/21] added script in template

---
 lib/Settings/BetaUserSetting.php | 7 +------
 templates/beta.php               | 3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/Settings/BetaUserSetting.php b/lib/Settings/BetaUserSetting.php
index 0597effe..79c6b95c 100644
--- a/lib/Settings/BetaUserSetting.php
+++ b/lib/Settings/BetaUserSetting.php
@@ -7,7 +7,6 @@ namespace OCA\EcloudAccounts\Settings;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IGroupManager;
 use OCP\Settings\ISettings;
-use OCP\Util;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\AppFramework\Services\IInitialState;
@@ -15,7 +14,6 @@ use OCA\EcloudAccounts\Service\BetaUserService;
 
 class BetaUserSetting implements ISettings {
 	protected $groupManager;
-	protected $util;
 	private $logger;
 	private $initialState;
 	private $config;
@@ -25,7 +23,6 @@ class BetaUserSetting implements ISettings {
 	public function __construct(
 		$appName,
 		IGroupManager $groupManager,
-		Util $util,
 		IConfig $config,
 		ILogger $logger,
 		IInitialState $initialState,
@@ -34,7 +31,6 @@ class BetaUserSetting implements ISettings {
 		$this->groupManager = $groupManager;
 		$this->appName = $appName;
 		$this->config = $config;
-		$this->util = $util;
 		$this->logger = $logger;
 		$this->initialState = $initialState;
 		$this->betaUserService = $betaUserService;
@@ -45,8 +41,7 @@ class BetaUserSetting implements ISettings {
 		$betaApps = $this->betaUserService->getBetaApps();
 		$this->initialState->provideInitialState('is_beta_user', $betaUserStatus);
 		$this->initialState->provideInitialState('beta_apps', $betaApps);
-		$this->util->addScript($this->appName, $this->appName . '-beta-user-setting');
-		return new TemplateResponse($this->appName, 'beta');
+		return new TemplateResponse($this->appName, 'beta', ['appName' => $this->appName], '');
 	}
 
 	public function getSection(): ?string {
diff --git a/templates/beta.php b/templates/beta.php
index 81bb79b0..cb0c5869 100644
--- a/templates/beta.php
+++ b/templates/beta.php
@@ -1 +1,4 @@
+<?php
+script("ecloud-accounts", $appName . '-beta-user-setting');
+?>
 <div id="become-beta-user"></div>
\ No newline at end of file
-- 
GitLab


From ac8accb6d364b2dc0e5310bdb1b8dc1a7bf5d872 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Fri, 12 May 2023 03:06:17 -0700
Subject: [PATCH 15/21] removed this which added bymistake

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

diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index fd1ee515..7e1deb93 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -111,7 +111,7 @@ export default {
 			appName: 'ecloud-accounts',
 			summaryOfFeedbackPlaceholderText: t('ecloud-accounts', 'Summary of your feedback'),
 			moreDetailsPlaceholderText: t('ecloud-accounts', 'Please give us as many details as possible'),
-			becomeBetaUserButtonLabel: this.t('ecloud-accounts', 'Become a beta user'),
+			becomeBetaUserButtonLabel: t('ecloud-accounts', 'Become a beta user'),
 			optOutBetaUserButtonLabel: t('ecloud-accounts', 'Opt out of beta features'),
 			submitButtonLabel: t('ecloud-accounts', 'Submit'),
 			isBetaUser: false,
-- 
GitLab


From c2d0152d559ac58cdb67247c5368863db890f8ca Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Fri, 12 May 2023 03:09:05 -0700
Subject: [PATCH 16/21] loadstate in data

---
 src/BecomeBetaUser.vue | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index 7e1deb93..e258c8d0 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -114,8 +114,8 @@ export default {
 			becomeBetaUserButtonLabel: t('ecloud-accounts', 'Become a beta user'),
 			optOutBetaUserButtonLabel: t('ecloud-accounts', 'Opt out of beta features'),
 			submitButtonLabel: t('ecloud-accounts', 'Submit'),
-			isBetaUser: false,
-			betaApps: [],
+			isBetaUser: loadState(this.appName, 'is_beta_user'),
+			betaApps: loadState(this.appName, 'beta_apps'),
 			title: '',
 			description: '',
 			loading: true,
@@ -126,14 +126,6 @@ export default {
 			return (this.description === '' || this.title === '')
 		},
 	},
-	created() {
-		try {
-			this.isBetaUser = loadState(this.appName, 'is_beta_user')
-			this.betaApps = loadState(this.appName, 'beta_apps')
-		} catch (e) {
-			console.error('Error fetching initial state', e)
-		}
-	},
 	methods: {
 		async becomeBetaUser() {
 			try {
-- 
GitLab


From fd0437fb8c7abf4bc06e04963fc25974d86e40c4 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Fri, 12 May 2023 03:11:07 -0700
Subject: [PATCH 17/21] added translate declaration

---
 src/BecomeBetaUser.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index e258c8d0..1a002918 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -100,6 +100,7 @@ import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection.js'
 import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showSuccess, showError } from '@nextcloud/dialogs'
+import { translate as t } from '@nextcloud/l10n'
 
 export default {
 	name: 'BecomeBetaUser',
@@ -126,6 +127,7 @@ export default {
 			return (this.description === '' || this.title === '')
 		},
 	},
+
 	methods: {
 		async becomeBetaUser() {
 			try {
-- 
GitLab


From 03f48279229e833b853b41345e03bbe57a797e72 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Fri, 12 May 2023 04:08:02 -0700
Subject: [PATCH 18/21] change in loadstate

---
 src/BecomeBetaUser.vue | 72 ++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 42 deletions(-)

diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index 1a002918..179f6f65 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -3,28 +3,28 @@
 		<div v-if="!isBetaUser" class="section padding-0">
 			<h2>
 				{{
-					t('ecloud-accounts', 'Do you want to become a beta user?')
+					t(appName, 'Do you want to become a beta user?')
 				}}
 			</h2>
 			<p class="settings-hint">
 				{{
-					t('ecloud-accounts', 'You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')
+					t(appName, 'You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')
 				}}
 			</p>
 			<p class="settings-hint">
 				{{
-					t('ecloud-accounts', 'To get a preview of our new features you need to become part of our beta users.To do so, simply click on the button below.You can opt out of beta features at anytime.')
+					t(appName, 'To get a preview of our new features you need to become part of our beta users.To do so, simply click on the button below.You can opt out of beta features at anytime.')
 				}}
 			</p>
 			<div id="groups" class="aliases-info">
 				<input type="button"
 					class="width300"
-					:value="becomeBetaUserButtonLabel"
+					:value="t(appName, 'Become a beta user')"
 					@click="becomeBetaUser()">
 			</div>
 			<div class="margin-top-10">
 				<p class="settings-hint">
-					{{ t('ecloud-accounts', 'Here is the list of currently available beta features: ') }}
+					{{ t(appName, 'Here is the list of currently available beta features: ') }}
 				</p>
 				<ul class="beta-apps settings-hint">
 					<li v-for="app in betaApps" :key="app">
@@ -35,14 +35,14 @@
 		</div>
 		<div v-if="isBetaUser" class="section padding-0">
 			<h2>
-				{{ t('ecloud-accounts','You are part of the beta users.') }}
+				{{ t(appName,'You are part of the beta users.') }}
 			</h2>
 			<p class="settings-hint">
-				{{ t('ecloud-accounts','Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.') }}
+				{{ t(appName,'Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.') }}
 			</p>
 			<div>
 				<p class="settings-hint">
-					{{ t('ecloud-accounts','Here is the list of currently available beta features:') }}
+					{{ t(appName,'Here is the list of currently available beta features:') }}
 				</p>
 				<ul class="beta-apps settings-hint">
 					<li v-for="app in betaApps" :key="app">
@@ -54,7 +54,7 @@
 				<p>
 					<label id="title_label" for="title">
 						<b>
-							{{ t('ecloud-accounts','Title') }} <sup class="color-red">*</sup>
+							{{ t(appName,'Title') }} <sup class="color-red">*</sup>
 						</b>
 					</label>
 				</p>
@@ -62,32 +62,32 @@
 					<input id="title"
 						v-model="title"
 						type="text"
-						:placeholder="summaryOfFeedbackPlaceholderText">
+						:placeholder="t(appName, 'Summary of your feedback')">
 				</p>
 				<p class="mt-20">
 					<label id="description_label" for="description">
 						<b>
-							{{ t('ecloud-accounts','Description') }} <sup class="color-red">*</sup>
+							{{ t(appName,'Description') }} <sup class="color-red">*</sup>
 						</b>
 					</label>
 				</p>
 				<p>
-					<textarea id="description" v-model="description" :placeholder="moreDetailsPlaceholderText" />
+					<textarea id="description" v-model="description" :placeholder="t(appName, 'Please give us as many details as possible')" />
 				</p>
 				<p class="mt-20">
 					<input type="submit"
-						:value="submitButtonLabel"
+						:value="t(appName, 'Submit')"
 						class="width300"
 						:disabled="isDisabled">
 				</p>
 			</form>
 			<p class="settings-hint mt-20">
-				{{ t('ecloud-accounts','Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!') }}
+				{{ t(appName,'Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!') }}
 			</p>
 			<div id="beta-form">
 				<input type="submit"
 					class="width300 btn-optout"
-					:value="optOutBetaUserButtonLabel"
+					:value="t(appName, 'Opt out of beta features')"
 					@click="optOutFromBetaUser()">
 			</div>
 		</div>
@@ -110,13 +110,8 @@ export default {
 	data() {
 		return {
 			appName: 'ecloud-accounts',
-			summaryOfFeedbackPlaceholderText: t('ecloud-accounts', 'Summary of your feedback'),
-			moreDetailsPlaceholderText: t('ecloud-accounts', 'Please give us as many details as possible'),
-			becomeBetaUserButtonLabel: t('ecloud-accounts', 'Become a beta user'),
-			optOutBetaUserButtonLabel: t('ecloud-accounts', 'Opt out of beta features'),
-			submitButtonLabel: t('ecloud-accounts', 'Submit'),
-			isBetaUser: loadState(this.appName, 'is_beta_user'),
-			betaApps: loadState(this.appName, 'beta_apps'),
+			isBetaUser: loadState('ecloud-accounts', 'is_beta_user'),
+			betaApps: loadState('ecloud-accounts', 'beta_apps'),
 			title: '',
 			description: '',
 			loading: true,
@@ -127,20 +122,17 @@ export default {
 			return (this.description === '' || this.title === '')
 		},
 	},
-
 	methods: {
 		async becomeBetaUser() {
 			try {
 				const url = generateUrl(
 					`/apps/${this.appName}/beta/add`
 				)
-				const { status } = await Axios.get(url)
-				if (status === 200) {
-					this.isBetaUser = true
-					showSuccess(t('ecloud-accounts', 'Congratulations! You\'ve successfully been added to the beta users.'))
-				}
+				await Axios.get(url)
+				this.isBetaUser = true
+				showSuccess(t(this.appName, 'Congratulations! You\'ve successfully been added to the beta users.'))
 			} catch (e) {
-				showError(t('ecloud-accounts', 'Something went wrong.'))
+				showError(t(this.appName, 'Something went wrong.'))
 			}
 		},
 		async optOutFromBetaUser() {
@@ -148,13 +140,11 @@ export default {
 				const url = generateUrl(
 					`/apps/${this.appName}/beta/remove`
 				)
-				const { status } = await Axios.get(url)
-				if (status === 200) {
-					this.isBetaUser = false
-					showSuccess(t('ecloud-accounts', 'You no longer have access to experimental features.'))
-				}
+				await Axios.get(url)
+				this.isBetaUser = false
+				showSuccess(t(this.appName, 'You no longer have access to experimental features.'))
 			} catch (e) {
-				showError(t('ecloud-accounts', 'Something went wrong.'))
+				showError(t(this.appName, 'Something went wrong.'))
 			}
 		},
 		async submitFeedback(e) {
@@ -163,14 +153,12 @@ export default {
 				const url = generateUrl(
 					`/apps/${this.appName}/issue/submit`
 				)
-				const { status } = await Axios.post(url, { title: this.title, description: this.description })
-				if (status === 200) {
-					showSuccess(t('ecloud-accounts', 'Issue submitted successfully.'))
-					this.description = ''
-					this.title = ''
-				}
+				await Axios.post(url, { title: this.title, description: this.description })
+				showSuccess(t(this.appName, 'Issue submitted successfully.'))
+				this.description = ''
+				this.title = ''
 			} catch (e) {
-				showError(t('ecloud-accounts', 'Something went wrong.'))
+				showError(t(this.appName, 'Something went wrong.'))
 			}
 		},
 	},
-- 
GitLab


From 43aac1280d5f036f0e350fbd3e42787038ab5da6 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Fri, 12 May 2023 05:19:30 -0700
Subject: [PATCH 19/21] removing loading

---
 src/BecomeBetaUser.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index 179f6f65..39de990e 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -114,7 +114,6 @@ export default {
 			betaApps: loadState('ecloud-accounts', 'beta_apps'),
 			title: '',
 			description: '',
-			loading: true,
 		}
 	},
 	computed: {
-- 
GitLab


From fbfe6ddd3db151df45f38cd15793e5a2d6f5031d Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Fri, 12 May 2023 05:42:20 -0700
Subject: [PATCH 20/21] app name as const

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

diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index 39de990e..fbf22c0d 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -101,6 +101,7 @@ import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
+const APPLICATION_NAME = 'ecloud-accounts'
 
 export default {
 	name: 'BecomeBetaUser',
@@ -109,9 +110,9 @@ export default {
 	},
 	data() {
 		return {
-			appName: 'ecloud-accounts',
-			isBetaUser: loadState('ecloud-accounts', 'is_beta_user'),
-			betaApps: loadState('ecloud-accounts', 'beta_apps'),
+			appName: APPLICATION_NAME,
+			isBetaUser: loadState(APPLICATION_NAME, 'is_beta_user'),
+			betaApps: loadState(APPLICATION_NAME, 'beta_apps'),
 			title: '',
 			description: '',
 		}
-- 
GitLab


From 9d41120fcd053c45adc7bb750f1c26e8abe16ab1 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Fri, 12 May 2023 09:58:44 -0700
Subject: [PATCH 21/21] scope

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

diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index fbf22c0d..1fbb3759 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -164,7 +164,7 @@ export default {
 	},
 }
 </script>
-<style>
+<style scoped>
 .alert {
 	position: relative;
 	margin-top: 1rem;
-- 
GitLab