fix: fix duplicate mistake from rebasing

fix: adapt files to solvro config fix: button fix: delete redundant components fix: delete redundant components
Solvro · Dec 18, 2024 · e168c08 · e168c08
1 parent 89e6b1b
commit e168c08
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 294 deletions.
diff --git a/queryClient.tsx b/queryClient.tsx
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,10 +1,9 @@
 import type { Metadata } from "next";
 import { Montserrat } from "next/font/google";
 
+import { Footer } from "@/components/footer";
 import { Navbar } from "@/components/navbar";
 import { QueryProvider } from "@/lib/query-client";
-import { Footer } from "@/components/Footer";
-
 
 import "./globals.css";
 

diff --git a/src/components/InteractiveMap.tsx b/src/components/InteractiveMap.tsx
diff --git a/src/components/StaticMap.tsx b/src/components/StaticMap.tsx
diff --git a/src/components/Footer.tsx → src/components/footer.tsx b/src/components/Footer.tsx → src/components/footer.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
 function List({ text, children }: { text: string; children: React.ReactNode }) {
   return (
     <div>
-      <h2 className="mb-5 text-base font-medium uppercase uppercase">{text}</h2>
+      <h2 className="mb-5 text-base font-medium uppercase">{text}</h2>
       <ul>{children}</ul>
     </div>
   );
@@ -31,15 +31,15 @@ function ListItem({
 function Footer() {
   return (
     <footer>
-      <div className="md:mb-16 md:mt-24 grid place-items-center">
+      <div className="grid place-items-center md:mb-16 md:mt-24">
         <Image
           src="/Juwe2025.png"
           alt="Logo Juwenalia 2025 #WROCŁAWRAZEM"
-          className="md:hidden my-20"
+          className="my-20 md:hidden"
           width={175}
           height={175}
         />
-        <div className="sm:grid-cols-4 sm:justify-around md:flex md:w-11/12 md:flex-row md:justify-around max-[475px]:gap-x-12 max-[640px]:gap-x-40 grid grid-cols-2 gap-y-10">
+        <div className="grid grid-cols-2 gap-y-10 max-[640px]:gap-x-40 max-[475px]:gap-x-12 sm:grid-cols-4 sm:justify-around md:flex md:w-11/12 md:flex-row md:justify-around">
           <List text="Kontakt">
             <ListItem url="mailto:example@gmail.com" text="Adres e-mail" />
             <ListItem url="mailto:example@gmail.com" text="Adres e-mail" />
@@ -52,7 +52,7 @@ function Footer() {
           <Image
             src="/Juwe2025.png"
             alt="Logo Juwenalia 2025 #WROCŁAWRAZEM"
-            className="md:-mt-8 md:block hidden"
+            className="hidden md:-mt-8 md:block"
             width={250}
             height={150}
           />
@@ -69,9 +69,9 @@ function Footer() {
           </List>
         </div>
       </div>
-      <div className="md:mb-16 md:flex md:justify-center mb-8 ml-5 mt-8 text-sm">
-        <div className="md:flex md:flex-row md:justify-between w-4/5">
-          <p className="md:w-full mb-8 w-48 text-slate-400">
+      <div className="mb-8 ml-5 mt-8 text-sm md:mb-16 md:flex md:justify-center">
+        <div className="w-4/5 md:flex md:flex-row md:justify-between">
+          <p className="mb-8 w-48 text-slate-400 md:w-full">
             © Juwenalia 2025. Wszelkie prawa zastrzeżone.
           </p>
           <p className="w-52 font-medium">Made with ❤️ by Solvro</p>

diff --git a/src/components/ui/NoDataInfo.tsx b/src/components/ui/NoDataInfo.tsx
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
@@ -19,8 +19,6 @@ const buttonVariants = cva(
           "bg-secondary text-secondary-foreground hover:bg-secondary/80",
         ghost: "hover:bg-accent hover:text-accent-foreground",
         link: "text-primary underline-offset-4 hover:underline",
-        mapNavActive: "bg-primary text-primary-foreground hover:bg-primary/90 border-primary",
-        mapNavInactive: "bg-background text-black hover:bg-accent hover:text-accent-foreground", 
       },
       size: {
         default: "h-10 px-4 py-2",

diff --git a/src/components/ui/homepage-header.tsx b/src/components/ui/homepage-header.tsx
diff --git a/src/components/ui/horizontal-rule.tsx b/src/components/ui/horizontal-rule.tsx