From db68d59286f1d29c556ff8b0088af58ba8d8856d Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Fri, 27 May 2016 10:51:05 -0400 Subject: [PATCH 01/11] adding README --- README.md | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..e889538e --- /dev/null +++ b/README.md @@ -0,0 +1,77 @@ +1. Upload db to local MySQL database +2. Add the following to your wp-config.php file. This sets the urls in your DB without having to change them in your DB itself. +1. define(‘WP_HOME’,‘http://yourlocalhost’); +2. define(‘WP_SITEURL’,‘http://yourlocalhost’); +3. Login as an Admin, go to Settings=>Permalinks, change the “Common Settings” to “Default”, and Save. Then, select “Post Name” and Save again. +4. You should be all set! + +Mac OS X Setup +Requirements +Apache +Mac OS X comes with Apache preinstalled +PHP +Mac OS X comes with PHP preinstalled +MySQL +Clone the Marketplace Repo to your machine +https://github.com/Blocp/Marketplace.git +Update your Hosts file with the following +sudo vi /etc/hosts +Add the following lines +127.0.0.1 blocpower +127.0.0.1 blocpower.local +Apache Configuration +Update Apache to serve PHP by running from the command line (You will need Super User access): +sudo su - +vi /etc/apache2/httpd.conf +Uncomment the following lines +LoadModule deflate_module libexec/apache2/mod_deflate.so +LoadModule expires_module libexec/apache2/mod_expires.so +LoadModule rewrite_module libexec/apache2/mod_rewrite.so +LoadModule php5_module libexec/apache2/libphp5.so +Create Virtual Hosts +mkdir /etc/apache2/vhosts +touch /etc/apache2/vhosts/default.conf +vi /etc/apache2/vhosts/default.conf + + DocumentRoot "/Library/WebServer/Documents" + +mkdir /etc/apache2/vhosts +touch /etc/apache2/vhosts/marketplace.conf +vi /etc/apache2/vhosts/marketplace.conf + + DocumentRoot "[path to local Marketplace repo]" + ServerName blocpower.local + ErrorLog "/private/var/log/apache2/blocpower.local-error_log" + CustomLog "/private/var/log/apache2/blocpower.local-access_log" common + + AllowOverride All + Require all granted + + +Restart Apache +apachectl restart +MySQL Setup +Download and install MySQL +Setup root username and root password +Import Marketplace Database from S3 Backup – https://s3.amazonaws.com/blocpower.us.builds/marketplace/sql/marketplace-production-2016-3-28.sql +mysql -u -p < database_backup.sql +Enter your mysql password, the same password created during setup +Wordpress Config +Update the file +…/Marketplace/wordpress/wp-config.php + +define('DB_NAME', 'marketplace'); +define('DB_USER', ''); +define('DB_PASSWORD', ''); +define('DB_HOST', '127.0.0.1:3306'); +define('WP_HOME','http://blocpower:8888'); +define('WP_SITEURL','http://blocpower:8888'); +Wordpress Plugin Config +Navigate to: http://blocpower:8888/wp-admin +Login info: +Login: Blocpower +Password: 49oAJn +Go to Plugins, and “activate” any plugins that need activating +“Advanced Custom Fields” & “User Role Editor” are usual suspects. +Browse the Marketplace +http://blocpower:8888 \ No newline at end of file -- GitLab From e095c8633b79a79c7cacaa5286afd80ff28b86ce Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Fri, 27 May 2016 10:52:00 -0400 Subject: [PATCH 02/11] trying markdown --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e889538e..5e8594b9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 3. Login as an Admin, go to Settings=>Permalinks, change the “Common Settings” to “Default”, and Save. Then, select “Post Name” and Save again. 4. You should be all set! -Mac OS X Setup +###Mac OS X Setup Requirements Apache Mac OS X comes with Apache preinstalled -- GitLab From 714c525c24759ce6cbea648de5a15d9455a5f730 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Fri, 27 May 2016 10:56:58 -0400 Subject: [PATCH 03/11] adding some markdown structuring --- README.md | 71 +++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 5e8594b9..3387e929 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,43 @@ -1. Upload db to local MySQL database -2. Add the following to your wp-config.php file. This sets the urls in your DB without having to change them in your DB itself. -1. define(‘WP_HOME’,‘http://yourlocalhost’); -2. define(‘WP_SITEURL’,‘http://yourlocalhost’); -3. Login as an Admin, go to Settings=>Permalinks, change the “Common Settings” to “Default”, and Save. Then, select “Post Name” and Save again. -4. You should be all set! +##Running the app locally ###Mac OS X Setup -Requirements -Apache -Mac OS X comes with Apache preinstalled -PHP -Mac OS X comes with PHP preinstalled -MySQL -Clone the Marketplace Repo to your machine -https://github.com/Blocp/Marketplace.git -Update your Hosts file with the following -sudo vi /etc/hosts +####Requirements +* Apache +* Mac OS X comes with Apache preinstalled +* PHP +* Mac OS X comes with PHP preinstalled +* MySQL + +####Steps +1. Clone the Marketplace Repo to your machine +``https://github.com/Blocp/Marketplace.git`` +2. Update your Hosts file with the following +``sudo vi /etc/hosts`` Add the following lines -127.0.0.1 blocpower -127.0.0.1 blocpower.local -Apache Configuration +``127.0.0.1 blocpower`` +``127.0.0.1 blocpower.local`` +#####Apache Configuration Update Apache to serve PHP by running from the command line (You will need Super User access): -sudo su - -vi /etc/apache2/httpd.conf +``sudo su -`` +``vi /etc/apache2/httpd.conf`` + Uncomment the following lines -LoadModule deflate_module libexec/apache2/mod_deflate.so -LoadModule expires_module libexec/apache2/mod_expires.so -LoadModule rewrite_module libexec/apache2/mod_rewrite.so -LoadModule php5_module libexec/apache2/libphp5.so +``LoadModule deflate_module libexec/apache2/mod_deflate.so`` +``LoadModule expires_module libexec/apache2/mod_expires.so`` +``LoadModule rewrite_module libexec/apache2/mod_rewrite.so`` +``LoadModule php5_module libexec/apache2/libphp5.so`` + Create Virtual Hosts -mkdir /etc/apache2/vhosts -touch /etc/apache2/vhosts/default.conf -vi /etc/apache2/vhosts/default.conf - - DocumentRoot "/Library/WebServer/Documents" - -mkdir /etc/apache2/vhosts -touch /etc/apache2/vhosts/marketplace.conf -vi /etc/apache2/vhosts/marketplace.conf - +``mkdir /etc/apache2/vhosts`` +``touch /etc/apache2/vhosts/default.conf`` +``vi /etc/apache2/vhosts/default.conf`` +```` + ``DocumentRoot "/Library/WebServer/Documents"`` +```` +``mkdir /etc/apache2/vhosts`` +``touch /etc/apache2/vhosts/marketplace.conf`` +``vi /etc/apache2/vhosts/marketplace.conf`` +`` DocumentRoot "[path to local Marketplace repo]" ServerName blocpower.local ErrorLog "/private/var/log/apache2/blocpower.local-error_log" @@ -47,7 +46,7 @@ vi /etc/apache2/vhosts/marketplace.conf AllowOverride All Require all granted - +`` Restart Apache apachectl restart MySQL Setup -- GitLab From 1f4cc4d6803dca25155359c5bda01063fdddae3d Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Fri, 27 May 2016 10:58:21 -0400 Subject: [PATCH 04/11] adding some markdown structuring --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 3387e929..56f2381a 100644 --- a/README.md +++ b/README.md @@ -13,24 +13,35 @@ ``https://github.com/Blocp/Marketplace.git`` 2. Update your Hosts file with the following ``sudo vi /etc/hosts`` + Add the following lines + ``127.0.0.1 blocpower`` ``127.0.0.1 blocpower.local`` + #####Apache Configuration Update Apache to serve PHP by running from the command line (You will need Super User access): ``sudo su -`` ``vi /etc/apache2/httpd.conf`` Uncomment the following lines + ``LoadModule deflate_module libexec/apache2/mod_deflate.so`` + ``LoadModule expires_module libexec/apache2/mod_expires.so`` + ``LoadModule rewrite_module libexec/apache2/mod_rewrite.so`` + ``LoadModule php5_module libexec/apache2/libphp5.so`` Create Virtual Hosts + ``mkdir /etc/apache2/vhosts`` + ``touch /etc/apache2/vhosts/default.conf`` + ``vi /etc/apache2/vhosts/default.conf`` + ```` ``DocumentRoot "/Library/WebServer/Documents"`` ```` -- GitLab From 1367659e4554d2a2a2e2113e0f61f43b53aed702 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Fri, 27 May 2016 11:29:04 -0400 Subject: [PATCH 05/11] adding some markdown structuring --- README.md | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 56f2381a..6ff4b4e4 100644 --- a/README.md +++ b/README.md @@ -9,43 +9,39 @@ * MySQL ####Steps -1. Clone the Marketplace Repo to your machine -``https://github.com/Blocp/Marketplace.git`` -2. Update your Hosts file with the following -``sudo vi /etc/hosts`` +1. Clone the Marketplace Repo to your machine + ``https://github.com/Blocp/Marketplace.git`` +2. Update your Hosts file with the following + ``sudo vi /etc/hosts`` -Add the following lines +Add the following lines -``127.0.0.1 blocpower`` +``127.0.0.1 blocpower`` ``127.0.0.1 blocpower.local`` #####Apache Configuration -Update Apache to serve PHP by running from the command line (You will need Super User access): -``sudo su -`` +Update Apache to serve PHP by running from the command line (You will need Super User access): +``sudo su -`` ``vi /etc/apache2/httpd.conf`` Uncomment the following lines -``LoadModule deflate_module libexec/apache2/mod_deflate.so`` - -``LoadModule expires_module libexec/apache2/mod_expires.so`` - -``LoadModule rewrite_module libexec/apache2/mod_rewrite.so`` - -``LoadModule php5_module libexec/apache2/libphp5.so`` +``LoadModule deflate_module libexec/apache2/mod_deflate.so +LoadModule expires_module libexec/apache2/mod_expires.so +LoadModule rewrite_module libexec/apache2/mod_rewrite.so +LoadModule php5_module libexec/apache2/libphp5.so`` Create Virtual Hosts -``mkdir /etc/apache2/vhosts`` - -``touch /etc/apache2/vhosts/default.conf`` - +``mkdir /etc/apache2/vhosts`` +``touch /etc/apache2/vhosts/default.conf`` ``vi /etc/apache2/vhosts/default.conf`` -```` - ``DocumentRoot "/Library/WebServer/Documents"`` -```` -``mkdir /etc/apache2/vhosts`` +`` + DocumentRoot "/Library/WebServer/Documents" +'' + +mkdir /etc/apache2/vhosts ``touch /etc/apache2/vhosts/marketplace.conf`` ``vi /etc/apache2/vhosts/marketplace.conf`` `` -- GitLab From 2db3432a7c4438d1d0a90a32b1d1758757a32c7e Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Fri, 27 May 2016 11:32:15 -0400 Subject: [PATCH 06/11] adding some markdown structuring --- README.md | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 6ff4b4e4..e1fa7496 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ ####Steps 1. Clone the Marketplace Repo to your machine ``https://github.com/Blocp/Marketplace.git`` + 2. Update your Hosts file with the following ``sudo vi /etc/hosts`` @@ -21,31 +22,36 @@ Add the following lines #####Apache Configuration Update Apache to serve PHP by running from the command line (You will need Super User access): -``sudo su -`` -``vi /etc/apache2/httpd.conf`` +``$ sudo su -`` +``$ vi /etc/apache2/httpd.conf`` Uncomment the following lines -``LoadModule deflate_module libexec/apache2/mod_deflate.so -LoadModule expires_module libexec/apache2/mod_expires.so -LoadModule rewrite_module libexec/apache2/mod_rewrite.so -LoadModule php5_module libexec/apache2/libphp5.so`` +``LoadModule deflate_module libexec/apache2/mod_deflate.so`` +``LoadModule expires_module libexec/apache2/mod_expires.so`` +``LoadModule rewrite_module libexec/apache2/mod_rewrite.so`` +``LoadModule php5_module libexec/apache2/libphp5.so`` Create Virtual Hosts -``mkdir /etc/apache2/vhosts`` -``touch /etc/apache2/vhosts/default.conf`` -``vi /etc/apache2/vhosts/default.conf`` +``$ mkdir /etc/apache2/vhosts`` +``$ touch /etc/apache2/vhosts/default.conf`` +``$ vi /etc/apache2/vhosts/default.conf`` + +Then add: `` DocumentRoot "/Library/WebServer/Documents" '' -mkdir /etc/apache2/vhosts -``touch /etc/apache2/vhosts/marketplace.conf`` -``vi /etc/apache2/vhosts/marketplace.conf`` -`` - DocumentRoot "[path to local Marketplace repo]" +``$ mkdir /etc/apache2/vhosts`` +``$ touch /etc/apache2/vhosts/marketplace.conf`` +``$ vi /etc/apache2/vhosts/marketplace.conf`` + +Then add: + +`` +DocumentRoot "[path to local Marketplace repo]" ServerName blocpower.local ErrorLog "/private/var/log/apache2/blocpower.local-error_log" CustomLog "/private/var/log/apache2/blocpower.local-access_log" common @@ -54,6 +60,8 @@ mkdir /etc/apache2/vhosts Require all granted `` + +Save and close Restart Apache apachectl restart MySQL Setup -- GitLab From de16e9f6a2c8cd63db2dcafffd97310b56521784 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Fri, 27 May 2016 11:36:40 -0400 Subject: [PATCH 07/11] adding some markdown structuring --- README.md | 77 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index e1fa7496..06c47921 100644 --- a/README.md +++ b/README.md @@ -50,42 +50,49 @@ Then add: Then add: -`` -DocumentRoot "[path to local Marketplace repo]" - ServerName blocpower.local - ErrorLog "/private/var/log/apache2/blocpower.local-error_log" - CustomLog "/private/var/log/apache2/blocpower.local-access_log" common - - AllowOverride All - Require all granted - -`` +```` +``DocumentRoot "[path to local Marketplace repo]"`` + ``ServerName blocpower.local`` + ``ErrorLog "/private/var/log/apache2/blocpower.local-error_log"`` + ``CustomLog "/private/var/log/apache2/blocpower.local-access_log" common`` + ```` + ``AllowOverride All`` + ``Require all granted`` + ```` +```` Save and close + Restart Apache -apachectl restart -MySQL Setup -Download and install MySQL -Setup root username and root password -Import Marketplace Database from S3 Backup – https://s3.amazonaws.com/blocpower.us.builds/marketplace/sql/marketplace-production-2016-3-28.sql -mysql -u -p < database_backup.sql -Enter your mysql password, the same password created during setup -Wordpress Config -Update the file -…/Marketplace/wordpress/wp-config.php - -define('DB_NAME', 'marketplace'); -define('DB_USER', ''); -define('DB_PASSWORD', ''); -define('DB_HOST', '127.0.0.1:3306'); -define('WP_HOME','http://blocpower:8888'); -define('WP_SITEURL','http://blocpower:8888'); -Wordpress Plugin Config -Navigate to: http://blocpower:8888/wp-admin -Login info: -Login: Blocpower -Password: 49oAJn -Go to Plugins, and “activate” any plugins that need activating +``apachectl restart`` + +####MySQL Setup + +1. Download and install MySQL +2. Setup root username and root password +3. Import Marketplace Database from S3 Backup – https://s3.amazonaws.com/blocpower.us.builds/marketplace/sql/marketplace-production-2016-3-28.sql +4. ``mysql -u -p < database_backup.sql`` +5. Enter your mysql password, the same password created during setup + +####Wordpress Config + +Update the file `…/Marketplace/wordpress/wp-config.php` + +``define('DB_NAME', 'marketplace');`` +``define('DB_USER', '');`` +``define('DB_PASSWORD', '');`` +``define('DB_HOST', '127.0.0.1:3306');`` +``define('WP_HOME','http://blocpower:8888');`` +``define('WP_SITEURL','http://blocpower:8888');`` + +####Wordpress Plugin Config + +1. Navigate to: http://blocpower:8888/wp-admin + **Login info: + ***Login: Blocpower + ***Password: 49oAJn + +2. Go to Plugins, and “activate” any plugins that need activating “Advanced Custom Fields” & “User Role Editor” are usual suspects. -Browse the Marketplace -http://blocpower:8888 \ No newline at end of file + +3. Browse the Marketplace http://blocpower:8888 \ No newline at end of file -- GitLab From d3f90bc87e66da2a6713f06bf46bdeb4ab8677a3 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Fri, 27 May 2016 11:39:34 -0400 Subject: [PATCH 08/11] adding some markdown structuring --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 06c47921..d3d6ca58 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,13 @@ Then add: ```` ``DocumentRoot "[path to local Marketplace repo]"`` - ``ServerName blocpower.local`` - ``ErrorLog "/private/var/log/apache2/blocpower.local-error_log"`` - ``CustomLog "/private/var/log/apache2/blocpower.local-access_log" common`` - ```` - ``AllowOverride All`` - ``Require all granted`` - ```` +    ``ServerName blocpower.local`` +    ``ErrorLog "/private/var/log/apache2/blocpower.local-error_log"`` +    ``CustomLog "/private/var/log/apache2/blocpower.local-access_log" common`` +    ```` +       ``AllowOverride All`` +       ``Require all granted`` +    ```` ```` Save and close -- GitLab From 0989ca8ee9f0a2f1f5d8f406c4cd39c88090303a Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Fri, 27 May 2016 13:16:10 -0400 Subject: [PATCH 09/11] fixing readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3d6ca58..6f53dc96 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Then add: `` DocumentRoot "/Library/WebServer/Documents" -'' +`` ``$ mkdir /etc/apache2/vhosts`` ``$ touch /etc/apache2/vhosts/marketplace.conf`` -- GitLab From f1d2934e5dbb875f23df4a81094aab0e7d72fe01 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Tue, 31 May 2016 16:32:03 -0400 Subject: [PATCH 10/11] editing chart layout --- .../themes/backer/single-ignition_product.php | 189 +++++++++--------- 1 file changed, 96 insertions(+), 93 deletions(-) diff --git a/wordpress/wp-content/themes/backer/single-ignition_product.php b/wordpress/wp-content/themes/backer/single-ignition_product.php index 037facf1..9fdee0d9 100644 --- a/wordpress/wp-content/themes/backer/single-ignition_product.php +++ b/wordpress/wp-content/themes/backer/single-ignition_product.php @@ -207,99 +207,102 @@ --> - - - - + + + + -- GitLab From b076e4453ba290469c9ba981d14c61c538806074 Mon Sep 17 00:00:00 2001 From: markAking Date: Tue, 31 May 2016 16:55:00 -0400 Subject: [PATCH 11/11] levels fix - why they cut and pasted was beyond me --- wordpress/.htaccess | 8 --- .../themes/backer/header-projectsingle.php | 3 +- .../themes/backer/single-ignition_product.php | 70 +++---------------- 3 files changed, 12 insertions(+), 69 deletions(-) diff --git a/wordpress/.htaccess b/wordpress/.htaccess index 08117e11..6dab457b 100644 --- a/wordpress/.htaccess +++ b/wordpress/.htaccess @@ -11,13 +11,5 @@ # END W3TC Browser Cache # BEGIN WordPress - -RewriteEngine On -RewriteBase / -RewriteRule ^index\.php$ - [L] -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule . /index.php [L] - # END WordPress diff --git a/wordpress/wp-content/themes/backer/header-projectsingle.php b/wordpress/wp-content/themes/backer/header-projectsingle.php index 3b2806d5..93cd1378 100644 --- a/wordpress/wp-content/themes/backer/header-projectsingle.php +++ b/wordpress/wp-content/themes/backer/header-projectsingle.php @@ -53,8 +53,7 @@ // the location the link goes to. // make your code return true to let the click happen // return false to stop the click - } - }); + }); }); diff --git a/wordpress/wp-content/themes/backer/single-ignition_product.php b/wordpress/wp-content/themes/backer/single-ignition_product.php index 037facf1..39c1d611 100644 --- a/wordpress/wp-content/themes/backer/single-ignition_product.php +++ b/wordpress/wp-content/themes/backer/single-ignition_product.php @@ -3,12 +3,14 @@ Template Name: newsingleproduct Template */ ?> - ID, 'ign_project_id', true ); $project_name = get_post_meta( $post->ID, 'ign_product_name', true ); @@ -436,65 +438,15 @@ - ID, 'ign_project_id', true ); + $deck = new Deck($project_id); + $the_deck = $deck->the_deck(); + echo do_action('id_widget_after', $project_id, $the_deck); ?> -
-
-
-
- -
-
-
-
- -
-
- - - - - - -
-
-

- -

-
-
- -
-
- -
-
-
-
-
+ - - - \ No newline at end of file + -- GitLab