simplified structure

.env_sample

@@ -1,23 +1,30 @@
-POSTGRES_HOST=postgres
+### BACK ### 
-POSTGRES_PORT=5432
-POSTGRES_USER=postgres_usr
-POSTGRES_PASSWORD=postgres_pw
-POSTGRES_DB=transcendence
-
-MAIL_USER=vaganiwast@gmail.com
-MAIL_PASSWORD=
-
-FRONT_FPS=144
-
 HOST=localhost
-VITE_HOST=localhost
 FRONT_PORT=80
 BACK_PORT=3001
 HASH_SALT=10
 
-JWT_SECRET=
+### FRONT ###
-JWT_EXPIRATION_TIME=900
+VITE_HOST=localhost
+VITE_BACK_PORT=3001
+
+### GAME ### 
+VITE_FRONT_FPS=144
+
+### 2FA ###
+MAIL_USER=vaganiwast@gmail.com
+MAIL_PASSWORD=
 
+### AUTH ###
 FT_OAUTH_CLIENT_ID=
 FT_OAUTH_CLIENT_SECRET=
 FT_OAUTH_CALLBACK_URL=http://localhost:3001/log/inReturn
+JWT_SECRET=test
+JWT_EXPIRATION_TIME=900
+
+### DB ###
+POSTGRES_HOST=postgres
+POSTGRES_PORT=5432
+POSTGRES_USER=postgres_usr
+POSTGRES_PASSWORD=postgres_pw
+POSTGRES_DB=transcendence

.gitattributes

@@ -0,0 +1,6 @@
+*.ts text=auto eol=lf
+*.svelte text=auto eol=lf
+*.yml text=auto eol=lf
+*.json text=auto eol=lf
+*.html text=auto eol=lf
+*.xml text=auto eol=lf

Makefile

@@ -21,7 +21,7 @@ clean: stop
 	docker system prune -f
 
 fclean: stop
-	rm -rf */volume/node_modules
+	rm -rf */node_modules
 	docker system prune -af --volumes
 
 re: fclean dev

Makesudo

@@ -4,27 +4,27 @@ USER = gavaniwast
 all: clean dev
 
 prod:
-	sudo NODE_ENV="production" docker compose -f docker-compose.yml up --build
+	sudo docker-compose up --build
 
 dev:
-	sudo NODE_ENV="development" docker compose -f docker-compose.yml up --build
+	sudo docker-compose up --build
 
 check:
-	sudo NODE_ENV="check" docker compose -f docker-compose.yml run back --build
+	sudo NODE_ENV="check" docker-compose run back --build
-	sudo NODE_ENV="check" docker compose -f docker-compose.yml run front --build
+	sudo NODE_ENV="check" docker-compose run front --build
 	sudo docker compose -f docker-compose.yml down 
 
 debug:
-	sudo NODE_ENV="debug" BUILDKIT_PROGRESS=plain docker compose -f docker-compose.yml up --build
+	sudo NODE_ENV="debug" BUILDKIT_PROGRESS=plain docker-compose up --build
 
 stop:
-	sudo docker compose -f docker-compose.yml down
+	sudo docker-compose down
 
 clean: stop
 	sudo docker system prune -f
 
 fclean: stop
-	rm */volume/node_modules
+	sudo rm -rf */node_modules
 	sudo docker system prune -af --volumes
 
 re: fclean dev

back.dockerfile

@@ -0,0 +1,5 @@
+FROM alpine:3.15
+
+RUN apk update && apk upgrade && apk add npm && npm install -g @nestjs/cli
+WORKDIR /var/www/html
+ENTRYPOINT npm install && npm run dev

back/Dockerfile

@@ -1,10 +0,0 @@
-FROM alpine:3.15
-
-RUN apk update && apk upgrade && apk add npm \
-  && npm install -g @nestjs/cli
-
-
-WORKDIR /var/www/html
-
-COPY entrypoint.sh /tmp/entrypoint.sh
-ENTRYPOINT ["sh", "/tmp/entrypoint.sh"]

back/entrypoint.sh

