Merge pull request #97 from isd-sgcu/dev

legoo
isd-sgcu · Aug 4, 2023 · 94378e7 · 94378e7
2 parents d8c029d + 08cc981
commit 94378e7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/src/components/Background.tsx b/src/components/Background.tsx
@@ -16,7 +16,7 @@ const Background = () => {
                 blurDataURL={`data:image/svg+xml;base64, ${toBase64(
                     shimmer(1024, 1024)
                 )}`}
-                className="pointer-events-none fixed left-0 top-0 -z-50 hidden h-full w-full select-none object-cover object-top lg:block"
+                className="pointer-events-none fixed left-0 top-0 -z-50 hidden h-full w-full w-screen select-none overflow-hidden object-cover object-top lg:block"
             />
             <Image
                 src={BackgroundMobile}
@@ -27,7 +27,7 @@ const Background = () => {
                 blurDataURL={`data:image/svg+xml;base64, ${toBase64(
                     shimmer(1024, 1024)
                 )}`}
-                className="pointer-events-none fixed left-0 top-0 -z-50 block h-full w-full select-none object-cover lg:hidden"
+                className="pointer-events-none fixed left-0 top-0 -z-50 block h-full w-full w-screen select-none overflow-hidden object-cover lg:hidden"
             />
         </>
     );

diff --git a/src/pages/pdpa.tsx b/src/pages/pdpa.tsx
@@ -11,11 +11,9 @@ export async function getStaticProps() {
 
 const PrivacyPolicy = ({ source }: { source: any }) => {
     return (
-        <div className="h-full w-full">
-            <article className="prose w-full list-disc whitespace-pre-line bg-purple-400/75 p-14 leading-loose backdrop-blur-lg">
-                <div className="mx-auto w-full max-w-lg px-2">{source}</div>
-            </article>
-        </div>
+        <article className="proset flex list-disc overflow-hidden whitespace-pre-line bg-purple-400/75 p-14 leading-loose text-white backdrop-blur-lg">
+            <div className="mx-auto max-w-lg px-2">{source}</div>
+        </article>
     );
 };
 

diff --git a/src/pages/privacy-policy.tsx b/src/pages/privacy-policy.tsx
@@ -11,11 +11,9 @@ export async function getStaticProps() {
 
 const PrivacyPolicy = ({ source }: { source: any }) => {
     return (
-        <div className="h-full w-full">
-            <article className="prose w-full list-disc whitespace-pre-line bg-purple-400/75 p-14 leading-loose backdrop-blur-lg">
-                <div className="mx-auto w-full max-w-lg px-2">{source}</div>
-            </article>
-        </div>
+        <article className="prose flex w-full list-disc whitespace-pre-line bg-purple-400/75 p-14 leading-loose text-white backdrop-blur-lg">
+            <div className="mx-auto w-full max-w-lg px-2">{source}</div>
+        </article>
     );
 };
 

diff --git a/src/pages/scan.tsx b/src/pages/scan.tsx
@@ -29,7 +29,7 @@ function Scan() {
         try {
             // check-in qr code
             if (token === 'rpkm66-check-in') {
-                const { status } = await httpPost('/checkin/', {});
+                const { status } = await httpPost('/checkin', {});
                 if (status === 200) {
                     toast?.setToast('success', 'Check-in successfully');
                 } else {

diff --git a/src/pages/terms-conditions.tsx b/src/pages/terms-conditions.tsx
@@ -10,11 +10,9 @@ export async function getStaticProps() {
 
 const PrivacyPolicy = ({ source }: { source: any }) => {
     return (
-        <div className="h-full w-full">
-            <article className="prose w-full list-disc whitespace-pre-line bg-purple-400/75 p-14 leading-loose backdrop-blur-lg">
-                <div className="mx-auto w-full max-w-lg px-2">{source}</div>
-            </article>
-        </div>
+        <article className="prose flex w-full list-disc whitespace-pre-line bg-purple-400/75 p-14 leading-loose text-white backdrop-blur-lg">
+            <div className="mx-auto w-full max-w-lg px-2">{source}</div>
+        </article>
     );
 };