Skip to content

Commit

Permalink
Merge pull request #32561 from nextcloud/port/vue-personal-federation
Browse files Browse the repository at this point in the history
  • Loading branch information
Pytal authored Jun 27, 2022
2 parents 0fe7064 + 3b6bb4f commit 529d653
Show file tree
Hide file tree
Showing 19 changed files with 289 additions and 325 deletions.
5 changes: 0 additions & 5 deletions apps/federatedfilesharing/css/settings-admin.css

This file was deleted.

1 change: 0 additions & 1 deletion apps/federatedfilesharing/css/settings-admin.css.map

This file was deleted.

3 changes: 0 additions & 3 deletions apps/federatedfilesharing/css/settings-admin.scss

This file was deleted.

107 changes: 0 additions & 107 deletions apps/federatedfilesharing/css/settings-personal.css

This file was deleted.

1 change: 0 additions & 1 deletion apps/federatedfilesharing/css/settings-personal.css.map

This file was deleted.

46 changes: 0 additions & 46 deletions apps/federatedfilesharing/css/settings-personal.scss

This file was deleted.

68 changes: 0 additions & 68 deletions apps/federatedfilesharing/js/settings-personal.js

This file was deleted.

32 changes: 22 additions & 10 deletions apps/federatedfilesharing/lib/Settings/Personal.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* @author Jos Poortvliet <[email protected]>
* @author Julius Härtl <[email protected]>
* @author Morris Jobke <[email protected]>
* @author Carl Schwan <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
Expand All @@ -27,31 +28,34 @@

use OCA\FederatedFileSharing\FederatedShareProvider;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
use OCP\IL10N;
use OCP\IUserSession;
use OCP\IURLGenerator;
use OCP\Settings\ISettings;

class Personal implements ISettings {

/** @var FederatedShareProvider */
private $federatedShareProvider;
/** @var IUserSession */
private $userSession;
/** @var IL10N */
private $l;
/** @var \OC_Defaults */
private $defaults;
private FederatedShareProvider $federatedShareProvider;
private IUserSession $userSession;
private IL10N $l;
private \OC_Defaults $defaults;
private IInitialState $initialState;
private IURLGenerator $urlGenerator;

public function __construct(
FederatedShareProvider $federatedShareProvider, #
IUserSession $userSession,
IL10N $l,
\OC_Defaults $defaults
\OC_Defaults $defaults,
IInitialState $initialState,
IURLGenerator $urlGenerator
) {
$this->federatedShareProvider = $federatedShareProvider;
$this->userSession = $userSession;
$this->l = $l;
$this->defaults = $defaults;
$this->initialState = $initialState;
$this->urlGenerator = $urlGenerator;
}

/**
Expand All @@ -71,6 +75,14 @@ public function getForm() {
'color' => $this->defaults->getColorPrimary(),
'textColor' => "#ffffff",
];

$this->initialState->provideInitialState('color', $this->defaults->getColorPrimary());
$this->initialState->provideInitialState('textColor', '#fffff');
$this->initialState->provideInitialState('logoPath', $this->defaults->getLogo());
$this->initialState->provideInitialState('reference', $url);
$this->initialState->provideInitialState('cloudId', $cloudID);
$this->initialState->provideInitialState('docUrlFederated', $this->urlGenerator->linkToDocs('user-sharing-federated'));

return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
}

Expand Down
Loading

0 comments on commit 529d653

Please sign in to comment.