Merge pull request #155 from Pageworks/develop

Fixing outstanding merge conflicts & requires developers email address

.env.example

@@ -45,3 +45,6 @@ SYSTEM_EMAIL_ADDRESS="REPLACE_ME"
 
 # System Email Name
 SYSTEM_EMAIL_NAME="REPLACE_ME"
+
+# Testing Email Adress
+TEST_EMAIL_ADDRESS="REPLACE_ME"

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.1.3.2 - 2019-05-14
+
+## Added
+
+- Adds: setup script requires the developers email address and sets it as the `testToEmailAddress` in `general.php`
+
+## Fixed
+
+- Fixes: outstanding merge conflict issue from the previous release
+
 ## 0.1.3.1 - 2019-05-14
 
 ### Added

build-tools/setup/questions.js

@@ -24,7 +24,7 @@ module.exports = {
                 name: 'defaultUrl',
                 type: 'input',
                 message: 'Site URL:',
-                default: `${ projectName.replace(' ', '-').toLowerCase() }.local`,
+                default: `${ projectName.replace(/\s/g, '-').toLowerCase() }.local`,
                 validate: (input)=>{
                     if(input !== ''){
                         if(input.match(/http:\/\//)){
@@ -35,6 +35,22 @@ module.exports = {
                     }
                     return 'Please enter a project URL.';
                 }
+            },
+            {
+                name: 'devEmailAddress',
+                type: 'input',
+                message: 'Your Email Address:',
+                default: `web@page.works`,
+                validate: (input)=>{
+                    if(input !== ''){
+                        if(input.match(/.+@.+\..+/)){
+                            return 'Please provide a valid email address.';
+                        }else{
+                            return true;
+                        }
+                    }
+                    return 'Please enter your email address.';
+                }
             }
         ];
 
@@ -96,7 +112,7 @@ module.exports = {
                 name: 'database',
                 type: 'input',
                 message: 'Database name:',
-                default: `craft_${ projectName.replace(' ', '-').toLowerCase() }`,
+                default: `craft_${ projectName.replace(/\s/g, '-').toLowerCase() }`,
                 validate: (input)=>{
                     if(input !== ''){
                         return true;
@@ -108,4 +124,4 @@ module.exports = {
 
         return inquirer.prompt(questions);
     }
-}
+}

build-tools/setup/setup.js

@@ -28,6 +28,7 @@ askQuestions = (async ()=>{
 
     const question2 = await questions.getProjectURL(projectDetails.projectName);
     projectDetails.devUrl = `${ question2.defaultUrl }`;
+    projectDetails.devEmail = devEmailAddress;
 
     const question3 = await questions.getDatabaseDetails(projectDetails.projectName);
     projectDetails.driver = question3.driver;
@@ -80,6 +81,7 @@ askQuestions = (async ()=>{
             modifiedFile = modifiedFile.replace(/SYSTEM_NAME="REPLACE_ME"/, `SYSTEM_NAME="${ projectDetails.projectName }"`);
             modifiedFile = modifiedFile.replace(/SYSTEM_EMAIL_NAME="REPLACE_ME"/, `SYSTEM_EMAIL_NAME="${ projectDetails.projectName }"`);
             modifiedFile = modifiedFile.replace(/SYSTEM_EMAIL_ADDRESS="REPLACE_ME"/, `SYSTEM_EMAIL_ADDRESS="no-reply@${ projectDetails.devUrl }"`);
+            modifiedFile = modifiedFile.replace(/TEST_EMAIL_ADDRESS="REPLACE_ME"/, `TEST_EMAIL_ADDRESS="${ projectDetails.devEmail }"`);
 
             fs.writeFile('.env', modifiedFile, (err)=>{
                 if(err){

config/general.php

@@ -26,13 +26,8 @@
         'useProjectConfigFile'          => true,
 
         // Leave at bottom of global settings
-<<<<<<< HEAD
-        'jsCacheBustTimestamp' => '53210445',
-        'cssCacheBustTimestamp' => '53211169',
-=======
-        'jsCacheBustTimestamp' => '53210445',
-        'cssCacheBustTimestamp' => '53211169',
->>>>>>> develop
+        'jsCacheBustTimestamp' => '54654843',
+        'cssCacheBustTimestamp' => '54655693',
     ],
 
     // Dev environment settings
@@ -41,7 +36,7 @@
         'siteUrl'               => getenv('DEV_URL'),
         'allowUpdates'          => true,
         'devMode'               => true,
-        'testToEmailAddress'    => 'REPLACE_ME',
+        'testToEmailAddress'    => getenv('TEST_EMAIL_ADDRESS'),
         'enableTemplateCaching' => false,
         'aliases' => [
             '@rootUrl' => getenv('DEV_URL'),