Rewrite admin theming in Vue

Signed-off-by: Christopher Ng <chrng8@gmail.com>
nextcloud · Oct 13, 2022 · 5d90fc8 · 5d90fc8
1 parent d967488
commit 5d90fc8
Show file tree

Hide file tree

Showing 24 changed files with 1,089 additions and 184 deletions.
diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php
@@ -52,8 +52,6 @@ class ImageManager {
 	private $appData;
 	/** @var IURLGenerator */
 	private $urlGenerator;
-	/** @var array */
-	private $supportedImageKeys = ['background', 'logo', 'logoheader', 'favicon'];
 	/** @var ICacheFactory */
 	private $cacheFactory;
 	/** @var ILogger */
@@ -135,20 +133,6 @@ public function hasImage(string $key): bool {
 		return $mimeSetting !== '';
 	}
 
-	/**
-	 * @return array<string, array{mime: string, url: string}>
-	 */
-	public function getCustomImages(): array {
-		$images = [];
-		foreach ($this->supportedImageKeys as $key) {
-			$images[$key] = [
-				'mime' => $this->config->getAppValue('theming', $key . 'Mime', ''),
-				'url' => $this->getImageUrl($key),
-			];
-		}
-		return $images;
-	}
-
 	/**
 	 * Get folder for current theming files
 	 *

diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php
@@ -27,32 +27,38 @@
  */
 namespace OCA\Theming\Settings;
 
+use OCA\Theming\AppInfo\Application;
 use OCA\Theming\ImageManager;
 use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IDelegatedSettings;
+use OCP\Util;
 
 class Admin implements IDelegatedSettings {
 	private string $appName;
 	private IConfig $config;
 	private IL10N $l;
 	private ThemingDefaults $themingDefaults;
+	private IInitialState $initialState;
 	private IURLGenerator $urlGenerator;
 	private ImageManager $imageManager;
 
 	public function __construct(string $appName,
 								IConfig $config,
 								IL10N $l,
 								ThemingDefaults $themingDefaults,
+								IInitialState $initialState,
 								IURLGenerator $urlGenerator,
 								ImageManager $imageManager) {
 		$this->appName = $appName;
 		$this->config = $config;
 		$this->l = $l;
 		$this->themingDefaults = $themingDefaults;
+		$this->initialState = $initialState;
 		$this->urlGenerator = $urlGenerator;
 		$this->imageManager = $imageManager;
 	}
@@ -69,22 +75,28 @@ public function getForm(): TemplateResponse {
 			$errorMessage = $this->l->t('You are already using a custom theme. Theming app settings might be overwritten by that.');
 		}
 
-		$parameters = [
-			'themable' => $themable,
-			'errorMessage' => $errorMessage,
+		$this->initialState->provideInitialState('adminThemingParameters', [
+			'isThemable' => $themable,
+			'notThemableErrorMessage' => $errorMessage,
 			'name' => $this->themingDefaults->getEntity(),
 			'url' => $this->themingDefaults->getBaseUrl(),
 			'slogan' => $this->themingDefaults->getSlogan(),
 			'color' => $this->themingDefaults->getColorPrimary(),
-			'uploadLogoRoute' => $this->urlGenerator->linkToRoute('theming.Theming.uploadImage'),
+			'logoMime' => $this->config->getAppValue(Application::APP_ID, 'logoMime', ''),
+			'backgroundMime' => $this->config->getAppValue(Application::APP_ID, 'backgroundMime', ''),
+			'logoheaderMime' => $this->config->getAppValue(Application::APP_ID, 'logoheaderMime', ''),
+			'faviconMime' => $this->config->getAppValue(Application::APP_ID, 'faviconMime', ''),
+			'legalNoticeUrl' => $this->themingDefaults->getImprintUrl(),
+			'privacyPolicyUrl' => $this->themingDefaults->getPrivacyUrl(),
+			'docUrl' => $this->urlGenerator->linkToDocs('admin-theming'),
+			'docUrlIcons' => $this->urlGenerator->linkToDocs('admin-theming-icons'),
 			'canThemeIcons' => $this->imageManager->shouldReplaceIcons(),
-			'iconDocs' => $this->urlGenerator->linkToDocs('admin-theming-icons'),
-			'images' => $this->imageManager->getCustomImages(),
-			'imprintUrl' => $this->themingDefaults->getImprintUrl(),
-			'privacyUrl' => $this->themingDefaults->getPrivacyUrl(),
-		];
+			'hasCustomPrimaryColor' => !empty($this->config->getAppValue(Application::APP_ID, 'color', '')),
+		]);
+
+		Util::addScript($this->appName, 'admin-theming');
 
-		return new TemplateResponse($this->appName, 'settings-admin', $parameters, '');
+		return new TemplateResponse($this->appName, 'settings-admin');
 	}
 
 	/**

diff --git a/apps/theming/lib/Settings/Personal.php b/apps/theming/lib/Settings/Personal.php
@@ -72,7 +72,7 @@ public function getForm(): TemplateResponse {
 
 		$this->initialStateService->provideInitialState('themes', array_values($themes));
 		$this->initialStateService->provideInitialState('enforceTheme', $enforcedTheme);
-		Util::addScript($this->appName, 'theming-settings');
+		Util::addScript($this->appName, 'personal-theming');
 
 		return new TemplateResponse($this->appName, 'settings-personal');
 	}