Merge pull request #17 from HellPat/nix-shell

Uses nix-shell instead of devenv.sh

Author: HellPat

.env

@@ -27,15 +27,15 @@ APP_SECRET=aebd59d3c9b54539553c1ea79045c817
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
 # DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
-DATABASE_URL="mysql://app:app@127.0.0.1:13309/app?erverVersion=8.0.35&charset=utf8"
+DATABASE_URL="mysql://user:pass@localhost/app?unix_socket=${MYSQL_UNIX_PORT}&serverVersion=8.0.35&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/messenger ###
 # Choose one of the transports below
 # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
 # MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
 # MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
-MESSENGER_TRANSPORT_DSN=redis://localhost:16379/messages
+MESSENGER_TRANSPORT_DSN=redis://${REDIS_SOCKET}?stream=messages
 ###< symfony/messenger ###
 
 ###> symfony/mailer ###

.envrc

@@ -46,5 +46,9 @@ devenv.local.nix
 phpstan.neon
 ###< phpstan/phpstan ###
 
-docker/
+storage/mysql/data
+storage/redis/data
+*.sock
+*.sock.lock
+*.pid
 node_modules/

.gitignore

@@ -4,8 +4,10 @@ reload:
   interval: 1s
   services:
     http:
-      patterns: [ ".php", ".env", ".env.local", ".yaml", ".yml" ]
+      dirs: [""]
       ignore: [ "var/" ]
+      patterns: [ ".php", ".env", ".env.local", ".yaml", ".yml" ]
+      recursive: true
 
 server:
   command: "php public/index.php"
@@ -23,6 +25,8 @@ http:
 
 logs:
   mode: development
+  level: debug
+  encoding: json
   channels:
     http:
       level: info

.rr.dev.yaml

@@ -1,7 +1,15 @@
 develop:
-    devenv up
+    overmind start
 
 build:
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    # initialize mysql when the directory does not exist
+    if [ ! -d $MYSQL_DATADIR ]; then
+      mkdir -p ${MYSQL_DATADIR}
+      mysqld --datadir=${MYSQL_DATADIR} --initialize
+    fi
+    echo "STRIPE_SIGNING_SECRET=$(stripe listen --print-secret)" > .env.local
     tailwindcss -i assets/styles/app.css -o assets/styles/app.tailwind.css
 
 rebuild:

Justfile

@@ -0,0 +1,13 @@
+# TODO: handle dependencies between services by using a wait-for.sh script.
+
+mysql: mysqld --datadir=${MYSQL_DATADIR} --init-file=${MYSQL_HOME}/init.sql --skip-networking
+redis: redis-server storage/redis/redis.conf
+symfony: rr serve -p -c .rr.dev.yaml --debug
+
+# TODO: rethink limits and restarts.
+#       I set a time limit and a limit of jobs to process, to easy using xdebug.
+#       Xdebug listening must be started in the IDE, and the long running process must be restarted to take effect.
+symfony-message-consumer: symfony run --watch=config,src,vendor bin/console messenger:consume async --limit=10 --time-limit=300 --no-interaction -vv
+
+stripe: stripe listen --skip-verify --forward-to localhost:8000/webhook/stripe
+tailwindcss: tailwindcss -i assets/styles/app.css -o assets/styles/app.tailwind.css --watch

Procfile

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com
+! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -32,11 +32,9 @@
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
 6. Use the user's configured `sans` font-variation-settings by default.
-7. Disable tap highlights on iOS
 */
 
-html,
-:host {
+html {
   line-height: 1.5;
   /* 1 */
   -webkit-text-size-adjust: 100%;
@@ -46,14 +44,12 @@ html,
   -o-tab-size: 4;
      tab-size: 4;
   /* 3 */
-  font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   /* 4 */
   font-feature-settings: normal;
   /* 5 */
   font-variation-settings: normal;
   /* 6 */
-  -webkit-tap-highlight-color: transparent;
-  /* 7 */
 }
 
 /*
@@ -125,10 +121,8 @@ strong {
 }
 
 /*
-1. Use the user's configured `mono` font-family by default.
-2. Use the user's configured `mono` font-feature-settings by default.
-3. Use the user's configured `mono` font-variation-settings by default.
-4. Correct the odd `em` font sizing in all browsers.
+1. Use the user's configured `mono` font family by default.
+2. Correct the odd `em` font sizing in all browsers.
 */
 
 code,
@@ -137,12 +131,8 @@ samp,
 pre {
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
-  font-feature-settings: normal;
-  /* 2 */
-  font-variation-settings: normal;
-  /* 3 */
   font-size: 1em;
-  /* 4 */
+  /* 2 */
 }
 
 /*

assets/styles/app.tailwind.css

@@ -7,8 +7,8 @@ when@dev:
         handlers:
             main:
                 type: stream
-                path: "%kernel.logs_dir%/%kernel.environment%.log"
-                level: debug
+                path: php://stderr
+                level: info
                 channels: ["!event"]
             # uncomment to get logging in your browser
             # you may have to allow bigger header sizes in your Web server configuration