Skip to content

Commit

Permalink
Merge pull request #54 from freifunkMUC/freifunk-main
Browse files Browse the repository at this point in the history
Freifunk main
  • Loading branch information
awlx authored Nov 14, 2023
2 parents 6fe5f88 + bbb0348 commit 4cda370
Show file tree
Hide file tree
Showing 141 changed files with 12,388 additions and 35,609 deletions.
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

0 comments on commit 4cda370

Please sign in to comment.