Merge branch 'main' into add-api

Solvro · Sep 8, 2024 · 698df50 · 698df50
2 parents bcb6d45 + d737eae
commit 698df50
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/src/components/Plan.tsx b/src/components/Plan.tsx
@@ -5,7 +5,7 @@ export const Plan = ({ id, name }: { id: number; name: string }) => {
   return (
     <Link
       href={`/createplan/${id}`}
-      className="h-[200px] w-[200px] rounded-lg bg-white p-4 text-left shadow-lg"
+      className="flex h-[200px] w-[200px] flex-col items-center justify-center rounded-lg border-2 border-gray-400 bg-white p-4 text-center shadow-lg"
     >
       <div className="text-xl font-semibold">{name}</div>
       <div className="mt-2 text-gray-600">

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -1,5 +1,5 @@
 import { motion } from "framer-motion";
-import { ChevronRightIcon } from "lucide-react";
+// import { ChevronRightIcon } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
 import type React from "react";
@@ -8,6 +8,7 @@ import { twMerge } from "tailwind-merge";
 
 import { Seo } from "@/components/SEO";
 import { Button, buttonVariants } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 
 const Navbar = () => {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
@@ -38,6 +39,9 @@ const Navbar = () => {
           <li className="cursor-pointer">
             <a href="https://solvro.pwr.edu.pl/contact/">Kontakt</a>
           </li>
+          <li className="cursor-pointer">
+            <a href="https://forms.gle/4tBCPkLMFKptB1iZ7">Zgłoś błąd</a>
+          </li>
         </ul>
       </nav>
 
@@ -81,6 +85,9 @@ const Navbar = () => {
             <li className="cursor-pointer p-2">
               <a href="https://solvro.pwr.edu.pl/contact/">Kontakt</a>
             </li>
+            <li className="cursor-pointer p-2">
+              <a href="https://forms.gle/4tBCPkLMFKptB1iZ7">Zgłoś błąd</a>
+            </li>
           </ul>
         </div>
       ) : null}
@@ -172,16 +179,21 @@ const JoinUsBlock = () => (
       (typeof window !== "undefined" &&
         window.location.hostname === "planer.solvro.pl") ? (
         <Link
-          href="/plans"
+          href="#"
           data-umami-event="Landing - Go to planning"
           className={buttonVariants({
             size: "lg",
             variant: "outline",
-            class:
-              "h-20 cursor-pointer self-center border-4 text-xl transition-all duration-300 hover:bg-white hover:shadow-[0_0_5px_rgb(200,200,255),0_0_10px_rgb(164,200,255)] md:mt-0 md:p-7",
+            className: cn(
+              "h-20 cursor-wait self-center border-4 text-xl opacity-80 transition-all duration-300 md:mt-0 md:p-7",
+              // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+              false &&
+                "cursor-pointer hover:bg-white hover:shadow-[0_0_5px_rgb(200,200,255),0_0_10px_rgb(164,200,255)]",
+            ),
           })}
         >
-          Przejdź do planowania <ChevronRightIcon className="ml-2" />
+          {/* Przejdź do planowania <ChevronRightIcon className="ml-2" /> */}
+          Startujemy 10 września
         </Link>
       ) : (
         <Button
@@ -213,8 +225,8 @@ const Logo = () => {
 
 const Footer = () => {
   return (
-    <footer className="mt-12">
-      <p className="text-center text-white">
+    <footer className="sm:mt-12">
+      <p className="p-4 text-center text-white">
         Made with ❤️ by{" "}
         <a
           href="https://solvro.pwr.edu.pl/"
@@ -232,7 +244,7 @@ const Home = () => {
     <>
       <Seo />
       {/* Main Page */}
-      <div className="relative min-h-screen overflow-hidden bg-mainbutton5">
+      <div className="relative min-h-screen overflow-hidden bg-mainbutton7">
         {/* Blobs */}
         <div className="hidden md:block">
           <svg

diff --git a/src/pages/plans.tsx b/src/pages/plans.tsx
@@ -41,8 +41,8 @@ const Plans = () => {
   return (
     <>
       <Seo pageTitle="Twoje Plany | Planer" />
-      <div className="flex h-screen flex-col items-stretch">
-        <div className="flex h-20 items-center justify-between bg-mainbutton5">
+      <div className="flex h-screen flex-col items-stretch bg-white">
+        <div className="flex h-20 items-center justify-between bg-mainbutton7">
           <div className="ml-4 w-1/4 flex-none">
             <SolvroLogo />
           </div>
@@ -62,7 +62,7 @@ const Plans = () => {
           </div>
         </div>
 
-        <div className="container mx-auto max-h-full flex-1 flex-grow overflow-y-auto bg-gray-200 p-4">
+        <div className="container mx-auto max-h-full flex-1 flex-grow overflow-y-auto p-4">
           <div className="flex flex-wrap items-center justify-center gap-4 sm:justify-start">
             <button
               onClick={addNewPlan}
@@ -77,7 +77,7 @@ const Plans = () => {
         </div>
 
         <div>
-          <div className="flex h-14 flex-row items-center justify-between bg-mainbutton3 text-sm text-white">
+          <div className="flex h-14 flex-row items-center justify-between bg-mainbutton7 text-sm text-white">
             <Link
               href="/"
               className="flex h-full flex-1 cursor-pointer items-center justify-center gap-2 text-center font-semibold transition-all hover:bg-solvroshadow hover:shadow-lg"