Skip to content

Commit

Permalink
Changing some stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
kyotoprotokollet committed Jan 29, 2018
1 parent 8892f35 commit ac1bd00
Show file tree
Hide file tree
Showing 50 changed files with 19,646 additions and 26 deletions.
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "wp-dockerized",
"name": "ronie.com",
"type": "project",
"description": "Wordpress starting point based on Docker and Bedrock",
"homepage": "http://johandahl.com",
"description": "Wordpress site ronie.com",
"homepage": "http://ronie.com",
"authors": [
{
"name" : "Johan Dahl",
Expand All @@ -26,7 +26,7 @@
"require": {
"composer/installers": "v1.0.12",
"vlucas/phpdotenv": "v1.1.0",
"johnpbloch/wordpress": "4.8"
"johnpbloch/wordpress": "*"
},
"require-dev": {
},
Expand Down
29 changes: 16 additions & 13 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 5 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ services:
volumes:
- "./database:/var/lib/mysql"
restart: on-failure:5
ports:
- "3306:3306"
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: ${DB_NAME}
Expand All @@ -22,14 +20,12 @@ services:
- "./docker/config/php-fpm/docker-php-ext-xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini:delegated"
restart: on-failure:5
build: ./docker/dockerfiles/php-fpm
extra_hosts:
- "docker-local.dev:172.18.0.1"

nginx:
depends_on:
- phpfpm
ports:
- "80:80"
- "11000:80"
image: nginx:latest
volumes:
- ".:/var/www/html:delegated"
Expand All @@ -42,7 +38,7 @@ services:
- mysql
image: phpmyadmin/phpmyadmin
ports:
- 70:80
- 100:80
restart: on-failure:5
environment:
PMA_ARBITRARY: 1
Expand All @@ -52,7 +48,7 @@ services:
image: schickling/mailcatcher
restart: on-failure:5
ports:
- "1025:1025"
- "1080:1080"
- "1135:1025"
- "1190:1080"
environment:
MAILCATCHER_PORT: 1025
MAILCATCHER_PORT: 1135
37 changes: 37 additions & 0 deletions public/app/themes/placid/404.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php
/**
* The template for displaying 404 pages (not found).
*
* @link https://codex.wordpress.org/Creating_an_Error_404_Page
*
* @package placid
*/

get_header(); ?>

<div id="primary" class="content-area">
<main id="main" class="site-main" role="main">

<section class="error-404 not-found">
<header class="page-header">
<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'placid' ); ?></h1>
</header><!-- .page-header -->

<div class="page-content">
<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'placid' ); ?></p>

<?php
get_search_form();

?>



</div><!-- .page-content -->
</section><!-- .error-404 -->

</main><!-- #main -->
</div><!-- #primary -->

<?php
get_footer();
51 changes: 51 additions & 0 deletions public/app/themes/placid/archive.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?php
/**
* The template for displaying archive pages.
*
* @link https://codex.wordpress.org/Template_Hierarchy
*
* @package placid
*/

get_header(); ?>

<div id="primary" class="content-area">
<main id="main" class="site-main" role="main">

<?php
if ( have_posts() ) : ?>

<header class="page-header">
<?php
the_archive_title( '<h1 class="page-title">', '</h1>' );
the_archive_description( '<div class="archive-description">', '</div>' );
?>
</header><!-- .page-header -->

<?php
/* Start the Loop */
while ( have_posts() ) : the_post();

/*
* Include the Post-Format-specific template for the content.
* If you want to override this in a child theme, then include a file
* called content-___.php (where ___ is the Post Format name) and that will be used instead.
*/
get_template_part( 'template-parts/content', get_post_format() );

endwhile;

the_posts_navigation();

else :

get_template_part( 'template-parts/content', 'none' );

endif; ?>

</main><!-- #main -->
</div><!-- #primary -->

<?php
get_sidebar();
get_footer();
Loading

0 comments on commit ac1bd00

Please sign in to comment.