From 35e8bd62dfe43e35fc18bed48e5d34669fdc7bd3 Mon Sep 17 00:00:00 2001
From: Gabriel_Tha <gabriel.m.t@hotmail.com>
Date: Mon, 11 Mar 2019 11:24:45 -0300
Subject: [PATCH] Adiciona mapa em SOBRE. Finaliza pagina CONTATO

---
 .../app/Http/Controllers/HomeController.php   |  4 +-
 remember_laravel/public/css/style.css         |  8 +++-
 .../resources/views/frontend/about.blade.php  |  4 +-
 .../views/frontend/contact.blade.php          | 37 ++++++++++++++++---
 .../{galery.blade.php => gallery.blade.php}   |  0
 .../views/frontend/layout/navbar.blade.php    |  4 +-
 remember_laravel/routes/web.php               |  2 +-
 7 files changed, 46 insertions(+), 13 deletions(-)
 rename remember_laravel/resources/views/frontend/{galery.blade.php => gallery.blade.php} (100%)

diff --git a/remember_laravel/app/Http/Controllers/HomeController.php b/remember_laravel/app/Http/Controllers/HomeController.php
index fbc5c46..32be9e5 100644
--- a/remember_laravel/app/Http/Controllers/HomeController.php
+++ b/remember_laravel/app/Http/Controllers/HomeController.php
@@ -47,10 +47,10 @@ class HomeController extends Controller
         ]);
     }
 
-    public function galery()
+    public function gallery()
     {
         $images = Image::all();
-        return view('frontend.galery')->with(['images' => $images]);
+        return view('frontend.gallery')->with(['images' => $images]);
     }
 
     public function about()
