diff --git a/DEV.md b/DEV.md index b8b59982..a1ff5ed6 100644 --- a/DEV.md +++ b/DEV.md @@ -96,7 +96,7 @@ and then open the link after replacing the port number from `14400` to `1421` (i - run a local instance of `ngaccount`. this is useful if you want to test or develop the ngaccount part of the flow.. -See the [README of ngaccount here](ngaccount/README.md). +See the [README of ngaccount here](helpers/ngaccount/README.md). Then you need to stop your ngd and start it again with the additional option : diff --git a/helpers/ngaccount/.env b/helpers/ngaccount/.env index 689de724..6bd7a317 100644 --- a/helpers/ngaccount/.env +++ b/helpers/ngaccount/.env @@ -1,5 +1,5 @@ export NG_ACCOUNT_DOMAIN=test.com -export NG_ACCOUNT_ADMIN=vC1HC5YZQppsHUkerBe2oXoNjAlleuvkpXpdUIWnRO8A +export NG_ACCOUNT_ADMIN=faawtBft5W3A5gonvvbsdaq3pM0HgAErJLYV247CJuIA export NG_ACCOUNT_LOCAL_PEER_KEY=5Q2FBa_VrUSGgJtsKc9Zstrtr0PyZYEgmeGxgtjrIo4A -export NG_ACCOUNT_SERVER=127.0.0.1,14400,95h47CSgbyHyHU4NAiaBd3hE76VONaQHlG9Mx0aJOLUA +export NG_ACCOUNT_SERVER=127.0.0.1,14400,AwJV2GoA-7_CdJ2XHeErtjokqZkuKdHz4engPCJvnJUA export RUST_LOG=debug diff --git a/helpers/ngaccount/.gitignore b/helpers/ngaccount/.gitignore index 6bfe6b19..de7703a7 100644 --- a/helpers/ngaccount/.gitignore +++ b/helpers/ngaccount/.gitignore @@ -1 +1,2 @@ log +.env \ No newline at end of file diff --git a/ng-app/src/api.ts b/ng-app/src/api.ts index 8cd82e5d..27bb97f2 100644 --- a/ng-app/src/api.ts +++ b/ng-app/src/api.ts @@ -344,7 +344,7 @@ export const NG_EU_BSP_REGISTER = import.meta.env.PROD export const NG_ONE_BSP = "https://nextgraph.one"; export const NG_ONE_BSP_REGISTER = import.meta.env.PROD ? "https://account.nextgraph.one/#/create" -: "http://account-dev.nextgraph.one:5173/#/create"; +: "http://account-dev.nextgraph.eu:5173/#/create"; export const APP_ACCOUNT_REGISTERED_SUFFIX = "/#/user/registered"; export const APP_WALLET_CREATE_SUFFIX = "/#/wallet/create"; diff --git a/ng-app/src/routes/WalletCreate.svelte b/ng-app/src/routes/WalletCreate.svelte index 632d9698..dd7b6759 100644 --- a/ng-app/src/routes/WalletCreate.svelte +++ b/ng-app/src/routes/WalletCreate.svelte @@ -206,10 +206,10 @@ : "http://localhost:3030/api/v1/"; const redirect_server = import.meta.env.NG_REDIR_SERVER || "nextgraph.net"; - const bootstrap_redirect = import.meta.env.DEV - ? "http://localhost:14403/#/?b=" - : import.meta.env.NG_DEV - ? "http://localhost:1421/bootstrap.html#/?b=" + const bootstrap_redirect = import.meta.env.NG_DEV + ? "http://localhost:1421/bootstrap.html#/?b=" + : import.meta.env.DEV + ? "http://localhost:14403/#/?b=" : import.meta.env.NG_DEV3 ? "http://127.0.0.1:3033/bootstrap/#/?b=" : `https://${redirect_server}/bootstrap/#/?b=`; @@ -249,7 +249,8 @@ } else if ( (param.get("rs") || param.get("i")) && !tauri_platform && - !param.get("ab") + !param.get("ab") && + !import.meta.env.NG_NO_REDIRECT ) { registration_success = param.get("rs");