From 573119e6e8344e850f7c21ad7bf5a4b58e19290c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Thu, 15 Feb 2024 15:55:34 +0100 Subject: [PATCH] chore: change `master` reference to `main` (#156) --- .github/CONTRIBUTING.md | 14 +++++++------- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yml | 2 +- .github/workflows/docs.yml | 2 +- README.md | 4 ++-- src/iotMapManager/css/map.css | 2 +- src/iotMapManager/css/markers.css | 2 +- src/iotMapManager/css/popup.css | 2 +- src/iotMapManager/css/shadows.css | 2 +- src/iotMapManager/css/tabs.css | 2 +- src/iotMapManager/import_png.d.ts | 2 +- src/iotMapManager/index.ts | 2 +- src/iotMapManager/iot-map-manager.css | 2 +- src/iotMapManager/src/iot-map-area-manager.ts | 2 +- src/iotMapManager/src/iot-map-area.ts | 2 +- src/iotMapManager/src/iot-map-cluster-manager.ts | 2 +- src/iotMapManager/src/iot-map-cluster.ts | 2 +- src/iotMapManager/src/iot-map-common-svg.ts | 2 +- src/iotMapManager/src/iot-map-config.ts | 2 +- src/iotMapManager/src/iot-map-icons.ts | 2 +- src/iotMapManager/src/iot-map-manager.ts | 2 +- src/iotMapManager/src/iot-map-marker-manager.ts | 2 +- src/iotMapManager/src/iot-map-marker.ts | 2 +- src/iotMapManager/src/iot-map-path-manager.ts | 2 +- src/iotMapManager/src/iot-map-path.ts | 2 +- src/iotMapManager/src/iot-map-types.ts | 2 +- .../src/iot-map-user-marker-manager.ts | 2 +- src/iotMapManager/src/iot-map-user-marker.ts | 2 +- 28 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6452c641..836e4913 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -55,7 +55,7 @@ Guidelines for bug reports: reported. 2. **Check if the issue has been fixed** — try to reproduce it using the - latest `master` in the repository. + latest `main` in the repository. 3. **Isolate the problem** — ideally create a [reduced test case](https://css-tricks.com/reduced-test-cases/) and a live example. @@ -142,11 +142,11 @@ included in the project: 2. If you cloned a while ago, get the latest changes from upstream: ```bash - git checkout master - git pull upstream master + git checkout main + git pull upstream main ``` -3. Create a new topic branch (off the master project development branch) to +3. Create a new topic branch (off the main project development branch) to contain your feature, change, or fix: ```bash @@ -155,14 +155,14 @@ included in the project: 4. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) - or your code is unlikely be merged into the master project. Use Git's + or your code is unlikely be merged into the main project. Use Git's [interactive rebase](https://help.github.com/articles/about-git-rebase/) feature to tidy up your commits before making them public. 5. Locally merge (or rebase) the upstream development branch into your topic branch: ```bash - git pull [--rebase] upstream master + git pull [--rebase] upstream main ``` 6. Push your topic branch up to your fork: @@ -172,7 +172,7 @@ included in the project: ``` 7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/) - with a clear title and description against the `master` branch. + with a clear title and description against the `main` branch. **IMPORTANT**: By submitting a patch, you agree to allow the project owners to license your work under the terms of the [MIT License](../LICENSE) (if it diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 0cbe00c6..50a56c55 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -13,7 +13,7 @@ body: required: true - label: I have [validated](https://html5.validator.nu/) any HTML to avoid common problems required: true - - label: I have read the [contributing guidelines](https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/.github/CONTRIBUTING.md) + - label: I have read the [contributing guidelines](https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/.github/CONTRIBUTING.md) required: true - type: textarea id: what-happened diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 23bc3514..37f45ef7 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -11,7 +11,7 @@ body: options: - label: I have [searched](https://github.com/Orange-OpenSource/IOT-Map-Component/issues?utf8=%E2%9C%93&q=is%3Aissue) for duplicate or closed feature requests required: true - - label: I have read the [contributing guidelines](https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/.github/CONTRIBUTING.md) + - label: I have read the [contributing guidelines](https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/.github/CONTRIBUTING.md) required: true - type: textarea id: proposal diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7807147d..b5e870b3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,7 +2,7 @@ name: Docs on: push: branches: - - master + - main env: FORCE_COLOR: 2 diff --git a/README.md b/README.md index 429a5cea..050be92e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

IoT Map Component is a map component, based on Leaflet, to be integrated in computer or mobile web applications developed in Angular or React. It provides Orange branded design and user experience.
- Visit documentation + Visit documentation

Report bug @@ -88,7 +88,7 @@ Then, display a map by inserting in your page: ``` ``` -Angular sample of use is given in ```map/map.components.ts``` (and not included by npm) to display/refresh map elements, using javascript **IoTMapManager** class methods (see [src/iotMapManager/readme.md](https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/src/iotMapManager/readme.md)). +Angular sample of use is given in ```map/map.components.ts``` (and not included by npm) to display/refresh map elements, using javascript **IoTMapManager** class methods (see [src/iotMapManager/readme.md](https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/src/iotMapManager/readme.md)). ## Storybook diff --git a/src/iotMapManager/css/map.css b/src/iotMapManager/css/map.css index 44a1b677..801be4d5 100644 --- a/src/iotMapManager/css/map.css +++ b/src/iotMapManager/css/map.css @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/css/markers.css b/src/iotMapManager/css/markers.css index 834388bd..8b1f27d7 100644 --- a/src/iotMapManager/css/markers.css +++ b/src/iotMapManager/css/markers.css @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/css/popup.css b/src/iotMapManager/css/popup.css index 357a0693..ca69db56 100644 --- a/src/iotMapManager/css/popup.css +++ b/src/iotMapManager/css/popup.css @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/css/shadows.css b/src/iotMapManager/css/shadows.css index cc000105..54a2fe61 100644 --- a/src/iotMapManager/css/shadows.css +++ b/src/iotMapManager/css/shadows.css @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/css/tabs.css b/src/iotMapManager/css/tabs.css index 6a261dc2..103da87f 100644 --- a/src/iotMapManager/css/tabs.css +++ b/src/iotMapManager/css/tabs.css @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/import_png.d.ts b/src/iotMapManager/import_png.d.ts index 918f2c06..dde87911 100644 --- a/src/iotMapManager/import_png.d.ts +++ b/src/iotMapManager/import_png.d.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/index.ts b/src/iotMapManager/index.ts index 2c7ae3ea..f0c7d2f3 100644 --- a/src/iotMapManager/index.ts +++ b/src/iotMapManager/index.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/iot-map-manager.css b/src/iotMapManager/iot-map-manager.css index 08e59a23..d42d4b15 100644 --- a/src/iotMapManager/iot-map-manager.css +++ b/src/iotMapManager/iot-map-manager.css @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-area-manager.ts b/src/iotMapManager/src/iot-map-area-manager.ts index d8fdce01..a6b20b5c 100644 --- a/src/iotMapManager/src/iot-map-area-manager.ts +++ b/src/iotMapManager/src/iot-map-area-manager.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-area.ts b/src/iotMapManager/src/iot-map-area.ts index a68b4728..0d7d49d8 100644 --- a/src/iotMapManager/src/iot-map-area.ts +++ b/src/iotMapManager/src/iot-map-area.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-cluster-manager.ts b/src/iotMapManager/src/iot-map-cluster-manager.ts index fc199481..9b466807 100644 --- a/src/iotMapManager/src/iot-map-cluster-manager.ts +++ b/src/iotMapManager/src/iot-map-cluster-manager.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-cluster.ts b/src/iotMapManager/src/iot-map-cluster.ts index 0496dc23..22213156 100644 --- a/src/iotMapManager/src/iot-map-cluster.ts +++ b/src/iotMapManager/src/iot-map-cluster.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-common-svg.ts b/src/iotMapManager/src/iot-map-common-svg.ts index cd1e44eb..0971c0ac 100644 --- a/src/iotMapManager/src/iot-map-common-svg.ts +++ b/src/iotMapManager/src/iot-map-common-svg.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-config.ts b/src/iotMapManager/src/iot-map-config.ts index 8e2555dd..34ab1863 100644 --- a/src/iotMapManager/src/iot-map-config.ts +++ b/src/iotMapManager/src/iot-map-config.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-icons.ts b/src/iotMapManager/src/iot-map-icons.ts index d13f51ee..6cac063c 100644 --- a/src/iotMapManager/src/iot-map-icons.ts +++ b/src/iotMapManager/src/iot-map-icons.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-manager.ts b/src/iotMapManager/src/iot-map-manager.ts index 772e5b71..fb6dd201 100644 --- a/src/iotMapManager/src/iot-map-manager.ts +++ b/src/iotMapManager/src/iot-map-manager.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-marker-manager.ts b/src/iotMapManager/src/iot-map-marker-manager.ts index 16a0a8a8..1970c2fe 100644 --- a/src/iotMapManager/src/iot-map-marker-manager.ts +++ b/src/iotMapManager/src/iot-map-marker-manager.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-marker.ts b/src/iotMapManager/src/iot-map-marker.ts index 808d7c23..31a4f6ed 100644 --- a/src/iotMapManager/src/iot-map-marker.ts +++ b/src/iotMapManager/src/iot-map-marker.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-path-manager.ts b/src/iotMapManager/src/iot-map-path-manager.ts index de67a238..f16dc543 100644 --- a/src/iotMapManager/src/iot-map-path-manager.ts +++ b/src/iotMapManager/src/iot-map-path-manager.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-path.ts b/src/iotMapManager/src/iot-map-path.ts index 9f57ba36..890c79cf 100644 --- a/src/iotMapManager/src/iot-map-path.ts +++ b/src/iotMapManager/src/iot-map-path.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-types.ts b/src/iotMapManager/src/iot-map-types.ts index 5254667d..4e2d03fa 100644 --- a/src/iotMapManager/src/iot-map-types.ts +++ b/src/iotMapManager/src/iot-map-types.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-user-marker-manager.ts b/src/iotMapManager/src/iot-map-user-marker-manager.ts index 2f0f27a2..83bcd23e 100644 --- a/src/iotMapManager/src/iot-map-user-marker-manager.ts +++ b/src/iotMapManager/src/iot-map-user-marker-manager.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau diff --git a/src/iotMapManager/src/iot-map-user-marker.ts b/src/iotMapManager/src/iot-map-user-marker.ts index a0f11eb2..888ed247 100644 --- a/src/iotMapManager/src/iot-map-user-marker.ts +++ b/src/iotMapManager/src/iot-map-user-marker.ts @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * This software is distributed under the MIT License, -* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/master/LICENSE +* the text of which is available at https://github.com/Orange-OpenSource/IOT-Map-Component/blob/main/LICENSE * or see the "license.txt" file for more details. * * Author: S. Gateau