Prueba2

.env

@@ -20,10 +20,9 @@ CI_ENVIRONMENT = development
 # APP
 #--------------------------------------------------------------------
 
-# app.baseURL = ''
+  app.baseURL = 'https://tbw2223-12-mrtjcmh.oa.r.appspot.com'
 # If you have trouble with `.`, you could also use `_`.
-#  app_baseURL = 'https://tbw2223-12-mrtjcmh.oa.r.appspot.com'
-  app_baseURL = 'http://localhost'
+#  app_baseURL = 'http://localhost'
 
 # app.forceGlobalSecureRequests = false
 # app.CSPEnabled = false
@@ -32,6 +31,13 @@ CI_ENVIRONMENT = development
 # DATABASE
 #--------------------------------------------------------------------
 
+# database.default.hostname = localhost
+# database.default.database = webapp
+# database.default.username = webapp_user
+# database.default.password = FOE6f35AUtbL015D
+# database.default.DBDriver = MySQLi
+
+
 database.default.hostname = 34.65.71.245
 database.default.database = webapp
 database.default.username = mrtjcmh

app/Controllers/User.php

@@ -50,11 +50,6 @@ class User extends BaseController
                 if ($user) {
                     $session->set('logged_in', TRUE);
                     $session->set('user', $user);
-<<<<<<< HEAD
-                    return redirect()->to(base_url('/home'));
-                } else {
-                    $session->setFlashdata('msg', 'Credenciales incorrectas');
-=======
                     return $this->response->setStatusCode(200)->setJSON([
                         'text' => 'Usuario logeado'
                     ]);
@@ -62,7 +57,6 @@ class User extends BaseController
                     return $this->response->setStatusCode(403)->setJSON([
                         'text' => 'Usuario no logeado'
                     ]);
->>>>>>> origin/developmanu
                 }
             } else {
                 return $this->output->set_content_type('application/json')

app/Views/pages/home.php

@@ -106,7 +106,7 @@
         <nav>
             <ol class="breadcrumb">
                 <li class="breadcrumb-item"><a href="index.html">HOME</a></li>
-                <li class="breadcrumb-item active">RECETAS</li>
+                <li class="breadcrumb-item active">RECETASS</li>
             </ol>
         </nav>
     </div><!-- End Page Title -->