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

Commit 285152c3 authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'dev/beta-user' into 'main'

Beta user section

See merge request !30
parents 08fbdb78 312cda73
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
variables:
    TO_PACKAGE: 'appinfo l10n img lib templates js'
    TO_PACKAGE: 'appinfo css l10n lib templates js img'
include:
  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
    ref: main
+13 −0
Original line number Diff line number Diff line
@@ -30,3 +30,16 @@ Please open issues here : https://gitlab.e.foundation/e/backlog/issues
This plugin works in cunjunction with the drop_account plugin : https://apps.nextcloud.com/apps/drop_account

This plugin uses SRDI's [Simple and lightweight curl class](https://github.com/srdi/php-curl-class), under the The Unlicense license : https://github.com/srdi/php-curl-class/blob/master/LICENSE

## Beta User

- The app is using system values which are configured in `/config/config.php`. 
- Below keys to add:
1. beta_group_name
2. beta_gitlab_email_id

The values are:
```
'beta_group_name' => 'beta',
'beta_gitlab_email_id' => 'xyz@e.email',
```
+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@
    </dependencies>
	<settings>
		<personal>OCA\EcloudAccounts\Settings\Personal</personal>
		<personal>OCA\EcloudAccounts\Settings\BetaUserSetting</personal> 
		<personal-section>OCA\EcloudAccounts\Settings\BetaSection</personal-section>
	</settings>     

</info>
+12 −0
Original line number Diff line number Diff line
@@ -13,4 +13,16 @@ return ['routes' => [
		'name' => 'user#preflighted_cors', 'url' => '/api/{path}',
		'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')
	],
	[
		'name' => 'beta_user#remove_user_in_group',
		'url' => '/beta/update', 'verb' => 'DELETE'
	],
	[
		'name' => 'beta_user#add_user_in_group',
		'url' => '/beta/update', 'verb' => 'POST'
	],
	[
		'name' => 'beta_user#submit_issue',
		'url' => '/issue/submit', 'verb' => 'POST'
	]
]];

css/style.css

0 → 100644
+52 −0
Original line number Diff line number Diff line
.alert {
	position: relative;
	padding: 0.75rem 1.25rem;
	margin-top: 1rem;
	border: 1px solid transparent;
	border-radius: 0.25rem;
	width: fit-content;
}

.alert-success {
	color: #155724;
	background-color: #d4edda;
	border-color: #c3e6cb;
}

.alert-fail {
	color: #721c24;
	background-color: #f8d7da;
	border-color: #f5c6cb;
}

#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;
}
 No newline at end of file
Loading