diff --git a/CHANGELOG.md b/CHANGELOG.md index bc4ae1a9..5402a84b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Error message when query has no sources was replaced with an application message in the empty result list (#204). - configs/oslo-kg: use smaller datasets for queries. - React-admin version updated to 5.7.2 (#207). +- Tool renamed to 'Miravi - a linked data viewer'; default favicon.ico and miravi.png provided (#210). ### Fixed @@ -239,20 +240,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - First release -[1.0.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.0.0 -[1.1.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.1.0 -[1.1.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.1.1 -[1.1.2]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.1.2 -[1.1.3]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.1.3 -[1.2.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.2.0 -[1.2.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.2.1 -[1.2.2]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.2.2 -[1.2.3]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.2.3 -[1.3.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.3.0 -[1.3.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.3.1 -[1.4.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.0 -[1.4.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.1 -[1.5.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.5.0 -[1.6.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.6.0 -[1.7.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.7.0 -[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.7.0...HEAD +[1.0.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.0.0 +[1.1.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.1.0 +[1.1.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.1.1 +[1.1.2]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.1.2 +[1.1.3]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.1.3 +[1.2.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.2.0 +[1.2.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.2.1 +[1.2.2]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.2.2 +[1.2.3]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.2.3 +[1.3.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.3.0 +[1.3.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.3.1 +[1.4.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.4.0 +[1.4.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.4.1 +[1.5.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.5.0 +[1.6.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.6.0 +[1.7.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.7.0 +[Unreleased]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/compare/v1.7.0...HEAD diff --git a/README.md b/README.md index ae5e3556..6c667b90 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,13 @@ -# Generic Data Viewer React Admin +# Miravi - a linked data viewer -This Web app allows users to easily execute queries over multiple data sources (including Solid pods) and +This Web app allows users to easily execute queries over multiple linked data sources (including Solid pods) and inspect the corresponding results. +About the name: Miravi reflects the many facets of the web — linking open and permissioned data into a unified view. +Rooted in the Latin *mirari* ("to look with wonder"), it turns fragmented knowledge into meaningful insight. + + + Table of contents: * [Preface](#preface) @@ -387,9 +392,10 @@ The easiest way to add your own configuration is: 1. Get inspired by the configuration in `main/configs/demo`. 2. Choose your ``: a string obeying regex `[a-z0-9-]+`; directory `main/configs/` should not yet be in use. 3. Add your own queries in the `main/configs//public/queries` directory and in general, your own resources in the `main/configs//public` directory. -4. Write your own `main/configs//config.json` file, following the [configuration file documentation above](#configuration-file). -5. Run or build as documented above for the `demo` configuration, of course now using ``. -6. Consider a pull request to add your configuration to this repo. +4. Add your own additional resources in `main/configs//public`, if the defaults you'll get from `main/config-defaults/public` are not satisfactory for you. +5. Write your own `main/configs//config.json` file, following the [configuration file documentation above](#configuration-file). +6. Run or build as documented above for the `demo` configuration, of course now using ``. +7. Consider a pull request to add your configuration to this repo. ### Testing diff --git a/RELEASE.md b/RELEASE.md index c49f7abb..c4deb78b 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -20,8 +20,8 @@ and [CHANGELOG.md](./CHANGELOG.md) should reflect all modifications under the `# In [CHANGELOG.md](./CHANGELOG.md): * Create the new release section by adding a new release title line below the `## [Unreleased]` title line. Example: `## [1.7.0] - 2025-04-09`. -* Add a new release link line near the end of the file. Example: `[1.7.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.7.0`. -* Update the `[Unreleased]` link in the bottom line to use the new release tag. Example: `[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.7.0...HEAD` +* Add a new release link line near the end of the file. Example: `[1.7.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.7.0`. +* Update the `[Unreleased]` link in the bottom line to use the new release tag. Example: `[Unreleased]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/compare/v1.7.0...HEAD` Enter the release tag in the version string in [/main/src/version.js](./main/src/version.js). diff --git a/doc/miravi.png b/doc/miravi.png new file mode 100644 index 00000000..160b2d5d Binary files /dev/null and b/doc/miravi.png differ diff --git a/main/config-defaults/public/favicon.ico b/main/config-defaults/public/favicon.ico new file mode 100644 index 00000000..fd705cd8 Binary files /dev/null and b/main/config-defaults/public/favicon.ico differ diff --git a/main/config-defaults/public/images/miravi.png b/main/config-defaults/public/images/miravi.png new file mode 100644 index 00000000..2f190954 Binary files /dev/null and b/main/config-defaults/public/images/miravi.png differ diff --git a/main/configs/demo/config.json b/main/configs/demo/config.json index a36f3b0a..9b3cda48 100644 --- a/main/configs/demo/config.json +++ b/main/configs/demo/config.json @@ -1,7 +1,7 @@ { - "title": "Generic Data Viewer", - "logoLocation": "images/IDLab-logo.png", - "logoRedirectURL": "https://idlab.technology/", + "title": "Miravi - a linked data viewer", + "logoLocation": "images/miravi.png", + "logoRedirectURL": "https://github.com/SolidLabResearch/miravi-a-linked-data-viewer", "mainAppColor": "lightgray", "backgroundColor": "#fff", "titleColor": "black", diff --git a/main/configs/demo/public/favicon.ico b/main/configs/demo/public/favicon.ico deleted file mode 100644 index 274802f2..00000000 Binary files a/main/configs/demo/public/favicon.ico and /dev/null differ diff --git a/main/configs/demo/public/images/IDLab-logo.png b/main/configs/demo/public/images/IDLab-logo.png deleted file mode 100644 index bc830196..00000000 Binary files a/main/configs/demo/public/images/IDLab-logo.png and /dev/null differ diff --git a/main/configs/onto-deside/public/favicon.ico b/main/configs/onto-deside/public/favicon.ico deleted file mode 100644 index 274802f2..00000000 Binary files a/main/configs/onto-deside/public/favicon.ico and /dev/null differ diff --git a/main/configs/oslo-kg/public/favicon.ico b/main/configs/oslo-kg/public/favicon.ico deleted file mode 100644 index 274802f2..00000000 Binary files a/main/configs/oslo-kg/public/favicon.ico and /dev/null differ diff --git a/main/configs/test/config.json b/main/configs/test/config.json index e937cb35..f457c556 100644 --- a/main/configs/test/config.json +++ b/main/configs/test/config.json @@ -1,7 +1,7 @@ { - "title": "Generic Data Viewer", - "logoLocation": "images/IDLab-logo.png", - "logoRedirectURL": "https://idlab.technology/", + "title": "Miravi - a linked data viewer", + "logoLocation": "images/miravi.png", + "logoRedirectURL": "https://github.com/SolidLabResearch/miravi-a-linked-data-viewer", "mainAppColor": "lightgray", "backgroundColor": "#fff", "titleColor": "black", diff --git a/main/configs/test/public/favicon.ico b/main/configs/test/public/favicon.ico deleted file mode 100644 index 274802f2..00000000 Binary files a/main/configs/test/public/favicon.ico and /dev/null differ diff --git a/main/index.html b/main/index.html index 08f6cb8a..e4463b24 100644 --- a/main/index.html +++ b/main/index.html @@ -3,7 +3,8 @@ - Generic Data Viewer + Miravi - a linked data viewer +
diff --git a/main/package-lock.json b/main/package-lock.json index fbfe27e5..4fbacf07 100644 --- a/main/package-lock.json +++ b/main/package-lock.json @@ -1,11 +1,11 @@ { - "name": "generic-data-viewer-admin", + "name": "miravi-a-linked-data-viewer", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "generic-data-viewer-admin", + "name": "miravi-a-linked-data-viewer", "version": "1.0.0", "dependencies": { "@comunica/query-sparql": "^3.2.3", diff --git a/main/package.json b/main/package.json index 85158ab2..ac28f897 100644 --- a/main/package.json +++ b/main/package.json @@ -1,5 +1,5 @@ { - "name": "generic-data-viewer-admin", + "name": "miravi-a-linked-data-viewer", "private": true, "version": "1.0.0", "type": "module", diff --git a/main/scripts/select-config.cjs b/main/scripts/select-config.cjs index a87fe4c3..3a102e11 100644 --- a/main/scripts/select-config.cjs +++ b/main/scripts/select-config.cjs @@ -10,9 +10,11 @@ function main(config) { const configDest = path.join('.', 'src', 'config.json'); fse.copySync(configSrc, configDest, options); + const publicDefaults = path.join('.', 'config-defaults', 'public'); const publicSrc = path.join(from, 'public'); const publicDest = path.join('.', 'public'); fse.emptyDirSync(publicDest); + fse.copySync(publicDefaults, publicDest, options); fse.copySync(publicSrc, publicDest, options); } diff --git a/main/src/authenticationProvider/authenticationProvider.js b/main/src/authenticationProvider/authenticationProvider.js index ab45b1a5..9925c871 100644 --- a/main/src/authenticationProvider/authenticationProvider.js +++ b/main/src/authenticationProvider/authenticationProvider.js @@ -36,7 +36,7 @@ export default { oidcIssuer: idp, // leading dot needed to run from any path redirectUrl: new URL('.', window.location.href).toString(), - clientName: "Generic Data Viewer", + clientName: "Miravi - a linked data viewer", }); } catch (error) { throw new Error("Login failed"); @@ -116,7 +116,7 @@ async function queryIDPfromWebId(webId) { /** * - * @param {object} webIdThing - the webId (actually of type ProfileAll, but importing this throws an error https://github.com/SolidLabResearch/generic-data-viewer-react-admin/issues/15) document to get the name from + * @param {object} webIdThing - the webId (actually of type ProfileAll, but importing this throws an error https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/issues/15) document to get the name from * @returns {?string} either the name or undefined if no foaf:name is found */ function getName(webIdThing) { @@ -128,7 +128,7 @@ function getName(webIdThing) { /** * - * @param {object} webIdThing - the webId (actually of type ProfileAll, but importing this throws an error https://github.com/SolidLabResearch/generic-data-viewer-react-admin/issues/15) document to get the profile picture from + * @param {object} webIdThing - the webId (actually of type ProfileAll, but importing this throws an error https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/issues/15) document to get the profile picture from * @returns {?string} either a url to the profile picture or undefined if no foaf:img is found */ function getProfilePicture(webIdThing) { diff --git a/main/src/components/InteractionLayout/NavigationBar/AboutDialog.jsx b/main/src/components/InteractionLayout/NavigationBar/AboutDialog.jsx index 0df35911..6dcbfc5c 100644 --- a/main/src/components/InteractionLayout/NavigationBar/AboutDialog.jsx +++ b/main/src/components/InteractionLayout/NavigationBar/AboutDialog.jsx @@ -1,6 +1,6 @@ import { Component } from "react"; import CloseIcon from "@mui/icons-material/Close"; -import { IconButton, Dialog, DialogTitle, DialogContent, DialogContentText } from "@mui/material"; +import { IconButton, Dialog, DialogTitle, DialogContent } from "@mui/material"; import version from "../../../version"; @@ -14,21 +14,19 @@ function AboutDialog(props) { return ( -
Generic Data Viewer
+
Miravi - a linked data viewer
- -

Version: {version}

-

Questions? Remarks? - Please create an issue at our Repository
- or mail to ben.demeester@ugent.be.

-

Powered by Comunica and React-Admin.

-

Initial development funded by Onto-DESIDE and SolidLab.

-

© IDLab 2025

-
+

Version: {version}

+

Questions? Remarks? + Please create an issue at our Repository
+ or mail to ben.demeester@ugent.be.

+

Powered by Comunica and React-Admin.

+

Initial development funded by Onto-DESIDE and SolidLab.

+

© IDLab 2025

); diff --git a/main/src/components/InteractionLayout/NavigationBar/NavigationBar.css b/main/src/components/InteractionLayout/NavigationBar/NavigationBar.css index f440f22b..c41e59b9 100644 --- a/main/src/components/InteractionLayout/NavigationBar/NavigationBar.css +++ b/main/src/components/InteractionLayout/NavigationBar/NavigationBar.css @@ -1,7 +1,6 @@ #app-logo{ - max-width: 150px; - max-height: 100%; + max-height: 56px; margin-right: 10px; padding: 5px; } \ No newline at end of file diff --git a/main/src/components/InteractionLayout/NavigationBar/NavigationBar.jsx b/main/src/components/InteractionLayout/NavigationBar/NavigationBar.jsx index 8bd64a99..755cc85a 100644 --- a/main/src/components/InteractionLayout/NavigationBar/NavigationBar.jsx +++ b/main/src/components/InteractionLayout/NavigationBar/NavigationBar.jsx @@ -56,11 +56,11 @@ function NavigationBar(props) { return ( <> } userMenu={}> - + + diff --git a/main/src/version.js b/main/src/version.js index 65d07262..dff77d6c 100644 --- a/main/src/version.js +++ b/main/src/version.js @@ -1,5 +1,5 @@ // Maintain the version string on the development branch: // - during development: set to (unreleased); -// - right before merging to the main branch for making a new release: set to the new release tag (see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/tags). -const version = "v1.7.0"; +// - right before merging to the main branch for making a new release: set to the new release tag (see https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/tags). +const version = "unreleased"; export default version; diff --git a/test/cypress/e2e/aggregating-query.cy.js b/test/cypress/e2e/aggregating-query.cy.js index 266419c4..154cfe97 100644 --- a/test/cypress/e2e/aggregating-query.cy.js +++ b/test/cypress/e2e/aggregating-query.cy.js @@ -1,5 +1,5 @@ describe("Aggregating query", () => { - it("AVG() function - see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/issues/70", () => { + it("AVG() function - see https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/issues/70", () => { cy.visit("/"); cy.contains("Example queries").click(); cy.contains("Average value").click(); diff --git a/test/cypress/e2e/sources-info.cy.js b/test/cypress/e2e/sources-info.cy.js index 5bc33c15..c6b4b0af 100644 --- a/test/cypress/e2e/sources-info.cy.js +++ b/test/cypress/e2e/sources-info.cy.js @@ -19,7 +19,7 @@ describe("Sources info", () => { cy.get('[aria-label="Fetch was successful"]').should("exist"); }); - it("Fetch status on cached source - see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/issues/59", () => { + it("Fetch status on cached source - see https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/issues/59", () => { cy.visit("/"); cy.contains("Project related examples").click(); cy.contains("Components").click(); diff --git a/test/package-lock.json b/test/package-lock.json index 85b32f94..0661b303 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -1,11 +1,11 @@ { - "name": "tools-for-generic-data-viewer-admin", + "name": "tools-for-miravi-a-linked-data-viewer", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "tools-for-generic-data-viewer-admin", + "name": "tools-for-miravi-a-linked-data-viewer", "version": "1.0.0", "dependencies": { "@solid/community-server": "^6.0.1", diff --git a/test/package.json b/test/package.json index aabf1abb..4a7a3083 100644 --- a/test/package.json +++ b/test/package.json @@ -1,5 +1,5 @@ { - "name": "tools-for-generic-data-viewer-admin", + "name": "tools-for-miravi-a-linked-data-viewer", "private": true, "version": "1.0.0", "type": "module",