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.

Sign up for GitHub

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

2.x feature-2.x-develop | update-settings-general-site-settings-responses #261

Merged
merged 9 commits into from
Feb 27, 2024
Merged

2.x feature-2.x-develop | update-settings-general-site-settings-responses #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0363e4c
Updated: general setting title and index page
we-shivam-g001 Feb 24, 2024
219e9d7
Updated: code for language strings
we-shivam-g001 Feb 24, 2024
2adb414
Updated: site setting list page
we-shivam-g001 Feb 24, 2024
23cc51a
Added: language string for missing field
we-shivam-g001 Feb 24, 2024
a48e390
Updated: language type placeholder
we-shivam-g001 Feb 24, 2024
4ce6cc7
Updated: code for input select and site setting fields
we-shivam-g001 Feb 24, 2024
87bb2b0
Updated: cache clear message
we-shivam-g001 Feb 26, 2024
464d41a
Merge branch '2.x-develop' into 2.x-feature/update-settings-general-r…
we-shivam-g001 Feb 26, 2024
362be95
Updated: language strings
we-shivam-g001 Feb 26, 2024
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
108 changes: 108 additions & 0 deletions Database/Seeders/json/language_strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1765,6 +1765,36 @@
"name": "Heading",
"content": "General Settings"
},
{
"locale_code_iso_639": "en",
"category": "general-setting",
"name": "Backend Home Page Link",
"content": "Backend Home Page Link"
},
{
"locale_code_iso_639": "en",
"category": "general-setting",
"name": "Allowed file size for upload",
"content": "Allowed file size for upload( in MB)"
},
{
"locale_code_iso_639": "en",
"category": "general-setting",
"name": "Max number of forgot password attempts",
"content": "Max number of forgot password attempts"
},
{
"locale_code_iso_639": "en",
"category": "general-setting",
"name": "Copyright Link",
"content": "Copyright Link"
},
{
"locale_code_iso_639": "en",
"category": "general",
"name": "Settings Successful Saved",
"content": "Settings successful saved"
},
{
"locale_code_iso_639": "en",
"category": "general-setting",
Expand Down Expand Up @@ -2162,6 +2192,12 @@
"name": "Scripts Message",
"content": "Add scripts of Google Analytics and other tracking scripts."
},
{
"locale_code_iso_639": "en",
"category": "general-setting",
"name": "Cache Delete Message",
"content": "Cache was successfully deleted."
},
{
"locale_code_iso_639": "en",
"category": "general-setting",
Expand Down Expand Up @@ -5421,6 +5457,36 @@
"name": "Heading",
"content": "Configuración general"
},
{
"locale_code_iso_639": "es",
"category": "general-setting",
"name": "Backend Home Page Link",
"content": "Enlace a la página de inicio del backend"
},
{
"locale_code_iso_639": "es",
"category": "general-setting",
"name": "Allowed file size for upload",
"content": "Tamaño de archivo permitido para cargar (en MB)"
},
{
"locale_code_iso_639": "es",
"category": "general-setting",
"name": "Max number of forgot password attempts",
"content": "Número máximo de intentos de olvido de contraseña"
},
{
"locale_code_iso_639": "es",
"category": "general-setting",
"name": "Copyright Link",
"content": "Enlace de derechos de autor"
},
{
"locale_code_iso_639": "es",
"category": "general",
"name": "Settings Successful Saved",
"content": "Configuración guardada correctamente"
},
{
"locale_code_iso_639": "es",
"category": "general-setting",
Expand Down Expand Up @@ -5817,6 +5883,12 @@
"name": "Scripts Message",
"content": "Agregue scripts de Google Analytics y otros scripts de seguimiento."
},
{
"locale_code_iso_639": "es",
"category": "general-setting",
"name": "Cache Delete Message",
"content": "\nLa caché se eliminó correctamente."
},
{
"locale_code_iso_639": "es",
"category": "general-setting",
Expand Down Expand Up @@ -8917,6 +8989,36 @@
"name": "Site Settings",
"content": "Paramètres du site"
},
{
"locale_code_iso_639": "fr",
"category": "general-setting",
"name": "Backend Home Page Link",
"content": "Lien vers la page d'accueil du back-end"
},
{
"locale_code_iso_639": "fr",
"category": "general-setting",
"name": "Allowed file size for upload",
"content": "Taille de fichier autorisée pour le téléchargement (en Mo)"
},
{
"locale_code_iso_639": "fr",
"category": "general-setting",
"name": "Max number of forgot password attempts",
"content": "Nombre maximum de tentatives d'oubli de mot de passe"
},
{
"locale_code_iso_639": "fr",
"category": "general-setting",
"name": "Copyright Link",
"content": "Lien de droit d\\'auteur"
},
{
"locale_code_iso_639": "fr",
"category": "general",
"name": "Settings Successful Saved",
"content": "Paramètres enregistrés avec succès"
},
{
"locale_code_iso_639": "fr",
"category": "general-setting",
Expand Down Expand Up @@ -9295,6 +9397,12 @@
"name": "Scripts Message",
"content": "Ajoutez des scripts de Google Analytics et d\\'autres scripts de suivi."
},
{
"locale_code_iso_639": "fr",
"category": "general-setting",
"name": "Cache Delete Message",
"content": "Le cache a été supprimé avec succès."
},
{
"locale_code_iso_639": "fr",
"category": "general-setting",
Expand Down
64 changes: 61 additions & 3 deletions Http/Controllers/Backend/Settings/GeneralController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public function getAssets(Request $request): JsonResponse
$response['success'] = true;
$response['data']['base_url'] = url('/');
$response['data']['roles'] = $role_data;
$response['data']['language_strings'] = $this->getLanguageStrings();
$response['data']['file_types'] = $vh_file_types_data;
$response['data']['vh_meta_attributes'] = vh_meta_attributes();
$response['data']['languages'] = Language::select('name', 'locale_code_iso_639')->get();
Expand All @@ -60,6 +61,63 @@ public function getAssets(Request $request): JsonResponse
return response()->json($response);
}
//----------------------------------------------------------
public function getLanguageStrings() : array {

return [
"general_settings_title" => trans("vaahcms-general-setting.heading"),
"expand_all" => trans("vaahcms-general-setting.expand_all"),
"collapse_all" => trans("vaahcms-general-setting.collapse_all"),
"site_settings" => trans("vaahcms-general-setting.site_settings"),
"site_settings_message" => trans("vaahcms-general-setting.site_settings_message"),
"securities" => trans("vaahcms-general-setting.securities"),
"securities_message" => trans("vaahcms-general-setting.securities_message"),
"date_and_time" => trans("vaahcms-general-setting.date_and_time"),
"global_date_and_time_settings" => trans("vaahcms-general-setting.global_date_and_time_settings"),
"social_media_and_links" => trans("vaahcms-general-setting.social_media_and_links"),
"static_links_management" => trans("vaahcms-general-setting.static_links_management"),
"scripts" => trans("vaahcms-general-setting.scripts"),
"scripts_message" => trans("vaahcms-general-setting.scripts_message"),
"meta_tags" => trans("vaahcms-general-setting.meta_tags"),
"global_meta_tags" => trans("vaahcms-general-setting.global_meta_tags"),
"site_title" => trans("vaahcms-general-setting.site_title"),
"default_site_language" => trans("vaahcms-general-setting.default_site_language"),
"redirect_after_frontend_login" => trans("vaahcms-general-setting.redirect_after_frontend_login"),
"meta_description" => trans("vaahcms-general-setting.meta_description"),
"search_engine_visibility" => trans("vaahcms-general-setting.search_engine_visibility"),
"assign_roles_on_registration" => trans("vaahcms-general-setting.assign_roles_on_registration"),
"allowed_file_types_for_upload" => trans("vaahcms-general-setting.allowed_file_types_for_upload"),
"is_logo_compressed_with_sidebar" => trans("vaahcms-general-setting.is_logo_compressed_with_sidebar"),
"copyright_text" => trans("vaahcms-general-setting.copyright_text"),
"copyright_year" => trans("vaahcms-general-setting.copyright_year"),
"maximum_number_of_login_attempts" => trans("vaahcms-general-setting.maximum_number_of_login_attempts"),
"password_protection" => trans("vaahcms-general-setting.password_protection"),
"laravel_queues" => trans("vaahcms-general-setting.laravel_queues"),
"maintenance_mode" => trans("vaahcms-general-setting.maintenance_mode"),
"signup_page" => trans("vaahcms-general-setting.signup_page"),
"redirect_after_backend_logout" => trans("vaahcms-general-setting.redirect_after_backend_logout"),
"save_settings_button" => trans("vaahcms-general-setting.save_settings_button"),
"clear_cache_button" => trans("vaahcms-general-setting.clear_cache_button"),
"allowed_file_size_for_upload" => trans("vaahcms-general-setting.allowed_file_size_for_upload"),
"copyright_link" => trans("vaahcms-general-setting.copyright_link"),
"max_number_of_forgot_password_attempts" => trans("vaahcms-general-setting.max_number_of_forgot_password_attempts"),
"backend_home_page_link" => trans("vaahcms-general-setting.backend_home_page_link"),
"localization_placeholder_select_a_language" => trans("vaahcms-localization-setting.localization_placeholder_select_a_language"),
"enter_custom_text" => trans("vaahcms-general-setting.enter_custom_text"),
"enter_custom_link" => trans("vaahcms-general-setting.enter_custom_link"),
"enter_redirection_link" => trans("vaahcms-general-setting.enter_redirection_link"),
"enable" => trans("vaahcms-general-setting.enable"),
"disable" => trans("vaahcms-general-setting.disable"),
"true" => trans("vaahcms-general-setting.true"),
"false" => trans("vaahcms-general-setting.false"),
"use_app_name" => trans("vaahcms-general-setting.use_app_name"),
"use_app_url" => trans("vaahcms-general-setting.use_app_url"),
"use_current_year" => trans("vaahcms-general-setting.use_current_year"),
"backend" => trans("vaahcms-general-setting.backend"),
"frontend" => trans("vaahcms-general-setting.frontend"),
"custom" => trans("vaahcms-general-setting.custom"),
];
}
//----------------------------------------------------------
public function getList(Request $request): JsonResponse
{
$permission_slug = 'has-access-of-setting-section';
Expand Down Expand Up @@ -128,7 +186,7 @@ public function storeSiteSettings(Request $request): JsonResponse

$response['success'] = true;
$response['data'][] = '';
$response['messages'][] = 'Settings successful saved';
$response['messages'][] = trans("vaahcms-general.settings_successful_saved");
} catch (\Exception $e) {
$response = [];
$response['success'] = false;
Expand Down Expand Up @@ -204,7 +262,7 @@ public function storeLinks(Request $request): JsonResponse
}

