Skip to content
Open
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
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"[javascript][typescript][css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.tabSize": 4,
"editor.formatOnSave": false
"editor.formatOnSave": true
},
"[svelte]": {
"editor.defaultFormatter": "svelte.svelte-vscode",
Expand Down
6 changes: 4 additions & 2 deletions compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
container_name: PRM-Server
hostname: prm-server
restart: unless-stopped
build:
build:
dockerfile: server/Dockerfile
target: dev
ports:
Expand Down Expand Up @@ -34,7 +34,9 @@ services:
database:
hostname: postgres
container_name: PRM-Postgres
image: tensorchord/pgvecto-rs:pg14-v0.2.1
image: tensorchord/pgvecto-rs:pg14-v0.2.1-rootless
user: 1000:1000
restart: always
env_file:
- .env
environment:
Expand Down
14 changes: 7 additions & 7 deletions server/package-lock.json

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

4 changes: 2 additions & 2 deletions server/src/controllers/diary.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AuthDto } from 'src/dto/auth.dto';
import { DiaryCreateDto, DiaryEditDto, DiaryResponseDto } from 'src/dto/diary.dto';
import { Auth, Authenticated } from 'src/middlewares/auth.guard';
import { DiaryService } from 'src/services/diary.service';
import { DateParamDto, UUIDParamDto } from 'src/validation';
import { DateParamDto } from 'src/validation';

@ApiTags('Diary')
@Controller('diary')
Expand Down Expand Up @@ -39,4 +39,4 @@ export class DiaryController {
async getAllDiaries(@Auth() auth: AuthDto) {
return this.service.getAll(auth);
}
}
}
6 changes: 3 additions & 3 deletions server/src/dto/diary.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class DiaryCreateDto {

@IsString()
@IsNotEmpty()
@ApiProperty({type: 'string', example: 'RSA'})
@ApiProperty({ type: 'string', example: 'RSA' })
encryption: DiaryEncryption;
}

Expand Down Expand Up @@ -88,6 +88,6 @@ export class DiaryEditDto {

@IsString()
@IsNotEmpty()
@ApiProperty({type: 'string', example: 'RSA'})
@ApiProperty({ type: 'string', example: 'RSA' })
encryption: DiaryEncryption;
}
}
1 change: 0 additions & 1 deletion server/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ async function bootstrap() {
app.useLogger(app.get(PRMLogger));
// app.use(json({ limit: '10mb' }));
app.use(cookieParser());
app.enableCors();

app.setGlobalPrefix('api');
if (isDev) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { MigrationInterface, QueryRunner } from 'typeorm';

export class ChangeDiaryRatingMinAndType1715629091268 implements MigrationInterface {
name = 'ChangeDiaryRatingMinAndType1715629091268'
name = 'ChangeDiaryRatingMinAndType1715629091268';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "diary" DROP COLUMN "rating"`);
Expand All @@ -12,5 +12,4 @@ export class ChangeDiaryRatingMinAndType1715629091268 implements MigrationInterf
await queryRunner.query(`ALTER TABLE "diary" DROP COLUMN "rating"`);
await queryRunner.query(`ALTER TABLE "diary" ADD "rating" integer`);
}

}
Loading