diff --git a/src/app/makuro/page.tsx b/src/app/makuro/page.tsx index 4ddb4c78..1ea65b4f 100644 --- a/src/app/makuro/page.tsx +++ b/src/app/makuro/page.tsx @@ -5,12 +5,14 @@ import { Button, Center, Paper, + ScrollArea, SimpleGrid, Stack, Text, TextInput, Title, } from "@mantine/core"; +import _ from "lodash"; // import ViewMakuro from "./_server/makuro_view"; // import mqtt_client from "@/util/mqtt_client"; // import { useState } from "react"; @@ -69,17 +71,38 @@ import { export default function Page() { return ( - -
+ + + satu + + - LOGIN - - - - - + {Array.from(new Array(300)).map((v, k) => ( + INI DIMANA {k+1} + ))} -
-
+ + + satu + + ); } diff --git a/src/app_modules/auth/index.ts b/src/app_modules/auth/index.ts index 04c1a5f0..97d3dd97 100644 --- a/src/app_modules/auth/index.ts +++ b/src/app_modules/auth/index.ts @@ -4,7 +4,6 @@ import Validasi from "./validasi/view"; import LayoutValidasi from "./validasi/layout"; import Register from "./register/view"; import User_Logout from "./logout/view"; -import LayoutLogin from "./login/layout"; export { SplashScreen, @@ -13,5 +12,4 @@ export { Register, User_Logout as Logout, LayoutValidasi, - LayoutLogin, }; diff --git a/src/app_modules/auth/login/layout.tsx b/src/app_modules/auth/login/layout.tsx deleted file mode 100644 index 3142b38e..00000000 --- a/src/app_modules/auth/login/layout.tsx +++ /dev/null @@ -1,22 +0,0 @@ -"use client"; - -import { - AppShell, - Center, - Footer, - Header, - Image, - Paper, - Text, - Title, -} from "@mantine/core"; -import React from "react"; - -export default function LayoutLogin({ - children, -}: { - children: React.ReactNode; -}) { - return <> - {children}; -} diff --git a/src/app_modules/auth/validasi/layout.tsx b/src/app_modules/auth/validasi/layout.tsx index bf18b6f3..56e952a4 100644 --- a/src/app_modules/auth/validasi/layout.tsx +++ b/src/app_modules/auth/validasi/layout.tsx @@ -13,8 +13,16 @@ export default function LayoutValidasi({ const router = useRouter(); return ( - - + + router.back()}> diff --git a/src/app_modules/auth/validasi/view.tsx b/src/app_modules/auth/validasi/view.tsx index dc449706..440bc596 100644 --- a/src/app_modules/auth/validasi/view.tsx +++ b/src/app_modules/auth/validasi/view.tsx @@ -105,53 +105,8 @@ export default function Validasi({ dataOtp }: { dataOtp: any }) { return ( <> - {/* - Validasi Kode OTP - - - - Enter the 4-digit OTP , we’ve just sent - to +{nomor} - - { - setInputOtp(val); - }} - /> - - - */} - {/*
{JSON.stringify(code)}
*/} - -
+
diff --git a/src/app_modules/home/layout.tsx b/src/app_modules/home/layout.tsx index e0ab35e9..60f3e8f2 100644 --- a/src/app_modules/home/layout.tsx +++ b/src/app_modules/home/layout.tsx @@ -3,6 +3,7 @@ import { ActionIcon, AppShell, Avatar, + Box, Center, Flex, Footer, @@ -14,6 +15,7 @@ import { Stack, Text, ThemeIcon, + Title, } from "@mantine/core"; import { HomeView } from "."; import { @@ -40,7 +42,7 @@ export default function HomeLayout({ }) { const router = useRouter(); const [user, setUser] = useState(dataUser); - const [loading, setLoading] = useState(false); + const [loadingProfil, setLoadingProfile] = useState(false); const [loadingUS, setLoadingUS] = useState(false); const listFooter = [ { @@ -57,33 +59,226 @@ export default function HomeLayout({ }, ]; + const Compo_Footer = ( +
+ + + {loadingUS ? ( +
+ +
+ ) : ( +
+ { + if (user?.Profile === null) { + ComponentGlobal_NotifikasiPeringatan("Lengkapi Profile"); + } else { + setLoadingUS(true); + // router.push(RouterProfile.katalog + `${user.Profile.id}`); + router.push(RouterUserSearch.main); + } + }} + > + + + + + Temukan pengguna + + +
+ )} +
+ + {loadingProfil ? ( +
+ +
+ ) : ( +
+ { + setLoadingProfile(true); + if (user?.Profile === null) { + router.push(RouterProfile.create + `${user.id}`); + } else { + router.push(RouterProfile.katalog + `${user.Profile.id}`); + } + }} + > + + {user?.Profile === null ? ( + + ) : ( + + )} + + + Profile + + +
+ )} +
+
+
+ ); + + return ( + <> + + +
+ + HIPMI + +
+
+ + {children} + + + + +
+ {loadingUS ? ( +
+ +
+ ) : ( +
+ { + if (user?.Profile === null) { + ComponentGlobal_NotifikasiPeringatan( + "Lengkapi Profile" + ); + } else { + setLoadingUS(true); + // router.push(RouterProfile.katalog + `${user.Profile.id}`); + router.push(RouterUserSearch.main); + } + }} + > + + + + + Temukan pengguna + + +
+ )} +
+ +
+ {loadingProfil ? ( +
+ +
+ ) : ( +
+ { + setLoadingProfile(true); + if (user?.Profile === null) { + router.push(RouterProfile.create + `${user.id}`); + } else { + router.push( + RouterProfile.katalog + `${user.Profile.id}` + ); + } + }} + > + + {user?.Profile === null ? ( + + ) : ( + + )} + + + Profile + + +
+ )} +
+
+
+
+ + ); + return ( <> - {/* - - - - */} HIPMI {/* */} - {/* - - - - */} } footer={