Merapihkan struktur folder

7 files changed, 44 insertions, 42 deletions

diff --git a/src/pages/my/address/[id]/edit.js b/src/pages/my/address/[id]/edit.js
index e65ba699..838d39e7 100644
--- a/src/pages/my/address/[id]/edit.js
+++ b/src/pages/my/address/[id]/edit.js
@@ -1,12 +1,12 @@
 import { Controller, useForm } from "react-hook-form"
-import WithAuth from "../../../../components/WithAuth";
-import Layout from "../../../../components/Layout";
-import AppBar from "../../../../components/AppBar";
+import WithAuth from "@/components/auth/WithAuth";
+import Layout from "@/components/layouts/Layout";
+import AppBar from "@/components/layouts/AppBar";
 import { yupResolver } from "@hookform/resolvers/yup";
 import * as Yup from "yup";
-import { Select } from "../../../../components/Fields";
+import { Select } from "@/components/elements/Fields";
 import { useEffect, useState } from "react";
-import apiOdoo from "../../../../helpers/apiOdoo";
+import apiOdoo from "@/core/utils/apiOdoo";
 import { toast } from "react-hot-toast";
 import { useRouter } from "next/router";
 
@@ -17,7 +17,7 @@ const validationSchema = Yup.object().shape({
   mobile: Yup.string().required('Harus di-isi'),
   street: Yup.string().required('Harus di-isi'),
   zip: Yup.string().required('Harus di-isi'),
-  city: Yup.number().required('Harus di-pilih'),
+  city: Yup.string().required('Harus di-pilih'),
 });
 
 const types = [
diff --git a/src/pages/my/address/create.js b/src/pages/my/address/create.js
index 71f73a64..4c7a8130 100644
--- a/src/pages/my/address/create.js
+++ b/src/pages/my/address/create.js
@@ -1,13 +1,13 @@
 import { Controller, useForm } from "react-hook-form"
-import WithAuth from "../../../components/WithAuth";
-import Layout from "../../../components/Layout";
-import AppBar from "../../../components/AppBar";
+import WithAuth from "@/components/auth/WithAuth";
+import Layout from "@/components/layouts/Layout";
+import AppBar from "@/components/layouts/AppBar";
 import { yupResolver } from "@hookform/resolvers/yup";
 import * as Yup from "yup";
-import { Select } from "../../../components/Fields";
+import { Select } from "@/components/elements/Fields";
 import { useEffect, useState } from "react";
-import apiOdoo from "../../../helpers/apiOdoo";
-import { useAuth } from "../../../helpers/auth";
+import apiOdoo from "@/core/utils/apiOdoo";
+import { useAuth } from "@/core/utils/auth";
 import { toast } from "react-hot-toast";
 import { useRouter } from "next/router";
 
@@ -18,7 +18,7 @@ const validationSchema = Yup.object().shape({
   mobile: Yup.string().required('Harus di-isi'),
   street: Yup.string().required('Harus di-isi'),
   zip: Yup.string().required('Harus di-isi'),
-  city: Yup.number().required('Harus di-pilih'),
+  city: Yup.string().required('Harus di-pilih'),
 });
 
 const defaultValues = {
diff --git a/src/pages/my/address/index.js b/src/pages/my/address/index.js
index 236e4b60..dbe082ff 100644
--- a/src/pages/my/address/index.js
+++ b/src/pages/my/address/index.js
@@ -1,12 +1,14 @@
 import { useEffect, useState } from "react";
-import AppBar from "../../../components/AppBar";
-import Layout from "../../../components/Layout";
-import Link from "../../../components/Link";
-import WithAuth from "../../../components/WithAuth";
-import apiOdoo from "../../../helpers/apiOdoo";
-import { useAuth } from "../../../helpers/auth";
 import { useRouter } from "next/router";
-import { createOrUpdateItemAddress, getItemAddress } from "../../../helpers/address";
+
+import AppBar from "@/components/layouts/AppBar";
+import Layout from "@/components/layouts/Layout";
+import Link from "@/components/elements/Link";
+import WithAuth from "@/components/auth/WithAuth";
+
+import apiOdoo from "@/core/utils/apiOdoo";
+import { useAuth } from "@/core/utils/auth";
+import { createOrUpdateItemAddress, getItemAddress } from "@/core/utils/address";
 
 export default function Address() {
   const router = useRouter();
diff --git a/src/pages/my/menu.js b/src/pages/my/menu.js
index f43c1fe9..e7ece135 100644
--- a/src/pages/my/menu.js
+++ b/src/pages/my/menu.js
@@ -1,8 +1,8 @@
 
-import AppBar from "../../components/AppBar";
-import Layout from "../../components/Layout";
-import Link from "../../components/Link";
-import { useAuth } from "../../helpers/auth";
+import AppBar from "@/components/layouts/AppBar";
+import Layout from "@/components/layouts/Layout";
+import Link from "@/components/elements/Link";
+import { useAuth } from "@/core/utils/auth";
 import {
   ArrowRightOnRectangleIcon,
   ChatBubbleLeftRightIcon,
diff --git a/src/pages/my/profile.js b/src/pages/my/profile.js
index d4b7fb6d..97891259 100644
--- a/src/pages/my/profile.js
+++ b/src/pages/my/profile.js
@@ -1,14 +1,14 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { toast } from "react-hot-toast";
-import AppBar from "../../components/AppBar";
-import Layout from "../../components/Layout";
-import WithAuth from "../../components/WithAuth";
-import apiOdoo from "../../helpers/apiOdoo";
+import AppBar from "@/components/layouts/AppBar";
+import Layout from "@/components/layouts/Layout";
+import WithAuth from "@/components/auth/WithAuth";
+import apiOdoo from "@/core/utils/apiOdoo";
 import { 
   useAuth,
   setAuth as setAuthCookie,
   getAuth
-} from "../../helpers/auth";
+} from "@/core/utils/auth";
 
 export default function MyProfile() {
   const [auth, setAuth] = useAuth();
diff --git a/src/pages/my/transactions/[slug].js b/src/pages/my/transactions/[slug].js
index b2381247..a76b0c4d 100644
--- a/src/pages/my/transactions/[slug].js
+++ b/src/pages/my/transactions/[slug].js
@@ -1,8 +1,8 @@
 import { ArrowDownOnSquareIcon, ArrowDownTrayIcon, ChevronDownIcon, ChevronRightIcon, ChevronUpIcon } from "@heroicons/react/24/outline";
-import AppBar from "../../../components/AppBar";
-import Layout from "../../../components/Layout";
-import LineDivider from "../../../components/LineDivider";
-import WithAuth from "../../../components/WithAuth";
+import AppBar from "@/components/layouts/AppBar";
+import Layout from "@/components/layouts/Layout";
+import LineDivider from "@/components/elements/LineDivider";
+import WithAuth from "@/components/auth/WithAuth";
 import { useState } from "react";
 
 const Row = ({ label, children }) => (
diff --git a/src/pages/my/transactions/index.js b/src/pages/my/transactions/index.js
index 7792c647..b1e31661 100644
--- a/src/pages/my/transactions/index.js
+++ b/src/pages/my/transactions/index.js
@@ -1,14 +1,14 @@
 import { useRouter } from "next/router";
-import AppBar from "../../../components/AppBar";
-import BottomPopup from "../../../components/BottomPopup";
-import Layout from "../../../components/Layout";
-import WithAuth from "../../../components/WithAuth";
+import AppBar from "@/components/layouts/AppBar";
+import BottomPopup from "@/components/elements/BottomPopup";
+import Layout from "@/components/layouts/Layout";
+import WithAuth from "@/components/auth/WithAuth";
 import { useEffect, useState } from "react";
-import { useAuth } from "../../../helpers/auth";
-import apiOdoo from "../../../helpers/apiOdoo";
-import currencyFormat from "../../../helpers/currencyFormat";
+import { useAuth } from "@/core/utils/auth";
+import apiOdoo from "@/core/utils/apiOdoo";
+import currencyFormat from "@/core/utils/currencyFormat";
 import { EllipsisVerticalIcon } from "@heroicons/react/24/outline";
-import Link from "../../../components/Link";
+import Link from "@/components/elements/Link";
 
 export default function Transactions() {
   const [ auth ] = useAuth();