$response['success'] = true;
$response['messages'][] = 'Saved';
$response['messages'][] = trans("vaahcms-general.saved");
$response['data'] = $data;
} catch (\Exception $e) {
$response = [];
Expand Down Expand Up @@ -264,7 +322,7 @@ public function storeMetaTags(Request $request): JsonResponse
}

$response['success'] = true;
$response['messages'][] = 'Saved';
$response['messages'][] = trans("vaahcms-general.saved");
$response['data'] = $data;
} catch (\Exception $e) {
$response = [];
Expand Down
2 changes: 1 addition & 1 deletion Http/Controllers/Frontend/WelcomeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function clearCache(Request $request)
}

$response['success'] = true;
$response['messages'][] = 'Cache was successfully deleted.';
$response['messages'][] = trans("vaahcms-general-setting.cache_delete_message");

}catch(\Exception $e)
{
Expand Down
38 changes: 19 additions & 19 deletions Vue/vaahtwo/pages/settings/general/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
import { onMounted } from "vue";
import { useRoute } from 'vue-router';
import { useGeneralStore } from "../../../stores/settings/store-general_setting";
import { useRootStore } from "../../../stores/root";
import { vaah } from '../../../vaahvue/pinia/vaah';
import SiteSettings from './components/SiteSettings.vue';
import Securities from './components/Securities.vue';
import DateTime from './components/DateTime.vue';
import SocialMediaLink from './components/SocialMediaLink.vue';
import Script from './components/Scripts.vue';
import MetaTags from './components/MetaTags.vue'

const root = useRootStore();
const store = useGeneralStore();
const route = useRoute();

Expand All @@ -34,20 +35,20 @@ onMounted(async () => {

<template>
<div>
<Panel class="is-small">
<Panel class="is-small" v-if="store.assets">
<template class="p-1" #header>
<div class="flex flex-row">
<div>
<b class="mr-1">General Settings</b>
<div v-if="store.assets && store.assets.language_strings">
<b class="mr-1">{{store.assets.language_strings.general_settings_title}}</b>
</div>
</div>
</template>

<template #icons>
<div class="buttons">
<Button label="Expand all" icon="pi pi-angle-double-down" class="p-button-sm mr-2"
<Button :label="store.assets.language_strings.expand_all" icon="pi pi-angle-double-down" class="p-button-sm mr-2"
@click="store.expandAll"></Button>
<Button label="Collapse all" icon="pi pi-angle-double-up" class="p-button-sm"
<Button :label="store.assets.language_strings.collapse_all" icon="pi pi-angle-double-up" class="p-button-sm"
@click="store.collapseAll"></Button>
</div>
</template>
Expand All @@ -57,9 +58,8 @@ onMounted(async () => {
<template #header>
<div class="w-full">
<div>
<h5 class="font-semibold text-sm">Site Settings</h5>
<p class="text-color-secondary text-xs">After a successful password update, you will be redirected to
the login page where you can log in with your new password.</p>
<h5 class="font-semibold text-sm">{{ store.assets.language_strings.site_settings }}</h5>
<p class="text-color-secondary text-xs">{{ store.assets.language_strings.site_settings_message }}</p>
</div>
</div>
</template>
Expand All @@ -70,8 +70,8 @@ onMounted(async () => {
<AccordionTab>
<template #header>
<div class="w-full">
<h5 class="font-semibold text-sm">Securities</h5>
<p class="text-color-secondary text-xs">Enable and choose multiple methods of authentication</p>
<h5 class="font-semibold text-sm">{{ store.assets.language_strings.securities }}</h5>
<p class="text-color-secondary text-xs">{{ store.assets.language_strings.securities_message }}</p>
</div>
</template>

Expand All @@ -81,8 +81,8 @@ onMounted(async () => {
<AccordionTab>
<template #header>
<div class="w-full">
<h5 class="font-semibold text-sm">Date & Time</h5>
<p class="text-color-secondary text-xs">Global date and time settings.</p>
<h5 class="font-semibold text-sm">{{ store.assets.language_strings.date_and_time }}</h5>
<p class="text-color-secondary text-xs">{{ store.assets.language_strings.global_date_and_time_settings }}</p>
</div>
</template>

Expand All @@ -92,8 +92,8 @@ onMounted(async () => {
<AccordionTab>
<template #header>
<div class="w-full">
<h5 class="font-semibold text-sm">Social Media & Links</h5>
<p class="text-color-secondary text-xs">Static links management.</p>
<h5 class="font-semibold text-sm">{{ store.assets.language_strings.social_media_and_links }}</h5>
<p class="text-color-secondary text-xs">{{ store.assets.language_strings.static_links_management }}</p>
</div>
</template>

Expand All @@ -103,8 +103,8 @@ onMounted(async () => {
<AccordionTab>
<template #header>
<div class="w-full">
<h5 class="font-semibold text-sm">Scripts</h5>
<p class="text-color-secondary text-xs">Add scripts of Google Analytics and other tracking scripts.</p>
<h5 class="font-semibold text-sm">{{ store.assets.language_strings.scripts }}</h5>
<p class="text-color-secondary text-xs">{{ store.assets.language_strings.scripts_message }}</p>
</div>
</template>

Expand All @@ -114,8 +114,8 @@ onMounted(async () => {
<AccordionTab>
<template #header>
<div class="w-full">
<h5 class="font-semibold text-sm">Meta Tags</h5>
<p class="text-color-secondary text-xs">Global meta tags.</p>
<h5 class="font-semibold text-sm">{{ store.assets.language_strings.meta_tags }}</h5>
<p class="text-color-secondary text-xs">{{ store.assets.language_strings.global_meta_tags }}</p>
</div>
</template>

Expand Down
Loading