From 5473d83027c33285aab5142d180573c4683edfaf Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Wed, 13 May 2020 10:55:13 +0530 Subject: [PATCH 01/11] is this helpful task completed --- src/css/doc.css | 4 ++-- src/css/is-this-helpful.css | 13 ++++++++++++- src/css/main.css | 7 +++++++ src/js/06-page-rating.js | 38 +++++++++++++++++++++++-------------- src/partials/toc.hbs | 7 +++++-- 5 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/css/doc.css b/src/css/doc.css index 3cdcd916..327ef0e5 100644 --- a/src/css/doc.css +++ b/src/css/doc.css @@ -8,7 +8,7 @@ .doc h4, .doc h5, .doc h6 { - font-weight: var(--weight-medium); + font-weight: var(--weight-semibold); letter-spacing: -0.025rem; line-height: 1.2; margin: 1.5rem 0 -0.25rem; @@ -27,7 +27,7 @@ } .doc h2 { - font-size: 1.875rem; + font-size: 2rem; margin: 2.25rem 0 2.5rem; max-width: fit-content; /* NOTE used to restrict width of key line */ diff --git a/src/css/is-this-helpful.css b/src/css/is-this-helpful.css index 5efe8337..88ad9a3c 100644 --- a/src/css/is-this-helpful.css +++ b/src/css/is-this-helpful.css @@ -44,7 +44,7 @@ border-radius: 5px; border: 1px solid var(--color-brand-gray5); resize: vertical; - font-size: 1rem; + font-size: 0.875rem; color: var(--color-brand-gray4); font-family: "Source Sans Pro", sans-serif; } @@ -97,6 +97,17 @@ line-height: 1.125rem; color: var(--color-brand-blue); } +.toc .any-feedback a{ + font-size: 0.875rem; + line-height: 20px; + text-decoration: none; + color: var(--color-brand-blue); + font-weight: var(--weight-normal); + margin-bottom: 15px; + display: inline-block; + width: 100%; + +} .is-this-helpful-box .action-btn-row .info-btn { font-size: 0.75rem; diff --git a/src/css/main.css b/src/css/main.css index e0ee1bbf..76902d1f 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -117,3 +117,10 @@ main p { align-items: flex-start; } } + + +@media screen and (max-width: 767px) { + .main{ + padding-bottom: 2rem; + } +} \ No newline at end of file diff --git a/src/js/06-page-rating.js b/src/js/06-page-rating.js index 76d4d100..9baa3548 100644 --- a/src/js/06-page-rating.js +++ b/src/js/06-page-rating.js @@ -6,7 +6,7 @@ var helpNoBtn = document.getElementById('noBtn') var skipBtnMsg = document.getElementById('skipBtnMsg') var feedBackFormBox = document.getElementById('additionalFeedbackBox') - var leaveAddtinalBox = document.getElementById('leaveAddtinalBox') + var leaveAddtinalBox = document.getElementById('leaveAddtinalBox') var skipLeaveBtn = document.getElementById('skipLeaveBtn') var feedBackMsg = document.querySelector('.feed-back-msg') var submitBtn = document.querySelector('.submit-btn') @@ -14,32 +14,41 @@ var feedbackInfoBtn = document.querySelector('.info-btn') var feedbackModal = document.querySelector('.feedback-modal') var closeModalPopup = document.querySelector('.close-popup') + var anyFeedbackBtn = document.querySelector('.any-feedback-btn') // for config var yesBtnData = helpYesBtn.dataset var noBtnData = helpNoBtn.dataset helpYesBtn.addEventListener('click', function (e) { - dialogBox.style.display = 'block' + // dialogBox.style.display = 'block' this.classList.add('active') helpNoBtn.classList.remove('active') - console.log(yesBtnData, 16) + // console.log(yesBtnData, 16) }) helpNoBtn.addEventListener('click', function (e) { - dialogBox.style.display = 'block' + // dialogBox.style.display = 'block' this.classList.add('active') helpYesBtn.classList.remove('active') - console.log(noBtnData, 27) + // console.log(noBtnData, 27) }) - skipBtnMsg.addEventListener('click', function (e) { - feedBackFormBox.style.display = 'none' - leaveAddtinalBox.style.display = 'block' - }) - skipLeaveBtn.addEventListener('click', function (e) { - leaveAddtinalBox.style.display = 'none' + anyFeedbackBtn.addEventListener('click', function (e) { + e.preventDefault() + dialogBox.style.display = 'block' feedBackFormBox.style.display = 'block' + this.classList.add('active') }) + skipBtnMsg.addEventListener('click', function (e) { + + dialogBox.style.display = 'none' + feedBackMsg.value = '' + }) + // skipLeaveBtn.addEventListener('click', function (e) { + // leaveAddtinalBox.style.display = 'none' + // feedBackFormBox.style.display = 'block' + // }) + feedBackMsg.addEventListener('keyup', function (e) { var textareaValue = this.value @@ -49,9 +58,10 @@ submitBtn.classList.add('disabled') } }) - leaveYesBtn.addEventListener('click', function (e) { - leaveAddtinalBox.style.display = 'none' - }) + + // leaveYesBtn.addEventListener('click', function (e) { + // leaveAddtinalBox.style.display = 'none' + // }) feedbackInfoBtn.addEventListener('click', function (e) { feedbackModal.classList.add('show') }) diff --git a/src/partials/toc.hbs b/src/partials/toc.hbs index 0794073c..07a2b118 100644 --- a/src/partials/toc.hbs +++ b/src/partials/toc.hbs @@ -11,6 +11,9 @@ No +
+ Leave Additional Feedback? +
@@ -25,14 +28,14 @@
-
+ {{!--

Leave Additional Feedback?

Skip
-
+
--}}
From b28c41aa7668d0172a04c6b45dbe3cd1db5d8cd6 Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Wed, 13 May 2020 15:16:42 +0530 Subject: [PATCH 02/11] removing ES lint error for is this page helpful task --- src/css/is-this-helpful.css | 4 ++-- src/css/main.css | 5 ++--- src/js/06-page-rating.js | 23 +++++++++-------------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/css/is-this-helpful.css b/src/css/is-this-helpful.css index 88ad9a3c..fd7a26ba 100644 --- a/src/css/is-this-helpful.css +++ b/src/css/is-this-helpful.css @@ -97,7 +97,8 @@ line-height: 1.125rem; color: var(--color-brand-blue); } -.toc .any-feedback a{ + +.toc .any-feedback a { font-size: 0.875rem; line-height: 20px; text-decoration: none; @@ -106,7 +107,6 @@ margin-bottom: 15px; display: inline-block; width: 100%; - } .is-this-helpful-box .action-btn-row .info-btn { diff --git a/src/css/main.css b/src/css/main.css index 76902d1f..5c70ef19 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -118,9 +118,8 @@ main p { } } - @media screen and (max-width: 767px) { - .main{ + .main { padding-bottom: 2rem; } -} \ No newline at end of file +} diff --git a/src/js/06-page-rating.js b/src/js/06-page-rating.js index 9baa3548..0b32045d 100644 --- a/src/js/06-page-rating.js +++ b/src/js/06-page-rating.js @@ -1,16 +1,16 @@ -;(function () { +; +(function () { 'use strict' - var dialogBox = document.getElementById('dialogBox') var helpYesBtn = document.getElementById('yesBtn') var helpNoBtn = document.getElementById('noBtn') var skipBtnMsg = document.getElementById('skipBtnMsg') var feedBackFormBox = document.getElementById('additionalFeedbackBox') - var leaveAddtinalBox = document.getElementById('leaveAddtinalBox') - var skipLeaveBtn = document.getElementById('skipLeaveBtn') + // var leaveAddtinalBox = document.getElementById('leaveAddtinalBox') + // var skipLeaveBtn = document.getElementById('skipLeaveBtn') var feedBackMsg = document.querySelector('.feed-back-msg') var submitBtn = document.querySelector('.submit-btn') - var leaveYesBtn = document.querySelector('.yes-btn') + // var leaveYesBtn = document.querySelector('.yes-btn') var feedbackInfoBtn = document.querySelector('.info-btn') var feedbackModal = document.querySelector('.feedback-modal') var closeModalPopup = document.querySelector('.close-popup') @@ -20,16 +20,16 @@ var noBtnData = helpNoBtn.dataset helpYesBtn.addEventListener('click', function (e) { - // dialogBox.style.display = 'block' + // dialogBox.style.display = 'block' this.classList.add('active') helpNoBtn.classList.remove('active') - // console.log(yesBtnData, 16) + console.log(yesBtnData, 16) }) helpNoBtn.addEventListener('click', function (e) { - // dialogBox.style.display = 'block' + // dialogBox.style.display = 'block' this.classList.add('active') helpYesBtn.classList.remove('active') - // console.log(noBtnData, 27) + console.log(noBtnData, 27) }) anyFeedbackBtn.addEventListener('click', function (e) { @@ -40,7 +40,6 @@ }) skipBtnMsg.addEventListener('click', function (e) { - dialogBox.style.display = 'none' feedBackMsg.value = '' }) @@ -58,10 +57,6 @@ submitBtn.classList.add('disabled') } }) - - // leaveYesBtn.addEventListener('click', function (e) { - // leaveAddtinalBox.style.display = 'none' - // }) feedbackInfoBtn.addEventListener('click', function (e) { feedbackModal.classList.add('show') }) From d785c8bcece50e2404b2fe35ff99f1fe38ecfe58 Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Thu, 14 May 2020 17:56:00 +0530 Subject: [PATCH 03/11] landing page core-concept UI fixes --- src/css/landing-page.css | 56 +++++-- src/partials/body-landing-core-concept.hbs | 96 ++++++++++-- src/partials/body-landing-sdk.hbs | 168 +++++++++++++++++++++ 3 files changed, 292 insertions(+), 28 deletions(-) create mode 100644 src/partials/body-landing-sdk.hbs diff --git a/src/css/landing-page.css b/src/css/landing-page.css index 20f3e0a8..629fadc5 100644 --- a/src/css/landing-page.css +++ b/src/css/landing-page.css @@ -3,7 +3,9 @@ .doc.landing-page-doc h1 { color: var(--color-brand-gray1); font-size: 2.5rem; + line-height: ; font-weight: var(--weight-semibold); + margin-bottom: 15px; } .doc.landing-page-doc p { @@ -16,25 +18,25 @@ flex-direction: row; justify-content: flex-start; flex-wrap: wrap; - margin-bottom: 30px; + margin-bottom: 0; } .doc.landing-page-doc .sub-heading { - margin-bottom: 30px; + margin-bottom: 15px; width: 100%; } .card-row .column { max-width: 48%; - /* flex-basis: 48%; */ - margin-bottom: 35px; + flex-basis: 48%; + margin-bottom: 25px; } .card-row.three-column-row .column { flex-basis: 25%; } -.card-row .column + .column { +.card-row .three-column-row + .column { padding-left: 5%; } @@ -45,7 +47,7 @@ .doc.landing-page-doc h3 { font-size: 1.5rem; line-height: 130%; - color: var(--color-brand-gray4); + color: var(--color-brand-black); margin: 0; } @@ -55,15 +57,20 @@ .doc.landing-page-doc .media-left { margin-left: 30px; + width: 100px; + margin-top: 0; } +.doc.landing-page-doc .paragraph{ + margin-top: 0; +} .doc.landing-page-doc img { max-width: 100%; } .doc.landing-page-doc ul { padding: 0; - margin-top: 30px; + /* margin-top: 30px; */ } .doc.landing-page-doc ul li { @@ -88,10 +95,9 @@ margin-bottom: 15px; } -.doc.landing-page-doc h4 { - font-size: 1.125rem; +.doc.landing-page-doc h3 { margin: 0; - color: var(--color-brand-gray4); + color: var(--color-brand-black); } .doc.landing-page-doc h2 { @@ -102,18 +108,41 @@ content: none; } +.card-row .column .content{ + margin-bottom: 10px; + display: inline-block; + width: 100%; +} + +.card-row.two-column-row .column:nth-child(even) { + padding-left: 5%; +} + +iframe{ + width: 100%; + height: 315px; +} + /* Responsive CSS */ +@media screen and (max-width: 1169px) { + .card-row.three-column-row .column{ + flex-basis: 33%; + } +} + @media screen and (max-width: 767px) { .card-row .column, .card-row.three-column-row .column { flex-basis: 100%; max-width: 100%; } - - .card-row { + .card-row .column{ margin-bottom: 15px; } + .card-row { + margin-bottom: 0; + } .doc.landing-page-doc .media-left { margin-left: 0; @@ -130,4 +159,7 @@ .card-row.border-column-row .column + .column { border-left: 0; } + .card-row.two-column-row .column:nth-child(even){ + padding-left: 0; + } } diff --git a/src/partials/body-landing-core-concept.hbs b/src/partials/body-landing-core-concept.hbs index dd0ded93..86434fee 100644 --- a/src/partials/body-landing-core-concept.hbs +++ b/src/partials/body-landing-core-concept.hbs @@ -22,36 +22,36 @@

Install and Deploy

-
+
-

Before You Begin

+

Before You Begin

-

Installation

+

Installation

-

Deployment

+

Deployment

@@ -60,41 +60,105 @@

Learn

-
+
-

Data

+

Data

-

Buckets and Storage

+

Buckets and Storage

-

Security

+

Security

- + + +
+

Lorem ipsum

+
+ +
+
+
+

Lorem ipsum

+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, + sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, + sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, + no sea takimata sanctus est Lorem +

+
+ Lorem ipsum +
+
+
+

Lorem ipsum

+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, + sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, + sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, + no sea takimata sanctus est Lorem +

+
+ Lorem ipsum +
+
+
+

Lorem ipsum

+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, + sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, + sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, + no sea takimata sanctus est Lorem +

+
+ Lorem ipsum +
+
+
+

Lorem ipsum

+
+
+ +
+ Lorem ipsum +
+ +
+ diff --git a/src/partials/body-landing-sdk.hbs b/src/partials/body-landing-sdk.hbs new file mode 100644 index 00000000..86434fee --- /dev/null +++ b/src/partials/body-landing-sdk.hbs @@ -0,0 +1,168 @@ +
+
+
+

Core Concepts

+
+
+
+

+ Couchbase Server is an open source, distributed, NoSQL document-oriented engagement database. + It exposes a fast key-value store with managed cache for sub-millisecond data operations, + purpose-built indexers for fast queries and a powerful query engine for executing SQL-like queries. +

+
+
+
+
+ +
+
+
+ +
+

Install and Deploy

+
+
+
+
+

Before You Begin

+
+ +
+
+
+

Installation

+
+ +
+
+
+

Deployment

+
+ +
+
+ +
+

Learn

+
+ +
+
+
+

Data

+
+ +
+
+
+

Buckets and Storage

+
+ +
+
+
+

Security

+
+ +
+
+ + +
+

Lorem ipsum

+
+ +
+
+
+

Lorem ipsum

+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, + sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, + sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, + no sea takimata sanctus est Lorem +

+
+ Lorem ipsum +
+
+
+

Lorem ipsum

+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, + sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, + sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, + no sea takimata sanctus est Lorem +

+
+ Lorem ipsum +
+
+
+

Lorem ipsum

+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, + sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, + sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, + no sea takimata sanctus est Lorem +

+
+ Lorem ipsum +
+
+
+

Lorem ipsum

+
+
+ +
+ Lorem ipsum +
+ +
+ + + + + +
+
+
From 2803bb885d82f46311473cb1f73cbdd6cec528fd Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Thu, 14 May 2020 19:29:18 +0530 Subject: [PATCH 04/11] SDK landing page added --- preview-src/landing-page-sdk.adoc | 4 + src/css/body.css | 8 + src/css/landing-page.css | 6 +- src/layouts/landing-page-sdk.hbs | 13 ++ src/partials/body-landing-core-concept.hbs | 6 +- src/partials/body-landing-sdk.hbs | 173 ++++++++------------- 6 files changed, 101 insertions(+), 109 deletions(-) create mode 100644 preview-src/landing-page-sdk.adoc create mode 100644 src/layouts/landing-page-sdk.hbs diff --git a/preview-src/landing-page-sdk.adoc b/preview-src/landing-page-sdk.adoc new file mode 100644 index 00000000..99d698fd --- /dev/null +++ b/preview-src/landing-page-sdk.adoc @@ -0,0 +1,4 @@ += Couchbase Tutorials +:page-layout: landing-page-sdk +:page-role: tiles +:!sectids: \ No newline at end of file diff --git a/src/css/body.css b/src/css/body.css index 88058829..1c04bceb 100644 --- a/src/css/body.css +++ b/src/css/body.css @@ -55,3 +55,11 @@ aside.toc.sidebar { display: block; } } + + +@media screen and (max-width:767px){ + + div.body{ + margin-top: 5rem; + } +} \ No newline at end of file diff --git a/src/css/landing-page.css b/src/css/landing-page.css index 629fadc5..d9589f4e 100644 --- a/src/css/landing-page.css +++ b/src/css/landing-page.css @@ -20,9 +20,13 @@ flex-wrap: wrap; margin-bottom: 0; } +.doc.landing-page-doc .heading { + margin-bottom: 16px; + width: 100%; +} .doc.landing-page-doc .sub-heading { - margin-bottom: 15px; + margin-bottom: 8px; width: 100%; } diff --git a/src/layouts/landing-page-sdk.hbs b/src/layouts/landing-page-sdk.hbs new file mode 100644 index 00000000..df716414 --- /dev/null +++ b/src/layouts/landing-page-sdk.hbs @@ -0,0 +1,13 @@ + + + +{{> head-first}} + {{{detag (or page.title 'landing page')}}}{{#if site.title}} | {{{site.title}}}{{/if}} +{{> head-last}} + + +{{> header}} +{{> body-landing-sdk}} +{{> footer}} + + diff --git a/src/partials/body-landing-core-concept.hbs b/src/partials/body-landing-core-concept.hbs index 86434fee..29bd5672 100644 --- a/src/partials/body-landing-core-concept.hbs +++ b/src/partials/body-landing-core-concept.hbs @@ -19,7 +19,7 @@
-
+

Install and Deploy

@@ -56,7 +56,7 @@
-
+

Learn

@@ -96,7 +96,7 @@
-
+

Lorem ipsum

diff --git a/src/partials/body-landing-sdk.hbs b/src/partials/body-landing-sdk.hbs index 86434fee..9614cdf7 100644 --- a/src/partials/body-landing-sdk.hbs +++ b/src/partials/body-landing-sdk.hbs @@ -1,14 +1,14 @@
-

Core Concepts

+

SDK

- Couchbase Server is an open source, distributed, NoSQL document-oriented engagement database. - It exposes a fast key-value store with managed cache for sub-millisecond data operations, - purpose-built indexers for fast queries and a powerful query engine for executing SQL-like queries. + + The Couchbase SDK allows applications to access a Couchbase cluster. It offers traditional synchronous APIs as well as scalable asynchronous APIs to maximize performance. +

@@ -19,144 +19,107 @@
-
-

Install and Deploy

-
-
-
-
-

Before You Begin

-
- -
-
-
-

Installation

-
- -
-
-
-

Deployment

-
- -
-
- -
-

Learn

-
- -
-
-
-

Data

-
- +
+

Languages

-
-
-

Buckets and Storage

-
- -
-
-
-

Security

-
-
    -
  • Authentication
    • -
  • Authorization
    • -
  • Encryption
    • +
    +
    +
    +

    C SDK

    +
    +
    +

    + The Couchbase C SDK (libcouchbase) enables C and C++ programs to access a Couchbase Server cluster. The C SDK is also commonly used as a core dependency of SDKs written in other language to provide a common implementation and high performance. +

    +
    + Start Using the Go SDK +
    -
-
-
+
+
+

.NET SDK

+
+
+

+The .NET SDK enables you to interact with a Couchbase Server cluster from the .NET Framework using any Common Language Runtime (CLR) language, including C#, F#, and VB.NET. It offers both a traditional synchronous API and an asynchronous API based on the Task-based Asynchronous Pattern (TAP). +

+
+ Start Using the .NET SDK +
-
-

Lorem ipsum

-
+
+
+

Go SDK

+
+
+

+ The Couchbase Go SDK allows you to connect to a Couchbase Server cluster from Go. The Go SDK is a native Go library and uses the high-performance gocbcore to handle communicating to the cluster over Couchbase’s binary protocols. +

+
+ Start Using the Go SDK +
-
-

Lorem ipsum

+

Java SDK

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, - sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, - sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. - Stet clita kasd gubergren, - no sea takimata sanctus est Lorem + The Java SDK allows Java applications to access a Couchbase Server cluster. The Java SDK offers traditional synchronous APIs as well as scalable asynchronous APIs to maximize performance.

- Lorem ipsum + Start Using the Java SDK
-

Lorem ipsum

+

Node.js SDK

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, - sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, - sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. - Stet clita kasd gubergren, - no sea takimata sanctus est Lorem + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem.

- Lorem ipsum + Start Using the Node.js SDK
-

Lorem ipsum

+

PHP SDK

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, - sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, - sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. - Stet clita kasd gubergren, - no sea takimata sanctus est Lorem + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet

- Lorem ipsum + Start Using the PHP SDK
-

Lorem ipsum

+

Python SDK

+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet +

+
+ Start Using the Python SDK +
+
+
+

Scala SDK

- +

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet +

- Lorem ipsum + Start Using the Scala SDK
+ + +
From e34dfd097e4f7b4d5bc553012c0a1b9db7ddf4f4 Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Fri, 15 May 2020 20:10:03 +0530 Subject: [PATCH 05/11] Tutorials landing page UI fixes for desktop view --- preview-src/landing-page-core-concept.adoc | 2 +- preview-src/landing-page-sdk.adoc | 2 +- preview-src/landing-page-tutorials.adoc | 4 + preview-src/landing-page.adoc | 2 +- src/css/body.css | 11 +- src/css/landing-page.css | 279 ++++++++++++- src/css/main.css | 5 + src/css/site.css | 1 + src/css/vars.css | 9 +- .../landing-page-icon/Intermediate-icon.svg | 1 + src/img/landing-page-icon/advanced-icon.svg | 1 + src/img/landing-page-icon/beginner-icon.svg | 1 + .../landing-page-icon/book-reader-icon.svg | 1 + src/img/landing-page-icon/clear-icon.svg | 1 + src/img/landing-page-icon/sdk-icon.svg | 1 + src/layouts/landing-page-tutorials.hbs | 16 + src/partials/body-landing-sdk.hbs | 2 +- src/partials/body-landing-tutorials.hbs | 371 ++++++++++++++++++ src/partials/body-tutorials.hbs | 2 +- src/partials/tutorials-filter.hbs | 34 ++ 20 files changed, 716 insertions(+), 30 deletions(-) create mode 100644 preview-src/landing-page-tutorials.adoc create mode 100644 src/img/landing-page-icon/Intermediate-icon.svg create mode 100644 src/img/landing-page-icon/advanced-icon.svg create mode 100644 src/img/landing-page-icon/beginner-icon.svg create mode 100644 src/img/landing-page-icon/book-reader-icon.svg create mode 100644 src/img/landing-page-icon/clear-icon.svg create mode 100644 src/img/landing-page-icon/sdk-icon.svg create mode 100644 src/layouts/landing-page-tutorials.hbs create mode 100644 src/partials/body-landing-tutorials.hbs create mode 100644 src/partials/tutorials-filter.hbs diff --git a/preview-src/landing-page-core-concept.adoc b/preview-src/landing-page-core-concept.adoc index 9aa7b1fe..961f5632 100644 --- a/preview-src/landing-page-core-concept.adoc +++ b/preview-src/landing-page-core-concept.adoc @@ -1,4 +1,4 @@ -= Couchbase Tutorials += Couchbase Core Concept :page-layout: landing-page-core-concept :page-role: tiles :!sectids: \ No newline at end of file diff --git a/preview-src/landing-page-sdk.adoc b/preview-src/landing-page-sdk.adoc index 99d698fd..d8a04df2 100644 --- a/preview-src/landing-page-sdk.adoc +++ b/preview-src/landing-page-sdk.adoc @@ -1,4 +1,4 @@ -= Couchbase Tutorials += Couchbase SDK :page-layout: landing-page-sdk :page-role: tiles :!sectids: \ No newline at end of file diff --git a/preview-src/landing-page-tutorials.adoc b/preview-src/landing-page-tutorials.adoc new file mode 100644 index 00000000..72d6c2ec --- /dev/null +++ b/preview-src/landing-page-tutorials.adoc @@ -0,0 +1,4 @@ += Couchbase Tutorials +:page-layout: landing-page-tutorials +:page-role: tiles +:!sectids: \ No newline at end of file diff --git a/preview-src/landing-page.adoc b/preview-src/landing-page.adoc index 65c2775c..2f89c1d8 100644 --- a/preview-src/landing-page.adoc +++ b/preview-src/landing-page.adoc @@ -1,4 +1,4 @@ -= Couchbase Tutorials += Couchbase Adoc :page-layout: landing-page :page-role: tiles :!sectids: \ No newline at end of file diff --git a/src/css/body.css b/src/css/body.css index 1c04bceb..88de87fe 100644 --- a/src/css/body.css +++ b/src/css/body.css @@ -3,7 +3,8 @@ div.body { display: flex; margin-top: var(--height-to-body); /* overflow-wrap: break-word; */ - word-wrap: break-word; /* IE only supports word-wrap, which is an alias of overflow-wrap */ + word-wrap: break-word; + /* IE only supports word-wrap, which is an alias of overflow-wrap */ } /* A selector that could possibly be re-used */ @@ -56,10 +57,8 @@ aside.toc.sidebar { } } - -@media screen and (max-width:767px){ - - div.body{ +@media screen and (max-width: 767px) { + div.body { margin-top: 5rem; } -} \ No newline at end of file +} diff --git a/src/css/landing-page.css b/src/css/landing-page.css index d9589f4e..ee239a0e 100644 --- a/src/css/landing-page.css +++ b/src/css/landing-page.css @@ -3,14 +3,18 @@ .doc.landing-page-doc h1 { color: var(--color-brand-gray1); font-size: 2.5rem; - line-height: ; font-weight: var(--weight-semibold); margin-bottom: 15px; } +.doc.landing-page-doc .text-color-brand-blue { + color: var(--color-brand-blue); +} + .doc.landing-page-doc p { font-size: 1rem; - color: var(--color-brand-gray1); + color: var(--color-brand-black); + font-family: "Open Sans", sans-serif; } .card-row { @@ -20,6 +24,7 @@ flex-wrap: wrap; margin-bottom: 0; } + .doc.landing-page-doc .heading { margin-bottom: 16px; width: 100%; @@ -30,6 +35,34 @@ width: 100%; } +.doc.landing-page-doc .sub-heading.two-column-heading { + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: wrap; +} + +.doc.landing-page-doc .filter-info h5 { + display: inline-block; + margin-right: 16px; + margin-top: 0; + font-weight: var(--weight-normal); + font-family: "Open Sans", sans-serif; + color: var(--color-brand-black); +} + +.doc.landing-page-doc .filter-info h5 .fas, +.doc.landing-page-doc .filter-info h5 img { + margin-right: 8px; +} + +.doc.landing-page-doc .filter-info span { + color: var(--color-brand-light-blue); + border-radius: 8px; + border: 1px solid var(--color-brand-light-blue); + padding: 6px 10px; +} + .card-row .column { max-width: 48%; flex-basis: 48%; @@ -55,19 +88,42 @@ margin: 0; } +.doc.landing-page-doc .text-color-brand-blue-secondary { + color: var(--color-brand-blue-secondary); +} + +.doc.landing-page-doc .other-info-list { + display: flex; + flex-wrap: wrap; +} + +.doc.landing-page-doc .other-info-list .box { + padding-right: 40px; +} + +.doc.landing-page-doc .other-info-list .box:last-child { + padding-right: 0; +} + +.doc.landing-page-doc .box h5 { + margin: 0 0 8px; + font-family: "Open Sans", sans-serif; +} + .doc.landing-page-doc figure { margin-bottom: 0; } .doc.landing-page-doc .media-left { - margin-left: 30px; + margin-left: 40px; width: 100px; margin-top: 0; } -.doc.landing-page-doc .paragraph{ +.doc.landing-page-doc .paragraph { margin-top: 0; } + .doc.landing-page-doc img { max-width: 100%; } @@ -81,6 +137,8 @@ list-style: none; margin-bottom: 8px; font-size: 1rem; + font-family: "Open Sans", sans-serif; + color: var(--color-brand-black); } .doc.landing-page-doc ul li a { @@ -99,40 +157,221 @@ margin-bottom: 15px; } -.doc.landing-page-doc h3 { - margin: 0; - color: var(--color-brand-black); -} - .doc.landing-page-doc h2 { margin: 0; + color: var(--color-brand-black); } .doc.landing-page-doc h2::after { content: none; } -.card-row .column .content{ - margin-bottom: 10px; +.card-row .column .content { + margin-bottom: 16px; display: inline-block; width: 100%; } +.card-row .column .content p { + text-align: justify; +} + +.card-row.two-column-row .column:nth-child(odd) { + padding-right: 40px; +} + .card-row.two-column-row .column:nth-child(even) { - padding-left: 5%; + padding-left: 40px; } -iframe{ +/* .card-row.two-column-row .column:nth-child(even) { + padding-left: 5%; +} */ + +.doc.landing-page-doc iframe { width: 100%; height: 315px; } +/* CSS for nav filter */ +.nav.tutorials-filter .nav-menu { + top: calc(0.91rem + var(--height-navbar)); + padding: 20px; + background: var(--color-brand-gray7); +} + +.nav.tutorials-filter .heading { + display: flex; + justify-content: space-between; + align-items: center; +} + +.nav.tutorials-filter .heading h3 { + margin: 0; +} + +.nav.tutorials-filter .heading a { + text-decoration: none; +} + +.nav.tutorials-filter .heading img { + margin-left: 8px; +} + +.nav.tutorials-filter ul.nav-list { + padding-left: 30px; +} + +.nav.tutorials-filter ul li { + margin-bottom: 16px; +} + +.nav.tutorials-filter ul li a { + font-size: 1rem; + line-height: 22px; + color: var(--color-brand-black); + font-family: "Open Sans", sans-serif; + display: flex; + align-items: center; + text-decoration: none; +} + +.nav.tutorials-filter ul li a:hover { + color: var(--color-brand-blue); +} + +.nav.tutorials-filter .arrow { + display: inline-block; + margin-right: 16px; +} + +.nav.tutorials-filter .arrow-down { + width: 0; + height: 0; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + border-top: 8px solid var(--color-brand-gray5); +} + +.nav.tutorials-filter .arrow-right { + display: inline-block; + width: 0; + height: 0; + border-top: 8px solid transparent; + border-bottom: 8px solid transparent; + border-left: 8px solid var(--color-brand-gray5); +} + +.nav.tutorials-filter .sub-menu { + margin-top: 20px; + padding-left: 28px; +} + +.nav.tutorials-filter .sub-menu li { + list-style: none; +} + +/* checkbox css */ + +/* Base for label styling */ +.nav.tutorials-filter [type="checkbox"]:not(:checked), +.nav.tutorials-filter [type="checkbox"]:checked { + position: absolute; + left: -9999px; +} + +.nav.tutorials-filter [type="checkbox"]:not(:checked) + label, +.nav.tutorials-filter [type="checkbox"]:checked + label { + position: relative; + padding-left: 1.95em; + cursor: pointer; +} + +/* checkbox aspect */ +.nav.tutorials-filter [type="checkbox"]:not(:checked) + label::before, +.nav.tutorials-filter [type="checkbox"]:checked + label::before { + content: ""; + position: absolute; + left: 0; + top: 0; + width: 1.15em; + height: 1.15em; + border: 0.5px solid #707070; + background: #fff; + border-radius: 2px; +} +/* checked mark aspect */ +.nav.tutorials-filter [type="checkbox"]:not(:checked) + label::after, +.nav.tutorials-filter [type="checkbox"]:checked + label::after { + content: "\2713\0020"; + position: absolute; + top: 4px; + left: 4px; + font-size: 0.875rem; + line-height: 0.8; + color: var(--color-brand-blue); + transition: all 0.2s; +} +/* checked mark aspect changes */ +.nav.tutorials-filter [type="checkbox"]:not(:checked) + label::after { + opacity: 0; + transform: scale(0); +} + +.nav.tutorials-filter [type="checkbox"]:checked + label::after { + opacity: 1; + transform: scale(1); +} +/* disabled checkbox */ +.nav.tutorials-filter [type="checkbox"]:disabled:not(:checked) + label::before, +.nav.tutorials-filter [type="checkbox"]:disabled:checked + label::before { + box-shadow: none; + border-color: #bbb; + background-color: #ddd; +} + +.nav.tutorials-filter [type="checkbox"]:disabled:checked + label::after { + color: #999; +} + +.nav.tutorials-filter [type="checkbox"]:disabled + label { + color: #aaa; +} +/* accessibility */ +/* .nav.tutorials-filter [type="checkbox"]:checked:focus + label:before, +.nav.tutorials-filter [type="checkbox"]:not(:checked):focus + label:before { + border: 2px solid var(--color-brand-blue); +} */ + +/* hover style just for information */ +.nav.tutorials-filter label:hover::before { + border: 2px solid var(--color-brand-blue); + outline: none; +} + +.nav.tutorials-filter label, +.nav.tutorials-filter label:focus, +.nav.tutorials-filter label:active, +.nav.tutorials-filter label::before, +.nav.tutorials-filter label::after { + outline: none; + outline-width: 0; +} + /* Responsive CSS */ @media screen and (max-width: 1169px) { - .card-row.three-column-row .column{ + .card-row.three-column-row .column { flex-basis: 33%; } + + .nav.tutorials-filter { + width: 16rem; + } + + .doc.landing-page-doc .sub-heading.two-column-heading .filter-info { + margin-top: 15px; + } } @media screen and (max-width: 767px) { @@ -141,9 +380,11 @@ iframe{ flex-basis: 100%; max-width: 100%; } - .card-row .column{ + + .card-row .column { margin-bottom: 15px; } + .card-row { margin-bottom: 0; } @@ -163,7 +404,13 @@ iframe{ .card-row.border-column-row .column + .column { border-left: 0; } - .card-row.two-column-row .column:nth-child(even){ + + .card-row.two-column-row .column:nth-child(even) { padding-left: 0; } + + .card-row.two-column-row .column:nth-child(odd), + .card-row.two-column-row .column:nth-child(even) { + padding: 0; + } } diff --git a/src/css/main.css b/src/css/main.css index 5c70ef19..a240668a 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -97,6 +97,11 @@ main p { min-width: 0; } +/* color css */ +.text-color-brand-blue { + color: var(--color-brand-blue); +} + @media screen and (min-width: 769px) { main.article { padding-right: var(--width-main-gutter); diff --git a/src/css/site.css b/src/css/site.css index 286d8a0f..e181dd63 100644 --- a/src/css/site.css +++ b/src/css/site.css @@ -1,4 +1,5 @@ @import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700&display=swap"); +@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400;600;700&display=swap'); @import "common.css"; @import "typeface-gotham.css"; @import "typeface-roboto-mono.css"; diff --git a/src/css/vars.css b/src/css/vars.css index 748a273d..d3221689 100644 --- a/src/css/vars.css +++ b/src/css/vars.css @@ -30,7 +30,7 @@ --color-brand-gray7: #f9f9f9; /* --color-brand-silver: #ccc; */ --color-brand-silver: #c1c1c1; - /* --color-brand-blue: #0074e0; */ + --color-brand-blue-secondary: #0074e0; --color-brand-blue-tint: #d9eafb; --color-brand-orange: #fc9c0c; --color-brand-orange-tint: #fff0da; @@ -46,12 +46,13 @@ --color-navbar-text: var(--color-brand-white); --color-footer-bg: var(--color-brand-black); --color-footer-text: var(--color-brand-white); - --height-spacer: 1.3rem; + /* --height-navbar: 4rem; */ + --height-spacer: 1.3rem; --height-navbar: 6.09rem; --height-to-body: calc(var(--height-navbar) + var(--height-spacer)); --height-min-body: calc(100vh - var(--height-to-body)); - --height-nav: calc(var(--height-min-body) - var(--height-spacer)); + --height-nav: calc(var(--height-min-body) + var(--height-spacer)); --labels-font-size: 0.75rem; --labels-line-height: 1; /* --width-main-gutter: 1.5rem; */ @@ -61,11 +62,13 @@ --width-container-gutter: 1.25rem; --width-nav: 20rem; --width-toc: 12rem; + /* Font weight */ --weight-light: 300; --weight-normal: 400; --weight-medium: 500; --weight-semibold: 600; --weight-bold: 700; + /* Z-index */ --z-index-feedback: 7; --z-index-nav-mobile: 6; --z-index-navbar-dropdown-link: 5; diff --git a/src/img/landing-page-icon/Intermediate-icon.svg b/src/img/landing-page-icon/Intermediate-icon.svg new file mode 100644 index 00000000..304bd102 --- /dev/null +++ b/src/img/landing-page-icon/Intermediate-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/img/landing-page-icon/advanced-icon.svg b/src/img/landing-page-icon/advanced-icon.svg new file mode 100644 index 00000000..be5bac03 --- /dev/null +++ b/src/img/landing-page-icon/advanced-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/img/landing-page-icon/beginner-icon.svg b/src/img/landing-page-icon/beginner-icon.svg new file mode 100644 index 00000000..903bf145 --- /dev/null +++ b/src/img/landing-page-icon/beginner-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/img/landing-page-icon/book-reader-icon.svg b/src/img/landing-page-icon/book-reader-icon.svg new file mode 100644 index 00000000..8323fbe8 --- /dev/null +++ b/src/img/landing-page-icon/book-reader-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/img/landing-page-icon/clear-icon.svg b/src/img/landing-page-icon/clear-icon.svg new file mode 100644 index 00000000..f9fe0e69 --- /dev/null +++ b/src/img/landing-page-icon/clear-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/img/landing-page-icon/sdk-icon.svg b/src/img/landing-page-icon/sdk-icon.svg new file mode 100644 index 00000000..c515c8ea --- /dev/null +++ b/src/img/landing-page-icon/sdk-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/layouts/landing-page-tutorials.hbs b/src/layouts/landing-page-tutorials.hbs new file mode 100644 index 00000000..2e78452c --- /dev/null +++ b/src/layouts/landing-page-tutorials.hbs @@ -0,0 +1,16 @@ + + + +{{> head-first}} + {{{detag (or page.title 'landing page')}}}{{#if site.title}} | {{{site.title}}}{{/if}} +{{> head-last}} + + + {{> header}} +
+ {{> tutorials-filter}} + {{> body-landing-tutorials}} +
+ {{> footer}} + + diff --git a/src/partials/body-landing-sdk.hbs b/src/partials/body-landing-sdk.hbs index 9614cdf7..c7717fe3 100644 --- a/src/partials/body-landing-sdk.hbs +++ b/src/partials/body-landing-sdk.hbs @@ -14,7 +14,7 @@
- +
diff --git a/src/partials/body-landing-tutorials.hbs b/src/partials/body-landing-tutorials.hbs new file mode 100644 index 00000000..cce45b08 --- /dev/null +++ b/src/partials/body-landing-tutorials.hbs @@ -0,0 +1,371 @@ + +
+
+

Couchbase Tutorials

+
+
+
+

+ + The Couchbase SDK allows applications to access a Couchbase cluster. It offers traditional synchronous APIs as well as scalable asynchronous APIs to maximize performance. + +

+
+
+
+
+ +
+
+
+ +
+

Tutorials

+
+ +
+
+
+

Lorem ipsum

+
+
+ {{!-- --}} + + Advanced
+ Developer +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+
+
+

Lorem ipsum

+
+
Intermediate
+ DevOps +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • + +
+
+
+
+
+
+

Lorem ipsum

+
+
Intermediate
+ Developer +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • + +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • + +
+
+
+
+
+
+

Lorem ipsum

+
+
Beginner
+ Architect +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+
+
+

Lorem ipsum

+
+
Intermediate
+ Developer +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • + +
+
+
+
+
+
+

Lorem ipsum

+
+
Advanced
+ Architect +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ +
+ + + + + +
+
diff --git a/src/partials/body-tutorials.hbs b/src/partials/body-tutorials.hbs index 2cfd3403..03f481fd 100644 --- a/src/partials/body-tutorials.hbs +++ b/src/partials/body-tutorials.hbs @@ -31,7 +31,7 @@
-{{{page.contents}}} + {{{page.contents}}}
diff --git a/src/partials/tutorials-filter.hbs b/src/partials/tutorials-filter.hbs new file mode 100644 index 00000000..e0102780 --- /dev/null +++ b/src/partials/tutorials-filter.hbs @@ -0,0 +1,34 @@ + \ No newline at end of file From 2398a36d911720d4042b405694234c8861bff40a Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Mon, 18 May 2020 23:54:34 +0530 Subject: [PATCH 06/11] Asci Doc implement for tutorials page --- package.json | 3 +- preview-src/landing-page-tutorials.adoc | 251 +++++++++++- src/css/is-this-helpful.css | 6 +- src/css/landing-page.css | 13 +- src/js/01-nav.js | 36 +- src/js/06-page-rating.js | 87 ++-- ...e-responsive.js => 09-table-responsive.js} | 0 src/js/10-landing-page-nav.js | 31 ++ src/partials/body-landing-tutorials.hbs | 353 +---------------- src/partials/body-landing-tutorials_copy.hbs | 370 ++++++++++++++++++ src/partials/toc.hbs | 14 +- src/partials/tutorials-filter.hbs | 16 +- 12 files changed, 756 insertions(+), 424 deletions(-) rename src/js/{08-table-responsive.js => 09-table-responsive.js} (100%) create mode 100644 src/js/10-landing-page-nav.js create mode 100644 src/partials/body-landing-tutorials_copy.hbs diff --git a/package.json b/package.json index f399a1f0..8f9452f6 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,6 @@ "typeface-roboto-mono": "0.0.54", "vinyl-buffer": "~1.0", "vinyl-fs": "~3.0" - } + }, + "dependencies": {} } diff --git a/preview-src/landing-page-tutorials.adoc b/preview-src/landing-page-tutorials.adoc index 72d6c2ec..9f126ac5 100644 --- a/preview-src/landing-page-tutorials.adoc +++ b/preview-src/landing-page-tutorials.adoc @@ -1,4 +1,253 @@ = Couchbase Tutorials :page-layout: landing-page-tutorials :page-role: tiles -:!sectids: \ No newline at end of file +:!sectids: + + +[.column] +====== {empty} +++++ +
+

Lorem ipsum

+
+
+ + Advanced
+ Developer +
+
+++++ +[.content] + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligula imperdiet, et cursus lectus bibendum. Etiam metus magna, dapibus vitae ipsum vel, sollicitudin interdum metus. Phasellus quis rutrum enim. Vivamus euismod sem nec posuere accumsan. Praesent elementum lectus vitae magna pellentesque, a facilisis risus pulvinar. Donec scelerisque porttitor aliquet. + +++++ +
+++++ + +[.box] + +* xref:#[Lorem ipsum] +* xref:#[Lorem ipsum] +* xref:#[Lorem ipsum] + +[.box] +.Component +* Lorem ipsum +* Lorem ipsum +* Lorem ipsum + +[.box] +.Languages +* Lorem ipsum +* Lorem ipsum +* Lorem ipsum + +++++ +
+++++ + + + +[.column] +====== {empty} +++++ +
+

Lorem ipsum

+
+
+ + Intermediate
+ DevOps +
+
+++++ +[.content] + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligula imperdiet, et cursus lectus bibendum. Etiam metus magna, dapibus vitae ipsum vel, sollicitudin interdum metus. Phasellus quis rutrum enim. Vivamus euismod sem nec posuere accumsan. Praesent elementum lectus vitae magna pellentesque, a facilisis risus pulvinar. Donec scelerisque porttitor aliquet. + +++++ +
+++++ + +[.box] + +* xref:#[Lorem ipsum] +* xref:#[Lorem ipsum] + + +[.box] +.Component +* Lorem ipsum +* Lorem ipsum +* Lorem ipsum + +[.box] +.Languages +* Lorem ipsum + +++++ +
+++++ + +[.column] +====== {empty} +++++ +
+

Lorem ipsum

+
+
+ + Intermediate
+ Developer +
+
+++++ +[.content] + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligula imperdiet, et cursus lectus bibendum. Etiam metus magna, dapibus vitae ipsum vel, sollicitudin interdum metus. Phasellus quis rutrum enim. Vivamus euismod sem nec posuere accumsan. Praesent elementum lectus vitae magna pellentesque, a facilisis risus pulvinar. Donec scelerisque porttitor aliquet. + +++++ +
+++++ + +[.box] + +* xref:#[Lorem ipsum] +* xref:#[Lorem ipsum] + + +[.box] +.Component +* Lorem ipsum +* Lorem ipsum + +[.box] +.Languages +* Lorem ipsum + +++++ +
+++++ + +[.column] +====== {empty} +++++ +
+

Lorem ipsum

+
+
+ + Beginner
+ Architect +
+
+++++ +[.content] + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligula imperdiet, et cursus lectus bibendum. Etiam metus magna, dapibus vitae ipsum vel, sollicitudin interdum metus. Phasellus quis rutrum enim. Vivamus euismod sem nec posuere accumsan. Praesent elementum lectus vitae magna pellentesque, a facilisis risus pulvinar. Donec scelerisque porttitor aliquet. + +++++ +
+++++ + +[.box] + +* xref:#[Lorem ipsum] + +[.box] +.Component +* Lorem ipsum +* Lorem ipsum +* Lorem ipsum + +[.box] +.Languages +* Lorem ipsum +* Lorem ipsum +* Lorem ipsum + +++++ +
+++++ + +[.column] +====== {empty} +++++ +
+

Lorem ipsum

+
+
+ + Intermediate
+ Developer +
+
+++++ +[.content] + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligula imperdiet, et cursus lectus bibendum. Etiam metus magna, dapibus vitae ipsum vel, sollicitudin interdum metus. Phasellus quis rutrum enim. Vivamus euismod sem nec posuere accumsan. Praesent elementum lectus vitae magna pellentesque, a facilisis risus pulvinar. Donec scelerisque porttitor aliquet. + +++++ +
+++++ + +[.box] + +* xref:#[Lorem ipsum] +* xref:#[Lorem ipsum] + +[.box] +.Component +* Lorem ipsum +* Lorem ipsum +* Lorem ipsum + +[.box] +.Languages +* Lorem ipsum + +++++ +
+++++ + +[.column] +====== {empty} +++++ +
+

Lorem ipsum

+
+
+ + Advanced
+ Architect +
+
+++++ +[.content] + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligula imperdiet, et cursus lectus bibendum. Etiam metus magna, dapibus vitae ipsum vel, sollicitudin interdum metus. Phasellus quis rutrum enim. Vivamus euismod sem nec posuere accumsan. Praesent elementum lectus vitae magna pellentesque, a facilisis risus pulvinar. Donec scelerisque porttitor aliquet. + +++++ +
+++++ + +[.box] + +* xref:#[Lorem ipsum] + +[.box] +.Component +* Lorem ipsum +* Lorem ipsum +* Lorem ipsum + +[.box] +.Languages +* Lorem ipsum +* Lorem ipsum +* Lorem ipsum + +++++ +
+++++ \ No newline at end of file diff --git a/src/css/is-this-helpful.css b/src/css/is-this-helpful.css index fd7a26ba..d9191344 100644 --- a/src/css/is-this-helpful.css +++ b/src/css/is-this-helpful.css @@ -21,14 +21,14 @@ margin: 15px 0; } -.is-this-helpful-box .btn-row .helpfull-btn { +.is-this-helpful-box .btn-row .helpful-btn { font-size: 0.875rem; line-height: 1.125rem; color: var(--color-brand-gray4); } -.is-this-helpful-box .btn-row .helpfull-btn:hover, -.is-this-helpful-box .btn-row .helpfull-btn.active { +.is-this-helpful-box .btn-row .helpful-btn:hover, +.is-this-helpful-box .btn-row .helpful-btn.active { color: var(--color-brand-blue); text-decoration: none; } diff --git a/src/css/landing-page.css b/src/css/landing-page.css index ee239a0e..34e0603e 100644 --- a/src/css/landing-page.css +++ b/src/css/landing-page.css @@ -105,9 +105,13 @@ padding-right: 0; } -.doc.landing-page-doc .box h5 { - margin: 0 0 8px; +.doc.landing-page-doc .box h5, +.doc.landing-page-doc .box .title { + margin: 0 0 16px; font-family: "Open Sans", sans-serif; + font-size: 1rem; + font-weight: var(--weight-semibold); + color: var(--color-brand-black); } .doc.landing-page-doc figure { @@ -135,7 +139,7 @@ .doc.landing-page-doc ul li { list-style: none; - margin-bottom: 8px; + margin:0 0 8px; font-size: 1rem; font-family: "Open Sans", sans-serif; color: var(--color-brand-black); @@ -265,6 +269,7 @@ .nav.tutorials-filter .sub-menu { margin-top: 20px; padding-left: 28px; + display: none; } .nav.tutorials-filter .sub-menu li { @@ -283,7 +288,7 @@ .nav.tutorials-filter [type="checkbox"]:not(:checked) + label, .nav.tutorials-filter [type="checkbox"]:checked + label { position: relative; - padding-left: 1.95em; + padding-left: 1.5em; cursor: pointer; } diff --git a/src/js/01-nav.js b/src/js/01-nav.js index cd878c29..920f28b0 100644 --- a/src/js/01-nav.js +++ b/src/js/01-nav.js @@ -64,17 +64,31 @@ // var reclaimedHeight = availableHeight - encroachingElement.getBoundingClientRect().top // navMenu.element.style.height = reclaimedHeight > 0 ? Math.max(0, preferredHeight - reclaimedHeight) + 'px' : '' // } - var navMenuControl = document.querySelector('.main-nav-parent') - // var navWrap = document.querySelector('.currentNav-wrap') - - navMenuControl.addEventListener('click', function () { - // navWrap.style.display = 'none' - for (var i = 0; i < navItems.length; i++) { - navItems[i].classList.remove('is-active') - navItems[i].classList.remove('is-inactive') - } - this.style.display = 'none' - }) + // var navMenuControl = document.querySelector('.main-nav-parent') + // // var navWrap = document.querySelector('.currentNav-wrap') + + // navMenuControl.addEventListener('click', function () { + // // navWrap.style.display = 'none' + // for (var i = 0; i < navItems.length; i++) { + // navItems[i].classList.remove('is-active') + // navItems[i].classList.remove('is-inactive') + // } + // this.style.display = 'none' + // }) + + var navMenuControl + if(document.querySelector('.main-nav-parent')){ + navMenuControl = document.querySelector('.main-nav-parent') + + navMenuControl.addEventListener('click', function () { + // navWrap.style.display = 'none' + for (var i = 0; i < navItems.length; i++) { + navItems[i].classList.remove('is-active') + navItems[i].classList.remove('is-inactive') + } + this.style.display = 'none' + }) + } // Toggle class function toggleActive (e) { diff --git a/src/js/06-page-rating.js b/src/js/06-page-rating.js index 0b32045d..3c5835b0 100644 --- a/src/js/06-page-rating.js +++ b/src/js/06-page-rating.js @@ -16,52 +16,55 @@ var closeModalPopup = document.querySelector('.close-popup') var anyFeedbackBtn = document.querySelector('.any-feedback-btn') // for config - var yesBtnData = helpYesBtn.dataset - var noBtnData = helpNoBtn.dataset - helpYesBtn.addEventListener('click', function (e) { - // dialogBox.style.display = 'block' - this.classList.add('active') - helpNoBtn.classList.remove('active') - console.log(yesBtnData, 16) - }) - helpNoBtn.addEventListener('click', function (e) { - // dialogBox.style.display = 'block' - this.classList.add('active') - helpYesBtn.classList.remove('active') - console.log(noBtnData, 27) - }) - anyFeedbackBtn.addEventListener('click', function (e) { - e.preventDefault() - dialogBox.style.display = 'block' - feedBackFormBox.style.display = 'block' - this.classList.add('active') - }) + if(document.querySelector('.is-this-helpful-box')){ + var yesBtnData = helpYesBtn.dataset + var noBtnData = helpNoBtn.dataset + helpYesBtn.addEventListener('click', function (e) { + // dialogBox.style.display = 'block' + this.classList.add('active') + helpNoBtn.classList.remove('active') + console.log(yesBtnData, 16) + }) - skipBtnMsg.addEventListener('click', function (e) { - dialogBox.style.display = 'none' - feedBackMsg.value = '' - }) - // skipLeaveBtn.addEventListener('click', function (e) { - // leaveAddtinalBox.style.display = 'none' - // feedBackFormBox.style.display = 'block' - // }) - feedBackMsg.addEventListener('keyup', function (e) { - var textareaValue = this.value + helpNoBtn.addEventListener('click', function (e) { + // dialogBox.style.display = 'block' + this.classList.add('active') + helpYesBtn.classList.remove('active') + console.log(noBtnData, 27) + }) + anyFeedbackBtn.addEventListener('click', function (e) { + e.preventDefault() + dialogBox.style.display = 'block' + feedBackFormBox.style.display = 'block' + this.classList.add('active') + }) + + skipBtnMsg.addEventListener('click', function (e) { + dialogBox.style.display = 'none' + feedBackMsg.value = '' + }) + + feedBackMsg.addEventListener('keyup', function (e) { + var textareaValue = this.value + + if (textareaValue !== '') { + submitBtn.classList.remove('disabled') + } else { + submitBtn.classList.add('disabled') + } + }) + feedbackInfoBtn.addEventListener('click', function (e) { + feedbackModal.classList.add('show') + }) + + closeModalPopup.addEventListener('click', function (e) { + feedbackModal.classList.remove('show') + }) + } + - if (textareaValue !== '') { - submitBtn.classList.remove('disabled') - } else { - submitBtn.classList.add('disabled') - } - }) - feedbackInfoBtn.addEventListener('click', function (e) { - feedbackModal.classList.add('show') - }) - closeModalPopup.addEventListener('click', function (e) { - feedbackModal.classList.remove('show') - }) })() diff --git a/src/js/08-table-responsive.js b/src/js/09-table-responsive.js similarity index 100% rename from src/js/08-table-responsive.js rename to src/js/09-table-responsive.js diff --git a/src/js/10-landing-page-nav.js b/src/js/10-landing-page-nav.js new file mode 100644 index 00000000..de290f17 --- /dev/null +++ b/src/js/10-landing-page-nav.js @@ -0,0 +1,31 @@ +;(function () { + 'use strict' + + var clearAllBtn = document.querySelector('#clearALLBtn') + var menuList = document.querySelectorAll('.nav-list .nav-link') + + clearAllBtn.addEventListener('click', function (e) { + e.preventDefault() + var inputs = document.querySelectorAll('.check-mark') + for(var i = 0; i < inputs.length; i++) { + inputs[i].checked = false + } + }) + + // function menuClickEvent(id) { + // for(var i = 0; i < menuList.length; i++) { + // console.log(menuList[i], id, menuList[id]) + // } + + // } + // Handlebars.registerHelper("menuClickEvent", function(id) { + // console.log("hello", id) + // }); + + // document.getElementsByClassName('nav-link').addEventListener('click', menuClickEvent) + // menuClick.addEventListener('click', function(e){ + + // }) + + + })() diff --git a/src/partials/body-landing-tutorials.hbs b/src/partials/body-landing-tutorials.hbs index cce45b08..81eab6fe 100644 --- a/src/partials/body-landing-tutorials.hbs +++ b/src/partials/body-landing-tutorials.hbs @@ -18,354 +18,13 @@ +
+

Tutorials

+
-
-

Tutorials

-
- -
-
-
-

Lorem ipsum

-
-
- {{!-- --}} - - Advanced
- Developer -
-
-
-

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem -

-
-
-
- -
-
-
- Components -
-
    -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
-
-
-
- Languages -
-
    -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
-
-
-
-
-
-

Lorem ipsum

-
-
Intermediate
- DevOps -
-
-
-

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem -

-
-
-
- -
-
-
- Components -
-
    -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
-
-
-
- Languages -
-
    -
  • - Lorem ipsum -
    • - -
-
-
-
-
-
-

Lorem ipsum

-
-
Intermediate
- Developer -
-
-
-

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem -

-
-
-
- -
-
-
- Components -
-
    -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • - -
-
-
-
- Languages -
-
    -
  • - Lorem ipsum -
    • - -
-
-
-
-
-
-

Lorem ipsum

-
-
Beginner
- Architect -
-
-
-

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem -

-
-
-
- -
-
-
- Components -
-
    -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
-
-
-
- Languages -
-
    -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
-
-
-
-
-
-

Lorem ipsum

-
-
Intermediate
- Developer -
-
-
-

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem -

-
-
-
- -
-
-
- Components -
-
    -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
-
-
-
- Languages -
-
    -
  • - Lorem ipsum -
    • - -
-
-
-
-
-
-

Lorem ipsum

-
-
Advanced
- Architect -
-
-
-

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem -

-
-
-
- -
-
-
- Components -
-
    -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
-
-
-
- Languages -
-
    -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
  • - Lorem ipsum -
    • -
-
-
-
- -
- - - - +
+ {{{page.contents}}} +
diff --git a/src/partials/body-landing-tutorials_copy.hbs b/src/partials/body-landing-tutorials_copy.hbs new file mode 100644 index 00000000..485ad568 --- /dev/null +++ b/src/partials/body-landing-tutorials_copy.hbs @@ -0,0 +1,370 @@ + +
+
+

Couchbase Tutorials

+
+
+
+

+ + The Couchbase SDK allows applications to access a Couchbase cluster. It offers traditional synchronous APIs as well as scalable asynchronous APIs to maximize performance. + +

+
+
+
+
+ +
+
+
+ +
+

Tutorials

+
+ +
+
+
+

Lorem ipsum

+
+
+ + Advanced
+ Developer +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+
+
+

Lorem ipsum

+
+
Intermediate
+ DevOps +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • + +
+
+
+
+
+
+

Lorem ipsum

+
+
Intermediate
+ Developer +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • + +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • + +
+
+
+
+
+
+

Lorem ipsum

+
+
Beginner
+ Architect +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+
+
+

Lorem ipsum

+
+
Intermediate
+ Developer +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • + +
+
+
+
+
+
+

Lorem ipsum

+
+
Advanced
+ Architect +
+
+
+

+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem +

+
+
+
+ +
+
+
+ Components +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ Languages +
+
    +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
  • + Lorem ipsum +
    • +
+
+
+
+ +
+ + + + + +
+
diff --git a/src/partials/toc.hbs b/src/partials/toc.hbs index 07a2b118..a604ab37 100644 --- a/src/partials/toc.hbs +++ b/src/partials/toc.hbs @@ -2,29 +2,29 @@
-

Is this page helpful ?

+

Is this page helpful?

- - No + No
Leave Additional Feedback?
-
+
- +
Skip
- +
@@ -33,7 +33,7 @@
Skip - +
--}}
diff --git a/src/partials/tutorials-filter.hbs b/src/partials/tutorials-filter.hbs index e0102780..cc625701 100644 --- a/src/partials/tutorials-filter.hbs +++ b/src/partials/tutorials-filter.hbs @@ -2,26 +2,26 @@

Filter by

- Clear all + Clear all
    -
  • Products
    • -
  • Languages
    • -
  • Frameworks
    • -
  • Levels +
  • Products
    • +
  • Languages
    • +
  • Frameworks
    • +
  • Levels
    • - +
    • - +
    • - +
      • From 7006264af7c4f599af48fe89c35bb09525dae451 Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Mon, 18 May 2020 23:58:06 +0530 Subject: [PATCH 07/11] Fix the issues for "is helpful task" section.. --- src/css/is-this-helpful.css | 6 +++--- src/partials/toc.hbs | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/css/is-this-helpful.css b/src/css/is-this-helpful.css index fd7a26ba..d9191344 100644 --- a/src/css/is-this-helpful.css +++ b/src/css/is-this-helpful.css @@ -21,14 +21,14 @@ margin: 15px 0; } -.is-this-helpful-box .btn-row .helpfull-btn { +.is-this-helpful-box .btn-row .helpful-btn { font-size: 0.875rem; line-height: 1.125rem; color: var(--color-brand-gray4); } -.is-this-helpful-box .btn-row .helpfull-btn:hover, -.is-this-helpful-box .btn-row .helpfull-btn.active { +.is-this-helpful-box .btn-row .helpful-btn:hover, +.is-this-helpful-box .btn-row .helpful-btn.active { color: var(--color-brand-blue); text-decoration: none; } diff --git a/src/partials/toc.hbs b/src/partials/toc.hbs index 07a2b118..a604ab37 100644 --- a/src/partials/toc.hbs +++ b/src/partials/toc.hbs @@ -2,29 +2,29 @@
      -

      Is this page helpful ?

      +

      Is this page helpful?

      - - No + No
      Leave Additional Feedback?
      -
      +
      - +
      Skip
      - +
      @@ -33,7 +33,7 @@
      Skip - +
      --}}
      From 2fc0dd94a35af07682c5e2b4aca0e4a4a96b2793 Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Thu, 21 May 2020 13:42:16 +0530 Subject: [PATCH 08/11] filter functionality done for multiple select --- package-lock.json | 476 +++++++++++++++++++----- package.json | 6 +- preview-src/landing-page-tutorials.adoc | 75 ++-- src/css/landing-page.css | 21 +- src/js/10-landing-page-nav.js | 95 +++-- src/partials/head-last.hbs | 6 +- src/partials/tutorials-filter.hbs | 40 +- 7 files changed, 543 insertions(+), 176 deletions(-) diff --git a/package-lock.json b/package-lock.json index e973a06d..4764661d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -496,6 +496,11 @@ "through": ">=2.2.7 <3" } }, + "abab": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", + "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -518,6 +523,27 @@ "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==", "dev": true }, + "acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "requires": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + }, + "dependencies": { + "acorn": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz", + "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==" + }, + "acorn-walk": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz", + "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==" + } + } + }, "acorn-jsx": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz", @@ -551,7 +577,6 @@ "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", @@ -925,7 +950,6 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, "requires": { "safer-buffer": "~2.1.0" } @@ -971,8 +995,7 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "assign-symbols": { "version": "1.0.0", @@ -1016,8 +1039,7 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "atob": { "version": "2.1.2", @@ -1058,14 +1080,12 @@ "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", - "dev": true + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" }, "bach": { "version": "1.2.0", @@ -1173,7 +1193,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, "requires": { "tweetnacl": "^0.14.3" } @@ -2075,8 +2094,7 @@ "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "caw": { "version": "2.0.1", @@ -2416,7 +2434,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -2591,8 +2608,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cosmiconfig": { "version": "5.2.1", @@ -2861,6 +2877,26 @@ } } }, + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + }, + "cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "requires": { + "cssom": "~0.3.6" + }, + "dependencies": { + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + } + } + }, "cuint": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", @@ -2896,11 +2932,20 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, "requires": { "assert-plus": "^1.0.0" } }, + "data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "requires": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -2926,6 +2971,11 @@ "map-obj": "^1.0.0" } }, + "decimal.js": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz", + "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==" + }, "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", @@ -3087,8 +3137,7 @@ "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, "default-compare": { "version": "1.0.0", @@ -3178,8 +3227,7 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "depd": { "version": "1.1.2", @@ -3344,6 +3392,21 @@ "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", "dev": true }, + "domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "requires": { + "webidl-conversions": "^5.0.0" + }, + "dependencies": { + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==" + } + } + }, "domhandler": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", @@ -3490,7 +3553,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -3693,6 +3755,18 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "escodegen": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz", + "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==", + "requires": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, "eslint": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz", @@ -4023,8 +4097,7 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { "version": "1.0.1", @@ -4047,8 +4120,7 @@ "estraverse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, "estree-is-function": { "version": "1.0.0", @@ -4080,8 +4152,7 @@ "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, "etag": { "version": "1.8.1", @@ -4275,8 +4346,7 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extend-shallow": { "version": "3.0.2", @@ -4393,8 +4463,7 @@ "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fancy-log": { "version": "1.3.3", @@ -4411,8 +4480,7 @@ "fast-deep-equal": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, "fast-glob": { "version": "3.2.1", @@ -4485,14 +4553,12 @@ "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "fast-safe-stringify": { "version": "2.0.7", @@ -4733,14 +4799,12 @@ "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -5443,7 +5507,6 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, "requires": { "assert-plus": "^1.0.0" } @@ -5966,14 +6029,12 @@ "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "dev": true, "requires": { "ajv": "^6.5.5", "har-schema": "^2.0.0" @@ -6175,6 +6236,14 @@ "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==", "dev": true }, + "html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "requires": { + "whatwg-encoding": "^1.0.5" + } + }, "html-tags": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz", @@ -6257,7 +6326,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -6274,7 +6342,6 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -6935,6 +7002,11 @@ "dev": true, "optional": true }, + "is-potential-custom-element-name": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", + "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=" + }, "is-promise": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", @@ -7011,8 +7083,7 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, "is-unc-path": { "version": "1.0.0", @@ -7083,8 +7154,7 @@ "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "isurl": { "version": "1.0.0", @@ -7134,8 +7204,105 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "jsdom": { + "version": "16.2.2", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.2.2.tgz", + "integrity": "sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==", + "requires": { + "abab": "^2.0.3", + "acorn": "^7.1.1", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.2.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.0", + "domexception": "^2.0.1", + "escodegen": "^1.14.1", + "html-encoding-sniffer": "^2.0.1", + "is-potential-custom-element-name": "^1.0.0", + "nwsapi": "^2.2.0", + "parse5": "5.1.1", + "request": "^2.88.2", + "request-promise-native": "^1.0.8", + "saxes": "^5.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^3.0.1", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.0.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0", + "ws": "^7.2.3", + "xml-name-validator": "^3.0.0" + }, + "dependencies": { + "acorn": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz", + "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==" + }, + "ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=" + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "requires": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } }, "jsesc": { "version": "2.5.2", @@ -7159,14 +7326,12 @@ "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "json-stable-stringify": { "version": "0.0.1", @@ -7186,8 +7351,7 @@ "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "json5": { "version": "2.1.1", @@ -7223,7 +7387,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -7322,7 +7485,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, "requires": { "prelude-ls": "~1.1.2", "type-check": "~0.3.2" @@ -7409,8 +7571,7 @@ "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.get": { "version": "4.4.2", @@ -7436,6 +7597,11 @@ "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=", "dev": true }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" + }, "lodash.unescape": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", @@ -7926,14 +8092,12 @@ "mime-db": { "version": "1.40.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", - "dev": true + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" }, "mime-types": { "version": "2.1.24", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", - "dev": true, "requires": { "mime-db": "1.40.0" } @@ -8326,11 +8490,15 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, + "nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==" + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, "object-assign": { "version": "4.1.1", @@ -8566,7 +8734,6 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, "requires": { "deep-is": "~0.1.3", "fast-levenshtein": "~2.0.4", @@ -8818,6 +8985,11 @@ "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", "dev": true }, + "parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -8924,8 +9096,7 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "picomatch": { "version": "2.2.1", @@ -9742,8 +9913,7 @@ "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "prepend-http": { "version": "1.0.4", @@ -9973,8 +10143,7 @@ "psl": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz", - "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==", - "dev": true + "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==" }, "public-encrypt": { "version": "4.0.3", @@ -10026,8 +10195,7 @@ "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "q": { "version": "1.5.1", @@ -10038,8 +10206,7 @@ "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, "query-string": { "version": "5.1.1", @@ -10403,6 +10570,24 @@ "uuid": "^3.3.2" } }, + "request-promise-core": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", + "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", + "requires": { + "lodash": "^4.17.15" + } + }, + "request-promise-native": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz", + "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==", + "requires": { + "request-promise-core": "1.1.3", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -10573,8 +10758,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-json-parse": { "version": "1.0.1", @@ -10594,8 +10778,7 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sax": { "version": "1.2.4", @@ -10603,6 +10786,14 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, + "saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "requires": { + "xmlchars": "^2.2.0" + } + }, "scope-analyzer": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/scope-analyzer/-/scope-analyzer-2.0.5.tgz", @@ -11071,8 +11262,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-resolve": { "version": "0.5.2", @@ -11204,7 +11394,6 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -11268,6 +11457,11 @@ "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", "dev": true }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + }, "stream-browserify": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", @@ -12042,6 +12236,11 @@ "util.promisify": "~1.0.0" } }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, "syntax-error": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", @@ -12383,12 +12582,26 @@ "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "dev": true, "requires": { "psl": "^1.1.24", "punycode": "^1.4.1" } }, + "tr46": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", + "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", + "requires": { + "punycode": "^2.1.1" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + } + } + }, "transform-ast": { "version": "2.4.4", "resolved": "https://registry.npmjs.org/transform-ast/-/transform-ast-2.4.4.tgz", @@ -12455,7 +12668,6 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, "requires": { "safe-buffer": "^5.0.1" } @@ -12463,8 +12675,7 @@ "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "type": { "version": "1.0.3", @@ -12476,7 +12687,6 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, "requires": { "prelude-ls": "~1.1.2" } @@ -12782,7 +12992,6 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, "requires": { "punycode": "^2.1.0" }, @@ -12790,8 +12999,7 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" } } }, @@ -12894,8 +13102,7 @@ "uuid": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "dev": true + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, "v8-compile-cache": { "version": "2.1.0", @@ -12938,7 +13145,6 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -13175,6 +13381,34 @@ } } }, + "w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "requires": { + "browser-process-hrtime": "^1.0.0" + }, + "dependencies": { + "browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" + } + } + }, + "w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "requires": { + "xml-name-validator": "^3.0.0" + } + }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==" + }, "websocket-driver": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz", @@ -13192,6 +13426,36 @@ "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", "dev": true }, + "whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "requires": { + "iconv-lite": "0.4.24" + } + }, + "whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" + }, + "whatwg-url": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz", + "integrity": "sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==", + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.2", + "webidl-conversions": "^5.0.0" + }, + "dependencies": { + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==" + } + } + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -13219,8 +13483,7 @@ "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" }, "wrap-ansi": { "version": "2.1.0", @@ -13275,12 +13538,27 @@ "mkdirp": "^0.5.1" } }, + "ws": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", + "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==" + }, "x-is-string": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz", "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=", "dev": true }, + "xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" + }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" + }, "xmlhttprequest": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", diff --git a/package.json b/package.json index 8f9452f6..8b3759e3 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "gulp-vinyl-zip": "~2.2", "handlebars": "~4.4", "highlight.js": "~9.15", - "jquery": "~3.4", + "jquery": "^3.4.1", "js-yaml": "~3.13", "mark.js": "~8.11", "merge-stream": "~2.0", @@ -58,5 +58,7 @@ "vinyl-buffer": "~1.0", "vinyl-fs": "~3.0" }, - "dependencies": {} + "dependencies": { + "jsdom": "^16.2.2" + } } diff --git a/preview-src/landing-page-tutorials.adoc b/preview-src/landing-page-tutorials.adoc index 9f126ac5..0a8db9ac 100644 --- a/preview-src/landing-page-tutorials.adoc +++ b/preview-src/landing-page-tutorials.adoc @@ -5,17 +5,18 @@ [.column] +[.data-filter-column] ====== {empty} ++++ -
      -

      Lorem ipsum

      -
      -
      - - Advanced
      - Developer -
      -
      +
      +

      Lorem ipsum

      +
      +
      + +Advanced
      +Developer +
      +
      ++++ [.content] @@ -26,22 +27,27 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu ++++ [.box] +[.link] * xref:#[Lorem ipsum] * xref:#[Lorem ipsum] * xref:#[Lorem ipsum] [.box] +[.component] + .Component * Lorem ipsum * Lorem ipsum * Lorem ipsum [.box] +[.languages] + .Languages -* Lorem ipsum -* Lorem ipsum -* Lorem ipsum +* Java +* Swift +* Javascript ++++
      @@ -50,12 +56,13 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.column] +[.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      -
      +
      Intermediate
      DevOps @@ -78,8 +85,8 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.box] .Component -* Lorem ipsum -* Lorem ipsum +* C# +* Node * Lorem ipsum [.box] @@ -91,12 +98,13 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu ++++ [.column] +[.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      -
      +
      Intermediate
      Developer @@ -124,19 +132,20 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.box] .Languages -* Lorem ipsum +* .NET ++++
      ++++ [.column] +[.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      -
      +
      Beginner
      Architect @@ -163,21 +172,22 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.box] .Languages -* Lorem ipsum -* Lorem ipsum -* Lorem ipsum +* AsciiDoc +* Java +* PHP ++++
      ++++ [.column] +[.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      -
      +
      Intermediate
      Developer @@ -205,19 +215,20 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.box] .Languages -* Lorem ipsum +* React ++++
      ++++ [.column] +[.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      -
      +
      Advanced
      Architect @@ -244,9 +255,9 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.box] .Languages -* Lorem ipsum -* Lorem ipsum -* Lorem ipsum +* Angular +* React +* Vue ++++
      diff --git a/src/css/landing-page.css b/src/css/landing-page.css index 34e0603e..d699133b 100644 --- a/src/css/landing-page.css +++ b/src/css/landing-page.css @@ -20,7 +20,7 @@ .card-row { display: flex; flex-direction: row; - justify-content: flex-start; + justify-content: space-between; flex-wrap: wrap; margin-bottom: 0; } @@ -64,8 +64,8 @@ } .card-row .column { - max-width: 48%; - flex-basis: 48%; + max-width: 46%; + flex-basis: 46%; margin-bottom: 25px; } @@ -180,12 +180,16 @@ text-align: justify; } -.card-row.two-column-row .column:nth-child(odd) { +/* .card-row.two-column-row .column.show:nth-child(odd) { padding-right: 40px; } -.card-row.two-column-row .column:nth-child(even) { +.card-row.two-column-row .column.show:nth-child(even) { padding-left: 40px; +} */ + +.card-row.two-column-row .column.data-filter-column.hide{ + display: none; } /* .card-row.two-column-row .column:nth-child(even) { @@ -238,11 +242,15 @@ display: flex; align-items: center; text-decoration: none; + } .nav.tutorials-filter ul li a:hover { color: var(--color-brand-blue); } +.nav.tutorials-filter ul li a.active .arrow.arrow-right { + transform: rotate(90deg); +} .nav.tutorials-filter .arrow { display: inline-block; @@ -323,7 +331,8 @@ transform: scale(0); } -.nav.tutorials-filter [type="checkbox"]:checked + label::after { +.nav.tutorials-filter [type="checkbox"]:checked + label::after, +.nav.tutorials-filter .active[type="checkbox"] + label::after { opacity: 1; transform: scale(1); } diff --git a/src/js/10-landing-page-nav.js b/src/js/10-landing-page-nav.js index de290f17..ac64ca38 100644 --- a/src/js/10-landing-page-nav.js +++ b/src/js/10-landing-page-nav.js @@ -1,31 +1,80 @@ -;(function () { - 'use strict' +(function($) { - var clearAllBtn = document.querySelector('#clearALLBtn') - var menuList = document.querySelectorAll('.nav-list .nav-link') + 'use strict'; - clearAllBtn.addEventListener('click', function (e) { - e.preventDefault() - var inputs = document.querySelectorAll('.check-mark') - for(var i = 0; i < inputs.length; i++) { - inputs[i].checked = false - } - }) + // for slide toggle + $( ".nav-link" ).click(function(){ + $(this).toggleClass('active') + $(this).next('.sub-menu').slideToggle(10) + }) + + + // for filter menu + var $filterCheckboxes = $('input[type="checkbox"]'); + + $filterCheckboxes.on('change', function() { + + var selectedFilters = { + + }; + + $filterCheckboxes.filter(':checked').each(function() { + + if (!selectedFilters.hasOwnProperty(this.name)) { + selectedFilters[this.name] = []; + //console.log(selectedFilters, 23) + } - // function menuClickEvent(id) { - // for(var i = 0; i < menuList.length; i++) { - // console.log(menuList[i], id, menuList[id]) - // } + selectedFilters[this.name].push(this.value); + console.log(selectedFilters, 27) + }); + + // create a collection containing all of the filterable elements + var $filteredResults = $('.data-filter-column'); + + // loop over the selected filter name -> (array) values pairs + $.each(selectedFilters, function(name, filterValues) { + + // filter each .data-filter-column element + $filteredResults = $filteredResults.filter(function() { + + var matched = false, + currentFilterValues = $(this).find('.sub-heading').data('level').split(' '); + var test = $(this).find('.languages li p').text(); + console.log(currentFilterValues, test, 48); + + // loop over each category value in the current .data-filter-column's data-category + $.each(currentFilterValues, function(_, currentFilterValue) { + console.log('enter'); + + // if the current category exists in the selected filters array + // set matched to true, and stop looping. as we're ORing in each + // set of filters, we only need to match once + + if ($.inArray(currentFilterValue, filterValues) != -1) { + console.log('true'); + matched = true; + return false; + } + }); - // } - // Handlebars.registerHelper("menuClickEvent", function(id) { - // console.log("hello", id) - // }); + // if matched is true the current .data-filter-column element is returned + return matched; - // document.getElementsByClassName('nav-link').addEventListener('click', menuClickEvent) - // menuClick.addEventListener('click', function(e){ + }); + }); - // }) + $('.data-filter-column').addClass('hide').filter($filteredResults).addClass('show').removeClass('hide'); + // reset all check mark + $('#clearALLBtn').click(function(event){ + selectedFilters = []; + $('.data-filter-column').removeClass('hide') + var inputs = $('.check-mark') + for(var i = 0; i < inputs.length; i++) { + inputs[i].checked = false + } + }) +}); - })() +})(jQuery); diff --git a/src/partials/head-last.hbs b/src/partials/head-last.hbs index 3be2b688..069acc09 100644 --- a/src/partials/head-last.hbs +++ b/src/partials/head-last.hbs @@ -1,10 +1,8 @@ {{!-- include fontAwesome CDN --}} - {{!-- --}} + {{!-- --}} + {{#if env.OPTANON_SCRIPT_URL}} diff --git a/src/partials/tutorials-filter.hbs b/src/partials/tutorials-filter.hbs index cc625701..eeec7f79 100644 --- a/src/partials/tutorials-filter.hbs +++ b/src/partials/tutorials-filter.hbs @@ -1,27 +1,46 @@ \ No newline at end of file + + From 5d5902b2c218e6659e113ab159b1f60ccc527049 Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Thu, 21 May 2020 18:30:25 +0530 Subject: [PATCH 09/11] multi select filter level functionality --- preview-src/landing-page-tutorials.adoc | 18 +++++++++--------- src/js/10-landing-page-nav.js | 14 ++++++-------- src/partials/tutorials-filter.hbs | 6 +++--- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/preview-src/landing-page-tutorials.adoc b/preview-src/landing-page-tutorials.adoc index 0a8db9ac..649a6bf6 100644 --- a/preview-src/landing-page-tutorials.adoc +++ b/preview-src/landing-page-tutorials.adoc @@ -8,7 +8,7 @@ [.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      @@ -59,7 +59,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      @@ -85,13 +85,13 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.box] .Component -* C# -* Node * Lorem ipsum [.box] .Languages -* Lorem ipsum +* C# +* Node +* Python ++++
      @@ -101,7 +101,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      @@ -142,7 +142,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      @@ -184,7 +184,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      @@ -225,7 +225,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
      +

      Lorem ipsum

      diff --git a/src/js/10-landing-page-nav.js b/src/js/10-landing-page-nav.js index ac64ca38..3daefebf 100644 --- a/src/js/10-landing-page-nav.js +++ b/src/js/10-landing-page-nav.js @@ -14,9 +14,7 @@ $filterCheckboxes.on('change', function() { - var selectedFilters = { - - }; + var selectedFilters = {}; $filterCheckboxes.filter(':checked').each(function() { @@ -24,9 +22,9 @@ selectedFilters[this.name] = []; //console.log(selectedFilters, 23) } - - selectedFilters[this.name].push(this.value); console.log(selectedFilters, 27) + selectedFilters[this.name].push(this.value.toLowerCase()); + }); // create a collection containing all of the filterable elements @@ -39,9 +37,9 @@ $filteredResults = $filteredResults.filter(function() { var matched = false, - currentFilterValues = $(this).find('.sub-heading').data('level').split(' '); - var test = $(this).find('.languages li p').text(); - console.log(currentFilterValues, test, 48); + currentFilterValues = $(this).find('.sub-heading').data('category').toLowerCase().split(' '); + // var test = $(this).find('.languages li p').text(); + console.log(currentFilterValues, 48); // loop over each category value in the current .data-filter-column's data-category $.each(currentFilterValues, function(_, currentFilterValue) { diff --git a/src/partials/tutorials-filter.hbs b/src/partials/tutorials-filter.hbs index eeec7f79..fb64be2e 100644 --- a/src/partials/tutorials-filter.hbs +++ b/src/partials/tutorials-filter.hbs @@ -10,17 +10,17 @@ Languages
      • - +
      • - +
      • - +
        • From b8378a72c3fa8e3a3c4eb1d90fafd0f433c43ab9 Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Sat, 23 May 2020 00:39:11 +0530 Subject: [PATCH 10/11] all tutorials page functionality and UI fixes --- preview-src/landing-page-tutorials.adoc | 12 +- src/css/landing-page.css | 48 ++++++-- src/js/01-nav.js | 38 +++--- src/js/10-landing-page-nav.js | 151 +++++++++++++----------- src/partials/body-landing-tutorials.hbs | 3 + src/partials/tutorials-filter.hbs | 70 +++++++---- 6 files changed, 191 insertions(+), 131 deletions(-) diff --git a/preview-src/landing-page-tutorials.adoc b/preview-src/landing-page-tutorials.adoc index 649a6bf6..8a969233 100644 --- a/preview-src/landing-page-tutorials.adoc +++ b/preview-src/landing-page-tutorials.adoc @@ -8,7 +8,7 @@ [.data-filter-column] ====== {empty} ++++ -
        +

        Lorem ipsum

        @@ -59,7 +59,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
        +

        Lorem ipsum

        @@ -101,7 +101,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
        +

        Lorem ipsum

        @@ -142,7 +142,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
        +

        Lorem ipsum

        @@ -184,7 +184,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
        +

        Lorem ipsum

        @@ -225,7 +225,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu [.data-filter-column] ====== {empty} ++++ -
        +

        Lorem ipsum

        diff --git a/src/css/landing-page.css b/src/css/landing-page.css index d699133b..81bf4a09 100644 --- a/src/css/landing-page.css +++ b/src/css/landing-page.css @@ -20,7 +20,7 @@ .card-row { display: flex; flex-direction: row; - justify-content: space-between; + /* justify-content: space-between; */ flex-wrap: wrap; margin-bottom: 0; } @@ -36,10 +36,11 @@ } .doc.landing-page-doc .sub-heading.two-column-heading { - display: flex; + /* display: flex; justify-content: space-between; align-items: center; - flex-wrap: wrap; + flex-wrap: wrap; */ + display: block; } .doc.landing-page-doc .filter-info h5 { @@ -56,6 +57,13 @@ margin-right: 8px; } +.doc.landing-page-doc .filter-info{ + margin-top: 15px; + margin-bottom: 10px; + display: inline-block; + width: 100%; +} + .doc.landing-page-doc .filter-info span { color: var(--color-brand-light-blue); border-radius: 8px; @@ -64,8 +72,8 @@ } .card-row .column { - max-width: 46%; - flex-basis: 46%; + max-width: 50%; + flex-basis: 50%; margin-bottom: 25px; } @@ -180,17 +188,30 @@ text-align: justify; } -/* .card-row.two-column-row .column.show:nth-child(odd) { +.card-row.two-column-row .column:not(.data-filter-column):nth-child(odd){ padding-right: 40px; } -.card-row.two-column-row .column.show:nth-child(even) { +.card-row.two-column-row .column:not(.data-filter-column):nth-child(even){ padding-left: 40px; -} */ +} + + +.card-row.two-column-row .column.data-filter-column.even { + padding-left: 40px; +} +.card-row.two-column-row .column.data-filter-column.odd { + padding-right: 40px; +} + + .card-row.two-column-row .column.data-filter-column.hide{ display: none; } +.hide{ + display: none; +} /* .card-row.two-column-row .column:nth-child(even) { padding-left: 5%; @@ -419,12 +440,17 @@ border-left: 0; } - .card-row.two-column-row .column:nth-child(even) { + .card-row.two-column-row .column.data-filter-column.even, + .card-row.two-column-row .column.data-filter-column.odd { padding-left: 0; + padding-right: 0; } .card-row.two-column-row .column:nth-child(odd), - .card-row.two-column-row .column:nth-child(even) { - padding: 0; + .card-row.two-column-row .column:nth-child(even), + .card-row.two-column-row .column:not(.data-filter-column):nth-child(even), + .card-row.two-column-row .column:not(.data-filter-column):nth-child(odd) { + padding-left: 0; + padding-right: 0; } } diff --git a/src/js/01-nav.js b/src/js/01-nav.js index 920f28b0..3636123b 100644 --- a/src/js/01-nav.js +++ b/src/js/01-nav.js @@ -1,4 +1,4 @@ -;(function () { +; (function () { 'use strict' var nav = document.querySelector('nav.nav') @@ -77,21 +77,21 @@ // }) var navMenuControl - if(document.querySelector('.main-nav-parent')){ - navMenuControl = document.querySelector('.main-nav-parent') - - navMenuControl.addEventListener('click', function () { - // navWrap.style.display = 'none' - for (var i = 0; i < navItems.length; i++) { - navItems[i].classList.remove('is-active') - navItems[i].classList.remove('is-inactive') - } - this.style.display = 'none' - }) + if (document.querySelector('.main-nav-parent')) { + navMenuControl = document.querySelector('.main-nav-parent') + + navMenuControl.addEventListener('click', function () { + // navWrap.style.display = 'none' + for (var i = 0; i < navItems.length; i++) { + navItems[i].classList.remove('is-active') + navItems[i].classList.remove('is-inactive') + } + this.style.display = 'none' + }) } // Toggle class - function toggleActive (e) { + function toggleActive(e) { if (this.getAttribute('data-depth') === '1') { var otherNavs = document.querySelectorAll('.nav-item[data-depth="0"]:not(.is-active)') console.log(otherNavs) @@ -117,7 +117,7 @@ // concealEvent(e) // } - function revealNav (e) { + function revealNav(e) { if (nav.classList.contains('is-active')) return hideNav(e) document.documentElement.classList.add('is-clipped--nav') nav.classList.add('is-active') @@ -126,7 +126,7 @@ concealEvent(e) // NOTE don't let event get picked up by window click listener } - function hideNav (e) { + function hideNav(e) { if (e.which === 3 || e.button === 2) return document.documentElement.classList.remove('is-clipped--nav') nav.classList.remove('is-active') @@ -135,11 +135,11 @@ concealEvent(e) // NOTE don't let event get picked up by window click listener } - function find (selector, from) { + function find(selector, from) { return [].slice.call((from || document).querySelectorAll(selector)) } - function findAncestorWithClass (className, from, scope) { + function findAncestorWithClass(className, from, scope) { if ((from = from.parentNode) !== scope) { if (from.classList.contains(className)) { return from @@ -149,14 +149,14 @@ } } - function findNextElement (from, el) { + function findNextElement(from, el) { if ((el = from.nextElementSibling)) return el el = from while ((el = el.nextSibling) && el.nodeType !== 1); return el } - function concealEvent (e) { + function concealEvent(e) { e.stopPropagation() } })() diff --git a/src/js/10-landing-page-nav.js b/src/js/10-landing-page-nav.js index 3daefebf..c40c8b90 100644 --- a/src/js/10-landing-page-nav.js +++ b/src/js/10-landing-page-nav.js @@ -1,78 +1,89 @@ -(function($) { - - 'use strict'; - +(function ($) { + 'use strict' // for slide toggle - $( ".nav-link" ).click(function(){ + $('.nav-link').click(function () { $(this).toggleClass('active') $(this).next('.sub-menu').slideToggle(10) }) - - // for filter menu - var $filterCheckboxes = $('input[type="checkbox"]'); - - $filterCheckboxes.on('change', function() { - - var selectedFilters = {}; - - $filterCheckboxes.filter(':checked').each(function() { - - if (!selectedFilters.hasOwnProperty(this.name)) { - selectedFilters[this.name] = []; - //console.log(selectedFilters, 23) - } - console.log(selectedFilters, 27) - selectedFilters[this.name].push(this.value.toLowerCase()); - - }); - - // create a collection containing all of the filterable elements - var $filteredResults = $('.data-filter-column'); - - // loop over the selected filter name -> (array) values pairs - $.each(selectedFilters, function(name, filterValues) { - - // filter each .data-filter-column element - $filteredResults = $filteredResults.filter(function() { - - var matched = false, - currentFilterValues = $(this).find('.sub-heading').data('category').toLowerCase().split(' '); - // var test = $(this).find('.languages li p').text(); - console.log(currentFilterValues, 48); - - // loop over each category value in the current .data-filter-column's data-category - $.each(currentFilterValues, function(_, currentFilterValue) { - console.log('enter'); - - // if the current category exists in the selected filters array - // set matched to true, and stop looping. as we're ORing in each - // set of filters, we only need to match once - - if ($.inArray(currentFilterValue, filterValues) != -1) { - console.log('true'); - matched = true; - return false; +// add class even odd +var $allData = $('.data-filter-column') +for(var i= 0; i < $allData.length; i++) { + console.log(i, 445, $allData[i]) + if((i % 2) == 1) { + $allData[i].classList.add('even') + }else{ + $allData[i].classList.add('odd') + } +} + + // for filter menu + var $filterMenuCheckboxes = $('input[type="checkbox"]') + $filterMenuCheckboxes.on('change', function () { + var selectedFiltersData = {} + $filterMenuCheckboxes.filter(':checked').each(function () { + if (!selectedFiltersData.hasOwnProperty(this.name)) { + selectedFiltersData[this.name] = [] + } + // console.log(selectedFiltersData, 27) + selectedFiltersData[this.name].push(this.value.toLowerCase()) + }) + // create a collection containing all of the filterable elements + var $filteredResultsData = $('.data-filter-column') + // loop over the selected filter name -> (array) values pairs + $filteredResultsData.removeClass('even') + $filteredResultsData.removeClass('odd') + $.each(selectedFiltersData, function (name, filterValues) { + // filter each .data-filter-column element + $filteredResultsData = $filteredResultsData.filter(function () { + var matched = false, + currentFilterValues = $(this).find('.sub-heading').data('category').toLowerCase().split(' ') + + + + $.each(currentFilterValues, function (_, currentFilterValue) { + // console.log('enter', currentFilterValues, currentFilterValue) + if ($.inArray(currentFilterValue, filterValues) != -1) { + console.log('true', currentFilterValue, filterValues) + matched = true + return false + } + }) + // if matched is true the current .data-filter-column element is returned + return matched + }) + }) + + + $('.data-filter-column').addClass('hide').filter($filteredResultsData).addClass('show').removeClass('hide') + // add class for data-filter-column + for(var i= 0; i < $filteredResultsData.length; i++) { + console.log(i, 445, $filteredResultsData[i]) + if((i % 2) == 1) { + $filteredResultsData[i].classList.add('even') + }else{ + $filteredResultsData[i].classList.add('odd') + } + } + // reset all check mark + $('#clearALLBtn').click(function (event) { + selectedFiltersData = [] + $('.data-filter-column').removeClass('hide').removeClass('show').removeClass('odd').removeClass('even') + var inputs = $('.check-mark') + for (var i = 0; i < inputs.length; i++) { + inputs[i].checked = false + } + for(var i= 0; i < $allData.length; i++) { + console.log(i, 445, $allData[i]) + // $allData[i].classList.remove('even') + // $allData[i].classList.remove('odd') + if((i % 2) == 1) { + $allData[i].classList.add('even') + }else{ + $allData[i].classList.add('odd') + } } - }); - - // if matched is true the current .data-filter-column element is returned - return matched; - - }); - }); - $('.data-filter-column').addClass('hide').filter($filteredResults).addClass('show').removeClass('hide'); - // reset all check mark - $('#clearALLBtn').click(function(event){ - selectedFilters = []; - $('.data-filter-column').removeClass('hide') - var inputs = $('.check-mark') - for(var i = 0; i < inputs.length; i++) { - inputs[i].checked = false - } + }) }) -}); - - -})(jQuery); +})(jQuery) diff --git a/src/partials/body-landing-tutorials.hbs b/src/partials/body-landing-tutorials.hbs index 81eab6fe..60f61fd0 100644 --- a/src/partials/body-landing-tutorials.hbs +++ b/src/partials/body-landing-tutorials.hbs @@ -25,6 +25,9 @@
        {{{page.contents}}}
        + {{!--
        +

        No Record found

        +
        --}} diff --git a/src/partials/tutorials-filter.hbs b/src/partials/tutorials-filter.hbs index fb64be2e..72fe815c 100644 --- a/src/partials/tutorials-filter.hbs +++ b/src/partials/tutorials-filter.hbs @@ -2,53 +2,73 @@

        Filter by

        - Clear all + Clear all
          -
        • Products
          • +
        • + Roles +
            +
          • + + + +
            • +
          • + + +
            • + +
          • + + + +
            • +
          +
          • +
        • Products
        • Languages
            -
          • - - - -
            • -
          • - - -
            • - -
          • - - - -
            • -
          +
        • + + + +
          • +
        • + + +
          • + +
        • + + + +
          • +
      • Frameworks
      • Levels
        • - +
        • - + -
          • +
        • - + -
          • +
      - - + \ No newline at end of file From d4843b9df8f9e4b07f977c67915c83e38497c716 Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Sat, 23 May 2020 16:06:19 +0530 Subject: [PATCH 11/11] Fix esLiint error for landing page functionality --- src/css/landing-page.css | 19 +++-- src/js/01-nav.js | 30 ++------ src/js/06-page-rating.js | 11 +-- src/js/10-landing-page-nav.js | 134 +++++++++++++++++----------------- 4 files changed, 84 insertions(+), 110 deletions(-) diff --git a/src/css/landing-page.css b/src/css/landing-page.css index 81bf4a09..3ac7f12d 100644 --- a/src/css/landing-page.css +++ b/src/css/landing-page.css @@ -57,7 +57,7 @@ margin-right: 8px; } -.doc.landing-page-doc .filter-info{ +.doc.landing-page-doc .filter-info { margin-top: 15px; margin-bottom: 10px; display: inline-block; @@ -147,7 +147,7 @@ .doc.landing-page-doc ul li { list-style: none; - margin:0 0 8px; + margin: 0 0 8px; font-size: 1rem; font-family: "Open Sans", sans-serif; color: var(--color-brand-black); @@ -188,28 +188,27 @@ text-align: justify; } -.card-row.two-column-row .column:not(.data-filter-column):nth-child(odd){ +.card-row.two-column-row .column:not(.data-filter-column):nth-child(odd) { padding-right: 40px; } -.card-row.two-column-row .column:not(.data-filter-column):nth-child(even){ +.card-row.two-column-row .column:not(.data-filter-column):nth-child(even) { padding-left: 40px; } - .card-row.two-column-row .column.data-filter-column.even { padding-left: 40px; } + .card-row.two-column-row .column.data-filter-column.odd { padding-right: 40px; } - - -.card-row.two-column-row .column.data-filter-column.hide{ +.card-row.two-column-row .column.data-filter-column.hide { display: none; } -.hide{ + +.hide { display: none; } @@ -263,12 +262,12 @@ display: flex; align-items: center; text-decoration: none; - } .nav.tutorials-filter ul li a:hover { color: var(--color-brand-blue); } + .nav.tutorials-filter ul li a.active .arrow.arrow-right { transform: rotate(90deg); } diff --git a/src/js/01-nav.js b/src/js/01-nav.js index 3636123b..46633f03 100644 --- a/src/js/01-nav.js +++ b/src/js/01-nav.js @@ -79,7 +79,6 @@ var navMenuControl if (document.querySelector('.main-nav-parent')) { navMenuControl = document.querySelector('.main-nav-parent') - navMenuControl.addEventListener('click', function () { // navWrap.style.display = 'none' for (var i = 0; i < navItems.length; i++) { @@ -89,9 +88,8 @@ this.style.display = 'none' }) } - // Toggle class - function toggleActive(e) { + function toggleActive (e) { if (this.getAttribute('data-depth') === '1') { var otherNavs = document.querySelectorAll('.nav-item[data-depth="0"]:not(.is-active)') console.log(otherNavs) @@ -102,22 +100,8 @@ this.classList.toggle('is-active') } - // function addActive (e) { - // removeClasses(e) - // this.classList.add('is-active') - // concealEvent(e) - // } - var navItems = document.querySelectorAll('.nav .nav-item') - - // function removeClasses (e) { - // for (var i = 0; i < navItems.length; i++) { - // navItems[i].classList.remove('is-active') - // } - // concealEvent(e) - // } - - function revealNav(e) { + function revealNav (e) { if (nav.classList.contains('is-active')) return hideNav(e) document.documentElement.classList.add('is-clipped--nav') nav.classList.add('is-active') @@ -126,7 +110,7 @@ concealEvent(e) // NOTE don't let event get picked up by window click listener } - function hideNav(e) { + function hideNav (e) { if (e.which === 3 || e.button === 2) return document.documentElement.classList.remove('is-clipped--nav') nav.classList.remove('is-active') @@ -135,11 +119,11 @@ concealEvent(e) // NOTE don't let event get picked up by window click listener } - function find(selector, from) { + function find (selector, from) { return [].slice.call((from || document).querySelectorAll(selector)) } - function findAncestorWithClass(className, from, scope) { + function findAncestorWithClass (className, from, scope) { if ((from = from.parentNode) !== scope) { if (from.classList.contains(className)) { return from @@ -149,14 +133,14 @@ } } - function findNextElement(from, el) { + function findNextElement (from, el) { if ((el = from.nextElementSibling)) return el el = from while ((el = el.nextSibling) && el.nodeType !== 1); return el } - function concealEvent(e) { + function concealEvent (e) { e.stopPropagation() } })() diff --git a/src/js/06-page-rating.js b/src/js/06-page-rating.js index 3c5835b0..1aa90708 100644 --- a/src/js/06-page-rating.js +++ b/src/js/06-page-rating.js @@ -17,10 +17,9 @@ var anyFeedbackBtn = document.querySelector('.any-feedback-btn') // for config - - if(document.querySelector('.is-this-helpful-box')){ - var yesBtnData = helpYesBtn.dataset - var noBtnData = helpNoBtn.dataset + if (document.querySelector('.is-this-helpful-box')) { + var yesBtnData = helpYesBtn.dataset + var noBtnData = helpNoBtn.dataset helpYesBtn.addEventListener('click', function (e) { // dialogBox.style.display = 'block' this.classList.add('active') @@ -28,7 +27,6 @@ console.log(yesBtnData, 16) }) - helpNoBtn.addEventListener('click', function (e) { // dialogBox.style.display = 'block' this.classList.add('active') @@ -64,7 +62,4 @@ feedbackModal.classList.remove('show') }) } - - - })() diff --git a/src/js/10-landing-page-nav.js b/src/js/10-landing-page-nav.js index c40c8b90..09b95ae1 100644 --- a/src/js/10-landing-page-nav.js +++ b/src/js/10-landing-page-nav.js @@ -5,85 +5,81 @@ $(this).toggleClass('active') $(this).next('.sub-menu').slideToggle(10) }) - -// add class even odd -var $allData = $('.data-filter-column') -for(var i= 0; i < $allData.length; i++) { - console.log(i, 445, $allData[i]) - if((i % 2) == 1) { + // add class even odd + var $allData = $('.data-filter-column') + for (var i = 0; i < $allData.length; i++) { + console.log(i, 445, $allData[i]) + if ((i % 2) === 1) { $allData[i].classList.add('even') - }else{ - $allData[i].classList.add('odd') + } else { + $allData[i].classList.add('odd') + } } -} - // for filter menu - var $filterMenuCheckboxes = $('input[type="checkbox"]') - $filterMenuCheckboxes.on('change', function () { - var selectedFiltersData = {} - $filterMenuCheckboxes.filter(':checked').each(function () { - if (!selectedFiltersData.hasOwnProperty(this.name)) { - selectedFiltersData[this.name] = [] - } + // for filter menu + var $filterMenuCheckboxes = $('input[type="checkbox"]') + $filterMenuCheckboxes.on('change', function () { + var selectedFiltersData = {} + $filterMenuCheckboxes.filter(':checked').each(function () { + if (!Object.prototype.hasOwnProperty.call(selectedFiltersData, this.name)) { + selectedFiltersData[this.name] = [] + } // console.log(selectedFiltersData, 27) - selectedFiltersData[this.name].push(this.value.toLowerCase()) - }) - // create a collection containing all of the filterable elements - var $filteredResultsData = $('.data-filter-column') - // loop over the selected filter name -> (array) values pairs - $filteredResultsData.removeClass('even') - $filteredResultsData.removeClass('odd') - $.each(selectedFiltersData, function (name, filterValues) { - // filter each .data-filter-column element - $filteredResultsData = $filteredResultsData.filter(function () { - var matched = false, - currentFilterValues = $(this).find('.sub-heading').data('category').toLowerCase().split(' ') - - + selectedFiltersData[this.name].push(this.value.toLowerCase()) + }) + // create a collection containing all of the filterable elements + var $filteredResultsData = $('.data-filter-column') + // loop over the selected filter name -> (array) values pairs + $filteredResultsData.removeClass('even') + $filteredResultsData.removeClass('odd') + $.each(selectedFiltersData, function (name, filterValues) { + // filter each .data-filter-column element + $filteredResultsData = $filteredResultsData.filter(function () { + var matched = false + var currentFilterValues = $(this).find('.sub-heading').data('category').toLowerCase().split(' ') - $.each(currentFilterValues, function (_, currentFilterValue) { + $.each(currentFilterValues, function (_, currentFilterValue) { // console.log('enter', currentFilterValues, currentFilterValue) - if ($.inArray(currentFilterValue, filterValues) != -1) { - console.log('true', currentFilterValue, filterValues) - matched = true - return false - } - }) - // if matched is true the current .data-filter-column element is returned - return matched + if ($.inArray(currentFilterValue, filterValues) !== -1) { + console.log('true', currentFilterValue, filterValues) + matched = true + return false + } }) + // if matched is true the current .data-filter-column element is returned + return matched }) - + }) $('.data-filter-column').addClass('hide').filter($filteredResultsData).addClass('show').removeClass('hide') - // add class for data-filter-column - for(var i= 0; i < $filteredResultsData.length; i++) { - console.log(i, 445, $filteredResultsData[i]) - if((i % 2) == 1) { - $filteredResultsData[i].classList.add('even') - }else{ - $filteredResultsData[i].classList.add('odd') - } - } - // reset all check mark - $('#clearALLBtn').click(function (event) { - selectedFiltersData = [] - $('.data-filter-column').removeClass('hide').removeClass('show').removeClass('odd').removeClass('even') - var inputs = $('.check-mark') - for (var i = 0; i < inputs.length; i++) { - inputs[i].checked = false - } - for(var i= 0; i < $allData.length; i++) { - console.log(i, 445, $allData[i]) - // $allData[i].classList.remove('even') - // $allData[i].classList.remove('odd') - if((i % 2) == 1) { - $allData[i].classList.add('even') - }else{ - $allData[i].classList.add('odd') - } + // add class for data-filter-column + for (var i = 0; i < $filteredResultsData.length; i++) { + console.log(i, 445, $filteredResultsData[i]) + if ((i % 2) === 1) { + $filteredResultsData[i].classList.add('even') + } else { + $filteredResultsData[i].classList.add('odd') + } + } + // reset all check mark + $('#clearALLBtn').click(function (event) { + selectedFiltersData = [] + $('.data-filter-column').removeClass('hide').removeClass('show').removeClass('odd').removeClass('even') + var inputs = $('.check-mark') + for (var j = 0; j < inputs.length; j++) { + inputs[j].checked = false + } + for (var i = 0; i < $allData.length; i++) { + console.log(i, 445, $allData[i]) + // $allData[i].classList.remove('even') + // $allData[i].classList.remove('odd') + if ((i % 2) === 1) { + $allData[i].classList.add('even') + } else { + $allData[i].classList.add('odd') } - - }) + } }) + }) + /*eslint-env jquery*/ })(jQuery)