@shift72/core-template 0.4.1 → 0.4.4

package/CHANGELOG.md

@@ -1,8 +1,36 @@
 # Changelog
 
-## [Unreleased](https://github.com/shift72/core-template/compare/0.4.1...HEAD)
+## [Unreleased](https://github.com/shift72/core-template/compare/0.4.4...HEAD)
+
+## [0.4.4](https://github.com/shift72/core-template/compare/0.4.3...0.4.4)
+- Fixed usage of obsolete $primary var for trailer button
+
+### Added
+- Awards categories
+
+## [0.4.3](https://github.com/shift72/core-template/compare/0.4.2...0.4.3)
 
 ### Added
+- Awards categories
+- Floating donate button
+- External custom CSS link in head.
+- Scripts for downloading/uploading custom CSS files for use with local development.
+
+### Changed
+- Replaced various SASS variables with CSS variables.
+- Added workarounds for SASS and Bootstrap functions that don't understand CSS variables.
+- Kibble 0.16.4
+- Split CC and Subtitles
+- Moved engagement icons
+
+## [0.4.2](https://github.com/shift72/core-template/compare/0.4.1...0.4.2)
+
+### Added
+- Lang files updated with entries for purchasing one-off passes
+- Sponsor banner that can be enabled/disabled in Uber Admin
+
+### Changed
+- Typo in English lang file
 
 ## [0.4.1](https://github.com/shift72/core-template/compare/0.4.0...0.4.1)
 

package/kibble.json

@@ -2,7 +2,7 @@
   "name": "core-template",
   "version": "0.0.1",
   "siteUrl": "https://abccinemas.screenplus.co",
-  "builderVersion": "0.15.22",
+  "builderVersion": "0.16.4",
   "defaultLanguage": "en",
   "languages": {
     "ar": { "code": "ar_LB", "name": "عربى" },
@@ -107,4 +107,4 @@
       "pageSize": 0
     }
   ]
-}
+}

package/package.json

