[ADD] Restructure

Light-it-labs · Sep 27, 2024 · 64980be · 64980be
1 parent 1afa186
commit 64980be
Show file tree

Hide file tree

Showing 23 changed files with 15 additions and 25 deletions.
diff --git a/src/config/api/api.types.ts → src/api/api.types.ts b/src/config/api/api.types.ts → src/api/api.types.ts
diff --git a/src/config/api/axios.ts → src/api/axios.ts b/src/config/api/axios.ts → src/api/axios.ts
diff --git a/src/config/api/handleAxiosFieldErrors.ts → src/api/handleAxiosFieldErrors.ts b/src/config/api/handleAxiosFieldErrors.ts → src/api/handleAxiosFieldErrors.ts
diff --git a/src/config/api/index.ts → src/api/index.ts b/src/config/api/index.ts → src/api/index.ts
diff --git a/src/config/api/interceptors/authHeader.ts → src/api/interceptors/authHeader.ts b/src/config/api/interceptors/authHeader.ts → src/api/interceptors/authHeader.ts
diff --git a/...interceptors/errorResponseInterceptors.ts → ...interceptors/errorResponseInterceptors.ts b/...interceptors/errorResponseInterceptors.ts → ...interceptors/errorResponseInterceptors.ts
diff --git a/src/config/api/interceptors/index.ts → src/api/interceptors/index.ts b/src/config/api/interceptors/index.ts → src/api/interceptors/index.ts
diff --git a/src/config/api/interceptors/refreshToken.ts → src/api/interceptors/refreshToken.ts b/src/config/api/interceptors/refreshToken.ts → src/api/interceptors/refreshToken.ts
@@ -4,7 +4,7 @@ import { useAuthStore } from "~/stores";
 import type { ServiceResponse } from "../api.types";
 import { api } from "../axios";
 
-const { setUser, setToken } = useAuthStore.getState();
+const { setToken } = useAuthStore.getState();
 
 export interface UserToken {
   refresh_token: string;
@@ -24,14 +24,12 @@ const refreshToken = async () => {
     );
     const { data: userToken } = response.data;
     if (!userToken.refresh_token) {
-      setUser(null);
       setToken(null);
     } else {
       refreshWasSuccessful = true;
       setToken(userToken.refresh_token);
     }
   } catch (error) {
-    setUser(null);
     setToken(null);
   }
   return refreshWasSuccessful;

diff --git a/src/config/constants/common.types.ts → src/config/common.ts b/src/config/constants/common.types.ts → src/config/common.ts
diff --git a/src/config/constants/index.ts → src/config/index.ts b/src/config/constants/index.ts → src/config/index.ts
@@ -2,5 +2,5 @@ import { env } from "~/env";
 
 export const isLocal = env.VITE_APP_ENV === "local";
 
-export * from "./common.types";
-export * from "./storybook.types";
+export * from "./common";
+export * from "./storybook";
diff --git a/src/config/providers/index.ts b/src/config/providers/index.ts
diff --git a/src/config/constants/storybook.types.ts → src/config/storybook.ts b/src/config/constants/storybook.types.ts → src/config/storybook.ts
diff --git a/src/domains/guest/api/login.ts b/src/domains/guest/api/login.ts
@@ -1,5 +1,5 @@
-import { api } from "~/config/api";
-import type { ServiceResponse } from "~/config/api";
+import { api } from "~/api";
+import type { ServiceResponse } from "~/api";
 import { useAuthStore } from "~/stores";
 
 export type UserToken = {
@@ -27,8 +27,7 @@ export const googleLogin = async ({
 };
 
 export const logout = () => {
-  const { setUser, setToken } = useAuthStore.getState();
+  const { setToken } = useAuthStore.getState();
 
-  setUser(null);
   setToken(null);
 };
diff --git a/src/main.tsx b/src/main.tsx
@@ -1,11 +1,11 @@
-import "~/config/scripts/sentry";
+import "~/config/providers/scripts/sentry";
 
 import React, { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 
 import "./index.css";
 
-import { Providers } from "./config/providers";
+import { Providers } from "./providers";
 import { Router } from "./router";
 
 const root = document.getElementById("root");

diff --git a/src/config/providers/Providers.tsx → src/providers/Providers.tsx b/src/config/providers/Providers.tsx → src/providers/Providers.tsx
@@ -2,7 +2,7 @@ import type { PropsWithChildren } from "react";
 import React from "react";
 
 import { ReactQueryProvider } from "./ReactQueryProvider";
-import { SentryProvider } from "./SentryProvider";
+import { SentryProvider } from "./sentry/SentryProvider";
 
 export const Providers = ({ children }: PropsWithChildren) => {
   return (

diff --git a/src/config/providers/ReactQueryProvider.tsx → src/providers/ReactQueryProvider.tsx b/src/config/providers/ReactQueryProvider.tsx → src/providers/ReactQueryProvider.tsx
@@ -8,7 +8,7 @@ import {
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { z } from "zod";
 
-import { isLocal } from "~/constants";
+import { isLocal } from "~/config";
 
 const errorSchema = z.object({ message: z.string() });
 

diff --git a/src/providers/index.ts b/src/providers/index.ts
@@ -0,0 +1 @@
+export * from "./Providers";
diff --git a/src/config/providers/SentryProvider.tsx → src/providers/sentry/SentryProvider.tsx b/src/config/providers/SentryProvider.tsx → src/providers/sentry/SentryProvider.tsx
diff --git a/src/config/scripts/sentry.ts → src/providers/sentry/sentry.ts b/src/config/scripts/sentry.ts → src/providers/sentry/sentry.ts
@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/react";
 
-import { isLocal } from "~/constants";
+import { isLocal } from "~/config";
 import { env } from "~/env";
 
 if (!isLocal) {

diff --git a/src/shared/components/icons/CloseIcon.tsx b/src/shared/components/icons/CloseIcon.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import type { SVGProps } from "~/config/constants";
+import type { SVGProps } from "~/config";
 
 export const CloseIcon = ({ className, ...props }: SVGProps) => (
   <svg

diff --git a/templates/domains/api/example.ts.hbs b/templates/domains/api/example.ts.hbs
@@ -15,8 +15,8 @@
  */
 import { z } from "zod";
 
-import type { ServiceResponse } from "~/config/api";
-import { api } from "~/config/api";
+import type { ServiceResponse } from "~/api";
+import { api } from "~/api";
 import { create{{camelCase name}}Schema, {{camelCase name}}Schema } from "./schemas";
 
 export type {{pascalCase name}} = z.infer<typeof {{camelCase name}}Schema>;

diff --git a/tsconfig.json b/tsconfig.json
@@ -11,7 +11,6 @@
     "paths": {
       "~/assets": ["./shared/assets"],
       "~/components": ["./shared/components/ui"],
-      "~/constants": ["./config/constants"],
       "~/hooks": ["./shared/hooks"],
       "~/icons": ["./shared/components/icons"],
       "~/sections": ["./shared/sections"],

diff --git a/vite.config.ts b/vite.config.ts
@@ -43,10 +43,6 @@ const config = ({ mode }: ConfigEnv): UserConfigExport => {
           find: "~/components",
           replacement: path.resolve(__dirname, "./src/shared/components/ui"),
         },
-        {
-          find: "~/constants",
-          replacement: path.resolve(__dirname, "./src/config/constants"),
-        },
         {
           find: "~/hooks",
           replacement: path.resolve(__dirname, "./src/shared/hooks"),