Skip to content

Juan Montilla / TBW2223_equipo12

Go to a project
Commit 6e23446c by Manuel Ruiz Toribio
Options

bug vegano arreglado

parent e033d7ff
Inline Side-by-side
Showing with 24 additions and 25 deletions
.env
...@@ -15,16 +15,16 @@ ...@@ -15,16 +15,16 @@
#-------------------------------------------------------------------- #--------------------------------------------------------------------
CI_ENVIRONMENT = production CI_ENVIRONMENT = production
CI_ENVIRONMENT = production
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# APP # APP
#-------------------------------------------------------------------- #--------------------------------------------------------------------
#app.baseURL = 'https://tbw2223-12-mrtjcmh.oa.r.appspot.com'
#app.baseURL = 'https://tbw2223-12-mrtjcmh.oa.r.appspot.com' app.baseURL = 'https://tbw2223-12-mrtjcmh.oa.r.appspot.com'
# If you have trouble with `.`, you could also use `_`. # If you have trouble with `.`, you could also use `_`.
app_baseURL = 'http://localhost' #app_baseURL = 'http://localhost'
# app.forceGlobalSecureRequests = false # app.forceGlobalSecureRequests = false
# app.CSPEnabled = false # app.CSPEnabled = false
...@@ -33,19 +33,19 @@ CI_ENVIRONMENT = production ...@@ -33,19 +33,19 @@ CI_ENVIRONMENT = production
# DATABASE # DATABASE
#-------------------------------------------------------------------- #--------------------------------------------------------------------
database.default.hostname = localhost #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.database = webapp
#database.default.username = mrtjcmh #database.default.username = webapp_user
#database.default.password = d7c+}rB+Ezouc<ak #database.default.password = FOE6f35AUtbL015D
#database.default.DBDriver = MySQLi #database.default.DBDriver = MySQLi
database.default.hostname = 34.65.71.245
database.default.database = webapp
database.default.username = mrtjcmh
database.default.password = d7c+}rB+Ezouc<ak
database.default.DBDriver = MySQLi
# database.default.hostname = localhost # database.default.hostname = localhost
# database.default.database = ci4 # database.default.database = ci4
# database.default.username = root # database.default.username = root
......
app/Config/Routes.php
...@@ -46,7 +46,7 @@ $routes->get('/recipes/delete/(:num)', 'RecipesController::delete/$1'); ...@@ -46,7 +46,7 @@ $routes->get('/recipes/delete/(:num)', 'RecipesController::delete/$1');
$routes->get('/logout', 'User::logout'); $routes->get('/logout', 'User::logout');
// Ruta para ver una receta // Ruta para ver una receta
//$routes->get('/recipe/(:num)', 'RecipesController::view_recipe/$1'); $routes->get('/recipe/(:num)', 'RecipesController::view_recipe/$1');
// Ruta para obtener una imagen de una receta dado un id // Ruta para obtener una imagen de una receta dado un id
$routes->get('recipe/image/(:num)', 'RecipesController::show_image/$1'); $routes->get('recipe/image/(:num)', 'RecipesController::show_image/$1');
......
app/Views/pages/home.php
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
}); });
let recipeHtml = ` let recipeHtml = `
<div class="card info-card sales-card" onclick="window.location.href='recipe/${recipe.id}'"> <div class="card info-card sales-card recipe-card" onclick="window.location.href='recipe/${recipe.id}'">
<a href="recipe/${recipe.id}"></a> <a href="recipe/${recipe.id}"></a>
<div class="row flex-nowrap"> <div class="row flex-nowrap">
<div class="col-lg-3 col-md-4 col-sm-12 imagen-container"> <div class="col-lg-3 col-md-4 col-sm-12 imagen-container">
......
app/Views/pages/insertRecipe.php
...@@ -60,16 +60,15 @@ ...@@ -60,16 +60,15 @@
<option value="Otoño">Otoño</option> <option value="Otoño">Otoño</option>
<option value="4estaciones">4 estaciones</option> <option value="4estaciones">4 estaciones</option>
</select> </select>
</div>
<!-- Opción vegana --> </div>
<div class="form-group col-md-4"> <!-- Seleccionar vegano -->
<label for="is_vegan" class="chip-label">Vegana</label> <div class="form-group col-md-4">
<div class="custom-control custom-switch"> <label for="is_vegan">Vegana?</label>
<input type="checkbox" class="custom-control-input" id="is_vegan" name="is_vegan" > <select id="is_vegan" name="is_vegan" class="form-control">
<label class="custom-control-label chip" for="is_vegan"></label> <option value="1">Si</option>
</div> <option value="0">No</option>
</select>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment