refactor: ✨ Adiciona novas entidades e atualiza a configuração do Typ…

…eOrm
welllucky · Nov 27, 2024 · e403916 · e403916
1 parent 904aec4
commit e403916
Show file tree

Hide file tree

Showing 38 changed files with 371 additions and 207 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 
 .fleet
 .vscode
+.vscode/*
 
 # testing
 /coverage

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "services",
-  "version": "0.1.19",
+  "version": "0.2.0",
   "private": true,
   "repository": {
     "type": "git",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/sw.js b/public/sw.js
diff --git a/public/sw.js.map b/public/sw.js.map
diff --git a/services.sqlite b/services.sqlite
diff --git a/src/app/ global-error.tsx b/src/app/ global-error.tsx
@@ -6,18 +6,18 @@ import * as Sentry from "@sentry/nextjs";
 import NextError from "next/error";
 import { useEffect } from "react";
 
-export default function GlobalError({
+const GlobalError = ({
   error,
 }: Readonly<{
   error: Error & { digest?: string };
-}>) {
+}>) => {
   useEffect(() => {
     Sentry.captureException(error);
   }, [error]);
 
   return (
     // eslint-disable-next-line jsx-a11y/html-has-lang
-    <html>
+    <html lang="pt-BR">
       <body>
         {/* `NextError` is the default Next.js error page component. Its type
         definition requires a `statusCode` prop. However, since the App Router
@@ -27,4 +27,6 @@ export default function GlobalError({
       </body>
     </html>
   );
-}
+};
+
+export default GlobalError;
diff --git a/src/app/(protected)/layout.tsx b/src/app/(protected)/layout.tsx
@@ -49,10 +49,6 @@ const Template = ({ children }: Readonly<{ children: ReactNode }>) => {
     [pagesWithoutHeader, pathName],
   );
 
-  // if (!isAuthenticated) {
-  //   redirect("/login");
-  // }
-
   return (
     <FlexContainer
       $backgroundColor={isRequestsPage ? "#E2F3D5" : "#F5F5F5"}

diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
@@ -7,18 +7,17 @@ const Login = async ({
   searchParams,
 }: {
   searchParams: {
-    code: string;
+    redirectTo: string;
   };
 }) => {
   const cookiesStore = cookies();
   const accessToken = cookiesStore.get(CS_KEY_ACCESS_TOKEN)?.value;
-  const signError = searchParams?.code;
 
   if (accessToken) {
     redirect("/");
   }
 
-  return <LoginPage error={signError} />;
+  return <LoginPage redirectTo={searchParams?.redirectTo} />;
 };
 
 export default Login;
diff --git a/src/components/Headers/Header/index.tsx b/src/components/Headers/Header/index.tsx
@@ -44,7 +44,7 @@ export const Header = () => {
             </TitleComponent>
           </UserName>
           <IconButton
-            onClick={signOut}
+            onClick={() => signOut(false)}
             icon={<SignOutIcon size={24} />}
           />
         </Row>

diff --git a/src/components/NavBar/OptionMenu/index.tsx b/src/components/NavBar/OptionMenu/index.tsx
@@ -1,29 +1,36 @@
-import { OptionMenuProps } from "@/types";
 import { CustomLink } from "@/components";
+import { OptionMenuProps } from "@/types";
 import { IconArea, TextMenu } from "../styles";
 
 const OptionMenu = ({
   name,
   icon,
   path,
   $isSelected,
+  $isPreselected,
   color,
+  onClick,
   $highlightTextColor,
 }: OptionMenuProps) => (
   <CustomLink
     $flexDirection="column"
-    href={path}>
+    href={path}
+    onClick={() => {
+      if (onClick) onClick(name);
+    }}>
     <IconArea
+      $isPreselected={$isPreselected}
       $backgroundColor={color}
       $isSelected={$isSelected}>
       {icon}
     </IconArea>
     <TextMenu
+      $isPreselected={$isPreselected}
       $highlightTextColor={$highlightTextColor}
       $isSelected={$isSelected}>
       {name}
     </TextMenu>
   </CustomLink>
-  );
+);
 
 export default OptionMenu;
diff --git a/src/components/NavBar/index.tsx b/src/components/NavBar/index.tsx
@@ -1,5 +1,6 @@
 import { OptionMenuProps } from "@/types";
 import { usePathname } from "next/navigation";
+import { useState } from "react";
 import OptionMenu from "./OptionMenu";
 import { ContainerMenu, MenuList } from "./styles";
 
@@ -17,20 +18,23 @@ export const NavigationBar = ({
   // isLoading = false,
 }: NavigationBarProps) => {
   const actualRoute = usePathname();
+  const [optionClicked, setOptionClicked] = useState("");
   return (
     <ContainerMenu color={color}>
       <MenuList>
         {options
           .filter((option) => option.$isVisibled)
           ?.map((option) => (
             <OptionMenu
+              $isPreselected={option.name === optionClicked}
               $highlightTextColor={$highlightTextColor}
               color={color}
               key={option.name}
               name={option.name}
               path={option.path}
               alt={option.alt}
               icon={option.icon}
+              onClick={(optionName) => setOptionClicked(optionName)}
               $isSelected={option.path === actualRoute}
             />
           ))}

diff --git a/src/components/NavBar/styles.tsx b/src/components/NavBar/styles.tsx
@@ -1,6 +1,6 @@
-import styled from "styled-components";
 import { OptionMenuStyleProps } from "@/types";
 import Link from "next/link";
+import styled from "styled-components";
 
 export const ContainerMenu = styled.div<{ color?: string }>`
   position: absolute;
@@ -23,7 +23,10 @@ export const OptionMenuStyle = styled(Link)<OptionMenuStyleProps>`
   justify-content: center;
   align-items: center;
   text-decoration: none;
-  background-color: ${({ $isSelected }) => ($isSelected === true ? "#7AC143" : "#F5F5F5")};
+  background-color: ${({ $isSelected }) =>
+    ($isSelected === true ? "#7AC143" : "#F5F5F5")};
+  ${({ $isPreselected, $isSelected }) =>
+    $isPreselected && !$isSelected && "background-color: #c1f599;"};
   /* F8F5F5 */
 `;
 
@@ -34,7 +37,11 @@ export const IconArea = styled.div<OptionMenuStyleProps>`
   border-radius: 16px;
   align-items: center;
   justify-content: center;
-  background-color: ${({ $isSelected, $backgroundColor }) => ($isSelected ? "#7AC143" : $backgroundColor || "#F5F5F5")};
+  background-color: ${({ $isSelected, $backgroundColor }) =>
+    ($isSelected ? "#7AC143" : $backgroundColor || "#F5F5F5")};
+
+  ${({ $isPreselected, $isSelected }) =>
+    $isPreselected && !$isSelected && "background-color: #c1f599;"};
 
   &:active {
     background-color: #c1f599;
@@ -52,6 +59,10 @@ export const TextMenu = styled.p<OptionMenuStyleProps>`
   font-size: 12px;
   font-weight: 600;
   line-height: 16px;
-  color: ${({ $isSelected, $highlightTextColor }) => ($isSelected ? $highlightTextColor || "#7AC143" : "#252728")};
+  color: ${({ $isSelected, $highlightTextColor }) =>
+    ($isSelected ? $highlightTextColor || "#7AC143" : "#252728")};
   list-style: none;
+
+  ${({ $isPreselected, $isSelected }) =>
+    $isPreselected && !$isSelected && "color: #51782f;"};
 `;
diff --git a/src/components/common/Buttons/IconButton/index.tsx b/src/components/common/Buttons/IconButton/index.tsx
@@ -5,7 +5,6 @@ const IconButton = ({
   icon,
   path,
   onClick,
-  onHover,
   color = "#000000",
   width = "16",
   height = "16",
@@ -16,16 +15,14 @@ const IconButton = ({
         color={color}
         href={path}
         width={width}
-        height={height}
-        onHover={onHover}>
+        height={height}>
         {icon}
       </CustomButtonAsLink>
     ) : (
       <CustomButton
         color={color}
         width={width}
         height={height}
-        onHover={onHover}
         onClick={onClick}>
         {icon}
       </CustomButton>

diff --git a/src/components/common/Buttons/IconButton/styles.tsx b/src/components/common/Buttons/IconButton/styles.tsx
@@ -1,14 +1,13 @@
-import styled from "styled-components";
 import Link from "next/link";
-import { MouseEventHandler } from "react";
+import styled from "styled-components";
 
 interface CustomButtonProps {
   path?: string;
   alt?: string;
   color?: string;
   width?: string;
   height?: string;
-  onHover?: MouseEventHandler<HTMLButtonElement>;
+  hoverColor?: string;
 }
 
 const IconButtonWrapper = styled.div``;
@@ -21,9 +20,10 @@ const CustomButtonAsLink = styled(Link)<CustomButtonProps>`
   border: none;
   cursor: pointer;
   transition: all 0.2s ease-in-out;
+
   &:hover {
     transform: scale(1.1);
-    color: ${(props) => (props.onHover ? "#fff" : "#fff")};
+    color: ${(props) => props?.hoverColor ?? "#fff"};
   }
 `;
 
@@ -37,8 +37,8 @@ const CustomButton = styled.button<CustomButtonProps>`
   transition: all 0.2s ease-in-out;
   &:hover {
     transform: scale(1.1);
-    color: ${(props) => (props.onHover ? "#fff" : "#fff")};
+    color: ${(props) => props.hoverColor ?? "#fff"};
   }
 `;
 
-export { IconButtonWrapper, CustomButton, CustomButtonAsLink };
+export { CustomButton, CustomButtonAsLink, IconButtonWrapper };
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     .fleet
     .vscode
+    .vscode/*
     # testing
     /coverage
@@ Expand Down @@