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

[TASK] Merge freifunkstuff #15

Closed
wants to merge 2 commits into from

Conversation

maurerle
Copy link
Member

@maurerle maurerle commented Jul 29, 2023

Description

merges changes from https://github.com/freifunkstuff/meshviewer

  • Dockerfile
  • Hardware Images for routers
  • support for embedding
  • show total client count in mesh cloud
  • support for links
  • different icon color if has vpn

Motivation and Context

This change is needed to contribute changes to the meshviewer "upstream".
So that one can have HwImg and deprecation warnings at the same time

How Has This Been Tested?

docker build -t meshviewer .
docker run -v ./config.json:/usr/share/nginx/html/config.json -p 8088:80 meshviewer

Screenshots/links (if appropriate):

image

Checklist:

  • 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.

@maurerle
Copy link
Member Author

I would need some help to see why the uglify is unhappy:

5.469 [20:48:12] Optimizing app.js
6.131 Error: Cannot uglify file: ../node_modules/almond/almond.build.js. Skipping it. Error is:
6.131 SyntaxError: Unexpected token operator «=», expected punc «,»
6.131 
6.131 If the source uses ES2015 or later syntax, please pass "optimize: 'none'" to r.js and use an ES2015+ compatible minifier after running r.js. The included UglifyJS only understands ES5 or earlier syntax.
6.340 [20:48:13] 'javascript' errored after 1.43 s
6.340 [20:48:13] GulpUglifyError: unable to minify JavaScript
6.340 Caused by: SyntaxError: Unexpected token: operator «=», expected: punc «,»
6.340 File: app.js
6.340 Line: 3287
6.340 Col: 36
6.340 [20:48:13] 'default' errored after 5.31 s

Maybe we need to update dependencies..?

@maurerle
Copy link
Member Author

I also created a script, which generates a correctly named output-folder for router images:
https://forum.freifunk.net/t/mithilfe-aufruf-aktuelle-firmware-selector-bilder/23821/4

The created folder can then be served with the hwImg setting set to https://servername/router-images/{MODEL_NORMALIZED}.svg

It would be great if there would be one common source for this and the firmware-selector:
freifunk-darmstadt/gluon-firmware-selector#154

* Dockerfile
* Hardware Images for routers
* support for embedding
* show total client count in mesh cloud
* support for links
@maurerle maurerle force-pushed the merge_freifunkstuff branch from 9023aac to 9e8a3e5 Compare August 22, 2023 14:07
@maurerle
Copy link
Member Author

maurerle commented Aug 22, 2023

@skorpy2009 should I split this up into a PR or commit for each of the features?

  • Dockerfile
  • Hardware Images for routers
  • support for embedding
  • show total client count in mesh cloud
  • different icon color if has vpn

@maurerle
Copy link
Member Author

This PR is superseded by the splitted ones referenced in #28 - I hope that this helpes to integrate changes upstream.

@maurerle maurerle closed this Aug 24, 2023
@MyIgel
Copy link
Member

MyIgel commented Aug 30, 2023

Definitely: having single-feature-PRs is the better way to go.
(And on the long run we should find a group of ppl that are able to maintain the software stack in a "new" group together ^^)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants