Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix vercel deployments #18

Merged
merged 21 commits into from
Jan 13, 2021
+1,936 −14
Merged

Fix vercel deployments #18

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
76ae32f
Change variables to start with REACT_APP
mattwalo32 Jan 12, 2021
521dfa1
Use VERCEL_URL variable
mattwalo32 Jan 12, 2021
538faec
Fix conflict
mattwalo32 Jan 12, 2021
d2c01e2
ignore all .env files
mattwalo32 Jan 12, 2021
21fa001
Change mongo var name
mattwalo32 Jan 12, 2021
5c378ff
Fix variable name typo
mattwalo32 Jan 12, 2021
ed70b9e
Run formatter
mattwalo32 Jan 12, 2021
a784345
Deleted failing test
mattwalo32 Jan 12, 2021
50580cc
Add flag to pass with no tests
mattwalo32 Jan 12, 2021
e831e0d
Remove vercel dependency
mattwalo32 Jan 12, 2021
cc0868f
Remove REACT_APP prefix
mattwalo32 Jan 12, 2021
4e00a10
Remove .env files
mattwalo32 Jan 12, 2021
41d4a05
Remove global dependency
mattwalo32 Jan 12, 2021
3a8c832
Readd env files
mattwalo32 Jan 13, 2021
0d38ca6
Resolve conflict
mattwalo32 Jan 13, 2021
daecc04
gitignore env files
mattwalo32 Jan 13, 2021
7b70722
Add test back
mattwalo32 Jan 13, 2021
927ba1f
Delete dev.env
mattwalo32 Jan 13, 2021
82f9697
Resolve merge conflict
mattwalo32 Jan 13, 2021
7d6b21c
Merge branch 'fix-vercel-deployments' of https://github.com/hack4impa…
mattwalo32 Jan 13, 2021
a2153c6
Remove "pass with no tests" flag
mattwalo32 Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ typings/
.yarn-integrity

# dotenv environment variables file
.env
.env.test
#*.env
#*.env.test
#*.env.production
mattwalo32 marked this conversation as resolved.
Show resolved Hide resolved

# parcel-bundler cache (https://parceljs.org/)
.cache
Expand Down Expand Up @@ -103,5 +104,5 @@ dist
# TernJS port file
.tern-port

# Env files
api/config/*
# Vercel
.vercel
Empty file modified api/bin/www
100755 → 100644
View file
Open in desktop
Empty file.
5 changes: 5 additions & 0 deletions api/config/dev.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
MONGO_URL=mongodb+srv://memberdb-admin:[email protected]/dev?retryWrites=true&w=majority
GOOGLE_CLIENT_ID=660704467078-j1cehuk1cr74vctddhh261am13nama98.apps.googleusercontent.com
GOOGLE_CLIENT_SECRET=AJvH31jF850hDEYCcyKc2nan
OAUTH_CALLBACK_URI=http://localhost:9000/api/auth/callback
SESSION_SECRET=keyboard cat
mattwalo32 marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions api/config/production.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MONGO_URL=production-mongo
1 change: 1 addition & 0 deletions api/config/test.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MONGO_URL=test-mongo
2 changes: 1 addition & 1 deletion api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"lint": "eslint --fix src -c .eslintrc.json --ext js",
"format": "prettier --write \"./**/*.{js,jsx,json,md}\"",
"format:check": "prettier --check \"./**/*.{js,jsx,json,md}\"",
"test": "jest"
"test": "jest --passWithNoTests"
mattwalo32 marked this conversation as resolved.
Show resolved Hide resolved
},
"dependencies": {
"cors": "^2.8.5",
Expand Down
26 changes: 0 additions & 26 deletions api/test/home.test.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions client/.env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
REACT_APP_VERCEL_URL=${VERCEL_URL}
Empty file modified client/public/apple-touch-icon.png
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified client/public/favicon.ico
100755 → 100644
View file
Open in desktop
Empty file.
4 changes: 3 additions & 1 deletion client/src/utils/apiWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import axios from 'axios';

const BASE_URL = process.env.BACKEND_URL ?? 'http://localhost:9000/api';
const BASE_URL = process.env.REACT_APP_VERCEL_URL
? `https://${process.env.REACT_APP_VERCEL_URL}/api`
: 'http://localhost:9000/api';

/**
* Returns a sample API response to demonstrate a working backend
Expand Down
5 changes: 0 additions & 5 deletions vercel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{
"regions": ["iad1"],
"build": {
"env": {
"BACKEND_URL": "@memberdb_tool_backend_url"
}
},
"env": {
"MONGO_URL": "@memberdb_tool_db_url"
},
Expand Down
Loading