Merge remote-tracking branch 'origin/main'

rats4final · Nov 24, 2022 · 5ef6539 · 5ef6539
2 parents a7d52e3 + b234c4f
commit 5ef6539
Show file tree

Hide file tree

Showing 153 changed files with 65,668 additions and 233 deletions.
diff --git a/app/Http/Controllers/CitasController.php b/app/Http/Controllers/CitasController.php
@@ -19,7 +19,7 @@ public function index()
 
     public function create()
     {
-        $User =User::get();
+        $User = User::get();
         return view('admin.Citas.create');
     }
 
@@ -32,12 +32,14 @@ public function store(Request $request)
 
     public function show($id)
     {
-        $Citas =Citas::find($id);
+        $Citas = Citas::find($id);
         return view('admin.Citas.show')->with('Citas', $Citas);
     }
 
     public function edit($id)
     {
+        $User = User::all();
+
         $Citas =Citas::find($id);
         return view('admin.Citas.edit')->with('Citas', $Citas);
     }

diff --git a/composer.lock b/composer.lock
diff --git a/public/css/app.css b/public/css/app.css
@@ -0,0 +1 @@
+
diff --git a/public/css/bootstrap copy/.DS_Store b/public/css/bootstrap copy/.DS_Store
diff --git a/public/css/bootstrap copy/_media.css b/public/css/bootstrap copy/_media.css
@@ -0,0 +1,12 @@
+.media {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: start;
+  -ms-flex-align: start;
+  align-items: flex-start; }
+
+.media-body {
+  -webkit-box-flex: 1;
+  -ms-flex: 1;
+  flex: 1; }
diff --git a/public/css/bootstrap copy/mixins/.DS_Store b/public/css/bootstrap copy/mixins/.DS_Store
diff --git a/public/css/bootstrap copy/mixins/_border-radius.css b/public/css/bootstrap copy/mixins/_border-radius.css
diff --git a/public/css/bootstrap copy/mixins/_screen-reader.css b/public/css/bootstrap copy/mixins/_screen-reader.css
diff --git a/public/css/bootstrap copy/mixins/_visibility.css b/public/css/bootstrap copy/mixins/_visibility.css
diff --git a/public/css/bootstrap copy/utilities/_stretched-link.css b/public/css/bootstrap copy/utilities/_stretched-link.css
@@ -0,0 +1,10 @@
+.stretched-link::after {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1;
+  pointer-events: auto;
+  content: "";
+  background-color: rgba(0, 0, 0, 0); }
diff --git a/public/css/bootstrap.css b/public/css/bootstrap.css
diff --git a/public/css/bootstrap.min copy.css b/public/css/bootstrap.min copy.css
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
diff --git a/public/css/bootstrap/.DS_Store b/public/css/bootstrap/.DS_Store
diff --git a/public/css/bootstrap/_media.css b/public/css/bootstrap/_media.css
@@ -0,0 +1,12 @@
+.media {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: start;
+  -ms-flex-align: start;
+  align-items: flex-start; }
+
+.media-body {
+  -webkit-box-flex: 1;
+  -ms-flex: 1;
+  flex: 1; }
diff --git a/public/css/bootstrap/mixins/.DS_Store b/public/css/bootstrap/mixins/.DS_Store
diff --git a/public/css/bootstrap/mixins/_border-radius.css b/public/css/bootstrap/mixins/_border-radius.css
diff --git a/public/css/bootstrap/mixins/_screen-reader.css b/public/css/bootstrap/mixins/_screen-reader.css
diff --git a/public/css/bootstrap/mixins/_visibility.css b/public/css/bootstrap/mixins/_visibility.css
diff --git a/public/css/bootstrap/utilities/_stretched-link.css b/public/css/bootstrap/utilities/_stretched-link.css
@@ -0,0 +1,10 @@
+.stretched-link::after {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1;
+  pointer-events: auto;
+  content: "";
+  background-color: rgba(0, 0, 0, 0); }