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.

Sign up for GitHub

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

Ux improvements #7

Closed
wants to merge 9 commits into from
Closed

Ux improvements #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6213fe1
add i18n language support #1
njakuschona Nov 23, 2023
104df35
retrun words in same language as choosen locale #2
njakuschona Nov 23, 2023
32a01d2
change display marker #3
njakuschona Nov 23, 2023
e3c8e3c
white tooltip color on hover #4
njakuschona Nov 23, 2023
4926adf
improve code consistency
njakuschona Nov 23, 2023
0001570
add copy button #5
njakuschona Dec 14, 2023
2ff8dc3
cursor to default over popup #6
njakuschona Dec 14, 2023
c845301
Merge branch 'main' into ux-improvements
njakuschona Dec 21, 2023
2836f2f
Update to map.apps version 4.17.0
sholtkamp Mar 1, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
/.vscode/settings.json
/.externalToolBuilders/
/package-lock.json
/gulpfile.overrides.js
2 changes: 1 addition & 1 deletion .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
"Esri.arcgis-jsapi-snippets",
"ctjdr.vscode-apprt-bundles"
]
}
}
2 changes: 1 addition & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
"webRoot": "${workspaceFolder}/src/main"
}
]
}
}
8 changes: 8 additions & 0 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@
"type": "shell",
"command": "mvn clean",
"group": "build"
},
{
"label": "Watch types",
"detail": "Start TypeScript compiler in watch mode",
"type": "npm",
"script": "watch-types",
"group": "build",
"problemMatcher": [],
}
]
}
2 changes: 1 addition & 1 deletion RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
✅ Tested for map.apps 4.15.1 / Linie 4
✅ Tested for map.apps 4.17.0 / Linie 4

