Skip to content
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
2 changes: 1 addition & 1 deletion assets/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/app.js

Large diffs are not rendered by default.

152 changes: 152 additions & 0 deletions resources/js/admin/SettingsPage.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
import http from '../utils/http';

export interface GeneralSettings {
site_name: string;
logo_url: string;
support_email: string;
timezone: string;
default_language: string;
}

export interface SeoSettings {
meta_title: string;
meta_description: string;
og_image_url: string;
}

export interface EmailSettings {
smtp_host: string;
smtp_port: string;
sender_name: string;
default_reply_to: string;
}


export interface SettingsState {
general: GeneralSettings;
seo: SeoSettings;
email: EmailSettings;
}

export function settingsPage() {
return {
activeTab: 'general', // 'general' | 'seo' | 'email'
loading: false,
saving: false,
errorMessage: '',
successMessage: '',
initialized: false,
isDirty: false,
originalDataJson: '',

form: {
general: {
site_name: '',
logo_url: '',
support_email: '',
timezone: 'UTC',
default_language: 'en',
},
seo: {
meta_title: '',
meta_description: '',
og_image_url: '',
},
email: {
smtp_host: '',
smtp_port: '587',
sender_name: '',
default_reply_to: '',
}
} as SettingsState,

async init() {
if (this.initialized) return;
this.initialized = true;

await this.fetchSettings();

window.addEventListener('beforeunload', (e) => {
if (this.isDirty) {
e.preventDefault();
e.returnValue = '';
}
});
},

markDirty() {
this.isDirty = true;
},

async fetchSettings() {
this.loading = true;
this.errorMessage = '';
try {
const data = await http.get('/api/v1/settings');
if (data) {
this.form = {
general: { ...this.form.general, ...(data.general || {}) },
seo: { ...this.form.seo, ...(data.seo || {}) },
email: { ...this.form.email, ...(data.email || {}) },
};
this.originalDataJson = JSON.stringify(this.form);
this.isDirty = false;
}
} catch (err: any) {
this.errorMessage = err.message || 'Failed to fetch settings.';
} finally {
this.loading = false;
}
},

discardChanges() {
if (this.originalDataJson) {
this.form = JSON.parse(this.originalDataJson);
this.isDirty = false;
this.successMessage = 'Changes discarded.';
setTimeout(() => {
this.successMessage = '';
}, 3000);
}
},

async saveSettings() {
this.errorMessage = '';
this.successMessage = '';

// Basic validation
if (!this.form.general.site_name.trim()) {
this.activeTab = 'general';
this.errorMessage = 'Site name is required in General settings.';
return;
}
if (!this.form.general.support_email.trim()) {
this.activeTab = 'general';
this.errorMessage = 'Support email is required in General settings.';
return;
}

this.saving = true;
try {
const updated = await http.put('/api/v1/settings', this.form);
if (updated) {
this.form = {
general: { ...this.form.general, ...(updated.general || {}) },
seo: { ...this.form.seo, ...(updated.seo || {}) },
email: { ...this.form.email, ...(updated.email || {}) },
};
this.originalDataJson = JSON.stringify(this.form);
this.isDirty = false;
this.successMessage = 'Settings saved successfully.';
setTimeout(() => {
this.successMessage = '';
}, 4000);
}
} catch (err: any) {
this.errorMessage = err.message || 'Failed to save settings.';
} finally {
this.saving = false;
}
},
};
}
4 changes: 4 additions & 0 deletions resources/js/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { apiKeyCreatePage } from "./api_key/ApiKeyCreatePage";
import { apiKeyEditPage } from "./api_key/ApiKeyEditPage";
import { appLayout } from "./layouts/AppLayout";
import { adminProfilePage } from "./admin/AdminProfilePage";
import { settingsPage } from "./admin/SettingsPage";

