From b112fdbdf3b3d8827d9b0533bc69699885b22624 Mon Sep 17 00:00:00 2001 From: Arthur Dodin Date: Wed, 11 Sep 2024 12:34:35 +0200 Subject: [PATCH 1/6] update: seed data --- seed/categories.csv | 2 +- seed/users.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/categories.csv b/seed/categories.csv index 087351d..636793b 100644 --- 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 index eadc335..076a8fd 100644 --- a/seed/users.csv +++ b/seed/users.csv @@ -1,5 +1,5 @@ id,name,key,permissions 1,Télévision,tv, 2,Vendeur,seller,sell -3,Préparateur Pizza,pizza,pizza +3,Préparateur,preparator,preparator 4,Administrateur,admin,admin \ No newline at end of file From 548f50e4f3d7308822fefc84d64f50583bf17a7c Mon Sep 17 00:00:00 2001 From: Arthur Dodin Date: Wed, 11 Sep 2024 12:35:40 +0200 Subject: [PATCH 2/6] update: .env consts --- env/api.env | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/env/api.env b/env/api.env index ba365da..3d96073 100644 --- a/env/api.env +++ b/env/api.env @@ -3,15 +3,24 @@ 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 +APP_PIN_ADMIN=000000 +APP_PIN_PREPARATOR=258369 + +# Envoie un message sur Slack si activé à chaque commande SLACK_ENABLED=false -SLACK_WEBHOOK_URL= \ No newline at end of file +SLACK_WEBHOOK_URL= + + From 0253ab655a1e5805b90b7bd0f7af8de31e799ca8 Mon Sep 17 00:00:00 2001 From: Arthur Dodin Date: Wed, 11 Sep 2024 12:55:50 +0200 Subject: [PATCH 3/6] update: seed/users.csv --- seed/users.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/users.csv b/seed/users.csv index 076a8fd..2d61b6c 100644 --- 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,preparator,preparator +3,Préparateur,preparator,prepare 4,Administrateur,admin,admin \ No newline at end of file From 429569a66cafbcd087c38e0d50c76bba0a276cd5 Mon Sep 17 00:00:00 2001 From: Arthur Dodin Date: Sat, 21 Sep 2024 16:20:09 +0200 Subject: [PATCH 4/6] feat/discord-message add .env const --- env/api.env | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/env/api.env b/env/api.env index 3d96073..1194691 100644 --- a/env/api.env +++ b/env/api.env @@ -13,14 +13,11 @@ 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=000000 -APP_PIN_PREPARATOR=258369 - -# Envoie un message sur Slack si activé à chaque commande -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= From 60bbfc2cff0e946f003f3d0a497f21b6457a0252 Mon Sep 17 00:00:00 2001 From: Zalko <88582103+Zalk0@users.noreply.github.com> Date: Tue, 24 Sep 2024 11:40:35 +0200 Subject: [PATCH 5/6] fix: ci failing --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f7b1d0..a202d7e 100644 --- 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 From 9f972d543bc9d1b2d218e5dfd864faed5c9dd756 Mon Sep 17 00:00:00 2001 From: Remi-pcn Date: Thu, 5 Dec 2024 13:57:04 +0100 Subject: [PATCH 6/6] Changed branch to master --- api | 2 +- front | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api b/api index b426c15..c308bd8 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit b426c15f220616229de4c2777685faa7ef828702 +Subproject commit c308bd8e317130332e69e788958123579cac5038 diff --git a/front b/front index 4473d03..7712c27 160000 --- a/front +++ b/front @@ -1 +1 @@ -Subproject commit 4473d034ca9ca2289da363d7608ada8b03a868d9 +Subproject commit 7712c272066ea7a0493ce86a45d47b5843ee3fec