From f13120bc018cbc924ffc07b21cb9d06b43d47917 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 28 Dec 2017 11:53:02 +0300 Subject: [PATCH 1/4] Updated Academy example data --- src/app/fuse-fake-db/academy.ts | 590 +++++++++++++++++++++++++------- 1 file changed, 471 insertions(+), 119 deletions(-) diff --git a/src/app/fuse-fake-db/academy.ts b/src/app/fuse-fake-db/academy.ts index 06e48d34..bbc70c1f 100644 --- a/src/app/fuse-fake-db/academy.ts +++ b/src/app/fuse-fake-db/academy.ts @@ -2,148 +2,148 @@ export class AcademyFakeDb { public static courses = [ { - 'id' : '15459251a6d6b397565', - 'title' : 'Basics of Angular', - 'slug' : 'basics-of-angular', - 'category' : 'web', - 'length' : 30, - 'updated' : 'Jun 28, 2017' + 'id' : '15459251a6d6b397565', + 'title' : 'Basics of Angular', + 'slug' : 'basics-of-angular', + 'category': 'web', + 'length' : 30, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '154588a0864d2881124', - 'title' : 'Basics of TypeScript', - 'slug' : 'basics-of-typeScript', - 'category' : 'web', - 'length' : 60, - 'updated' : 'Nov 01, 2017' + 'id' : '154588a0864d2881124', + 'title' : 'Basics of TypeScript', + 'slug' : 'basics-of-typeScript', + 'category': 'web', + 'length' : 60, + 'updated' : 'Nov 01, 2017' }, { - 'id' : '15453ba60d3baa5daaf', - 'title' : 'Android N: Quick Settings', - 'slug' : 'android-n-quick-settings', - 'category' : 'android', - 'length' : 120, - 'updated' : 'Jun 28, 2017' + 'id' : '15453ba60d3baa5daaf', + 'title' : 'Android N: Quick Settings', + 'slug' : 'android-n-quick-settings', + 'category': 'android', + 'length' : 120, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '15453a06c08fb021776', - 'title' : 'Keep Sensitive Data Safe and Private', - 'slug' : 'keep-sensitive-data-safe-and-private', - 'category' : 'android', - 'length' : 45, - 'updated' : 'Jun 28, 2017' + 'id' : '15453a06c08fb021776', + 'title' : 'Keep Sensitive Data Safe and Private', + 'slug' : 'keep-sensitive-data-safe-and-private', + 'category': 'android', + 'length' : 45, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '15427f4c1b7f3953234', - 'title' : 'Building a gRPC Service with Java', - 'slug' : 'building-a-grpc-service-with-java', - 'category' : 'cloud', - 'length' : 30, - 'updated' : 'Jun 28, 2017' + 'id' : '15427f4c1b7f3953234', + 'title' : 'Building a gRPC Service with Java', + 'slug' : 'building-a-grpc-service-with-java', + 'category': 'cloud', + 'length' : 30, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '1542d75d929a603125', - 'title' : 'Build a PWA Using Workbox', - 'slug' : 'build-a-pwa-using-workbox', - 'category' : 'web', - 'length' : 120, - 'updated' : 'Jun 28, 2017' + 'id' : '1542d75d929a603125', + 'title' : 'Build a PWA Using Workbox', + 'slug' : 'build-a-pwa-using-workbox', + 'category': 'web', + 'length' : 120, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '1543ee3a5b43e0f9f45', - 'title' : 'Build an App for the Google Assistant with Firebase and Dialogflow', - 'slug' : 'build-an-app-for-the-google-assistant-with-firebase-and-dialogflow', - 'category' : 'firebase', - 'length' : 30, - 'updated' : 'Jun 28, 2017' + 'id' : '1543ee3a5b43e0f9f45', + 'title' : 'Build an App for the Google Assistant with Firebase and Dialogflow', + 'slug' : 'build-an-app-for-the-google-assistant-with-firebase-and-dialogflow', + 'category': 'firebase', + 'length' : 30, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '1543cc4515df3146112', - 'title' : 'Cloud Functions for Firebase', - 'slug' : 'cloud-functions-for-firebase', - 'category' : 'firebase', - 'length' : 45, - 'updated' : 'Jun 28, 2017' + 'id' : '1543cc4515df3146112', + 'title' : 'Cloud Functions for Firebase', + 'slug' : 'cloud-functions-for-firebase', + 'category': 'firebase', + 'length' : 45, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '154398a4770d7aaf9a2', - 'title' : 'Manage Your Pivotal Cloud Foundry App\'s Using Apigee Edge', - 'slug' : 'manage-your-pivotal-cloud-foundry-apps-using-apigee-Edge', - 'category' : 'cloud', - 'length' : 90, - 'updated' : 'Jun 28, 2017' + 'id' : '154398a4770d7aaf9a2', + 'title' : 'Manage Your Pivotal Cloud Foundry App\'s Using Apigee Edge', + 'slug' : 'manage-your-pivotal-cloud-foundry-apps-using-apigee-Edge', + 'category': 'cloud', + 'length' : 90, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '15438351f87dcd68567', - 'title' : 'Building Beautiful UIs with Flutter', - 'your' : 'building-beautiful-uis-with-flutter', - 'category' : 'web', - 'length' : 90, - 'updated' : 'Jun 28, 2017' + 'id' : '15438351f87dcd68567', + 'title' : 'Building Beautiful UIs with Flutter', + 'your' : 'building-beautiful-uis-with-flutter', + 'category': 'web', + 'length' : 90, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '1544e43dcdae6ebf876', - 'title' : 'Cloud Firestore', - 'slug' : 'cloud-firestore', - 'category' : 'firebase', - 'length' : 90, - 'updated' : 'Jun 28, 2017' + 'id' : '1544e43dcdae6ebf876', + 'title' : 'Cloud Firestore', + 'slug' : 'cloud-firestore', + 'category': 'firebase', + 'length' : 90, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '1541ca7af66da284177', - 'title' : 'Customize Network Topology with Subnetworks', - 'slug' : 'customize-network-topology-with-subnetworks', - 'category' : 'web', - 'length' : 45, - 'updated' : 'Jun 28, 2017' + 'id' : '1541ca7af66da284177', + 'title' : 'Customize Network Topology with Subnetworks', + 'slug' : 'customize-network-topology-with-subnetworks', + 'category': 'web', + 'length' : 45, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '154297167e781781745', - 'title' : 'Looking at Campaign Finance with BigQuery', - 'slug' : 'looking-at-campaign-finance-with-bigquery', - 'category' : 'cloud', - 'length' : 60, - 'updated' : 'Jun 28, 2017' + 'id' : '154297167e781781745', + 'title' : 'Looking at Campaign Finance with BigQuery', + 'slug' : 'looking-at-campaign-finance-with-bigquery', + 'category': 'cloud', + 'length' : 60, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '154537435d5b32bf11a', - 'title' : 'Firebase Android', - 'slug' : 'firebase-android', - 'category' : 'android', - 'length' : 45, - 'updated' : 'Jun 28, 2017' + 'id' : '154537435d5b32bf11a', + 'title' : 'Firebase Android', + 'slug' : 'firebase-android', + 'category': 'android', + 'length' : 45, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '154204e45a59b168453', - 'title' : 'Simulating a Thread Network Using OpenThread', - 'slug' : 'simulating-a-thread-network-using-openthread', - 'category' : 'web', - 'length' : 45, - 'updated' : 'Jun 28, 2017' + 'id' : '154204e45a59b168453', + 'title' : 'Simulating a Thread Network Using OpenThread', + 'slug' : 'simulating-a-thread-network-using-openthread', + 'category': 'web', + 'length' : 45, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '1541dd1e05dfc439216', - 'title' : 'Your First Progressive Web App', - 'slug' : 'your-first-progressive-web-app', - 'category' : 'web', - 'length' : 30, - 'updated' : 'Jun 28, 2017' + 'id' : '1541dd1e05dfc439216', + 'title' : 'Your First Progressive Web App', + 'slug' : 'your-first-progressive-web-app', + 'category': 'web', + 'length' : 30, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '1532dfc67e704e48515', - 'title' : 'Launch Cloud Datalab', - 'slug' : 'launch-cloud-datalab', - 'category' : 'cloud', - 'length' : 60, - 'updated' : 'Jun 28, 2017' + 'id' : '1532dfc67e704e48515', + 'title' : 'Launch Cloud Datalab', + 'slug' : 'launch-cloud-datalab', + 'category': 'cloud', + 'length' : 60, + 'updated' : 'Jun 28, 2017' }, { - 'id' : '1542e43dfaae6ebf226', - 'title' : 'Personalize Your iOS App with Firebase User Management', - 'slug' : 'personalize-your-ios-app-with-firebase-user-management', - 'category' : 'firebase', - 'length' : 90, - 'updated' : 'Jun 28, 2017' + 'id' : '1542e43dfaae6ebf226', + 'title' : 'Personalize Your iOS App with Firebase User Management', + 'slug' : 'personalize-your-ios-app-with-firebase-user-management', + 'category': 'firebase', + 'length' : 90, + 'updated' : 'Jun 28, 2017' } ]; @@ -173,47 +173,399 @@ export class AcademyFakeDb private static demoSteps = [ { 'title' : 'Introduction', - 'content': '1 Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit


Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 1 - Introduction

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'Get the sample code', - 'content': '2 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 2 - Get the sample code

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'Create a Firebase project and Set up your app', - 'content': '3 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 3 - Create a Firebase project and Set up your app

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'Install the Firebase Command Line Interface', - 'content': '4 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 4 - Install the Firebase Command Line Interface

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'Deploy and run the web app', - 'content': '5 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 5 - Deploy and run the web app

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'The Functions Directory', - 'content': '6 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 6 - The Functions Directory

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'Import the Cloud Functions and Firebase Admin modules', - 'content': '7 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 7 - Import the Cloud Functions and Firebase Admin modules

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'Welcome New Users', - 'content': '8 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 8 - Welcome New Users

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'Images moderation', - 'content': '9 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 9 - Images moderation

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'New Message Notifications', - 'content': '10 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 10 - New Message Notifications

' + + '
' + + 'This is an example step of the course. You can put anything in here from example codes to videos.' + + '

' + + 'To install the CLI you need to have installed npm which typically comes with NodeJS.' + + 'To install or upgrade the CLI run the following npm command:' + + '

' + + 'npm -g install @angular/cli' + + '

' + + 'To verify that the CLI has been installed correctly, open a console and run:' + + '

' + + 'ng version' + + '

' + + '

Install dependencies

' + + '
' + + 'To moderate the images we\'ll need a few Node.js packages:' + + '

' + + '' + + '
' + + 'To install these three packages into your Cloud Functions app, run the following npm install --save command. Make sure that you do this from the functions directory.' + + '

' + + 'npm install --save @google-cloud/vision @google-cloud/storage child-process-promise' + + '

' + + 'This will install the three packages locally and add them as declared dependencies in your package.js file.' }, { 'title' : 'Congratulations!', - 'content': '11 Lorem ipsum dolor sit amet, consectetur adipiscing elit' + 'content': '

Step 11 - Congratulations!

' + + '
' + + 'You\'ve built a full-fidelity, offline-capable progressive web app by leveraging the power of reusable Web Components and Firebase. Why bother with a native app when you know how to do all that?!' } ]; From 0653b5f36b5c76e79dbaab2038cb4a6dabaaf042 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 28 Dec 2017 14:00:06 +0300 Subject: [PATCH 2/4] Academy app small tweaks and responsive fixes --- .../content/apps/academy/course/course.component.scss | 2 +- .../content/apps/academy/courses/courses.component.html | 4 ++-- .../content/apps/academy/courses/courses.component.scss | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/main/content/apps/academy/course/course.component.scss b/src/app/main/content/apps/academy/course/course.component.scss index eed7b8f6..64bfb404 100644 --- a/src/app/main/content/apps/academy/course/course.component.scss +++ b/src/app/main/content/apps/academy/course/course.component.scss @@ -163,7 +163,7 @@ padding: 48px; @media (max-width: 720px) { - padding: 0; + padding: 0 0 120px 0; } .course-step-content { diff --git a/src/app/main/content/apps/academy/courses/courses.component.html b/src/app/main/content/apps/academy/courses/courses.component.html index d0ff39e0..870d3764 100644 --- a/src/app/main/content/apps/academy/courses/courses.component.html +++ b/src/app/main/content/apps/academy/courses/courses.component.html @@ -20,8 +20,8 @@
-
+
diff --git a/src/app/main/content/apps/academy/courses/courses.component.scss b/src/app/main/content/apps/academy/courses/courses.component.scss index 30478f74..b437c44f 100644 --- a/src/app/main/content/apps/academy/courses/courses.component.scss +++ b/src/app/main/content/apps/academy/courses/courses.component.scss @@ -65,10 +65,16 @@ .filters { width: 100%; - max-width: 1000px; + max-width: 1040px; margin: 24px auto; + padding: 0 20px; + + @include media-breakpoint-down('xs') { + margin: 0 auto; + } .course-search { + width: 200px; @include media-breakpoint-down('xs') { margin-bottom: 16px; From 6f315aa38efd38614da9b5de03c63ab3c3e35faa Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Tue, 2 Jan 2018 12:00:46 +0300 Subject: [PATCH 3/4] Small fixes to Auth pages --- .../forgot-password-2/forgot-password-2.component.html | 1 - .../forgot-password-2/forgot-password-2.component.scss | 4 +++- .../pages/authentication/login-2/login-2.component.html | 1 - .../pages/authentication/login-2/login-2.component.scss | 4 +++- .../pages/authentication/register-2/register-2.component.html | 1 - .../pages/authentication/register-2/register-2.component.scss | 4 +++- .../reset-password-2/reset-password-2.component.html | 1 - .../reset-password-2/reset-password-2.component.scss | 4 +++- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.html b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.html index 668cac38..1a6992e0 100644 --- a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.html +++ b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.html @@ -27,7 +27,6 @@
RECOVER YOUR PASSWORD
-
Sed mollis velit facilisis facilisis viverra
diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss index 22190990..dab8f959 100644 --- a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss +++ b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss @@ -10,6 +10,7 @@ #forgot-password-intro { padding: 128px; + color: white; @include media-breakpoint('sm') { padding: 128px 64px; @@ -27,9 +28,10 @@ } .description { - padding-top: 8px; + padding-top: 16px; font-size: 14px; max-width: 600px; + color: rgba(255, 255, 255, 0.54); } } diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.html b/src/app/main/content/pages/authentication/login-2/login-2.component.html index 68377365..13ff9bb2 100644 --- a/src/app/main/content/pages/authentication/login-2/login-2.component.html +++ b/src/app/main/content/pages/authentication/login-2/login-2.component.html @@ -27,7 +27,6 @@
LOGIN TO YOUR ACCOUNT
-
Sed mollis velit facilisis facilisis viverra
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.scss b/src/app/main/content/pages/authentication/login-2/login-2.component.scss index 2a2d50a5..71e05f07 100644 --- a/src/app/main/content/pages/authentication/login-2/login-2.component.scss +++ b/src/app/main/content/pages/authentication/login-2/login-2.component.scss @@ -10,6 +10,7 @@ #login-intro { padding: 128px; + color: white; @include media-breakpoint('sm') { padding: 128px 64px; @@ -27,9 +28,10 @@ } .description { - padding-top: 8px; + padding-top: 16px; font-size: 14px; max-width: 600px; + color: rgba(255, 255, 255, 0.54); } } diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.html b/src/app/main/content/pages/authentication/register-2/register-2.component.html index 82331d80..ec5ad4e1 100644 --- a/src/app/main/content/pages/authentication/register-2/register-2.component.html +++ b/src/app/main/content/pages/authentication/register-2/register-2.component.html @@ -27,7 +27,6 @@
CREATE AN ACCOUNT
-
Sed mollis velit facilisis facilisis viverra
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.scss b/src/app/main/content/pages/authentication/register-2/register-2.component.scss index 9868851d..06dac9ef 100644 --- a/src/app/main/content/pages/authentication/register-2/register-2.component.scss +++ b/src/app/main/content/pages/authentication/register-2/register-2.component.scss @@ -10,6 +10,7 @@ #register-intro { padding: 128px; + color: white; @include media-breakpoint('sm') { padding: 128px 64px; @@ -27,9 +28,10 @@ } .description { - padding-top: 8px; + padding-top: 16px; font-size: 14px; max-width: 600px; + color: rgba(255, 255, 255, 0.54); } } diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.html b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.html index e5017346..ed45a2b8 100644 --- a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.html +++ b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.html @@ -27,7 +27,6 @@
RESET YOUR PASSWORD
-
Sed mollis velit facilisis facilisis viverra
diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss index 4138158e..10b978a1 100644 --- a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss +++ b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss @@ -10,6 +10,7 @@ #reset-password-intro { padding: 128px; + color: white; @include media-breakpoint('sm') { padding: 128px 64px; @@ -27,9 +28,10 @@ } .description { - padding-top: 8px; + padding-top: 16px; font-size: 14px; max-width: 600px; + color: rgba(255, 255, 255, 0.54); } } From 5f2372cc081b8986375393a789fb79ff9f2502f6 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Tue, 2 Jan 2018 12:29:32 +0300 Subject: [PATCH 4/4] Updated Angular Calendar due to broken AoT --- package-lock.json | 340 +++++++++++++++++++++++++++++++++------------- package.json | 2 +- 2 files changed, 250 insertions(+), 92 deletions(-) diff --git a/package-lock.json b/package-lock.json index 153137e0..c4ec46de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -122,7 +122,7 @@ "style-loader": "0.13.2", "stylus": "0.54.5", "stylus-loader": "3.0.1", - "uglifyjs-webpack-plugin": "1.1.4", + "uglifyjs-webpack-plugin": "1.1.5", "url-loader": "0.6.2", "webpack": "3.10.0", "webpack-dev-middleware": "1.12.2", @@ -387,9 +387,9 @@ } }, "acorn": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz", - "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz", + "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==", "dev": true }, "acorn-dynamic-import": { @@ -481,21 +481,21 @@ "dev": true }, "angular-calendar": { - "version": "0.22.3", - "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.22.3.tgz", - "integrity": "sha512-+5/rUaUoggQ2iNIAcwazl5xc1d9BDxR6QA8nmJsp+JWRaMPaoWoxA6njz8Mns1U6XSqrkcQYyhLSmTWHOpyNAQ==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.23.0.tgz", + "integrity": "sha512-/FrZx80RXI55gabVWnHFl1uX0jPbZ9PEjeR4QbkVkNGQaejucKwkOtPcUJ1+oHRB0fjJdm3ZN9sb4D/Kya2SjQ==", "requires": { - "angular-draggable-droppable": "1.1.1", - "angular-resizable-element": "1.2.4", - "calendar-utils": "0.0.59", + "angular-draggable-droppable": "2.0.0", + "angular-resizable-element": "2.0.0", + "calendar-utils": "0.0.60", "date-fns": "1.29.0", "positioning": "1.3.1" } }, "angular-draggable-droppable": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-1.1.1.tgz", - "integrity": "sha512-peha7H6EtuigMcdsbRinTOqUbQf+TDQ/Sgxme0xs0/Rk6dpFDZdEw0G/O89BG0q1mNQyOnYMdgf+wX0OfJDp7g==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-2.0.0.tgz", + "integrity": "sha512-/b8LIGamjOKnDI2uG1jRUErTIHeQ3w2WqHn4cbeiUTy+6eNHjkQI32DNhvxl0nVxr2gF5QluECNB4uWjMMyzQg==" }, "angular-in-memory-web-api": { "version": "0.5.2", @@ -503,17 +503,17 @@ "integrity": "sha1-/y6mZqv9BN19FslT7JcuExigmCQ=" }, "angular-resizable-element": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-1.2.4.tgz", - "integrity": "sha512-unMWXfmx02zfX4BUpvA+S+9/+QfXowRvS57jwGIV+Vhnl+9wTYHaHnoQS/dpiUpNrtuFw2K1V5/Fcz5ZHpxsww==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-2.0.0.tgz", + "integrity": "sha512-Jsa818fxtAtBA3Fp1u4mWV9tcpakM+bNYFFbB/AjKig2BtzZkeyLx3vjcBCfwPmXkK10kX2QKR8RDALk1w209A==" }, "angular2-markdown": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/angular2-markdown/-/angular2-markdown-1.6.0.tgz", "integrity": "sha1-hja/narXD8NWMxJnB/+zPmhPurE=", "requires": { - "marked": "0.3.6", - "prismjs": "1.8.4" + "marked": "0.3.9", + "prismjs": "1.9.0" } }, "ansi-html": { @@ -1219,9 +1219,9 @@ } }, "calendar-utils": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.0.59.tgz", - "integrity": "sha512-rj9knfXAIgGJFKAGmrYw8TNfy1FyTCzhd3utZPBC7fZS9HNeQsHGa9xwNtes/LDjdHYCnw4TM0BW/PxTB6hghQ==" + "version": "0.0.60", + "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.0.60.tgz", + "integrity": "sha512-45lyGf+9XZdq+gWUzeu0PwrbkH2lkxxAa2XdaVG1Jr8ENLLwajkThvJVMf1LruRHz6gF/MJcnWSgCCTJpNVGRQ==" }, "callsite": { "version": "1.0.0", @@ -2031,6 +2031,12 @@ "source-map": "0.5.7" } }, + "cuint": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", + "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", + "dev": true + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -2444,9 +2450,9 @@ "dev": true }, "delegate": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz", - "integrity": "sha1-moJRp3fXAl+qVXN7w7BxdCEnqf0=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", "optional": true }, "delegates": { @@ -4605,7 +4611,7 @@ "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", "optional": true, "requires": { - "delegate": "3.1.3" + "delegate": "3.2.0" } }, "graceful-fs": { @@ -4899,7 +4905,7 @@ "ncname": "1.0.0", "param-case": "2.1.1", "relateurl": "0.2.7", - "uglify-js": "3.3.2" + "uglify-js": "3.3.4" } }, "html-webpack-plugin": { @@ -5087,7 +5093,7 @@ "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", "dev": true, "requires": { - "postcss": "6.0.14" + "postcss": "6.0.15" }, "dependencies": { "chalk": { @@ -5099,17 +5105,28 @@ "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", + "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", "dev": true, "requires": { "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "4.5.0" + "supports-color": "5.1.0" } }, "source-map": { @@ -5117,6 +5134,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } } } }, @@ -6217,9 +6243,9 @@ "dev": true }, "marked": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz", - "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=" + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.9.tgz", + "integrity": "sha512-nW5u0dxpXxHfkHzzrveY45gCbi+R4PaO4WRZYqZNl+vB0hVGeqlFn0aOg1c8AKL63TrNFn9Bm2UP4AdiZ9TPLw==" }, "math-expression-evaluator": { "version": "1.2.17", @@ -7389,7 +7415,7 @@ "dev": true, "requires": { "balanced-match": "1.0.0", - "postcss": "6.0.14" + "postcss": "6.0.15" }, "dependencies": { "chalk": { @@ -7401,17 +7427,28 @@ "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", + "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", "dev": true, "requires": { "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "4.5.0" + "supports-color": "5.1.0" } }, "source-map": { @@ -7419,6 +7456,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } } } }, @@ -7517,7 +7563,7 @@ "dev": true, "requires": { "loader-utils": "1.1.0", - "postcss": "6.0.14", + "postcss": "6.0.15", "postcss-load-config": "1.2.0", "schema-utils": "0.3.0" }, @@ -7531,17 +7577,28 @@ "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", + "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", "dev": true, "requires": { "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "4.5.0" + "supports-color": "5.1.0" } }, "source-map": { @@ -7549,6 +7606,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } } } }, @@ -7642,7 +7708,7 @@ "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=", "dev": true, "requires": { - "postcss": "6.0.14" + "postcss": "6.0.15" }, "dependencies": { "chalk": { @@ -7654,17 +7720,28 @@ "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", + "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", "dev": true, "requires": { "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "4.5.0" + "supports-color": "5.1.0" } }, "source-map": { @@ -7672,6 +7749,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } } } }, @@ -7682,7 +7768,7 @@ "dev": true, "requires": { "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.14" + "postcss": "6.0.15" }, "dependencies": { "chalk": { @@ -7694,17 +7780,28 @@ "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", + "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", "dev": true, "requires": { "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "4.5.0" + "supports-color": "5.1.0" } }, "source-map": { @@ -7712,6 +7809,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } } } }, @@ -7722,7 +7828,7 @@ "dev": true, "requires": { "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.14" + "postcss": "6.0.15" }, "dependencies": { "chalk": { @@ -7734,17 +7840,28 @@ "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", + "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", "dev": true, "requires": { "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "4.5.0" + "supports-color": "5.1.0" } }, "source-map": { @@ -7752,6 +7869,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } } } }, @@ -7762,7 +7888,7 @@ "dev": true, "requires": { "icss-replace-symbols": "1.1.0", - "postcss": "6.0.14" + "postcss": "6.0.15" }, "dependencies": { "chalk": { @@ -7774,17 +7900,28 @@ "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", + "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", "dev": true, "requires": { "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "4.5.0" + "supports-color": "5.1.0" } }, "source-map": { @@ -7792,6 +7929,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } } } }, @@ -7899,7 +8045,7 @@ "mime": "1.6.0", "minimatch": "3.0.4", "mkdirp": "0.5.1", - "postcss": "6.0.14", + "postcss": "6.0.15", "xxhashjs": "0.2.1" }, "dependencies": { @@ -7912,17 +8058,28 @@ "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "postcss": { - "version": "6.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", - "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", + "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", "dev": true, "requires": { "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "4.5.0" + "supports-color": "5.1.0" } }, "source-map": { @@ -7930,6 +8087,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } } } }, @@ -7973,9 +8139,9 @@ } }, "prismjs": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.8.4.tgz", - "integrity": "sha1-VzzHoUwsBlZuHsog2BP1rlXbgNI=", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.9.0.tgz", + "integrity": "sha1-+j4tntw8OIfB8fMJXUHx+bQgDw8=", "requires": { "clipboard": "1.7.1" } @@ -9809,9 +9975,9 @@ "dev": true }, "uglify-js": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.2.tgz", - "integrity": "sha512-uZp2gduFfZDDfx0iIAmfKgRTANCooWcFjnFmJ2n8x/+RpBNk97lac1HU5wvZxWZCBbwHmTFDpWAsEhKnQpsM2A==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.4.tgz", + "integrity": "sha512-hfIwuAQI5dlXP30UtdmWoYF9k+ypVqBXIdmd6ZKBiaNHHvA8ty7ZloMe3+7S5AEKVkxHbjByl4DfRHQ7QpZquw==", "dev": true, "requires": { "commander": "2.12.1", @@ -9834,9 +10000,9 @@ "optional": true }, "uglifyjs-webpack-plugin": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.4.tgz", - "integrity": "sha512-fRrOJ5tv6YCsJIhP9mPRnfgyo4DVNSIfNOa7Gs9aT1NNpeJc85W7GcbVxQgc+9rU3No6tnkbMqZ4xsgRBU+HGQ==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.5.tgz", + "integrity": "sha512-YBGc9G7dv12Vjx8vUQs54DZgAXVf04LlG6dNNiEbTZjL3PbUqiY4uPB9Kv+fUJaqRskEGva/lS7sh08yJr7jnA==", "dev": true, "requires": { "cacache": "10.0.1", @@ -9844,7 +10010,7 @@ "schema-utils": "0.3.0", "serialize-javascript": "1.4.0", "source-map": "0.6.1", - "uglify-es": "3.3.2", + "uglify-es": "3.2.2", "webpack-sources": "1.1.0", "worker-farm": "1.5.2" }, @@ -9856,9 +10022,9 @@ "dev": true }, "uglify-es": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.2.tgz", - "integrity": "sha512-g7rGvx7YiFROLXKUtFMTw+YpTVV/XXPNvDUQfzwDTcB3vINwLUr3qXnkcPCu8VCIVjxI2EqaZ+sHoAxcYE/98w==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz", + "integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==", "dev": true, "requires": { "commander": "2.12.1", @@ -10191,7 +10357,7 @@ "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==", "dev": true, "requires": { - "acorn": "5.2.1", + "acorn": "5.3.0", "acorn-dynamic-import": "2.0.2", "ajv": "5.5.2", "ajv-keywords": "2.1.1", @@ -10748,14 +10914,6 @@ "dev": true, "requires": { "cuint": "0.2.2" - }, - "dependencies": { - "cuint": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", - "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", - "dev": true - } } }, "y18n": { diff --git a/package.json b/package.json index 5e56fcc2..7fb50514 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@swimlane/ngx-charts": "7.0.1", "@swimlane/ngx-datatable": "11.1.7", "@swimlane/ngx-dnd": "3.1.0", - "angular-calendar": "0.22.3", + "angular-calendar": "0.23.0", "angular-in-memory-web-api": "0.5.2", "angular2-markdown": "1.6.0", "classlist.js": "1.1.20150312",