#15 Fixed map, applied few styles and started implementing #37 frontend.

arnaugarcia · May 5, 2017 · a7f98a2 · a7f98a2
1 parent 24054d1
commit a7f98a2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/main/webapp/app/entities/contact/contact.controller.js b/src/main/webapp/app/entities/contact/contact.controller.js
@@ -23,6 +23,8 @@
             "long": ""
         };
 
+        vm.formData = {};
+
         loadAll();
 
         function loadAll() {
@@ -51,6 +53,14 @@
                     }
                 });
             });
+
         }
+
+        vm.sendEmail = function() {
+            console.log(vm.formData);
+            //We finally clean the fields
+            vm.formData = {};
+        }
+
     }
 })();
diff --git a/src/main/webapp/app/entities/contact/contacts.html b/src/main/webapp/app/entities/contact/contacts.html
@@ -6,45 +6,48 @@
             <div class="col-md-12">
                 <div class="blog-container">
                     <div class="blog-content">
-                        <div id="map"></div>
+
+                        <ng-map id="map" center="41.3579495,1.9810097" zoom="16">
+                            <marker position="[41.3579495, 1.9810097]" title="hello"></marker>
+                        </ng-map>
                         <div class="blog-title">
                             <h2 data-translate="contact.title1"></h2>
                             <h3 data-translate="contact.title2"></h3>
                         </div>
                         <div class="blog-text contact">
                             <div class="row">
                                 <div class="col-md-8 col-sm-7">
-                                    <form>
+                                    <form name="form" role="form" ng-submit="vm.sendEmail()">
                                         <div class="form-group">
                                             <label for="name" class="sr-only">Name</label>
-                                            <input type="text" class="form-control" placeholder="{{ 'contact.inputs.name' | translate }}">
+                                            <input type="text" class="form-control" placeholder="{{ 'contact.inputs.name' | translate }}" ng-model="vm.formData.name">
                                         </div>
                                         <div class="form-group">
                                             <label for="email" class="sr-only">Email</label>
-                                            <input type="email" class="form-control" placeholder="{{ 'contact.inputs.mail' | translate }}">
+                                            <input type="email" class="form-control" placeholder="{{ 'contact.inputs.mail' | translate }}" ng-model="vm.formData.mail">
                                         </div>
                                         <div class="form-group">
                                             <label for="subject" class="sr-only">Subject</label>
-                                            <input type="text" class="form-control" placeholder="{{ 'contact.inputs.subject' | translate }}">
+                                            <input type="text" class="form-control" placeholder="{{ 'contact.inputs.subject' | translate }}" ng-model="vm.formData.subject">
                                         </div>
                                         <div class="form-group">
                                             <label for="name" class="sr-only">Message</label>
-                                            <textarea class="form-control" rows="5" placeholder="{{ 'contact.inputs.message' | translate }}"></textarea>
+                                            <textarea class="form-control" rows="5" placeholder="{{ 'contact.inputs.message' | translate }}" ng-model="vm.formData.message"></textarea>
                                         </div>
                                         <div class="form-group">
                                             <button type="submit" name="submit" class="btn btn-success" data-translate="contact.button"><i class="fa fa-envelope-o"></i></button>
                                         </div>
                                     </form><br>
                                 </div>
-                                <div class="col-md-4 col-sm-5">
+                                <!--<div class="col-md-4 col-sm-5">
                                     <address>
                                         <strong>{{vm.companyInfo.name}}</strong><br>
                                         {{vm.companyInfo.phone}}<br>
                                         {{vm.companyInfo.email}}<br>
                                         {{vm.companyInfo.cif}}
                                     </address>
                                     </div>
-                                </div>
+                                </div>-->
                             </div>
                         </div>
                     </div>

diff --git a/src/main/webapp/content/css/style.css b/src/main/webapp/content/css/style.css
@@ -983,7 +983,6 @@ input[type="color"]:focus,
 
 .blog-text{
     display: block;
-    padding-top: 30px;
     padding-bottom: 30px;
     padding-left: 15%;
     padding-right: 15%;
@@ -2211,7 +2210,6 @@ video#bgvid {
 
 /* MAP */
 #map {
-    border: 1px solid #6b6e80;
     margin-bottom: 50px;
 }