finallycoffee/nextcloud-pride-flags
5
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 10 Wiki Activity

Compare commits

base: finallycoffee:2087570201bc9c4b0a9e78227b72520e5b3f0355
Branches Tags
finallycoffee:main finallycoffee:transcaffeine/refactor finallycoffee:app-1.1.1 finallycoffee:transcaffeine/global-setting finallycoffee:transcaffeine/fix-per-user finallycoffee:transcaffeine/prepare-release
finallycoffee:1.1.2 finallycoffee:1.1.1 finallycoffee:1.1.0 finallycoffee:1.0.1 finallycoffee:1.0.0 finallycoffee:1.0.0-rc.1 finallycoffee:1.0.0-rc.0 finallycoffee:0.1.0-rc.2 finallycoffee:0.1.0-rc.1 finallycoffee:0.1.0-rc.0
..
compare: finallycoffee:1.1.0
Branches Tags
finallycoffee:transcaffeine/refactor finallycoffee:main finallycoffee:app-1.1.1 finallycoffee:transcaffeine/global-setting finallycoffee:transcaffeine/fix-per-user finallycoffee:transcaffeine/prepare-release
finallycoffee:1.1.2 finallycoffee:1.1.1 finallycoffee:1.1.0 finallycoffee:1.0.1 finallycoffee:1.0.0 finallycoffee:1.0.0-rc.1 finallycoffee:1.0.0-rc.0 finallycoffee:0.1.0-rc.2 finallycoffee:0.1.0-rc.1 finallycoffee:0.1.0-rc.0

2 Commits
2087570201 ... 1.1.0

Author SHA1 Message Date
transcaffeine
1ac7c8f69a meta: bump version to 1.1.0 2024-08-09 22:36:28 +02:00
transcaffeine
6b53ccb88e feat: allow global settings as fallback when user has not defined any 2024-08-09 22:36:22 +02:00
4 changed files with 77 additions and 70 deletions
Expand all files Collapse all files

68
js/pride-settings-global.js
View File

@ -1,36 +1,38 @@
const folder_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.folder-flavour select')[0];
const button_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.button-flavour select')[0];
const submit_button = document.querySelectorAll('.pride_flags_user_settings .settings-pride-submit');
const container = document.querySelector('.pride_flags_server_settings settings-section')
(function(window) {
const folder_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.folder-flavour select')[0];
const button_selector = document.querySelectorAll('.pride_flags_server_settings .server-settings.button-flavour select')[0];
const submit_button = document.querySelectorAll('.pride_flags_server_settings .settings-pride-submit');
const container = document.querySelector('.pride_flags_server_settings .settings-section');
function load() {
fetch(OC.generateUrl('/apps/pride_flags/settings/global'))
.then(res => res.json())
.then(({folderVariant, buttonVariant}) => {
folder_selector.value = folderVariant;
button_selector.value = buttonVariant;
container.classList.remove('hidden');
});
}
function save() {
const payload = {
folderVariant: folder_selector.value,
buttonVariant: button_selector.value,
function load() {
fetch(OC.generateUrl('/apps/pride_flags/settings/global'))
.then(res => res.json())
.then(({folderVariant, buttonVariant}) => {
folder_selector.value = folderVariant;
button_selector.value = buttonVariant;
container.classList.remove('hidden');
});
}
fetch(OC.generateUrl('/apps/pride_flags/settings/global'), {
method: 'POST',
body: JSON.stringify(payload),
headers: {
"Content-Type": "application/json",
"requesttoken": OC.requestToken,
}
}).then(response => {
if (response.ok) {
window.location.reload();
}
})
}
submit_button.forEach(node => node.addEventListener('click', e => save()));
load();
function save() {
const payload = {
folderVariant: folder_selector.value,
buttonVariant: button_selector.value,
}
fetch(OC.generateUrl('/apps/pride_flags/settings/global'), {
method: 'POST',
body: JSON.stringify(payload),
headers: {
"Content-Type": "application/json",
"requesttoken": OC.requestToken,
}
}).then(response => {
if (response.ok) {
window.location.reload();
}
})
}
submit_button.forEach(node => node.addEventListener('click', e => save()));
load();
})(window);

70
js/pride-settings.js
View File

@ -1,38 +1,38 @@
(function(window) {
const folder_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.folder-flavour select')[0];
const button_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.button-flavour select')[0];
const submit_button = document.querySelectorAll('.pride_flags_user_settings .settings-pride-submit');
const container = document.querySelector('.pride_flags_user_settings .settings-section');
const folder_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.folder-flavour select')[0];
const button_selector = document.querySelectorAll('.pride_flags_user_settings .user-settings.button-flavour select')[0];
const submit_button = document.querySelectorAll('.pride_flags_user_settings .settings-pride-submit');
const container = document.querySelector('.pride_flags_user_settings settings-section')
function load() {
fetch(OC.generateUrl('/apps/pride_flags/settings'))
.then(res => res.json())
.then(({folderVariant, buttonVariant}) => {
folder_selector.value = folderVariant;
button_selector.value = buttonVariant;
container.classList.remove('hidden');
});
}
function save() {
const payload = {
folderVariant: folder_selector.value,
buttonVariant: button_selector.value,
function load() {
fetch(OC.generateUrl('/apps/pride_flags/settings'))
.then(res => res.json())
.then(({folderVariant, buttonVariant}) => {
folder_selector.value = folderVariant;
button_selector.value = buttonVariant;
container.classList.remove('hidden');
});
}
fetch(OC.generateUrl('/apps/pride_flags/settings'), {
method: 'POST',
body: JSON.stringify(payload),
headers: {
"Content-Type": "application/json",
"requesttoken": OC.requestToken,
}
}).then(response => {
if (response.ok) {
window.location.reload();
}
})
}
submit_button.forEach(node => node.addEventListener('click', e => save()));
load();
function save() {
const payload = {
folderVariant: folder_selector.value,
buttonVariant: button_selector.value,
}
fetch(OC.generateUrl('/apps/pride_flags/settings'), {
method: 'POST',
body: JSON.stringify(payload),
headers: {
"Content-Type": "application/json",
"requesttoken": OC.requestToken,
}
}).then(response => {
if (response.ok) {
window.location.reload();
}
})
}
submit_button.forEach(node => node.addEventListener('click', e => save()));
load();
})(window);

5
lib/Controller/SettingsController.php
View File

@ -40,6 +40,11 @@ class SettingsController extends Controller {
return $this->makeJSONResponse(fn () => $this->appSettings->getGlobal());
}
#[NoCSRFRequired]
public function getGlobal(): JSONResponse {
return $this->makeJSONResponse(fn () => $this->appSettings->getGlobal());
}
protected function makeJSONResponse(Closure $closure): JSONResponse {
try {
return new JSONResponse($closure(), HTTP::STATUS_OK);

4
lib/Settings/AppSettings.php
View File

@ -34,8 +34,8 @@ class AppSettings {
public function getGlobal(): array {
return [
AppSettings::FOLDER_VARIANT => $this->config->getAppValue(AppSettings::APP_ID, AppSettings::FOLDER_VARIANT, 'pride'),
AppSettings::BUTTON_VARIANT => $this->config->getAppValue(AppSettings::APP_ID, AppSettings::BUTTON_VARIANT, 'trans'),
AppSettings::FOLDER_VARIANT => $this->config->getAppValue(AppConstants::APP_ID, AppSettings::FOLDER_VARIANT, 'pride'),
AppSettings::BUTTON_VARIANT => $this->config->getAppValue(AppConstants::APP_ID, AppSettings::BUTTON_VARIANT, 'trans'),
];
}