From dfa9b3a0cad8adba9f2dd50e2e10d7701bc60e37 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Sat, 17 Jul 2021 00:51:28 +0800
Subject: [PATCH] fix require() actually not working after build in the
 frontend

---
 server/util.js                        |  8 ++------
 src/components/CountUp.vue            |  2 +-
 src/components/NotificationDialog.vue |  2 +-
 src/util-frontend.js                  | 13 +++++++++++++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/server/util.js b/server/util.js
index d1c9266a8..0a8877b80 100644
--- a/server/util.js
+++ b/server/util.js
@@ -1,9 +1,5 @@
-/*
- * Common functions - can be used in frontend or backend
- */
-
-
-
+// Common JS cannot be used in frontend sadly
+// sleep, ucfirst is duplicated in ../src/util-frontend.js
 
 exports.sleep = function (ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
diff --git a/src/components/CountUp.vue b/src/components/CountUp.vue
index b90f430e4..33904b6a9 100644
--- a/src/components/CountUp.vue
+++ b/src/components/CountUp.vue
@@ -5,7 +5,7 @@
 
 <script>
 
-const {sleep} = require("../../server/util")
+import {sleep} from '../util-frontend'
 
 export default {
 
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 791fa280f..159915177 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -220,7 +220,7 @@
 
 <script>
 import { Modal } from 'bootstrap'
-const {ucfirst} = require("../../server/util")
+import { ucfirst } from '../util-frontend'
 import axios from "axios";
 import { useToast } from 'vue-toastification'
 import Confirm from "./Confirm.vue";
diff --git a/src/util-frontend.js b/src/util-frontend.js
index ac308a8ec..7094c159b 100644
--- a/src/util-frontend.js
+++ b/src/util-frontend.js
@@ -5,6 +5,19 @@ import timezone  from 'dayjs/plugin/timezone'
 dayjs.extend(utc)
 dayjs.extend(timezone)
 
+export function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+export function ucfirst(str) {
+    if (! str) {
+        return str;
+    }
+
+    const firstLetter = str.substr(0, 1);
+    return firstLetter.toUpperCase() + str.substr(1);
+}
+
 
 function getTimezoneOffset(timeZone) {
     const now = new Date();