diff --git a/snowpack.config.js b/snowpack.config.js index eaf7ffc..ad8512e 100644 --- a/snowpack.config.js +++ b/snowpack.config.js @@ -22,12 +22,7 @@ module.exports = { open: "none", }, alias: { - "@assets": "./src/assets", - "@utils": "./src/utils", - "@type": "./src/type", + "~": "./src", }, exclude: ["**/node_modules/**/*", "**/*.test.*"], - env: { - // API_URL: "https://publitebackend.dmitriy.icu", - }, }; diff --git a/src/App/index.tsx b/src/App/index.tsx index af21d26..1c5b2c0 100644 --- a/src/App/index.tsx +++ b/src/App/index.tsx @@ -1,10 +1,11 @@ -import { Route } from "@type/router"; +import { Route } from "~/types/router"; import React from "react"; -import { Bookshelf } from "../Bookshelf"; -import { Router } from "../router"; -import { Err404 } from "../router/404"; -import { UploadForm } from "../UploadForm"; +import { Bookshelf } from "~/pages/Bookshelf"; +import { UploadForm } from "~/pages/UploadForm"; + +import { Router } from "~/router"; +import { Err404 } from "~/router/404"; import styles from "./App.module.css"; diff --git a/src/api.ts b/src/api.ts index 7762a47..6bb44e8 100644 --- a/src/api.ts +++ b/src/api.ts @@ -1,4 +1,4 @@ -import { IBook, optionalBookProps, requiredBookProps } from "@type/book"; +import { IBook, optionalBookProps, requiredBookProps } from "~/types/book"; import { API_URL } from "./constants"; diff --git a/src/index.tsx b/src/index.tsx index 64b891e..78f3909 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -3,7 +3,7 @@ import ReactDOM from "react-dom"; import "./index.css"; -import { App } from "./App"; +import { App } from "~/App"; ReactDOM.render( diff --git a/src/Bookshelf/AddBook/AddBook.module.css b/src/pages/Bookshelf/AddBook/AddBook.module.css similarity index 100% rename from src/Bookshelf/AddBook/AddBook.module.css rename to src/pages/Bookshelf/AddBook/AddBook.module.css diff --git a/src/Bookshelf/AddBook/index.tsx b/src/pages/Bookshelf/AddBook/index.tsx similarity index 73% rename from src/Bookshelf/AddBook/index.tsx rename to src/pages/Bookshelf/AddBook/index.tsx index 7ffb8bd..96f1ef2 100644 --- a/src/Bookshelf/AddBook/index.tsx +++ b/src/pages/Bookshelf/AddBook/index.tsx @@ -1,9 +1,9 @@ import React from "react"; -import plusIcon from "@assets/plus.svg"; +import plusIcon from "~/assets/plus.svg"; import styles from "./AddBook.module.css"; -import { BASE_URL } from "../../constants"; -import { goTo } from "../../router/goTo"; +import { BASE_URL } from "~/constants"; +import { goTo } from "~/router/goTo"; export const AddBook = () => { return ( diff --git a/src/Bookshelf/BookItem/BookItem.module.css b/src/pages/Bookshelf/BookItem/BookItem.module.css similarity index 100% rename from src/Bookshelf/BookItem/BookItem.module.css rename to src/pages/Bookshelf/BookItem/BookItem.module.css diff --git a/src/Bookshelf/BookItem/index.tsx b/src/pages/Bookshelf/BookItem/index.tsx similarity index 93% rename from src/Bookshelf/BookItem/index.tsx rename to src/pages/Bookshelf/BookItem/index.tsx index 975b79c..e20c688 100644 --- a/src/Bookshelf/BookItem/index.tsx +++ b/src/pages/Bookshelf/BookItem/index.tsx @@ -2,7 +2,7 @@ import React from "react"; import styles from "./BookItem.module.css"; -import { IBook } from "@type/book"; +import { IBook } from "~/types/book"; interface IBookItemProps extends IBook {} diff --git a/src/Bookshelf/Bookshelf.module.css b/src/pages/Bookshelf/Bookshelf.module.css similarity index 100% rename from src/Bookshelf/Bookshelf.module.css rename to src/pages/Bookshelf/Bookshelf.module.css diff --git a/src/Bookshelf/index.tsx b/src/pages/Bookshelf/index.tsx similarity index 86% rename from src/Bookshelf/index.tsx rename to src/pages/Bookshelf/index.tsx index 1253c4c..9851c6d 100644 --- a/src/Bookshelf/index.tsx +++ b/src/pages/Bookshelf/index.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useState } from "react"; -import { IBook } from "@type/book"; +import { IBook } from "~/types/book"; import styles from "./Bookshelf.module.css"; import { BookItem } from "./BookItem"; import { AddBook } from "./AddBook"; -import { readBooks } from "@utils/localStorage"; +import { readBooks } from "~/utils/localStorage"; export const Bookshelf = () => { const [books, setBooks] = useState([]); diff --git a/src/UploadForm/UploadForm.module.css b/src/pages/UploadForm/UploadForm.module.css similarity index 100% rename from src/UploadForm/UploadForm.module.css rename to src/pages/UploadForm/UploadForm.module.css diff --git a/src/UploadForm/index.tsx b/src/pages/UploadForm/index.tsx similarity index 87% rename from src/UploadForm/index.tsx rename to src/pages/UploadForm/index.tsx index bd27911..9ede168 100644 --- a/src/UploadForm/index.tsx +++ b/src/pages/UploadForm/index.tsx @@ -1,11 +1,11 @@ import React, { useState } from "react"; -import plusIcon from "@assets/plus.svg"; +import plusIcon from "~/assets/plus.svg"; import styles from "./UploadForm.module.css"; -import { submitFile, validateResponse, validState } from "../api"; -import { saveBook } from "@utils/localStorage"; -import { BASE_URL } from "../constants"; -import { goTo } from "../router/goTo"; +import { submitFile, validateResponse, validState } from "~/api"; +import { saveBook } from "~/utils/localStorage"; +import { BASE_URL } from "~/constants"; +import { goTo } from "~/router/goTo"; export const UploadForm = () => { const [error, setError] = useState(""); diff --git a/src/router/index.tsx b/src/router/index.tsx index 6d6027b..158facb 100644 --- a/src/router/index.tsx +++ b/src/router/index.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { BASE_URL } from "../constants"; -import { Route } from "@type/router"; +import { BASE_URL } from "~/constants"; +import { Route } from "~/types/router"; import { Err404 } from "./404"; import { goTo } from "./goTo"; diff --git a/src/type/book.ts b/src/types/book.ts similarity index 100% rename from src/type/book.ts rename to src/types/book.ts diff --git a/src/type/router.ts b/src/types/router.ts similarity index 100% rename from src/type/router.ts rename to src/types/router.ts diff --git a/src/type/utils.ts b/src/types/utils.ts similarity index 100% rename from src/type/utils.ts rename to src/types/utils.ts diff --git a/src/utils/localStorage.ts b/src/utils/localStorage.ts index 3ef9b67..ca0d3c1 100644 --- a/src/utils/localStorage.ts +++ b/src/utils/localStorage.ts @@ -1,7 +1,7 @@ -import { IBook } from "@type/book"; -import { isArrOfStr } from "@type/utils"; -import { validateResponse } from "../api"; -import { BookItem } from "../Bookshelf/BookItem"; +import { IBook } from "~/types/book"; +import { isArrOfStr } from "~/types/utils"; +import { validateResponse } from "~/api"; +import { BookItem } from "~/pages/Bookshelf/BookItem"; const readBookList = ( cb: (bookList: string[]) => T, diff --git a/tsconfig.json b/tsconfig.json index ea53e2b..a273641 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,9 +11,7 @@ "moduleResolution": "node", "resolveJsonModule": true, "paths": { - "@assets/*": ["./src/assets/*"], - "@utils/*": ["./src/utils/*"], - "@type/*": ["./src/type/*"] + "~/*": ["./src/*"] } } }