Merge branch 'release' into development

# Conflicts:
#	src/pages/shop/product/variant/[slug].jsx

1 files changed, 17 insertions, 2 deletions

diff --git a/src-migrate/modules/page-content/index.tsx b/src-migrate/modules/page-content/index.tsx
index 608079f8..547b1957 100644
--- a/src-migrate/modules/page-content/index.tsx
+++ b/src-migrate/modules/page-content/index.tsx
@@ -1,7 +1,6 @@
 import { useMemo } from "react"
 import { useQuery } from "react-query"
-import PageContentSkeleton from "~/common/components/skeleton/PageContentSkeleton"
-import { PageContentProps } from "~/common/types/pageContent"
+import { PageContentProps } from "~/types/pageContent"
 import { getPageContent } from "~/services/pageContent"
 
 type Props = {
@@ -26,4 +25,20 @@ const PageContent = ({ path }: Props) => {
   )
 }
 
+const PageContentSkeleton = () => (
+  <div className="animate-pulse grid gap-y-4">
+    <div className="w-full h-10 bg-gray-300 rounded" />
+    <div className="h-2" />
+    <div className="w-full h-4 bg-gray-300 rounded" />
+    <div className="w-full h-4 bg-gray-300 rounded" />
+    <div className="w-full h-4 bg-gray-300 rounded" />
+    <div className="w-8/12 h-4 bg-gray-300 rounded" />
+    <div className="h-2" />
+    <div className="w-full h-4 bg-gray-300 rounded" />
+    <div className="w-full h-4 bg-gray-300 rounded" />
+    <div className="w-full h-4 bg-gray-300 rounded" />
+    <div className="w-1/2 h-4 bg-gray-300 rounded" />
+  </div>
+)
+
 export default PageContent
\ No newline at end of file