Merge branch 'master' into dependabot/composer/laravel/sail-1.29.0

Author: perisicnikola37

.github/workflows/docker_action.yml

@@ -0,0 +1,21 @@
+name: Docker compose action
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'Dockerfile'
+      - 'docker-compose.yml'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Build and run Docker Compose
+        run: |
+          docker-compose up --build -d

.github/workflows/phpunit.yml renamed to .github/workflows/phpunit_action.yml

@@ -1,4 +1,4 @@
-name: Laravel
+name: PHP Unit action
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 jobs:
-  laravel-tests:
+  project-tests:
 
     runs-on: ubuntu-latest
 
@@ -30,7 +30,7 @@ jobs:
         LARAVEL_BYPASS_ENV_CHECK: 1
       run: npm install && npm run dev &
     - name: Wait for server to start
-      run: sleep 10s # Adjust this time according to your server startup time
+      run: sleep 10s 
     - name: Execute tests (Unit and Feature tests) via PHPUnit
       env:
         DB_CONNECTION: sqlite

Dockerfile

@@ -2,6 +2,7 @@ FROM php:8.2-cli
 
 WORKDIR /var/www/html
 
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
     curl \
     libpng-dev \
@@ -11,30 +12,32 @@ RUN apt-get update && apt-get install -y \
     zip \
     unzip \
     nodejs \
-    npm
+    npm \
+    && rm -rf /var/lib/apt/lists/*
 
+# Install PHP extensions
 RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) gd pdo pdo_mysql zip
 
+# Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
+# Copy composer files and install dependencies
 COPY composer.json composer.lock ./
-
 RUN composer install --no-scripts --no-autoloader
 
+# Copy the rest of the application files
 COPY . .
 
+# Generate autoload files
 RUN composer dump-autoload
 
-RUN apt-get update && apt-get install -y \
-    nodejs \
-    npm
-
-RUN npm install 
-
-RUN php artisan config:clear
+# Install npm packages and build
+RUN npm install && npm run build
 
+# Expose ports for both PHP and npm servers
 EXPOSE 9000
+EXPOSE 5173
 
-CMD php artisan serve --host=0.0.0.0 --port=9000 
-
+# Set up command to run both services
+CMD php artisan serve --host=0.0.0.0 --port=9000 & npm run dev --host 0.0.0.0 --port 5173

README.md

@@ -1,4 +1,4 @@
-## Laravel 10 + Inertia.js + Vue.js 3 -> single page application
+## Laravel 10 + Inertia.js + Vue.js 3 + Jetstream -> single page application
 
 <div style="display: flex;">
   <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/Laravel.svg/985px-Laravel.svg.png" alt="Laravel Logo" style="width: 40px;">
@@ -9,9 +9,9 @@
 <br>
 The application is designed to provide a smooth and interactive user experience. This SPA offers an all-in-one solution for managing users and roles, featuring an easy-to-use dashboard for administrators.
 
-## Preview
+## Demo video
 
-[gif.webm](https://user-images.githubusercontent.com/79047182/222930543-9883369c-1d8f-4985-9b61-baa933122596.webm)
+[Demo video](https://github.com/perisicnikola37/laravel-inertia-vue-spa/assets/79047182/38ffbb70-0543-495b-8211-ed5e17257ff2)
 
 ## Installation
 

capture.webm

@@ -12,7 +12,7 @@
         "laravel/jetstream": "^4.1.1",
         "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.8",
-        "tightenco/ziggy": "^1.0"
+        "tightenco/ziggy": "^2.0"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^3.0",

composer.json

@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Role>
+ */
+class RoleFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->name(),
+        ];
+    }
+}

composer.lock

@@ -1,7 +1,7 @@
 {
     "private": true,
     "scripts": {
-        "dev": "vite",
+        "dev": "vite --host",
         "build": "vite build"
     },
     "devDependencies": {