Merge pull request #7 from braican/6.0.0

6.0.0

.editorconfig

@@ -0,0 +1,20 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.js]
+indent_style = space
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false

.env.sample

@@ -0,0 +1,30 @@
+WORDPRESS_TITLE=YOUR THEME NAME
+WORDPRESS_THEME_NAME=your-theme-name
+WORDPRESS_URL=https://your-theme-name.ups.dock
+WORDPRESS_ADMIN_USER=admin
+WORDPRESS_ADMIN_EMAIL=[email protected]
+WORDPRESS_ADMIN_PASSWORD=password
+
+WORDPRESS_DB_HOST=db
+WORDPRESS_DB_NAME=wordpress
+WORDPRESS_DB_USER=wordpress
+WORDPRESS_DB_PASSWORD=wordpress
+
+# Runtime configuration for upstatement/ups-dock
+# See https://github.com/upstatement/ups-dock
+UPS_DOCK_NAME=YOUR THEME NAME
+
+# Runtime configuration for jwilder/nginx-proxy
+# See https://github.com/jwilder/nginx-proxy
+VIRTUAL_HOST=your-theme-name.ups.dock
+HTTPS_METHOD=noredirect
+
+# Runtime configuration for richarvey/nginx-php-fpm
+# See https://github.com/richarvey/nginx-php-fpm
+RUN_SCRIPTS=1
+
+# Comment out this next line to avoid permissions issues when not mounting the
+# theme codebase into the container via `volumes` in `docker-composer.yml`.
+# We're skipping it by default as it's not strictly required when using `volumes`
+# and it adds significantly to boot time with larger codebases.
+SKIP_CHOWN=1

.eslintrc.json

@@ -0,0 +1,8 @@
+{
+    "extends": ["plugin:prettier/recommended"],
+    "plugins": ["prettier"],
+    "parser": "babel-eslint",
+    "rules": {
+        "prettier/prettier": "error"
+    }
+}

.gitignore

@@ -8,9 +8,18 @@ wp-config.php
 .env
 
 # the uploads directory
