Browse Source

changed structure

master
narnaud 2 years ago
parent
commit
67482ec5be
  1. 1
      .gitignore
  2. 14
      Makefile
  3. 22
      Makesudo
  4. 0
      back/Dockerfile
  5. 0
      back/volume/.gitignore
  6. 0
      back/volume/README.md
  7. 0
      back/volume/nest-cli.json
  8. 0
      back/volume/package-lock.json
  9. 0
      back/volume/package.json
  10. 0
      back/volume/src/app.module.ts
  11. 0
      back/volume/src/main.ts
  12. 0
      back/volume/src/pong/game/Ball.ts
  13. 0
      back/volume/src/pong/game/Game.ts
  14. 0
      back/volume/src/pong/game/Paddle.ts
  15. 0
      back/volume/src/pong/game/Player.ts
  16. 0
      back/volume/src/pong/game/constants.ts
  17. 0
      back/volume/src/pong/game/utils.ts
  18. 0
      back/volume/src/pong/pong.gateway.spec.ts
  19. 0
      back/volume/src/pong/pong.gateway.ts
  20. 0
      back/volume/src/pong/pong.module.ts
  21. 0
      back/volume/src/pong/pong.spec.ts
  22. 0
      back/volume/src/pong/pong.ts
  23. 0
      back/volume/test/app.e2e-spec.ts
  24. 0
      back/volume/test/jest-e2e.json
  25. 0
      back/volume/tsconfig.build.json
  26. 0
      back/volume/tsconfig.json
  27. 8
      docker-compose.yml
  28. 0
      front/Dockerfile
  29. 0
      front/volume/.gitignore
  30. 0
      front/volume/README.md
  31. 0
      front/volume/index.html
  32. 0
      front/volume/package-lock.json
  33. 0
      front/volume/package.json
  34. 0
      front/volume/public/global.css
  35. 0
      front/volume/public/img/pog.jpg
  36. 0
      front/volume/public/img/pong.png
  37. 0
      front/volume/public/img/profileicon.png
  38. 0
      front/volume/public/vite.svg
  39. 0
      front/volume/src/App.svelte
  40. 0
      front/volume/src/app.d.ts
  41. 0
      front/volume/src/assets/svelte.svg
  42. 0
      front/volume/src/components/Friends.svelte
  43. 0
      front/volume/src/components/MatchHistory.svelte
  44. 0
      front/volume/src/components/NavBar.svelte
  45. 0
      front/volume/src/components/Play.svelte
  46. 0
      front/volume/src/components/Pong/Ball.ts
  47. 0
      front/volume/src/components/Pong/Game.ts
  48. 0
      front/volume/src/components/Pong/Paddle.ts
  49. 0
      front/volume/src/components/Pong/Player.ts
  50. 0
      front/volume/src/components/Pong/Pong.svelte
  51. 0
      front/volume/src/components/Pong/constants.ts
  52. 0
      front/volume/src/components/Pong/utils.ts
  53. 0
      front/volume/src/components/Profile.svelte
  54. 0
      front/volume/src/components/Spectate.svelte
  55. 0
      front/volume/src/main.ts
  56. 0
      front/volume/src/vite-env.d.ts
  57. 0
      front/volume/svelte.config.js
  58. 0
      front/volume/tsconfig.json
  59. 0
      front/volume/tsconfig.node.json
  60. 0
      front/volume/vite.config.ts

1
.gitignore

@ -1 +0,0 @@
Makefile.linux

14
Makefile

@ -1,21 +1,12 @@
NAME = transcendence NAME = transcendence
USER = gavaniwast USER = gavaniwast
CERT = volumes/ssl/$(NAME).pem
all: clean start all: clean start
$(CERT): start:
openssl req -newkey rsa:4096 -x509 -sha256 -days 365 -nodes \
-out $(NAME).pem -keyout $(NAME).pem \
-subj "/C=FR/ST=Nice/L=Nice/O=42/OU=student/CN=$(NAME)_$(USER)/"
mkdir -p volumes/ssl
mv $(NAME).pem volumes/ssl
start: $(CERT)
BACK_RUN=start docker compose -f docker-compose.yml up --build BACK_RUN=start docker compose -f docker-compose.yml up --build
debug: $(CERT) debug:
BUILDKIT_PROGRESS=plain BACK_RUN=start:debug docker compose -f docker-compose.yml up --build BUILDKIT_PROGRESS=plain BACK_RUN=start:debug docker compose -f docker-compose.yml up --build
stop: stop:
@ -25,6 +16,7 @@ clean: stop
docker system prune -f docker system prune -f
fclean: stop fclean: stop
rm -rf volumes/*/node_modules
docker system prune -af --volumes docker system prune -af --volumes
re: fclean start re: fclean start

22
Makesudo

@ -0,0 +1,22 @@
NAME = transcendence
USER = gavaniwast
all: clean start
start:
sudo BACK_RUN=start docker compose -f docker-compose.yml up --build
debug:
sudo BUILDKIT_PROGRESS=plain BACK_RUN=start:debug docker compose -f docker-compose.yml up --build
stop:
sudo docker compose -f docker-compose.yml down
clean: stop
sudo docker system prune -f
fclean: stop
rm -rf volumes/*/node_modules
sudo docker system prune -af --volumes
re: fclean start

0
cont/back/Dockerfile → back/Dockerfile

0
volumes/back/.gitignore → back/volume/.gitignore

0
volumes/back/README.md → back/volume/README.md