@@ -1,31 +0,0 @@
-npm install;
-cat >.env <<EOF
-POSTGRES_HOST=$POSTGRES_HOST
-POSTGRES_PORT=$POSTGRES_PORT
-POSTGRES_USER=$POSTGRES_USER
-POSTGRES_PASSWORD=$POSTGRES_PASSWORD
-POSTGRES_DB=$POSTGRES_DB
-
-MAIL_USER=$MAIL_USER
-MAIL_PASSWORD=$MAIL_PASSWORD
-
-HOST=$HOST
-FRONT_PORT=$FRONT_PORT
-BACK_PORT=$BACK_PORT
-HASH_SALT=$HASH_SALT
-
-JWT_SECRET=$JWT_SECRET
-JWT_EXPIRATION_TIME=$JWT_EXPIRATION_TIME
-
-FT_OAUTH_CLIENT_ID=$FT_OAUTH_CLIENT_ID
-FT_OAUTH_CLIENT_SECRET=$FT_OAUTH_CLIENT_SECRET
-FT_OAUTH_CALLBACK_URL=$FT_OAUTH_CALLBACK_URL
-EOF
-
-if [[ $NODE_ENV == "debug" ]]; then
-  npm run start:debug;
-elif [[ $NODE_ENV == "check" ]]; then
-  npm run format && npm run lint; echo "=== FINISH ===";
-else 
-  npm run dev;
-fi;

back/src/app.module.ts

@@ -0,0 +1,36 @@
+import { Module } from '@nestjs/common'
+import { ConfigModule, ConfigService } from '@nestjs/config'
+import { TypeOrmModule } from '@nestjs/typeorm'
+import * as Joi from 'joi'
+import { ScheduleModule } from '@nestjs/schedule'
+
+import { AuthModule } from './auth/auth.module'
+import { ChatModule } from './chat/chat.module'
+import { PongModule } from './pong/pong.module'
+import { UsersModule } from './users/users.module'
+
+@Module({
+  imports: [
+    ScheduleModule.forRoot(),
+    TypeOrmModule.forRootAsync({
+      imports: [ConfigModule],
+      inject: [ConfigService],
+      useFactory: (configService: ConfigService) => ({
+        type: 'postgres',
+        host: process.env.POSTGRES_HOST || 'localhost',
+        port: (process.env.POSTGRES_PORT || 5432) as number,
+        username: process.env.POSTGRES_USER || 'postgres',
+        password: process.env.POSTGRES_PASSWORD || 'postgres',
+        database: process.env.POSTGRES_DB || 'postgres',
+        jwt_secret: process.env.JWT_SECRET || 'secret',
+        autoLoadEntities: true,
+        synchronize: true
+      })
+    }),
+    AuthModule,
+    ChatModule,
+    PongModule,
+    UsersModule
+  ]
+})
+export class AppModule {}

back/volume/src/auth/42.strategy.ts → back/src/auth/42.strategy.ts

