Skip to content

Commit

Permalink
Merge branch 'release/1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
ademers committed Mar 30, 2020
2 parents dac200f + 763a763 commit e793d38
Show file tree
Hide file tree
Showing 15 changed files with 1,529 additions and 851 deletions.
30 changes: 13 additions & 17 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,32 @@ ENVIRONMENT="dev"
# The secure key Craft will use for hashing and encrypting data
SECURITY_KEY=""

# The database driver that will be used ('mysql' or 'pgsql')
DB_DRIVER="mysql"

# The database server name or IP address (usually this is 'localhost' or '127.0.0.1')
DB_SERVER="localhost"
# The Data Source Name (“DSN”) that tells Craft how to connect to the database
DB_DSN=""

# The database username to connect with
DB_USER="root"

# The database password to connect with
DB_PASSWORD=""

# The name of the database to select
DB_DATABASE=""

# The database schema that will be used (PostgreSQL only)
DB_SCHEMA="public"
DB_SCHEMA=""

# The prefix that should be added to generated table names (only necessary if multiple things are sharing the same database)
DB_TABLE_PREFIX=""

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

# Sites Settings
# Sites settings
DEFAULT_SITE_URL="http://craft-starter.test"

# General settings
SYSTEM_NAME="Craft Starter"

# Email Settings
SYSTEM_EMAIL_ADDRESS="[email protected]"
# Email settings
SYSTEM_EMAIL_ADDRESS="[email protected]"
REPLY_TO_ADDRESS="[email protected]"
SENDER_NAME="Craft Starter"

# Assets
ASSETS_BASE_URL="http://craft-starter.test/assets"
ASSETS_FILE_SYSTEM_PATH="/home/vagrant/sites/craft-starter/web"
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 1.1.2 - 2020-03-30
### Added
- Add _images_ Assets Volume.
- Add SeoMatic plugin config file.
- Add Minify plugin config file.
- Add Contact Form plugin config file.
- Add DSN to DB config file.
- Add DB_DSN & custom vars to `.env.example.com`.

### Changed
- Downgrade Craft CMS to Solo edition.
- Hardcode Craft & plugin versions in `composer.json`.
- Update readme file.

### Removed
- Remove DB configs replaced by DSN.

## 1.1.1 - 2020-03-20
### Changed
- Update Craft and Craft plugins to latest versions.
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
A [Craft CMS](https://craftcms.com/) starter project by [Andrea DeMers](https://andreademers.com).

## Content Management System (CMS)
- [Craft CMS](https://craftcms.com/)
- [Craft CMS Solo Edition](https://craftcms.com/)
- [Craft CMS 3.x documentation](https://docs.craftcms.com/v3/)

## Craft CMS Plugins
Expand Down Expand Up @@ -45,6 +45,7 @@ A [Craft CMS](https://craftcms.com/) starter project by [Andrea DeMers](https://
7. Do a little dance. :dancer:

## Todo
- [ ] Review installation instructions.
- [x] Replace Vue.js with Alpine.js as default JavaScript framework
- [x] Configure PurgeCSS
- [x] Add installation instructions
Expand Down
34 changes: 19 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
"name": "ademers/craft-starter",
"description": "A Craft CMS starter project by Andrea DeMers.",
"keywords": [
"craft",
"cms",
"craftcms",
"project"
],
"craft",
"cms",
"craftcms",
"project"
],
"type": "project",
"version": "1.1.1",
"version": "1.1.2",
"license": "MIT",
"require": {
"craftcms/cms": "^3.4.9",
"craftcms/contact-form": "^2.2",
"craftcms/redactor": "^2.6.0.1",
"mmikkel/retcon": "^2.0",
"nystudio107/craft-minify": "^1.2",
"nystudio107/craft-scripts": "^1.2",
"nystudio107/craft-seomatic": "^3.2.45",
"nystudio107/craft-twigpack": "^1.2.0",
"vlucas/phpdotenv": "^3.4.0"
"craftcms/cms": "3.4.11",
"craftcms/contact-form": "2.2.6",
"craftcms/redactor": "2.6.1",
"mmikkel/retcon": "2.1.0",
"nystudio107/craft-minify": "1.2.9",
"nystudio107/craft-scripts": "1.2.10",
"nystudio107/craft-seomatic": "3.2.49",
"nystudio107/craft-twigpack": "1.2.0",
"vlucas/phpdotenv": "^3.4.0"
},
"autoload": {
"psr-4": {
Expand All @@ -33,6 +33,10 @@
"scripts": {
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@composer dump-autoload -o",
"@php craft setup/welcome"
]
}
}
Loading

0 comments on commit e793d38

Please sign in to comment.