From df58c3ff2f0a3951854bbf14f00ba8abda159949 Mon Sep 17 00:00:00 2001 From: Daniel Bayley Date: Sat, 16 Dec 2023 14:39:40 +0000 Subject: [PATCH] Add `fire`/safety/security/amenities icons (#1392) * Add `fire-extinguisher` icon * Add `smoke-alarm` icon * Improve fire related metadata * Add `fire-alarm` icon * Add `cctv` icon * Add `cctv-off` icon * Update icons/fire-alarm.json Co-authored-by: Karsa * Update icons/fire-alarm.json Co-authored-by: Karsa * Rename `fire-alarm` to `bell-alarm` * Refine `cctv` icons * Optimise `bell-alarm` icon * Rename `bell-alarm` to `bell-electric` * Rename `smoke-alarm` to `alarm-smoke` * Refine `alarm-smoke` icon * Refine `cctv` icons * Update icons/alarm-smoke.svg Co-authored-by: Karsa * Update icons/cctv.svg Co-authored-by: Karsa * Update icons/fire-extinguisher.svg Co-authored-by: Karsa * update pr workflow * update pr workflow * add env * remove cctv off icons --------- Co-authored-by: Karsa Co-authored-by: Eric Fennis --- .github/workflows/pull-request.yml | 17 +++++++++++----- icons/alarm-smoke.json | 21 ++++++++++++++++++++ icons/alarm-smoke.svg | 17 ++++++++++++++++ icons/axe.json | 13 +++++++++++- icons/bell-electric.json | 32 ++++++++++++++++++++++++++++++ icons/bell-electric.svg | 18 +++++++++++++++++ icons/cctv.json | 22 ++++++++++++++++++++ icons/cctv.svg | 17 ++++++++++++++++ icons/fire-extinguisher.json | 32 ++++++++++++++++++++++++++++++ icons/fire-extinguisher.svg | 18 +++++++++++++++++ icons/flame.json | 12 ++++++++++- 11 files changed, 212 insertions(+), 7 deletions(-) create mode 100644 icons/alarm-smoke.json create mode 100644 icons/alarm-smoke.svg create mode 100644 icons/bell-electric.json create mode 100644 icons/bell-electric.svg create mode 100644 icons/cctv.json create mode 100644 icons/cctv.svg create mode 100644 icons/fire-extinguisher.json create mode 100644 icons/fire-extinguisher.svg diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index a669921d6..efe66440b 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -21,14 +21,21 @@ jobs: uses: tj-actions/changed-files@v35 with: files: icons/* - - uses: actions/setup-node@v3.8.1 - - name: Install simple-git (safer and faster than installing all deps) - run: npm install simple-git - - env: + - uses: pnpm/action-setup@v2 + with: + version: 8 + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: 'pnpm' + - name: Install deps + run: pnpm install --ignore-scripts + - name: Generate annotations + run: node ./scripts/updateContributors.mjs + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} FETCH_DEPTH: ${{ github.event.pull_request.commits }} CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }} - run: node ./scripts/updateContributors.mjs - name: Generate annotations env: ANNOTATION_SEVERITY: notice diff --git a/icons/alarm-smoke.json b/icons/alarm-smoke.json new file mode 100644 index 000000000..48c37d40a --- /dev/null +++ b/icons/alarm-smoke.json @@ -0,0 +1,21 @@ +{ + "$schema": "../icon.schema.json", + "contributors": [ + "danielbayley" + ], + "tags": [ + "fire", + "alert", + "warning", + "detector", + "carbon monoxide", + "safety", + "equipment", + "amenities" + ], + "categories": [ + "home", + "devices", + "travel" + ] +} \ No newline at end of file diff --git a/icons/alarm-smoke.svg b/icons/alarm-smoke.svg new file mode 100644 index 000000000..701b039ed --- /dev/null +++ b/icons/alarm-smoke.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/icons/axe.json b/icons/axe.json index 07dcfcce4..01391c36a 100644 --- a/icons/axe.json +++ b/icons/axe.json @@ -8,7 +8,18 @@ "karsa-mistmere" ], "tags": [ - "hatchet" + "hatchet", + "weapon", + "chop", + "sharp", + "equipment", + "fireman", + "firefighter", + "brigade", + "lumberjack", + "woodcutter", + "logger", + "forestry" ], "categories": [ "tools", diff --git a/icons/bell-electric.json b/icons/bell-electric.json new file mode 100644 index 000000000..9304dfdd8 --- /dev/null +++ b/icons/bell-electric.json @@ -0,0 +1,32 @@ +{ + "$schema": "../icon.schema.json", + "contributors": [ + "danielbayley" + ], + "tags": [ + "fire alarm", + "flames", + "smoke", + "firefighter", + "fireman", + "department", + "brigade", + "station", + "emergency", + "alert", + "safety", + "school bell", + "period break", + "recess", + "doorbell", + "entrance", + "entry", + "ring", + "reception" + ], + "categories": [ + "devices", + "notifications", + "home" + ] +} \ No newline at end of file diff --git a/icons/bell-electric.svg b/icons/bell-electric.svg new file mode 100644 index 000000000..2fd1aa5db --- /dev/null +++ b/icons/bell-electric.svg @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/icons/cctv.json b/icons/cctv.json new file mode 100644 index 000000000..7155ea907 --- /dev/null +++ b/icons/cctv.json @@ -0,0 +1,22 @@ +{ + "$schema": "../icon.schema.json", + "contributors": [ + "danielbayley" + ], + "tags": [ + "camera", + "surveillance", + "recording", + "film", + "videotape", + "crime", + "watching" + ], + "categories": [ + "security", + "devices", + "communication", + "connectivity", + "photography" + ] +} \ No newline at end of file diff --git a/icons/cctv.svg b/icons/cctv.svg new file mode 100644 index 000000000..0ea629706 --- /dev/null +++ b/icons/cctv.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/icons/fire-extinguisher.json b/icons/fire-extinguisher.json new file mode 100644 index 000000000..44b7f1093 --- /dev/null +++ b/icons/fire-extinguisher.json @@ -0,0 +1,32 @@ +{ + "$schema": "../icon.schema.json", + "contributors": [ + "danielbayley" + ], + "tags": [ + "flames", + "smoke", + "foam", + "water", + "spray", + "hose", + "firefighter", + "fireman", + "department", + "brigade", + "station", + "emergency", + "suppress", + "compressed", + "tank", + "cylinder", + "safety", + "equipment", + "amenities" + ], + "categories": [ + "home", + "tools", + "travel" + ] +} \ No newline at end of file diff --git a/icons/fire-extinguisher.svg b/icons/fire-extinguisher.svg new file mode 100644 index 000000000..0ee8d1105 --- /dev/null +++ b/icons/fire-extinguisher.svg @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/icons/flame.json b/icons/flame.json index e08a5f4d5..1f68cfb1d 100644 --- a/icons/flame.json +++ b/icons/flame.json @@ -7,7 +7,17 @@ ], "tags": [ "fire", - "lit" + "lit", + "burning", + "spark", + "embers", + "smoke", + "firefighter", + "fireman", + "department", + "brigade", + "station", + "emergency" ], "categories": [ "weather",