@@ -1,15 +1,17 @@
 {
   "name": "@shift72/core-template",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "description": "Shift72 core template",
   "license": "MIT",
   "scripts": {
     "start": "npm run init && npm-run-all --parallel css:watch js:watch kibble:watch",
-    "init": "npm-run-all css js",
+    "init": "npm-run-all css css:local:get js",
     "css": "sass ./site/styles/main.scss ./site/static/styles/main.css --load-path=node_modules",
     "css:lint": "prettier 'site/styles/*.scss' --write && stylelint ./site/styles/*.scss --fix",
     "css:watch": "npm run css -- --watch",
     "css:build": "postcss ./site/static/styles/main.css --use autoprefixer --use cssnano -r",
+    "css:local:get": "node scripts/css-local-get.js",
+    "css:local:put": "node scripts/css-local-put.js",
     "js": "rollup -c",
     "js:lint": "prettier '{scripts,site/static/js}/**/!(modernizr-custom).js' --write && eslint ./site/static/js/*.js ./scripts --fix",
     "js:watch": "rollup -c -w",
@@ -34,7 +36,7 @@
   "dependencies": {
     "@rollup/plugin-buble": "^0.21.3",
     "autoprefixer": "^7.1.2",
-    "bootstrap": "^4.0.0",
+    "bootstrap": "^4.6.1",
     "concat": "^1.0.3",
     "cssnano": "^5.0.8",
     "del": "^6.0.0",
@@ -45,7 +47,7 @@
     "postcss-cli": "^9.0.1",
     "rollup": "^2.23.0",
     "rollup-plugin-terser": "^6.1.0",
-    "s72-kibble": "^0.15.22",
+    "s72-kibble": "^0.16.4",
     "sass": "^1.36.0"
   },
   "devDependencies": {
@@ -55,6 +57,7 @@
     "eslint-plugin-compat": "^3.13.0",
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
+    "form-data": "^4.0.0",
     "prettier": "^2.3.2",
     "stylelint": "^13.13.1",
     "stylelint-config-prettier": "^8.0.2",

package/scripts/css-local-get.js

@@ -0,0 +1,34 @@
+const https = require('https');
+const fs = require('fs');
+
+const siteUrl = readJsonValueFromRawData('siteUrl', fs.readFileSync('kibble.json'));
+const file = fs.createWriteStream('site/static/styles/local.css');
+
+https.get(`${siteUrl}/services/users/v1/css`, handleFilenameResponse).on('error', handleError);
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+function readJsonValueFromRawData(key, rawJson) {
+  let json = JSON.parse(rawJson);
+  return json[key];
+}
+
+function handleFilenameResponse(res) {
+  res.on('data', d => {
+    const filename = readJsonValueFromRawData('css_filename', d);
+
+    if (filename) {
+      https.get(`${siteUrl}/styles/${filename}`, handleFileResponse).on('error', handleError);
+    } else {
+      console.log('Custom CSS not found');
+    }
+  });
+}
+
+function handleFileResponse(res) {
+  res.pipe(file);
+}
+
+function handleError(e) {
+  console.error(e);
+}

package/scripts/css-local-put.js

@@ -0,0 +1,110 @@
+const https = require('https');
+const fs = require('fs');
+const FormData = require('form-data');
+const rl = require('readline').createInterface({
+  input: process.stdin,
+  output: process.stdout,
+});
+
+const siteUrl = readJsonValueFromRawData('siteUrl', fs.readFileSync('kibble.json'));
+const url = new URL(siteUrl);
+
+rl.question(`Enter Username for ${siteUrl}: `, username => {
+  rl.question('Enter Password: ', password => {
+    rl.close();
+
+    return signin(username, password)
+      .then(authToken => {
+        return uploadCSS(authToken);
+      })
+      .then(filename => {
+        console.log(`CSS file upload success: https://${url.hostname}/styles/${filename}`);
+      })
+      .catch(handleError);
+  });
+});
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+function uploadCSS(authToken) {
+  return new Promise((resolve, reject) => {
+    let form = new FormData();
+    form.append('file', fs.createReadStream('site/static/styles/local.css'), {
+      filename: 'local.css',
+      contentType: 'text/css',
+    });
+
+    let headers = form.getHeaders();
+    headers['x-auth-token'] = authToken;
+
+    let options = {
+      hostname: url.hostname,
+      path: '/services/users/v1/css',
+      method: 'PUT',
+      headers,
+    };
+
+    const req = https.request(options);
+
+    form.pipe(req);
+    form.on('end', () => {
+      req.end();
+    });
+
+    req.on('response', res => {
+      if (res.statusCode < 200 || res.statusCode >= 300) {
+        return reject(new Error(`statusCode=${res.statusCode}`));
+      }
+
+      res.on('data', d => {
+        let filename = readJsonValueFromRawData('css_filename', d);
+        return resolve(filename);
+      });
+    });
+
+    req.on('error', e => {
+      return reject(e);
+    });
+  });
+}
+
+function signin(username, password) {
+  return new Promise((resolve, reject) => {
+    let options = {
+      hostname: url.hostname,
+      path: '/services/users/auth/sign_in',
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+    };
+
+    const req = https.request(options);
+
+    req.on('response', res => {
+      if (res.statusCode < 200 || res.statusCode >= 300) {
+        return reject(new Error(`statusCode=${res.statusCode}`));
+      }
+
+      res.on('data', d => {
+        let authToken = readJsonValueFromRawData('auth_token', d);
+        return resolve(authToken);
+      });
+    });
+
+    req.on('error', e => {
+      return reject(e);
+    });
+
+    req.write(JSON.stringify({ user: { email: username, password } }));
+
+    req.end();
+  });
+}
+
+function readJsonValueFromRawData(key, rawJson) {
+  let json = JSON.parse(rawJson);
+  return json[key];
+}
+
+function handleError(e) {
+  console.error(e);
+}

package/scripts/language-file-validator.js

@@ -10,7 +10,6 @@ const languageFiles = openFiles(languageFilenames);
 let errors = [];
 
 const whitespacePaddedKeys = [
-  'accept_invite_page_header',
   'shopping_info_release_date_title',
   'shopping_info_available_until_date_title',
   'shopping_info_rental_period_duration',
@@ -18,7 +17,7 @@ const whitespacePaddedKeys = [
   'classification_intro',
   'classification_divider',
 ];
-const emptyKeys = ['classification_outro', 'plan_label_owned'];
+const emptyKeys = ['classification_outro'];
 
 languageFilenames.forEach(language => {
   console.log(`===== TESTING: ${language} =====`);
@@ -39,6 +38,7 @@ languageFilenames.forEach(language => {
 
     if (keys.includes(key)) {
       testKeyNotEnglish(masterFile[key], file[key], key);
+      testValueNotKey(file[key], key);
     }
   });
 
@@ -103,3 +103,17 @@ function testKeyNotEnglish(englishValue, translatedValue, key) {
     errors.push(e);
   }
 }
+
+function testValueNotKey(translation, key) {
+  try {
+    assert.ok(translation['zero'] != key);
+    assert.ok(translation['one'] != key);
+    assert.ok(translation['two'] != key);
+    assert.ok(translation['few'] != key);
+    assert.ok(translation['many'] != key);
+    assert.ok(translation['other'] != key);
+  } catch(e) {
+    console.error(`${key} - key is value.`);
+    errors.push(e);
+  }
+}

package/site/ar_LB.all.json

@@ -312,7 +312,9 @@
     "shopping_complete_purchase_coming_soon": { "other": "يمكن المشاهدة ابتداء من {{.Date}}." },
     "shopping_complete_receipt": { "other": "تم إرسال الإيصال عبر البريد الإلكتروني." },
     "shopping_complete_library_link": { "other": "عرض المكتبة" },
-  
+    "shopping_complete_plan": {
+      "other": "لقد نجحت عملية شرائك لـ {{ .Title }}"
+    },
     "shopping_complete_rental_watch_window_start": {
       "one": "يمكن الآن بدء المشاهدة حتى اليوم التالي.",
       "other": "يمكن الآن بدء المشاهدة في غضون الأيام الـ {{.Count}} القادمة."
@@ -346,6 +348,7 @@
     "meta_detail_studios": { "one": "الاستديو", "other": "الاستوديوهات" },
     "meta_detail_countries": { "one": "البلد", "other": "البلدان" },
     "meta_detail_subtitles": { "other": "الترجمة" },
+    "meta_detail_captions": { "other": "الترجمة [CC]" },
     "meta_detail_episodes_title": { "other": "الحلفات" },
     "meta_detail_bonus_title": { "other": "محتوى إضافي" },
     "meta_detail_recommendations_title": { "other": "قد يعجبك أيضا" },
@@ -411,7 +414,6 @@
     "users_gender_diverse": { "other": "مختلف" },
     "users_gender_other": { "other": "غير محدد" },
   
-    "plan_label_owned": { "other": "" },
   
     "pricing_quality_hd": { "other": "pricing_quality_hd" },
     "pricing_quality_sd": { "other": "pricing_quality_sd" },
@@ -431,22 +433,8 @@
   
     "shopping_info_ownership_plan": { "other": "shopping_info_ownership_plan" },
   
-    "shopping_price_title_plan": { "other": "shopping_price_title_plan" },
-    "shopping_price_plan_note": { "other": "shopping_price_plan_note" },
-    "shopping_price_plan_note_interval": { "other": "shopping_price_plan_note_interval" },
-  
-    "shopping_enter_card_prompt_plan": { "other": "shopping_enter_card_prompt_plan" },
-  
-    "shopping_action_credit": { "other": "shopping_action_credit" },
-    "shopping_action_plan": { "other": "shopping_action_plan" },
-  
-    "shopping_complete_subscription": { "other": "shopping_complete_subscription" },
-    "shopping_complete_subscription_browse": { "other": "shopping_complete_subscription_browse" },
-  
     "shopping_info_rental_period_coming_soon": { "other": "من تاريخ ووقت الإصدار." },
-    "shopping_info_plan_offer": { "other": "shopping_info_plan_offer" },
-    "shopping_info_trial_period_offer": { "other": "shopping_info_trial_period_offer" },
-  
+
     "usersubscriptions_change_payment_method_change": { "other": "usersubscriptions_change_payment_method_change" },
     "usersubscriptions_change_payment_method_modal_title": { "other": "usersubscriptions_change_payment_method_modal_title" },
     "usersubscriptions_change_payment_method_modal_submit": { "other": "usersubscriptions_change_payment_method_modal_submit" },
@@ -538,6 +526,7 @@
     "shopping_action_plan": {
         "other": "مكتمل"
     },
+    "shopping_action_credit": { "other": "shopping_action_credit" },
     "shopping_complete_subscription": {
         "other": "تم شراء اشتراكك بنجاح. أنت الآن مشترك في {{ .Title }} ."
     },
@@ -588,5 +577,20 @@
     },
     "awards_in_competition": {
       "other": "في المنافسة"
-    }
+    },
+    "donate_button_text": {
+      "other": "يتبرع"
+    },
+    "shopping_error_plan_already_owned": { "other": "You already have this plan." },
+    "shopping_error_plan_expired": { "other": "This plan is no longer available." },
+
+    "wcag_aria_label_letterboxd": { "other": "View on Letterboxd" },
+
+    "header_banner": { "other": "ABC Cinemas – 21st  Film Festival, June 1 – 6, 2021" },
+    "app_badge_title": { "other": "Download the app to view your purchased content!" },
+    "app_badge_ios": { "other": "Download on the App Store" },
+    "app_badge_android": { "other": "Get it on Google Play" },
+
+    "awards_winner_of": { "other": "Winner of" }
+
   } 

package/site/ca_ES.all.json

@@ -147,7 +147,7 @@
   "social_media_buttons_copied_link": { "other": "S'ha copiat l'enllaç al porta-retalls!" },
   "social_media_buttons_copy_link": { "other": "Copiar al portapapers" },
   "accept_invite_page_header": {
-   "other": "Benvingut"
+   "other": "Benvingut "
   },
   "acceptinvite_form_invalid_reset_password_token": {
    "other": "Sembla que ja heu reclamat aquesta invitació, haureu de fer <a href=\"{{.SigninURL}}\">inicia la sessió</a> en canvi. Si heu oblidat la vostra contrasenya, també podeu <a href=\"{{.ForgotPasswordURL}}\">restablir la contrasenya</a>."
@@ -693,6 +693,9 @@
   "shopping_complete_purchase_coming_soon": {
    "other": "Podreu veure-ho des de {{.Date}}."
   },
+  "shopping_complete_plan": {
+    "other": "La teva compra de {{ .Title }} estat correcta."
+  },  
   "shopping_complete_receipt": {
    "other": "S'ha enviat un rebut per correu electrònic."
   },
@@ -757,6 +760,7 @@
   "meta_detail_subtitles": {
    "other": "Subtítols"
   },
+  "meta_detail_captions": { "other": "Subtítols [CC]" },
   "meta_detail_episodes_title": {
    "other": "Episodis"
   },
@@ -914,9 +918,6 @@
   "users_gender_other": {
    "other": "Altre"
   },
-  "plan_label_owned": {
-   "other": ""
-  },
   "pricing_quality_hd": {
    "other": "pricing_quality_hd"
   },
@@ -962,39 +963,12 @@
   "shopping_info_ownership_plan": {
    "other": "shopping_info_ownership_plan"
   },
-  "shopping_price_title_plan": {
-   "other": "shopping_price_title_plan"
-  },
-  "shopping_price_plan_note": {
-   "other": "shopping_price_plan_note"
-  },
-  "shopping_price_plan_note_interval": {
-   "other": "shopping_price_plan_note_interval"
-  },
-  "shopping_enter_card_prompt_plan": {
-   "other": "shopping_enter_card_prompt_plan"
-  },
   "shopping_action_credit": {
    "other": "shopping_action_credit"
   },
-  "shopping_action_plan": {
-   "other": "shopping_action_plan"
-  },
-  "shopping_complete_subscription": {
-   "other": "shopping_complete_subscription"
-  },
-  "shopping_complete_subscription_browse": {
-   "other": "shopping_complete_subscription_browse"
-  },
   "shopping_info_rental_period_coming_soon": {
    "other": "des de la data i l'hora de l'alliberament."
   },
-  "shopping_info_plan_offer": {
-   "other": "shopping_info_plan_offer"
-  },
-  "shopping_info_trial_period_offer": {
-   "other": "shopping_info_trial_period_offer"
-  },
   "usersubscriptions_change_payment_method_change": {
    "other": "usersubscriptions_change_payment_method_change"
   },
@@ -1255,5 +1229,15 @@
   },
   "awards_in_competition": {
     "other": "En Competició"
-  }
+  },
+  "awards_winner_of": {
+    "other": "Guanyador de"
+  },
+  "donate_button_text": {
+    "other": "Donar"
+  },
+  "shopping_error_plan_already_owned": { "other": "You already have this plan." },
+  "shopping_error_plan_expired": { "other": "This plan is no longer available." },
+
+  "wcag_aria_label_letterboxd": { "other": "View on Letterboxd" }
 }

package/site/da_DK.all.json

@@ -132,7 +132,7 @@
   "social_media_buttons_copied_link": { "other": "Link kopieret til udklipsholder!" },
   "social_media_buttons_copy_link": { "other": "Kopier til udklipsholder" },
   "accept_invite_page_header": {
-    "other": "Velkommen"
+    "other": "Velkommen "
   },
   "acceptinvite_form_invalid_reset_password_token": {
     "other": "Det ser ud som om du allerede har accepteret denne invitation, du skal derfor <a href=\"signin.html\">logge ind</a> i stedet Hvis du har glemt dit kodeord, kan du også <a href=\"forgotpassword.html\">nulstille dit kodeord</a>."
@@ -676,6 +676,9 @@
   "shopping_complete_receipt": {
     "other": "En kvittering er blevet mailet til dig."
   },
+  "shopping_complete_plan": {
+    "other": "Dit køb af {{ .Title }} blev gennemført."
+  },  
   "shopping_complete_library_link": {
     "other": "Se dit bibliotek"
   },
@@ -722,6 +725,7 @@
   "meta_detail_subtitles": {
     "other": "Undertekster"
   },
+  "meta_detail_captions": { "other": "Undertekster [CC]" },
   "meta_detail_episodes_title": {
     "other": "Episodes"
   },
@@ -879,9 +883,6 @@
   "users_gender_other": {
     "other": "Andet"
   },
-  "plan_label_owned": {
-    "other": ""
-  },
   "pricing_quality_hd": {
     "other": "pricing_quality_hd"
   },
@@ -927,39 +928,12 @@
   "shopping_info_ownership_plan": {
     "other": "shopping_info_ownership_plan"
   },
-  "shopping_price_title_plan": {
-    "other": "shopping_price_title_plan"
-  },
-  "shopping_price_plan_note": {
-    "other": "shopping_price_plan_note"
-  },
-  "shopping_price_plan_note_interval": {
-    "other": "shopping_price_plan_note_interval"
-  },
-  "shopping_enter_card_prompt_plan": {
-    "other": "shopping_enter_card_prompt_plan"
-  },
   "shopping_action_credit": {
     "other": "shopping_action_credit"
   },
-  "shopping_action_plan": {
-    "other": "shopping_action_plan"
-  },
-  "shopping_complete_subscription": {
-    "other": "shopping_complete_subscription"
-  },
-  "shopping_complete_subscription_browse": {
-    "other": "shopping_complete_subscription_browse"
-  },
   "shopping_info_rental_period_coming_soon": {
     "other": "fra premieredatoen og -tidspunktet."
   },
-  "shopping_info_plan_offer": {
-    "other": "shopping_info_plan_offer"
-  },
-  "shopping_info_trial_period_offer": {
-    "other": "shopping_info_trial_period_offer"
-  },
   "usersubscriptions_change_payment_method_change": {
     "other": "usersubscriptions_change_payment_method_change"
   },
@@ -1158,5 +1132,46 @@
     },
     "awards_in_competition": {
       "other": "I Konkurrence"
-    }
+    },
+    "awards_winner_of": {
+      "other": "Vinder af"
+    },
+    "donate_button_text": {
+      "other": "Doner"
+    },
+
+    "shopping_error_plan_already_owned": { "other": "You already have this plan." },
+    "shopping_error_plan_expired": { "other": "This plan is no longer available." },
+    "shopping_payment_method_header": { "other": "Payment methods" },
+    "shopping_payment_method_credit_card": { "other": "Credit card" },
+    "shopping_payment_method_giropay": { "other": "Giropay" },
+    "shopping_error_stripe_unknown_error": { "other": "Something went wrong with this payment. Please try again later." },
+    "shopping_error_payment_complete_failed": { "other": "The payment was declined. Close this window and try again." },
+
+    "wcag_skip_links_header": { "other": "Accessibility Links" },
+  "wcag_skip_links_content": { "other": "Skip to Content" },
+  "wcag_skip_links_footer": { "other": "Skip to Footer" },
+
+  "wcag_homepage_h1": { "other": "Homepage" },
+  "wcag_carousel_h2": { "other": "Carousel" },
+  "wcag_collections_h2": { "other": "Collections" },
+
+  "wcag_aria_label_footer": { "other": "Footer" },
+  "wcag_aria_label_nav_main": { "other": "Main" },
+  "wcag_aria_label_nav_sub": { "other": "Sub" },
+  "wcag_aria_label_toggle_nav": { "other": "Toggle Navigation" },
+  "wcag_aria_label_bundle_items": { "other": "Bundle Items" },
+  "wcag_aria_label_carousel": { "other": "Carousel" },
+  "wcag_aria_label_page_collection": { "other": "Page Collection" },
+  "wcag_aria_label_collection_list": { "other": "Collection List" },
+  "wcag_aria_label_collection_slider": { "other": "Collection Slider" },
+  "wcag_aria_label_wishlist": { "other": "Wishlist" },
+  "wcag_aria_label_facebook": { "other": "Share on Facebook" },
+  "wcag_aria_label_twitter": { "other": "Share on Twitter" },
+  "wcag_aria_label_linkedin": { "other": "Share on LinkedIn" },
+  "wcag_aria_label_letterboxd": { "other": "View on Letterboxd" },
+
+  "header_banner": { "other": "ABC Cinemas – 21st  Film Festival, June 1 – 6, 2021" }
+
+    
 }