diff --git a/Components/Repo/QuickCommands/QuickCommands.js b/Components/Repo/QuickCommands/QuickCommands.js index bfdd549..bccd985 100644 --- a/Components/Repo/QuickCommands/QuickCommands.js +++ b/Components/Repo/QuickCommands/QuickCommands.js @@ -6,20 +6,21 @@ import { IconSettingsAutomation, IconCopy } from '@tabler/icons-react'; export default function QuickCommands(props) { ////Vars + const wizardEnv = props.wizardEnv; //Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled. let HOSTNAME; let SSH_SERVER_PORT; - let UNIX_USER = process.env.NEXT_PUBLIC_UNIX_USER; + let UNIX_USER; if ( props.lanCommand && - process.env.NEXT_PUBLIC_HOSTNAME_LAN && - process.env.NEXT_PUBLIC_SSH_SERVER_PORT_LAN + wizardEnv.HOSTNAME_LAN && + wizardEnv.SSH_SERVER_PORT_LAN ) { - HOSTNAME = process.env.NEXT_PUBLIC_HOSTNAME_LAN; - SSH_SERVER_PORT = process.env.NEXT_PUBLIC_SSH_SERVER_PORT_LAN; + HOSTNAME = wizardEnv.HOSTNAME_LAN; + SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT_LAN; } else { - HOSTNAME = process.env.NEXT_PUBLIC_HOSTNAME; - SSH_SERVER_PORT = process.env.NEXT_PUBLIC_SSH_SERVER_PORT; + HOSTNAME = wizardEnv.HOSTNAME; + SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT; } //State diff --git a/Components/Repo/Repo.js b/Components/Repo/Repo.js index e8517dd..1d1cb03 100644 --- a/Components/Repo/Repo.js +++ b/Components/Repo/Repo.js @@ -80,6 +80,7 @@ export default function Repo(props) { diff --git a/Containers/RepoList/RepoList.js b/Containers/RepoList/RepoList.js index 352e131..2bbf642 100644 --- a/Containers/RepoList/RepoList.js +++ b/Containers/RepoList/RepoList.js @@ -43,11 +43,27 @@ export default function RepoList() { if (router.pathname.startsWith('/manage-repo/edit')) { setDisplayRepoEdit(!displayRepoEdit); } + //Fetch wizardEnv to hydrate Repo components + const fetchWizardEnv = async () => { + try { + const response = await fetch('/api/account/getWizardEnv', { + method: 'GET', + headers: { + 'Content-type': 'application/json', + }, + }); + setWizardEnv((await response.json()).wizardEnv); + } catch (error) { + console.log('Fetching datas error'); + } + }; + fetchWizardEnv(); }, []); ////States const [displayRepoAdd, setDisplayRepoAdd] = useState(false); const [displayRepoEdit, setDisplayRepoEdit] = useState(false); + const [wizardEnv, setWizardEnv] = useState({}); ////Functions @@ -107,6 +123,7 @@ export default function RepoList() { comment={repo.comment} lanCommand={repo.lanCommand} repoManageEditHandler={() => repoManageEditHandler(repo.id)} + wizardEnv={wizardEnv} > );