-webroot/wp-content/uploads/*
-wp-content/uploads/*
+api/wp-content/uploads/*
 
 # npm
 node_modules/*
 
+# linting caches
+.eslintcache
+.stylelintcache
+
+# dist
+dist
+frontend/data/*.json
+frontend/static/style.css
+frontend/static/main.js
+*.map

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/themes/ananke"]
+	path = src/themes/ananke
+	url = https://github.com/budparr/gohugo-theme-ananke.git

.nvmrc

@@ -0,0 +1 @@
+v10.5.0

.prettierrc

@@ -0,0 +1,11 @@
+
+{
+    "printWidth": 100,
+    "tabWidth": 4,
+    "useTabs": false,
+    "semi": true,
+    "singleQuote": true,
+    "trailingComma": "es5",
+    "bracketSpacing": true,
+    "arrowParens": "always"
+  }

.travis.yml

@@ -0,0 +1,15 @@
+language: php
+php:
+  - '7.2'
+cache:
+  directories:
+    - node_modules
+
+before_install:
+  - nvm install
+
+install:
+  - npm install
+
+script:
+  - npm run lint:scripts

Dockerfile

@@ -31,15 +31,16 @@ RUN wget https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.ph
 	echo -e "source $HOME/wp-completion.bash\n" > $HOME/.bashrc 
 
 # Download WordPress
-RUN wp core download
+#RUN wp core download
 
 # Copy custom configuration files into location expected by nginx-php-fpm.
 # See https://github.com/richarvey/nginx-php-fpm/blob/master/docs/nginx_configs.md
-COPY conf /var/www/html/conf
+#COPY conf /var/www/html/conf
 
 # Copy startup scripts into location expected by nginx-php-fpm.
 # See https://github.com/richarvey/nginx-php-fpm/blob/master/docs/scripting_templating.md
-COPY scripts /var/www/html/scripts
+#COPY scripts /var/www/html/scripts
 
 # Copy the rest of this theme into place
-COPY . /var/www/html
+COPY webroot /var/www/html
+

README.md

@@ -1,36 +1,59 @@
-braican.com
-===========
+# braican.com
 
-I like to build websites.
 
 This is the public repository of [braican.com](http://braican.com), [Nick Braica's](http://twitter.com/braican) portfolio site.
 
-Each iteration of braican.com was pretty much a ground-up build. In other words, there was no code sharing between one version and another.
 
-## version 5
+## The Versions
+
+### Version 6
+`released 07/09/2018`
+
+Version six is a slight aesthetic improvement, but a total overhaul in the technology and the code behind the site. I kept WordPress on to handle my content, but am using it solely as a platform to create a content API that provides json endpoints for the data. The front end is handled by Hugo, a static site generator. The json data is downloaded via a gulp task that Hugo then renders.
+
+The reasoning for the change was simple - I don't have that much content, and I didn't need an entire CMS to handle just some case studies and an introduction.
+
+
+### Version 5
 `released 01/06/2018`
 
-Started Friday, December 8, 2017. Simple site with goofy intro and a list of projects.
+![v5](assets/braican.com-v5.jpg?raw=true)
+
+The fifth iteration of braican.com saw a focus on a simpler approach. A brief intro, thumbnails of projects that link to brief case studies, and a contact form make up the whole site. This version is completely powered by WordPress.
+
+I started working on the site on December 8, 2017, and initially launched it about a month later.
+
 
-## version 4
+### Version 4
 `released 03/19/2014`
 
-A custom, one page WordPress theme that consists of sections for my work, about me, and contact links. The theme is responsive, and it does some sweet ajax magic to bring in the portfolio items.
+![v4](assets/braican.com-v4.jpg?raw=true)
 
-## version 3
+Moving to a CMS driven site for the first time, I developed a custom, one page WordPress theme that consisted of sections for my work, about me, and contact links. This is the first braican.com iteration to be fully responsive. I utilized AJAX and the HTML5 history API to navigate to the portfolio items and case studies. To date, this has been the longest running braican.com iteration.
+
+### Version 3
 `released 09/30/2011`
 
-Created using HTML/CSS/JavaScript, with WordPress being the back end of the blogging funtionality. The theme consisted of large banners across each page with a fixed, full-screen image. This site is not responsive.
+![v3](assets/braican.com-v3.jpg?raw=true)
 
-## version 2
-`released 10/20/2010`
+Another static site with WordPress driving the blogging funtionality. This iteration was a complete redesign from the previous site, and featured large banners across each page with a fixed, full-screen image. This site is not responsive, but does include some nifty animations throughout. And man, I really liked those sliders on the homepage.
+
+This is the site that was live when I was hired as a co-op at The Boston Globe, as well as when I graduated from college and was hired full-time by Tank Design. So I guess you could say that this one was good enough to get me a couple jobs.
+
+** Interesting
 
-Way back machine.
+
+### Version 2
+`released 10/20/2010`
 
 ![v2](assets/braican.com-v2.jpg?raw=true)
 
-## Version 1
+A modification of the first iteration, this was a static html site that used WordPress only to power the blog. This version highlighted the breadth of work that I had completed up until that point, which included a slew of classwork and other personal projects in several different mediums that were completed throughout the years.
+
+I was also able to highlight The Girl From Last Night, perhaps the college project I'm most proud of.
+
+### Version 1
 
 `released ??/??/??`
 
-This one's been lost to time.
+This one's been lost to time. It was a very basic, static site that highlighted some schoolwork. There was a really cool grayscale gradient background.

conf/nginx/nginx-site.conf → api/conf/nginx/nginx-site.conf

@@ -67,4 +67,4 @@ server {
 		allow all;
 		auth_basic off;
 	}
-}
+}

webroot/wp-activate.php → api/wp-activate.php

@@ -18,6 +18,8 @@
 	die();
 }
 
+nocache_headers();
+
 if ( is_object( $wp_object_cache ) )
 	$wp_object_cache->cache_enabled = false;
 
@@ -110,7 +112,7 @@ function wpmu_activate_stylesheet() {
 					printf(
 						/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
 						__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-						sprintf( '<a href="http://%s">%s</a>', $signup->domain ),
+						sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
 						$signup->user_login,
 						$signup->user_email,
 						wp_lostpassword_url()

webroot/wp-admin/about.php → api/wp-admin/about.php

@@ -27,11 +27,101 @@
 			<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
 			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
 			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-			<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
+			<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
 		</h2>
 
 		<div class="changelog point-releases">
 			<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed %2$s bugs.',
+						18
+					),
+					'4.9.6',
+					number_format_i18n( 18 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.6' );
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+						28
+					),
+					'4.9.5',
+					number_format_i18n( 28 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.5' );
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed %2$s bugs.',
+						1
+					),
+					'4.9.4',
+					number_format_i18n( 1 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.4' );
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed %2$s bugs.',
+						34
+					),
+					'4.9.3',
+					number_format_i18n( 34 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.3' );
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+						22
+					),
+					'4.9.2',
+					number_format_i18n( 22 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.2' );
+				?>
+			</p>
 			<p>
 				<?php
 				printf(

webroot/wp-admin/admin-ajax.php → api/wp-admin/admin-ajax.php

@@ -65,6 +65,8 @@
 	'generate-password', 'save-wporg-username', 'delete-plugin', 'search-plugins',
 	'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme', 'install-theme',
 	'get-post-thumbnail-html', 'get-community-events', 'edit-theme-plugin-file',
+	'wp-privacy-export-personal-data',
+	'wp-privacy-erase-personal-data',
 );
 
 // Deprecated

webroot/wp-admin/credits.php → api/wp-admin/credits.php

@@ -28,7 +28,7 @@
 	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
 	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
 	<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-	<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
+	<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
 </h2>
 
 <div class="about-wrap-content">
@@ -52,6 +52,12 @@
 
 echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
 
+echo '<p>' . sprintf(
+	/* translators: %s: https://make.wordpress.org/ */
+	__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
+	__( 'https://make.wordpress.org/' )
+) . '</p>';
+
 foreach ( $credits['groups'] as $group_slug => $group_data ) {
 	if ( $group_data['name'] ) {
 		if ( 'Translators' == $group_data['name'] ) {
@@ -101,13 +107,6 @@
 }
 
 ?>
-<p class="clear"><?php
-	/* translators: %s: https://make.wordpress.org/ */
-	printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-		__( 'https://make.wordpress.org/' )
-	);
-?></p>
-
 </div>
 </div>
 <?php