ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Have separate SITE_URL env from API_URL (#234)

Browse Source
This commit is contained in:
Frank Noirot
2023-08-07 13:07:40 -04:00
committed by GitHub
parent 62dc07e117
commit 6e14dbaf77
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@ -1,2 +1,3 @@
VITE_KC_API_WS_MODELING_URL=wss://api.dev.kittycad.io/ws/modeling/commands VITE_KC_API_WS_MODELING_URL=wss://api.dev.kittycad.io/ws/modeling/commands
VITE_KC_API_BASE_URL=https://api.dev.kittycad.io VITE_KC_API_BASE_URL=https://api.dev.kittycad.io
VITE_KC_SITE_BASE_URL=https://dev.kittycad.io

1
.env.production
View File

@ -1,2 +1,3 @@
VITE_KC_API_WS_MODELING_URL=wss://api.kittycad.io/ws/modeling/commands VITE_KC_API_WS_MODELING_URL=wss://api.kittycad.io/ws/modeling/commands
VITE_KC_API_BASE_URL=https://api.kittycad.io VITE_KC_API_BASE_URL=https://api.kittycad.io
VITE_KC_SITE_BASE_URL=https://kittycad.io

1
src/env.ts
View File

@ -9,3 +9,4 @@ export const VITE_KC_API_WS_MODELING_URL = import.meta.env
.VITE_KC_API_WS_MODELING_URL .VITE_KC_API_WS_MODELING_URL
// @ts-ignore // @ts-ignore
export const VITE_KC_API_BASE_URL = import.meta.env.VITE_KC_API_BASE_URL export const VITE_KC_API_BASE_URL = import.meta.env.VITE_KC_API_BASE_URL
export const VITE_KC_SITE_BASE_URL = import.meta.env.VITE_KC_SITE_BASE_URL

4
src/routes/SignIn.tsx
View File

@ -4,7 +4,7 @@ import { isTauri } from '../lib/isTauri'
import { useStore } from '../useStore' import { useStore } from '../useStore'
import { invoke } from '@tauri-apps/api/tauri' import { invoke } from '@tauri-apps/api/tauri'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import { VITE_KC_API_BASE_URL } from '../env' import { VITE_KC_SITE_BASE_URL } from '../env'
const SignIn = () => { const SignIn = () => {
const navigate = useNavigate() const navigate = useNavigate()
@ -69,7 +69,7 @@ const SignIn = () => {
) : ( ) : (
<ActionButton <ActionButton
Element="link" Element="link"
to={`${VITE_KC_API_BASE_URL}/signin?callbackUrl=${encodeURIComponent( to={`${VITE_KC_SITE_BASE_URL}/signin?callbackUrl=${encodeURIComponent(
typeof window !== 'undefined' && typeof window !== 'undefined' &&
window.location.href.replace('signin', '') window.location.href.replace('signin', '')
)}`} )}`}