rename exchange -> bivouac

.env

@@ -41,24 +41,24 @@ CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 # MAILER_DSN=mailgun://KEY:DOMAIN@default?region=us
 # MAILER_DSN=mailgun+smtp://USERNAME:PASSWORD@default?region=us
 
-#MAILGUN_DOMAIN=sandbox3a45137aa4b14102a862356eb2281755.mailgun.org
-#MAILGUN_KEY=0277360e4a8c28b83092fdc0920c98e0-73ae490d-f4d427fd
-MAILGUN_DOMAIN=mg.garden-exchange.org
-MAILGUN_KEY=a695cbc7876c98c3f0bb722a26d82a37-cb3791c4-8661903b
+MAILGUN_DOMAIN=sandbox3a45137aa4b14102a862356eb2281755.mailgun.org
+MAILGUN_KEY=0277360e4a8c28b83092fdc0920c98e0-73ae490d-f4d427fd
+#MAILGUN_DOMAIN=mg.gardenbivouac.org
+#MAILGUN_KEY=f0b237a708b3f675961083bf72a4762d-aff8aa95-f5865bc7
 
 #MAILER_DSN="mailgun+api://$MAILGUN_KEY:$MAILGUN_DOMAIN@default"
 #MAILER_DSN=mailgun://$MAILGUN_KEY:$MAILGUN_DOMAIN@default?region=us
 MAILER_DSN=mailgun+https://$MAILGUN_KEY:$MAILGUN_DOMAIN@default?region=eu
 
 
-#MAILER_DSN=smtp://share@garden-exchange.org:hKnb56tyGFcvwtf11@mail.garden-exchange.org?verify_peer=0
-#MAILER_DSN=smtp://share@garden-exchange.org:[email protected]
+#MAILER_DSN=smtp://share@gardenbivouac.org:hKnb56tyGFcvwtf11@mail.gardenbivouac.org?verify_peer=0
+#MAILER_DSN=smtp://share@gardenbivouac.org:[email protected]
 
 ###< symfony/mailgun-mailer ###
 
 ###> AntiBots ###
 HOST_DEV=127.0.0.1:8000
-HOST_PROD=garden-exchange.org
+HOST_PROD=gardenbivouac.org
 ANTI_SPAM=false
 SEND_LOG_SPAM=true
 TIME_NOT_BOT=4

assets/js/admin.js

