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

Load the local hostname's config, where possible #2071

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
+15 −3
Open

Load the local hostname's config, where possible #2071

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ea2d15
Load the local hostname's config, where possible
nexy7574 Nov 30, 2024
a333153
Don't try to load a local site config in development mode
nexy7574 Dec 15, 2024
d800f41
Only load site config in non-dev mode + try loading config first
nexy7574 Dec 15, 2024
97f8032
Merge branch 'dev' of https://github.com/cinnyapp/cinny into nexy7574…
nexy7574 Jan 5, 2025
50bb5b2
committed the wrong file
nexy7574 Jan 13, 2025
f830d10
Load configurations in parallel & stop suppressing errors
nexy7574 Jan 13, 2025
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
23 changes: 20 additions & 3 deletions src/app/components/ClientConfigLoader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,26 @@ import { ClientConfig } from '../hooks/useClientConfig';
import { trimTrailingSlash } from '../utils/common';

const getClientConfig = async (): Promise<ClientConfig> => {
const url = `${trimTrailingSlash(import.meta.env.BASE_URL)}/config.json`;
const config = await fetch(url, { method: 'GET' });
return config.json();
let url = `${trimTrailingSlash(import.meta.env.BASE_URL)}/config.${window.location.hostname}.json`;
let config = await fetch(url, { method: 'GET' });

let loadedConfig = null;
try {
if(config.ok && import.meta.env.MODE != "development") {
loadedConfig = await config.json();
}
} catch (e) {}

if(!loadedConfig) {
url = `${trimTrailingSlash(import.meta.env.BASE_URL)}/config.json`;
config = await fetch(url, { method: 'GET' });
try {
loadedConfig = await config.json();
} catch (e) {
return {};
}
}
nexy7574 marked this conversation as resolved.
Show resolved Hide resolved
nexy7574 marked this conversation as resolved.
Show resolved Hide resolved
return loadedConfig;
};

type ClientConfigLoaderProps = {
Expand Down
Loading