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.

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

deploy #196

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/be-cd.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: froxy Continuous Delivery
name: froxy BE Continuous Delivery

on:
push:
branches:
- release # release 브랜치에 푸시될 때 실행
- deploy

jobs:
be-cd:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/be-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Froxy Continuous Integration
name: Froxy-BE Continuous Integration

on:
push:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fe-cd.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Froxy Continuous Integration
name: Froxy-FE Continuous Integration

on:
push:
branches:
- release
- deploy

jobs:
fe-cd:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fe-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Froxy Continuous Integration
name: Froxy-CI Continuous Integration

on:
push:
Expand Down
313 changes: 291 additions & 22 deletions README.md

Large diffs are not rendered by default.

180 changes: 91 additions & 89 deletions apps/backend/package.json
Original file line number Diff line number Diff line change
@@ -1,89 +1,91 @@
{
"name": "backend",
"version": "0.0.1",
"description": "",
"author": "",
"private": true,
"license": "UNLICENSED",
"scripts": {
"build": "nest build",
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
"start": "nest start",
"start:dev": "nest start --watch",
"start:debug": "nest start --debug --watch",
"start:prod": "node dist/main",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
"test": "jest",
"test:watch": "jest --watch",
"test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "jest --config ./test/jest-e2e.json"
},
"lint-staged": {
"*.ts": [
"eslint --fix",
"prettier --write"
]
},
"dependencies": {
"@nestjs/common": "^10.0.0",
"@nestjs/core": "^10.0.0",
"@nestjs/jwt": "^10.2.0",
"@nestjs/platform-express": "^10.0.0",
"@nestjs/swagger": "^8.0.7",
"@nestjs/typeorm": "^10.0.2",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"dockerode": "^4.0.2",
"dotenv": "^16.4.5",
"mysql2": "^3.11.4",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.8.1",
"swagger-ui-express": "^5.0.1",
"tar-stream": "^3.1.7",
"typeorm": "^0.3.20"
},
"devDependencies": {
"@nestjs/cli": "^10.0.0",
"@nestjs/config": "^3.3.0",
"@nestjs/schematics": "^10.0.0",
"@nestjs/testing": "^10.0.0",
"@types/express": "^4.17.17",
"@types/jest": "^29.5.2",
"@types/node": "^20.3.1",
"@types/supertest": "^2.0.12",
"@typescript-eslint/eslint-plugin": "^5.59.11",
"@typescript-eslint/parser": "^5.59.11",
"eslint": "^8.42.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-no-relative-import-paths": "^1.5.5",
"eslint-plugin-prettier": "^4.2.1",
"jest": "^29.5.0",
"prettier": "^2.8.8",
"source-map-support": "^0.5.21",
"supertest": "^6.3.3",
"ts-jest": "^29.1.0",
"ts-loader": "^9.4.3",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.1.3"
},
"jest": {
"moduleFileExtensions": [
"js",
"json",
"ts"
],
"rootDir": "src",
"testRegex": ".*\\.spec\\.ts$",
"transform": {
"^.+\\.(t|j)s$": "ts-jest"
},
"collectCoverageFrom": [
"**/*.(t|j)s"
],
"coverageDirectory": "../coverage",
"testEnvironment": "node"
}
}
{
"name": "backend",
"version": "0.0.1",
"description": "",
"author": "",
"private": true,
"license": "UNLICENSED",
"scripts": {
"build": "nest build",
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
"start": "nest start",
"start:dev": "nest start --watch",
"start:debug": "nest start --debug --watch",
"start:prod": "node dist/main",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
"test": "jest",
"test:watch": "jest --watch",
"test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "jest --config ./test/jest-e2e.json"
},
"lint-staged": {
"*.ts": [
"eslint --fix",
"prettier --write"
]
},
"dependencies": {
"@nestjs/bull": "^10.2.2",
"@nestjs/common": "^10.0.0",
"@nestjs/core": "^10.0.0",
"@nestjs/jwt": "^10.2.0",
"@nestjs/platform-express": "^10.0.0",
"@nestjs/swagger": "^8.0.7",
"@nestjs/typeorm": "^10.0.2",
"bull": "^4.16.4",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"dockerode": "^4.0.2",
"dotenv": "^16.4.5",
"mysql2": "^3.11.4",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.8.1",
"swagger-ui-express": "^5.0.1",
"tar-stream": "^3.1.7",
"typeorm": "^0.3.20"
},
"devDependencies": {
"@nestjs/cli": "^10.0.0",
"@nestjs/config": "^3.3.0",
"@nestjs/schematics": "^10.0.0",
"@nestjs/testing": "^10.0.0",
"@types/express": "^4.17.17",
"@types/jest": "^29.5.2",
"@types/node": "^20.3.1",
"@types/supertest": "^2.0.12",
"@typescript-eslint/eslint-plugin": "^5.59.11",
"@typescript-eslint/parser": "^5.59.11",
"eslint": "^8.42.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-no-relative-import-paths": "^1.5.5",
"eslint-plugin-prettier": "^4.2.1",
"jest": "^29.5.0",
"prettier": "^2.8.8",
"source-map-support": "^0.5.21",
"supertest": "^6.3.3",
"ts-jest": "^29.1.0",
"ts-loader": "^9.4.3",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.1.3"
},
"jest": {
"moduleFileExtensions": [
"js",
"json",
"ts"
],
"rootDir": "src",
"testRegex": ".*\\.spec\\.ts$",
"transform": {
"^.+\\.(t|j)s$": "ts-jest"
},
"collectCoverageFrom": [
"**/*.(t|j)s"
],
"coverageDirectory": "../coverage",
"testEnvironment": "node"
}
}
78 changes: 42 additions & 36 deletions apps/backend/src/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,36 +1,42 @@
import { Module } from '@nestjs/common';
import { ConfigModule, ConfigService } from '@nestjs/config';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { AuthModule } from './auth/auth.module';
import { typeORMConfig } from './config/typeorm.config';
import { DockerModule } from './docker/docker.module';
import { GistModule } from './gist/gist.module';
import { HistoryModule } from './history/history.module';
import { LotusModule } from './lotus/lotus.module';
import { TagModule } from './tag/tag.module';
import { UserModule } from './user/user.module';

