From f99e0aba70efad0deb907d8e27f09fc9f527c8a4 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 17 Feb 2023 17:07:50 +0700 Subject: Refactor --- src/core/components/layouts/AnimationLayout.jsx | 22 ++++++++++++++++++++++ src/core/components/layouts/AppLayout.jsx | 15 +++++++++++++++ src/core/components/layouts/BasicLayout.jsx | 15 +++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 src/core/components/layouts/AnimationLayout.jsx create mode 100644 src/core/components/layouts/AppLayout.jsx create mode 100644 src/core/components/layouts/BasicLayout.jsx (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/AnimationLayout.jsx b/src/core/components/layouts/AnimationLayout.jsx new file mode 100644 index 00000000..cdd2d059 --- /dev/null +++ b/src/core/components/layouts/AnimationLayout.jsx @@ -0,0 +1,22 @@ +import { motion } from 'framer-motion' + +const AnimationLayout = ({ children, ...props }) => { + const transition = { + ease: 'easeOut', + duration: 0.3 + } + + return children && ( + + { children } + + ) +} + +export default AnimationLayout \ No newline at end of file diff --git a/src/core/components/layouts/AppLayout.jsx b/src/core/components/layouts/AppLayout.jsx new file mode 100644 index 00000000..7aaa52ca --- /dev/null +++ b/src/core/components/layouts/AppLayout.jsx @@ -0,0 +1,15 @@ +import AppBar from "../elements/Appbar/Appbar" +import AnimationLayout from "./AnimationLayout" + +const AppLayout = ({ children, title }) => { + return ( + <> + + + { children } + + + ) +} + +export default AppLayout \ No newline at end of file diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx new file mode 100644 index 00000000..32c785e5 --- /dev/null +++ b/src/core/components/layouts/BasicLayout.jsx @@ -0,0 +1,15 @@ +import NavBar from "../elements/NavBar/NavBar" +import AnimationLayout from "./AnimationLayout" + +const BasicLayout = ({ children }) => { + return ( + <> + + + { children } + + + ) +} + +export default BasicLayout \ No newline at end of file -- cgit v1.2.3 From 347e28848fb063ffcb7f9268384409e57b7ef3ad Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Sat, 18 Feb 2023 22:08:07 +0700 Subject: change animation --- src/core/components/layouts/AnimationLayout.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/AnimationLayout.jsx b/src/core/components/layouts/AnimationLayout.jsx index cdd2d059..12b6d112 100644 --- a/src/core/components/layouts/AnimationLayout.jsx +++ b/src/core/components/layouts/AnimationLayout.jsx @@ -8,9 +8,9 @@ const AnimationLayout = ({ children, ...props }) => { return children && ( -- cgit v1.2.3 From 75767ed41d28947429f3dbef9c7e128ebc552e64 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Sat, 18 Feb 2023 22:18:46 +0700 Subject: change animation --- src/core/components/layouts/AnimationLayout.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/AnimationLayout.jsx b/src/core/components/layouts/AnimationLayout.jsx index 12b6d112..f40f1eec 100644 --- a/src/core/components/layouts/AnimationLayout.jsx +++ b/src/core/components/layouts/AnimationLayout.jsx @@ -8,7 +8,7 @@ const AnimationLayout = ({ children, ...props }) => { return children && ( Date: Sat, 18 Feb 2023 22:21:46 +0700 Subject: change animation --- src/core/components/layouts/AnimationLayout.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/AnimationLayout.jsx b/src/core/components/layouts/AnimationLayout.jsx index f40f1eec..adb6b081 100644 --- a/src/core/components/layouts/AnimationLayout.jsx +++ b/src/core/components/layouts/AnimationLayout.jsx @@ -8,9 +8,9 @@ const AnimationLayout = ({ children, ...props }) => { return children && ( -- cgit v1.2.3 From d0d2a927fa1b9ac0a0e571f6e6f1294445db66a4 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Sun, 19 Feb 2023 22:06:00 +0700 Subject: fix --- src/core/components/layouts/BasicLayout.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx index 32c785e5..94c235fb 100644 --- a/src/core/components/layouts/BasicLayout.jsx +++ b/src/core/components/layouts/BasicLayout.jsx @@ -1,10 +1,10 @@ -import NavBar from "../elements/NavBar/NavBar" +import Navbar from "../elements/Navbar/Navbar" import AnimationLayout from "./AnimationLayout" const BasicLayout = ({ children }) => { return ( <> - + { children } -- cgit v1.2.3 From 71ca8757d549c62e7b2925793689815f4ab771ad Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Sun, 19 Feb 2023 22:18:01 +0700 Subject: fix --- src/core/components/layouts/BasicLayout.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx index 94c235fb..98134b32 100644 --- a/src/core/components/layouts/BasicLayout.jsx +++ b/src/core/components/layouts/BasicLayout.jsx @@ -1,5 +1,7 @@ -import Navbar from "../elements/Navbar/Navbar" -import AnimationLayout from "./AnimationLayout" +import dynamic from "next/dynamic" + +const Navbar = dynamic(() => import("../elements/Navbar/Navbar")) +const AnimationLayout = dynamic(() => import("./AnimationLayout")) const BasicLayout = ({ children }) => { return ( -- cgit v1.2.3 From ed950b23d50f9b3993cfd2ac2386a5b3a68d5e57 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 20 Feb 2023 17:03:28 +0700 Subject: fix --- src/core/components/layouts/AnimationLayout.jsx | 2 +- src/core/components/layouts/AppLayout.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/AnimationLayout.jsx b/src/core/components/layouts/AnimationLayout.jsx index adb6b081..cf2b06d5 100644 --- a/src/core/components/layouts/AnimationLayout.jsx +++ b/src/core/components/layouts/AnimationLayout.jsx @@ -2,7 +2,7 @@ import { motion } from 'framer-motion' const AnimationLayout = ({ children, ...props }) => { const transition = { - ease: 'easeOut', + ease: 'easeIn', duration: 0.3 } diff --git a/src/core/components/layouts/AppLayout.jsx b/src/core/components/layouts/AppLayout.jsx index 7aaa52ca..3e986477 100644 --- a/src/core/components/layouts/AppLayout.jsx +++ b/src/core/components/layouts/AppLayout.jsx @@ -4,8 +4,8 @@ import AnimationLayout from "./AnimationLayout" const AppLayout = ({ children, title }) => { return ( <> - + { children } -- cgit v1.2.3 From f66b12fd1d0b83af0d7230d7b1565fbe00afbe3c Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 22 Feb 2023 11:03:34 +0700 Subject: prettier --- src/core/components/layouts/AnimationLayout.jsx | 28 +++++++++++++------------ src/core/components/layouts/AppLayout.jsx | 10 ++++----- src/core/components/layouts/BasicLayout.jsx | 12 +++++------ 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/AnimationLayout.jsx b/src/core/components/layouts/AnimationLayout.jsx index cf2b06d5..357187b2 100644 --- a/src/core/components/layouts/AnimationLayout.jsx +++ b/src/core/components/layouts/AnimationLayout.jsx @@ -1,22 +1,24 @@ import { motion } from 'framer-motion' const AnimationLayout = ({ children, ...props }) => { - const transition = { - ease: 'easeIn', + const transition = { + ease: 'easeIn', duration: 0.3 } - return children && ( - - { children } - + return ( + children && ( + + {children} + + ) ) } -export default AnimationLayout \ No newline at end of file +export default AnimationLayout diff --git a/src/core/components/layouts/AppLayout.jsx b/src/core/components/layouts/AppLayout.jsx index 3e986477..3e3c8ee5 100644 --- a/src/core/components/layouts/AppLayout.jsx +++ b/src/core/components/layouts/AppLayout.jsx @@ -1,15 +1,15 @@ -import AppBar from "../elements/Appbar/Appbar" -import AnimationLayout from "./AnimationLayout" +import AppBar from '../elements/Appbar/Appbar' +import AnimationLayout from './AnimationLayout' const AppLayout = ({ children, title }) => { return ( <> - - { children } + + {children} ) } -export default AppLayout \ No newline at end of file +export default AppLayout diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx index 98134b32..6f176737 100644 --- a/src/core/components/layouts/BasicLayout.jsx +++ b/src/core/components/layouts/BasicLayout.jsx @@ -1,17 +1,15 @@ -import dynamic from "next/dynamic" +import dynamic from 'next/dynamic' -const Navbar = dynamic(() => import("../elements/Navbar/Navbar")) -const AnimationLayout = dynamic(() => import("./AnimationLayout")) +const Navbar = dynamic(() => import('../elements/Navbar/Navbar')) +const AnimationLayout = dynamic(() => import('./AnimationLayout')) const BasicLayout = ({ children }) => { return ( <> - - { children } - + {children} ) } -export default BasicLayout \ No newline at end of file +export default BasicLayout -- cgit v1.2.3 From 047aacc646c86b316c4d42fb720cbc841426df27 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 24 Feb 2023 10:05:06 +0700 Subject: fix --- src/core/components/layouts/AnimationLayout.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/AnimationLayout.jsx b/src/core/components/layouts/AnimationLayout.jsx index 357187b2..c4dee606 100644 --- a/src/core/components/layouts/AnimationLayout.jsx +++ b/src/core/components/layouts/AnimationLayout.jsx @@ -3,7 +3,7 @@ import { motion } from 'framer-motion' const AnimationLayout = ({ children, ...props }) => { const transition = { ease: 'easeIn', - duration: 0.3 + duration: 0.2 } return ( -- cgit v1.2.3 From ffa261e6adef70a2845878cf93e6e492eb8cee62 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 27 Feb 2023 10:49:45 +0700 Subject: footer --- src/core/components/layouts/AppLayout.jsx | 2 ++ src/core/components/layouts/BasicLayout.jsx | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/AppLayout.jsx b/src/core/components/layouts/AppLayout.jsx index 3e3c8ee5..006c47c7 100644 --- a/src/core/components/layouts/AppLayout.jsx +++ b/src/core/components/layouts/AppLayout.jsx @@ -1,4 +1,5 @@ import AppBar from '../elements/Appbar/Appbar' +import BasicFooter from '../elements/Footer/BasicFooter' import AnimationLayout from './AnimationLayout' const AppLayout = ({ children, title }) => { @@ -7,6 +8,7 @@ const AppLayout = ({ children, title }) => { {children} + ) diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx index 6f176737..1a7185cd 100644 --- a/src/core/components/layouts/BasicLayout.jsx +++ b/src/core/components/layouts/BasicLayout.jsx @@ -1,4 +1,5 @@ import dynamic from 'next/dynamic' +import BasicFooter from '../elements/Footer/BasicFooter' const Navbar = dynamic(() => import('../elements/Navbar/Navbar')) const AnimationLayout = dynamic(() => import('./AnimationLayout')) @@ -8,6 +9,7 @@ const BasicLayout = ({ children }) => { <> {children} + ) } -- cgit v1.2.3 From a1b9b647a6c4bda1f5db63879639d44543f9557e Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 1 Mar 2023 13:53:31 +0700 Subject: fix layout --- src/core/components/layouts/AppLayout.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/components/layouts') diff --git a/src/core/components/layouts/AppLayout.jsx b/src/core/components/layouts/AppLayout.jsx index 006c47c7..a325b1c1 100644 --- a/src/core/components/layouts/AppLayout.jsx +++ b/src/core/components/layouts/AppLayout.jsx @@ -8,8 +8,8 @@ const AppLayout = ({ children, title }) => { {children} - + ) } -- cgit v1.2.3