Merge remote-tracking branch 'origin/main' into demo

2021-05-31 15:43:14 -07:00 · 2021-05-31 15:43:14 -07:00 · bf074e0a76
parent 87003491eb 1a30b7cd1d
commit bf074e0a76
9 changed files with 458 additions and 309 deletions
--- a/.env.example
+++ b/.env.example
@ -3,11 +3,11 @@
 #

 APP_NAME=kcal
-APP_ENV=local
+APP_ENV=production
 APP_KEY=
-APP_DEBUG=true
+APP_DEBUG=false
 APP_URL=http://127.0.0.1
-APP_PORT=8080
+APP_PORT=80
 APP_SERVICE=app
 APP_TIMEZONE=UTC

@ -16,13 +16,13 @@ APP_TIMEZONE=UTC
 #

 DB_CONNECTION=mysql
-DB_HOST=db
+DB_HOST=localhost
 DB_PORT=3306
 DB_DATABASE=kcal
 DB_USERNAME=kcal
 DB_PASSWORD=kcal

-REDIS_HOST=redis
+REDIS_HOST=localhost
 REDIS_PORT=6379

 #
@ -36,7 +36,7 @@ REDIS_PORT=6379
 #ALGOLIA_SECRET=

 SCOUT_DRIVER=elastic
-ELASTIC_HOST=elasticsearch:9200
+ELASTIC_HOST=localhost:9200
 ELASTIC_PORT=9200

 #
--- a/_ide_helper.php
+++ b/_ide_helper.php
@ -3,7 +3,7 @@

 /**
 * A helper file for Laravel, to provide autocomplete information to your IDE
- * Generated for Laravel 8.42.1.
+ * Generated for Laravel 8.44.0.
 *
 * This file should not be included in your code, only analyzed by your IDE!
 *
@ -4927,6 +4927,17 @@
        {            //Method inherited from \Illuminate\Database\Connection         
                        /** @var \Illuminate\Database\MySqlConnection $instance */
                        return $instance->getName();
+        }
+                    /**
+         * Get the database connection full name.
+         *
+         * @return string|null 
+         * @static 
+         */ 
+        public static function getNameWithReadWriteType()
+        {            //Method inherited from \Illuminate\Database\Connection         
+                        /** @var \Illuminate\Database\MySqlConnection $instance */
+                        return $instance->getNameWithReadWriteType();
        }
                    /**
         * Get an option from the configuration options.
@ -5165,6 +5176,18 @@
        {            //Method inherited from \Illuminate\Database\Connection         
                        /** @var \Illuminate\Database\MySqlConnection $instance */
                        return $instance->setDatabaseName($database);
