Merge remote-tracking branch 'origin/master' into sitemap-update

.github/workflows/main.yml

@@ -42,7 +42,6 @@ jobs:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         with:
           coverageCommand: yarn test --coverage --forceExit --detectOpenHandles
-
   docker:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     needs: [test]
@@ -54,7 +53,7 @@ jobs:
 
       - uses: docker/login-action@v1 
         with:
-          registry: www.ebl.lmu.de
+          registry: ebl.badw.de
           username: ${{ secrets.EBL_REGISTRY_USERNAME }}
           password: ${{ secrets.EBL_REGISTRY_PASSWORD }}
 
@@ -74,8 +73,8 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: |
-            www.ebl.lmu.de/ebl-frontend:master
-            ${{format('www.ebl.lmu.de/ebl-frontend:master.{0}', github.run_number)}}
+            ebl.badw.de/ebl-frontend:master
+            ${{format('ebl.badw.de/ebl-frontend:master.{0}', github.run_number)}}
 
   docker-test: 
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
@@ -87,7 +86,7 @@ jobs:
 
       - uses: docker/login-action@v1 
         with:
-          registry: www.ebl.lmu.de
+          registry: ebl.badw.de
           username: ${{ secrets.EBL_REGISTRY_USERNAME }}
           password: ${{ secrets.EBL_REGISTRY_PASSWORD }}
 
@@ -107,5 +106,5 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: |
-            www.ebl.lmu.de/ebl-frontend:test
+            ebl.badw.de/ebl-frontend:test
 

README.md

@@ -160,7 +160,7 @@ The sitemap should be regularly updated. To do so, follow these steps:
 
 ## Acknowledgements
 
-[Junicode](http://junicode.sourceforge.net/) webfont by [psb1558](http://sourceforge.net/users/psb1558) is licensed under the [SIL Open Font License, Version 1.1](http://scripts.sil.org/OFL). You can get the full distribution from [Junicode download page](http://sourceforge.net/projects/junicode/?source=typ_redirect).
+[Junicode](https://github.com/psb1558/Junicode-font) webfont by [psb1558](https://github.com/psb1558) is licensed under the [SIL Open Font License, Version 1.1](http://scripts.sil.org/OFL). You can get the full distribution from [Junicode download page](https://github.com/psb1558/Junicode-font).
 
 [Assurbanipal, Esagil, Santakku, SantakkuM, UllikummiA](https://www.hethport.uni-wuerzburg.de/cuneifont//) webfonts by
 [Sylvie Vanséveren](https://www.hethport.uni-wuerzburg.de/cuneifont/) are freely available for the scientific community.

public/index.html

@@ -6,15 +6,16 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="theme-color" content="#000000">
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-  <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+  <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.svg">
   <title>electronic Babylonian Library</title>
   <meta name="description"
     content="The electronic Babylonian Library (eBL) Project brings together ancient Near Eastern specialists and data scientists to revolutionize the way in which the literature of Iraq in the first millennium BCE is reconstructed and analyzed."
     data-rh="true">
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css"
     integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css"
-    integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"
+    integrity="sha512-Kc323vGBEqzTmouAECnVceyQqyqdsSiqLQISBL29aUW4U/M7pSPA/gEUZQqv1cwx4OnYxTxve5UMg5GT6L4JJg=="
+    crossorigin="anonymous">
   <meta name="google-site-verification" content="J13cZ-OSwYU4IUrzsMxb9A80nUcdgkG9U4xbBR3C7LA" />
   <meta property="og:type" content="website" />
   <meta property="og:site_name" content="electronic Babylonian Library" />

public/manifest.json

@@ -3,9 +3,9 @@
   "name": "electronic Babylonian Library",
   "icons": [
     {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
+      "src": "favicon.svg",
+      "sizes": "any",
+      "type": "image/svg+xml"
     }
   ],
   "start_url": "./index.html",

public/serve.json

@@ -5,7 +5,7 @@
       "headers": [
         {
           "key": "Content-Security-Policy",
-          "value": "default-src 'self'; connect-src 'self' https: https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com; script-src 'self' https://storage.googleapis.com https://*.googletagmanager.com https://sentry.io; worker-src 'self' blob:; img-src 'self' data: blob: https://cdli.mpiwg-berlin.mpg.de https://cdn.auth0.com https://*.google-analytics.com https://*.googletagmanager.com; font-src 'self' data: https://stackpath.bootstrapcdn.com https://use.fontawesome.com; style-src 'self' 'unsafe-inline' https://stackpath.bootstrapcdn.com https://use.fontawesome.com; frame-src 'self' https://electronic-babylonian-literature.eu.auth0.com https://auth.ebl.lmu.de; frame-ancestors 'none'; base-uri 'none'; form-action 'none';"  
+          "value": "default-src 'self'; connect-src 'self' https: https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com; script-src 'self' https://storage.googleapis.com https://*.googletagmanager.com https://sentry.io; worker-src 'self' blob:; img-src 'self' data: blob: https://cdli.mpiwg-berlin.mpg.de https://cdn.auth0.com https://*.google-analytics.com https://*.googletagmanager.com; font-src 'self' data: https://stackpath.bootstrapcdn.com https://cdnjs.cloudflare.com; style-src 'self' 'unsafe-inline' https://stackpath.bootstrapcdn.com https://cdnjs.cloudflare.com; frame-src 'self' https://electronic-babylonian-literature.eu.auth0.com https://auth.ebl.lmu.de; frame-ancestors 'none'; base-uri 'none'; form-action 'none';"
         },
         {
           "key": "Strict-Transport-Security",

src/App.test.ts

@@ -29,7 +29,10 @@ test.each([
   ...['date-converter', 'list-of-kings'].map((tabId) => '/about/' + tabId),
   '/signs',
   '/signs/sign_id',
+  '/impressum',
+  '/datenschutz',
 ])('%s renders without crashing', async (route) => {
+  window.scrollTo = jest.fn()
   const fakeApi = new FakeApi().allowStatistics(statisticsFactory.build())
   const appDriver = new AppDriver(fakeApi.client).withPath(route).render()
   await appDriver.waitForTextToDisappear('Loading...')