diff --git a/package.json b/package.json index 70251d1..8c8aced 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,10 @@ "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^13.5.0", + "@types/jest": "^27.5.1", + "@types/node": "^17.0.35", + "@types/react": "^18.0.9", + "@types/react-dom": "^18.0.5", "axios": "^0.27.2", "bootstrap": "^5.1.3", "dotenv": "^16.0.1", @@ -14,6 +18,7 @@ "react-debounce-input": "^3.2.5", "react-dom": "^17.0.0", "react-scripts": "5.0.1", + "typescript": "^4.7.2", "web-vitals": "^2.1.4" }, "scripts": { diff --git a/src/App.js b/src/App.tsx similarity index 87% rename from src/App.js rename to src/App.tsx index 3303657..373dc6e 100644 --- a/src/App.js +++ b/src/App.tsx @@ -2,7 +2,7 @@ import "./App.css"; import "bootstrap/dist/css/bootstrap.min.css"; import Home from "./components/Home"; -function App() { +function App():JSX.Element{ return (
diff --git a/src/components/Api.js b/src/components/Api.js deleted file mode 100644 index b2b6748..0000000 --- a/src/components/Api.js +++ /dev/null @@ -1,15 +0,0 @@ -import { create } from "axios"; -export const instance = create({ - baseURL: `${process.env.REACT_APP_API_BASE_URL}`, -}); -export const getBeersService = async (filters, currentPage) => { - const { id, beerName, yeast, date, abv, postPerPage } = filters; - const idQueryString = id ? `&ids=${id}` : ""; - const yeastQueryString = yeast ? `&yeast=${yeast}` : ""; - const beerQueryString = beerName ? `&beer_name=${beerName}` : ""; - const dateQueryString = date ? `&brewed_after=${date}` : ""; - const abvQueryString = abv ? `&abv_gt=${abv}` : ""; - const PerPageQueryString = postPerPage ? `&per_page=${postPerPage}` : ""; - const url = `/beers?page=${currentPage}${PerPageQueryString}${dateQueryString}${abvQueryString}${beerQueryString}${idQueryString}${yeastQueryString}`; - return await instance.get(url); -}; diff --git a/src/components/Api.tsx b/src/components/Api.tsx new file mode 100644 index 0000000..27a512b --- /dev/null +++ b/src/components/Api.tsx @@ -0,0 +1,41 @@ +import axios, { AxiosInstance } from "axios"; + +export interface IPostdata { + id: number; + name: string; + tagline: string; + first_brewed: string; + description: string; + ingredients: { + yeast: string; + }; + image_url: string; + abv: string; +}; + +export const instance : AxiosInstance = axios.create({ + baseURL: `${process.env.REACT_APP_API_BASE_URL}`, +}); + +export interface IFilters { + beerName: String + yeast: String + date: String + abv: number + id: String + endPage:String + postPerPage:String + } + +export const getBeersService = async (filters:IFilters, currentPage:number) :Promise => { + const { id, beerName, yeast, date, abv, postPerPage } = filters; + const idQueryString = id ? `&ids=${id}` : ""; + const yeastQueryString = yeast ? `&yeast=${yeast}` : ""; + const beerQueryString = beerName ? `&beer_name=${beerName}` : ""; + const dateQueryString = date ? `&brewed_after=${date}` : ""; + const abvQueryString = abv ? `&abv_gt=${abv}` : ""; + const PerPageQueryString = postPerPage ? `&per_page=${postPerPage}` : ""; + const url = `/beers?page=${currentPage}${PerPageQueryString}${dateQueryString}${abvQueryString}${beerQueryString}${idQueryString}${yeastQueryString}`; + const {data}=await instance.get(url); + return data +}; diff --git a/src/components/Filters.js b/src/components/Filters.tsx similarity index 92% rename from src/components/Filters.js rename to src/components/Filters.tsx index fb7b83f..f9aead9 100644 --- a/src/components/Filters.js +++ b/src/components/Filters.tsx @@ -1,7 +1,10 @@ -import React from "react"; +import React,{ChangeEventHandler, FC} from "react"; import { Container, Row, Col } from "react-bootstrap"; import { DebounceInput } from "react-debounce-input"; -const Filters = ({ handleChange }) => { +type HandleChange={ + handleChange:ChangeEventHandler; +} +const Filters:FC = ({ handleChange }) => { return ( <> diff --git a/src/components/Home.js b/src/components/Home.js deleted file mode 100644 index af65036..0000000 --- a/src/components/Home.js +++ /dev/null @@ -1,41 +0,0 @@ -import React, { useEffect, useState } from "react"; -import Table from "./Table"; -import { getBeersService } from "./Api"; -import Filters from "./Filters"; -const Home = () => { - const [post, setPost] = useState([]); - const [currentPage, setCurrentPage] = useState(1); - const [filters, setFilters] = useState({ - beerName: "", - yeast: "", - date: "", - abv: "", - id: "", - endPage: 33, - postPerPage: 10, - }); - const handleChange = (e) => { - const { name, value } = e.target; - setFilters({ - ...filters, - [name]: value, - }); - }; - useEffect(() => { - (async () => { - const { data } = await getBeersService(filters, currentPage); - setPost(data); - })(); - }, [filters, currentPage]); - return ( -
- - - - ); -}; -export default Home; diff --git a/src/components/Home.tsx b/src/components/Home.tsx new file mode 100644 index 0000000..7889623 --- /dev/null +++ b/src/components/Home.tsx @@ -0,0 +1,47 @@ +import React, { FC, useEffect, ChangeEvent, useState } from "react"; +import Table from "./Table"; +import {getBeersService, IFilters, IPostdata} from "./Api"; +import Filters from "./Filters"; + +const initialFilters = { + beerName: "", + yeast: "", + date: "", + abv: 0, + id: "", + endPage: "33", + postPerPage: "10", +} + +const Home: FC = () => { + const [post, setPost] = useState([]); + const [currentPage, setCurrentPage] = useState(1); + const [filters, setFilters] = useState(initialFilters); + + const handleChange = (e: ChangeEvent) => { + const { name, value } = e.target; + setFilters({ + ...filters, + [name]: value, + }); + }; + + useEffect(() => { + (async () => { + const data = await getBeersService(filters, currentPage); + setPost(data); + })(); + }, [filters, currentPage]); + + return ( +
+ +
+ + ); +}; +export default Home; diff --git a/src/components/Table.js b/src/components/Table.tsx similarity index 81% rename from src/components/Table.js rename to src/components/Table.tsx index c5853c4..2cccb1a 100644 --- a/src/components/Table.js +++ b/src/components/Table.tsx @@ -1,16 +1,25 @@ -import React, { useState } from "react"; +import React, { Dispatch, FC } from "react"; +import { IPostdata } from "./Api"; import "./Table.css"; -const Table = ({ currentPage, post, setCurrentPage }) => { - const tableHead = [ - "ID", - "Name", - "Tagline", - "First Brewed", - "Description", - "Abv", - "Yeast", - "Image", - ]; + +interface ITableProps { + currentPage: number; + post: IPostdata[]; + setCurrentPage:Dispatch> +}; + +const tableHead = [ + "ID", + "Name", + "Tagline", + "First Brewed", + "Description", + "Abv", + "Yeast", + "Image", +]; + +const Table: FC = ({ currentPage, post, setCurrentPage }) => { return ( <>
diff --git a/src/index.js b/src/index.tsx similarity index 100% rename from src/index.js rename to src/index.tsx diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..e17d9e5 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,105 @@ +{ + + "compilerOptions": { + "jsx": "react-jsx", + /* Visit https://aka.ms/tsconfig to read more about this file */ + + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + + /* Language and Environment */ + "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + + /* Modules */ + "module": "commonjs", /* Specify what module code is generated. */ + // "rootDir": "./", /* Specify the root folder within your source files. */ + // "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + // "outDir": "./", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + + /* Type Checking */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + } +}