Skip to content

Commit 5f4896e

Browse files
committed
Merge branch 'development' of https://github.com/BinaryStudioAcademy/thread-js into task/thjs-124-upgrade-nodejs-version-20-lts-with-packages
2 parents e477eab + 2b94309 commit 5f4896e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+756
-1165
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.18
1+
20.11

apps/backend/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"dependencies": {
2828
"@fastify/static": "7.0.4",
2929
"@thread-js/shared": "*",
30-
"bcrypt": "5.1.1",
3130
"convict": "6.2.4",
3231
"dotenv": "16.4.5",
3332
"fastify": "4.27.0",
@@ -40,7 +39,6 @@
4039
"devDependencies": {
4140
"@faker-js/faker": "8.4.1",
4241
"@jest/globals": "29.7.0",
43-
"@types/bcrypt": "5.0.2",
4442
"@types/convict": "6.1.6",
4543
"@types/jest": "29.5.12",
4644
"@types/pg": "8.11.6",

apps/backend/src/db/migrations/20211208202419_create_tables.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ const ColumnName = {
99
EMAIL: 'email',
1010
ID: 'id',
1111
PASSWORD: 'password',
12-
UPDATED_AT: 'updated_at',
13-
USERNAME: 'username'
12+
UPDATED_AT: 'updated_at'
1413
} as const;
1514

1615
const up = async (knex: Knex): Promise<void> => {
1716
await knex.schema.createTable(TableName.USERS, table => {
1817
table.increments(ColumnName.ID).primary();
1918
table.string(ColumnName.EMAIL).notNullable().unique();
20-
table.string(ColumnName.USERNAME).notNullable().unique();
2119
table.string(ColumnName.PASSWORD).notNullable();
2220
table
2321
.dateTime(ColumnName.CREATED_AT)

apps/backend/src/db/seed-data/users-seed.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

apps/backend/src/db/seeds/fill-database.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

apps/backend/src/libs/modules/server-application/server-application.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { type ParsedQs, parse } from 'qs';
22

33
import { config } from '~/libs/modules/config/config.js';
44
import { database } from '~/libs/modules/database/database.js';
5-
import { authController } from '~/packages/auth/auth.js';
5+
import { authController } from '~/modules/auth/auth.js';
66

77
import { logger } from '../logger/logger.js';
88
import { ServerApp } from './server-app.js';
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { APIPath } from '~/libs/enums/enums.js';
22
import { logger } from '~/libs/modules/logger/logger.js';
3-
import { userService } from '~/packages/user/user.js';
3+
import { userService } from '~/modules/user/user.js';
44

55
import { Auth as AuthController } from './auth.controller.js';
66
import { Auth as AuthService } from './auth.service.js';
File renamed without changes.

0 commit comments

Comments
 (0)