0
volumes/back/nest-cli.json → back/volume/nest-cli.json

0
volumes/back/package-lock.json → back/volume/package-lock.json

0
volumes/back/package.json → back/volume/package.json

0
volumes/back/src/app.module.ts → back/volume/src/app.module.ts

0
volumes/back/src/main.ts → back/volume/src/main.ts

0
volumes/back/src/pong/game/Ball.ts → back/volume/src/pong/game/Ball.ts

0
volumes/back/src/pong/game/Game.ts → back/volume/src/pong/game/Game.ts

0
volumes/back/src/pong/game/Paddle.ts → back/volume/src/pong/game/Paddle.ts

0
volumes/back/src/pong/game/Player.ts → back/volume/src/pong/game/Player.ts

0
volumes/back/src/pong/game/constants.ts → back/volume/src/pong/game/constants.ts

0
volumes/back/src/pong/game/utils.ts → back/volume/src/pong/game/utils.ts

0
volumes/back/src/pong/pong.gateway.spec.ts → back/volume/src/pong/pong.gateway.spec.ts

0
volumes/back/src/pong/pong.gateway.ts → back/volume/src/pong/pong.gateway.ts

0
volumes/back/src/pong/pong.module.ts → back/volume/src/pong/pong.module.ts

0
volumes/back/src/pong/pong.spec.ts → back/volume/src/pong/pong.spec.ts

0
volumes/back/src/pong/pong.ts → back/volume/src/pong/pong.ts

0
volumes/back/test/app.e2e-spec.ts → back/volume/test/app.e2e-spec.ts

0
volumes/back/test/jest-e2e.json → back/volume/test/jest-e2e.json

0
volumes/back/tsconfig.build.json → back/volume/tsconfig.build.json

0
volumes/back/tsconfig.json → back/volume/tsconfig.json

8
docker-compose.yml

@ -6,23 +6,23 @@ networks:
services: services:
front: front:
container_name: front container_name: front
build: cont/front/ build: front/
env_file: .env env_file: .env
depends_on: [postgres, back] depends_on: [postgres, back]
ports: [80:80] ports: [80:80]
volumes: [./volumes/front:/var/www/html] volumes: [./front/volume:/var/www/html]
networks: [transcendence] networks: [transcendence]
restart: always restart: always
back: back:
container_name: back container_name: back
build: cont/back/ build: back/
env_file: .env env_file: .env
environment: environment:
- RUN=${BACK_RUN} - RUN=${BACK_RUN}
depends_on: [postgres] depends_on: [postgres]
ports: [3001:3001] ports: [3001:3001]
networks: [transcendence] networks: [transcendence]
volumes: [./volumes/back:/var/www/html] volumes: [./back/volume:/var/www/html]
restart: always restart: always
postgres: postgres:
container_name: postgres container_name: postgres

0
cont/front/Dockerfile → front/Dockerfile

0
volumes/front/.gitignore → front/volume/.gitignore

0
volumes/front/README.md → front/volume/README.md

0
volumes/front/index.html → front/volume/index.html

0
volumes/front/package-lock.json → front/volume/package-lock.json

0
volumes/front/package.json → front/volume/package.json

0
volumes/front/public/global.css → front/volume/public/global.css

0
volumes/front/public/img/pog.jpg → front/volume/public/img/pog.jpg

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

0
volumes/front/public/img/pong.png → front/volume/public/img/pong.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
volumes/front/public/img/profileicon.png → front/volume/public/img/profileicon.png

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

0
volumes/front/public/vite.svg → front/volume/public/vite.svg

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
volumes/front/src/App.svelte → front/volume/src/App.svelte

0
volumes/front/src/app.d.ts → front/volume/src/app.d.ts

0
volumes/front/src/assets/svelte.svg → front/volume/src/assets/svelte.svg

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
volumes/front/src/components/Friends.svelte → front/volume/src/components/Friends.svelte

0
volumes/front/src/components/MatchHistory.svelte → front/volume/src/components/MatchHistory.svelte

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

0
volumes/front/src/components/Play.svelte → front/volume/src/components/Play.svelte

0
volumes/front/src/components/Pong/Ball.ts → front/volume/src/components/Pong/Ball.ts

0
volumes/front/src/components/Pong/Game.ts → front/volume/src/components/Pong/Game.ts

0
volumes/front/src/components/Pong/Paddle.ts → front/volume/src/components/Pong/Paddle.ts

0
volumes/front/src/components/Pong/Player.ts → front/volume/src/components/Pong/Player.ts

0
volumes/front/src/components/Pong/Pong.svelte → front/volume/src/components/Pong/Pong.svelte

0
volumes/front/src/components/Pong/constants.ts → front/volume/src/components/Pong/constants.ts

0
volumes/front/src/components/Pong/utils.ts → front/volume/src/components/Pong/utils.ts

0
volumes/front/src/components/Profile.svelte → front/volume/src/components/Profile.svelte

0
volumes/front/src/components/Spectate.svelte → front/volume/src/components/Spectate.svelte

0
volumes/front/src/main.ts → front/volume/src/main.ts

0
volumes/front/src/vite-env.d.ts → front/volume/src/vite-env.d.ts

0
volumes/front/svelte.config.js → front/volume/svelte.config.js

0
volumes/front/tsconfig.json → front/volume/tsconfig.json

0
volumes/front/tsconfig.node.json → front/volume/tsconfig.node.json

0
volumes/front/vite.config.ts → front/volume/vite.config.ts

Loading…
Cancel
Save