feat: update

lazuardytech · Dec 2, 2024 · 96f6398 · 96f6398
1 parent e428740
commit 96f6398
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 17 deletions.
diff --git a/app/about/page.jsx b/app/about/page.jsx
@@ -7,7 +7,9 @@ export default function Page() {
     <>
       <Header />
       <Content />
-      <Footer />
+      <div className="hidden lg:block fixed bottom-0 start-0 w-full">
+        <Footer />
+      </div>
     </>
   );
 }
diff --git a/app/contact/page.jsx b/app/contact/page.jsx
@@ -7,7 +7,9 @@ export default function Page() {
     <>
       <Header />
       <Content />
-      <Footer />
+      <div className="hidden lg:block fixed bottom-0 start-0 w-full">
+        <Footer />
+      </div>
     </>
   );
 }
diff --git a/app/gallery/page.jsx b/app/gallery/page.jsx
@@ -7,7 +7,9 @@ export default function Page() {
     <>
       <Header />
       <Tiles />
-      <Footer />
+      <div className="hidden lg:block fixed bottom-0 start-0 w-full">
+        <Footer />
+      </div>
     </>
   );
 }
diff --git a/components/ui/about/content.jsx b/components/ui/about/content.jsx
@@ -2,16 +2,17 @@ import Image from "next/image";
 import Link from "next/link";
 import Spectral from "@/lib/fonts/spectral";
 import BlurFade from "@/components/ui/blur-fade";
