From 2990c9e8fe3a06750829424da96b3e7187e7885e Mon Sep 17 00:00:00 2001 From: Mark Moffat Date: Sun, 11 Feb 2018 13:44:45 +0100 Subject: [PATCH] Theme now defaults to Cloth to avoid duplicate code --- lib/common.js | 6 +- views/checkout.hbs | 5 -- views/index.hbs | 117 ----------------------------------- views/page.hbs | 64 ------------------- views/pay.hbs | 65 -------------------- views/payment_complete.hbs | 21 ------- views/product.hbs | 122 ------------------------------------- 7 files changed, 4 insertions(+), 396 deletions(-) delete mode 100644 views/checkout.hbs delete mode 100644 views/index.hbs delete mode 100644 views/page.hbs delete mode 100644 views/pay.hbs delete mode 100644 views/payment_complete.hbs delete mode 100644 views/product.hbs diff --git a/lib/common.js b/lib/common.js index 8f896b2..42cf8c5 100644 --- a/lib/common.js +++ b/lib/common.js @@ -202,10 +202,12 @@ exports.getConfig = () => { // setup theme config.themeViews = ''; - if(typeof config.theme !== 'undefined' && config.theme !== ''){ - config.themeViews = '../public/themes/' + config.theme + '/'; + if(typeof config.theme === 'undefined' || config.theme === ''){ + config.theme = 'Cloth'; // Default to Cloth theme } + config.themeViews = '../public/themes/' + config.theme + '/'; + // if db set to mongodb override connection with MONGODB_CONNECTION_STRING env var config.databaseConnectionString = process.env.MONGODB_CONNECTION_STRING || config.databaseConnectionString; diff --git a/views/checkout.hbs b/views/checkout.hbs deleted file mode 100644 index 614b069..0000000 --- a/views/checkout.hbs +++ /dev/null @@ -1,5 +0,0 @@ -
-
- {{> cart}} -
-
\ No newline at end of file diff --git a/views/index.hbs b/views/index.hbs deleted file mode 100644 index bd81ff9..0000000 --- a/views/index.hbs +++ /dev/null @@ -1,117 +0,0 @@ -
-
-
- {{#ifCond config.menuEnabled '==' 'true'}} - {{#ifCond config.menuLocation '==' "side"}} -
- {{else}} -
- {{/ifCond}} - {{else}} -
- {{/ifCond}} -
- - - - - -
-
- -
-
- {{#ifCond config.menuEnabled '==' 'true'}} - {{#ifCond config.menuLocation '==' "side"}} -
- -
-
- {{else}} -
-
-
    -
  1. Home
    2. - {{#each menu.items}} -
  2. {{this.title}}
    3. - {{/each}} -
-
-
-
- {{/ifCond}} - {{else}} -
- {{/ifCond}} - {{#if filtered}} -
- Showing results for: {{searchTerm}} -
- {{/if}} -
- {{#ifCond results.length '==' 0}} -
-

No products found

-
- {{/ifCond}} - {{#each results}} -
-
- {{#if productPermalink}} -
- -
- {{#if productImage}} - ... - {{else}} - ... - {{/if}} -
-

- {{this.productTitle}} -

- -
- {{else}} - -
- {{#if productImage}} - ... - {{else}} - ... - {{/if}} -
-

- {{this.productTitle}} -

- - {{/if}} -

- {{currencySymbol ../config.currencySymbol}}{{formatAmount productPrice}} -

-

- Add to cart -

-
-
- {{/each}} -
-
-
- - - - - -
-
-
-
-
-
\ No newline at end of file diff --git a/views/page.hbs b/views/page.hbs deleted file mode 100644 index 4aa7412..0000000 --- a/views/page.hbs +++ /dev/null @@ -1,64 +0,0 @@ -
-
-
-
- {{#ifCond config.menuEnabled '==' 'true'}} - {{#ifCond config.menuLocation '==' "side"}} -
- {{else}} -
- {{/ifCond}} - {{else}} -
- {{/ifCond}} -
- - - - - -
-
-
- -
-
- {{#ifCond config.menuEnabled '==' 'true'}} - {{#ifCond config.menuLocation '==' "side"}} -
- -
-
- {{else}} -
-
-
    -
  1. Home
    2. - {{#each menu.items}} -
  2. {{this.title}}
    3. - {{/each}} -
-
-
-
- {{/ifCond}} - {{else}} -
- {{/ifCond}} - {{#if filtered}} -
- Showing results for: {{searchTerm}} -
- {{/if}} -
- {{{page.pageContent}}} -
-
-
-
\ No newline at end of file diff --git a/views/pay.hbs b/views/pay.hbs deleted file mode 100644 index 03e3ff3..0000000 --- a/views/pay.hbs +++ /dev/null @@ -1,65 +0,0 @@ -
-
- {{#if paymentMessage}} -

{{paymentMessage}}

- {{/if}} -
-
-
Customer details
- {{#unless session.customer}} - - {{/unless}} -
- {{#if session.customer}} -
- -
- {{/if}} -
- {{> payments/shipping-form}} - - {{#if session.customer}} - {{#ifCond config.paymentGateway '==' 'paypal'}} - {{> payments/paypal}} - {{/ifCond}} - {{/if}} - {{#unless session.customer}} -
-

Enter a password to create an account for next time

-
- -
- Create account -
- {{/unless}} -
- {{#if session.customer}} - {{#ifCond config.paymentGateway '==' 'stripe'}} - {{> payments/stripe}} - {{/ifCond}} - {{#ifCond config.paymentGateway '==' 'authorizenet'}} - {{> payments/authorizenet}} - {{/ifCond}} - {{/if}} -
-
-
-
- {{> cart}} -
-
-
\ No newline at end of file diff --git a/views/payment_complete.hbs b/views/payment_complete.hbs deleted file mode 100644 index a5a511b..0000000 --- a/views/payment_complete.hbs +++ /dev/null @@ -1,21 +0,0 @@ -
-
-
- {{#ifCond result.orderStatus '==' 'Paid'}} -

Your payment has been successfully processed

- {{else}} -

Your payment has failed. Please try again or contact us.

- {{/ifCond}} - {{#if result}} -
-

Order ID: {{result._id}}

-

Payment ID: {{result.orderPaymentId}}

-
- {{/if}} - {{#ifCond result.orderStatus '==' 'Paid'}} -

Please retain the details above as a reference of payment.

- {{/ifCond}} - Home -
-
-
\ No newline at end of file diff --git a/views/product.hbs b/views/product.hbs deleted file mode 100644 index 40a5953..0000000 --- a/views/product.hbs +++ /dev/null @@ -1,122 +0,0 @@ -
-
- {{#ifCond config.menuEnabled '==' 'true'}} - {{#ifCond config.menuLocation '==' "side"}} -
- -
-
- {{else}} -
-
-
    -
  1. Home
    2. - {{#each menu.items}} -
  2. {{this.title}}
    3. - {{/each}} -
-
-
-
- {{/ifCond}} - {{else}} -
- {{/ifCond}} -
-
-
-

{{result.productTitle}}

-

{{currencySymbol config.currencySymbol}}{{result.productPrice}}

- {{#if productOptions}} -

Options

- {{#each productOptions}} - {{#ifCond this.optType '==' "select"}} - {{this.optName}} - - {{/ifCond}} - {{#ifCond this.optType '==' "radio"}} - {{#each this.optOptions}} - {{this.optName}} -
- -
- {{/each}} - {{/ifCond}} - {{#ifCond this.optType '==' "checkbox"}} -
- -
- {{/ifCond}} - {{/each}} - {{/if}} -

-

-
-

Quantity

-
- - - - - - - -
-
-
-

-

-

-
- -
-
-

-

-

- {{{productDescription}}} -

-
-
- {{#if result.productImage}} -
-
- ... -
-
- {{else}} -
- ... -
- {{/if}} - {{#ifCond images.length '>' 1}} -
- {{#each images}} -
- -
- {{/each}} -
- {{/ifCond}} -
-
-
-
-
- -
\ No newline at end of file