diff --git a/package-lock.json b/package-lock.json index 9f3a0468..1dfbee0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15370,6 +15370,17 @@ "inBundle": true, "license": "ISC" }, + "node_modules/npm/node_modules/glob/node_modules/minimatch": { + "version": "3.1.2", + "inBundle": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/npm/node_modules/glob/node_modules/path-is-absolute": { "version": "1.0.0", "inBundle": true, @@ -15608,6 +15619,11 @@ "validate-npm-package-license": "^3.0.1" } }, + "node_modules/npm/node_modules/normalize-package-data/node_modules/hosted-git-info": { + "version": "2.8.9", + "inBundle": true, + "license": "ISC" + }, "node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin-module": { "version": "1.0.0", "inBundle": true, @@ -15627,6 +15643,14 @@ "node": ">=0.10.0" } }, + "node_modules/npm/node_modules/normalize-package-data/node_modules/semver": { + "version": "5.7.1", + "inBundle": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, "node_modules/npm/node_modules/npm-cache-filename": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz", @@ -15654,6 +15678,19 @@ "semver": "4 || 5" } }, + "node_modules/npm/node_modules/npm-package-arg/node_modules/hosted-git-info": { + "version": "2.8.9", + "inBundle": true, + "license": "ISC" + }, + "node_modules/npm/node_modules/npm-package-arg/node_modules/semver": { + "version": "5.7.1", + "inBundle": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, "node_modules/npm/node_modules/npm-registry-client": { "version": "7.2.1", "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.2.1.tgz", @@ -15979,6 +16016,19 @@ "node": ">=0.10.0" } }, + "node_modules/npm/node_modules/read-package-json/node_modules/graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "inBundle": true, + "license": "ISC", + "optional": true + }, + "node_modules/npm/node_modules/read-package-json/node_modules/hosted-git-info": { + "version": "2.8.9", + "inBundle": true, + "license": "ISC" + }, "node_modules/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror": { "version": "1.0.3", "inBundle": true, @@ -15992,6 +16042,36 @@ "inBundle": true, "license": "WTFPL" }, + "node_modules/npm/node_modules/read-package-json/node_modules/minimatch": { + "version": "3.1.2", + "inBundle": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/npm/node_modules/read-package-json/node_modules/normalize-package-data": { + "version": "2.5.0", + "inBundle": true, + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/npm/node_modules/read-package-json/node_modules/semver": { + "version": "5.7.1", + "inBundle": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, "node_modules/npm/node_modules/read/node_modules/mute-stream": { "version": "0.0.5", "inBundle": true, @@ -16658,6 +16738,38 @@ "rimraf": "bin.js" } }, + "node_modules/npm/node_modules/rimraf/node_modules/glob": { + "version": "7.2.3", + "inBundle": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/npm/node_modules/rimraf/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "inBundle": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/npm/node_modules/semver": { "version": "5.1.0", "inBundle": true, @@ -16865,6 +16977,13 @@ "slide": "^1.1.5" } }, + "node_modules/npm/node_modules/write-file-atomic/node_modules/graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "inBundle": true, + "license": "ISC" + }, "node_modules/nth-check": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", @@ -35134,6 +35253,13 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "bundled": true }, + "minimatch": { + "version": "3.1.2", + "bundled": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, "path-is-absolute": { "version": "1.0.0", "bundled": true @@ -35326,6 +35452,10 @@ "validate-npm-package-license": "^3.0.1" }, "dependencies": { + "hosted-git-info": { + "version": "2.8.9", + "bundled": true + }, "is-builtin-module": { "version": "1.0.0", "bundled": true, @@ -35338,6 +35468,10 @@ "bundled": true } } + }, + "semver": { + "version": "5.7.1", + "bundled": true } } }, @@ -35363,6 +35497,16 @@ "requires": { "hosted-git-info": "^2.1.4", "semver": "4 || 5" + }, + "dependencies": { + "hosted-git-info": { + "version": "2.8.9", + "bundled": true + }, + "semver": { + "version": "5.7.1", + "bundled": true + } } }, "npm-registry-client": { @@ -35645,6 +35789,17 @@ } } }, + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "bundled": true, + "optional": true + }, + "hosted-git-info": { + "version": "2.8.9", + "bundled": true + }, "json-parse-helpfulerror": { "version": "1.0.3", "bundled": true, @@ -35657,6 +35812,27 @@ "bundled": true } } + }, + "minimatch": { + "version": "3.1.2", + "bundled": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "normalize-package-data": { + "version": "2.5.0", + "bundled": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "semver": { + "version": "5.7.1", + "bundled": true } } }, @@ -36156,6 +36332,29 @@ "bundled": true, "requires": { "glob": "^7.0.5" + }, + "dependencies": { + "glob": { + "version": "7.2.3", + "bundled": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "bundled": true, + "requires": { + "brace-expansion": "^1.1.7" + } + } } }, "semver": { @@ -36334,6 +36533,14 @@ "graceful-fs": "^4.1.2", "imurmurhash": "^0.1.4", "slide": "^1.1.5" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "bundled": true + } } } } diff --git a/src/components/Backbutton.tsx b/src/components/Backbutton.tsx index da74d88c..114c8dae 100644 --- a/src/components/Backbutton.tsx +++ b/src/components/Backbutton.tsx @@ -8,7 +8,7 @@ function Backbutton() { return ( ); } diff --git a/src/components/Photouploadbox.tsx b/src/components/Photouploadbox.tsx index 389f2ffa..0b135ab3 100644 --- a/src/components/Photouploadbox.tsx +++ b/src/components/Photouploadbox.tsx @@ -91,6 +91,7 @@ function Photouploadbox() { const picFormData = new FormData(); picFormData.append("picuuid", picuuid); var count = 0; + console.log(res); if (task_id !== "") { setLoading(true); const getAnswer = async () => { diff --git a/src/components/Slider.tsx b/src/components/Slider.tsx index 51d11882..dd8c8558 100644 --- a/src/components/Slider.tsx +++ b/src/components/Slider.tsx @@ -64,11 +64,11 @@ function Slider() { const greatslider = greats.map(great => (
navigate("/Detailpage", { state: great })} > -
+
@@ -96,7 +96,7 @@ function Slider() { }} navigation={true} modules={[Pagination, Navigation]} - className="mySwiper z-50" + className="mySwiper z-50 " > {greatslider} diff --git a/src/components/Slider2.tsx b/src/components/Slider2.tsx index b51966a5..975e39b9 100644 --- a/src/components/Slider2.tsx +++ b/src/components/Slider2.tsx @@ -84,16 +84,19 @@ function Slider2() { greatslider = mypagedata.map(mydata => (
-
- - +
+ +
diff --git a/src/pages/Resultpage.tsx b/src/pages/Resultpage.tsx index 8d5552ab..0b8e9a87 100644 --- a/src/pages/Resultpage.tsx +++ b/src/pages/Resultpage.tsx @@ -11,6 +11,7 @@ import result from "@images/result.png"; import React, { useState } from "react"; import { useLocation } from "react-router-dom"; import html2canvas from "html2canvas"; +import Backbutton from "@components/Backbutton"; function Resultpage() { // 한 @@ -26,12 +27,13 @@ function Resultpage() { monkey: "원숭이띠", chicken: "닭띠", dog: "개띠", - pig: "돼지띠", + pig: "돼지ㄸ:", }; const { state } = useLocation(); const keys = Object.keys(state.result); console.log(state.userimage); console.log(state.animalimage); + console.log(state); const onCapture = () => { console.log("onCapture"); @@ -57,13 +59,13 @@ function Resultpage() {
-
+
{data[keys[0]]}
{data[keys[1]]}
{data[keys[2]]}
@@ -72,36 +74,29 @@ function Resultpage() {
- - + +
-

{data[keys[0]]}

+

{data[keys[0]]}

-
- -
-
- -
-
-
-

공유하기

-
- kakao - url - onCapture()}>사진 +
+

공유하기

+
+ kakao + url +
-
+
{state.result[keys[0]]}%
{state.result[keys[1]]}%
{state.result[keys[2]]}%
@@ -112,6 +107,9 @@ function Resultpage() {
+
+ +
); diff --git a/yarn.lock b/yarn.lock index 28c67318..b77507bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6448,7 +6448,7 @@ "once" "^1.3.0" "path-is-absolute" "^1.0.0" -"glob@^7.0.3", "glob@^7.0.5", "glob@~7.0.6": +"glob@^7.0.3", "glob@~7.0.6": "integrity" "sha512-f8c0rE8JiCxpa52kWPAOa3ZaYEnzofDzCQLCn3Vdk0Z5OVLq3BsRFJI4S4ykpeVW6QMGBUkMeUpoEgWnMTnw5Q==" "resolved" "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz" "version" "7.0.6" @@ -6460,6 +6460,16 @@ "once" "^1.3.0" "path-is-absolute" "^1.0.0" +"glob@^7.0.5": + "version" "7.2.3" + dependencies: + "fs.realpath" "^1.0.0" + "inflight" "^1.0.4" + "inherits" "2" + "minimatch" "^3.1.1" + "once" "^1.3.0" + "path-is-absolute" "^1.0.0" + "glob@^7.1.1", "glob@^7.1.2", "glob@^7.1.3", "glob@^7.1.4", "glob@^7.1.6": "integrity" "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==" "resolved" "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" @@ -6700,7 +6710,10 @@ "resolved" "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz" "version" "0.1.4" -"hosted-git-info@^2.1.4", "hosted-git-info@~2.1.5": +"hosted-git-info@^2.1.4": + "version" "2.8.9" + +"hosted-git-info@~2.1.5": "integrity" "sha512-5sLwVGWIA8493A2PzG/py8s+uBrYqrwmLp6C6U5+Gpw5Ll49OOigsuD4LKbUTExbgedTNPvPb/0GV5ohHYYNBg==" "resolved" "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz" "version" "2.1.5" @@ -8738,7 +8751,15 @@ "resolved" "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.2.tgz" "version" "3.0.2" -"normalize-package-data@^2.0.0", "normalize-package-data@~1.0.1 || ^2.0.0", "normalize-package-data@~2.3.5": +"normalize-package-data@^2.0.0": + "version" "2.5.0" + dependencies: + "hosted-git-info" "^2.1.4" + "resolve" "^1.10.0" + "semver" "2 || 3 || 4 || 5" + "validate-npm-package-license" "^3.0.1" + +"normalize-package-data@~1.0.1 || ^2.0.0", "normalize-package-data@~2.3.5": "version" "2.3.5" dependencies: "hosted-git-info" "^2.1.4" @@ -10934,7 +10955,7 @@ "resolved" "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz" "version" "1.1.0" -"resolve@^1.1.7", "resolve@^1.14.2", "resolve@^1.19.0", "resolve@^1.20.0", "resolve@^1.22.0", "resolve@^1.22.1": +"resolve@^1.1.7", "resolve@^1.10.0", "resolve@^1.14.2", "resolve@^1.19.0", "resolve@^1.20.0", "resolve@^1.22.0", "resolve@^1.22.1": "integrity" "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==" "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz" "version" "1.22.1" @@ -11162,7 +11183,7 @@ dependencies: "node-forge" "^1" -"semver@^2.3.0 || 3.x || 4 || 5", "semver@~5.1.0", "semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@4 || 5": +"semver@^2.3.0 || 3.x || 4 || 5", "semver@~5.1.0", "semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5": "version" "5.1.0" "semver@^5.6.0": @@ -11200,6 +11221,9 @@ "semver@~5.3.0": "version" "5.3.0" +"semver@4 || 5": + "version" "5.7.1" + "semver@7.0.0": "integrity" "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" "resolved" "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"