Merge pull request #55 from Coderberg/develop

Develop

Author: Coderberg

.env.test

@@ -3,4 +3,5 @@ KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
 PANTHER_APP_ENV=panther
+PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
 DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name

.eslintrc

@@ -0,0 +1,34 @@
+{
+  "parser": "@babel/eslint-parser",
+  "env": {
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 2019,
+    "sourceType": "module"
+  },
+  "rules": {
+    "linebreak-style": ["off", "unix"],
+    "no-console": "error",
+    "quotes": ["error", "single"],
+    "semi": ["error", "always"],
+    "no-var": "error",
+    "eqeqeq": ["error", "always"],
+    "object-curly-spacing": "off",
+    "no-const-assign": "error",
+    "newline-before-return": "error",
+    "no-unreachable": "error",
+    "no-extra-semi": "error",
+    "no-unexpected-multiline": "error",
+    "comma-dangle": [
+      "error",
+      {
+        "arrays": "never",
+        "objects": "never",
+        "imports": "never",
+        "exports": "never",
+        "functions": "never"
+      }
+    ]
+  }
+}

.gitignore

@@ -27,3 +27,8 @@ yarn-error.log
 /.php_cs
 /.php_cs.cache
 ###< friendsofphp/php-cs-fixer ###
+
+###> phpunit/phpunit ###
+/phpunit.xml
+.phpunit.result.cache
+###< phpunit/phpunit ###

.php_cs.dist

@@ -2,6 +2,7 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
+    ->exclude('node_modules')
     ->exclude('config')
     ->exclude('var')
     ->exclude('public/bundles')

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "printWidth": 70,
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 4,
+  "trailingComma": "none"
+}

assets/js/admin.js

@@ -3,39 +3,44 @@
 import Cookies from 'js-cookie/src/js.cookie';
 
 $(document).ready(() => {
-
     let currentUrl = window.location.href;
 
     $('.sidebar .nav-item').each(function () {
         let sidebarLink = $('a', this).attr('href');
         if (currentUrl.includes(sidebarLink)) {
             $(this).addClass('active');
-        } else if (sidebarLink.includes('locations') && currentUrl.includes('locations')) {
+        } else if (
+            sidebarLink.includes('locations') &&
+            currentUrl.includes('locations')
+        ) {
             $(this).addClass('active');
         }
     });
 
     // Toggle the side navigation
-    $("#sidebarToggle").on('click', (e) => {
-
+    $('#sidebarToggle').on('click', (e) => {
         let $body = $('body');
         e.preventDefault();
 
-        if ($($body).is(".sidebar-toggled")) {
+        if ($($body).is('.sidebar-toggled')) {
             Cookies.set('sidebar-toggled', false);
         } else {
             Cookies.set('sidebar-toggled', true);
         }
 
-        $("body").toggleClass("sidebar-toggled");
-        $(".sidebar").toggleClass("toggled");
+        $body.toggleClass('sidebar-toggled');
+        $('.sidebar').toggleClass('toggled');
     });
 
     // Sorting
     $('#sort_by, #state').on('change', () => {
         let value = $('#sort_by').val();
         let state = $('#state').val();
-        window.location.href = window.location.pathname + '?sort_by=' + value + '&state=' + state;
+        window.location.href =
+            window.location.pathname +
+            '?sort_by=' +
+            value +
+            '&state=' +
+            state;
     });
-
 });

assets/js/city.js

@@ -1,7 +1,6 @@
 'use strict';
 
 $(document).ready(function () {
-
     let $city = $('#property_city');
     let $title = $('#property_title');
     let $description = $('#property_meta_description');
@@ -10,7 +9,6 @@ $(document).ready(function () {
     let $state = $('#property_state');
 
     $city.change(function () {
-
         let $form = $(this).closest('form');
         let data = getPropertyData();
 

assets/js/map.js

@@ -7,24 +7,29 @@ const longitude = $map.attr('data-longitude');
 const hintContent = $map.attr('data-hintContent');
 const balloonContent = $map.attr('data-balloonContent');
 
-function init(){
+function init() {
     // Creating the map.
-    let myMap = new ymaps.Map("map", {
+    let myMap = new ymaps.Map('map', {
         center: [latitude, longitude],
         zoom: 13
     });
 
-    let currentApartment = new ymaps.Placemark([latitude, longitude], {
-        hintContent: hintContent,
-        balloonContent: balloonContent
-    }, {
-        preset: "islands#blueHomeIcon"
-    });
+    let currentApartment = new ymaps.Placemark(
+        [latitude, longitude],
+        {
+            hintContent: hintContent,
+            balloonContent: balloonContent
+        },
+        {
+            preset: 'islands#blueHomeIcon'
+        }
+    );
 
-    myMap.geoObjects.add(currentApartment)
+    myMap.geoObjects.add(currentApartment);
 }
 
-$("#map").css({
-    width: "100%",
-    height: "280px", "padding-top": "20px"
+$map.css({
+    width: '100%',
+    height: '280px',
+    'padding-top': '20px'
 });

assets/js/menu-sorting.js

@@ -6,39 +6,35 @@ function changeButtons() {
         .addClass('js-up-one')
         .html('<i class="fas fa-arrow-up"></i> Up one');
 
-    $(".js-move:first")
+    $('.js-move:first')
         .removeClass('js-up-one')
         .addClass('js-down-one')
         .html('<i class="fas fa-arrow-down"></i> Down one');
 }
 
 function sendRequest() {
-
     let item = $('.js-move');
 
     if (item.length > 1) {
-
         let items = [];
 
         item.each(function () {
             items.push(parseInt($(this).attr('id'), 10));
         });
 
         $.ajax({
-            method: "POST",
-            url: "/admin/menu/sort",
+            method: 'POST',
+            url: '/en/admin/menu/sort',
             data: { items: items }
         });
     }
 }
 
 $(document).ready(function () {
+    $('body').on('click', '.js-move', function () {
+        let row = $(this).parents('tr:first');
 
-    $('body').on('click', ".js-move", function () {
-
-        let row = $(this).parents("tr:first");
-
-        if ($(this).is(".js-up-one")) {
+        if ($(this).is('.js-up-one')) {
             row.insertBefore(row.prev());
         } else {
             row.insertAfter(row.next());

assets/js/page.js

@@ -1,27 +1,23 @@
 'use strict';
 
 $(document).ready(function () {
-
     let $checkbox = $('#page_add_contact_form');
     let $emailContainer = $('#email-address');
     let $emailField = $('#page_contact_email_address');
 
-
-    if ($checkbox.attr("checked") === 'checked') {
+    if ($checkbox.attr('checked') === 'checked') {
         $emailContainer.slideDown();
         $emailField.prop('required', true);
     }
 
     // Event Handler
     $checkbox.on('change', function () {
-
         updateDisplay();
     });
 
     // Action
 
     function updateDisplay() {
-
         let isChecked = $checkbox.is(':checked');
 
         if (isChecked) {
@@ -32,5 +28,4 @@ $(document).ready(function () {
             $emailField.prop('required', false);
         }
     }
-
 });