Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d07dd55 authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'dev/beta-convert-to-vue' into 'main' 

Refactor Beta user section to use VueJS instead of jQuery and PHP

See merge request !53
parents 3d9e2eb1 943dd1c1

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
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

appinfo/info.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

appinfo/routes.php

+2 −2
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 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',

css/style.css

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
.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;

}

lib/Controller/BetaUserController.php

+0 −5
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ use OCP\IConfig; 
use OCP\IUserManager;

use OCP\IGroupManager;

use OCP\IUserSession;

use OCP\ILogger;

use OCP\Mail\IMailer;

use OCP\Util;
@@ -29,7 +28,6 @@ class BetaUserController extends Controller { 
		$AppName,

		IRequest $request,

		IConfig $config,

		ILogger $logger,

		IUserManager $userManager,

		IGroupManager $groupManager,

		IUserSession $userSession,
@@ -39,7 +37,6 @@ class BetaUserController extends Controller { 
		$this->appName = $AppName;

		$this->request = $request;

		$this->config = $config;

		$this->logger = $logger;

		$this->userManager = $userManager;

		$this->userSession = $userSession;

		$this->groupManager = $groupManager;
@@ -85,7 +82,6 @@ class BetaUserController extends Controller { 
		$fromEmail = $user->getEMailAddress();

		$fromName = $user->getDisplayName();





		$template = $this->mailer->createEMailTemplate('betauser.SubmitGitIssue', []);

		$template->addHeader();

		$template->setSubject($title);
@@ -98,7 +94,6 @@ class BetaUserController extends Controller { 
		$message->useTemplate($template);



		$this->mailer->send($message);



		return true;

	}

}