chore: merge branch

isd-sgcu · Jul 11, 2023 · d6ad083 · d6ad083
2 parents 68d7a96 + f49a4ee
commit d6ad083
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 25 deletions.
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -62,37 +62,35 @@ function MetaData() {
 
 export default function App({ Component, pageProps }: AppProps) {
     return (
-        <AuthProvider>
+        <main className={`${ibmPlexSansThai.variable} font-ibm text-white`}>
             <ToastProvider>
-                <MetaData />
+                <AuthProvider>
+                    <MetaData />
 
-                <main
-                    className={`${ibmPlexSansThai.variable} font-ibm text-white`}
-                >
                     <Navbar />
                     <Component {...pageProps} />
                     <Background />
                     <Footer />
-                </main>
-
-                <Analytics />
-                <Script
-                    async
-                    src="https://www.googletagmanager.com/gtag/js?id=G-0ZFDD1EKVW"
-                />
-                <Script
-                    id="google-analytics"
-                    dangerouslySetInnerHTML={{
-                        __html: `
-              window.dataLayer = window.dataLayer || [];
-              function gtag(){dataLayer.push(arguments);}
-              gtag('js', new Date());
-
-              gtag('config', 'G-0ZFDD1EKVW');
-          `,
-                    }}
-                />
+                </AuthProvider>
             </ToastProvider>
-        </AuthProvider>
+
+            <Analytics />
+            <Script
+                async
+                src="https://www.googletagmanager.com/gtag/js?id=G-0ZFDD1EKVW"
+            />
+            <Script
+                id="google-analytics"
+                dangerouslySetInnerHTML={{
+                    __html: `
+                      window.dataLayer = window.dataLayer || [];
+                      function gtag(){dataLayer.push(arguments);}
+                      gtag('js', new Date());
+
+                      gtag('config', 'G-0ZFDD1EKVW');
+                      `,
+                }}
+            />
+        </main>
     );
 }
diff --git a/src/pages/register.tsx b/src/pages/register.tsx
@@ -31,6 +31,13 @@ const Register = () => {
         formData.append('tag', '1');
         formData.append('type', '1');
 
+        // if file larger than 10mb
+        const TEN_MB = 10 * 1024 * 1024;
+        if (file.size > TEN_MB) {
+            toast?.setToast('error', 'ไฟล์มีขนาดใหญ่เกิน 10 MB');
+            return;
+        }
+
         try {
             const { data } = await httpPost<
                 FormData,
@@ -273,6 +280,9 @@ const Register = () => {
                                 <span className="text-xs">แก้ไข</span>
                             </div>
                         </div>
+                        <span className="text-center text-sm font-extralight text-purple/50">
+                            รูปภาพจะต้องมีขนาดไม่เกิน 10MB
+                        </span>
                         <input
                             id="image"
                             name="image"