Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

webpack update and settings redirect #5

Merged
merged 3 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ tests/.phpunit.result.cache
.DS_Store
/css/**/*.css
/css/**/*.css.map
/dist/
/dist/
/js/
4 changes: 4 additions & 0 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@
<personal-section>OCA\NMCSettings\Sections\Personal\AccountSettings</personal-section>
<personal>OCA\NMCSettings\Settings\Personal\Security\NmcAuthtokens</personal>
<personal-section>OCA\NMCSettings\Sections\Personal\DevicesSessions</personal-section>
<personal>OCA\NMCSettings\Settings\Groupware</personal>
<personal>OCA\NMCSettings\Settings\PersonalInfo</personal>
<personal>OCA\NMCSettings\Settings\Security</personal>
<personal>OCA\NMCSettings\Settings\SyncClients</personal>
</settings>
</info>
2 changes: 1 addition & 1 deletion lib/Listener/BeforeTemplateRenderedListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ public function handle(Event $event): void {
$response->setParams($tmplparams);
}

\OCP\Util::addScript("nmcsettings", "../dist/nmcsettings");
\OCP\Util::addScript("nmcsettings", "nmcsettings-nmcsettings");
}
}
32 changes: 32 additions & 0 deletions lib/Settings/Groupware.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

declare(strict_types=1);

namespace OCA\NMCSettings\Settings;

use OCP\AppFramework\Http\TemplateResponse;
use OCP\Settings\ISettings;

class Groupware implements ISettings {

public function __construct() {

}

/**
* @return TemplateResponse
*/
public function getForm(): TemplateResponse {
return new TemplateResponse('nmcsettings', 'settings-personal', []);
}

/** {@inheritDoc} */
public function getSection(): string {
return 'groupware';
}

/** {@inheritDoc} */
public function getPriority(): int {
return 0;
}
}
15 changes: 1 addition & 14 deletions lib/Settings/Personal/NmcPersonalInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ public function getForm(): TemplateResponse {
$this->initialStateService->provideInitialState('settings', 'profileParameters', $profileParameters);

return new TemplateResponse('nmcsettings', 'settings/personal/account', $parameters, '');
//return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
}

public function getSection(): string {
Expand Down Expand Up @@ -264,19 +263,7 @@ private function getLanguageMap(IUser $user): array {
$uid = $user->getUID();

$userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
//$languages = $this->l10nFactory->getLanguages();
$languages = [
'commonLanguages' => [
[
'code' => 'de_DE',
'name' => 'Deutsch',
],[
'code' => 'en_GB',
'name' => 'English',
]
],
'otherLanguages' => [],
];
$languages = $this->l10nFactory->getLanguages();

// associate the user language with the proper array
$userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code'));
Expand Down
32 changes: 32 additions & 0 deletions lib/Settings/PersonalInfo.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

declare(strict_types=1);

namespace OCA\NMCSettings\Settings;

use OCP\AppFramework\Http\TemplateResponse;
use OCP\Settings\ISettings;

class PersonalInfo implements ISettings {

public function __construct() {

}

/**
* @return TemplateResponse
*/
public function getForm(): TemplateResponse {
return new TemplateResponse('nmcsettings', 'settings-personal');
}

/** {@inheritDoc} */
public function getSection(): string {
return 'personal-info';
}

/** {@inheritDoc} */
public function getPriority(): int {
return 0;
}
}
32 changes: 32 additions & 0 deletions lib/Settings/Security.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

declare(strict_types=1);

namespace OCA\NMCSettings\Settings;

use OCP\AppFramework\Http\TemplateResponse;
use OCP\Settings\ISettings;

class Security implements ISettings {

public function __construct() {

}

/**
* @return TemplateResponse
*/
public function getForm(): TemplateResponse {
return new TemplateResponse('nmcsettings', 'settings-personal', []);
}

/** {@inheritDoc} */
public function getSection(): string {
return 'security';
}

/** {@inheritDoc} */
public function getPriority(): int {
return 0;
}
}
32 changes: 32 additions & 0 deletions lib/Settings/SyncClients.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

declare(strict_types=1);

namespace OCA\NMCSettings\Settings;

use OCP\AppFramework\Http\TemplateResponse;
use OCP\Settings\ISettings;

class SyncClients implements ISettings {

public function __construct() {

}

/**
* @return TemplateResponse
*/
public function getForm(): TemplateResponse {
return new TemplateResponse('nmcsettings', 'settings-personal', []);
}

/** {@inheritDoc} */
public function getSection(): string {
return 'sync-clients';
}

/** {@inheritDoc} */
public function getPriority(): int {
return 0;
}
}
Loading