highmed · imi-muenster · Dec 9, 2021 · Dec 9, 2021
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
+
+docker-compose.yml
+
 # User-specific files
 *.rsuser
 *.suo
@@ -461,4 +464,4 @@ dist
 .yarn/cache
 .yarn/unplugged
 .yarn/build-state.yml
-.pnp.*
+.pnp.*
diff --git a/Certificates/.placeholder b/Certificates/.placeholder
diff --git a/Dockerfile b/Dockerfile
@@ -29,17 +29,16 @@ COPY RKIAlgorithm/Statistik.dod.zip RKIAlgorithm/Statistik.dod.zip
 COPY RKIAlgorithm/Statistik.dod.tar.gz RKIAlgorithm/Statistik.dod.tar.gz
 COPY SmICSWebApp/Resources/RRuntime/R_Script_00010.R Resources/RRuntime/
 COPY pub/jranke.asc jranke.asc
+COPY pub/jranke2.asc jranke2.asc
 COPY SmICSWebApp/Resources/ Resources/
 
 RUN apt-get update 
 Run apt-get -y upgrade
-RUN apt-get -y install ca-certificates wget
-RUN apt-get -y install gnupg2 gnupg1
+RUN apt-get -y install ca-certificates wget gnupg2 gnupg1 software-properties-common apt-transport-https
 RUN apt-get -y install dirmngr --install-recommends
-RUN apt-get -y install software-properties-common
-RUN apt-get -y install apt-transport-https
 
 RUN apt-key add jranke.asc
+RUN apt-key add jranke2.asc
 
 RUN add-apt-repository 'deb http://cloud.r-project.org/bin/linux/debian buster-cran40/'
 RUN apt-get update
@@ -57,4 +56,4 @@ EXPOSE 80
 EXPOSE 443
 ENV SMICS_VISU_PORT=3231
 
-ENTRYPOINT ["dotnet", "SmICSWebApp.dll"]
+ENTRYPOINT ["dotnet", "SmICSWebApp.dll"]
diff --git a/SmICSWebApp/Pages/Index.razor b/SmICSWebApp/Pages/Index.razor
@@ -42,27 +42,27 @@
         Gefördert vom:
     </div>
     <a href="https://www.highmed.org/">
-        <img src="/resources/highmed.png" width="12%" height="8%" class="logo_img" />
+        <img src="resources/highmed.png" width="12%" height="8%" class="logo_img" />
     </a>
 
     <a href="https://www.medizininformatik-initiative.de/de/use-cases/codex-covid-19-data-exchange-platform">
-        <img src="/resources/Logo_CODEX_rgb_cropped.png" width="12%" height="8%" class="logo_img" />
+        <img src="resources/Logo_CODEX_rgb_cropped.png" width="12%" height="8%" class="logo_img" />
     </a>
 
     <a href="https://www.umg.eu/forschung/corona-forschung/num/b-fast/projekt-b-fast/">
-        <img src="/resources/BFAST_Logo.png" width="10%" height="7%" class="logo_img" />
+        <img src="resources/BFAST_Logo.png" width="10%" height="7%" class="logo_img" />
     </a>
 
     <a href="https://www.netzwerk-universitaetsmedizin.de/">
-        <img src="/resources/NUM_Logo.png" width="10%" height="7%" class="logo_img" style="padding-bottom: 1%;" />
+        <img src="resources/NUM_Logo.png" width="10%" height="7%" class="logo_img" style="padding-bottom: 1%;" />
     </a>
 
     <a href="https://www.medizininformatik-initiative.de/">
-        <img src="/resources/Logo_MII.png" width="8%" height="5%" class="logo_img" />
+        <img src="resources/Logo_MII.png" width="8%" height="5%" class="logo_img" />
     </a>
 
     <a href="https://www.bmbf.de/">
-        <img src="/resources/BMBF_Logo.png" width="10%" height="7%" class="logo_img" />
+        <img src="resources/BMBF_Logo.png" width="10%" height="7%" class="logo_img" />
     </a>
 
 </div>
diff --git a/SmICSWebApp/Pages/_Host.cshtml b/SmICSWebApp/Pages/_Host.cshtml
@@ -11,11 +11,11 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>SmICSWebApp</title>
-    <base href="~/" />
+
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
     <link href="css/site.css" rel="stylesheet" />
     <link href="SmICSWebApp.styles.css" rel="stylesheet" />
-    <link href="~/css/rki-dashboard.css" rel="stylesheet" />
+    <link href="css/rki-dashboard.css" rel="stylesheet" />
     <link href="css/form.css" rel="stylesheet" />
 
 </head>
@@ -37,14 +37,12 @@
 
     <script src="_framework/blazor.server.js"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
-
-    <script src="~/js/saveAsFile.js"></script>
-    <script src="~/js/site.js"></script>
-    <script src="~/js/copyToClipoard.js"></script>
+    <script src="js/saveAsFile.js"></script>
+    <script src="js/site.js"></script>
+    <script src="js/copyToClipoard.js"></script>
 
     @*Chart*@
-    <script src="https://cdn.jsdelivr.net/npm/chart.js@2.9.4/dist/Chart.min.js"></script>
+    <script src="js/libs/Chart.js/2.9.4/Chart.min.js"></script>
     <script src="_content/ChartJs.Blazor.Fork/ChartJsBlazorInterop.js"></script>
 
 </body>

diff --git a/SmICSWebApp/Shared/NavMenu.razor b/SmICSWebApp/Shared/NavMenu.razor
@@ -6,7 +6,7 @@
     <div class="container_logo">
         @*<h1>SmICS</h1>*@
         <a href="">
-            <img src="/resources/SmICS_Logo.png" />
+            <img src="resources/SmICS_Logo.png" />
         </a>
     </div>
     <div class="navbar-nav-box">

diff --git a/SmICSWebApp/wwwroot/js/libs/Chart.js/2.9.4/Chart.min.js b/SmICSWebApp/wwwroot/js/libs/Chart.js/2.9.4/Chart.min.js
diff --git a/docker-compose.yml → docker-compose.yml.default b/docker-compose.yml → docker-compose.yml.default
diff --git a/pub/jranke2.asc b/pub/jranke2.asc
@@ -0,0 +1,82 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Hostname: 
+Version: Hockeypuck ~unreleased
+
+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
+uJJREg==
+=5igN
+-----END PGP PUBLIC KEY BLOCK-----
+