From d5555117e574e50f217a10765862f5a870199689 Mon Sep 17 00:00:00 2001 From: Henit Chobisa Date: Thu, 21 Sep 2023 11:53:37 +0000 Subject: [PATCH 1/5] chore: shifted index page to /home route --- space/components/accounts/sign-in.tsx | 4 ++-- space/pages/home/index.tsx | 8 ++++++++ space/pages/index.tsx | 7 ++----- 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 space/pages/home/index.tsx diff --git a/space/components/accounts/sign-in.tsx b/space/components/accounts/sign-in.tsx index d3c29103dfd..858dd517305 100644 --- a/space/components/accounts/sign-in.tsx +++ b/space/components/accounts/sign-in.tsx @@ -33,7 +33,7 @@ export const SignInView = observer(() => { const onSignInSuccess = (response: any) => { const isOnboarded = response?.user?.onboarding_step?.profile_complete || false; - const nextPath = router.asPath.includes("next_path") ? router.asPath.split("/?next_path=")[1] : "/"; + const nextPath = router.asPath.includes("next_path") ? router.asPath.split("/?next_path=")[1] : "/home"; userStore.setCurrentUser(response?.user); @@ -41,7 +41,7 @@ export const SignInView = observer(() => { router.push(`/onboarding?next_path=${nextPath}`); return; } - router.push((nextPath ?? "/").toString()); + router.push((nextPath ?? "/home").toString()); }; const handleGoogleSignIn = async ({ clientId, credential }: any) => { diff --git a/space/pages/home/index.tsx b/space/pages/home/index.tsx new file mode 100644 index 00000000000..abd066c4314 --- /dev/null +++ b/space/pages/home/index.tsx @@ -0,0 +1,8 @@ +import React from "react"; + +// components +import { HomeView } from "components/views"; + +const HomePage = () => ; + +export default HomePage; \ No newline at end of file diff --git a/space/pages/index.tsx b/space/pages/index.tsx index fe0b7d33aca..5f346ccf887 100644 --- a/space/pages/index.tsx +++ b/space/pages/index.tsx @@ -1,8 +1,5 @@ import React from "react"; -// components -import { HomeView } from "components/views"; +const space = () => <>; -const HomePage = () => ; - -export default HomePage; +export default space; From 9558d88a40443454d2e2bd60d970796cf8f4fa3c Mon Sep 17 00:00:00 2001 From: Henit Chobisa Date: Thu, 21 Sep 2023 11:54:07 +0000 Subject: [PATCH 2/5] chore: added rewrite logic, to rewrite index to /home --- nginx/nginx.conf.template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template index 36a68fa5513..d44a4a74210 100644 --- a/nginx/nginx.conf.template +++ b/nginx/nginx.conf.template @@ -10,6 +10,11 @@ http { client_max_body_size ${FILE_SIZE_LIMIT}; + add_header X-Content-Type-Options "nosniff" always; + add_header Referrer-Policy "no-referrer-when-downgrade" always; + add_header Permissions-Policy "interest-cohort=()" always; + add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; + location / { proxy_pass http://planefrontend:3000/; } @@ -19,6 +24,7 @@ http { } location /spaces/ { + rewrite ^/spaces/?$ /spaces/home break; proxy_pass http://planedeploy:3000/spaces/; } @@ -26,4 +32,4 @@ http { proxy_pass http://plane-minio:9000/uploads/; } } -} \ No newline at end of file +} From 7311f6d40d9a15fa01f689232c019cdb7d34d50a Mon Sep 17 00:00:00 2001 From: Henit Chobisa Date: Fri, 22 Sep 2023 09:38:10 +0000 Subject: [PATCH 3/5] chore: routed home to login route as login page --- space/components/accounts/sign-in.tsx | 2 +- space/components/views/index.ts | 2 +- space/components/views/{home.tsx => login.tsx} | 2 +- space/pages/home/index.tsx | 8 -------- space/pages/index.tsx | 5 ----- space/pages/login/index.tsx | 8 ++++++++ 6 files changed, 11 insertions(+), 16 deletions(-) rename space/components/views/{home.tsx => login.tsx} (88%) delete mode 100644 space/pages/home/index.tsx delete mode 100644 space/pages/index.tsx create mode 100644 space/pages/login/index.tsx diff --git a/space/components/accounts/sign-in.tsx b/space/components/accounts/sign-in.tsx index 858dd517305..ca6aa9e4729 100644 --- a/space/components/accounts/sign-in.tsx +++ b/space/components/accounts/sign-in.tsx @@ -41,7 +41,7 @@ export const SignInView = observer(() => { router.push(`/onboarding?next_path=${nextPath}`); return; } - router.push((nextPath ?? "/home").toString()); + router.push((nextPath ?? "/login").toString()); }; const handleGoogleSignIn = async ({ clientId, credential }: any) => { diff --git a/space/components/views/index.ts b/space/components/views/index.ts index 84d36cd2911..f54d11bdd2c 100644 --- a/space/components/views/index.ts +++ b/space/components/views/index.ts @@ -1 +1 @@ -export * from "./home"; +export * from "./login"; diff --git a/space/components/views/home.tsx b/space/components/views/login.tsx similarity index 88% rename from space/components/views/home.tsx rename to space/components/views/login.tsx index 999fce0734e..d01a226811f 100644 --- a/space/components/views/home.tsx +++ b/space/components/views/login.tsx @@ -4,7 +4,7 @@ import { useMobxStore } from "lib/mobx/store-provider"; // components import { SignInView, UserLoggedIn } from "components/accounts"; -export const HomeView = observer(() => { +export const LoginView = observer(() => { const { user: userStore } = useMobxStore(); if (!userStore.currentUser) return ; diff --git a/space/pages/home/index.tsx b/space/pages/home/index.tsx deleted file mode 100644 index abd066c4314..00000000000 --- a/space/pages/home/index.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import React from "react"; - -// components -import { HomeView } from "components/views"; - -const HomePage = () => ; - -export default HomePage; \ No newline at end of file diff --git a/space/pages/index.tsx b/space/pages/index.tsx deleted file mode 100644 index 5f346ccf887..00000000000 --- a/space/pages/index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import React from "react"; - -const space = () => <>; - -export default space; diff --git a/space/pages/login/index.tsx b/space/pages/login/index.tsx new file mode 100644 index 00000000000..a80eff8736d --- /dev/null +++ b/space/pages/login/index.tsx @@ -0,0 +1,8 @@ +import React from "react"; + +// components +import { LoginView } from "components/views"; + +const LoginPage = () => ; + +export default LoginPage; \ No newline at end of file From e7489e34492fdbe579c1c3a298f2dae265358f24 Mon Sep 17 00:00:00 2001 From: Henit Chobisa Date: Fri, 22 Sep 2023 09:39:04 +0000 Subject: [PATCH 4/5] chore: updated nginx config to route to login --- nginx/nginx.conf.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template index d44a4a74210..87dce011447 100644 --- a/nginx/nginx.conf.template +++ b/nginx/nginx.conf.template @@ -24,7 +24,7 @@ http { } location /spaces/ { - rewrite ^/spaces/?$ /spaces/home break; + rewrite ^/spaces/?$ /spaces/login break; proxy_pass http://planedeploy:3000/spaces/; } From 6d52e7b5b67000943c4594c61c63e07ffd1f7a4b Mon Sep 17 00:00:00 2001 From: Henit Chobisa Date: Fri, 22 Sep 2023 10:55:17 +0000 Subject: [PATCH 5/5] chore: updated path for home --- space/components/accounts/sign-in.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/space/components/accounts/sign-in.tsx b/space/components/accounts/sign-in.tsx index ca6aa9e4729..c6a151d4423 100644 --- a/space/components/accounts/sign-in.tsx +++ b/space/components/accounts/sign-in.tsx @@ -33,7 +33,7 @@ export const SignInView = observer(() => { const onSignInSuccess = (response: any) => { const isOnboarded = response?.user?.onboarding_step?.profile_complete || false; - const nextPath = router.asPath.includes("next_path") ? router.asPath.split("/?next_path=")[1] : "/home"; + const nextPath = router.asPath.includes("next_path") ? router.asPath.split("/?next_path=")[1] : "/login"; userStore.setCurrentUser(response?.user);