Skip to content

Commit

Permalink
Merge pull request #185 from ilri/enhancements-Oct-2023
Browse files Browse the repository at this point in the history
Enhancements Oct 2023
  • Loading branch information
alanorth authored Nov 5, 2023
2 parents 9d2615b + 87bb2c0 commit 513c5f8
Show file tree
Hide file tree
Showing 206 changed files with 24,995 additions and 42,420 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ $ sudo docker-compose up -d
This will bring up all of the container components of the project and start building them. Monitor the progress with `docker logs -f angular_nginx`, for example. After a few minutes you can visit the site at localhost:80 and log into the admin dashboard (default is admin/admin).

*Note: the Elasticsearch component requires more virtual memory. You will most likely need to increase the host system's memory map limits by setting `vm.max_map_count = 262144` in /etc/sysctl.conf. See the [Elasticsearch docs for more information](https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html).*
*Note: Elasticsearch requires a username and password, to override this execute `docker exec elasticsearch bash -c 'echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml' && docker restart elasticsearch`

## Configuration

Expand Down
4 changes: 2 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/node:18-bookworm
FROM docker.io/node:20-bookworm
ARG DEBIAN_FRONTEND=noninteractive
RUN apt update -y \
&& apt install -y --no-install-recommends unoconv libreoffice-writer \
Expand All @@ -13,4 +13,4 @@ RUN cp example.env .env \
&& npm run copy:assets \
&& npm run build

CMD ["./wait-for-elasticsearch.sh", "http://elasticsearch_7:9200", "--", "node", "dist/main"]
CMD ["./wait-for-elasticsearch.sh", "http://elasticsearch:9200", "--", "node", "dist/main"]
62 changes: 0 additions & 62 deletions backend/data/templates/example.appearance.json

This file was deleted.

95 changes: 95 additions & 0 deletions backend/data/templates/example.dashboards.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
[
{
"id": "a1",
"index": "c411accc-97a1-44ce-b47b-ff5beb4bdb20",
"name": "index",
"appearance": {
"primary_color": "#20a5b7",
"website_name": "OpenRXV",
"logo": null,
"chartColors": [
"#427730",
"#009673",
"#0065bd",
"#e1d219",
"#762022",
"#FF6633",
"#FFB399",
"#FF33FF",
"#FFFF99",
"#00B3E6",
"#E6B333",
"#3366E6",
"#999966",
"#99FF99",
"#B34D4D",
"#80B300",
"#809900",
"#E6B3B3",
"#6680B3",
"#66991A",
"#FF99E6",
"#CCFF1A",
"#FF1A66",
"#E6331A",
"#33FFCC",
"#66994D",
"#B366CC",
"#4D8000",
"#B33300",
"#CC80CC",
"#66664D",
"#991AFF",
"#E666FF",
"#4DB3FF",
"#1AB399",
"#E666B3",
"#33991A",
"#CC9999",
"#B3B31A",
"#00E680",
"#4D8066",
"#809980",
"#E6FF80",
"#1AFF33",
"#999933",
"#FF3380",
"#CCCC00",
"#66E64D",
"#4D80CC",
"#9900B3",
"#E64D66",
"#4DB380",
"#FF4D4D",
"#99E6E6",
"#6666FF"
]
},
"explorer": {
"counters": [],
"filters": [],
"dashboard": [],
"appearance": {
"primary_color": "#20a5b7",
"website_name": "OpenRXV",
"logo": null
},
"footer": "",
"welcome": {
"show": true,
"component": "WelcomeComponent",
"componentConfigs": {
"title": "Greetings",
"description": "Welcome to OpenRXV - Open Repository Explorer and Visualizer",
"show": true,
"id": "welcome",
"text": "<h2 class=\"primary-text center-text\" style=\"text-align: center;\">Welcome to OpenRXV - Open Repository Explorer and Visualizer</h2>\n<p class=\"center-text\">Choose your search options from the lists on your ICONS:search . Consider adding a filter &ndash; this can provide greater specificity to your query. You can start filtering anywhere you want. By selecting multiple criteria in each filter, all the other filters will be automatically updated to guarantee a combined result that returns no empty queries. AReS figures, graphics, tables and the Info Products List of Results update in real time and your results will be instantly displayed!</p>\n<p class=\"center-text\">Navigate the page and explore all of its features. You can expand and collapse the filters&rsquo; tab and any other section as you like, by clicking on ICONS:search and ICONS:expand_more icons. All graphics are exportable by clicking on ICONS:view_headline, and the Info Products List of Results can be downloaded in .xls , .docx , .pdf formats. Want to clean up all filters and query something else? Click ICONS:loop and start a new query straight away!</p>"
},
"tour": true
}
},
"reports": [],
"description": "The Main explorer index do not delete",
"created_at": "6/11/2022, 6:10:06 PM"
}
]
6 changes: 5 additions & 1 deletion backend/data/templates/example.data.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{"repositories":[]}
{
"openrxv-items": {
"repositories": []
}
}
6 changes: 5 additions & 1 deletion backend/data/templates/example.dataToUse.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{"repositories":[]}
{
"openrxv-items": {
"repositories": []
}
}
23 changes: 0 additions & 23 deletions backend/data/templates/example.explorer.json

This file was deleted.

8 changes: 8 additions & 0 deletions backend/data/templates/example.indexes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"id": "c411accc-97a1-44ce-b47b-ff5beb4bdb20",
"name": "openrxv-items",
"description": "The main index of OpenRXV\n",
"created_at": "6/12/2022, 11:31:26 AM"
}
]
4 changes: 3 additions & 1 deletion backend/data/templates/example.plugins.json
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
[]
{
"openrxv-items": []
}
1 change: 0 additions & 1 deletion backend/data/templates/example.reports.json

This file was deleted.

Loading

0 comments on commit 513c5f8

Please sign in to comment.