Feat/franken

Caddyfile

@@ -0,0 +1,17 @@
+{
+	frankenphp
+	order php_server before file_server
+}
+
+# The domain name of your server
+loger.test {
+	# Set the webroot to the public/ dir
+	root * public/
+	# Enable compression (optional)
+	encode zstd gzip
+	# Execute PHP files in the current directory and serve assets
+	php_server {
+		# Required for the public/storage/ dir
+		resolve_root_symlink
+	}
+}

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1.2-fpm
+FROM dunglas/frankenphp
 
 ARG user
 ARG uid
@@ -28,16 +28,12 @@ echo extension=mailparse.so > /usr/local/etc/php/conf.d/mailparse.ini
 # Get latest Composer
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
-
 # Create system user to run Composer and Artisan Commands
-RUN useradd -G www-data,root,crontab -u $uid -d /home/$user $user
-RUN mkdir -p /home/$user/.composer && \
-    chown -R $user:$user /home/$user && \
-    chown -R $user:$user /var/www && \
-    chown -R www-data:www-data /var/www
+# RUN useradd -G www-data,root,crontab -u $uid -d /home/$user $user
+# RUN mkdir -p /home/$user/.composer && \
+#     chown -R $user:$user /home/$user && \
+#     chown -R $user:$user /var/www && \
+#     chown -R www-data:www-data /var/www
 
-# Set working directory
-WORKDIR /var/www
 
-USER $user
-CMD ["php artisan serve"]
+# USER $user

components.d.ts

@@ -7,36 +7,26 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
-    IFluentFoodApple20Filled: typeof import('~icons/fluent/food-apple20-filled')['default']
-    IIcRoundQueryStats: typeof import('~icons/ic/round-query-stats')['default']
     IIonEllipsisVertical: typeof import('~icons/ion/ellipsis-vertical')['default']
     IMaterialSymbolsBrightnessAlertOutlineRounded: typeof import('~icons/material-symbols/brightness-alert-outline-rounded')['default']
     IMdiBankTransfer: typeof import('~icons/mdi/bank-transfer')['default']
     IMdiBankTransferIn: typeof import('~icons/mdi/bank-transfer-in')['default']
     IMdiBankTransferOut: typeof import('~icons/mdi/bank-transfer-out')['default']
     IMdiCallSplit: typeof import('~icons/mdi/call-split')['default']
-    IMdiCheck: typeof import('~icons/mdi/check')['default']
-    IMdiChevronLeft: typeof import('~icons/mdi/chevron-left')['default']
-    IMdiChevronRight: typeof import('~icons/mdi/chevron-right')['default']
     IMdiClose: typeof import('~icons/mdi/close')['default']
     IMdiEdit: typeof import('~icons/mdi/edit')['default']
     IMdiEllipsisVertical: typeof import('~icons/mdi/ellipsis-vertical')['default']
     IMdiExport: typeof import('~icons/mdi/export')['default']
     IMdiFile: typeof import('~icons/mdi/file')['default']
     IMdiFilter: typeof import('~icons/mdi/filter')['default']
-    IMdiHistory: typeof import('~icons/mdi/history')['default']
     IMdiLink: typeof import('~icons/mdi/link')['default']
     IMdiLock: typeof import('~icons/mdi/lock')['default']
-    IMdiMinus: typeof import('~icons/mdi/minus')['default']
-    IMdiPencil: typeof import('~icons/mdi/pencil')['default']
     IMdiPlus: typeof import('~icons/mdi/plus')['default']
-    IMdiPrinter: typeof import('~icons/mdi/printer')['default']
     IMdiSearch: typeof import('~icons/mdi/search')['default']
     IMdiSort: typeof import('~icons/mdi/sort')['default']
     IMdiStar: typeof import('~icons/mdi/star')['default']
     IMdiStarOutline: typeof import('~icons/mdi/star-outline')['default']
     IMdiSync: typeof import('~icons/mdi/sync')['default']
     IMdiTrash: typeof import('~icons/mdi/trash')['default']
-    IMdiWallet: typeof import('~icons/mdi/wallet')['default']
   }
 }

composer.json

@@ -4,15 +4,6 @@
     "description": "The Laravel Framework.",
     "keywords": ["framework", "laravel"],
     "license": "MIT",
-    "repositories": [
-        {
-          "url": "../packages/journal",
-          "type": "path",
-          "options": {
-                "symlink": true
-            }
-        }
-    ],
     "require": {
         "php": "^8.1",
         "ext-mailparse": "*",

docker-compose.dev.yml

@@ -3,16 +3,18 @@ services:
   web:
     build:
       args:
-        user: 'loger'
         uid: 1000
         TZ: America\New_York
       context: ./
       dockerfile: Dockerfile
     image: loger
     container_name: loger-app
+    ports:
+      - 80:80
+      - 443:443
     restart: unless-stopped
     volumes:
-      - ./:/var/www
+      - ./:/app
       - ./docker-compose/web/timezone:/etc/timezone
       - loger_db:/var/lib/mysql
     networks:
@@ -40,17 +42,17 @@ services:
       - ./docker-compose/mysql:/home/root/cache/
     networks:
       - loger
-  nginx:
-    image: nginx:alpine
-    container_name: loger-nginx
-    restart: unless-stopped
-    ports:
-      - "8080:80"
-    volumes:
-      - ./:/var/www
-      - ./docker-compose/nginx/vhosts:/etc/nginx/conf.d/
-    networks:
-      - loger
+  # nginx:
+  #   image: nginx:alpine
+  #   container_name: loger-nginx
+  #   restart: unless-stopped
+  #   ports:
+  #     - "8080:80"
+  #   volumes:
+  #     - ./:/var/www
+  #     - ./docker-compose/nginx/vhosts:/etc/nginx/conf.d/
+  #   networks:
+  #     - loger
   redis:
     image: 'redis:alpine'
     ports:

package.json

@@ -8,7 +8,7 @@
         "prod": "vite build",
         "build": "vite build",
         "local:setup": "php artisan migrate:fresh --force --seed",
-        "local:setup-demo": "npm run local:setup && php artisan demo:seed",
+        "local:setup-demo": "npm run local:setup && php artisan app:demo-seed",
         "local:demo": "php artisan demo:seed",
         "docker:build": "docker compose build",
         "docker:up-dev": "docker compose -f docker-compose.dev.yml up -d",