Merge pull request #5 from ungdev/maj2024

Update 2024
ungdev · Dec 5, 2024 · 517c770 · 517c770
2 parents 6ac128a + 9f972d5
commit 517c770
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,8 +11,8 @@ jobs:
         with:
           submodules: true
       - name: Build containers
-        run: docker-compose build
+        run: docker compose build
       - name: Start containers
-        run: docker-compose up -d
+        run: docker compose up -d
       - name: Shutdown containers
-        run: docker-compose down
+        run: docker compose down
diff --git a/api b/api
diff --git a/env/api.env b/env/api.env
@@ -3,15 +3,21 @@ DB_PORT=3306
 DB_NAME=bouffe
 DB_USERNAME=ua
 DB_PASSWORD=uttarena
+
 SALE_POINT_ID=
 ENTRY_SALE_POINT_ID=
 DEVICE_ID=
+INTERNET_CHECK_TIMEOUT=30000
+
 APP_PORT=3001
 APP_TOKEN_SECRET=randomString
 APP_TOKEN_EXPIRES=3 days
-APP_PIN_TV=123456
-APP_PIN_SELLER=147258
-APP_PIN_PIZZA=741852
-APP_PIN_ADMIN=159753
-SLACK_ENABLED=false
-SLACK_WEBHOOK_URL=
+
+APP_PIN_TV=
+APP_PIN_SELLER=
+APP_PIN_ADMIN=
+APP_PIN_PREPARATOR=
+
+# Envoie un message sur Discord à chaque commande prête
+DISCORD_API_PRIVATE_KEY=
+
diff --git a/front b/front
diff --git a/seed/categories.csv b/seed/categories.csv
@@ -1,7 +1,7 @@
 id,name,key,needsPreparation
 1,Boissons,boissons,0
 2,Snacks,snacks,0
-3,Crêpes salées,galette,1
+3,Crêpes salées,galettes,1
 4,Croques,croques,1
 5,Pizzas,pizzas,1
 6,Hotdogs,hotdogs,1

diff --git a/seed/users.csv b/seed/users.csv
@@ -1,5 +1,5 @@
 id,name,key,permissions
-1,Télévision,tv,
+1,Télévision,tv,tv
 2,Vendeur,seller,sell
-3,Préparateur Pizza,pizza,pizza
+3,Préparateur,preparator,prepare
 4,Administrateur,admin,admin
+4 −8		.env.example
+0 −3		src/controllers/order/create.ts
+0 −3		src/controllers/order/dispatch.ts
+1 −34		src/controllers/order/editStatus.ts
+43 −0		src/utils/sendDiscordMessage.ts
+0 −16		src/utils/sendSlackMessage.ts