diff --git a/studio/pages/_app.tsx b/studio/pages/_app.tsx index 9b4d0badaa7..9420bc43e17 100644 --- a/studio/pages/_app.tsx +++ b/studio/pages/_app.tsx @@ -10,7 +10,6 @@ import 'styles/contextMenu.scss' import 'styles/react-data-grid-logs.scss' import 'styles/date-picker.scss' import 'styles/grid.scss' -import 'styles/join-organization-auth-code.scss' import dayjs from 'dayjs' import customParseFormat from 'dayjs/plugin/customParseFormat' diff --git a/studio/pages/join/[slug].tsx b/studio/pages/join/[slug].tsx index 7e1afbf4294..d92eec5b3af 100644 --- a/studio/pages/join/[slug].tsx +++ b/studio/pages/join/[slug].tsx @@ -26,7 +26,7 @@ const User = () => { const {slug, token} = router.query const { ui } = useStore() const [isSubmitting, setIsSubmitting] = useState( false ) - const [tokenValidationInfo, setTokenValidationInfo] = useState() + const [tokenValidationInfo, setTokenValidationInfo] = useState() const { token_does_not_exist, email_match, @@ -38,14 +38,13 @@ const User = () => { async function fetchTokenInfo() { const response = await get( `${API_URL}/organizations/${slug}/members/join?token=${token}`, {} ) - setTokenValidationInfo(response); - console.log({response}) + setTokenValidationInfo(response); } useEffect(() => { - if(router.query.token) { - fetchTokenInfo() - } + if(router.query.token) { + fetchTokenInfo() + } }, [] ) diff --git a/studio/pages/org/[slug]/settings.tsx b/studio/pages/org/[slug]/settings.tsx index 9e3409663e1..efb2b265249 100644 --- a/studio/pages/org/[slug]/settings.tsx +++ b/studio/pages/org/[slug]/settings.tsx @@ -172,35 +172,6 @@ const TabsView = observer(() => { console.log(toJS(organization)) const projects = app.projects.list((x: Project) => x.organization_id == organization?.id) - // useEffect(() => { - // if (window.location.hash) { - // console.log('has hash') - // changeTab(window.location.hash.slice(1).toUpperCase()); - // console.log(window.location.hash.slice(1).toUpperCase()) - // } - // },[]) - - // function onHashChangeStart() { - // console.log('route changed') - // changeTab(window.location.hash); - // } - -// useEffect(() => { -// const onHashChangeStart = () => { -// console.log(`Path changing`); -// }; - -// router.events.on("hashChangeStart", onHashChangeStart); - -// return () => { -// router.events.off("hashChangeStart", onHashChangeStart); -// }; -// }, [router.events]); - - // function changeTab(id: any) { - // //router.push(`/org/${toJS(PageState.organization.slug)}/settings#${id.toLowerCase()}`) - // } - return ( <>
diff --git a/studio/styles/join-organization-auth-code.scss b/studio/styles/join-organization-auth-code.scss deleted file mode 100644 index dd1df279b5d..00000000000 --- a/studio/styles/join-organization-auth-code.scss +++ /dev/null @@ -1,20 +0,0 @@ -// For the org/[ref]/join confirmation after a user has been invited to an org -.join-auth-code-container { - input + input { - @apply ml-2 - } - - > input { - @apply text-center; - @apply text-xl; - @apply text-scale-800; - - &:nth-child(5n+1) { - @apply ml-6 - } - } - - input:first-child { - @apply ml-0 - } -} \ No newline at end of file