@@ -11,13 +11,12 @@ import { User } from 'src/users/entity/user.entity'
 @Injectable()
 export class FtStrategy extends PassportStrategy(Strategy, '42') {
   constructor (
-    private readonly configService: ConfigService,
     private readonly usersService: UsersService
   ) {
     super({
-      clientID: configService.get<string>('FT_OAUTH_CLIENT_ID'),
+      clientID: process.env.FT_OAUTH_CLIENT_ID,
-      clientSecret: configService.get<string>('FT_OAUTH_CLIENT_SECRET'),
+      clientSecret: process.env.FT_OAUTH_CLIENT_SECRET,
-      callbackURL: configService.get<string>('FT_OAUTH_CALLBACK_URL'),
+      callbackURL: process.env.FT_OAUTH_CALLBACK_URL,
       passReqToCallback: true
     })
   }

back/volume/src/chat/chat.controller.ts → back/src/chat/chat.controller.ts

@@ -121,6 +121,9 @@ export class ChatController {
       @Profile42() profile: Profile
   ): Promise<void> {
     const channel = await this.channelService.getFullChannel(id)
+    if (await this.channelService.isOwner(channel.id, target.id)) {
+      throw new BadRequestException('The owner cannot be demoted')
+    }
     if (!(await this.channelService.isOwner(channel.id, +profile.id))) {
       throw new BadRequestException('You are not the owner of this channel')
     }

back/volume/src/chat/chat.gateway.ts → back/src/chat/chat.gateway.ts

@@ -84,7 +84,7 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
     conUser.user = user.ftId;
     conUser.channel = channel.id;
     conUser.socket = socket.id;
-    const test = await this.connectedUserRepository.save(conUser);
+    await this.connectedUserRepository.save(conUser);
     await socket.join(channel.id.toString());
     this.server.to(socket.id).emit('messages', messages);
   }

back/volume/README.md

@@ -1,73 +0,0 @@
-<p align="center">
-  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="200" alt="Nest Logo" /></a>
-</p>
-
-[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
-[circleci-url]: https://circleci.com/gh/nestjs/nest
-
-  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
-    <p align="center">
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
-<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
-<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
-<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
-<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
-<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
-  <a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg"/></a>
-    <a href="https://opencollective.com/nest#sponsor"  target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
-  <a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow"></a>
-</p>
-  <!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
-  [![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
-
-## Description
-
-[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
-
-## Installation
-
-```bash
-$ npm install
-```
-
-## Running the app
-
-```bash
-# development
-$ npm run start
-
-# watch mode
-$ npm run start:dev
-
-# production mode
-$ npm run start:prod
-```
-
-## Test
-
-```bash
-# unit tests
-$ npm run test
-
-# e2e tests
-$ npm run test:e2e
-
-# test coverage
-$ npm run test:cov
-```
-
-## Support
-
-Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
-
-## Stay in touch
-
-- Author - [Kamil Myśliwiec](https://kamilmysliwiec.com)
-- Website - [https://nestjs.com](https://nestjs.com/)
-- Twitter - [@nestframework](https://twitter.com/nestframework)
-
-## License
-
-Nest is [MIT licensed](LICENSE).

back/volume/src/app.module.ts

@@ -1,53 +0,0 @@
-import { Module } from '@nestjs/common'
-import { ConfigModule, ConfigService } from '@nestjs/config'
-import { TypeOrmModule } from '@nestjs/typeorm'
-import * as Joi from 'joi'
-import { ScheduleModule } from '@nestjs/schedule'
-
-import { AuthModule } from './auth/auth.module'
-import { ChatModule } from './chat/chat.module'
-import { PongModule } from './pong/pong.module'
-import { UsersModule } from './users/users.module'
-
-@Module({
-  imports: [
-    ScheduleModule.forRoot(),
-    ConfigModule.forRoot({
-      validationSchema: Joi.object({
-        POSTGRES_HOST: Joi.string().required(),
-        POSTGRES_PORT: Joi.number().required(),
-        POSTGRES_USER: Joi.string().required(),
-        POSTGRES_PASSWORD: Joi.string().required(),
-        POSTGRES_DB: Joi.string().required(),
-        MAIL_USER: Joi.string().required(),
-        MAIL_PASSWORD: Joi.string().required(),
-        JWT_SECRET: Joi.string().required(),
-        JWT_EXPIRATION_TIME: Joi.string().required(),
-        HOST: Joi.string().required(),
-        FRONT_PORT: Joi.number().required(),
-        BACK_PORT: Joi.number().required(),
-        HASH_SALT: Joi.number().required()
-      })
-    }),
-    TypeOrmModule.forRootAsync({
-      imports: [ConfigModule],
-      inject: [ConfigService],
-      useFactory: (configService: ConfigService) => ({
-        type: 'postgres',
-        host: configService.get<string>('POSTGRES_HOST'),
-        port: configService.get<number>('POSTGRES_PORT'),
-        username: configService.get<string>('POSTGRES_USER'),
-        password: configService.get<string>('POSTGRES_PASSWORD'),
-        database: configService.get<string>('POSTGRES_DB'),
-        jwt_secret: configService.get<string>('JWT_SECRET'),
-        autoLoadEntities: true,
-        synchronize: true
-      })
-    }),
-    AuthModule,
-    ChatModule,
-    PongModule,
-    UsersModule
-  ]
-})
-export class AppModule {}

docker-compose.yml

@@ -6,25 +6,29 @@ networks:
 services:
   front:
     container_name: front
-    build: front/
+    build: 
+      context: ./
+      dockerfile: front.dockerfile
     env_file: .env
     environment:
       - NODE_ENV=${NODE_ENV}
     depends_on: [postgres, back]
     ports: [80:80]
-    volumes: [./front/volume:/var/www/html]
+    volumes: [./front:/var/www/html]
     networks: [transcendence]
     restart: on-failure
   back:
     container_name: back
-    build: back/
+    build:
+      context: ./
+      dockerfile: back.dockerfile
     env_file: .env
     environment:
       - NODE_ENV=${NODE_ENV}
     depends_on: [postgres]
     ports: [3001:3001]
     networks: [transcendence]
-    volumes: [./back/volume:/var/www/html]
+    volumes: [./back:/var/www/html]
     restart: on-failure
   postgres:
     container_name: postgres

front/Dockerfile → front.dockerfile

@@ -1,8 +1,5 @@
 FROM alpine:3.15
 
 RUN apk update && apk upgrade && apk add npm
-
 WORKDIR /var/www/html
-COPY entrypoint.sh /tmp/entrypoint.sh
+ENTRYPOINT npm install && npm run dev
-
-ENTRYPOINT ["sh", "/tmp/entrypoint.sh"]

front/entrypoint.sh

@@ -1,13 +0,0 @@
-npm install;
-cat >.env <<EOF
-VITE_FRONT_FPS=$FRONT_FPS
-VITE_HOST=$HOST
-VITE_BACK_PORT=$BACK_PORT
-EOF
-
-npm install;
-if [[ $NODE_ENV == "check" ]]; then
-  npm run format && npm run check; echo "=== FINISH ==="
-else
-  npm run dev;
-fi;

front/volume/src/components/Channels.svelte → front/src/components/Channels.svelte

@@ -1,5 +1,12 @@
 <script lang="ts" context="module">
   import { content, show_popup } from './Alert/content'
+  import { onMount } from "svelte";
+  import { API_URL, store } from "../Auth";
+  import type User from "./Profile.svelte";
+  import { APPSTATE } from "../App.svelte";
+
+  export let appState: string;
+  export let setAppState: (newState: APPSTATE | string) => void;
 
   export interface ChannelsType {
     id: number;
@@ -16,9 +23,6 @@
     author: User;
     text: string;
   }
-  import { onMount } from "svelte";
-  import { API_URL, store } from "../Auth";
-  import type User from "./Profile.svelte";
 
   export async function formatChannelNames(channel: Array<ChannelsType>): Promise<void> {
     const res = await fetch(API_URL + "/users/all", {
@@ -60,6 +64,7 @@
       }
     }
   }
+
 </script>
 
 <script lang="ts">

front/volume/src/components/Chat.svelte → front/src/components/Chat.svelte

@@ -6,6 +6,7 @@
   import { APPSTATE } from "../App.svelte";
   import { formatChannelNames, type ChannelsType, type chatMessagesType } from "./Channels.svelte";
   import type User from "./Profile.svelte";
+
 </script>
 
 <script lang="ts">
@@ -41,9 +42,7 @@
   }
 
   onMount(async () => {
-    socket = io(
+    socket = io(API_URL);
-      "http://" + (import.meta.env.VITE_HOST ?? "localhost") + ":3001"
-    );
     socket.connect();
     await getCurrentChannel();
     if (!channel) setAppState(APPSTATE.CHANNELS);
@@ -129,7 +128,6 @@
       }
     }
   };
-
   //--------------------------------------------------------------------------------/
 
   const dispatch = createEventDispatcher();

front/volume/src/components/NavBar.svelte → front/src/components/NavBar.svelte

@@ -1,9 +1,5 @@
 <script lang="ts">
-  let api =
+  import { API_URL } from "../Auth";
-    "http://" +
-    import.meta.env.VITE_HOST +
-    ":" +
-    import.meta.env.VITE_BACK_PORT;
 
   export let links = [
     { text: "Home" },
@@ -54,7 +50,7 @@
         {#if link.text === "Profile"}
           <li>
             <button on:click={clickProfile}>
-              <img src={api + "/users/avatar"} alt="avatar" />
+              <img src={API_URL + "/users/avatar"} alt="avatar" />
             </button>
           </li>
         {/if}