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

chore: list styles, BG Map Management #678

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
e7bb0fa
chore: added map-server to main thread
ErikSin Nov 28, 2022
eba9734
chore: scaffolded useMapServerQuery
ErikSin Nov 28, 2022
f5493be
chore: sampled typings
ErikSin Nov 28, 2022
bfbeb15
chore: JSDoc overload example
gmaclennan Nov 29, 2022
c9098f1
chore: Added custom hooks
ErikSin Dec 7, 2022
69dbd01
chore: update query invalidation
ErikSin Dec 7, 2022
fdeab8b
chore: update styles endpoint typing to return array
ErikSin Dec 7, 2022
2eec2d2
chore: ran electron-rebuild
ErikSin Dec 8, 2022
0574610
chore: update hooks
ErikSin Dec 8, 2022
68b6155
chore: update query invalidation to be more general
ErikSin Dec 10, 2022
e5f43f0
feat: Added settings tab
ErikSin Apr 17, 2022
36a98e9
chore: Added Translations
ErikSin Apr 17, 2022
0b15b12
chore: updated jsdoc types
ErikSin Apr 17, 2022
bb5af49
chore: updated translations
ErikSin Apr 18, 2022
e45a4ff
chore: translations
ErikSin Apr 18, 2022
9f4528a
chore: updated Types
ErikSin Apr 19, 2022
e31636a
chore: lazy load bg map info
ErikSin Apr 18, 2022
80e3223
chore: translations
ErikSin Apr 18, 2022
4b4da91
chore: Added zoom level definitions
ErikSin Apr 19, 2022
967e673
chore: translations
ErikSin Apr 19, 2022
546c209
chore: clean up
ErikSin Apr 19, 2022
3a46007
chore: translations
ErikSin Apr 19, 2022
11860e6
chore: Added offline area cards
ErikSin Apr 20, 2022
9f3a035
chore: translations
ErikSin Apr 20, 2022
9e4edb4
chore: Added type checking
ErikSin Apr 21, 2022
c36ab9e
chore: Cleaned up buttons
ErikSin Apr 25, 2022
d1ef2b4
chore: translations
ErikSin Apr 25, 2022
9986517
chore: linting fix for CI
ErikSin Apr 25, 2022
222be4c
chore: updated components with tanstack hooks
ErikSin Dec 7, 2022
8037109
chore: translations
ErikSin Dec 7, 2022
755b8d4
chore: added api logic to ui
ErikSin Dec 8, 2022
fd653ef
chore: add map and list styles
ErikSin Dec 10, 2022
968d9ee
chore: translations
ErikSin Dec 10, 2022
49ac141
chore: update dialog UI for import maps
ErikSin Dec 15, 2022
c66092a
chore: translations
ErikSin Dec 15, 2022
b962312
chore: create one instance of mapbox for prev
ErikSin Dec 15, 2022
f315ea0
chore: map card showing map
ErikSin Jan 19, 2023
7bc6d2a
chore: added summary of map
ErikSin Jan 19, 2023
5339099
chore: translations
ErikSin Jan 19, 2023
6f840a5
Merge branch 'master' into BGMapCards
ErikSin Jan 19, 2023
b6ddb86
chore: linting issues
ErikSin Jan 19, 2023
233d07f
chore: clean up excess brackets
ErikSin Jan 19, 2023
35536ba
update mapInfo
ErikSin Feb 6, 2023
7591f07
chore translations
ErikSin Feb 6, 2023
73472a2
chore: took out conditional rendering of settings
ErikSin Feb 6, 2023
c607d02
center icon
ErikSin Feb 7, 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
20 changes: 15 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ var argv = minimist(process.argv.slice(2), {
default: {
port: 5000,
datadir: path.join(userDataPath, 'kappa.db'),
mapsdir: path.join(userDataPath, 'background-maps'),
tileport: 5005,
mapPrinterPort: 5200
mapPrinterPort: 5200,
mapServerPort: 5300
},
boolean: ['headless', 'debug'],
alias: {
Expand Down Expand Up @@ -88,20 +90,28 @@ if (!gotTheLock) {
try {
// Ensure we have open ports. Small chance the ports could get taken by
// another app before we finish loading, but hopefully unlikely!
const [mapeoServerPort, tileServerPort, mapPrinterPort] = await getPorts([
const [
mapeoServerPort,
tileServerPort,
mapPrinterPort,
mapServerPort
] = await getPorts([
argv.port,
argv.tileport,
argv.mapPrinterPort
argv.mapPrinterPort,
argv.mapServerPort
])
const { headless, debug, datadir } = argv
const { headless, debug, datadir, mapsdir } = argv
logger.timedPromise(
startApp({
mapeoServerPort,
tileServerPort,
mapPrinterPort,
mapServerPort,
headless,
debug,
datadir
datadir,
mapsdir
}),
'Started Mapeo'
)
Expand Down
72 changes: 72 additions & 0 deletions messages/renderer/en.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,44 @@
{
"renderer.components.BackgroundMaps.BackgroundMapInfo.createOfflineArea": {
"description": "Button to create an offline area",
"message": "Create Offline Area"
},
"renderer.components.BackgroundMaps.BackgroundMapInfo.deleteErrorDescription": {
"description": "Description for error message when deleting style,",
"message": "There was an error deleting the style"
},
"renderer.components.BackgroundMaps.BackgroundMapInfo.deleteErrorTitle": {
"description": "Title for error message when deleting style",
"message": "Error Deleting Style"
},
"renderer.components.BackgroundMaps.BackgroundMapInfo.deleteStyle": {
"description": "Button to delete style",
"message": "Delete Style"
},
"renderer.components.BackgroundMaps.BackgroundMapInfo.offlineAreas": {
"description": "Title for Offline Areas",
"message": "Offline Areas"
},
"renderer.components.BackgroundMaps.MapCard.areas": {
"description": "indicates how many offline areas",
"message": "offline areas"
},
"renderer.components.BackgroundMaps.MapCard.mb": {
"description": "Abbreviation for megabytes",
"message": "MB"
},
"renderer.components.BackgroundMaps.SidePanel.addMap": {
"description": "Button to add map background",
"message": "Add Map Background"
},
"renderer.components.BackgroundMaps.SidePanel.backToSettings": {
"description": "button to go back to settings",
"message": "Back to Settings"
},
"renderer.components.BackgroundMaps.SidePanel.createOfflineMap": {
"description": "Button to create an offline area for a map backgroun",
"message": "Create Offline Map"
},
"renderer.components.Home.mapeditor": {
"description": "MapEditor tab label",
"message": "Territory"
Expand Down Expand Up @@ -464,6 +504,22 @@
"description": "Name to show for an observation when it does not match any preset",
"message": "Observation"
},
"renderer.components.Settings.AboutMapeo.version": {
"description": "Used to indicate the version of mapeo the user is using",
"message": "Version"
},
"renderer.components.Settings.BackgroundMaps.mapBackgroundTitle": {
"description": "Title for description of offline maps",
"message": "Managing Map Backgrounds and Offline Areas"
},
"renderer.components.Settings.index.aboutMapeo": {
"description": "Setting Tab title to open information about mapeo",
"message": "About Mapeo"
},
"renderer.components.Settings.index.backgroundMap": {
"description": "Setting Tab title to open background maps",
"message": "Background Map"
},
"renderer.components.SyncView.Searching.searchingHint": {
"description": "Hint on sync screen when searching on wifi for devices",
"message": "Make sure devices are turned on and connected to the same wifi network"
Expand Down Expand Up @@ -620,6 +676,22 @@
"renderer.components.dialogs.Error.openLog": {
"message": "Open log..."
},
"renderer.components.dialogs.ImportMapStyle.addMap": {
"description": "Title of screen used to add a new background map",
"message": "Add Map Background"
},
"renderer.components.dialogs.ImportMapStyle.cancel": {
"description": "button to cancel the import of a background map",
"message": "Cancel"
},
"renderer.components.dialogs.ImportMapStyle.importErrorDescription": {
"description": "Description of map import error",
"message": "There was an error importing the background maps. Please try again."
},
"renderer.components.dialogs.ImportMapStyle.importErrorTitle": {
"description": "Title for import errot pop up dialog,",
"message": "Background Maps Import Error"
},
"renderer.components.dialogs.LatLon.button-submit": {
"message": "Submit"
},
Expand Down
Loading