Sync Main & Develop #594
Merged
Sync Main & Develop #594
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Allow custom user fields to be added and saved in the user table - Data json column handles the data dynamically - Includes migration - Dynamically creates TextField inputs on the profile page for any number of fields you add to your config - Can be formatted as an array of strings or array of objects - If you use a string, the string is used as the name that is displayed and saved in the db json - If you use objects, you have extra customization: - You can have different locales displayed, use the locales as the keys and the display name as the value - Use the `name` key as the fallback for any missing locales - Use the `database` key as the key that will be saved in the database json
Files changed:\nM server/src/configs/custom-environment-variables.json
Add data column
- Cleanup some eslint rules - Lint some various jsons - Convert all `.mjs` files back to standard `.js` files for less PM2 headaches in the long run - Keep `ReactMap.mjs` as a polyfill with a deprecation warning after version 1.8.0 - Set all Location icons to the crosshairs style - Cleanup old vscode extensions - Format on save
- Move scan dialog into its own component - Move constants out of ScanNextTarget fn - Wrap a lot of state changes in useEffects to control renders
- Consolidate repeat functions - Consolidate repeat dialog
- Consolidate ScanNext and ScanZone components into one reusable component - Cleanup backend code to use more general variables -
House Keeping
- Use styled components instead of theme overrides - Remove unnecessary Slider props and use React Children instead of passing a block prop - Disable other map markers when ScanZone popup is open, something is not right when any other markers are activated that can cause the server to get hammered.
ScanNext & ScanZone fixes
- Allows admins to fetch their config so they can see the full config after the merges and mutations have been applied - Configurable options to include the schemas and authentication strategies for security reasons - Minor change in sessionStore.js to allow running the map server without any db connections
Files changed:\nM server/src/configs/custom-environment-variables.json
Add a config api route
- For some reason I needed to move the holiday-canvas div to the html template instead of in React... - Reported by @ReuschelCGN - Also lints html/css files, oops
Fix Holiday Animations
- Rude config change, `holidayEffects` is now an array of objects instead of an object with bool properties - name (does nothing other than label in config): string - enabled: boolean - images: string[] - css: 'snow' | 'fireworks' - startDay: int - startMonth: int - endDay: int - startDay: int - Enables any amount of images to be put into the effects as well as any amount of custom holiday effects
Files changed:\nM server/src/configs/custom-environment-variables.json
holiday effects v2
Machine generated locales
update de.json translation
Co-Authored-By: Jakub <10072920+lenisko@users.noreply.github.com>
… into locales-catchup
Not really sure what was going on here...
adjust interaction ranges
- Version bump - Add thumbnailUrl to discord strategy object - pass full req.user to scanner api - Initialize strategies in a separate file for dynamically collecting all clients - Rudimentary cache for storing # of requests for users in a given day - Log to the same channel as authentication reqs - Remove unused accessToken arg - Save logChanneld in the class instance - Remove user info from frontend, collect from request instead - REQUIRES ADJUSTMENTS IF YOU USE A CUSTOM STRATEGY
- Allow separate channels - Some embed changes - GH link in log message for old auth strategies
Locales Catchup
Scan Next/Zone Discord Logging
Co-Authored-By: bbdoc <23477802+bbdoc@users.noreply.github.com>
- Create unique area keys if an area has a parent, allowing areas of the same name that have different parents - *Should* be backwards compatible with existing system / currently logged in users - If you have multiple areas with the same names and want to use `areaRestrictions`, using only the area name will give permissions to every area with that name, to restrict by parent and area name you must use the format `parent-area` in the `areas` array in `areaRestrictions - Sort parents alphabetically
Area Fixes
- Adds a reference file that holds the character count of the default.json of the current commit - Checks on startup to see if the character count matches - Should catch the large majority of instances where someone edits the default.json - GH action for automating the check
Check for default.json changes
- Add locale selection to loginPage/donationPage/motd - Set type = "localeSelection" in the config
add locale selector
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.