@shift72/core-template 0.5.1 → 1.0.0-alpha.0

package/.github/pull_request_template.md

@@ -0,0 +1,47 @@
+ADO card: ☑️ [AB#XXXX](https://dev.azure.com/S72/SHIFT72/_workitems/edit/XXXX)
+
+Elab notes/AC: 📃 [Google Docs](https://docs.google.com)
+- [ ] Has this been discussed with Delivery Team?
+
+Designs: 
+- 📱 [Mobile](http://www.zeplin.io/????)
+- 💊 [Tablet](http://www.zeplin.io/????)
+- 🖥 [Desktop](http://www.zeplin.io/????)
+
+## Description of work
+This is a description of the feature or bug.
+
+## Edge cases/Caveats/Known issues
+- Edge case 1
+- Caveat 2
+- Known issue 3
+
+## Config settings/Toggles required for the feature to work
+- Config setting 1
+
+## Related PRs 
+
+### Any PRs which this PR depends on
+- Relish?
+- Kibble?
+- APIs?
+
+### Any PRs dependent on this one
+- Relish?
+- Kibble?
+- APIs?
+
+### Affected Clients
+ - All clients who use Kibble
+ - Client 1
+ - Client 2
+
+## Checklist
+- [ ] CI tests are passing Github actions (inc. linting)
+- [ ] Key areas of the feature outlined for context and testing
+- [ ] If there are designs for this work are they noted here and in the ADO card 
+- [ ] Design review
+- [ ] Have checked this at multiple screen resolutions and range of browsers
+- [ ] Moved ADO card to Dev/done, checked link to Github, tagged "Review"
+- [ ] Updated changelog (if applicable)
+- [ ] I promise to document any new feature toggles/configurations in the appropriate documentation

package/.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.13.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

package/.nvmrc

@@ -0,0 +1 @@
+16.13.1

package/CHANGELOG.md

@@ -1,6 +1,53 @@
 # Changelog
 
-## [Unreleased](https://github.com/shift72/core-template/compare/0.5.1...HEAD)
+## [Unreleased](https://github.com/shift72/core-template/compare/1.0.0-alpha.0...HEAD)
+
+## [1.0.0-alpha.0](https://github.com/shift72/core-template/compare/0.6.0...1.0.0-alpha.0)
+
+### Added
+- Subscribe to watch button
+- Bundles tagline to show n items rather than n films
+- Keyboard controls for the carousel.
+- Pull request template file.
+- Playback progress component and style
+- `url` parameter in share modals
+
+### Changed
+- New Jet and CSS for reusable CTA (call-to-action) buttons.  Used for consistent button appearance on film/tv/bundle pages and carousel slides.
+- Reworked the carousel UI.
+- Carousel background now extends the full width of the window.
+
+### Fixed
+- Remove whitespaces from mustaches variables in translations.
+- Fix unwanted variables in translations.
+- Sub-item CSS is no longer broken by the linter.
+
+## [0.6.0](https://github.com/shift72/core-template/compare/0.6.0-alpha.0...0.6.0)
+
+No changes from `alpha-0`.
+
+## [0.6.0-alpha.0](https://github.com/shift72/core-template/compare/0.5.1...0.6.0-alpha.0)
+
+### Added
+- If the signed in user has plans to show, they will now be visible in `subscriptions.html.jet` with a link from "My Subscriptions" in the menu.
+- Styling and translations to support SVOD subscriptions.
+- `.nvmrc` to pin versions of Node/NPM.
+- Developer tool to fetch translations from Google Translate.
+- Social media buttons replaced with share modal.
+- Relish now loads the `urlmap.json`.
+- Sponsor image in carousel and meta detail.
+
+### Changed
+- Default Font Awesome removed. A trimmed icons file is now in `fa-s72.woff` being used by `_icons.scss`.
+- Styling changes to awards and availability label/status.
+
+### Fixed
+- Removed some redundant wishlist CSS.
+- Improved and translated element switcher.
+- Removed suffixed `plan` from subscription translations.
+- Changed incorrect language code for Estonia.
+- Donate button hover color.
+- Google scripts respect cookie consents and only load when accepted.
 
 ## [0.5.1](https://github.com/shift72/core-template/compare/0.5.0...0.5.1)
 
@@ -11,30 +58,38 @@
 - Sentence casing for `en_AU` translation about passes.
 
 ## [0.5.0](https://github.com/shift72/core-template/compare/0.4.4...0.5.0)
-### Changed
-- Upgrade to kibble `0.16.6`.
-- Moved references from `film.Images` to `film.ImageMap`.
-- Removed minimum page height from content pages.
-- Moved skip link above cookie consent banner
 
 ### Added
 - Start the site with an admin build: `npm start --admin`.
 - Added Core template version to `<head>` and `kibble.json`.
 - Added styling for floating donate button to use button sass variables.
 - A bunch of missing language keys across language files.
-- Automated translation command
+- Automated translation command.
+
+### Changed
+- Upgrade to kibble `0.16.6`.
+- Moved references from `film.Images` to `film.ImageMap`.
+- Removed minimum page height from content pages.
+- Moved skip link above cookie consent banner
+
+### Changed
+- Upgrade to kibble `0.16.6`.
+- Moved references from `film.Images` to `film.ImageMap`.
+- Removed minimum page height from content pages.
+- Moved skip link above cookie consent banner
 
 ### Fixed
 - Can now override the cookie consent styling.
-- Can now send analytics data to both GA4 and UA Legacy google analytics (GA4 previously not supported)
+- Can now send analytics data to both GA4 and UA Legacy google analytics (GA4 previously not supported).
 
 ## [0.4.4](https://github.com/shift72/core-template/compare/0.4.3...0.4.4)
-### Fixed
-- Fixed obsolete `$primary` var for trailer button.
 
 ### Added
 - Awards categories.
 
+### Fixed
+- Fixed obsolete `$primary` var for trailer button.
+
 ## [0.4.3](https://github.com/shift72/core-template/compare/0.4.2...0.4.3)
 
 ### Added

package/kibble.json

@@ -2,7 +2,7 @@
   "name": "core-template",
   "version": "0.0.1",
   "siteUrl": "https://abccinemas.screenplus.co",
-  "builderVersion": "0.16.6",
+  "builderVersion": "0.16.7",
   "defaultLanguage": "en",
   "languages": {
     "ar": {
@@ -21,8 +21,8 @@
       "code": "de_DE",
       "name": "Deutsch"
     },
-    "ee": {
-      "code": "ee_EE",
+    "et": {
+      "code": "et_ET",
       "name": "Eestlane"
     },
     "el": {
@@ -185,5 +185,5 @@
       "pageSize": 0
     }
   ],
-  "coreTemplateVersion": "0.5.1"
+  "coreTemplateVersion": "1.0.0-alpha.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shift72/core-template",
-  "version": "0.5.1",
+  "version": "1.0.0-alpha.0",
   "description": "Shift72 core template",
   "license": "MIT",
   "scripts": {
@@ -46,7 +46,6 @@
     "concat": "^1.0.3",
     "cssnano": "^5.0.8",
     "del": "^6.0.0",
-    "font-awesome": "^4.7.0",
     "minify": "^4.1.1",
     "npm-run-all": "^4.0.2",
     "postcss": "^8.3.11",

package/scripts/translate.mjs

@@ -11,33 +11,41 @@ if (!key || !value) {
 }
 glob('./site/*.json', {}, (err, files) => {
   files.forEach(pathName => {
+    function writeTranslationFile(translatedValue) {
+      if (!content[key]) {
+        content[key] = {};
+      }
+
+      content[key][nestedKey ? nestedKey : 'other'] = translatedValue;
+      fs.writeFileSync(pathName, JSON.stringify(content, null, 2));
+    }
     const file_content = fs.readFileSync(pathName);
     const content = JSON.parse(file_content);
     let languageCode = pathName.slice(7, 9);
     if (languageCode == 'ee') languageCode = 'et';
-    fetch(
-      `https://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=${languageCode}&dt=t&q=${encodeURI(
-        value
-      )}`
-    )
-      .then(res => {
-        const contentType = res.headers.get('content-type');
-        if (contentType && contentType.indexOf('application/json') !== -1) {
-          return res.json();
-        }
-        console.log(`translation failed for ${languageCode}`);
-      })
-      .then(translated => {
-        if (translated) {
-          const translatedValue = translated[0][0][0];
-
-          if (!content[key]) {
-            content[key] = {};
+    if (value.trim() === '') {
+      writeTranslationFile(value);
+    } else {
+      fetch(
+        `https://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=${languageCode}&dt=t&q=${encodeURI(
+          value
+        )}`
+      )
+        .then(res => {
+          const contentType = res.headers.get('content-type');
+          if (contentType && contentType.indexOf('application/json') !== -1) {
+            return res.json();
+          }
+          console.log(`translation failed for ${languageCode}`);
+        })
+        .then(translated => {
+          if (translated) {
+            let translatedValue = '';
+            translated[0].forEach(each => translatedValue += each[0]);
+            writeTranslationFile(translatedValue);
           }
+        });
+    }
 
-          content[key][nestedKey ? nestedKey : 'other'] = translatedValue;
-          fs.writeFileSync(pathName, JSON.stringify(content, null, 2));
-        }
-      });
   });
 });

package/site/ar_LB.all.json

@@ -134,28 +134,28 @@
     "other": "تابع "
   },
   "social_media_buttons_title": {
-    "other": "النشر "
+    "other": "يشارك"
   },
   "social_media_buttons_facebook": {
-    "other": "انشر في الفيسبوك"
+    "other": "Facebook"
   },
   "social_media_buttons_twitter": {
-    "other": "حصة على التغريد"
+    "other": "Twitter"
   },
   "social_media_buttons_linkedin": {
-    "other": "انشر على لينكد إن"
+    "other": "Linkedin"
   },
   "social_media_buttons_email": {
-    "other": "سهم عبر البريد الإلكتروني"
+    "other": "بريد الالكتروني"
   },
   "social_media_buttons_email_subject": {
     "other": "مشاركة الارتباط"
   },
   "social_media_buttons_copied_link": {
-    "other": "تم نسخ الرابط إلى الحافظة!"
+    "other": "تم نسخ الرابط"
   },
   "social_media_buttons_copy_link": {
-    "other": "نسخ إلى الحافظة"
+    "other": "نسخ الوصلة"
   },
   "accept_invite_page_header": {
     "other": "أهلا بك"
@@ -711,7 +711,7 @@
     "other": "عرض المكتبة"
   },
   "shopping_complete_plan": {
-    "other": "لقد نجحت عملية شرائك لـ {{ .Title }}"
+    "other": "لقد نجحت عملية شرائك لـ {{.Title}}"
   },
   "shopping_complete_rental_watch_window_start": {
     "one": "يمكن الآن بدء المشاهدة حتى اليوم التالي.",
@@ -1016,7 +1016,7 @@
     "other": "إلغاء الاشتراك؟"
   },
   "usersubscriptions_unsubscribe_modal_body": {
-    "other": "سيؤدي هذا إلى إلغاء الاشتراك في خطة {{.Name}}. ستظل قادرًا على مشاهدة المحتوى في الخطة حتى انتهاء صلاحيتها {{.Expiry}}."
+    "other": "سيؤدي هذا إلى إلغاء الاشتراك في {{.Name}}. ستظل قادرًا على مشاهدة المحتوى حتى انتهاء صلاحيته {{.Expiry}}."
   },
   "availability_coming_soon": {
     "other": "قريبا"
@@ -1138,6 +1138,9 @@
   "wcag_aria_label_carousel": {
     "other": "المشاركات الدائرية"
   },
+  "wcag_aria_label_carousel_pagination": {
+    "other": "ترقيم الصفحات"
+  },
   "wcag_aria_label_page_collection": {
     "other": "صفحة المجموعات"
   },
@@ -1163,16 +1166,29 @@
     "other": "سعر"
   },
   "shopping_price_plan_note": {
-    "zero": "اتهم كل {{ .Interval }} .",
-    "one": "يتم تحصيل الرسوم كل {{ .Interval }} بعد انتهاء الفترة التجريبية المجانية لمدة 24 ساعة.",
-    "other": "يتم تحصيل الرسوم كل {{ .Interval }} بعد انتهاء {{ .Count }} التجريبية المجانية .Count يوم."
+    "zero": "اتهم كل {{.Interval}} .",
+    "one": "يتم تحصيل الرسوم كل {{.Interval}} بعد انتهاء الفترة التجريبية المجانية لمدة 24 ساعة.",
+    "two": "يتم تحصيل الرسوم كل {{.Interval}} بعد انتهاء الفترة التجريبية المجانية التي تبلغ مدتها {{.Count}} يومًا.",
+    "few": "يتم تحصيل الرسوم كل {{.Interval}} بعد انتهاء الفترة التجريبية المجانية التي تبلغ مدتها {{.Count}} يومًا.",
+    "many": "يتم تحصيل الرسوم كل {{.Interval}} بعد انتهاء الفترة التجريبية المجانية التي تبلغ مدتها {{.Count}} يومًا.",
+    "other": "يتم تحصيل الرسوم كل {{.Interval}} بعد انتهاء الفترة التجريبية المجانية التي تبلغ مدتها {{.Count}} يومًا."
+  },
+  "shopping_price_plan_note_without_trial": {
+    "other": "اتهم كل {{.Interval}} ."
   },
   "shopping_price_plan_note_interval": {
-    "one": "{{ .Interval }}",
-    "other": "{{ .Count }} {{ .Interval }}"
+    "zero": "{{.Interval}}",
+    "one": "{{.Interval}}",
+    "two": "{{.Count}} {{.Interval}}",
+    "few": "{{.Count}} {{.Interval}}",
+    "many": "{{.Count}} {{.Interval}}",
+    "other": "{{.Count}} {{.Interval}}"
+  },
+  "shopping_enter_card_prompt_subscription": {
+    "other": "أدخل تفاصيل بطاقة الائتمان الخاصة بك أدناه لبدء اشتراكك."
   },
   "shopping_enter_card_prompt_plan": {
-    "other": "أدخل تفاصيل بطاقة الائتمان الخاصة بك أدناه لبدء اشتراكك."
+    "other": "أدخل تفاصيل بطاقة الائتمان الخاصة بك أدناه لبدء خطتك."
   },
   "shopping_action_plan": {
     "other": "مكتمل"
@@ -1181,18 +1197,18 @@
     "other": "فوق حتى"
   },
   "shopping_complete_subscription": {
-    "other": "تم شراء اشتراكك بنجاح. أنت الآن مشترك في {{ .Title }} ."
+    "other": "تم شراء اشتراكك بنجاح. أنت الآن مشترك في {{.Title}} ."
   },
   "shopping_complete_subscription_browse": {
     "other": "لا تتردد في <a href=\"/\">تصفح</a> الموقع ، أو <a href=\"/search.html\">البحث</a> عن شيء محدد."
   },
   "shopping_info_plan_offer": {
-    "one": "يجدد تلقائيا كل. {{ .Interval }}",
-    "other": "يجدد تلقائيا كل {{ .Count }} {{ .Interval }}"
+    "one": "يجدد تلقائيا كل. {{.Interval}}",
+    "other": "يجدد تلقائيا كل {{.Count}} {{.Interval}}"
   },
   "shopping_info_trial_period_offer": {
     "one": "جرب الإصدار التجريبي المجاني لمدة 24 ساعة الآن!",
-    "other": "{{ .Count }} التجريبي المجاني من {{ .Count }} day!"
+    "other": "{{.Count}} التجريبي المجاني من {{.Count}} day!"
   },
   "plans_page_header": {
     "other": "الخطط المتاحة"
@@ -1210,13 +1226,13 @@
     "other": "اقرأ أكثر"
   },
   "plan_page_header_text": {
-    "other": "استمتع {{ .Name }}"
+    "other": "استمتع {{.Name}}"
   },
   "page_plan_explore_intro": {
     "other": "أو"
   },
   "page_plan_explore_link": {
-    "other": "استكشف ممرات أخرى"
+    "other": "استكشاف المزيد"
   },
   "plan_showcase_page_ownership_button_buy": {
     "other": "اشتري الآن"
@@ -1255,9 +1271,69 @@
     "other": "الفائز"
   },
   "meta_description_expand": {
-    "other": "أظهر المزيد"
+    "other": "شاهد المزيد"
   },
   "meta_description_collapse": {
-    "other": "عرض أقل"
+    "other": "رؤية أقل"
+  },
+  "usersubscriptions_page_header": {
+    "other": "الاشتراكات والفواتير"
+  },
+  "usersubscriptions_page_content": {
+    "other": " "
+  },
+  "usersubscriptions_payment_section_title": {
+    "other": "طريقة الدفع او السداد"
+  },
+  "usersubscriptions_payment_section_content": {
+    "other": "تسري التغييرات التي تم إجراؤها على طريقة الدفع ببطاقتك الائتمانية في دورة الفوترة التالية."
+  },
+  "usersubscriptions_subscriptions_section_title": {
+    "other": "تفاصيل الاشتراك"
+  },
+  "usersubscriptions_subscriptions_section_content": {
+    "other": " "
+  },
+  "usersubscriptions_subscription_status_active": {
+    "other": "نشيط"
+  },
+  "usersubscriptions_subscription_expired": {
+    "other": "منتهية الصلاحية"
+  },
+  "usersubscriptions_no_subscriptions_section_title": {
+    "other": "اكتشف الاشتراكات"
+  },
+  "usersubscriptions_no_subscriptions_content": {
+    "other": "اكتشف محتوى رائعًا بأسعار رائعة ، ويمكن إدارته بسهولة هنا."
+  },
+  "usersubscriptions_no_subscriptions_button_title": {
+    "other": "اكتشف الاشتراكات"
+  },
+  "nav_subscriptions": {
+    "other": "اشتراكاتي"
+  },
+  "usersubscriptions_subscription_expiry_trialing": {
+    "other": "الدفعة {{.Expiry}}"
+  },
+  "usersubscriptions_subscription_expiry_active": {
+    "other": "الدفعة {{.Expiry}}"
+  },
+  "usersubscriptions_subscription_expiry_past_due": {
+    "other": "الدفع {{.Expiry}}"
+  },
+  "usersubscriptions_subscription_expiry_cancelled": {
+    "other": "{{.Expiry}}"
+  },
+  "usersubscriptions_subscription_expiry_expired": {
+    "other": "{{.Expiry}}"
+  },
+  "sponsor_image_alt": {
+    "other": "شعار الراعي"
+  },
+  "subscribe_to_watch": {
+    "other": "اشترك للمشاهدة"
+  },
+  "bundle_items_generic": {
+    "other": "{{.Count}} أغراض"
   }
 }