Merge pull request #484 from nfdi4plants/Refactor_DataMap

Refactor data map

.db/docker-compose.yml

@@ -19,7 +19,7 @@ services:
     networks:
       - swobup_network
     environment:
-      - NEO4J_AUTH=neo4j/test
+      - NEO4J_AUTH=neo4j/testing12345
       - NEO4J_server_memory_pagecache_size=7G
       - NEO4J_server_memory_heap_initial__size=5G
       - NEO4J_server_memory_heap_max__size=5G
@@ -29,7 +29,6 @@ services:
       - NEO4J_PLUGINS=["graph-data-science", "apoc"]
       - NEO4J_dbms_security_procedures_unrestricted=algo.*, apoc.*
       - NEO4J_server_jvm_additional='-XX:+ExitOnOutOfMemoryError'
-      - NEO4J_dbms_security_auth__minimum__password__length=4
     volumes:
       - ./neo4j/data:/data
       - ./neo4j/logs:/logs
@@ -46,7 +45,7 @@ services:
       - GITHUB_SECRET=test
       - DB_URL=bolt://neo4j:7687
       - DB_USER=neo4j
-      - DB_PASSWORD=test
+      - DB_PASSWORD=testing12345
       - ONTOLOGY_REPOSITORY=nfdi4plants/nfdi4plants_ontology
       - TEMPLATE_REPOSITORY=nfdi4plants/SWATE_templates
       - SWATE_API=https://swate-alpha.nfdi4plants.org

.db/docker.compose.new.yml

@@ -24,7 +24,7 @@ services:
     networks:
       - swobup_network
     environment:
-      - NEO4J_AUTH=neo4j/test
+      - NEO4J_AUTH=neo4j/testing12345
       - NEO4J_server_memory_pagecache_size=7G
       - NEO4J_server_memory_heap_initial__size=5G
       - NEO4J_server_memory_heap_max__size=5G
@@ -34,7 +34,6 @@ services:
       - NEO4J_PLUGINS=["graph-data-science", "apoc"]
       - NEO4J_dbms_security_procedures_unrestricted=algo.*, apoc.*
       - NEO4J_server_jvm_additional='-XX:+ExitOnOutOfMemoryError'
-      - NEO4J_dbms_security_auth__minimum__password__length=4
     volumes:
       - ./neo4j/data:/data
       - ./neo4j/logs:/logs
@@ -53,7 +52,7 @@ services:
       - swobup_network
     environment:
       - DB_USER=neo4j
-      - DB_PASSWORD=test
+      - DB_PASSWORD=testing12345
       - DB_URL=bolt://neo4j:7687
       - DB_NAME=neo4j
 
@@ -68,7 +67,7 @@ services:
       - GITHUB_SECRET=test
       - DB_URL=bolt://neo4j:7687
       - DB_USER=neo4j
-      - DB_PASSWORD=test
+      - DB_PASSWORD=testing12345
       - ONTOLOGY_REPOSITORY=nfdi4plants/nfdi4plants_ontology
       - TEMPLATE_REPOSITORY=nfdi4plants/SWATE_templates
       - SWATE_API=https://swate-alpha.nfdi4plants.org

.editorconfig

@@ -9,4 +9,8 @@ insert_final_newline = false
 
 [*.fs]
 fsharp_multiline_bracket_style = stroustrup
-fsharp_newline_before_multiline_computation_expression = false
+fsharp_newline_before_multiline_computation_expression = false
+
+[*.fsproj]
+indent_style = space
+indent_size = 2

README.md

@@ -75,10 +75,10 @@ Swate runs on localhost:8080 (and swobup on localhost:8000).
 ```
 Usage: ./build.cmd <command>
 
-run (--nodb)                        Start .net backend server, vite frontend (and database, 
-                                    swobup with docker if not `--nodb`)
+run [db]                            Start .net backend server, vite frontend (and database, 
+                                    swobup with docker if `db`)
 
-release (pre)                       Run .net tests tag current branch and force push to 
+release [pre]                       Run .net tests tag current branch and force push to 
                                     release branch (nightly if `pre`), this will trigger
                                     Github release with docker image
 

build/Dockerfile.publish

@@ -12,7 +12,6 @@ RUN apt-get update && apt-get install nodejs -y
 WORKDIR /workspace
 COPY ../. .
 RUN dotnet tool restore
-RUN dotnet paket install
 RUN dotnet run --project ./build/Build.fsproj bundle