Merge pull request #8 from Marbles/renewal

Renewal of craft template

.env.example

@@ -1,45 +1,50 @@
-ENVIRONMENT="dev"
-SECURITY_KEY=""
-
-DB_DRIVER="mysql"
-DB_SERVER="localhost"
-DB_USER="root"
-DB_PASSWORD=""
-DB_DATABASE=""
-DB_SCHEMA="public"
-DB_TABLE_PREFIX=""
-DB_PORT="3306"
+# The environment Craft is currently running in (dev, staging, production, etc.)
+ENVIRONMENT=dev
+
+# The application ID used to to uniquely store session and cache data, mutex locks, and more
+APP_ID=CraftCMS--b77afe3e-9c69-41b4-9265-64a7a7e59f8d
+
+# The secure key Craft will use for hashing and encrypting data
+SECURITY_KEY=
+
+# Database Configuration
+DB_DRIVER=mysql
+DB_SERVER=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=
+DB_USER=root
+DB_PASSWORD=
+DB_SCHEMA=
+DB_TABLE_PREFIX=
 
 # The base path and url of the project
-BASE_PATH=""
-BASE_URL=""
+BASE_PATH="/users/ferre/Code/craft-3/"
+PRIMARY_SITE_URL=http://www.craft-3.wip/
 
-# PHP Binary for Async Queues
-PHP_BINARY="/usr/local/bin/php"
-ASYNC_QUEUE_CONCURRENCY=3
+# The URI segment that tells Craft to load the control panel
+CP_TRIGGER=admin
 
-# BIN PATH
-BIN_PATH=/usr/bin
+# Email
+SYSTEM_EMAIL=[email protected]
+REPLY_EMAIL=[email protected]
+SENDER=Marbles
 
-# SENDGRID
-MAIL_HOST=
-MAIL_PORT=
-MAIL_USERNAME=
+MAIL_HOST=smtp.sendgrid.net
+MAIL_PORT=587
+MAIL_USERNAME=apikey
 MAIL_PASSWORD=
 
 # IMGIX
 IMGIX_API_KEY=""
 IMGIX_DOMAIN=""
 IMGIX_SIGN_KEY=""
 
-# SENTRY
-SENTRY_DSN=
-SENTRY_ENVIRONMENT=
+# PHP Binary for Async Queues
+PHP_BINARY=/usr/local/bin/php
+ASYNC_QUEUE_CONCURRENCY=5
 
-# RECAPTCHA
-RECAPTCHA_SITE_KEY=
-RECAPTCHA_SECRET_KEY=
+# BIN Path for bin
+BIN_PATH=/usr/local/bin/
 
-# Mailchimp
-MAILCHIMP_API_KEY=
-MAILCHIMP_AUDIENCE_ID=
+# USERBACK TOKEN
+USERBACK_TOKEN=

composer.json

