Skip to content
This repository has been archived by the owner on Dec 6, 2022. It is now read-only.

Commit

Permalink
Merge pull request #29 from pxblue/feature/pxblue-2534-blui-migration
Browse files Browse the repository at this point in the history
Brightlayer UI Migration
  • Loading branch information
EvanMcLaughlin-eaton authored Nov 3, 2021
2 parents d219eb8 + 1cfdd69 commit e6162b6
Show file tree
Hide file tree
Showing 13 changed files with 129 additions and 96 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGELOG

## v2.1.0 (November 5, 2021)
## v2.1.0 (November 3, 2021)

### Changed

Expand Down
22 changes: 11 additions & 11 deletions angular-demo/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module.exports = {
root: true,
parser: '@typescript-eslint/parser',
extends: [ '@pxblue/eslint-config/ts' ],
parserOptions: {
project: "./tsconfig.json",
},
env: {
browser: true
}
};
module.exports = {
root: true,
parser: '@typescript-eslint/parser',
extends: ['@brightlayer-ui/eslint-config/ts'],
parserOptions: {
project: "./tsconfig.json",
},
env: {
browser: true
}
};
11 changes: 7 additions & 4 deletions angular-demo/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# Highcharts Demo
This is a sample application demonstrating the PXBlue Highcharts library.

