Fixing bugs, adding forgotten images, removing unused stuff.

krulis-martin · krulis-martin · commit 6b9e12cb2edb · 2025-01-04T21:16:48.000+01:00
diff --git a/etc/env.json.example b/etc/env.json.example
@@ -2,7 +2,7 @@
   "PORT": 8080,
   "URL_PATH_PREFIX": "",
   "API_BASE": "https://siscodex.base.domain/api",
-  "RECODEX_URI:": "https://recodex.webapp.domain",
+  "RECODEX_URI": "https://recodex.webapp.domain",
   "TITLE": "SIS-CodEx",
   "SKIN": "success",
   "PERSISTENT_TOKENS_KEY_PREFIX": "recodex-sis"
diff --git a/public/public/favicon.ico b/public/public/favicon.ico
diff --git a/public/public/logo-bare.png b/public/public/logo-bare.png
diff --git a/src/helpers/config.js b/src/helpers/config.js
@@ -4,7 +4,7 @@ import { safeGet, canUseDOM } from './common.js';
 export const getConfigVar = name => {
   let MY_VAR = '';
   if (canUseDOM) {
-    MY_VAR = safeGet(window, ['__RECODEX_CONFIG__', name], '');
+    MY_VAR = safeGet(window, ['__SISCODEX_CONFIG__', name], '');
   } else {
     MY_VAR = JSON.parse(fs.readFileSync('etc/env.json', 'utf8'))[name] || '';
   }
diff --git a/src/pages/routes.js b/src/pages/routes.js
@@ -90,7 +90,11 @@ const getRedirect = (routeObj, urlPath, isLoggedIn) => {
  */
 export const match = (urlPath, isLoggedIn) => {
   const routeObj = routesDescriptors.find(({ route }) => matchPath(route, urlPath) !== null);
-  const component = routeObj && unwrap(routeObj.component);
+  if (!routeObj) {
+    return {};
+  }
+
+  const component = unwrap(routeObj.component);
 
   const redirect = getRedirect(routeObj, urlPath, isLoggedIn);
   const match = matchPath(routeObj.route, urlPath);
diff --git a/src/server.js b/src/server.js
@@ -90,7 +90,7 @@ app.get('*', (req, res) => {
      */
 
     const userId = loggedInUserIdSelector(store.getState()); // try to get the user ID from the token (if any)
-    const { redirect /*, params, loadAsync */ } = match(location, Boolean(userId));
+    const { redirect = null /*, params, loadAsync */ } = match(location, Boolean(userId));
 
     if (redirect) {
       res.redirect(302, redirect);
diff --git a/views/index.ejs b/views/index.ejs
@@ -9,9 +9,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/png" href="<%= urlPrefix %>/public/favicon.ico" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700&display=fallback">
-
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.11.1/katex.min.css" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.16.2/build/styles/default.min.css">
     <link
       rel="stylesheet"
       href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/4.0.0/github-markdown.min.css"
@@ -72,13 +69,11 @@
   </head>
 
   <body class="loading" style="height: auto">
-    <div id="loading-screen">
-      <%= ((new Date()).getMonth() === 3 && (new Date()).getDate() === 1) ? 'Loudím' : 'Loading' %>...
-    </div>
+    <div id="loading-screen">Loading...</div>
 
     <div id="root"></div>
     <script>
-      window.__RECODEX_CONFIG__ = <%- config %>;
+      window.__SISCODEX_CONFIG__ = <%- config %>;
     </script>
     <script src="<%= bundle %>"></script>
     <script>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import { safeGet, canUseDOM } from './common.js';`
`4`	`4`	`export const getConfigVar = name => {`
`5`	`5`	`let MY_VAR = '';`
`6`	`6`	`if (canUseDOM) {`
`7`		`- MY_VAR = safeGet(window, ['__RECODEX_CONFIG__', name], '');`
	`7`	`+ MY_VAR = safeGet(window, ['__SISCODEX_CONFIG__', name], '');`
`8`	`8`	`} else {`
`9`	`9`	`MY_VAR = JSON.parse(fs.readFileSync('etc/env.json', 'utf8'))[name] \|\| '';`
`10`	`10`	`}`