From af025da5717beadb84b151600ae136cf2cbb931b Mon Sep 17 00:00:00 2001 From: antontranelis <31516529+antontranelis@users.noreply.github.com> Date: Sat, 26 Oct 2024 08:31:31 +0200 Subject: [PATCH 1/7] Create GLOSSAR.md --- GLOSSAR.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 GLOSSAR.md diff --git a/GLOSSAR.md b/GLOSSAR.md new file mode 100644 index 00000000..61e41ff4 --- /dev/null +++ b/GLOSSAR.md @@ -0,0 +1,19 @@ +# Glossar + +#### Map +An instance of the Utopia Map with its own name, its own users and [Items](#Item) in predefined [Layers](#Layer) + +#### Layer +A predefined category of [Items](#Item), with predefined [Map Markers](#Map_Marker), icons, colors, popups and profiles + +#### Item +An item is an object whith a profile which is part of one [Layer](#Layer) and usually has a geographic position shown on the map wih map marker and popup + +#### Map Marker +A marker on a Map which shows the geographic position of an [Item](#Item) + +#### Popup +Popup which opens when the user clicks a Map Marker. Beside the View Popup there is also an Edit Popup + +#### Profile +Belongs to an [Item](#Item) ans shows all the data of it From 080e49d6fab4a1745e619d6d0320927edc05ee20 Mon Sep 17 00:00:00 2001 From: antontranelis <31516529+antontranelis@users.noreply.github.com> Date: Sat, 26 Oct 2024 08:34:11 +0200 Subject: [PATCH 2/7] Update GLOSSAR.md --- GLOSSAR.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GLOSSAR.md b/GLOSSAR.md index 61e41ff4..550937a7 100644 --- a/GLOSSAR.md +++ b/GLOSSAR.md @@ -4,16 +4,16 @@ An instance of the Utopia Map with its own name, its own users and [Items](#Item) in predefined [Layers](#Layer) #### Layer -A predefined category of [Items](#Item), with predefined [Map Markers](#Map_Marker), icons, colors, popups and profiles +A predefined category of [Items](#Item), with predefined [Map Markers](#Map-Marker), icons, colors, [Popups](#Popups) and [Profiles](#Profile) #### Item -An item is an object whith a profile which is part of one [Layer](#Layer) and usually has a geographic position shown on the map wih map marker and popup +An item is an object whith a profile which is part of one [Layer](#Layer) and usually has a geographic position shown on the map wiht [Map Marker](#Map-Marker) and [Popup](#Popup) #### Map Marker A marker on a Map which shows the geographic position of an [Item](#Item) #### Popup -Popup which opens when the user clicks a Map Marker. Beside the View Popup there is also an Edit Popup +It opens when the user clicks a Map Marker. #### Profile Belongs to an [Item](#Item) ans shows all the data of it From 0533834ecc25ea7e077bf05213bcb4b9231a28b4 Mon Sep 17 00:00:00 2001 From: antontranelis <31516529+antontranelis@users.noreply.github.com> Date: Sat, 26 Oct 2024 08:36:14 +0200 Subject: [PATCH 3/7] Update GLOSSAR.md --- GLOSSAR.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GLOSSAR.md b/GLOSSAR.md index 550937a7..d46faaed 100644 --- a/GLOSSAR.md +++ b/GLOSSAR.md @@ -16,4 +16,4 @@ A marker on a Map which shows the geographic position of an [Item](#Item) It opens when the user clicks a Map Marker. #### Profile -Belongs to an [Item](#Item) ans shows all the data of it +A representation of all the the data of an [Item](#Item) From 168cd28af711ba1df79cdde869caf22705487c20 Mon Sep 17 00:00:00 2001 From: antontranelis <31516529+antontranelis@users.noreply.github.com> Date: Sat, 26 Oct 2024 08:40:28 +0200 Subject: [PATCH 4/7] Update GLOSSAR.md --- GLOSSAR.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GLOSSAR.md b/GLOSSAR.md index d46faaed..de53e5d0 100644 --- a/GLOSSAR.md +++ b/GLOSSAR.md @@ -1,10 +1,10 @@ # Glossar #### Map -An instance of the Utopia Map with its own name, its own users and [Items](#Item) in predefined [Layers](#Layer) +A geographic interactive map and an instance of the Utopia Map with its own name, its own users and [Items](#Item) in predefined [Layers](#Layer) #### Layer -A predefined category of [Items](#Item), with predefined [Map Markers](#Map-Marker), icons, colors, [Popups](#Popups) and [Profiles](#Profile) +A predefined category of [Items](#Item), with predefined [Map Markers](#Map-Marker), icons, colors, texts, [Popups](#Popups) and [Profiles](#Profile) #### Item An item is an object whith a profile which is part of one [Layer](#Layer) and usually has a geographic position shown on the map wiht [Map Marker](#Map-Marker) and [Popup](#Popup) @@ -13,7 +13,7 @@ An item is an object whith a profile which is part of one [Layer](#Layer) and us A marker on a Map which shows the geographic position of an [Item](#Item) #### Popup -It opens when the user clicks a Map Marker. +A small preview of an item which opens on the map when the user clicks it's [Map Marker](#Map-Marker). #### Profile A representation of all the the data of an [Item](#Item) From 5c9373eabd580c16a1000a39366f27a7eabc8ea0 Mon Sep 17 00:00:00 2001 From: antontranelis <31516529+antontranelis@users.noreply.github.com> Date: Sun, 27 Oct 2024 07:13:23 +0100 Subject: [PATCH 5/7] Update GLOSSAR.md --- GLOSSAR.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GLOSSAR.md b/GLOSSAR.md index de53e5d0..8d8dfa12 100644 --- a/GLOSSAR.md +++ b/GLOSSAR.md @@ -17,3 +17,6 @@ A small preview of an item which opens on the map when the user clicks it's [Map #### Profile A representation of all the the data of an [Item](#Item) + +#### Network +An initiative that aims to connect people in real life by providing their own [Map instance](#Map) to its circle From 4d9bb8bf8306d5cf6c5d85c8b870044e0ff8040f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 29 Oct 2024 10:29:25 +0100 Subject: [PATCH 6/7] implement test.lint workflow --- .github/workflows/test.lint.yml | 61 +++++++++++++++++++++++++++++++++ .tool-versions | 1 + package.json | 3 +- 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/test.lint.yml create mode 100644 .tool-versions diff --git a/.github/workflows/test.lint.yml b/.github/workflows/test.lint.yml new file mode 100644 index 00000000..a774ad62 --- /dev/null +++ b/.github/workflows/test.lint.yml @@ -0,0 +1,61 @@ +name: test:lint + +on: push + +jobs: + files-changed: + name: Detect File Changes - src/ + runs-on: ubuntu-latest + outputs: + src: ${{ steps.filter.outputs.src }} + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7 + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 + id: filter + with: + src: | + src: + - '.github/workflows/**/*' + - 'src/**/*' + +# build: +# if: needs.files-changed.outputs.frontend == 'true' +# name: Build - Frontend +# needs: files-changed +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7 +# - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.0.3 +# with: +# node-version-file: './.tool-versions' +# - name: Frontend | Build +# run: npm install && npm run build +# working-directory: ./frontend + + lint: + if: needs.files-changed.outputs.src == 'true' + name: Lint + needs: files-changed + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7 + - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.0.3 + with: + node-version-file: './.tool-versions' + - name: Lint + run: npm install && npm run test:lint:eslint + working-directory: ./ + +# unit: +# if: needs.files-changed.outputs.frontend == 'true' +# name: Unit - Frontend +# needs: files-changed +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7 +# - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.0.3 +# with: +# node-version-file: './.tool-versions' +# - name: Frontend | Unit +# run: npm install && npm run test:unit +# working-directory: ./frontend diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000..4120b7f8 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +nodejs 20.12.1 diff --git a/package.json b/package.json index d4fe0244..0e6b4e27 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "types": "dist/index.d.ts", "scripts": { "build": "rollup -c", - "start": "rollup -c -w" + "start": "rollup -c -w", + "test:lint:eslint": "eslint --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.json,.yml,.yaml --max-warnings 0 ." }, "files": [ "dist" From 625c85cd4532aec365adadd9e95d558c0fcee6ea Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 29 Oct 2024 10:36:17 +0100 Subject: [PATCH 7/7] fix workflow --- .github/workflows/test.lint.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.lint.yml b/.github/workflows/test.lint.yml index a774ad62..591c0652 100644 --- a/.github/workflows/test.lint.yml +++ b/.github/workflows/test.lint.yml @@ -4,17 +4,17 @@ on: push jobs: files-changed: - name: Detect File Changes - src/ + name: Detect File Changes - lint runs-on: ubuntu-latest outputs: - src: ${{ steps.filter.outputs.src }} + lint: ${{ steps.filter.outputs.lint }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7 - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: filter with: - src: | - src: + filters: | + lint: - '.github/workflows/**/*' - 'src/**/*' @@ -33,7 +33,7 @@ jobs: # working-directory: ./frontend lint: - if: needs.files-changed.outputs.src == 'true' + if: needs.files-changed.outputs.lint == 'true' name: Lint needs: files-changed runs-on: ubuntu-latest