[View on Stackblitz](https://stackblitz.com/github/pxblue/highcharts/tree/master/angular-demo)
This is a sample application demonstrating the Brightlayer UI Highcharts library.

[View on Stackblitz](https://stackblitz.com/github/brightlayer-ui/highcharts/tree/master/angular-demo)

## Running the Example

```
git clone https://github.com/pxblue/highcharts
git clone https://github.com/brightlayer-ui/highcharts
cd highcharts
yarn start:angular
```

> **NOTE**: running the demo will use the latest src files from the repository and NOT the themes that are published on NPM.
For additional information read our [Angular Guide](https://pxblue.github.io/development/frameworks-web/angular) and our [Environment Setup](https://pxblue.github.io/development/environment)
For additional information read our [Angular Guide](https://brightlayer-ui.github.io/development/frameworks-web/angular) and our [Environment Setup](https://brightlayer-ui.github.io/development/environment)
10 changes: 5 additions & 5 deletions angular-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"@angular/platform-browser-dynamic": "~11.2.7",
"@angular/router": "~11.2.7",
"@pxblue/angular-themes": "^6.0.1",
"@pxblue/colors": "^3.0.0",
"@pxblue/highcharts": "^2.1.0-beta.0",
"@brightlayer-ui/colors": "^3.0.1",
"@brightlayer-ui/highcharts": "^2.1.0-beta.0",
"angular-highcharts": "^11.3.1",
"highcharts": "^9.0.1",
"rxjs": "~6.6.0",
Expand All @@ -39,8 +39,8 @@
"@angular-devkit/build-angular": "~0.1102.6",
"@angular/cli": "~11.2.6",
"@angular/compiler-cli": "~11.2.7",
"@pxblue/eslint-config": "^2.0.4",
"@pxblue/prettier-config": "^1.0.2",
"@brightlayer-ui/eslint-config": "^2.0.5",
"@brightlayer-ui/prettier-config": "^1.0.3",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "^4.5.0",
Expand All @@ -60,5 +60,5 @@
"ts-node": "~8.3.0",
"typescript": "~4.1.5"
},
"prettier": "@pxblue/prettier-config"
"prettier": "@brightlayer-ui/prettier-config"
}
8 changes: 4 additions & 4 deletions angular-demo/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
import { Component, OnInit } from '@angular/core';
import { Chart } from 'angular-highcharts';

import { createLineChart, createBarChart, createPieChart, createDonutChart } from '@pxblue/highcharts';
import * as PXBColors from '@pxblue/colors';
import { createLineChart, createBarChart, createPieChart, createDonutChart } from '@brightlayer-ui/highcharts';
import * as BLUIColors from '@brightlayer-ui/colors';

const mainConfig = {
colors: [PXBColors.blue[900], PXBColors.blue[500], PXBColors.blue[200]],
colors: [BLUIColors.blue[900], BLUIColors.blue[500], BLUIColors.blue[200]],
};

const lineConfig = {
colors: [PXBColors.blue[500], PXBColors.blue[200], PXBColors.blue[200]],
colors: [BLUIColors.blue[500], BLUIColors.blue[200], BLUIColors.blue[200]],
};

@Component({
Expand Down
27 changes: 15 additions & 12 deletions angular-demo/src/index.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>angular-demo</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/x-icon" href="favicon.ico" />
</head>
<body class="pxb-blue mat-typography mat-app-background">
<app-root></app-root>
</body>
</html>

<head>
<meta charset="utf-8" />
<title>angular-demo</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/x-icon" href="favicon.ico" />
</head>

<body class="pxb-blue mat-typography mat-app-background">
<app-root></app-root>
</body>

</html>
56 changes: 34 additions & 22 deletions angular-demo/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1143,6 +1143,40 @@
lodash "^4.17.19"
to-fast-properties "^2.0.0"

"@brightlayer-ui/colors@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/colors/-/colors-3.0.1.tgz#f085acf6b6b4266a01798c78bc25841d15e44b3e"
integrity sha512-AE9F6FN1EQWMoqFTak6q8MN3wg9et2u2SUs6HjYhcS3GVSHjMWVSsuJZ2aD5Lu9409Gfi6pBHDWsJZ5PyeLsdQ==
dependencies:
"@brightlayer-ui/types" "^2.0.0"

"@brightlayer-ui/eslint-config@^2.0.5":
version "2.0.5"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/eslint-config/-/eslint-config-2.0.5.tgz#b7ee0c47f4669d2ecefc45d5fc37d7a9e209ccc9"
integrity sha512-qUxNX/1z+cmBWzbOeFftxGD7SPT+xkT1rUj++xsZjIQajEkwF1Ka+0mRlSY5qqAsQpRLGDCHDszx8uztmSm1lA==
dependencies:
"@typescript-eslint/parser" "^4.8.0"
eslint-config-prettier ">= 6.3.0"
optionalDependencies:
eslint-plugin-react "^7.16.0"

"@brightlayer-ui/highcharts@^2.1.0-beta.0":
version "2.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/highcharts/-/highcharts-2.1.0-beta.0.tgz#ef9c7ba65899f5844926822bc44f01e6899d5f0a"
integrity sha512-2UvleFg96PmVrC6TH+hbGTgjGhxQxmAqzWYauVgmx+t+2VF2jLOcR8R9ZKdSrvx6W2fVfFHEmpvzwsIL9Xhadg==
dependencies:
"@brightlayer-ui/colors" "^3.0.1"

"@brightlayer-ui/prettier-config@^1.0.3":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/prettier-config/-/prettier-config-1.0.3.tgz#e40a7ae7435c6fd5118acbf249080e0aa81e93af"
integrity sha512-EYm3+V7Qd+oYEF+8FadsXAZqXryEHHbGnrV1BMp9selhABjceqUqXPVE4Sn3SKWQdBNJ3En2A3EzgrzRbvRTaw==

"@brightlayer-ui/types@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/types/-/types-2.0.0.tgz#d8adc0cdb96c164943adbad6e74043128a8b4112"
integrity sha512-DTCVwND6YC9qrkQl7pkFlN6QxDReJHtjuAiFU9HkXJN368vlw+fzHQ5/j4sB1sZl2eNwOgccv5ecl2XrlolOCw==

"@discoveryjs/[email protected]":
version "0.5.2"
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752"
Expand Down Expand Up @@ -1288,28 +1322,6 @@
dependencies:
"@pxblue/types" "^2.0.0"

"@pxblue/eslint-config@^2.0.4":
version "2.0.4"
resolved "https://registry.yarnpkg.com/@pxblue/eslint-config/-/eslint-config-2.0.4.tgz#b22d637e2e8bbf1d8606de99bfd7e95f3af2ce34"
integrity sha512-PDBj5dhi/6c14/QYhoFLTkMnrYRTKw8hW7AuFq/9wc7pJ4MdSOF3i5MJH1NZ1p9chBl9na4ZASPeHWsDCvvk8A==
dependencies:
"@typescript-eslint/parser" "^4.8.0"
eslint-config-prettier ">= 6.3.0"
optionalDependencies:
eslint-plugin-react "^7.16.0"

"@pxblue/highcharts@^2.1.0-beta.0":
version "2.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@pxblue/highcharts/-/highcharts-2.1.0-beta.0.tgz#7e102ba7855c2de80b2bd8fabdc05fc7b30af4c3"
integrity sha512-1hWdKpYPtFWZAFjSeefWq+sLdP1erGoVEE1amoOf6Ncbs7rfXTrWnNVSut3hJXe6Ol49gFcMHPtAg1XG0vGLDw==
dependencies:
"@pxblue/colors" "^3.0.0"

"@pxblue/prettier-config@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@pxblue/prettier-config/-/prettier-config-1.0.2.tgz#fb00503df6557b66c3d91d43c9101e614c35d2ec"
integrity sha512-/3cLBoTjZs3kV1ATPA/Sp0tsL7XmlV/b8HW/qt0jqR/uP5+cdXL2YIhMXQngLRa7PhpSkEiRIYK5sl0rKsXTUg==

"@pxblue/types@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@pxblue/types/-/types-2.0.0.tgz#3df970352aca5256974a10a97d75a2264bad1eba"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brightlayer-ui/highcharts",
"version": "2.1.0-beta.0",
"version": "2.1.0",
"description": "Base configurations for assorted HighCharts graph types for Brightlayer UI.",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion react-demo/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
root: true,
parser: '@typescript-eslint/parser',
extends: ['@pxblue/eslint-config/tsx'],
extends: ['@brightlayer-ui/eslint-config/tsx'],
parserOptions: {
project: "./tsconfig.json",
},
Expand Down
11 changes: 7 additions & 4 deletions react-demo/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# Highcharts Demo
This is a sample application demonstrating the PXBlue Highcharts library.

[View on CodeSandbox](https://codesandbox.io/s/github/pxblue/highcharts/tree/master/react-demo)
This is a sample application demonstrating the Brightlayer UI Highcharts library.

[View on CodeSandbox](https://codesandbox.io/s/github/brightlayer-ui/highcharts/tree/master/react-demo)

## Running the Example

```
git clone https://github.com/pxblue/highcharts
git clone https://github.com/brightlayer-ui/highcharts
cd highcharts
yarn start:react
```

> **NOTE**: running the demo will use the latest src files from the repository and NOT the themes that are published on NPM.
For additional information read our [React Guide](https://pxblue.github.io/development/frameworks-web/react) and our [Environment Setup](https://pxblue.github.io/development/environment)
For additional information read our [React Guide](https://brightlayer-ui.github.io/development/frameworks-web/react) and our [Environment Setup](https://brightlayer-ui.github.io/development/environment)
10 changes: 5 additions & 5 deletions react-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"dependencies": {
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@pxblue/colors": "^3.0.0",
"@pxblue/highcharts": "^2.1.0-beta.0",
"@brightlayer-ui/colors": "^3.0.1",
"@brightlayer-ui/highcharts": "^2.1.0-beta.0",
"@pxblue/icons-mui": "^2.2.1",
"@pxblue/react-themes": "^6.0.0",
"@testing-library/jest-dom": "^5.11.4",
Expand Down Expand Up @@ -56,8 +56,8 @@
]
},
"devDependencies": {
"@pxblue/eslint-config": "^2.0.4",
"@pxblue/prettier-config": "^1.0.2",
"@brightlayer-ui/eslint-config": "^2.0.5",
"@brightlayer-ui/prettier-config": "^1.0.3",
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
Expand All @@ -72,5 +72,5 @@
"jest": "26.6.0",
"prettier": "^2.1.2"
},
"prettier": "@pxblue/prettier-config"
"prettier": "@brightlayer-ui/prettier-config"
}
8 changes: 4 additions & 4 deletions react-demo/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import React from 'react';
import ReactHighcharts from 'react-highcharts';

// @ts-ignore
import { createLineChart, createBarChart, createPieChart, createDonutChart } from '@pxblue/highcharts';
import * as PXBColors from '@pxblue/colors';
import { createLineChart, createBarChart, createPieChart, createDonutChart } from '@brightlayer-ui/highcharts';
import * as BLUIColors from '@brightlayer-ui/colors';

const mainConfig = {
colors: [PXBColors.blue[900], PXBColors.blue[500], PXBColors.blue[200]],
colors: [BLUIColors.blue[900], BLUIColors.blue[500], BLUIColors.blue[200]],
};

const lineConfig = {
colors: [PXBColors.blue[500], PXBColors.blue[200], PXBColors.blue[200]],
colors: [BLUIColors.blue[500], BLUIColors.blue[200], BLUIColors.blue[200]],
};

const graphStyles = {
Expand Down
56 changes: 34 additions & 22 deletions react-demo/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,40 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

"@brightlayer-ui/colors@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/colors/-/colors-3.0.1.tgz#f085acf6b6b4266a01798c78bc25841d15e44b3e"
integrity sha512-AE9F6FN1EQWMoqFTak6q8MN3wg9et2u2SUs6HjYhcS3GVSHjMWVSsuJZ2aD5Lu9409Gfi6pBHDWsJZ5PyeLsdQ==
dependencies:
"@brightlayer-ui/types" "^2.0.0"

"@brightlayer-ui/eslint-config@^2.0.5":
version "2.0.5"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/eslint-config/-/eslint-config-2.0.5.tgz#b7ee0c47f4669d2ecefc45d5fc37d7a9e209ccc9"
integrity sha512-qUxNX/1z+cmBWzbOeFftxGD7SPT+xkT1rUj++xsZjIQajEkwF1Ka+0mRlSY5qqAsQpRLGDCHDszx8uztmSm1lA==
dependencies:
"@typescript-eslint/parser" "^4.8.0"
eslint-config-prettier ">= 6.3.0"
optionalDependencies:
eslint-plugin-react "^7.16.0"

"@brightlayer-ui/highcharts@^2.1.0-beta.0":
version "2.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/highcharts/-/highcharts-2.1.0-beta.0.tgz#ef9c7ba65899f5844926822bc44f01e6899d5f0a"
integrity sha512-2UvleFg96PmVrC6TH+hbGTgjGhxQxmAqzWYauVgmx+t+2VF2jLOcR8R9ZKdSrvx6W2fVfFHEmpvzwsIL9Xhadg==
dependencies:
"@brightlayer-ui/colors" "^3.0.1"

"@brightlayer-ui/prettier-config@^1.0.3":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/prettier-config/-/prettier-config-1.0.3.tgz#e40a7ae7435c6fd5118acbf249080e0aa81e93af"
integrity sha512-EYm3+V7Qd+oYEF+8FadsXAZqXryEHHbGnrV1BMp9selhABjceqUqXPVE4Sn3SKWQdBNJ3En2A3EzgrzRbvRTaw==

"@brightlayer-ui/types@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@brightlayer-ui/types/-/types-2.0.0.tgz#d8adc0cdb96c164943adbad6e74043128a8b4112"
integrity sha512-DTCVwND6YC9qrkQl7pkFlN6QxDReJHtjuAiFU9HkXJN368vlw+fzHQ5/j4sB1sZl2eNwOgccv5ecl2XrlolOCw==

"@cnakazawa/watch@^1.0.3":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
Expand Down Expand Up @@ -1546,33 +1580,11 @@
dependencies:
"@pxblue/types" "^2.0.0"

"@pxblue/eslint-config@^2.0.4":
version "2.0.4"
resolved "https://registry.yarnpkg.com/@pxblue/eslint-config/-/eslint-config-2.0.4.tgz#b22d637e2e8bbf1d8606de99bfd7e95f3af2ce34"
integrity sha512-PDBj5dhi/6c14/QYhoFLTkMnrYRTKw8hW7AuFq/9wc7pJ4MdSOF3i5MJH1NZ1p9chBl9na4ZASPeHWsDCvvk8A==
dependencies:
"@typescript-eslint/parser" "^4.8.0"
eslint-config-prettier ">= 6.3.0"
optionalDependencies:
eslint-plugin-react "^7.16.0"

"@pxblue/highcharts@^2.1.0-beta.0":
version "2.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@pxblue/highcharts/-/highcharts-2.1.0-beta.0.tgz#7e102ba7855c2de80b2bd8fabdc05fc7b30af4c3"
integrity sha512-1hWdKpYPtFWZAFjSeefWq+sLdP1erGoVEE1amoOf6Ncbs7rfXTrWnNVSut3hJXe6Ol49gFcMHPtAg1XG0vGLDw==
dependencies:
"@pxblue/colors" "^3.0.0"

"@pxblue/icons-mui@^2.2.1":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@pxblue/icons-mui/-/icons-mui-2.3.0.tgz#5398630529e5a89b2c93d13db7ccf86f14b8ab51"
integrity sha512-GzqkkSKFYgaSy1/LITheqI3BSxPthXE6UrCAz5Ubk1btwDajSvw0O5YR3/b4h7p9vfk/fIxSYgztW8H2/1i4Eg==

"@pxblue/prettier-config@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@pxblue/prettier-config/-/prettier-config-1.0.2.tgz#fb00503df6557b66c3d91d43c9101e614c35d2ec"
integrity sha512-/3cLBoTjZs3kV1ATPA/Sp0tsL7XmlV/b8HW/qt0jqR/uP5+cdXL2YIhMXQngLRa7PhpSkEiRIYK5sl0rKsXTUg==

"@pxblue/react-themes@^6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@pxblue/react-themes/-/react-themes-6.0.0.tgz#35ce84165263d8721bde638ed594f820c408727c"
Expand Down

0 comments on commit e6162b6

Please sign in to comment.