Update portal title and favicon

panosc-eu · Apr 14, 2022 · 95ed691 · 95ed691
1 parent b276504
commit 95ed691
Show file tree

Hide file tree

Showing 24 changed files with 64 additions and 87 deletions.
diff --git a/public/404.html b/public/404.html
@@ -2,45 +2,18 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>Single Page Apps for GitHub Pages</title>
+    <title>Open Data Portal · PaNOSC</title>
     <script type="text/javascript">
-      // Single Page Apps for GitHub Pages
-      // MIT License
-      // https://github.com/rafgraph/spa-github-pages
-      // This script takes the current url and converts the path and query
-      // string into just a query string, and then redirects the browser
-      // to the new url with only a query string and hash fragment,
-      // e.g. https://www.foo.tld/one/two?a=b&c=d#qwe, becomes
-      // https://www.foo.tld/?/one/two&a=b~and~c=d#qwe
-      // Note: this 404.html file must be at least 512 bytes for it to work
-      // with Internet Explorer (it is currently > 512 bytes)
-
-      // If you're creating a Project Pages site and NOT using a custom domain,
-      // then set pathSegmentsToKeep to 1 (enterprise users may need to set it to > 1).
-      // This way the code will only replace the route part of the path, and not
-      // the real directory in which the app resides, for example:
-      // https://username.github.io/repo-name/one/two?a=b&c=d#qwe becomes
-      // https://username.github.io/repo-name/?/one/two&a=b~and~c=d#qwe
-      // Otherwise, leave pathSegmentsToKeep as 0.
-      var pathSegmentsToKeep = 0
-
+      // https://github.com/rafgraph/spa-github-pages (MIT License)
       var l = window.location
       l.replace(
         l.protocol +
           '//' +
           l.hostname +
           (l.port ? ':' + l.port : '') +
-          l.pathname
-            .split('/')
-            .slice(0, 1 + pathSegmentsToKeep)
-            .join('/') +
+          l.pathname.split('/').slice(0, 1).join('/') +
           '/?/' +
-          l.pathname
-            .slice(1)
-            .split('/')
-            .slice(pathSegmentsToKeep)
-            .join('/')
-            .replace(/&/g, '~and~') +
+          l.pathname.slice(1).split('/').join('/').replace(/&/g, '~and~') +
           (l.search ? '&' + l.search.slice(1).replace(/&/g, '~and~') : '') +
           l.hash,
       )

diff --git a/public/PaNOSC_logo_black.svg b/public/PaNOSC_logo_black.svg
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon.png b/public/favicon.png
diff --git a/public/favicon.svg b/public/favicon.svg
diff --git a/public/icons/Icon_CPU.svg b/public/icons/Icon_CPU.svg
diff --git a/public/icons/Icon_GPU.svg b/public/icons/Icon_GPU.svg
diff --git a/public/icons/Icon_Message.svg b/public/icons/Icon_Message.svg
diff --git a/public/icons/Icon_Search.svg b/public/icons/Icon_Search.svg
diff --git a/public/icons/Icon_Settings.svg b/public/icons/Icon_Settings.svg
diff --git a/public/icons/Icon_User.svg b/public/icons/Icon_User.svg
diff --git a/public/icons/JupyterLab.svg b/public/icons/JupyterLab.svg
diff --git a/public/icons/PaNOSC_logo_black.png b/public/icons/PaNOSC_logo_black.png
diff --git a/public/icons/PaNOSC_logo_white.png b/public/icons/PaNOSC_logo_white.png
diff --git a/public/icons/VM.svg b/public/icons/VM.svg
diff --git a/public/index.html b/public/index.html
@@ -2,44 +2,23 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
+
+    <title>Open Data Portal · PaNOSC</title>
+    <meta name="description" content="Open Science Catalogue" />
+
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" sizes="any" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.svg" type="image/svg+xml" />
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <link rel="preconnect" href="https://fonts.gstatic.com" />
     <link
       href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400;600;700&display=swap"
       rel="stylesheet"
     />
 
-    <meta name="description" content="Open Science Catalogue" />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>Photon and Neutron Open Science Cloud</title>
-
     <script type="text/javascript">
-      // Single Page Apps for GitHub Pages
-      // MIT License
-      // https://github.com/rafgraph/spa-github-pages
-      // This script checks to see if a redirect is present in the query string,
-      // converts it back into the correct url and adds it to the
-      // browser's history using window.history.replaceState(...),
-      // which won't cause the browser to attempt to load the new url.
-      // When the single page app is loaded further down in this file,
-      // the correct url will be waiting in the browser's history for
-      // the single page app to route accordingly.
+      // https://github.com/rafgraph/spa-github-pages (MIT License)
       ;(function (l) {
         if (l.search[1] === '/') {
           var decoded = l.search
@@ -61,15 +40,5 @@
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   </body>
 </html>
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/logo_dark.png b/public/logo_dark.png
diff --git a/public/logo_light.png b/public/logo_light.png
diff --git a/public/panosc_plain.svg b/public/panosc_plain.svg
diff --git a/public/site.webmanifest b/public/site.webmanifest
@@ -0,0 +1,3 @@
+{
+  "icons": [{ "src": "/favicon.png", "type": "image/png", "sizes": "192x192" }]
+}
diff --git a/src/App/Navigation.js b/src/App/Navigation.js
@@ -2,8 +2,8 @@ import { Input } from '@rebass/forms/styled-components'
 import { FiSearch } from 'react-icons/fi'
 import { Redirect, Route, useLocation } from 'react-router-dom'
 
-import logoWhite from '../PaNOSC_logo_white.svg'
 import { Box, Button, Flex, Image, NavLink } from '../Primitives'
+import logo from '../logo.svg'
 import { useQueryParam } from '../router-utils'
 import ResultsCount from './ResultsCount'
 
@@ -34,12 +34,7 @@ function Navigation() {
     >
       <NavLink to="/" exact>
         <Box height="logoHeight" p={[1, 0]}>
-          <Image
-            height="100%"
-            width="unset"
-            alt="PaNOSC logo"
-            src={logoWhite}
-          />
+          <Image height="100%" width="unset" alt="PaNOSC logo" src={logo} />
         </Box>
       </NavLink>
 

diff --git a/src/PaNOSC_logo_white.svg → src/logo.svg b/src/PaNOSC_logo_white.svg → src/logo.svg