Merge branch 'main' into dev

Author: w3bdesign

.circleci/config.yml

@@ -1,11 +1,12 @@
 version: 2.1
 orbs:
-  browser-tools: circleci/browser-tools@1.3.0
+  browser-tools: circleci/browser-tools@1.2
+
 jobs: # a collection of steps
   build: # runs not using Workflows must have a `build` job as entry point
     docker: # run the steps with Docker
       #- image: cimg/php:8.0.14-browsers # ...with this image as the primary container; this is where all `steps` will run
-      - image: cimg/php:8.0.19-browsers # ...with this image as the primary container; this is where all `steps` will run
+      - image: cimg/php:8.1.7-browsers # ...with this image as the primary container; this is where all `steps` will run
         auth:
           username: mydockerhub-user
           password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
@@ -34,8 +35,8 @@ jobs: # a collection of steps
           key: node-v1-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
-      - run: touch database/database.sqlite
-      - run: php artisan migrate --env=testing
+      - run: touch database/testing.sqlite
+      - run: php artisan migrate --env=testing --database=sqlite_testing --force
       - run: php artisan dusk:chrome-driver 70
       - run: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
       - run: sudo dpkg -i google-chrome-stable_current_amd64.deb
@@ -45,7 +46,8 @@ jobs: # a collection of steps
           name: Serve Application
           background: true
           command: php artisan serve  
-      - run: php artisan dusk      
+      - run: php artisan dusk
+      - run: php artisan test      
       - store_artifacts:
           path: ./tests/Browser/console
           destination: console

.editorconfig

@@ -13,3 +13,6 @@ trim_trailing_whitespace = false
 
 [*.{yml,yaml}]
 indent_size = 2
+
+[docker-compose.yml]
+indent_size = 4

.env.example

@@ -2,9 +2,10 @@ APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://localhost
+APP_URL=http://127.0.0.1:8000
 
 LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
@@ -16,6 +17,7 @@ DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+FILESYSTEM_DISK=local
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
@@ -32,13 +34,14 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
+MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
@@ -48,8 +51,8 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
-STRIPE_KEY=
-STRIPE_SECRET=
+STRIPE_KEY="changeme"
+STRIPE_SECRET="changeme"
 
 MIX_STRIPE_KEY="${STRIPE_KEY}"
 

.env.testing

@@ -1,5 +1,10 @@
 * text=auto
-*.css linguist-vendored
-*.scss linguist-vendored
-*.js linguist-vendored
+
+*.blade.php diff=html
+*.css diff=css
+*.html diff=html
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
 CHANGELOG.md export-ignore

.eslintrc.json

@@ -1,26 +1,14 @@
-/vendor/
-node_modules/
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
+/vendor
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
 npm-debug.log
 yarn-error.log
-
-# Laravel 4 specific
-bootstrap/compiled.php
-app/storage/
-
-# Laravel 5 & Lumen specific
-public/storage
-public/hot
-
-# Laravel 5 & Lumen specific with changed public path
-public_html/storage
-public_html/hot
-
-storage/*.key
+/.idea
+/.vscode
 .env
-Homestead.yaml
-Homestead.json
-/.vagrant
-.phpunit.result.cache
-
-# Laravel IDE helper
-_ide_helper.php
+.env.testing

.gitattributes

@@ -5,7 +5,6 @@ php:
   finder:
     not-name:
       - index.php
-      - server.php
 js:
   finder:
     not-name: