Skip to content

Commit 04cb505

Browse files
Merge branch 'dev' of github.com:Terraform-GUI/terraform-gui into feat_tf_samples
2 parents 5cdafa1 + a9e6699 commit 04cb505

35 files changed

+1446
-259
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ api-test:
5252

5353
api-setup:
5454
$(DOCKER_COMPOSE) $(EXEC_PHP) "composer install"
55-
5655
$(DOCKER_COMPOSE) $(EXEC_PHP) "php bin/console lexik:jwt:generate-keypair --skip-if-exists"
56+
php api/vendor/bin/grumphp git:init --config='./api/grumphp.yml'
5757

5858

5959
api-fix:

api/.env

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,20 @@ JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
3232
JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
3333
JWT_PASSPHRASE=fd832ae495ab05070be93cac658e4bb4
3434
###< lexik/jwt-authentication-bundle ###
35+
36+
###> symfony/mailer ###
37+
MAILER_DSN=smtp://mail:1025
38+
MAILER_FROM_EMAIL=[email protected]
39+
###< symfony/mailer ###
40+
41+
42+
###> General ###
43+
DOMAIN=
44+
FRONT_URL=http://localhost:8000
45+
PASSWORD_RESET_EXPIRATION=3600
46+
###< General ###
47+
48+
###> Github ###
49+
GITHUB_CLIENT_ID=
50+
GITHUB_CLIENT_SECRET=
51+
###< Github ###

api/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"doctrine/annotations": "^1.13",
1313
"doctrine/mongodb-odm": "^2.4",
1414
"doctrine/mongodb-odm-bundle": "^4.5",
15+
"firebase/php-jwt": "^6.3",
1516
"gesdinet/jwt-refresh-token-bundle": "^1.1",
1617
"lexik/jwt-authentication-bundle": "^2.16",
1718
"symfony/apache-pack": "^1.0",
@@ -20,6 +21,8 @@
2021
"symfony/flex": "^2",
2122
"symfony/form": "6.1.*",
2223
"symfony/framework-bundle": "6.1.*",
24+
"symfony/mailer": "6.1.*",
25+
"symfony/http-client": "6.1.*",
2326
"symfony/runtime": "6.1.*",
2427
"symfony/security-bundle": "6.1.*",
2528
"symfony/serializer": "6.1.*",

0 commit comments

Comments
 (0)