+import Footer from "@/components/ui/footer";
 import { Button } from "@/components/ui/button";
 import { IconPhone } from "@tabler/icons-react";
 import profile from "@/public/images/profile.webp";
 
 export default function Content() {
   return (
     <div className="flex w-full min-h-screen">
-      <div className="grid lg:grid-cols-4 w-full my-auto lg:px-48 pb-8 lg:pb-0">
-        <div className="flex flex-col w-full col-span-3 my-auto">
-          <div className="flex lg:hidden w-full mb-8">
+      <div className="grid lg:grid-cols-4 w-full lg:my-auto lg:px-48 pb-8 lg:pb-0">
+        <div className="flex flex-col w-full col-span-3 lg:my-auto">
+          <div className="flex lg:hidden w-full mt-36 mb-8">
             <BlurFade delay={0.3} inView className="w-full">
               <Image
                 src={profile}
@@ -67,6 +68,9 @@ export default function Content() {
               </Link>
             </BlurFade>
           </div>
+          <div className="flex lg:hidden w-full mt-24">
+            <Footer />
+          </div>
         </div>
         <div className="hidden lg:flex flex-col w-full">
           <BlurFade delay={0.8} inView>

diff --git a/components/ui/contact/content.jsx b/components/ui/contact/content.jsx
@@ -3,6 +3,7 @@
 import Image from "next/image";
 import Link from "next/link";
 import BlurFade from "@/components/ui/blur-fade";
+import Footer from "@/components/ui/footer";
 import ContactForm from "@/components/ui/home/contact-form";
 import { Button } from "@/components/ui/button";
 import { ContactButtons } from "@/components/ui/home/contact";
@@ -26,8 +27,8 @@ export const Map = dynamic(() => import("@/components/ui/map"), {
 export default function Content() {
   return (
     <div className="flex w-full min-h-screen">
-      <div className="flex flex-col w-full my-auto lg:px-48 pb-12 lg:pb-0">
-        <div className="flex flex-col items-center w-full px-10 lg:px-0">
+      <div className="flex flex-col w-full lg:my-auto lg:px-48 pb-12 lg:pb-0">
+        <div className="flex flex-col items-center w-full px-10 lg:px-0 mt-36 lg:mt-0">
           <BlurFade delay={0.3} inView>
             <Image
               src={logo}
@@ -108,6 +109,9 @@ export default function Content() {
             <Map />
           </BlurFade>
         </div>
+        <div className="flex flex-col lg:hidden w-full mt-24">
+          <Footer />
+        </div>
       </div>
     </div>
   );

diff --git a/components/ui/footer.jsx b/components/ui/footer.jsx
@@ -3,7 +3,7 @@ import Social from "@/components/ui/social";
 
 export default function Footer() {
   return (
-    <div className="fixed bottom-0 start-0 w-full mb-8 lg:mb-10 px-10 lg:px-48 grid lg:grid-cols-2">
+    <div className="w-full mb-8 lg:mb-10 px-10 lg:px-48 grid lg:grid-cols-2">
       <div className="flex justify-center lg:justify-start font-extralight text-sm text-white">
         <BlurFade delay={0.5} inView>
           <Social />

diff --git a/components/ui/gallery/tiles.jsx b/components/ui/gallery/tiles.jsx
@@ -36,9 +36,9 @@ export default function Tiles() {
   });
 
   return (
-    <div className="flex w-full min-h-screen">
+    <div className="flex w-full h-full max-h-screen">
       {!canvasReady ? (
-        <div ref={loading} className="flex w-full min-h-screen z-10">
+        <div ref={loading} className="flex w-full h-full max-h-screen z-10">
           <div className="flex w-full my-auto justify-center">
             <BlurFade delay={0.25 + 6 * 0.05} inView>
               <Loading />
@@ -47,7 +47,7 @@ export default function Tiles() {
         </div>
       ) : null}
       {showCanvas ? (
-        <div className="absolute w-full min-h-screen z-20">
+        <div className="absolute w-full h-full max-h-screen z-20">
           <Canvas
             style={{ width: "100%", height: "100vh" }}
             gl={{ antialias: false, performance: "low-power" }}
@@ -134,6 +134,7 @@ function Item({ index, position, scale, c = new THREE.Color(), ...props }) {
   return (
     <Image
       {...props}
+      className="pb-10"
       alt={`image-${index}`}
       ref={ref}
       position={position}

diff --git a/components/ui/header.jsx b/components/ui/header.jsx
@@ -2,8 +2,8 @@ import Navigation from "@/components/ui/navigation";
 
 export default function Header() {
   return (
-    <div className="absolute z-40 top-0 start-0 w-full mt-10 px-10 text-center">
-      <div className="inline-block mx-auto py-2 px-6">
+    <div className="absolute z-40 top-0 start-0 w-full mt-8 px-10 text-center bg-main pt-2">
+      <div className="mx-auto py-2 px-6">
         <Navigation />
       </div>
     </div>

diff --git a/components/ui/map.jsx b/components/ui/map.jsx
@@ -6,9 +6,9 @@ import "leaflet/dist/leaflet.css";
 
 delete L.Icon.Default.prototype._getIconUrl;
 L.Icon.Default.mergeOptions({
-  iconRetinaUrl: require("leaflet/dist/images/marker-icon-2x.png"),
-  iconUrl: require("leaflet/dist/images/marker-icon.png"),
-  shadowUrl: require("leaflet/dist/images/marker-shadow.png"),
+  iconRetinaUrl: "/images/marker-icon-2x.png",
+  iconUrl: "/images/marker-icon.png",
+  shadowUrl: "/images/marker-shadow.png",
 });
 
 // https://google.com/maps/place/Jl.+Rowosari+II,+Wonosari,+Kec.+Ngaliyan,+Kota+Semarang,+Jawa+Tengah+50244/@-6.9737171,110.291647,17z/data=!4m15!1m8!3m7!1s0x2e705fd08e012d3f:0xb07c0b58ac9ba793!2sJl.+Rowosari+II,+Wonosari,+Kec.+Ngaliyan,+Kota+Semarang,+Jawa+Tengah+50244!3b1!8m2!3d-6.9737171!4d110.2942219!16s%2Fg%2F11bwg065w2!3m5!1s0x2e705fd08e012d3f:0xb07c0b58ac9ba793!8m2!3d-6.9737171!4d110.2942219!16s%2Fg%2F11bwg065w2?entry=ttu&g_ep=EgoyMDI0MTEyNC4xIKXMDSoASAFQAw%3D%3D