diff --git a/remember_laravel/public/css/style.css b/remember_laravel/public/css/style.css
index ca96b5b..2df1f0d 100644
--- a/remember_laravel/public/css/style.css
+++ b/remember_laravel/public/css/style.css
@@ -170,7 +170,8 @@ textarea {
     -moz-filter: blur(5px);
  	-o-filter: blur(5px);
 	-ms-filter: blur(5px);
-  	filter: blur(5px);
+    filter: blur(5px) grayscale(55%);
+
 }
 
 .gallery-block{
@@ -236,3 +237,8 @@ textarea {
 	margin:0 auto;
 }
 
+.img_mapa{
+  max-width: 100%;
+  max-height: 100%;
+  padding-top:50px;
+}
diff --git a/remember_laravel/resources/views/frontend/about.blade.php b/remember_laravel/resources/views/frontend/about.blade.php
index da7393e..f2342fc 100644
--- a/remember_laravel/resources/views/frontend/about.blade.php
+++ b/remember_laravel/resources/views/frontend/about.blade.php
@@ -16,12 +16,14 @@
                         <p>405, R. Evaristo F. Ferreira da Costa, 393 - Jardim das Americas, Curitiba - PR, 80050-540</p>
                         <h3>E-mail</h3>
                         <p>pet@inf.ufpr.br</p>
+                        <a href="https://www.google.com.br/maps/place/PET+Computa%C3%A7%C3%A3o/@-25.4502641,-49.2316668,17.5z/data=!4m5!3m4!1s0x94dce5d5c8cc48d7:0xc7ac9d16c16ee4bb!8m2!3d-25.4502789!4d-49.2318302">
+                            <img class="img_mapa" src="{{ asset('storage/images/mapa_pet.png') }}"/>
+                        </a>
                     </div>
                     
                 {{--  AQUI VAI O MAPA  --}}
                 </div>
             </div>
-        <img class="bimagem" src="{{ asset('storage/images/background.jpg') }}" style="padding-top:50px"/>
     </section>
 </div>
 
diff --git a/remember_laravel/resources/views/frontend/contact.blade.php b/remember_laravel/resources/views/frontend/contact.blade.php
index 1dd042e..e6e0971 100644
--- a/remember_laravel/resources/views/frontend/contact.blade.php
+++ b/remember_laravel/resources/views/frontend/contact.blade.php
@@ -2,12 +2,37 @@
 
 @section('content')
 <!-- Header -->
-{{ Form::open(array('action' => 'HomeController@contato', 'role' => 'form')) }}
-{{ Form::label('nome', 'Nome', array('class'=>'control-label')) }}
- {{ Form::text('nome', null, array('placeholder'=>'Seu nome...', 'class'=>'form-control')) }}
-{{ Form::label('email', 'E-mail', array('class'=>'control-label')) }}
- {{ Form::text('email', null, array('placeholder'=>'Seu e-mail...', 'class'=>'form-control')) }}
-{{ Form::submit('Enviar Mensagem', array('class' => 'btn btn-default')) }}{{ Form::close() }}
+<div class="div-index-geral">
+        
+
+    <section class="gallery-block cards-gallery">
+            <div class="container">
+                <div class="heading">
+                  <h1>CONTATO</h1>
+                </div>
+                <div class="row">
+                    <div class="info">
+                        <h3>E-mail</h3>
+                        <h4>pet@inf.ufpr.br</h4>
+                        <h3 style="padding-top: 50px">Redes Sociais</h3>
+                    </div>
+                {{--  AQUI VAI O MAPA  --}}
+                </div>
+            </div>
+        <div style="display:flex;justify-content:center;align-items:center;">  
+                
+            <a href="https://www.facebook.com/petcompufpr">
+                <img src="https://www.facebook.com/images/fb_icon_325x325.png" style=" width: 100px"/>
+            </a>            
+            <a href="https://www.instagram.com/petcompufpr">
+                <img src="https://cdn.icon-icons.com/icons2/1294/PNG/512/2362135-instagram-photo-round-social_85523.png" style=" width: 110px; padding-left: 10px"/>
+            </a>
+            <a href="https://www.twitter.com/petcompufpr">
+                <img src="https://cdn1.iconfinder.com/data/icons/logotypes/32/square-twitter-512.png" style=" width: 110px; padding-left: 10px"/>
+            </a>
+        </div>
+    </section>
+</div>
 
 @endsection
 
diff --git a/remember_laravel/resources/views/frontend/galery.blade.php b/remember_laravel/resources/views/frontend/gallery.blade.php
similarity index 100%
rename from remember_laravel/resources/views/frontend/galery.blade.php
rename to remember_laravel/resources/views/frontend/gallery.blade.php
diff --git a/remember_laravel/resources/views/frontend/layout/navbar.blade.php b/remember_laravel/resources/views/frontend/layout/navbar.blade.php
index 0a8ffbd..e23aa72 100644
--- a/remember_laravel/resources/views/frontend/layout/navbar.blade.php
+++ b/remember_laravel/resources/views/frontend/layout/navbar.blade.php
@@ -3,14 +3,14 @@
   <div class="w3-bar w3-black w3-card w3-left-align w3-large">
     <a class="w3-bar-item w3-button w3-hide-medium w3-hide-large w3-right w3-padding-large w3-hover-white w3-large w3-black" href="javascript:void(0);" onclick="myFunction()" title="Toggle Navigation Menu"><i class="fa fa-bars"></i></a>
     <a href="/" class="w3-bar-item w3-button w3-padding-large home">REMEMBER PET</a>
-    <a href="galery" class="w3-bar-item w3-button w3-hide-small w3-padding-large w3-hover-white">Galeria</a>
+    <a href="gallery" class="w3-bar-item w3-button w3-hide-small w3-padding-large w3-hover-white">Galeria</a>
     <a href="about" class="w3-bar-item w3-button w3-hide-small w3-padding-large w3-hover-white">Sobre</a>
     <a href="contact" class="w3-bar-item w3-button w3-hide-small w3-padding-large w3-hover-white">Contato</a>
 <!--<a href="#" class="w3-bar-item w3-button w3-hide-small w3-padding-large w3-hover-white">Link 4</a> -->
   </div>
   <!-- Navbar on small screens -->
   <div id="navDemo" class="w3-bar-block w3-black w3-hide w3-hide-large w3-hide-medium w3-large">
-    <a href="galery" class="w3-bar-item w3-button w3-padding-large w3-hover-white">Galeria</a>
+    <a href="gallery" class="w3-bar-item w3-button w3-padding-large w3-hover-white">Galeria</a>
     <a href="about" class="w3-bar-item w3-button w3-padding-large w3-hover-white">Sobre</a>
     <a href="contact" class="w3-bar-item w3-button w3-padding-large w3-hover-white">Contato</a>
     <!--<a href="#" class="w3-bar-item w3-button w3-padding-large">Link 4</a> -->
diff --git a/remember_laravel/routes/web.php b/remember_laravel/routes/web.php
index 794799f..0e30d87 100644
--- a/remember_laravel/routes/web.php
+++ b/remember_laravel/routes/web.php
@@ -17,7 +17,7 @@
  */
 
 Route::get('/', 'HomeController@index')->name('home');
-Route::get('/galery', 'HomeController@galery')->name('galery');
+Route::get('/gallery', 'HomeController@gallery')->name('galery');
 Route::get('/about', 'HomeController@about')->name('about');
 Route::get('/contact', 'HomeController@contact')->name('contact');
 
-- 
GitLab