Skip to content

Commit

Permalink
Rename app to content, Closes #25
Browse files Browse the repository at this point in the history
  • Loading branch information
stian-overasen authored Nov 12, 2019
1 parent a41c803 commit f9eca30
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ wp
/composer.lock

# Language files
web/app/languages
web/content/languages

# Plugins
web/app/plugins
web/content/plugins

# Themes
web/app/themes/teft-theme
web/content/themes/teft-theme

# Upgrade and uploads
web/app/upgrade
web/app/uploads
web/content/upgrade
web/content/uploads

# Dotenv
.env
Expand Down
4 changes: 2 additions & 2 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Much of the philosophy behind Bedrock is inspired by the [Twelve-Factor App](htt

Or, you can cut and paste from the [Roots WordPress Salt Generator][roots-wp-salt].

3. Add theme(s) in `web/app/themes` as you would for a normal WordPress site.
3. Add theme(s) in `web/content/themes` as you would for a normal WordPress site.

4. Set your site vhost document root to `/path/to/site/web/` (`/path/to/site/current/web/` if using deploys)

Expand All @@ -55,7 +55,7 @@ Much of the philosophy behind Bedrock is inspired by the [Twelve-Factor App](htt
1. Create a new site in the Local app using Custom settings.

Note that if you use preferred settings, the setup script will fail because preferred does not create the `/conf` folder required by teft-base.

2. `cd` to the `/app/` folder and `rm -r public` to remove the WordPress files automatically generated by Local.

3. Follow the normal installation instructions.
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
"extra": {
"wordpress-install-dir": "web/wp",
"installer-paths": {
"web/app/mu-plugins/{$name}/": [ "type:wordpress-muplugin" ],
"web/app/plugins/{$name}/": [ "type:wordpress-plugin" ],
"web/app/themes/{$name}/": [ "type:wordpress-theme" ]
"web/content/mu-plugins/{$name}/": [ "type:wordpress-muplugin" ],
"web/content/plugins/{$name}/": [ "type:wordpress-plugin" ],
"web/content/themes/{$name}/": [ "type:wordpress-theme" ]
},
"dropin-paths": {
"web/app/languages/": [ "vendor:koodimonni-language" ],
"web/app/languages/plugins/": [ "vendor:koodimonni-plugin-language" ]
"web/content/languages/": [ "vendor:koodimonni-language" ],
"web/content/languages/plugins/": [ "vendor:koodimonni-plugin-language" ]
}
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion config/application.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
/**
* Custom Content Directory
*/
define( 'CONTENT_DIR', '/app' );
define( 'CONTENT_DIR', '/content' );
define( 'WP_CONTENT_DIR', $webroot_dir . CONTENT_DIR );
define( 'WP_CONTENT_URL', WP_HOME . CONTENT_DIR );

Expand Down
8 changes: 4 additions & 4 deletions phpcs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rule ref="Dekode" />

<exclude-pattern>web/wp</exclude-pattern>
<exclude-pattern>web/app/languages</exclude-pattern>
<exclude-pattern>web/app/plugins</exclude-pattern>
<exclude-pattern>web/app/uploads</exclude-pattern>
<exclude-pattern>web/app/themes/teft-theme</exclude-pattern>
<exclude-pattern>web/content/languages</exclude-pattern>
<exclude-pattern>web/content/plugins</exclude-pattern>
<exclude-pattern>web/content/uploads</exclude-pattern>
<exclude-pattern>web/content/themes/teft-theme</exclude-pattern>
</ruleset>

0 comments on commit f9eca30

Please sign in to comment.