@Module({
imports: [
ConfigModule.forRoot({
isGlobal: true,
envFilePath: '.env'
}),
TypeOrmModule.forRootAsync({
inject: [ConfigService],
useFactory: typeORMConfig
}),
DockerModule,
GistModule,
HistoryModule,
UserModule,
AuthModule,
LotusModule,
TagModule
],
controllers: [AppController],
providers: [AppService]
})
export class AppModule {}
import { BullModule } from '@nestjs/bull';
import { Module } from '@nestjs/common';
import { ConfigModule, ConfigService } from '@nestjs/config';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { AuthModule } from './auth/auth.module';
import { queueConfig } from './config/queue.config';
import { typeORMConfig } from './config/typeorm.config';
import { DockerModule } from './docker/docker.module';
import { GistModule } from './gist/gist.module';
import { HistoryModule } from './history/history.module';
import { LotusModule } from './lotus/lotus.module';
import { TagModule } from './tag/tag.module';
import { UserModule } from './user/user.module';

@Module({
imports: [
ConfigModule.forRoot({
isGlobal: true,
envFilePath: '.env'
}),
TypeOrmModule.forRootAsync({
inject: [ConfigService],
useFactory: typeORMConfig
}),
BullModule.forRootAsync({
inject: [ConfigService],
useFactory: queueConfig
}),
DockerModule,
GistModule,
HistoryModule,
UserModule,
AuthModule,
LotusModule,
TagModule
],
controllers: [AppController],
providers: [AppService]
})
export class AppModule {}
40 changes: 20 additions & 20 deletions apps/backend/src/auth/auth.module.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { Global, Module, forwardRef } from '@nestjs/common';
import { JwtModule } from '@nestjs/jwt';
import { AuthService } from './auth.service';
import { UserModule } from '@/user/user.module';

@Global()
@Module({
imports: [
JwtModule.register({
signOptions: {
algorithm: 'HS256',
expiresIn: '1h'
}
}),
forwardRef(() => UserModule)
],
providers: [AuthService],
exports: [AuthService]
})
export class AuthModule {}
import { Global, Module, forwardRef } from '@nestjs/common';
import { JwtModule } from '@nestjs/jwt';
import { AuthService } from './auth.service';
import { UserModule } from '@/user/user.module';
@Global()
@Module({
imports: [
JwtModule.register({
signOptions: {
algorithm: 'HS256',
expiresIn: '1h'
}
}),
forwardRef(() => UserModule)
],
providers: [AuthService],
exports: [AuthService]
})
export class AuthModule {}
Loading