diff --git a/.gitignore b/.gitignore index a547bf36..9826b5ca 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ dist-ssr *.njsproj *.sln *.sw? + +# Environment variables +.env \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 60d6e3e5..06757f55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,9 @@ "version": "0.0.0", "dependencies": { "@tailwindcss/vite": "^4.0.6", + "axios": "^1.8.1", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router": "^7.1.3", "react-router-dom": "^7.1.3", "tailwindcss": "^4.0.6" }, @@ -1594,6 +1594,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", @@ -1610,6 +1616,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/axios": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.1.tgz", + "integrity": "sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1651,7 +1668,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -1725,6 +1741,18 @@ "dev": true, "license": "MIT" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1878,6 +1906,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", @@ -1907,7 +1944,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -2001,7 +2037,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -2011,7 +2046,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -2049,7 +2083,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -2062,7 +2095,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -2450,6 +2482,26 @@ "dev": true, "license": "ISC" }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -2460,6 +2512,21 @@ "is-callable": "^1.1.3" } }, + "node_modules/form-data": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", + "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2478,7 +2545,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2519,7 +2585,6 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -2544,7 +2609,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", @@ -2619,7 +2683,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -2690,7 +2753,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -2703,7 +2765,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" @@ -2719,7 +2780,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -3535,12 +3595,32 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3962,6 +4042,12 @@ "react-is": "^16.13.1" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/package.json b/package.json index afff856f..26a1fe7b 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.0.6", + "axios": "^1.8.1", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router": "^7.1.3", "react-router-dom": "^7.1.3", "tailwindcss": "^4.0.6" }, diff --git a/src/App.jsx b/src/App.jsx index 5127a17a..124d79c8 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -9,20 +9,23 @@ import AddItem from "@/pages/AddItem.jsx"; import Boards from "@/pages/Boards"; import Policy from "@/pages/Policy.jsx"; import Faq from "@/pages/Faq.jsx"; +import Layout from "./components/MainLayout"; function App() { return ( - }> - }> - }> - }> - }> - }> - }> - }> + }> + } /> + } /> + } /> + } /> + + } /> + } /> + } /> + } /> diff --git a/src/api/api.jsx b/src/api/api.jsx index 39f1496e..6fd2bb93 100644 --- a/src/api/api.jsx +++ b/src/api/api.jsx @@ -1,25 +1,41 @@ +import instance from "@/api/axiosInstance"; + +const PRODUCT_ENDPOINT = `/products`; +const IMAGE_ENDPOINT = `/images/upload`; + export const getItems = async ( page, pageSize, orderBy = "recent", keyword = null, ) => { - const baseURL = "https://panda-market-api.vercel.app/products/"; - const params = new URLSearchParams({ + const params = { page: page, pageSize: pageSize, orderBy: orderBy, - }); + }; if (keyword) { - params.append("keyword", keyword); + params[keyword] = keyword; } - const requrl = `${baseURL}?${params.toString()}`; - - const response = await fetch(requrl, { - method: "GET", + const response = await instance.get(PRODUCT_ENDPOINT, { + params: params, }); - const data = await response.json(); + + const data = response.data; + return data; +}; + +export const postItem = async (item) => { + const response = await instance.post(PRODUCT_ENDPOINT, item); + const data = response.data; + return data; +}; + +export const uploadImage = async (image) => { + const response = await instance.post(IMAGE_ENDPOINT, { image }); + const data = response.data; + return data; }; diff --git a/src/api/axiosInstance.jsx b/src/api/axiosInstance.jsx new file mode 100644 index 00000000..dda452ff --- /dev/null +++ b/src/api/axiosInstance.jsx @@ -0,0 +1,12 @@ +import axios from "axios"; + +const API_BASE_URL = import.meta.env.VITE_API_BASE_URL; + +const axiosInstance = axios.create({ + baseURL: API_BASE_URL, + headers: { + "Content-Type": "application/json", + }, +}); + +export default axiosInstance; diff --git a/src/assets/ic_close.svg b/src/assets/ic_close.svg new file mode 100644 index 00000000..f6674f7f --- /dev/null +++ b/src/assets/ic_close.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/ic_plus.svg b/src/assets/ic_plus.svg new file mode 100644 index 00000000..5bb9abf5 --- /dev/null +++ b/src/assets/ic_plus.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/AddItemInputField.jsx b/src/components/AddItemInputField.jsx new file mode 100644 index 00000000..8dfeadbd --- /dev/null +++ b/src/components/AddItemInputField.jsx @@ -0,0 +1,47 @@ +import { useState } from "react"; + +function AddItemInputField({ + id, + name, + type, + label, + placeholder, + value, + setValue, + onEnterKeyDown, + onBlur, +}) { + const handleEnterKeyDown = (e) => { + if (!onEnterKeyDown) return; + if (e.key === "Enter") { + e.preventDefault(); + onEnterKeyDown(e.target.value); + setValue(""); + } + }; + + return ( +
+ +
+ setValue(e.target.value)} + onKeyDown={handleEnterKeyDown} + onBlur={onBlur} + /> +
+
+ ); +} + +export default AddItemInputField; diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index 70cd7851..dc696b0c 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -1,4 +1,4 @@ -import { Link, useNavigate } from "react-router"; +import { Link } from "react-router-dom"; import facebook from "@/assets/ic_facebook.svg"; import twitter from "@/assets/ic_twitter.svg"; import youtube from "@/assets/ic_youtube.svg"; @@ -6,55 +6,51 @@ import instagram from "@/assets/ic_instagram.svg"; function Footer() { return ( - <> - ); } diff --git a/src/components/Header.jsx b/src/components/Header.jsx index f4161d6a..2fe64620 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -2,7 +2,7 @@ import logo_sm from "@/assets/logo_sm.svg"; import logo_text from "@/assets/logo_text.svg"; import LogoImage from "@/components/LogoImage"; import ic_profile from "@/assets/ic_profile.svg"; -import { Link, useLocation, useNavigate } from "react-router"; +import { Link, useLocation, useNavigate } from "react-router-dom"; function Header() { const { pathname } = useLocation(); @@ -39,7 +39,7 @@ function Header() {
  • diff --git a/src/components/InputField.jsx b/src/components/InputField.jsx index d11bef77..f46ae8d1 100644 --- a/src/components/InputField.jsx +++ b/src/components/InputField.jsx @@ -13,6 +13,7 @@ function InputField({ value, onChange, onBlur, + onEnterKeyDown, hasValue, isValidated, }) { @@ -34,6 +35,13 @@ function InputField({ onBlur(name); }; + const handleEnterKeyDown = (e) => { + if (e.key === "Enter") { + onEnterKeyDown(e.target.value); + } + onChange(name, e); + }; + const togglePasswordVisibility = () => { setCurrentInputType((prevInputType) => prevInputType === "password" ? "text" : "password", @@ -42,7 +50,7 @@ function InputField({ return (
    -