Commit 4843d92e by Yana

fixed connection with DB

parent 11651508
...@@ -49,11 +49,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ...@@ -49,11 +49,9 @@ defined('BASEPATH') OR exit('No direct script access allowed');
| Examples: my-controller/index -> my_controller/index | Examples: my-controller/index -> my_controller/index
| my-controller/my-method -> my_controller/my_method | my-controller/my-method -> my_controller/my_method
*/ */
//$route['default_controller'] = 'pages/view'; $route['default_controller'] = 'pages/view';
//$route['(:any)'] = 'pages/view/$1'; $route['(:any)'] = 'pages/view/$1';
$route['404_override'] = ''; $route['404_override'] = '';
$route['translate_uri_dashes'] = FALSE; $route['translate_uri_dashes'] = FALSE;
$route['products'] = 'products'; $route['products'] = 'products';
//$route['news'] = 'news';
//$route['profiler']="Profiler_controller";
//$route['profiler/disable']="Profiler_controller/disable";
...@@ -12,9 +12,7 @@ class Pages extends CI_Controller { ...@@ -12,9 +12,7 @@ class Pages extends CI_Controller {
$this->load->view('templates/header', $data); $this->load->view('templates/header', $data);
$this->load->view('pages/'.$page, $data); $this->load->view('pages/'.$page, $data);
// $this->load->view('food_page' , $data);
$this->load->view('templates/footer', $data); $this->load->view('templates/footer', $data);
$this->load->helper('url'); $this->load->helper('url');
} }
} }
......
...@@ -29,21 +29,7 @@ ...@@ -29,21 +29,7 @@
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/style.css"> <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/style.css">
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-lg navbar-dark ftco_navbar bg-dark ftco-navbar-light" id="ftco-navbar">
<div class="container">
<a class="navbar-brand" href="index.html"><span class="flaticon-pizza-1 mr-1"></span>Food<br><small>Runner</small></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#ftco-nav" aria-controls="ftco-nav" aria-expanded="false" aria-label="Toggle navigation">
<span class="oi oi-menu"></span> Menu
</button>
<div class="collapse navbar-collapse" id="ftco-nav">
<ul class="navbar-nav ml-auto">
<li class="nav-item"><a href="#" class="nav-link">Home</a></li>
<li class="nav-item"><a href="#about" class="nav-link">About us</a></li>
<li class="nav-item"><a href="#contacts" class="nav-link">Contacts</a></li>
</ul>
</div>
</div>
</nav>
<!-- Page Features --> <!-- Page Features -->
<!-- /.row --> <!-- /.row -->
......
...@@ -29,21 +29,7 @@ ...@@ -29,21 +29,7 @@
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/style.css"> <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/style.css">
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-lg navbar-dark ftco_navbar bg-dark ftco-navbar-light" id="ftco-navbar">
<div class="container">
<a class="navbar-brand" href="index.html"><span class="flaticon-pizza-1 mr-1"></span>Food<br><small>Runner</small></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#ftco-nav" aria-controls="ftco-nav" aria-expanded="false" aria-label="Toggle navigation">
<span class="oi oi-menu"></span> Menu
</button>
<div class="collapse navbar-collapse" id="ftco-nav">
<ul class="navbar-nav ml-auto">
<li class="nav-item"><a href="#" class="nav-link">Home</a></li>
<li class="nav-item"><a href="#about" class="nav-link">About us</a></li>
<li class="nav-item"><a href="#contacts" class="nav-link">Contacts</a></li>
</ul>
</div>
</div>
</nav>
<!-- END nav --> <!-- END nav -->
<section class="home-slider owl-carousel img" style="background-image: url(../assets/images/bg_1.jpg);"> <section class="home-slider owl-carousel img" style="background-image: url(../assets/images/bg_1.jpg);">
<div class="slider-item" style="background-image: url(../assets/images/bg_3.jpg);"> <div class="slider-item" style="background-image: url(../assets/images/bg_3.jpg);">
...@@ -72,7 +58,7 @@ ...@@ -72,7 +58,7 @@
<span class="subheading">Delicious</span> <span class="subheading">Delicious</span>
<h1 class="mb-4">Gazpacho</h1> <h1 class="mb-4">Gazpacho</h1>
<p class="mb-4 mb-md-5">We offer you only fresh food.</p> <p class="mb-4 mb-md-5">We offer you only fresh food.</p>
<p><a href="#" class="btn btn-primary p-3 px-xl-4 py-xl-3">Order Now</a></p> <p><a href="index" class="btn btn-primary p-3 px-xl-4 py-xl-3">Order Now</a></p>
</div> </div>
<div class="col-md-6 ftco-animate"> <div class="col-md-6 ftco-animate">
<img src="../assets/images/bg_1.png" class="img-fluid" alt=""> <img src="../assets/images/bg_1.png" class="img-fluid" alt="">
......
...@@ -9,16 +9,14 @@ ...@@ -9,16 +9,14 @@
<div id="block-content"> <div id="block-content">
<!--<?php foreach ($products as $key => $value): ?>
<h2><?php echo $value['title'];?> <?php foreach ($products as $key => $value): ?>
<h1 class="grid-item Deserts" data-text-color="#000" data-image="https:"><?php echo $value['title']; ?></h1>
<?php <?php
echo $value['description']; echo $value['description'];
?> </h2> ?>
<?php endforeach ?> <?php endforeach ?>
-->
<div class="grid-item Deserts" data-text-color="#000" data-image="https:"><a href="https://codepen.io/evalasters/pen/bwYwgx">Nombre2</a></div> <div class="grid-item Deserts" data-text-color="#000" data-image="https:"><a href="https://codepen.io/evalasters/pen/bwYwgx">Nombre2</a></div>
......
...@@ -114,7 +114,7 @@ switch (ENVIRONMENT) ...@@ -114,7 +114,7 @@ switch (ENVIRONMENT)
* *
* NO TRAILING SLASH! * NO TRAILING SLASH!
*/ */
$application_folder = 'application-bootstrap_lab'; $application_folder = 'application';
/* /*
*--------------------------------------------------------------- *---------------------------------------------------------------
......
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