From 3d6a3d4abcb9fe07329b20e215c9dfcb562348b7 Mon Sep 17 00:00:00 2001 From: Thith-thith Date: Thu, 24 Aug 2023 23:03:00 -0400 Subject: [PATCH] Changes to be committed: modified: client/package-lock.json modified: client/package.json modified: client/src/pages/products/index.tsx --- client/package-lock.json | 72 +++++++++++++++++++++++++++++ client/package.json | 1 + client/src/pages/products/index.tsx | 33 ++++++++++--- 3 files changed, 99 insertions(+), 7 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index c3e977d..1ae119e 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@solidjs/router": "^0.8.2", "aos": "^2.3.4", + "axios": "^1.4.0", "babel-preset-solid": "^1.7.4", "flowbite": "^1.7.0", "json-server": "^0.17.3", @@ -1297,6 +1298,11 @@ "get-intrinsic": "^1.1.3" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/autoprefixer": { "version": "10.4.14", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", @@ -1341,6 +1347,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/axios": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", + "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/babel-plugin-jsx-dom-expressions": { "version": "0.36.10", "resolved": "https://registry.npmjs.org/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.36.10.tgz", @@ -1663,6 +1679,17 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, + "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==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", @@ -1866,6 +1893,14 @@ "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==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -2926,6 +2961,25 @@ "mini-svg-data-uri": "^1.4.3" } }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "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", @@ -2934,6 +2988,19 @@ "is-callable": "^1.1.3" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -4663,6 +4730,11 @@ "node": ">= 0.10" } }, + "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==" + }, "node_modules/punycode": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", diff --git a/client/package.json b/client/package.json index 7bdddf5..6a0ad66 100644 --- a/client/package.json +++ b/client/package.json @@ -22,6 +22,7 @@ "dependencies": { "@solidjs/router": "^0.8.2", "aos": "^2.3.4", + "axios": "^1.4.0", "babel-preset-solid": "^1.7.4", "flowbite": "^1.7.0", "json-server": "^0.17.3", diff --git a/client/src/pages/products/index.tsx b/client/src/pages/products/index.tsx index 66e2081..cd97bc0 100644 --- a/client/src/pages/products/index.tsx +++ b/client/src/pages/products/index.tsx @@ -1,13 +1,32 @@ -import { Component, For, createResource } from "solid-js"; +import { + Component, + For, + createResource, + createSignal, + createEffect, +} from "solid-js"; import { A } from "@solidjs/router"; import Cards from "../../components/cards/Cards"; +import axios from "axios"; const Products: Component = () => { - const fetchData = async () => { - const res = await fetch("https://cptdb.koompi.com/CoreProducts"); - return res.json(); - }; - const [coreProducts] = createResource(fetchData); + // const fetchData = async () => { + // const res = await fetch("https://cptdb.koompi.com/CoreProducts"); + // return res.json(); + // }; + // const [coreProducts] = createResource(fetchData); + + const [data, setData] = createSignal([]); + + createEffect(() => { + axios + .get("https://cptdb.koompi.com/CoreProducts") + .then((res) => { + console.log("res", res.data); + setData(res?.data); + }) + .catch((err) => console.log(err)); + }); return (
@@ -480,7 +499,7 @@ const Products: Component = () => {
- + {(res) => { return ; }}