Merge pull request #228 from RL-IDLE/dev

Refator

.github/workflows/deploy.yml

@@ -72,6 +72,8 @@ jobs:
           echo BASE_URL=${{ vars.BASE_URL }} >> .env
           echo PASSWORD_HASHER_SECRET=${{ secrets.PASSWORD_HASHER_SECRET }} >> .env
           echo STRIPE_SECRET_KEY=${{ secrets.STRIPE_SECRET_KEY }} >> .env
+          echo VAPID_PUBLIC_KEY=${{ secrets.VAPID_PUBLIC_KEY }} >> .env
+          echo VAPID_PRIVATE_KEY=${{ secrets.VAPID_PRIVATE_KEY }} >> .env
 
       - name: Create frontend env
         working-directory: frontend

backend/.env.example

@@ -13,4 +13,6 @@ REDIS_PORT=6379
 REDIS_USE_TLS=false
 BASE_URL=http://localhost:3000
 PASSWORD_HASHER_SECRET=secret
-STRIPE_SECRET_KEY=
+STRIPE_SECRET_KEY=
+VAPID_PUBLIC_KEY=BApXw6Y2bts3HoZdwKHT3lPyTxNaJ2CjezGY-OqwIf59acyWMSO6MXi6A9UM1Ov28HWc5M11qJYg3nY1qo2MWTc
+VAPID_PRIVATE_KEY=oyckOJYe9sGLiyKnIKpO3zMtIi7jXEsiIHOUJjYHAsc

backend/.gitignore

@@ -37,4 +37,6 @@ lerna-debug.log*
 .env*
 !.env.example
 
-unq.sh
+unq.sh
+
+tmp.ts

backend/package.json

@@ -63,6 +63,7 @@
     "socket.io": "^4.7.2",
     "stripe": "^14.3.0",
     "typeorm": "^0.3.17",
+    "web-push": "^3.6.6",
     "zod": "^3.22.4"
   },
   "devDependencies": {

backend/src/config/index.ts

@@ -30,8 +30,3 @@ export default [
     serveRoot: '/public',
   }),
 ];
-
-const configService = new ConfigService();
-export const BACKHEALTH_API_KEY =
-  configService.get<string>('BACKHEALTH_API_KEY');
-export const ENVIRONMENT = configService.getOrThrow<string>('ENV');

backend/src/database/migrations/1699091200029-itemUrl.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class ItemUrl1699091200029 implements MigrationInterface {
+  name = 'ItemUrl1699091200029';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "item" DROP COLUMN "image"`);
+    await queryRunner.query(
+      `ALTER TABLE "item" ADD "url" character varying NOT NULL DEFAULT ''`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "item" ADD "kind" character varying NOT NULL DEFAULT 'car'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "item" DROP COLUMN "kind"`);
+    await queryRunner.query(`ALTER TABLE "item" DROP COLUMN "url"`);
+    await queryRunner.query(
+      `ALTER TABLE "item" ADD "image" character varying NOT NULL`,
+    );
+  }
+}

backend/src/database/migrations/1699354231982-subscriptions.ts

@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class Subscriptions1699354231982 implements MigrationInterface {
+  name = 'Subscriptions1699354231982';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "subscription" ("createdAt" TIMESTAMP NOT NULL DEFAULT NOW(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP, "id" uuid NOT NULL DEFAULT uuid_generate_v4(), "subscription" jsonb NOT NULL, "userId" uuid, CONSTRAINT "PK_8c3e00ebd02103caa1174cd5d9d" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "subscription" ADD CONSTRAINT "FK_cc906b4bc892b048f1b654d2aa0" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "subscription" DROP CONSTRAINT "FK_cc906b4bc892b048f1b654d2aa0"`,
+    );
+    await queryRunner.query(`DROP TABLE "subscription"`);
+  }
+}

backend/src/database/migrations/1699363937537-passiveNotification.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PassiveNotification1699363937537 implements MigrationInterface {
+  name = 'PassiveNotification1699363937537';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user" ADD "passiveNotificationSent" boolean NOT NULL DEFAULT false`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user" DROP COLUMN "passiveNotificationSent"`,
+    );
+  }
+}