Merge remote-tracking branch 'origin/main' into Profile
# Conflicts: # src/views/LoginView.vue
This commit is contained in:
@@ -1,3 +0,0 @@
|
|||||||
VITE_API_URL=https://localhost:5001/
|
|
||||||
VITE_GOOGLE_CLIENT_ID=468391910875-78sfopq1t12ulrv4f5vj227j45guuj66.apps.googleusercontent.com
|
|
||||||
VITE_FACEBOOK_APP_ID=1202001717489038
|
|
||||||
4
.env.dist
Normal file
4
.env.dist
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
VITE_API_URL=https:
|
||||||
|
VITE_STRIPE_API_KEY=
|
||||||
|
VITE_GOOGLE_CLIENT_ID=
|
||||||
|
VITE_FACEBOOK_APP_ID
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
VITE_API_URL=https://hutopy.azurewebsites.net/
|
|
||||||
VITE_GOOGLE_CLIENT_ID=468391910875-78sfopq1t12ulrv4f5vj227j45guuj66.apps.googleusercontent.com
|
|
||||||
VITE_FACEBOOK_APP_ID=1202001717489038
|
|
||||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -27,3 +27,8 @@ coverage
|
|||||||
*.sw?
|
*.sw?
|
||||||
|
|
||||||
*.tsbuildinfo
|
*.tsbuildinfo
|
||||||
|
|
||||||
|
# .Env files
|
||||||
|
.env.development
|
||||||
|
.env.production
|
||||||
|
.env
|
||||||
@@ -55,8 +55,7 @@ const isPaymentDialogActive = ref(false);
|
|||||||
var checkout;
|
var checkout;
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
// I removed api key to push. Need to get it from backend.
|
stripe = await loadStripe(import.meta.env.VITE_STRIPE_API_KEY);
|
||||||
stripe = await loadStripe('');
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const fetchClientSecret = async () => {
|
const fetchClientSecret = async () => {
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ export default defineConfig(({ mode }) => {
|
|||||||
},
|
},
|
||||||
define: {
|
define: {
|
||||||
// Define a global constant __APP_ENV__ based on loaded environment variables
|
// Define a global constant __APP_ENV__ based on loaded environment variables
|
||||||
VITE_API_URL: JSON.stringify(env.VITE_API_URL)
|
VITE_API_URL: JSON.stringify(env.VITE_API_URL),
|
||||||
|
VITE_STRIPE_API_KEY: JSON.stringify(env.VITE_STRIPE_API_KEY)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user