@@ -188,6 +188,24 @@ $(document).ready( function(){
     $('#submit-edit-garden').on('click', function () {
         event.preventDefault();
         var count = 0;
+        var countPostcode = 0;
+        var countCity = 0;
+        console.log('countPostcode');
+        console.log(countPostcode);
+        if($('#garden_postcode').val() != ''){
+            countPostcode++;
+        }
+        if(countPostcode == 0){
+            $('.warning-postcode').show();
+            window.scrollTo(100,0);
+        }
+        if($('#garden_city').val() != ''){
+            countCity++;
+        }
+        if(countCity == 0){
+            $('.warning-city').show();
+            window.scrollTo(100,0);
+        }
         $('#main').find('.campingType_choice').each( function(){
             if($(this).hasClass('campingType_selected')){
                 count++;

assets/scss/app.scss

@@ -104,15 +104,17 @@ header .locales .active small,
 header .locales a:hover small {
   color: inherit;
 }
-
+.container {
+    max-width: none;
+}
 .body-container {
   flex: 1;
   /* needed to prevent pages with a very small height and browsers not supporting flex */
   min-height: 600px
 }
 
 .body-container #main h1, .body-container #main h2 {
-  margin-top: 0
+  margin-top: 3vh;
 }
 
 #sidebar .section {
@@ -498,6 +500,9 @@ header ul.nav li:hover {
 }
 .add-garden{
     background-color: $vert;
+    border-width: 3px;
+    border-radius: 10px;
+    border: none;
 }
 header ul.nav li.add-garden:hover {
     background-color: #FFF;
@@ -538,17 +543,19 @@ header ul.nav li.add-garden:hover {
 }
 .navbar-default .navbar-nav > li > a {
     border: 1px solid #FFF;
+
 }
 .navbar-default .navbar-nav > li > a:hover, .navbar-right ul li a:hover {
     /* border: 1px solid $liHover; */
 }
 .navbar-default .navbar-nav > li.add-garden > a {
     color: #FFF;
-    border: 1px solid $vert;
 }
 .navbar-default .navbar-nav > li.add-garden > a:hover {
     color: $vert;
     border: 1px solid $vert;
+    border-width: 1px;
+    border-radius: 10px;
 }
 form[name='simple_search']{
     display: flex;
@@ -612,6 +619,10 @@ body#admin_post_show .post-tags .label-default i {
     margin: 0;
     line-height: 2em;
 }
+.liste-errors{
+    width: 50%;
+    margin: 0 auto;
+    }
 /* Photos   ------------------------------------------------------------------------- */
 
 .image-upload{
@@ -752,8 +763,7 @@ a.index-content-conversation{
     float: right;
 }
 .profile-view-description{
-    width: 80%;
-    margin: 4em auto;
+    width: 60%;
 }
 .contact-verified .btn{
     cursor: auto;
@@ -762,7 +772,11 @@ a.index-content-conversation{
     background: #F39C12;
     border-color: #F39C12;
 }
-
+.profile-garden-listing{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+}
 /* Homepage   ------------------------------------------------------------------------- */
 #homepage .homedream-container{
     position: relative;
@@ -802,7 +816,7 @@ a.index-content-conversation{
     text-align: center;
 }
 .homepage-intro{
-    padding: .5em 0em;
+    padding: 1.5em 0em;
     font-size: 1.5em;
 }
 .homepage-encart{
@@ -1206,10 +1220,21 @@ p, ul, ol {
 }
 /* NOTIFICATION   ------------------------------------------------------------------------- */
 .notification{
-    width: 100%;
+    width: 80%;
     background: #59F;
     color: #FFF;
     padding: 2rem;
+    margin: 2rem;
     font-size: 2rem;
     font-weight: bold;
 }
+.notification p{
+    margin: 1rem;
+}
+/* VOS ANNONCES   ------------------------------------------------------------------------- */
+.carte-listings-no-annonce{
+    padding: 2rem;
+}
+.go-result{
+    padding: 2rem;
+}

assets/scss/common.scss

@@ -101,6 +101,11 @@ hr{
 .notAlink{
     cursor: auto;
 }
+.navbar-default .navbar-nav > li > a.notAlink{
+    color: #FFF;
+    background: #303434;
+}
 .navbar-default .navbar-nav > li > a.notAlink:hover{
-    background: #FFF;
+    color: #FFF;
+    background: #303434;
 }

assets/scss/responsive.scss

@@ -49,7 +49,7 @@
         height: 270px;
     }
     .homepage-intro, .homepage-photos {
-        padding: 1em 0 0 0;
+        padding: 1.5em 0 0 0;
     }
     #register .well, #login .well {
         flex-grow: 1;

config/validator/validation.yaml

@@ -1,4 +1,4 @@
-#~ App\Entity\ConversationExchange:
+#~ App\Entity\ConversationBivouac:
     #~ properties:
         #~ host:
             #~ - Blank: ~

public/.htaccess

@@ -49,7 +49,7 @@ DirectoryIndex index.php
     RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
 
     RewriteCond %{SERVER_PORT} 80
-    RewriteRule ^(.*)$ https://garden-exchange.org/$1 [R,L]
+    RewriteRule ^(.*)$ https://gardenbivouac.org/$1 [R,L]
 
     # If the requested filename exists, simply serve it.
     # We only want to let Apache serve files and not directories.

public/build/admin.js

@@ -144,7 +144,7 @@ function initAjaxPost() {
             $.each(msg.route, function (key, value) {
               $.ajax({
                 url: value,
-                method: 'POST'
+                method: 'GET'
               }).done(function (data) {
                 $(key).html(data);
                 initAjaxPost();
@@ -169,7 +169,7 @@ function initAjaxPost() {
             $.each(msg.route, function (key, value) {
               $.ajax({
                 url: value,
-                method: 'POST'
+                method: 'GET'
               }).done(function (data) {
                 $(key).html(data);
                 initAjaxPost();
@@ -242,6 +242,29 @@ $(document).ready(function () {
   $('#submit-edit-garden').on('click', function () {
     event.preventDefault();
     var count = 0;
+    var countPostcode = 0;
+    var countCity = 0;
+    console.log('countPostcode');
+    console.log(countPostcode);
+
+    if ($('#garden_postcode').val() != '') {
+      countPostcode++;
+    }
+
+    if (countPostcode == 0) {
+      $('.warning-postcode').show();
+      window.scrollTo(100, 0);
+    }
+
+    if ($('#garden_city').val() != '') {
+      countCity++;
+    }
+
+    if (countCity == 0) {
+      $('.warning-city').show();
+      window.scrollTo(100, 0);
+    }
+
     $('#main').find('.campingType_choice').each(function () {
       if ($(this).hasClass('campingType_selected')) {
         count++;