Skip to content

Commit

Permalink
Merge pull request #7 from JayBox325/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
JayBox325 authored Nov 12, 2019
2 parents 9a1e2aa + ab8d1d6 commit 9a721f4
Show file tree
Hide file tree
Showing 8 changed files with 1,116 additions and 50 deletions.
9 changes: 9 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,12 @@ DB_TABLE_PREFIX=""

# The port to connect to the database with. Will default to 5432 for PostgreSQL and 3306 for MySQL.
DB_PORT=""

# Default site
DEFAULT_SITE_URL="https://local.jaycraft.com"


# MAMP database backups
BACKUP_COMMAND="/Applications/MAMP/Library/bin/mysqldump -h localhost -u root -proot --add-drop-table --comments --create-options --dump-date --no-autocommit --routines --set-charset --triggers --single-transaction --no-data --result-file=\"{file}\" {database} && /Applications/MAMP/Library/bin/mysqldump -h localhost -u root -proot --add-drop-table --comments --create-options --dump-date --no-autocommit --routines --set-charset --triggers --no-create-info --ignore-table={database}.assetindexdata --ignore-table={database}.assettransformindex --ignore-table={database}.cache --ignore-table={database}.sessions --ignore-table={database}.templatecaches --ignore-table={database}.templatecachecriteria --ignore-table={database}.templatecacheelements {database} >> \"{file}\""

RESTORE_COMMAND="/Applications/MAMP/Library/bin/mysql -h localhost -u root -proot {database} < \"{file}\""
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@
/vendor

# CRAFT STORAGE
/craft/storage/*
/storage/*
/public/cpresrouces/

# ASSETS
/public/uploads/*
/web/assets/*

# IMAGER TRANSFORMS
/public/imager/*
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).

## 1.0.5
### Added
- Added common and helpful plugins to boilerplate

## 1.0.4
### Added
- Added project type to composer.json
Expand Down
24 changes: 21 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
{
"name": "jaybox325/jaycraft",
"description": "Craft boilerplate to work with JayBox325/JayPack",
"version": "1.0.4",
"version": "1.0.5",
"type": "project",
"require": {
"adigital/cookie-consent-banner": "^1.1",
"anubarak/craft-relabel": "^1.3",
"craftcms/cms": "^3.0.0",
"vlucas/phpdotenv": "^3.4.0",
"nystudio107/craft-typogrify": "^1.1.1"
"craftcms/redactor": "^2.4",
"ether/seo": "3.6.2",
"ether/tags": "^1.0",
"marionnewlevant/snitch": "^3.0",
"mmikkel/cp-field-inspect": "^1.0",
"nilsenpaul/slug-alert": "1.0.0.1",
"nystudio107/craft-similar": "^1.0",
"nystudio107/craft-typogrify": "^1.1.1",
"ostark/craft-plugin-commands": "^1.1",
"putyourlightson/craft-entry-count": "^2.0",
"richhayler/stretch": "^1.0",
"sebastianlenz/linkfield": "^1.0",
"studioespresso/defaulttab": "^1.3",
"superbig/craft-entry-instructions": "^1.0",
"topshelfcraft/supersort": "^3.0",
"vaersaagod/matrixmate": "^1.2",
"verbb/cp-nav": "^2.0",
"vlucas/phpdotenv": "^3.4.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 9a721f4

Please sign in to comment.