@@ -1,83 +1,88 @@
 {
-    "name": "marbles/craft",
-    "description": "Marbles Craft 3 CMS scaffolding project",
-    "keywords": [
-        "craft",
-        "cms",
-        "craftcms",
-        "project"
+  "name": "marbles/craft",
+  "description": "Marbles Craft 3 CMS scaffolding project",
+  "keywords": [
+    "craft",
+    "cms",
+    "craftcms",
+    "project"
+  ],
+  "license": "MIT",
+  "homepage": "https://craftcms.com/",
+  "type": "project",
+  "support": {
+    "email": "[email protected]",
+    "issues": "https://github.com/marbles/craft/issues",
+    "source": "https://github.com/marbles/craft",
+    "docs": "https://github.com/marbles/craft"
+  },
+  "minimum-stability": "RC",
+  "require": {
+    "aelvan/imager": "2.4.0",
+    "carlcs/craft-redactorcustomstyles": "3.0.4",
+    "charliedev/section-field": "1.1.0",
+    "craftcms/cms": "3.6.12",
+    "craftcms/redactor": "2.8.6",
+    "ether/seo": "3.6.7",
+    "glue-agency/craft-fingerprint-assets": "1.0.1",
+    "hybridinteractive/craft-position-fieldtype": "1.0.17",
+    "nystudio107/craft-eagerbeaver": "1.0.4",
+    "nystudio107/craft-minify": "1.2.10",
+    "nystudio107/craft-scripts": "^1.2.4",
+    "nystudio107/craft-twigpack": "1.2.13",
+    "nystudio107/craft-typogrify": "1.1.18",
+    "percipioglobal/craft-colour-swatches": "1.4.1.1",
+    "putyourlightson/craft-elements-panel": "1.1.1",
+    "putyourlightson/craft-sprig": "1.5.2",
+    "sebastianlenz/linkfield": "1.0.25",
+    "spicyweb/craft-embedded-assets": "2.5.3",
+    "spicyweb/craft-neo": "2.9.6",
+    "utakka/redactor-anchors": "1.1.0",
+    "verbb/expanded-singles": "1.1.3",
+    "verbb/navigation": "1.4.15",
+    "verbb/super-table": "2.6.7",
+    "vlucas/phpdotenv": "^3.0",
+    "wbrowar/adminbar": "3.1.11",
+    "youandmedigital/breadcrumb": "1.1.0"
+  },
+  "require-dev": {
+    "yiisoft/yii2-shell": "^2.0.3"
+  },
+  "autoload": {
+    "psr-4": {
+      "modules\\": "modules/"
+    }
+  },
+  "config": {
+    "sort-packages": true,
+    "cache-files-ttl": 0,
+    "optimize-autoloader": true,
+    "platform": {
+      "php": "7.2.5"
+    }
+  },
+  "scripts": {    
+    "craft-update": [
+      "@pre-craft-update",
+      "@post-craft-update"
     ],
-    "license": "MIT",
-    "homepage": "https://craftcms.com/",
-    "type": "project",
-    "support": {
-        "email": "[email protected]",
-        "issues": "https://github.com/marbles/craft/issues",
-        "source": "https://github.com/marbles/craft",
-        "docs": "https://github.com/marbles/craft"
-    },
-    "minimum-stability": "beta",
-    "require": {
-        "aelvan/imager": "v2.4.0",
-        "carlcs/craft-redactorcustomstyles": "3.0.4",
-        "charliedev/section-field": "1.1.0",
-        "codeception/codeception": "^4.0",
-        "codeception/module-asserts": "^1.0.0",
-        "codeception/module-phpbrowser": "^1.0.0",
-        "codeception/module-yii2": "^1.0",
-        "craftcms/cms": "3.5.17.1",
-        "craftcms/redactor": "2.8.5",
-        "ether/seo": "3.6.7",
-        "hybridinteractive/craft-position-fieldtype": "1.0.16",
-        "misterbk/mix": "1.5.2",
-        "mmikkel/retcon": "2.2.1",
-        "nystudio107/craft-eagerbeaver": "1.0.4",
-        "nystudio107/craft-minify": "1.2.10",
-        "nystudio107/craft-scripts": "^1.2.4",
-        "nystudio107/craft-twigpack": "1.2.9",
-        "nystudio107/craft-typogrify": "1.1.18",
-        "ostark/craft-async-queue": "2.1.1",
-        "percipioglobal/craft-colour-swatches": "1.4.1.1",
-        "putyourlightson/craft-blitz": "2.1.4",
-        "putyourlightson/craft-blitz-recommendations": "1.2.0",
-        "putyourlightson/craft-elements-panel": "1.1.1",
-        "putyourlightson/craft-sprig": "1.3.1",
-        "sebastianlenz/linkfield": "1.0.24",
-        "spicyweb/craft-embedded-assets": "2.4.5",
-        "spicyweb/craft-neo": "2.8.17",
-        "verbb/expanded-singles": "1.1.3",
-        "verbb/navigation": "1.4.12",
-        "verbb/super-table": "2.6.5",
-        "vlucas/phpdotenv": "^2.4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "modules\\sitemodule\\": "modules/sitemodule/src/"
-        }
-    },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/Marbles/craft-simple-forms"
-        }
+    "pre-craft-update": [
     ],
-    "config": {
-        "optimize-autoloader": true,
-        "sort-packages": true
-    },
-    "scripts": {
-        "post-root-package-install": [
-            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-        ],
-        "post-create-project-cmd": [
-            "@php craft setup/welcome",
-            "@php marbles-setup welcome"
-        ],
-        "post-update-cmd": [
-            "@php marbles-setup update"
-        ],
-        "post-install-cmd": [
-            "@php marbles-setup update"
-        ]
-    }
+    "post-craft-update": [
+      "@php craft install/check && php craft clear-caches/all --interactive=0 || exit 0",
+      "@php craft install/check && php craft migrate/all --interactive=0 || exit 0",
+      "@php craft install/check && php craft project-config/apply --interactive=0 || return 0"
+    ],
+    "post-root-package-install": [
+      "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+    ],
+    "post-create-project-cmd": [
+      "@php craft setup/welcome",
+      "@php marbles-setup welcome"
+    ],
+    "pre-update-cmd": "@pre-craft-update",
+    "pre-install-cmd": "@pre-craft-update",
+    "post-update-cmd": "@post-craft-update",
+    "post-install-cmd": "@post-craft-update"
+  }
 }