From 3cc0c51a8869e5f43228bb55a9d532b477a2c3d1 Mon Sep 17 00:00:00 2001
From: Fernanda Andrade <119636766+fe222004@users.noreply.github.com>
Date: Tue, 23 Jul 2024 13:48:17 -0500
Subject: [PATCH] DM2-2646-desarrollo-del-sistema

---
 .env          | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
 composer.lock |  8 +++++++
 2 files changed, 67 insertions(+)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000..445c485
--- /dev/null
+++ b/.env
@@ -0,0 +1,59 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=base64:0hUj54Gbe261h5UYbuXmWsigir+WrXBQuQAZKLsMe4Q=
+APP_DEBUG=true
+APP_URL=http://localhost:8000/api
+
+LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=appliance_care
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailpit
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=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=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+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}"
diff --git a/composer.lock b/composer.lock
index b8e9dc7..8bf1a3e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1259,6 +1259,7 @@
                     "dev-master": "1.x-dev"
                 },
                 "laravel": {
+<<<<<<< Updated upstream
                     "providers": [
                         "Intervention\\Image\\ImageServiceProvider",
                         "Laravel\\Fortify\\FortifyServiceProvider"
@@ -1266,6 +1267,9 @@
                     "aliases": {
                         "Image": "Intervention\\Image\\Facades\\Image"
                     }
+=======
+                    "providers": ["Laravel\\Fortify\\FortifyServiceProvider"]
+>>>>>>> Stashed changes
                 }
             },
             "autoload": {
@@ -1288,6 +1292,7 @@
                 }
             ],
             "description": "Backend controllers and scaffolding for Laravel authentication.",
+<<<<<<< Updated upstream
             "homepage": "https://laravel.com/docs/9.x/fortify",
             "keywords": [
                 "auth",
@@ -1298,6 +1303,9 @@
                 "thumbnail",
                 "watermark"
             ],
+=======
+            "keywords": ["auth", "laravel"],
+>>>>>>> Stashed changes
             "support": {
                 "issues": "https://github.com/laravel/fortify/issues",
                 "source": "https://github.com/laravel/fortify"