Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Freifunk main #54

Merged
merged 75 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
b184fef
Bump nanoid from 3.1.23 to 3.2.0 (#319)
dependabot[bot] Jul 11, 2022
683d834
Bump follow-redirects from 1.14.1 to 1.14.8 (#320)
dependabot[bot] Jul 11, 2022
a349484
Bump minimist from 1.2.5 to 1.2.6 (#322)
dependabot[bot] Jul 11, 2022
bdb6364
Bump moment from 2.29.1 to 2.29.4 (#324)
dependabot[bot] Jul 11, 2022
5d706fa
Bump socket.io-parser from 3.3.2 to 3.3.3 (#328)
dependabot[bot] Nov 10, 2022
0cf4bf0
Bump decode-uri-component from 0.2.0 to 0.2.2 (#329)
dependabot[bot] Dec 21, 2022
5475b49
Bump minimatch from 3.0.4 to 3.1.2 (#330)
dependabot[bot] Dec 21, 2022
6af43f5
Merge remote-tracking branch 'upstream/develop'
MyIgel Jan 14, 2023
b3a0073
Added {NODE_CUSTOM} replacement
MyIgel Jan 14, 2023
70d70e1
Fixed build
MyIgel Jan 14, 2023
ff4583b
Add deprecation warning for TL-WR1043N/ND v1
AiyionPrime Mar 10, 2023
2594f03
Add deprecation warning for
AiyionPrime Mar 9, 2023
b1e6459
workflows: switch to main
skorpy2009 Jun 5, 2023
ee38b15
Allow defining gejson in config.json
maurerle Aug 14, 2022
d040ea8
Updated .gitignore
MyIgel Jun 5, 2023
52ad96c
Fix mix() $weight deprecation warning
MyIgel Jun 5, 2023
98ad775
Readme: added docker setup docs
MyIgel Jun 5, 2023
bfe882e
Readme: Fixed "Build Status" badge
MyIgel Jun 5, 2023
fb85f32
Fix README build instructions
weeman1337 Jun 5, 2023
fcad208
Remove yarn.lock, since the project uses NPM everywhere
weeman1337 Jun 5, 2023
d9b8653
Remove unused Travis CI spec file
weeman1337 Jun 5, 2023
96ddac4
Update dependencies to solve security issues
weeman1337 Jun 5, 2023
952d479
Add units to SCSS mix()
weeman1337 Jun 5, 2023
a43b1a0
Migrate d3 graph view
weeman1337 Jun 5, 2023
a75884b
Add doc about development server
weeman1337 Jun 5, 2023
97752d9
Merge pull request #12 from weeman1337/js-gefrickel
skorpy2009 Jun 5, 2023
fa63dbc
Update dependencies to solve security issues
skorpy2009 Aug 22, 2023
243f49c
adds filter for deprecationStatus and baseversion
maurerle Jul 29, 2023
40a37e3
init dependabot
skorpy2009 Aug 22, 2023
1047ead
Bump actions/setup-node from 1 to 3
dependabot[bot] Aug 22, 2023
1b7295a
Bump actions/checkout from 2 to 3
dependabot[bot] Aug 22, 2023
0fb2b61
npm: bump sass from 1.62.1 to 1.66.1
dependabot[bot] Aug 22, 2023
f15d488
npm: bump navigo from 7.1.3 to 8.11.1
dependabot[bot] Aug 22, 2023
ffbc4c8
npm: bump fsevents from 2.3.2 to 2.3.3
dependabot[bot] Aug 23, 2023
9a46bb0
Revert "npm: bump navigo from 7.1.3 to 8.11.1" as that change breaks …
MyIgel Aug 30, 2023
202888d
npm: bump eslint-plugin-react from 7.32.2 to 7.33.2
dependabot[bot] Aug 25, 2023
a904f2c
Merge pull request #16 from maurerle/improve_filter
weeman1337 Sep 5, 2023
cbdb802
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 4, 2023
a3c7694
Add support for node hardware images
micw Jul 4, 2022
a63cf00
Better hw image support
micw Jul 4, 2022
fefbd0a
In placeholder MODEL_NORMALIZED for hw images, replace multiple dash …
micw Jul 9, 2022
45e8d3a
center hwImg, move css into base.scss
maurerle Sep 3, 2023
7942e2d
Tweak hw image position and size
weeman1337 Sep 5, 2023
9b3486a
Show number of clients in local cloud
micw Jul 10, 2022
ffbe65b
Extra style for nodes with uplink
micw Jul 17, 2022
6086ac0
Added uplink node example to about page
MyIgel Sep 5, 2023
a89380c
Updated maintainer notice
MyIgel Sep 5, 2023
b042645
Rename config.json.example to config.example.json
MyIgel Sep 16, 2023
ed2d8a2
Updated URLs to match github.com/freifunk/meshviewer
MyIgel Sep 16, 2023
0d5604a
Updated readme texts
MyIgel Sep 16, 2023
80db0dc
Update templates and guidelines
MyIgel Sep 17, 2023
fcabcbc
a dot is allowed in firmware image names
maurerle Sep 16, 2023
0476a38
Add prettier
weeman1337 Sep 17, 2023
a6bfc9d
Apply prettier formatting
weeman1337 Sep 17, 2023
962938f
Set up eslint
weeman1337 Sep 17, 2023
b220aaf
Remove unmaintained sasslint.
weeman1337 Sep 17, 2023
860cdd9
Migrate to Vite
weeman1337 Sep 18, 2023
2ee5ee8
Switch to ESLint recommended
weeman1337 Oct 5, 2023
7fdd8ae
npm: bump node-polyglot from 2.2.2 to 2.5.0
dependabot[bot] Oct 10, 2023
378128c
npm: bump eslint from 7.32.0 to 8.51.0
dependabot[bot] Oct 10, 2023
5f42396
npm: bump sass from 1.68.0 to 1.69.2
dependabot[bot] Oct 10, 2023
31386a7
Dependabot: Check every month
MyIgel Oct 15, 2023
b71c734
Show error message if config.json can't be found
MyIgel Oct 10, 2023
e8b43bb
npm: bump babel from 7.23.0 to 7.23.2
skorpy2009 Oct 17, 2023
eabafaa
npm: bump sass from 1.69.2 to 1.69.3
dependabot[bot] Oct 17, 2023
35a9eef
add attribution to devicePictures
maurerle Oct 11, 2023
17cad66
Updated variable names to be more meaningful
MyIgel Oct 25, 2023
6fb1069
Add TypeScript support
weeman1337 Oct 25, 2023
39a2b22
Fixed filters after renaming
MyIgel Oct 27, 2023
34f09d8
fix deployment to subfolders
anoymouserver Oct 29, 2023
f146bed
Merge branch 'main' of github.com:freifunk/meshviewer into freifunk-main
awlx Nov 14, 2023
7f16865
Run prettier
awlx Nov 14, 2023
325d1bc
Update docker
awlx Nov 14, 2023
6305482
Update docker
awlx Nov 14, 2023
bbb0348
Fix this shit
awlx Nov 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/build
/dev-dist
14 changes: 0 additions & 14 deletions .eslintrc

This file was deleted.

17 changes: 17 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"root": true,
"parserOptions": {
"sourceType": "module"
},
"env": {
"browser": true,
"es2020": true,
"node": true
},
"extends": ["eslint:recommended", "prettier"],
"rules": {
"no-undef": "off",
"no-prototype-builtins": "off",
"no-useless-escape": "off"
}
}
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Contributing is welcome

Pull requests are welcome without the need of opening an issue. If you're unsure
about your feature or your implementation open an issue and discuss your
about your feature or your implementation, open an issue and discuss your
suggested changes. Meshviewer is a frontend application and the code needs to be
loaded fast and perform with many nodes and clients on slow mobile devices.
48 changes: 28 additions & 20 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,50 @@
---
name: Bug report
about: Create a report to help us improve

about: Create a report to help us improve the software
---

<!--- Provide a general summary of the issue in the Title above -->
<!--- This template should help to improve the report, unneeded parts can be remvoed -->
<!-- Provide a general summary of the issue in the title above -->
<!-- This template should help to improve the report, unneeded parts can be removed -->
<!-- Everything between these comment tags is hidden from the issue and just there to guide you. -->

## Expected Behavior
<!--- If you're describing a bug, tell us what should happen -->
<!--- If you're suggesting a change/improvement, tell us how it should work -->

<!-- If you're describing a bug, tell us what should happen -->
<!-- If you're suggesting a change/improvement, tell us how it should work -->

## Current Behavior
<!--- If describing a bug, tell us what happens instead of the expected behavior -->
<!--- If suggesting a change/improvement, explain the difference from current behavior -->

<!-- If describing a bug, tell us what happens instead of the expected behavior -->
<!-- If suggesting a change/improvement, explain the difference from current behavior -->

## Possible Solution
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
<!--- or ideas how to implement the addition or change -->

<!-- Not obligatory, but suggest a fix/reason for the bug, or ideas how to implement the addition or change -->

## Steps to Reproduce
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->

<!-- Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. -->
<!-- Include code to reproduce, if relevant -->

1.
2.
3.
4.

## Context
<!--- How has this issue affected you? What are you trying to accomplish? -->
<!--- Providing context helps us come up with a solution that is most useful in the real world -->

<!-- How has this issue affected you? What are you trying to accomplish? -->
<!-- Providing context helps us come up with a solution that is most useful in the real world -->

## Your Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Version used:
* Browser Name and version:
* Operating System and version (desktop or mobile):
* Link to your project:

<!-- Include as many relevant details about the environment you experienced the bug in -->

- Version used: ``
- Browser Name and version: ``
- Operating System and version (desktop or mobile): ``
- Link to your project: ``

## Screenshots
<!--- If applicable, add screenshots to help explain your problem. -->

<!-- If applicable, add screenshots to help explain your problem. -->
18 changes: 11 additions & 7 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
---
name: Feature request
about: Suggest an idea for this project

---

<!--- Provide a general summary of the issue in the Title above -->
<!--- This template should help to improve the report, unneeded parts can be remvoed -->
<!-- Provide a general summary of the issue in the Title above -->
<!-- This template should help to improve the report, unneeded parts can be removed -->
<!-- Everything between these comment tags is hidden from the issue and just there to guide you. -->

## Is your feature request related to a problem? Please describe.
<!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->

<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->

## Describe the solution you'd like
<!--- A clear and concise description of what you want to happen. -->

<!-- A clear and concise description of what you want to happen. -->

## Describe alternatives you've considered
<!--- A clear and concise description of any alternative solutions or features you've considered. -->

<!-- A clear and concise description of any alternative solutions or features you've considered. -->

## Additional context
<!--- Add any other context or screenshots about the feature request here. -->

<!-- Add any other context or screenshots about the feature request here. -->
27 changes: 18 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
<!--- Use a prefix like [TASK], [BUGFIX], [DOC] or [CGL] and provide a general summary of your changes in the Title above -->
<!-- Use a prefix like [TASK], [BUGFIX], [DOC] etc. and provide a general summary of your changes in the title above -->
<!-- Everything between these comment tags is hidden from the issue and just there to guide you. -->

## Description
<!--- Describe your changes -->

<!-- Describe your changes -->

## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->

<!-- Why is this change required? What problem does it solve? -->
<!-- If it fixes an open issue, please link to the issue here. -->

## How Has This Been Tested?
<!--- Please try to test the code in multiple browsers and also on a mobile device -->

## Screenshots/links (if appropriate):
<!-- Please try to test the code in multiple browsers and on a mobile device -->

## Screenshots/links:

<!-- Add screenshots of changed code if visual output has changed / is more complex. -->
<!-- Include both before and after screenshots to easily compare and discuss changes when available. -->

## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] My code follows the code style of this project. (CI will test it anyway and also needs approval)
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have updated the documentation accordingly.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ version: 2
updates:
- package-ecosystem: npm
directory: /
schedule: {interval: monthly}
schedule: { interval: monthly }
reviewers: [freifunkMUC/webseite]
assignees: [freifunkMUC/webseite]

- package-ecosystem: github-actions
directory: /
schedule: {interval: monthly}
schedule: { interval: monthly }
reviewers: [freifunkMUC/webseite]
assignees: [freifunkMUC/webseite]
20 changes: 11 additions & 9 deletions .github/workflows/build-meshviewer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@ name: Build Meshviewer
on:
push:
branches:
- master
- main
pull_request:
types: [opened, synchronize, reopened]
jobs:
meshviewer-build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x, 13.x, 14.x]
node-version: [20.x]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm run gulp-ci
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm audit
- run: npm run lint
- run: npm run build
58 changes: 29 additions & 29 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ name: "CodeQL"

on:
push:
branches: [ main ]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
branches: [main]
schedule:
- cron: '30 16 * * 6'
- cron: "30 16 * * 6"

jobs:
analyze:
Expand All @@ -32,39 +32,39 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
language: ["javascript"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
36 changes: 18 additions & 18 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: DEPLOY
on:
push:
branches:
- main
- main
jobs:
map-deploy:
strategy:
Expand All @@ -12,20 +12,20 @@ jobs:
node-version: [12.x]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm run gulp
- run: cp config.json build/
- name: rsync deployments
uses: burnett01/[email protected]
with:
switches: -avzr --delete --exclude .ssh
path: build/
remote_path: /srv/www/map.ffmuc.net/
remote_host: ${{ matrix.target }}.ext.ffmuc.net
remote_user: deploy-map
remote_key: ${{ secrets.DEPLOY_KEY }}
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm run gulp
- run: cp config.json build/
- name: rsync deployments
uses: burnett01/[email protected]
with:
switches: -avzr --delete --exclude .ssh
path: build/
remote_path: /srv/www/map.ffmuc.net/
remote_host: ${{ matrix.target }}.ext.ffmuc.net
remote_user: deploy-map
remote_key: ${{ secrets.DEPLOY_KEY }}
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Publish Docker image
on:
push:
branches:
- 'main'
- "main"
tags:
- 'v*.*.*'
- "v*.*.*"

env:
REGISTRY: ghcr.io
Expand Down
Loading