From 58f4a6c7cb5ad9da8d321f07a1293d02a445146c Mon Sep 17 00:00:00 2001 From: Noah Spannbauer Date: Sun, 19 Jan 2025 09:07:13 -0600 Subject: [PATCH] Refactoring --- app/src/components/siteNav/SiteNav.tsx | 29 +++++++++++++++----------- infrastructure/config/main.tf | 17 +++++++++++---- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/app/src/components/siteNav/SiteNav.tsx b/app/src/components/siteNav/SiteNav.tsx index d6eb623..00fc215 100644 --- a/app/src/components/siteNav/SiteNav.tsx +++ b/app/src/components/siteNav/SiteNav.tsx @@ -44,18 +44,23 @@ const SiteNav: React.FC = () => { } ]; const handleSignIn = async () => { - instance.handleRedirectPromise().then((response) => { - if (response) { - console.log(response) - console.log('successful login', response); - } else { - instance.loginRedirect({ - scopes: [`api://${import.meta.env.VITE_CLIENT_ID}/user_impersonation`] - }); - } - }).catch((error) => { - console.log(error); - }) + // instance.handleRedirectPromise().then((response) => { + // if (response) { + // console.log(response) + // console.log('successful login', response); + // } else { + // instance.loginRedirect({ + // scopes: [`api://${import.meta.env.VITE_CLIENT_ID}/user_impersonation`] + // }); + // } + // }).catch((error) => { + // console.log(error); + // }) + try { + await instance.loginPopup(); + } catch (err) { + console.log(err); + } }; const handleSignOut = () => { instance.logoutRedirect(); diff --git a/infrastructure/config/main.tf b/infrastructure/config/main.tf index 103dd1c..fd2b534 100644 --- a/infrastructure/config/main.tf +++ b/infrastructure/config/main.tf @@ -1,53 +1,62 @@ locals { container_app_app_name = { dev = "flying-app-dev" + test = "flying-app-test" + prod = "flying-app-prod" } container_app_app_container_image = { dev = "noahspan/flying-app:v0.0.1" + test = "noahspan/flying-app:v0.0.1" } container_app_app_container_name = { dev = "flying-app-dev" + test = "flying-app-test" } container_app_api_name = { dev = "flying-api-dev" + test = "flying-api-test" } container_app_api_container_image = { dev = "noahspan/flying-api:v0.0.1" + test = "noahspan/flying-api:v0.0.1" } container_app_api_container_name = { dev = "flying-api-dev" + test = "flying-api-test" } container_app_api_dapr_app_id = { dev = "flyingapidev" + test = "flyingapitest" } container_app_environment_name = { dev = "flying-dev" + test = "flying-test" } logbook_feature_flag_active = { dev = "true" - } - - key_vault_name = { - dev = "noahspanflyingkeyvault" + test = "true" } log_analytics_workspace_name = { dev = "flying-log-analytics-workspace-dev" + test = "flying-log-analytics-workspace-test" } pilots_feature_flag_active = { dev = "true" + test = "true" } storage_account_name = { dev = "noahspanflyingdev" + test = "noahspanflyingtest" } } \ No newline at end of file