+        }
+                    /**
+         * Set the read / write type of the connection.
+         *
+         * @param string|null $readWriteType
+         * @return \Illuminate\Database\MySqlConnection 
+         * @static 
+         */ 
+        public static function setReadWriteType($readWriteType)
+        {            //Method inherited from \Illuminate\Database\Connection         
+                        /** @var \Illuminate\Database\MySqlConnection $instance */
+                        return $instance->setReadWriteType($readWriteType);
        }
                    /**
         * Get the table prefix for the connection.
@ -18447,6 +18470,31 @@ namespace  {
                                return $instance->sharedLock();
            }
             
+                /**
+             * Register a closure to be invoked before the query is executed.
+             *
+             * @param callable $callback
+             * @return \Illuminate\Database\Query\Builder 
+             * @static 
+             */ 
+            public static function beforeQuery($callback)
+            {
+                                /** @var \Illuminate\Database\Query\Builder $instance */
+                                return $instance->beforeQuery($callback);
+            }
+             
+                /**
+             * Invoke the "before query" modification callbacks.
+             *
+             * @return void 
+             * @static 
+             */ 
+            public static function applyBeforeQueryCallbacks()
+            {
+                                /** @var \Illuminate\Database\Query\Builder $instance */
+                                $instance->applyBeforeQueryCallbacks();
+            }
+             
                /**
             * Get the SQL representation of the query.
             *
--- a/composer.lock
+++ b/composer.lock
--- a/config/app.php
+++ b/config/app.php
@ -15,6 +15,18 @@ return [

    'name' => env('APP_NAME', 'kcal'),

+    /*
+    |--------------------------------------------------------------------------
+    | Application Version
+    |--------------------------------------------------------------------------
+    |
+    | This value is the version of your application. This value is used when
+    | the framework needs to place the application's version in a notification
+    | or any other location as required by the application or its packages.
+    */
+
+    'version' => '0.8.0',
+
    /*
    |--------------------------------------------------------------------------
    | Application Environment
--- a/package-lock.json
+++ b/package-lock.json
@ -10,9 +10,9 @@
            },
            "devDependencies": {
                "@tailwindcss/forms": "^0.3.2",
-                "@tailwindcss/typography": "^0.4.0",
+                "@tailwindcss/typography": "^0.4.1",
                "alpinejs": "^2.8.2",
-                "autoprefixer": "^10.2.5",
+                "autoprefixer": "^10.2.6",
                "axios": "^0.21.1",
                "cross-env": "^7.0",
                "laravel-mix": "^6.0.19",
@ -1439,9 +1439,9 @@
            }
        },
        "node_modules/@tailwindcss/typography": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.4.0.tgz",
-            "integrity": "sha512-3BfOYT5MYNEq81Ism3L2qu/HRP2Q5vWqZtZRQqQrthHuaTK9qpuPfbMT5WATjAM5J1OePKBaI5pLoX4S1JGNMQ==",
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.4.1.tgz",
+            "integrity": "sha512-ovPPLUhs7zAIJfr0y1dbGlyCuPhpuv/jpBoFgqAc658DWGGrOBWBMpAWLw2KlzbNeVk4YBJMzue1ekvIbdw6XA==",
            "dev": true,
            "dependencies": {
                "lodash.castarray": "^4.4.0",
@ -1450,7 +1450,7 @@
                "lodash.uniq": "^4.5.0"
            },
            "peerDependencies": {
-                "tailwindcss": "2.0.0-alpha.24 || ^2.0.0"
+                "tailwindcss": ">=2.0.0"
            }
        },
        "node_modules/@types/babel__core": {
@ -2638,15 +2638,15 @@
            }
        },
        "node_modules/autoprefixer": {
-            "version": "10.2.5",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.5.tgz",
-            "integrity": "sha512-7H4AJZXvSsn62SqZyJCP+1AWwOuoYpUfK6ot9vm0e87XD6mT8lDywc9D9OTJPMULyGcvmIxzTAMeG2Cc+YX+fA==",
+            "version": "10.2.6",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.6.tgz",
+            "integrity": "sha512-8lChSmdU6dCNMCQopIf4Pe5kipkAGj/fvTMslCsih0uHpOrXOPUEVOmYMMqmw3cekQkSD7EhIeuYl5y0BLdKqg==",
            "dev": true,
            "dependencies": {
-                "browserslist": "^4.16.3",
-                "caniuse-lite": "^1.0.30001196",
+                "browserslist": "^4.16.6",
+                "caniuse-lite": "^1.0.30001230",
                "colorette": "^1.2.2",
-                "fraction.js": "^4.0.13",
+                "fraction.js": "^4.1.1",
                "normalize-range": "^0.1.2",
                "postcss-value-parser": "^4.1.0"
            },
@ -3075,16 +3075,16 @@
            }
        },
        "node_modules/browserslist": {
-            "version": "4.16.3",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
-            "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+            "version": "4.16.6",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+            "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
            "dev": true,
            "dependencies": {
-                "caniuse-lite": "^1.0.30001181",
-                "colorette": "^1.2.1",
-                "electron-to-chromium": "^1.3.649",
+                "caniuse-lite": "^1.0.30001219",
+                "colorette": "^1.2.2",
+                "electron-to-chromium": "^1.3.723",
                "escalade": "^3.1.1",
-                "node-releases": "^1.1.70"
+                "node-releases": "^1.1.71"
            },
            "bin": {
                "browserslist": "cli.js"
@ -3251,10 +3251,14 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001205",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz",
-            "integrity": "sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==",
-            "dev": true
+            "version": "1.0.30001232",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz",
+            "integrity": "sha512-e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==",
+            "dev": true,
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/browserslist"
+            }
        },
        "node_modules/chalk": {
            "version": "4.1.0",
@ -5058,9 +5062,9 @@
            "dev": true
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.3.707",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.707.tgz",
-            "integrity": "sha512-BqddgxNPrcWnbDdJw7SzXVzPmp+oiyjVrc7tkQVaznPGSS9SKZatw6qxoP857M+HbOyyqJQwYQtsuFIMSTNSZA==",
+            "version": "1.3.743",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz",
+            "integrity": "sha512-K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg==",
            "dev": true
        },
        "node_modules/elliptic": {
@ -5803,12 +5807,16 @@
            }
        },
        "node_modules/fraction.js": {
-            "version": "4.0.13",
-            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.13.tgz",
-            "integrity": "sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA==",
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
+            "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
            "dev": true,
            "engines": {
                "node": "*"
+            },
+            "funding": {
+                "type": "patreon",
+                "url": "https://www.patreon.com/infusion"
            }
        },
        "node_modules/fragment-cache": {
@ -16708,9 +16716,9 @@
            }
        },
        "@tailwindcss/typography": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.4.0.tgz",
-            "integrity": "sha512-3BfOYT5MYNEq81Ism3L2qu/HRP2Q5vWqZtZRQqQrthHuaTK9qpuPfbMT5WATjAM5J1OePKBaI5pLoX4S1JGNMQ==",
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.4.1.tgz",
+            "integrity": "sha512-ovPPLUhs7zAIJfr0y1dbGlyCuPhpuv/jpBoFgqAc658DWGGrOBWBMpAWLw2KlzbNeVk4YBJMzue1ekvIbdw6XA==",
            "dev": true,
            "requires": {
                "lodash.castarray": "^4.4.0",
@ -17740,15 +17748,15 @@
            "dev": true
        },
        "autoprefixer": {
-            "version": "10.2.5",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.5.tgz",
-            "integrity": "sha512-7H4AJZXvSsn62SqZyJCP+1AWwOuoYpUfK6ot9vm0e87XD6mT8lDywc9D9OTJPMULyGcvmIxzTAMeG2Cc+YX+fA==",
+            "version": "10.2.6",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.6.tgz",
+            "integrity": "sha512-8lChSmdU6dCNMCQopIf4Pe5kipkAGj/fvTMslCsih0uHpOrXOPUEVOmYMMqmw3cekQkSD7EhIeuYl5y0BLdKqg==",
            "dev": true,
            "requires": {
-                "browserslist": "^4.16.3",
-                "caniuse-lite": "^1.0.30001196",
+                "browserslist": "^4.16.6",
+                "caniuse-lite": "^1.0.30001230",
                "colorette": "^1.2.2",
-                "fraction.js": "^4.0.13",
+                "fraction.js": "^4.1.1",
                "normalize-range": "^0.1.2",
                "postcss-value-parser": "^4.1.0"
            }
@ -18095,16 +18103,16 @@
            }
        },
        "browserslist": {
-            "version": "4.16.3",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
-            "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+            "version": "4.16.6",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+            "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
            "dev": true,
            "requires": {
-                "caniuse-lite": "^1.0.30001181",
-                "colorette": "^1.2.1",
-                "electron-to-chromium": "^1.3.649",
+                "caniuse-lite": "^1.0.30001219",
+                "colorette": "^1.2.2",
+                "electron-to-chromium": "^1.3.723",
                "escalade": "^3.1.1",
-                "node-releases": "^1.1.70"
+                "node-releases": "^1.1.71"
            }
        },
        "buffer": {
@ -18234,9 +18242,9 @@
            }
        },
        "caniuse-lite": {
-            "version": "1.0.30001205",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz",
-            "integrity": "sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==",
+            "version": "1.0.30001232",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz",
+            "integrity": "sha512-e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==",
            "dev": true
        },
        "chalk": {
@ -19707,9 +19715,9 @@
            "dev": true
        },
        "electron-to-chromium": {
-            "version": "1.3.707",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.707.tgz",
-            "integrity": "sha512-BqddgxNPrcWnbDdJw7SzXVzPmp+oiyjVrc7tkQVaznPGSS9SKZatw6qxoP857M+HbOyyqJQwYQtsuFIMSTNSZA==",
+            "version": "1.3.743",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz",
+            "integrity": "sha512-K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg==",
            "dev": true
        },
        "elliptic": {
@ -20299,9 +20307,9 @@
            "dev": true
        },
        "fraction.js": {
-            "version": "4.0.13",
-            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.13.tgz",
-            "integrity": "sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA==",
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
+            "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
            "dev": true
        },
        "fragment-cache": {
--- a/package.json
+++ b/package.json
@ -11,9 +11,9 @@
    },
    "devDependencies": {
        "@tailwindcss/forms": "^0.3.2",
-        "@tailwindcss/typography": "^0.4.0",
+        "@tailwindcss/typography": "^0.4.1",
        "alpinejs": "^2.8.2",
-        "autoprefixer": "^10.2.5",
+        "autoprefixer": "^10.2.6",
        "axios": "^0.21.1",
        "cross-env": "^7.0",
        "laravel-mix": "^6.0.19",
--- a/public/css/app.css
+++ b/public/css/app.css
--- a/screenshot-mobile.png
+++ b/screenshot-mobile.png
--- a/screenshot.png
+++ b/screenshot.png