Skip to content

Commit

Permalink
Remove API_URL
Browse files Browse the repository at this point in the history
  • Loading branch information
TueeNguyen committed Apr 7, 2022
1 parent 059bf77 commit 3833b79
Show file tree
Hide file tree
Showing 13 changed files with 161 additions and 216 deletions.
3 changes: 0 additions & 3 deletions .eslintrc.js

This file was deleted.

6 changes: 0 additions & 6 deletions .github/workflows/docker-build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ on:
required: false
default: 'https://dev.telescope.cdot.systems'
type: string
api_url:
description: 'The microservice gateway URL (defaults to staging)'
required: false
default: 'https://dev.telescope.cdot.systems'
type: string
image_url:
description: 'The image microservice URL (defaults to staging)'
required: false
Expand Down Expand Up @@ -83,7 +78,6 @@ jobs:
image: nginx
build-args: |
WEB_URL=${{ inputs.web_url }}
API_URL=${{ inputs.api_url }}
IMAGE_URL=${{ inputs.image_url }}
SSO_URL=${{ inputs.sso_url }}
POSTS_URL=${{ inputs.posts_url }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
with:
deploy_tag: production
web_url: 'https://telescope.cdot.systems'
api_url: 'https://telescope.cdot.systems'
image_url: 'https://api.telescope.cdot.systems/v1/image'
sso_url: 'https://api.telescope.cdot.systems/v1/auth'
posts_url: 'https://api.telescope.cdot.systems/v1/posts'
Expand Down
2 changes: 0 additions & 2 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ tasks:
openMode: split-left
# Copying env.development and replacing 'localhost' with Gitpod urls
before: |
eval $(gp env -e API_URL=$(gp url 3000))
eval $(gp env -e WEB_URL=$(gp url 8000))
eval $(gp env -e API_HOST=$(gp url 8443))
eval $(gp env -e SSO_LOGIN_URL=$(gp url 8081))
Expand All @@ -15,7 +14,6 @@ tasks:
sed -r \
-e "s@(.+=)http://localhost:8000(/[^ ]*)*@\1$WEB_URL\2@g" \
-e "s@(.+=)http://localhost:3000(/[^ ]*)*@\1$API_URL\2@g" \
-e "s@(.+=)http://localhost:8081(/[^ ]*)*@\1$SSO_LOGIN_URL\2@g" \
-e "s@(.+=)http://kong:8000(/[^ ]*)*@\1$SUPABASE_API\2@g" \
-e "s@(.+=)http://localhost([^:]*)@\1$API_HOST\2@g" \
Expand Down
16 changes: 0 additions & 16 deletions config/env.development
Original file line number Diff line number Diff line change
Expand Up @@ -187,22 +187,6 @@ DEPENDENCY_DISCOVERY_URL=http://localhost/v1/dependency-discovery
# NODE_ENV should be one of "development" or "production"
NODE_ENV=development

# PORT is the port used by the web server
PORT=3000

# API_URL is the URL of the Telescope Web API server. Change this to
# pick which backend server our frontend uses. If you are developing
# locally, this will be localhost:{PORT}, probably http://localhost:3000.
# Other possible values include:
#
# (local development)
# API_URL=http://localhost:3000
# (our staging server)
# API_URL=https://dev.telescope.cdot.systems
# (our production server)
# API_URL=https://telescope.cdot.systems
API_URL=http://localhost:3000

# PROXY_FRONTEND=1 will allow proxying the Next dev server (http://localhost:8000)
# through our node server (http://localhost:3000). Useful for testing locally.
# To run:
Expand Down
5 changes: 0 additions & 5 deletions config/env.production
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,6 @@ DEPENDENCY_DISCOVERY_URL=https://api.telescope.cdot.systems/v1/dependency-discov
# NODE_ENV should be one of "development" or "production"
NODE_ENV=production

# PORT is the port used by the web server
PORT=3000

API_URL=https://telescope.cdot.systems

# LOG_LEVEL is used to set the level of debugging for the logs.
# info, error and debug are commonly used levels. See http://getpino.io/#/docs/api?id=level for more info on levels.
# to completely disable all logs, use silent.
Expand Down
5 changes: 0 additions & 5 deletions config/env.staging
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,6 @@ DEPENDENCY_DISCOVERY_URL=https://dev.api.telescope.cdot.systems/v1/dependency-di
# NODE_ENV should be one of "development" or "production"
NODE_ENV=production

# PORT is the port used by the web server
PORT=3000

API_URL=https://dev.telescope.cdot.systems

# LOG_LEVEL is used to set the level of debugging for the logs.
# info, error and debug are commonly used levels. See http://getpino.io/#/docs/api?id=level for more info on levels.
# to completely disable all logs, use silent.
Expand Down
2 changes: 0 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,6 @@ services:
args:
# Web front-end URL
- WEB_URL=${WEB_URL}
# Telescope 1.0 API URL
- API_URL=${API_URL}
# Telescope 2.0 Microservice URLs
- IMAGE_URL=${IMAGE_URL}
- SSO_URL=${SSO_URL}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"build": "pnpm turbo run build",
"dev": "pnpm dev --prefix src/web/app --",
"develop": "pnpm dev",
"eslint": "TIMING=1 eslint --config .eslintrc.js --ignore-path .gitignore",
"eslint-fix": "eslint --config .eslintrc.js --ignore-path .gitignore --fix",
"eslint": "TIMING=1 eslint --ignore-path .gitignore",
"eslint-fix": "eslint --ignore-path .gitignore --fix",
"lint": "pnpm turbo run lint && pnpm eslint",
"clean": "pnpm turbo run clean && pnpm -r exec rm -rf node_modules",
"prettier": "prettier --write \"./**/*.{md,jsx,json,html,css,js,yml,ts,tsx}\"",
Expand Down
Loading

0 comments on commit 3833b79

Please sign in to comment.