#### Release Notes
- autogenerated SNAPSHOT-Release
9 changes: 3 additions & 6 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,13 @@ mapapps.registerTasks({
},

/* a list of themes inside this project */
themes: [/*"sample-theme"*/],
themes: [],
/* state that the custom theme will be dependant from map.apps everlasting theme that provides the base styles */
hasBaseThemes: true,
/* state that we want to support vuetify components and therefore need the vuetify core styles*/
hasVuetify: true,
themeChangeTargets: {
"vuetify": [
// "sample_theme"
]
"vuetify": []
},
/* A list oft target browser versions. This should be streamlined with Esri JS API requirements. */
transpileTargets: {
Expand Down Expand Up @@ -139,7 +137,6 @@ gulp.task("lint",
gulp.task("preview",
gulp.series(
"build",
"lint",
gulp.parallel(
"watch",
"browser-sync"
Expand All @@ -152,7 +149,7 @@ gulp.task("run-tests",
function transportTestUrls() {
// transport test url to run-browser-tests
// eslint-disable-next-line max-len
const testsAt = mapappsBrowserSync.state.url + "/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_what3words/tests/all&reporter=tap";
const testsAt = mapappsBrowserSync.state.url + "/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=sample_helloworld/tests/all&reporter=tap";
runBrowserTests.push(testsAt);
return Promise.resolve();
},
Expand Down
40 changes: 25 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,32 @@
"version": "0.0.1",
"license": "CC0-1.0",
"scripts": {
"check-licenses": "node ./src/support/js/check-licenses.js"
"check-licenses": "tsx ./src/support/js/check-licenses.ts",
"check-types": "tsc --noEmit",
"watch-types": "tsc -w --noEmit"
},
"devDependencies": {
"@conterra/ct-mapapps-typings": "4.15.1",
"@conterra/mapapps-mocha-runner": "^1.1.1",
"@types/arcgis-js-api": "4.26.0",
"chai": "^4.3.7",
"ct-mapapps-browser-sync": "0.0.30",
"ct-mapapps-gulp-js": "0.9.4",
"eslint-config-ct-prodeng": "1.3.0-next-2",
"license-checker": "^25.0.1",
"mocha": "^10.2.0",
"puppeteer": "^19.11.1",
"vue-template-compiler": "2.7.8",
"stylelint-config-ct-prodeng": "1.0.4",
"stylelint-config-recommended": "5.0.0",
"stylelint": "^13.13.1"
"@conterra/ct-mapapps-typings": "~4.17.0",
"@conterra/mapapps-mocha-runner": "1.1.1",
"@types/arcgis-js-api": "4.28.0",
"@types/chai": "4.3.10",
"@types/license-checker": "^25.0.6",
"@types/mocha": "10.0.4",
"chai": "4.3.10",
"ct-mapapps-browser-sync": "0.0.35",
"ct-mapapps-gulp-js": "0.10.2",
"eslint-config-ct-prodeng": "1.4.0",
"license-checker": "25.0.1",
"mocha": "10.2.0",
"puppeteer": "21.5.2",
"stylelint": "15.11.0",
"stylelint-config-ct-prodeng": "2.0.0",
"stylelint-config-recommended": "13.0.0",
"stylelint-config-recommended-less": "2.0.0",
"ts-node": "^10.9.1",
"tsx": "^4.6.0",
"typescript": "5.2.2",
"vue": "2.7.15",
"vue-template-compiler": "2.7.15"
}
}
66 changes: 30 additions & 36 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
limitations under the License.

-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.conterra.devnet</groupId>
Expand Down Expand Up @@ -46,11 +47,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>de.conterra.mapapps</groupId>
<artifactId>ct-mapapps-js</artifactId>
<version>${mapapps.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -92,6 +88,11 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>de.conterra.mapapps</groupId>
<artifactId>mapapps-maven-plugin</artifactId>
<version>${mapapps.version}</version>
</plugin>
<plugin>
<groupId>de.conterra.jsregistry</groupId>
<artifactId>ct-jsregistry-maven-plugin</artifactId>
Expand Down Expand Up @@ -144,10 +145,9 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.1</version>
<version>1.14.2</version>
<configuration>
<nodeVersion>v18.13.0</nodeVersion>
<npmVersion>8.19.3</npmVersion>
<nodeVersion>v20.9.0</nodeVersion>
</configuration>
</plugin>
<plugin>
Expand All @@ -173,11 +173,6 @@
<artifactId>setproperties-maven-plugin</artifactId>
<version>1.0.2</version>
</plugin>
<plugin>
<groupId>de.conterra.jsrt</groupId>
<artifactId>ct-jsrt-test-maven-plugin</artifactId>
<version>${ct.jsrt-test.version}</version>
</plugin>
</plugins>
</pluginManagement>
<sourceDirectory>src/main/js</sourceDirectory>
Expand Down Expand Up @@ -215,32 +210,31 @@
</execution>
</executions>
<configuration>
<!-- add here properties which are used in plugin configuration resolution -->
<properties>
<!-- deployment of map.apps installation -->
<mapapps.remote.base>.</mapapps.remote.base>
</properties>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.11.0</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<version>3.5.0</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>unpack-themes-src</id>
Expand Down Expand Up @@ -343,6 +337,9 @@
<include>**/gulpfile.js</include>
<include>**/pom.xml</include>
</includes>
<excludes>
<exclude>src/main/js/**/*.min.js</exclude>
</excludes>
<mapping>
<vue>XML_STYLE</vue>
</mapping>
Expand Down Expand Up @@ -409,6 +406,12 @@
<plugin>
<groupId>de.conterra.mapapps</groupId>
<artifactId>mapapps-maven-plugin</artifactId>
<configuration>
<!-- only build zip files -->
<skipDeploy>true</skipDeploy>
<sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
<executions>
<execution>
<!-- used to create .zip files containing the apps during the build -->
Expand Down Expand Up @@ -436,13 +439,6 @@
</configuration>
</execution>
</executions>
<configuration>
<!-- only build zip files -->
<skipDeploy>true</skipDeploy>
<createApp>false</createApp>
<sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down Expand Up @@ -496,15 +492,16 @@
<root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
<js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>

<mapapps.version>4.15.1</mapapps.version>
<mapapps.version>4.17.0</mapapps.version>
<vuetify.version>1.5.28</vuetify.version>
<!-- JS lib versions -->
<apprt.version>${mapapps.version}</apprt.version>
<!-- java lib versions -->
<ct.jsregistry.version>1.5.10</ct.jsregistry.version>
<ct.jsregistry.version>2.0.1</ct.jsregistry.version>
<ct.jsrt-test.version>2.0.2</ct.jsrt-test.version>

<!-- the default app, replaced in the *.html files to switch app names-->
<default.app.name>sample</default.app.name>
<default.app.name>Demo</default.app.name>

<!-- don't do this in production configuration! This allows to go any http traffic over the
/proxy endpoint -->
Expand Down Expand Up @@ -563,6 +560,11 @@
<artifactId>ags-js-api4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.esri</groupId>
<artifactId>terraformer-js</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>moment-js</groupId>
<artifactId>moment-js</artifactId>
Expand Down Expand Up @@ -665,12 +667,6 @@
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
<plugin>
<groupId>de.conterra.jsregistry</groupId>
<artifactId>ct-jsregistry-maven-plugin</artifactId>
Expand Down Expand Up @@ -713,8 +709,6 @@
<configuration>
<skipDeploy>${skip.apps.upload}</skipDeploy>
<deployAsApp>true</deployAsApp>
<appName>${project.artifactId}</appName>
<appTitle>${project.artifactId}-${project.version}</appTitle>
<appEditorState>PUBLISHED</appEditorState>
<serverResourcesEndpoint>${mapapps.remote.base}/resources</serverResourcesEndpoint>
<username>${mapapps.user}</username>
Expand Down
Binary file modified src/main/js/apps/sample/images/mapMarker.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading