Skip to content

Commit

Permalink
fix: rename ui folder with presentation folder
Browse files Browse the repository at this point in the history
  • Loading branch information
arnaugomez committed Sep 27, 2024
1 parent 15e691b commit 5a60620
Show file tree
Hide file tree
Showing 75 changed files with 110 additions and 110 deletions.
2 changes: 1 addition & 1 deletion docs/i18next.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## react-i18next

**Each time you add a new namespace** to the folder `src/shared/ui/i18n/locales/{lang}` you should also add its corresponding
**Each time you add a new namespace** to the folder `src/shared/presentation/i18n/locales/{lang}` you should also add its corresponding
declarations to the file `react-i18next.d.ts`. This way typescript will be able to infer the translations keys
for each file.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { HomeStateViewModel } from "@/src/home/ui/view-models/home-state";
import { createProvider } from "@/src/shared/ui/utils/zustand";
import type { HomeStateViewModel } from "@/src/home/presentation/view-models/home-state";
import { createProvider } from "@/src/shared/presentation/utils/zustand";

interface HomeProviderBuilderProps {
amount: "none" | "twenty" | "thirty";
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { px2rem, wrapperStyles } from "@/src/shared/ui/styles/utils.css";
import { spacing } from "@/src/shared/ui/styles/spacing";
import { px2rem, wrapperStyles } from "@/src/shared/presentation/styles/utils.css";
import { spacing } from "@/src/shared/presentation/styles/spacing";
import { style } from "@vanilla-extract/css";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { vars } from "@/src/shared/presentation/styles/theme.css";

const wrapper = style([
wrapperStyles,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useHomeProvider, useHomeProviderBis } from "@/src/home/ui/providers/home-provider";
import { useHomeProvider, useHomeProviderBis } from "@/src/home/presentation/providers/home-provider";
import { BaseError } from "@/src/shared/domain/models/base-error";
import { Button } from "@/src/shared/ui/components/button/button";
import { ControlledInput } from "@/src/shared/ui/components/input/input";
import { Button } from "@/src/shared/presentation/components/button/button";
import { ControlledInput } from "@/src/shared/presentation/components/input/input";
import { timeout } from "@front_web_mrmilu/utils";
import { yupResolver } from "@hookform/resolvers/yup";
import { useEffect, useMemo } from "react";
Expand Down
6 changes: 3 additions & 3 deletions src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { IEnvVars } from "@/src/shared/domain/interfaces/env-vars";
import { locator } from "@/src/shared/ioc/__generated__";
import { TYPES } from "@/src/shared/ioc/__generated__/types";
import "@/src/shared/ui/i18n/index";
import { router } from "@/src/shared/ui/router/routes";
import "@/src/shared/ui/utils/yup-extensions";
import "@/src/shared/presentation/i18n/index";
import { router } from "@/src/shared/presentation/router/routes";
import "@/src/shared/presentation/utils/yup-extensions";
import * as Sentry from "@sentry/react";
import { BrowserTracing } from "@sentry/tracing";
import { StrictMode } from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { spacing } from "@/src/shared/ui/styles/spacing";
import { px2rem, wrapperStyles } from "@/src/shared/ui/styles/utils.css";
import { spacing } from "@/src/shared/presentation/styles/spacing";
import { px2rem, wrapperStyles } from "@/src/shared/presentation/styles/utils.css";
import { style } from "@vanilla-extract/css";

const wrapper = style([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import type { CreatePostUseCase } from "@/src/posts/application/use-cases/create
import { locator } from "@/src/shared/ioc/__generated__";
import { TYPES } from "@/src/shared/ioc/__generated__/types";
import type { IocProvider } from "@/src/shared/ioc/interfaces";
import { Button } from "@/src/shared/ui/components/button/button";
import { Switch } from "@/src/shared/ui/components/switch/switch";
import { Button } from "@/src/shared/presentation/components/button/button";
import { Switch } from "@/src/shared/presentation/components/switch/switch";
import { useAsyncState } from "@front_web_mrmilu/hooks";
import { debounce } from "lodash";
import { useCallback, useState } from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SimpleCard } from "@/src/shared/ui/components/simple-card/simple-card";
import { SimpleCard } from "@/src/shared/presentation/components/simple-card/simple-card";
import { Suspense } from "react";
import { usePostsProvider } from "../providers/posts.provider";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import BasePage from "@/src/shared/ui/components/base-page/base-page";
import BasePage from "@/src/shared/presentation/components/base-page/base-page";
import { PostsResults } from "./containers/post-results";
import { useInitPostsProvider } from "./providers/posts.provider";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { GetPostsUseCase } from "@/src/posts/application/use-cases/get-post
import { locator } from "@/src/shared/ioc/__generated__";
import { TYPES } from "@/src/shared/ioc/__generated__/types";
import type { IocProvider } from "@/src/shared/ioc/interfaces";
import { createProvider } from "@/src/shared/ui/utils/zustand";
import { createProvider } from "@/src/shared/presentation/utils/zustand";
import { useEffectStrictMode } from "@front_web_mrmilu/hooks";
import { timeout, wrapPromise, wrapPromisePending } from "@front_web_mrmilu/utils";
import { PostsState } from "../view-models/posts-state";
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { px2rem } from "@/src/shared/ui/styles/utils.css";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { px2rem } from "@/src/shared/presentation/styles/utils.css";
import { vars } from "@/src/shared/presentation/styles/theme.css";
import { style } from "@vanilla-extract/css";

const wrapper = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { spacing } from "@/src/shared/ui/styles/spacing";
import { px2rem, wrapperStyles } from "@/src/shared/ui/styles/utils.css";
import { spacing } from "@/src/shared/presentation/styles/spacing";
import { px2rem, wrapperStyles } from "@/src/shared/presentation/styles/utils.css";
import { style } from "@vanilla-extract/css";

const wrapper = style([
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { CypressProps } from "@/src/shared/ui/view-models/cypress";
import type { CypressProps } from "@/src/shared/presentation/view-models/cypress";
import type { PropsWithChildren } from "react";
import css from "./base-page.css";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { px2rem } from "@/src/shared/ui/styles/utils.css";
import { spacing } from "@/src/shared/ui/styles/spacing";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { px2rem } from "@/src/shared/presentation/styles/utils.css";
import { spacing } from "@/src/shared/presentation/styles/spacing";
import { vars } from "@/src/shared/presentation/styles/theme.css";
import type { RecipeVariants } from "@vanilla-extract/recipes";
import { recipe } from "@vanilla-extract/recipes";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { MouseEventHandler, PropsWithChildren } from "react";
import type { ButtonVariants } from "./button.css";
import css from "./button.css";
import type { CypressProps } from "@/src/shared/ui/view-models/cypress";
import type { CypressProps } from "@/src/shared/presentation/view-models/cypress";

export interface ButtonProps extends CypressProps {
onClick?: MouseEventHandler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { px2rem } from "@/src/shared/ui/styles/utils.css";
import { px2rem } from "@/src/shared/presentation/styles/utils.css";
import { spacing } from "../../styles/spacing";
import { globalStyle, style } from "@vanilla-extract/css";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { vars } from "@/src/shared/presentation/styles/theme.css";

const wrapper = style({
display: "flex",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { CypressProps } from "@/src/shared/ui/view-models/cypress";
import type { CypressProps } from "@/src/shared/presentation/view-models/cypress";
import type { MouseEventHandler, ReactNode } from "react";
import { forwardRef } from "react";
import css from "./icon-button.css";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { spacing } from "@/src/shared/ui/styles/spacing";
import { px2rem } from "@/src/shared/ui/styles/utils.css";
import { spacing } from "@/src/shared/presentation/styles/spacing";
import { px2rem } from "@/src/shared/presentation/styles/utils.css";
import { style } from "@vanilla-extract/css";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { typographyStyles } from "@/src/shared/ui/styles/typography.css";
import { getBreakpoint } from "@/src/shared/ui/styles/breakpoints";
import { vars } from "@/src/shared/presentation/styles/theme.css";
import { typographyStyles } from "@/src/shared/presentation/styles/typography.css";
import { getBreakpoint } from "@/src/shared/presentation/styles/breakpoints";

const wrapper = style({
display: "flex",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { px2rem } from "@/src/shared/ui/styles/utils.css";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { px2rem } from "@/src/shared/presentation/styles/utils.css";
import { vars } from "@/src/shared/presentation/styles/theme.css";
import { keyframes, style } from "@vanilla-extract/css";

const dotFlashing = keyframes({
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { spacing } from "../../styles/spacing";
import { px2rem } from "../../styles/utils.css";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { vars } from "@/src/shared/presentation/styles/theme.css";
import { style } from "@vanilla-extract/css";

const wrapper = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Loader } from "@/src/shared/ui/components/loader/loader";
import { useUiProvider } from "@/src/shared/ui/providers/ui.provider";
import { Loader } from "@/src/shared/presentation/components/loader/loader";
import { useUiProvider } from "@/src/shared/presentation/providers/ui.provider";
import { animated, easings, useTransition } from "@react-spring/web";
import css from "./main-loader.css";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { px2rem } from "@/src/shared/ui/styles/utils.css";
import { spacing } from "@/src/shared/ui/styles/spacing";
import { px2rem } from "@/src/shared/presentation/styles/utils.css";
import { spacing } from "@/src/shared/presentation/styles/spacing";
import { style } from "@vanilla-extract/css";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { vars } from "@/src/shared/presentation/styles/theme.css";
import { recipe } from "@vanilla-extract/recipes";

const wrapper = recipe({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { typographyStyles } from "@/src/shared/ui/styles/typography.css";
import type { CypressProps } from "@/src/shared/ui/view-models/cypress";
import { typographyStyles } from "@/src/shared/presentation/styles/typography.css";
import type { CypressProps } from "@/src/shared/presentation/view-models/cypress";
import type { MouseEventHandler } from "react";
import css from "./simple-card.css";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { px2rem } from "@/src/shared/ui/styles/utils.css";
import { spacing } from "@/src/shared/ui/styles/spacing";
import { px2rem } from "@/src/shared/presentation/styles/utils.css";
import { spacing } from "@/src/shared/presentation/styles/spacing";
import { style } from "@vanilla-extract/css";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { vars } from "@/src/shared/presentation/styles/theme.css";

const wrapper = style({
display: "flex",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { vars } from "@/src/shared/ui/styles/theme.css";
import { vars } from "@/src/shared/presentation/styles/theme.css";
import { style } from "@vanilla-extract/css";
import { px2rem } from "../../styles/utils.css";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import CloseIcon from "@/src/shared/ui/assets/icons/close.svg?react";
import { IconButton } from "@/src/shared/ui/components/icon-button/icon-button";
import { useUiProvider } from "@/src/shared/ui/providers/ui.provider";
import type { CypressProps } from "@/src/shared/ui/view-models/cypress";
import CloseIcon from "@/src/shared/presentation/assets/icons/close.svg?react";
import { IconButton } from "@/src/shared/presentation/components/icon-button/icon-button";
import { useUiProvider } from "@/src/shared/presentation/providers/ui.provider";
import type { CypressProps } from "@/src/shared/presentation/view-models/cypress";
import { useClickOutside } from "@front_web_mrmilu/hooks";
import { animated, easings, useTransition } from "@react-spring/web";
import type { PropsWithChildren, ReactElement } from "react";
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import type { UserStateViewModel } from "@/src/shared/ui/view-models/user-state";
import type { UserStateViewModel } from "@/src/shared/presentation/view-models/user-state";
import { createStore, useStore } from "zustand";

export const userProvider = createStore<UserStateViewModel>((set) => ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { getBreakpoint } from "@/src/shared/ui/styles/breakpoints";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { px2rem } from "@/src/shared/ui/styles/utils.css";
import { getBreakpoint } from "@/src/shared/presentation/styles/breakpoints";
import { vars } from "@/src/shared/presentation/styles/theme.css";
import { px2rem } from "@/src/shared/presentation/styles/utils.css";
import { globalStyle, style } from "@vanilla-extract/css";
import { spacing } from "../styles/spacing";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Button } from "@/src/shared/ui/components/button/button";
import { MainLoader } from "@/src/shared/ui/components/main-loader/main-loader";
import { Modal } from "@/src/shared/ui/containers/modal/modal";
import { useUserProvider } from "@/src/shared/ui/providers/user.provider";
import "@/src/shared/ui/styles/fonts.css";
import "@/src/shared/ui/styles/globals.css";
import "@/src/shared/ui/styles/reset.css";
import { theme } from "@/src/shared/ui/styles/theme.css";
import { Button } from "@/src/shared/presentation/components/button/button";
import { MainLoader } from "@/src/shared/presentation/components/main-loader/main-loader";
import { Modal } from "@/src/shared/presentation/containers/modal/modal";
import { useUserProvider } from "@/src/shared/presentation/providers/user.provider";
import "@/src/shared/presentation/styles/fonts.css";
import "@/src/shared/presentation/styles/globals.css";
import "@/src/shared/presentation/styles/reset.css";
import { theme } from "@/src/shared/presentation/styles/theme.css";
import { Link, Outlet } from "react-router-dom";
import { SuspenseMainLoader } from "../components/suspense-main-loader/suspense-main-loader";
import css from "./root-page.css";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { LoggingModal } from "@/src/shared/ui/components/logging-modal/logging-modal";
import { useUiProvider } from "@/src/shared/ui/providers/ui.provider";
import { useUserProvider } from "@/src/shared/ui/providers/user.provider";
import type { MiddlewareHook } from "@/src/shared/ui/router/route-middleware";
import { LoggingModal } from "@/src/shared/presentation/components/logging-modal/logging-modal";
import { useUiProvider } from "@/src/shared/presentation/providers/ui.provider";
import { useUserProvider } from "@/src/shared/presentation/providers/user.provider";
import type { MiddlewareHook } from "@/src/shared/presentation/router/route-middleware";
import { useEffect } from "react";

export const useAuthMiddleware: MiddlewareHook = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Await, Navigate, useLocation, defer } from "react-router-dom";
import { SuspenseMainLoader } from "@/src/shared/ui/components/suspense-main-loader/suspense-main-loader";
import { SuspenseMainLoader } from "@/src/shared/presentation/components/suspense-main-loader/suspense-main-loader";
import { Await, defer, Navigate, useLocation } from "react-router-dom";

export interface TrackedPromise<T> extends Promise<T> {
_tracked?: boolean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { usePostsProvider } from "@/src/posts/ui/views/posts-list-page/providers/posts.provider";
import { AppErrorBoundary } from "@/src/shared/ui/components/app-error-boundary/app-error-boundary";
import Page404 from "@/src/shared/ui/components/error-pages/404";
import { SuspenseMainLoader } from "@/src/shared/ui/components/suspense-main-loader/suspense-main-loader";
import { RootPage } from "@/src/shared/ui/root/root-page";
import { useAuthMiddleware } from "@/src/shared/ui/router/middlewares/auth-middleware.hook";
import { RouteMiddleware } from "@/src/shared/ui/router/route-middleware";
import { useUsersListProvider } from "@/src/users/ui/views/users-list-page/providers/users-list.provider";
import { usePostsProvider } from "@/src/posts/presentation/views/posts-list-page/providers/posts.provider";
import { AppErrorBoundary } from "@/src/shared/presentation/components/app-error-boundary/app-error-boundary";
import Page404 from "@/src/shared/presentation/components/error-pages/404";
import { SuspenseMainLoader } from "@/src/shared/presentation/components/suspense-main-loader/suspense-main-loader";
import { RootPage } from "@/src/shared/presentation/root/root-page";
import { useAuthMiddleware } from "@/src/shared/presentation/router/middlewares/auth-middleware.hook";
import { RouteMiddleware } from "@/src/shared/presentation/router/route-middleware";
import { useUsersListProvider } from "@/src/users/presentation/views/users-list-page/providers/users-list.provider";
import { lazy } from "react";
import { createBrowserRouter } from "react-router-dom";

const HomePage = lazy(() => import("@/src/home/ui/views/home-page/home-page"));
const UsersListPage = lazy(() => import("@/src/users/ui/views/users-list-page/users-list-page"));
const PostsListPage = lazy(() => import("@/src/posts/ui/views/posts-list-page/posts-list-page"));
const CreatePostPage = lazy(() => import("@/src/posts/ui/views/create-post-page/create-post-page"));
const HomePage = lazy(() => import("@/src/home/presentation/views/home-page/home-page"));
const UsersListPage = lazy(() => import("@/src/users/presentation/views/users-list-page/users-list-page"));
const PostsListPage = lazy(() => import("@/src/posts/presentation/views/posts-list-page/posts-list-page"));
const CreatePostPage = lazy(() => import("@/src/posts/presentation/views/create-post-page/create-post-page"));

// TODO migrate to new DataRouter API
export const router = createBrowserRouter([
Expand Down
File renamed without changes.
File renamed without changes.
15 changes: 15 additions & 0 deletions src/shared/presentation/styles/fonts.css.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { latoFontFamily } from "@/src/shared/presentation/styles/constants";
import { globalFontFace } from "@vanilla-extract/css";

globalFontFace(latoFontFamily, {
src: `url("/src/shared/presentation/assets/fonts/Lato-Regular.ttf") format('truetype')`,
fontWeight: 400
});
globalFontFace(latoFontFamily, {
src: `url("/src/shared/presentation/assets/fonts/Lato-Bold.ttf") format('truetype')`,
fontWeight: 700
});
globalFontFace(latoFontFamily, {
src: `url("/src/shared/presentation/assets/fonts/Lato-Light.ttf") format('truetype')`,
fontWeight: 300
});
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { typographyConfig } from "@/src/shared/ui/styles/typography.css";
import { px2rem } from "@/src/shared/ui/styles/utils.css";
import { typographyConfig } from "@/src/shared/presentation/styles/typography.css";
import { px2rem } from "@/src/shared/presentation/styles/utils.css";
import { globalStyle } from "@vanilla-extract/css";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { latoFontFamily } from "@/src/shared/ui/styles/constants";
import { vars } from "@/src/shared/presentation/styles/theme.css";
import { latoFontFamily } from "@/src/shared/presentation/styles/constants";

globalStyle("body", {
backgroundColor: vars.colors.gray10
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 0 additions & 15 deletions src/shared/ui/styles/fonts.css.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { recipe } from "@vanilla-extract/recipes";
import { vars } from "@/src/shared/ui/styles/theme.css";
import { vars } from "@/src/shared/presentation/styles/theme.css";

const content = recipe({
base: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ModalContent } from "@/src/shared/ui/containers/modal/modal";
import { ModalContent } from "@/src/shared/presentation/containers/modal/modal";
import type { User } from "@/src/users/domain/models/user";
import { forwardRef } from "react";
import css from "./user-modal.css";
Expand Down
Loading

0 comments on commit 5a60620

Please sign in to comment.