Skip to content

Commit 529d653

Browse files
authored
Merge pull request #32561 from nextcloud/port/vue-personal-federation
2 parents 0fe7064 + 3b6bb4f commit 529d653

19 files changed

Lines changed: 289 additions & 325 deletions

apps/federatedfilesharing/css/settings-admin.css

Lines changed: 0 additions & 5 deletions
This file was deleted.

apps/federatedfilesharing/css/settings-admin.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/federatedfilesharing/css/settings-admin.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

apps/federatedfilesharing/css/settings-personal.css

Lines changed: 0 additions & 107 deletions
This file was deleted.

apps/federatedfilesharing/css/settings-personal.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/federatedfilesharing/css/settings-personal.scss

Lines changed: 0 additions & 46 deletions
This file was deleted.

apps/federatedfilesharing/js/settings-personal.js

Lines changed: 0 additions & 68 deletions
This file was deleted.

apps/federatedfilesharing/lib/Settings/Personal.php

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* @author Jos Poortvliet <jos@opensuse.org>
77
* @author Julius Härtl <jus@bitgrid.net>
88
* @author Morris Jobke <hey@morrisjobke.de>
9+
* @author Carl Schwan <carl@carlschwan.eu>
910
*
1011
* @license GNU AGPL version 3 or any later version
1112
*
@@ -27,31 +28,34 @@
2728

2829
use OCA\FederatedFileSharing\FederatedShareProvider;
2930
use OCP\AppFramework\Http\TemplateResponse;
31+
use OCP\AppFramework\Services\IInitialState;
3032
use OCP\IL10N;
3133
use OCP\IUserSession;
34+
use OCP\IURLGenerator;
3235
use OCP\Settings\ISettings;
3336

3437
class Personal implements ISettings {
35-
36-
/** @var FederatedShareProvider */
37-
private $federatedShareProvider;
38-
/** @var IUserSession */
39-
private $userSession;
40-
/** @var IL10N */
41-
private $l;
42-
/** @var \OC_Defaults */
43-
private $defaults;
38+
private FederatedShareProvider $federatedShareProvider;
39+
private IUserSession $userSession;
40+
private IL10N $l;
41+
private \OC_Defaults $defaults;
42+
private IInitialState $initialState;
43+
private IURLGenerator $urlGenerator;
4444

4545
public function __construct(
4646
FederatedShareProvider $federatedShareProvider, #
4747
IUserSession $userSession,
4848
IL10N $l,
49-
\OC_Defaults $defaults
49+
\OC_Defaults $defaults,
50+
IInitialState $initialState,
51+
IURLGenerator $urlGenerator
5052
) {
5153
$this->federatedShareProvider = $federatedShareProvider;
5254
$this->userSession = $userSession;
5355
$this->l = $l;
5456
$this->defaults = $defaults;
57+
$this->initialState = $initialState;
58+
$this->urlGenerator = $urlGenerator;
5559
}
5660

5761
/**
@@ -71,6 +75,14 @@ public function getForm() {
7175
'color' => $this->defaults->getColorPrimary(),
7276
'textColor' => "#ffffff",
7377
];
78+
79+
$this->initialState->provideInitialState('color', $this->defaults->getColorPrimary());
80+
$this->initialState->provideInitialState('textColor', '#fffff');
81+
$this->initialState->provideInitialState('logoPath', $this->defaults->getLogo());
82+
$this->initialState->provideInitialState('reference', $url);
83+
$this->initialState->provideInitialState('cloudId', $cloudID);
84+
$this->initialState->provideInitialState('docUrlFederated', $this->urlGenerator->linkToDocs('user-sharing-federated'));
85+
7486
return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
7587
}
7688

0 commit comments

Comments
 (0)