declare global {
interface Window {
Expand All @@ -38,6 +39,7 @@ declare global {
apiKeyEditPage: typeof apiKeyEditPage;
appLayout: typeof appLayout;
adminProfilePage: typeof adminProfilePage;
settingsPage: typeof settingsPage;
}
}

Expand All @@ -58,6 +60,7 @@ window.apiKeyCreatePage = apiKeyCreatePage;
window.apiKeyEditPage = apiKeyEditPage;
window.appLayout = appLayout;
window.adminProfilePage = adminProfilePage;
window.settingsPage = settingsPage;

if (window.Alpine) {
window.Alpine.data("appLayout", appLayout);
Expand All @@ -77,6 +80,7 @@ if (window.Alpine) {
window.Alpine.data("apiKeyCreatePage", apiKeyCreatePage);
window.Alpine.data("apiKeyEditPage", apiKeyEditPage);
window.Alpine.data("adminProfilePage", adminProfilePage);
window.Alpine.data("settingsPage", settingsPage);
}

const initApp = () => {
Expand Down
3 changes: 3 additions & 0 deletions src/api/rest_api_routes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ use crate::interfaces::api::{
create_api_key_handler, delete_api_key_handler, fetch_api_key_handler,
paginate_api_keys_handler, update_api_key_handler,
},
setting::{fetch_settings_handler, update_settings_handler},
};
use axum::{
http::HeaderValue,
Expand Down Expand Up @@ -139,6 +140,8 @@ pub fn rest_api_routes(state: AppState) -> crate::error::Result<Router> {
"/api/v1/admin/me/password",
put(crate::interfaces::api::auth::change_password_handler),
)
.route("/api/v1/settings", get(fetch_settings_handler))
.route("/api/v1/settings", put(update_settings_handler))
.layer(axum::middleware::from_fn_with_state(
state.clone(),
auth_middleware::check_auth,
Expand Down
16 changes: 13 additions & 3 deletions src/avored_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ use leptos::config::LeptosOptions;

use crate::{
core::application::use_cases::{
AuthUseCase, EmailTemplateUseCase, EntityUseCase, MiscUseCase, WorkflowUseCase,
ApiKeyUseCase,
ApiKeyUseCase, AuthUseCase, EmailTemplateUseCase, EntityUseCase, MiscUseCase,
SettingUseCase, WorkflowUseCase,
},
infrastructure::persistence::{
api_key_repository::ApiKeyRepositoryImpl,
email_template_repository::EmailTemplateRepositoryImpl,
entity_repository::EntityRepositoryImpl, misc_repository::MiscRepositoryImpl,
setting_repository::SettingRepositoryImpl,
workflow_repository::WorkflowRepositoryImpl, AuthRepositoryImpl,
api_key_repository::ApiKeyRepositoryImpl,
},
infrastructure::workflow_dispatcher::{HttpWebhookExecutor, WorkflowDispatcher},
providers::{
Expand Down Expand Up @@ -40,6 +41,8 @@ pub struct AppState {

pub api_key_use_case: ApiKeyUseCase<ApiKeyRepositoryImpl>,

pub setting_use_case: SettingUseCase<SettingRepositoryImpl>,

// pub attribute_use_case: AttributeUseCase<AttributeRepositoryImpl>,
/// Database provider for `AvoRed` (SurrealDB).
pub database_provider: Arc<AvoRedDatabaseProvider>,
Expand Down Expand Up @@ -82,6 +85,9 @@ impl AppState {
let api_key_repository = ApiKeyRepositoryImpl::new(avored_database_provider.clone());
let api_key_use_case = ApiKeyUseCase::new(api_key_repository);

let setting_repository = SettingRepositoryImpl::new(avored_database_provider.clone());
let setting_use_case = SettingUseCase::new(setting_repository);

// let attribute_repository = AttributeRepositoryImpl::new(avored_database_provider.clone());
// let attribute_use_case = AttributeUseCase::new(attribute_repository);

Expand All @@ -96,6 +102,7 @@ impl AppState {
workflow_use_case,
workflow_dispatcher,
api_key_use_case,
setting_use_case,
// attribute_use_case
})
}
Expand All @@ -120,6 +127,8 @@ pub async fn test_avored_state() -> AppState {
WorkflowDispatcher::new(workflow_use_case.clone(), HttpWebhookExecutor::new());
let api_key_repository = ApiKeyRepositoryImpl::new(database_provider.clone());
let api_key_use_case = ApiKeyUseCase::new(api_key_repository);
let setting_repository = SettingRepositoryImpl::new(database_provider.clone());
let setting_use_case = SettingUseCase::new(setting_repository);
// let attribute_repository = AttributeRepositoryImpl::new(database_provider.clone());

AppState {
Expand All @@ -133,6 +142,7 @@ pub async fn test_avored_state() -> AppState {
workflow_use_case,
workflow_dispatcher,
api_key_use_case,
setting_use_case,
// attribute_use_case: AttributeUseCase::new(attribute_repository),
database_provider,
config: Arc::new(AvoRedConfigProvider {
Expand Down
1 change: 1 addition & 0 deletions src/core/application/dtos/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ pub use workflow_dto::{
};

pub mod api_key_dto;
pub mod setting_dto;
39 changes: 39 additions & 0 deletions src/core/application/dtos/setting_dto.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
use serde::{Deserialize, Serialize};

#[derive(Debug, Clone, Serialize, Deserialize, Default)]
pub struct GeneralSettingsDto {
pub site_name: String,
pub logo_url: String,
pub support_email: String,
pub timezone: String,
pub default_language: String,
}

#[derive(Debug, Clone, Serialize, Deserialize, Default)]
pub struct SeoSettingsDto {
pub meta_title: String,
pub meta_description: String,
pub og_image_url: String,
}

#[derive(Debug, Clone, Serialize, Deserialize, Default)]
pub struct EmailSettingsDto {
pub smtp_host: String,
pub smtp_port: String,
pub sender_name: String,
pub default_reply_to: String,
}

#[derive(Debug, Clone, Serialize, Deserialize, Default)]
pub struct SettingsGroupResponse {
pub general: GeneralSettingsDto,
pub seo: SeoSettingsDto,
pub email: EmailSettingsDto,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct UpdateSettingsPayload {
pub general: GeneralSettingsDto,
pub seo: SeoSettingsDto,
pub email: EmailSettingsDto,
}
3 changes: 3 additions & 0 deletions src/core/application/use_cases/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ pub use workflow_use_case::WorkflowUseCase;
pub mod api_key_use_case;
pub use api_key_use_case::ApiKeyUseCase;

pub mod setting_use_case;
pub use setting_use_case::SettingUseCase;

// pub mod attribute_use_case;

// pub use attribute_use_case::AttributeUseCase;
Loading
Loading