Skip to content

Commit

Permalink
Commitando atualizações por segurança
Browse files Browse the repository at this point in the history
  • Loading branch information
marcio1002 committed Jul 11, 2020
1 parent a342246 commit f3786e0
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 18 deletions.
5 changes: 4 additions & 1 deletion src/Views/_theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=7" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<link rel="shortcut icon" href="./src/assets/logos-icons/ecomais.ico" type="image/x-icon">
<meta name="author" content="EcoMais">
<meta name="description" content="Conheça a melhor plataforma de discontos de atacarejos. O ecomais vai te mostrar os melhores discontos perto da sua casa.">
<meta name="keywords" content="discontos,atacarejo,supermecado,compras">
<link rel="shortcut icon" href=<?=renderUrl("/src/assets/logos-icons/ecomais.ico")?> type="image/x-icon">
<?= Bundles::renderCss(["css/bootstrap", "css/alertify", "fontawesome", "css/eco/style"]); ?>
<link rel='stylesheet' type='text/css' href=<?= renderUrl("/src/assets/css/estilo.css") ?> />
<?= $this->section("css"); ?>
Expand Down
12 changes: 5 additions & 7 deletions src/Views/home.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,23 +82,22 @@
</div>
</div>
</div>
<div class="container-fluid">
<div id="mainSlider" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
<li data-target="#mainSlider" data-slide-to="0" class="activate"></li>
<li data-target="#mainSlider" data-slide-to="1"></li>
<li data-target="#mainSlider" data-slide-to="2"></li>
</ol>
<div class="carousel-inner">
<div class="carousel-item active">
<div class="carousel-inner ">
<div class="carousel-item active after-color">
<img src=<?= renderUrl("/src/assets/imgs/frutas-e-legumes.png"); ?> class="d-block w-100" alt="missao">
<div class="carousel-caption d-none d-md-block">
<h2>Impacto Positivo</h2>
<p> Entre e conheça sobre os benefícios da propaganda digital para o meio ambiente</p>
<a href="#" class="main-btn text-white">Saiba mais</a>
</div>
</div>
<div class="carousel-item">
<div class="carousel-item after-color ">
<img src=<?= renderUrl("/src/assets/imgs/supermarket.png"); ?> class="d-block w-100" alt="iamgem de negocios">
<div class="carousel-caption d-none d-md-block">
<h2>Benefícios para os consumidores</h2>
Expand All @@ -107,8 +106,8 @@
<a href="#" class="main-btn text-white">Saiba mais!</a>
</div>
</div>
<div class="carousel-item ">
<img src=<?= renderUrl("/src/assets/imgs/fruta.png"); ?> class="d-block w-100" alt="Mercado">
<div class="carousel-item after-color">
<img src=<?= renderUrl("/src/assets/imgs/carrinho-com-compras.png"); ?> class="d-block w-100" alt="Mercado">
<div class="carousel-caption d-none d-md-block">
<h2>Mais que um simples negócio, uma missão</h2>
<p> A equipe EcoMais zela pelo meio ambiente e pelo cuidado com planeta</p>
Expand All @@ -124,7 +123,6 @@
<span class="sr-only">Next</span>
</a>
</div>
</div>

<?php
$this->start("footer");
Expand Down
2 changes: 1 addition & 1 deletion src/Views/register.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
</div>
<div class="col-12">
<div class="col-xl-5 col-lg-5 col-md-9 col-sm-12 m-auto">
<button type="button" class="btn btn-block bg-red-wine text-white border-green-dark-1 nextItem font-size-1-2em text-weight-700" id="btnRegister">Cadastrar</button>
<button type="button" class="btn btn-block bg-red-wine remove-focus text-white border-green-dark-1 nextItem font-size-1-2em text-weight-700" id="btnRegister">Cadastrar</button>
</div>
</div>
</div>
Expand Down
6 changes: 5 additions & 1 deletion src/assets/css/eco.style.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,8 @@
.text-red-wine { color: rgb(128, 18, 18) !important;}

/* --- Buttons Colors ---*/
.btn-color-red { background: #ea4335; }
.btn-color-red { background: #ea4335; }

/* --- Remove o focus do bootstrap ---*/

.remove-focus:focus { box-shadow: none !important;}
12 changes: 11 additions & 1 deletion src/assets/css/estilo.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ body{
#login:active { background-color: #239c55 !important; color: rgb(236, 236, 236) !important; }
/* ------- */

#title-container { background: rgba(68, 68, 68, 0.74) url("../imgs/casal-no-mercado.png") no-repeat; background-size: cover; background-attachment: fixed; height: 70vh; }
#title-container { background: rgba(68, 68, 68, 0.644) url("../imgs/casal-no-mercado.png") no-repeat; background-size: cover; background-attachment: fixed; height: 70vh; }

.h1{ font-family: 'Jost', sans-serif; margin: 0; padding-top: 20px; padding-left: 0; padding-bottom: 50px; letter-spacing: 8px;text-align: center; font-size: 75px; color: #F9F9F9; background-size: 300%;}

Expand Down Expand Up @@ -110,6 +110,16 @@ body{



.after-color:after{
content:'';
position: absolute;
top:0;
bottom:0;
left:0;
right:0;
background-color:rgba(0, 0, 0, 0.301);
}

@media (max-width:720px) {
#login {
border: none !important;
Expand Down
Binary file added src/assets/imgs/carrinho-com-compras.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/imgs/fruteira.jpg
Binary file not shown.
5 changes: 1 addition & 4 deletions src/assets/js/product/list-product.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ function createTable() {
error: (err) => alertify.error("Ocorreu um erro no servidor!")
};


reqAjax(option);


reqAjax(option);
}

createTable();
3 changes: 0 additions & 3 deletions src/assets/js/register.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,12 @@ $('#btnRegister').click(function() {
dataType: "json",
data: person,
beforeSend: () => {
load(true, this);
$(this).prop("disabled",true);
},
complete: () => {
load(false, this);
$(this).prop("disabled",false);
},
success: (res) => {
load(false, "#btnRegister");
if (typeof res == undefined || !res) throw new TypeError("Object null");

if (!res.error) {
Expand Down

0 comments on commit f3786e0

Please sign in to comment.