Skip to content

Commit

Permalink
Merge pull request #307 from etn-ccis/feature/4717-new-icon
Browse files Browse the repository at this point in the history
BLUI-4717: added 9 new icons
  • Loading branch information
ektaghag-eaton authored Feb 15, 2024
2 parents 0cb3ed3 + 9a2d177 commit 2267429
Show file tree
Hide file tree
Showing 129 changed files with 2,457 additions and 1,707 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @huayunh @daileytj @JeffGreiner-eaton @surajeaton
* @huayunh @JeffGreiner-eaton @surajeaton @ektaghag-eaton
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,15 @@ cd blui-icons
yarn install
```

To build the libraries:
After you have made changes, you may build the packages:

```sh
yarn build
```

There is a demo project in the repository which shows the various icon formats being used in a project. To start the demo, run:
There is a demo project in the repository which shows the various icon formats being used in a project. To start the demo, ensure that the demo project is using the latest version of packages you created before spinning up the development server:

```sh
yarn update:demo
yarn start
```
12 changes: 6 additions & 6 deletions demos/react-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"private": true,
"dependencies": {
"@brightlayer-ui/colors": "^3.1.1",
"@brightlayer-ui/icons": "2.2.0",
"@brightlayer-ui/icons-mui": "3.5.0",
"@brightlayer-ui/icons-svg": "1.13.0",
"@brightlayer-ui/icons": "2.3.0",
"@brightlayer-ui/icons-mui": "3.6.0",
"@brightlayer-ui/icons-svg": "1.14.0",
"@brightlayer-ui/react-components": "^6.2.0",
"@brightlayer-ui/react-native-vector-icons": "^2.0.0",
"@brightlayer-ui/react-themes": "^7.0.0",
Expand All @@ -19,8 +19,8 @@
"react": "^18.2.0",
"react-app-polyfill": "^3.0.0",
"react-dom": "^18.2.0",
"react-router": "^6.4.3",
"react-router-dom": "^6.14.2",
"react-router": "^6.22.0",
"react-router-dom": "^6.22.0",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
},
Expand Down Expand Up @@ -68,7 +68,7 @@
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "^7.32.2",
"prettier": "^2.7.1",
"prettier": "^3.2.5",
"typescript": "^4.9.3"
},
"prettier": "@brightlayer-ui/prettier-config"
Expand Down
3 changes: 3 additions & 0 deletions design/Devices/ethernet_port.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions design/Devices/wind_turbine.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
139 changes: 139 additions & 0 deletions design/META.json
Original file line number Diff line number Diff line change
Expand Up @@ -4305,6 +4305,145 @@
"tags": ["car", "door", "shed", "storage", "tool", "house"],
"author": "Michael Irigoyen",
"size": 24
},
{
"name": "Ethernet Port",
"filename": "ethernet_port.svg",
"family": ["Devices"],
"style": "baseline",
"tags": ["iot", "internet", "network", "plug", "connection", "web", "local", "cable", "link"],
"author": "Simran",
"size": 24
},
{
"name": "Skillet",
"filename": "skillet.svg",
"family": ["Residential"],
"style": "baseline",
"tags": ["iot", "cooking", "pot", "kitchen", "ware", "container", "heat", "cuiline", "stove", "soup"],
"author": "Google",
"size": 24
},
{
"name": "Skillet Cooktop",
"filename": "skillet_cooktop.svg",
"family": ["Residential"],
"style": "baseline",
"tags": ["iot", "cooking", "pot", "kitchen", "ware", "container", "heat", "cuiline", "stove", "soup"],
"author": "Google",
"size": 24
},
{
"name": "Cooking",
"filename": "cooking.svg",
"family": ["Residential"],
"style": "baseline",
"tags": ["iot", "cooking", "pot", "kitchen", "ware", "container", "heat", "cuiline", "stove", "soup"],
"author": "Google",
"size": 24
},
{
"name": "Stockpot",
"filename": "stockpot.svg",
"family": ["Residential"],
"style": "baseline",
"tags": [
"iot",
"cooking",
"pot",
"kitchen",
"ware",
"container",
"heat",
"cuiline",
"stove",
"soup",
"dutch oven"
],
"author": "Google",
"size": 24
},
{
"name": "Stove",
"filename": "stove.svg",
"family": ["Residential"],
"style": "baseline",
"tags": ["iot", "cooking", "pot", "kitchen", "ware", "container", "heat", "cuiline", "stove"],
"author": "Austin Andrews",
"size": 24
},
{
"name": "Wind Turbine",
"filename": "wind_turbine.svg",
"family": ["Devices"],
"style": "outlined",
"tags": [
"renewable",
"energy",
"green",
"carbon",
"footprint",
"blade",
"farm",
"grid",
"electricity",
"source",
"fan",
"generator",
"generate",
"generation",
"power"
],
"author": "Google",
"size": 24
},
{
"name": "Water Energy",
"filename": "water_energy.svg",
"family": ["Status"],
"style": "baseline",
"tags": [
"renewable",
"energy",
"green",
"carbon",
"footprint",
"turbine",
"turbo",
"grid",
"dam",
"hydro",
"electricity",
"source",
"generator",
"generate",
"generation",
"power"
],
"author": "Google",
"size": 24
},
{
"name": "IOT Scene",
"filename": "iot_scene.svg",
"family": ["Residential"],
"style": "baseline",
"tags": [
"iot",
"scenario",
"automation",
"living room",
"sofa",
"lamp",
"reading",
"recliner",
"light",
"time",
"schedule",
"control"
],
"author": "Google",
"size": 24
}
]
}
3 changes: 3 additions & 0 deletions design/Residential/cooking.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions design/Residential/iot_scene.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions design/Residential/skillet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions design/Residential/skillet_cooktop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions design/Residential/stockpot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions design/Residential/stove.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions design/Status/water_energy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"devDependencies": {
"@brightlayer-ui/prettier-config": "^1.0.3",
"prettier": "^2.2.1"
"prettier": "^3.2.5"
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit 2267429

Please sign in to comment.