Merge pull request #163 from shiftenterdev/development

Development

.env.docker

@@ -2,29 +2,29 @@ APP_NAME=Snapovia
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=false
-APP_URL=http://snapovia.test
+APP_URL=http://localhost
 
 LOG_CHANNEL=daily
 
 DB_CONNECTION=mysql
-DB_HOST=snapovia_db
+DB_HOST=mysql
 DB_PORT=3306
 DB_DATABASE=snapovia
-DB_USERNAME=root
-DB_PASSWORD=root
+DB_USERNAME=sail
+DB_PASSWORD=password
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-QUEUE_CONNECTION=database
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
-REDIS_HOST=127.0.0.1
+REDIS_HOST=redis
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
+MAIL_HOST=mailpit
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
@@ -37,14 +37,12 @@ AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
 
-SAMPLE_PRODUCT_COUNT=50
-SAMPLE_CUSTOMER_COUNT=50
-SAMPLE_ORDER_COUNT=10
-SAMPLE_ABANDON_CART_COUNT=6
-
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
 PUSHER_APP_CLUSTER=mt1
 
 LARAVEL_WEBSOCKETS_HOST=127.0.0.1
@@ -59,5 +57,29 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 STRIPE_KEY=
 STRIPE_SECRET=
 
+SAMPLE_PRODUCT_COUNT=150
+SAMPLE_CUSTOMER_COUNT=50
+SAMPLE_ORDER_COUNT=10
+SAMPLE_ABANDON_CART_COUNT=6
+
 FRONTEND_VIEW=blade
 ADMIN_URL=adminportal
+
+VITE_PORT=5173
+VITE_APP_NAME="${APP_NAME}"
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+SCOUT_DRIVER=typesense
+TYPESENSE_HOST=typesense
+TYPESENSE_PORT=8108
+TYPESENSE_PROTOCOL=http
+TYPESENSE_API_KEY=xyz
+
+FORWARD_REDIS_PORT=6379
+FORWARD_MAILPIT_PORT=1025
+FORWARD_MAILPIT_DASHBOARD_PORT=8025
+APP_PORT=8000

README.md

@@ -29,21 +29,21 @@ We will have the following features:
 
 ## Specification
 
-|Info|Details|
-|:---|:---|
-|Project|Ecommerce|
-|Type|Single store mode|
-|Framework|Laravel 8.x|
-|Database|Mysql 5.7|
-|PHP|^7.3|
-|Admin panel|Yes|
-|Vendor|Yes|
-|Frontend|Blade & Vue|
-|Livewire|2.x|
-|Spatie Media Library|7.x|
-|Spatie Permission|3.x|
-|Unisharp File manager|dev-master|
-|Payment |COD,Stripe,Paypal|
+| Info                  | Details           |
+|:----------------------|:------------------|
+| Project               | Ecommerce         |
+| Type                  | Single store mode |
+| Framework             | Laravel 10.x      |
+| Database              | Mysql 5.7         |
+| PHP                   | ^8.1              |
+| Admin panel           | Yes               |
+| Vendor                | Yes               |
+| Frontend              | Blade & Vue       |
+| Livewire              | 3.x               |
+| Spatie Media Library  | 7.x               |
+| Spatie Permission     | 3.x               |
+| Unisharp File manager | dev-master        |
+| Payment               | COD,Stripe,Paypal |
 
 ## Installation
 
@@ -55,54 +55,17 @@ $ cd snapovia
 $ composer install
 $ cp .env.docker .env
 
-$ docker-compose build
-$ docker-compose up -d
+$ sail up
+# OR in detach mode
+$ sail up -d
 
-$ docker-compose exec app php /var/www/artisan migrate:fresh --seed
-# If you want to execute direct shell command
-# $ docker-compose exec {container_name} sh
-$ docker-compose exec app sh
-# Then execute as 
-$ php artisan migrate:fresh --seed
+$ ./vendor/bin/sail artisan migrate:fresh --seed
 
-# migrate without sample-data
-$ php artisan migrate:fresh
-
-$ docker-compose run npm install --save
-$ docker-compose run npm run production
-```
-**Now serve http://snapovia.local/**
-
-### General
-
-```shell script
-# Using git clone
-$ git clone https://github.com/shiftenterdev/snapovia.git
-
-# Using composer
-$ composer create-project shiftenterdev/snapovia
-
-$ cd snapovia
-$ composer install
-$ cp .env.example .env
-$ php artisan key:generate
-
-# create database add it .env file
-
-# migrate database with sample-data
-$ php artisan migrate:fresh --seed
-
-# migrate without sample-data
-$ php artisan migrate:fresh
-
-# install node modules for vue(optional)[On progress...]
-$ npm i --save
-$ npm run production
-
-# finally run the buit-in server
-$ php artisan serve
+$ ./vendor/bin/sail run serve
+# OR using yarn
+$ ./vendor/bin/sail yarn
 ```
-**Now serve http://127.0.0.1:8000**
+**Now serve http://localhost:8000/**
 
 > Admin url: http://127.0.0.1:8000/adminportal/login \
 > Login: `[email protected]` \
@@ -119,15 +82,15 @@ QUEUE_CONNECTION=database
 ```
 Then run (in console or cron job)
 ```sh
-php artisan queue:work
+sail artisan queue:work
 ```
 To check the failed jobs
 ```sh
-php artisan queue:failed 
+sail artisan queue:failed 
 ``` 
 To send them in queue list again
 ```sh
-php artisan queue:retry all 
+sail artisan queue:retry all 
 ```
 
 

composer.json

@@ -30,16 +30,16 @@
         "unisharp/laravel-filemanager": "^2.6.4"
     },
     "require-dev": {
-        "roave/security-advisories": "dev-latest",
         "barryvdh/laravel-debugbar": "^3.8",
         "fakerphp/faker": "^1.21",
         "laravel/pint": "^1.13",
-        "laravel/sail": "^1.18",
+        "laravel/sail": "^1.27",
         "mbezhanov/faker-provider-collection": "^2.0",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^7.0",
         "pestphp/pest": "^2.16",
         "phpunit/phpunit": "^10.1",
+        "roave/security-advisories": "dev-latest",
         "spatie/laravel-ignition": "^2.0"
     },
     "config": {