From 0c7745d435763e3fb8ea1893d8706837102fc5fb Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Thu, 12 Aug 2021 19:17:30 +0800
Subject: [PATCH] ui: training description display

---
 packages/ui-default/build/index.js            | 42 +++++++++----------
 packages/ui-default/entry.js                  |  6 +++
 packages/ui-default/hydro.js                  |  4 --
 packages/ui-default/package.json              |  2 +-
 .../ui-default/templates/training_detail.html |  2 +-
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/packages/ui-default/build/index.js b/packages/ui-default/build/index.js
index 9f76ce826..7cad145c2 100644
--- a/packages/ui-default/build/index.js
+++ b/packages/ui-default/build/index.js
@@ -5,29 +5,29 @@ let transformTimeUsage = 0;
 let transformCount = 0;
 let displayTimeout;
 function transform(filename) {
-    const start = new Date();
-    const result = esbuild.buildSync({
-        entryPoints: [filename],
-        sourcemap: 'inline',
-        platform: 'node',
-        format: 'cjs',
-        target: 'node12',
-        jsx: 'transform',
-        write: false,
-    });
-    if (result.warnings.length) console.warn(result.warnings);
-    transformTimeUsage += new Date().getTime() - start.getTime();
-    transformCount++;
-    if (displayTimeout) clearTimeout(displayTimeout);
-    displayTimeout = setTimeout(() => console.log(`Transformed ${transformCount} files. (${transformTimeUsage}ms)`), 1000);
-    return result.outputFiles[0].text;
+  const start = new Date();
+  const result = esbuild.buildSync({
+    entryPoints: [filename],
+    sourcemap: 'inline',
+    platform: 'node',
+    format: 'cjs',
+    target: 'node12',
+    jsx: 'transform',
+    write: false,
+  });
+  if (result.warnings.length) console.warn(result.warnings);
+  transformTimeUsage += new Date().getTime() - start.getTime();
+  transformCount++;
+  if (displayTimeout) clearTimeout(displayTimeout);
+  displayTimeout = setTimeout(() => console.log(`Transformed ${transformCount} files. (${transformTimeUsage}ms)`), 1000);
+  return result.outputFiles[0].text;
 }
 require.extensions['.js'] = function loader(module, filename) {
-    if (!filename.includes('node_modules')) {
-        return module._compile(transform(filename), filename);
-    }
-    const content = fs.readFileSync(filename, 'utf-8');
-    return module._compile(content, filename);
+  if (!filename.includes('node_modules') && !filename.includes('postcss.config.js')) {
+    return module._compile(transform(filename), filename);
+  }
+  const content = fs.readFileSync(filename, 'utf-8');
+  return module._compile(content, filename);
 };
 const main = require('./main.js');
 
diff --git a/packages/ui-default/entry.js b/packages/ui-default/entry.js
index 287a9f729..70cef2d75 100644
--- a/packages/ui-default/entry.js
+++ b/packages/ui-default/entry.js
@@ -18,4 +18,10 @@ console.log(
       /____/                   
 `,
 );
+
+window.UiContext = JSON.parse(window.UiContext);
+
+// eslint-disable-next-line
+try { __webpack_public_path__ = UiContext.cdn_prefix } catch (e) { }
+
 import('./hydro');
diff --git a/packages/ui-default/hydro.js b/packages/ui-default/hydro.js
index ae1ed5b1b..e786308c6 100644
--- a/packages/ui-default/hydro.js
+++ b/packages/ui-default/hydro.js
@@ -6,12 +6,8 @@ import PageLoader from 'vj/misc/PageLoader';
 import delay from 'vj/utils/delay';
 
 const start = new Date();
-window.UiContext = JSON.parse(window.UiContext);
 window.UserContext = JSON.parse(window.UserContext);
 
-// eslint-disable-next-line
-try { __webpack_public_path__ = UiContext.cdn_prefix } catch (e) { }
-
 function buildSequence(pages, type) {
   if (process.env.NODE_ENV !== 'production') {
     if (['before', 'after'].indexOf(type) === -1) {
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 14fb729c7..9fb0f3a05 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.17.1",
+  "version": "4.17.2",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/templates/training_detail.html b/packages/ui-default/templates/training_detail.html
index 31c6ea56f..c52e2c4b4 100644
--- a/packages/ui-default/templates/training_detail.html
+++ b/packages/ui-default/templates/training_detail.html
@@ -9,7 +9,7 @@
         {{ tdoc['content'] }}
       </div>
       <div class="section__body typo">
-        {{ tdoc['desc']|default('')|markdown|safe }}
+        {{ tdoc.description|default('')|markdown|safe }}
       </div>
     </div>
     <div class="section">