Merge branch 'main' into docs/readme

2anki · May 28, 2022 · 6b197e4 · 6b197e4
2 parents f42c42d + 116ccce
commit 6b197e4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/server/lib/notion/helpers/getListItems.tsx b/server/lib/notion/helpers/getListItems.tsx
@@ -19,7 +19,7 @@ export default async function getListItems(
       if (!list) {
         return null;
       }
-      const backSide = await getChildren(result, handler);
+      const backSide = await getChildren(list, handler);
       handler.skip.push(result.id);
       const isTodo = type === 'to_do';
       const checked =
@@ -36,7 +36,11 @@ export default async function getListItems(
               className={`checkbox checkbox-${list.checked ? 'on' : 'off'}`}
             ></div>
           )}
-          {renderTextChildren(list.text, handler.settings)}
+          <div
+            dangerouslySetInnerHTML={{
+              __html: renderTextChildren(list.text, handler.settings),
+            }}
+          />
           {backSide && (
             <div
               className={`${checkedClass}`}

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -7,7 +7,7 @@
     "notion2anki"
   ],
   "author": "Alexander Alemayhu",
-  "version": "0.14.6",
+  "version": "1.0.0-alpha.0",
   "engines": {
     "node": ">=12.0.0"
   },

diff --git a/server/server.ts b/server/server.ts
@@ -7,6 +7,12 @@ import cookieParser from 'cookie-parser';
 import * as dotenv from 'dotenv';
 
 import { IsDebug } from './lib/debug';
+if (IsDebug()) {
+  const localEnvFile = path.join(__dirname, '.env');
+  if (existsSync(localEnvFile)) {
+    dotenv.config({ path: localEnvFile });
+  }
+}
 
 import { ALLOWED_ORIGINS, BUILD_DIR, INDEX_FILE } from './lib/constants';
 import ErrorHandler from './lib/misc/ErrorHandler';
@@ -30,13 +36,6 @@ import { ScheduleCleanup } from './lib/jobs/JobHandler';
 import ConversionJob from './lib/jobs/ConversionJob';
 import RequireAuthentication from './middleware/RequireAuthentication';
 
-if (IsDebug()) {
-  const localEnvFile = path.join(__dirname, '.env');
-  if (existsSync(localEnvFile)) {
-    dotenv.config({ path: localEnvFile });
-  }
-}
-
 function serve() {
   const templateDir = path.join(__dirname, 'templates');
   const app = express();

diff --git a/server/templates/custom.css b/server/templates/custom.css
@@ -26,15 +26,10 @@ body {
 }
 
 .front-text-post {
-  color: gray;
   font-size: 1rem;
 }
 
 .back-text {
   font-size: 1.5rem;
   text-align: left;
-}
-
-.extra {
-  color: gray;
-}
+}