Skip to content

Commit

Permalink
Release 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kyY00n authored Aug 26, 2023
2 parents fe463bb + 32cacac commit 5ded19b
Show file tree
Hide file tree
Showing 70 changed files with 1,791 additions and 251 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"plugins": ["@typescript-eslint", "prettier"],
"overrides": [
{
"files": ["*.ts", "*.tsx"], // Your TypeScript files extension
"files": ["*.ts", "*.tsx", "*.spec.ts"], // Your TypeScript files extension

// As mentioned in the comments, you should extend TypeScript plugins here,
// instead of extending them outside the `overrides`.
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/deploy-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,27 @@ name: build and push code
on:
push:
branches:
- develop
- development
- sprint/**
jobs:
git-push:
name: build and push
runs-on: ubuntu-latest
steps:
- name: Extract branch name
shell: bash
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
id: extract_branch
- uses: actions/checkout@v2
- uses: borales/actions-yarn@v3.0.0
with:
cmd: install # will run `yarn install` command
- uses: borales/actions-yarn@v3.0.0
with:
cmd: build # will run `yarn build` command
- name: ls /dist
shell: bash
run: ls dist
- uses: cpina/github-action-push-to-another-repository@main
env:
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
Expand All @@ -23,11 +31,5 @@ jobs:
destination-github-username: 'TeamPiickle'
destination-repository-name: 'express-build'
user-email: dev.kayoung@gmail.com
target-branch: develop
# deploy:
# name: deploy pm2
# needs: git-push
# runs-on: [self-hosted, development]
# steps:
# - name: run shell script
# run: /home/ubuntu/deploy-piickle-server.sh
target-branch: ${{ steps.extract_branch.outputs.branch }}
create-target-branch-if-needed: true
161 changes: 157 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"typescript": "^4.7.4"
},
"dependencies": {
"@sentry/node": "^7.57.0",
"@slack/client": "^5.0.2",
"@types/bcrypt": "^5.0.0",
"@types/bcryptjs": "^2.4.2",
Expand All @@ -59,6 +60,7 @@
"express-validator": "^6.14.0",
"firebase": "^9.9.3",
"helmet": "^5.1.0",
"install": "^0.13.0",
"jsonwebtoken": "^8.5.1",
"mongoose": "^6.3.1",
"multer": "^1.4.4",
Expand Down
15 changes: 14 additions & 1 deletion src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ const MONGO_URI =
? process.env.MONGODB_URI
: process.env.MONGODB_DEVELOPMENT_URI;

const WEB_APP_URL =
NODE_ENV == 'production'
? process.env.WEB_APP_URL
: process.env.WEB_APP_DEV_URL;

export default {
nodeEnv: NODE_ENV,
port: parseInt(process.env.PORT as string, 10),

/**
Expand Down Expand Up @@ -55,5 +61,12 @@ export default {
prod: process.env.SIGN_UP_REDIRECTION_PROD_URL as string,
dev: process.env.SIGN_UP_REDIRECTION_DEV_URL as string
},
clientKey: process.env.CLIENT_KEY as string
clientKey: process.env.CLIENT_KEY as string,
naverClientId: process.env.NAVER_CLIENT_ID as string,
naverClientSecret: process.env.NAVER_CLIENT_SECRET as string,
sentryDsn: process.env.SENTRY_DSN as string,
/**
* piickle service application url
*/
webAppUrl: WEB_APP_URL as string
};
Loading

0 comments on commit 5ded19b

Please sign in to comment.