diff --git a/client/build-storybook.log b/client/build-storybook.log new file mode 100644 index 00000000..589eabd9 --- /dev/null +++ b/client/build-storybook.log @@ -0,0 +1,481 @@ + +> client@0.1.0 build-storybook +> storybook build --output-dir /var/folders/qr/663ztf_s7jld7xx8wft33m0w0000gn/T/chromatic--4272-TJRLWLxRJ0Cl + +@storybook/cli v7.3.2 + +info => Cleaning outputDir: /var/folders/qr/663ztf_s7jld7xx8wft33m0w0000gn/T/chromatic--4272-TJRLWLxRJ0Cl +info => Loading presets +info Found existing addon "@storybook/addon-actions", skipping. +info Found existing addon "@storybook/addon-actions", skipping. +info => Building manager.. +info => Manager built (153 ms) +info => Compiling preview.. +info => Copying static files: /Users/hyerimkim/Documents/codestates/seb45_main_026/client/node_modules/@storybook/manager/static at /var/folders/qr/663ztf_s7jld7xx8wft33m0w0000gn/T/chromatic--4272-TJRLWLxRJ0Cl/sb-common-assets +info Addon-docs: using MDX2 +info => Loading Webpack configuration from `node_modules/react-scripts` +info => Removing existing JavaScript and TypeScript rules. +info => Modifying Create React App rules. +info => Using default Webpack5 setup + [webpack.Progress] 0% + + [webpack.Progress] 1% setup before run + [webpack.Progress] 1% setup before run NodeEnvironmentPlugin + [webpack.Progress] 1% setup before run + [webpack.Progress] 2% setup run + [webpack.Progress] 2% setup run ESLintWebpackPlugin_1 + [webpack.Progress] 2% setup run + [webpack.Progress] 4% setup normal module factory + [webpack.Progress] 4% setup normal module factory CaseSensitivePathsPlugin + [webpack.Progress] 4% setup normal module factory ModuleNotFoundPlugin + [webpack.Progress] 4% setup normal module factory IgnorePlugin + [webpack.Progress] 4% setup normal module factory + [webpack.Progress] 5% setup context module factory + [webpack.Progress] 5% setup context module factory IgnorePlugin + [webpack.Progress] 5% setup context module factory + [webpack.Progress] 6% setup before compile + [webpack.Progress] 6% setup before compile ProgressPlugin + [webpack.Progress] 6% setup before compile + [webpack.Progress] 7% setup compile + [webpack.Progress] 7% setup compile ExternalsPlugin + [webpack.Progress] 7% setup compile ExternalsPlugin + [webpack.Progress] 7% setup compile + [webpack.Progress] 8% setup compilation + [webpack.Progress] 8% setup compilation unplugin-csf + [webpack.Progress] 8% setup compilation mini-css-extract-plugin + [webpack.Progress] 8% setup compilation ArrayPushCallbackChunkFormatPlugin + [webpack.Progress] 8% setup compilation JsonpChunkLoadingPlugin + [webpack.Progress] 8% setup compilation StartupChunkDependenciesPlugin + [webpack.Progress] 8% setup compilation ImportScriptsChunkLoadingPlugin + [webpack.Progress] 8% setup compilation FetchCompileWasmPlugin + [webpack.Progress] 8% setup compilation FetchCompileAsyncWasmPlugin + [webpack.Progress] 8% setup compilation WorkerPlugin + [webpack.Progress] 8% setup compilation SplitChunksPlugin + [webpack.Progress] 8% setup compilation RuntimeChunkPlugin + [webpack.Progress] 8% setup compilation ResolverCachePlugin + [webpack.Progress] 8% setup compilation HtmlWebpackPlugin + [webpack.Progress] 8% setup compilation + [webpack.Progress] 9% setup compilation + [webpack.Progress] 9% setup compilation DefinePlugin + [webpack.Progress] 9% setup compilation ProvidePlugin + [webpack.Progress] 9% setup compilation ProgressPlugin + [webpack.Progress] 9% setup compilation InlineChunkHtmlPlugin + [webpack.Progress] 9% setup compilation InterpolateHtmlPlugin + [webpack.Progress] 9% setup compilation mini-css-extract-plugin + [webpack.Progress] 9% setup compilation DocGenPlugin + [webpack.Progress] 9% setup compilation ChunkPrefetchPreloadPlugin + [webpack.Progress] 9% setup compilation SourceMapDevToolPlugin + [webpack.Progress] 9% setup compilation JavascriptModulesPlugin + [webpack.Progress] 9% setup compilation JsonModulesPlugin + [webpack.Progress] 9% setup compilation AssetModulesPlugin + [webpack.Progress] 9% setup compilation EntryPlugin + [webpack.Progress] 9% setup compilation RuntimePlugin + [webpack.Progress] 9% setup compilation InferAsyncModulesPlugin + [webpack.Progress] 9% setup compilation DataUriPlugin + [webpack.Progress] 9% setup compilation FileUriPlugin + [webpack.Progress] 9% setup compilation CompatibilityPlugin + [webpack.Progress] 9% setup compilation HarmonyModulesPlugin + [webpack.Progress] 9% setup compilation AMDPlugin + [webpack.Progress] 9% setup compilation RequireJsStuffPlugin + [webpack.Progress] 9% setup compilation CommonJsPlugin + [webpack.Progress] 9% setup compilation LoaderPlugin + [webpack.Progress] 9% setup compilation LoaderPlugin + [webpack.Progress] 9% setup compilation NodeStuffPlugin + [webpack.Progress] 9% setup compilation APIPlugin + [webpack.Progress] 9% setup compilation ExportsInfoApiPlugin + [webpack.Progress] 9% setup compilation WebpackIsIncludedPlugin + [webpack.Progress] 9% setup compilation ConstPlugin + [webpack.Progress] 9% setup compilation UseStrictPlugin + [webpack.Progress] 9% setup compilation RequireIncludePlugin + [webpack.Progress] 9% setup compilation RequireEnsurePlugin + [webpack.Progress] 9% setup compilation RequireContextPlugin + [webpack.Progress] 9% setup compilation ImportPlugin + [webpack.Progress] 9% setup compilation ImportMetaContextPlugin + [webpack.Progress] 9% setup compilation SystemPlugin + [webpack.Progress] 9% setup compilation ImportMetaPlugin + [webpack.Progress] 9% setup compilation URLPlugin + [webpack.Progress] 9% setup compilation DefaultStatsFactoryPlugin + [webpack.Progress] 9% setup compilation DefaultStatsPresetPlugin + [webpack.Progress] 9% setup compilation DefaultStatsPrinterPlugin + [webpack.Progress] 9% setup compilation JavascriptMetaInfoPlugin + [webpack.Progress] 9% setup compilation EnsureChunkConditionsPlugin + [webpack.Progress] 9% setup compilation RemoveEmptyChunksPlugin + [webpack.Progress] 9% setup compilation MergeDuplicateChunksPlugin + [webpack.Progress] 9% setup compilation FlagIncludedChunksPlugin + [webpack.Progress] 9% setup compilation SideEffectsFlagPlugin + [webpack.Progress] 9% setup compilation FlagDependencyExportsPlugin + [webpack.Progress] 9% setup compilation FlagDependencyUsagePlugin + [webpack.Progress] 9% setup compilation InnerGraphPlugin + [webpack.Progress] 9% setup compilation MangleExportsPlugin + [webpack.Progress] 9% setup compilation ModuleConcatenationPlugin + [webpack.Progress] 9% setup compilation NoEmitOnErrorsPlugin + [webpack.Progress] 9% setup compilation RealContentHashPlugin + [webpack.Progress] 9% setup compilation WasmFinalizeExportsPlugin + [webpack.Progress] 9% setup compilation NamedModuleIdsPlugin + [webpack.Progress] 9% setup compilation DeterministicChunkIdsPlugin + [webpack.Progress] 9% setup compilation DefinePlugin + [webpack.Progress] 9% setup compilation TerserPlugin + [webpack.Progress] 9% setup compilation TemplatedPathPlugin + [webpack.Progress] 9% setup compilation RecordIdsPlugin + [webpack.Progress] 9% setup compilation WarnCaseSensitiveModulesPlugin + [webpack.Progress] 9% setup compilation IgnoreWarningsPlugin + [webpack.Progress] 9% setup compilation ESLintWebpackPlugin_1 + [webpack.Progress] 9% setup compilation + [webpack.Progress] 10% building + [webpack.Progress] 10% building 0/1 entries 0/0 dependencies 0/0 modules + [webpack.Progress] 20% building import loader ./node_modules/babel-loader/lib/index.js + [webpack.Progress] 20% building import loader ./node_modules/source-map-loader/dist/cjs.js + [webpack.Progress] 20% building 0/1 entries 11/39 dependencies 2/11 modules +info => Copying static files: /Users/hyerimkim/Documents/codestates/seb45_main_026/client/public at /var/folders/qr/663ztf_s7jld7xx8wft33m0w0000gn/T/chromatic--4272-TJRLWLxRJ0Cl/ + [webpack.Progress] 22% building import loader ./node_modules/@storybook/mdx2-csf/loader.js + [webpack.Progress] 22% building 0/1 entries 36/80 dependencies 6/27 modules + [webpack.Progress] 21% building import loader ./node_modules/unplugin/dist/webpack/loaders/load.js + [webpack.Progress] 21% building 0/1 entries 59/109 dependencies 8/39 modules + [webpack.Progress] 27% building import loader ./node_modules/mini-css-extract-plugin/dist/loader.js + [webpack.Progress] 27% building import loader ./node_modules/css-loader/dist/cjs.js + [webpack.Progress] 27% building import loader ./node_modules/postcss-loader/dist/cjs.js + [webpack.Progress] 27% building 0/1 entries 82/110 dependencies 19/61 modules + [webpack.Progress] 24% building import loader ./node_modules/@svgr/webpack/lib/index.js + [webpack.Progress] 24% building import loader ./node_modules/file-loader/dist/cjs.js + [webpack.Progress] 24% building 0/1 entries 106/138 dependencies 19/73 modules + [webpack.Progress] 31% building 0/1 entries 274/400 dependencies 60/157 modules + [webpack.Progress] 46% building 0/1 entries 1000/1033 dependencies 291/443 modules + [webpack.Progress] 65% building 1/1 entries 2371/2371 dependencies 917/917 modules + [webpack.Progress] 65% building + [webpack.Progress] 69% building finish + [webpack.Progress] 69% building finish + [webpack.Progress] 70% sealing finish module graph + [webpack.Progress] 70% sealing finish module graph ResolverCachePlugin + [webpack.Progress] 70% sealing finish module graph InferAsyncModulesPlugin + [webpack.Progress] 70% sealing finish module graph FlagDependencyExportsPlugin + [webpack.Progress] 70% sealing finish module graph InnerGraphPlugin + [webpack.Progress] 70% sealing finish module graph WasmFinalizeExportsPlugin + [webpack.Progress] 70% sealing finish module graph ESLintWebpackPlugin_1 + [webpack.Progress] 70% sealing finish module graph + [webpack.Progress] 70% sealing plugins + [webpack.Progress] 70% sealing plugins DocGenPlugin + [webpack.Progress] 70% sealing plugins WarnCaseSensitiveModulesPlugin + [webpack.Progress] 70% sealing plugins + [webpack.Progress] 71% sealing dependencies optimization + [webpack.Progress] 71% sealing dependencies optimization SideEffectsFlagPlugin + [webpack.Progress] 71% sealing dependencies optimization FlagDependencyUsagePlugin + [webpack.Progress] 71% sealing dependencies optimization + [webpack.Progress] 71% sealing after dependencies optimization + [webpack.Progress] 71% sealing after dependencies optimization + [webpack.Progress] 72% sealing chunk graph + [webpack.Progress] 72% sealing chunk graph + [webpack.Progress] 73% sealing after chunk graph + [webpack.Progress] 73% sealing after chunk graph + [webpack.Progress] 73% sealing optimizing + [webpack.Progress] 73% sealing optimizing + [webpack.Progress] 74% sealing module optimization + [webpack.Progress] 74% sealing module optimization + [webpack.Progress] 75% sealing after module optimization + [webpack.Progress] 75% sealing after module optimization + [webpack.Progress] 75% sealing chunk optimization + [webpack.Progress] 75% sealing chunk optimization EnsureChunkConditionsPlugin + [webpack.Progress] 75% sealing chunk optimization RemoveEmptyChunksPlugin + [webpack.Progress] 75% sealing chunk optimization MergeDuplicateChunksPlugin + [webpack.Progress] 75% sealing chunk optimization SplitChunksPlugin + [webpack.Progress] 75% sealing chunk optimization RemoveEmptyChunksPlugin + [webpack.Progress] 75% sealing chunk optimization + [webpack.Progress] 76% sealing after chunk optimization + [webpack.Progress] 76% sealing after chunk optimization + [webpack.Progress] 77% sealing module and chunk tree optimization + [webpack.Progress] 77% sealing module and chunk tree optimization PersistentChildCompilerSingletonPlugin + [webpack.Progress] 77% sealing module and chunk tree optimization + [webpack.Progress] 77% sealing after module and chunk tree optimization + [webpack.Progress] 77% sealing after module and chunk tree optimization + [webpack.Progress] 78% sealing chunk modules optimization + [webpack.Progress] 78% sealing chunk modules optimization ModuleConcatenationPlugin + [webpack.Progress] 78% sealing chunk modules optimization + [webpack.Progress] 78% sealing after chunk modules optimization + [webpack.Progress] 78% sealing after chunk modules optimization + [webpack.Progress] 79% sealing module reviving + [webpack.Progress] 79% sealing module reviving RecordIdsPlugin + [webpack.Progress] 79% sealing module reviving + [webpack.Progress] 80% sealing before module ids + [webpack.Progress] 80% sealing before module ids + [webpack.Progress] 80% sealing module ids + [webpack.Progress] 80% sealing module ids NamedModuleIdsPlugin + [webpack.Progress] 80% sealing module ids + [webpack.Progress] 81% sealing module id optimization + [webpack.Progress] 81% sealing module id optimization + [webpack.Progress] 82% sealing module id optimization + [webpack.Progress] 82% sealing module id optimization + [webpack.Progress] 82% sealing chunk reviving + [webpack.Progress] 82% sealing chunk reviving RecordIdsPlugin + [webpack.Progress] 82% sealing chunk reviving + [webpack.Progress] 83% sealing before chunk ids + [webpack.Progress] 83% sealing before chunk ids + [webpack.Progress] 84% sealing chunk ids + [webpack.Progress] 84% sealing chunk ids DeterministicChunkIdsPlugin + [webpack.Progress] 84% sealing chunk ids + [webpack.Progress] 84% sealing chunk id optimization + [webpack.Progress] 84% sealing chunk id optimization FlagIncludedChunksPlugin + [webpack.Progress] 84% sealing chunk id optimization + [webpack.Progress] 85% sealing after chunk id optimization + [webpack.Progress] 85% sealing after chunk id optimization + [webpack.Progress] 86% sealing record modules + [webpack.Progress] 86% sealing record modules RecordIdsPlugin + [webpack.Progress] 86% sealing record modules + [webpack.Progress] 86% sealing record chunks + [webpack.Progress] 86% sealing record chunks RecordIdsPlugin + [webpack.Progress] 86% sealing record chunks + [webpack.Progress] 87% sealing module hashing + [webpack.Progress] 87% sealing module hashing + [webpack.Progress] 87% sealing code generation + [webpack.Progress] 87% sealing code generation + [webpack.Progress] 88% sealing runtime requirements + [webpack.Progress] 88% sealing runtime requirements + [webpack.Progress] 89% sealing hashing + [webpack.Progress] 89% sealing hashing + [webpack.Progress] 89% sealing after hashing + [webpack.Progress] 89% sealing after hashing + [webpack.Progress] 90% sealing record hash + [webpack.Progress] 90% sealing record hash + [webpack.Progress] 91% sealing module assets processing + [webpack.Progress] 91% sealing module assets processing + [webpack.Progress] 91% sealing chunk assets processing + [webpack.Progress] 91% sealing chunk assets processing + [webpack.Progress] 92% sealing asset processing + [webpack.Progress] 92% sealing asset processing ESLintWebpackPlugin_1 + [webpack.Progress] 92% sealing asset processing PersistentChildCompilerSingletonPlugin + [webpack.Progress] 92% sealing asset processing TerserPlugin +One of your dependencies, babel-preset-react-app, is importing the +"@babel/plugin-proposal-private-property-in-object" package without +declaring it in its dependencies. This is currently working because +"@babel/plugin-proposal-private-property-in-object" is already in your +node_modules folder for unrelated reasons, but it may break at any time. + +babel-preset-react-app is part of the create-react-app project, which +is not maintianed anymore. It is thus unlikely that this bug will +ever be fixed. Add "@babel/plugin-proposal-private-property-in-object" to +your devDependencies to work around this error. This will make this message +go away. + + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/main.81d04a95.css generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/main.81d04a95.css generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin main.bf1185b6.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin main.bf1185b6.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin runtime~main.f75eb973.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin runtime~main.f75eb973.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin stories-Configure-mdx.5e05ecd8.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin stories-Configure-mdx.5e05ecd8.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-buttons-Buttons-stories.a910bb85.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-buttons-Buttons-stories.a910bb85.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-buttons-Checkbox-stories.8fae23b1.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-buttons-Checkbox-stories.8fae23b1.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-buttons-Toggle-stories.6c7754a7.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-buttons-Toggle-stories.6c7754a7.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-loading-Loading-stories.5aeb3907.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-loading-Loading-stories.5aeb3907.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-modal-ConfirmModal-stories.143cd39c.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-modal-ConfirmModal-stories.143cd39c.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-modal-Modal-stories.658b6fa8.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-modal-Modal-stories.658b6fa8.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-typographys-Typographys-stories.948c5410.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin atoms-typographys-Typographys-stories.948c5410.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Button-stories.4a867eda.chunk.css generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Button-stories.4a867eda.chunk.css generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin stories-Button-stories.b393db4c.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin stories-Button-stories.b393db4c.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Header-stories.519e766c.chunk.css generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Header-stories.519e766c.chunk.css generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin stories-Header-stories.583c0ae5.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin stories-Header-stories.583c0ae5.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Page-stories.419d359e.chunk.css generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Page-stories.419d359e.chunk.css generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin stories-Page-stories.1a3fed24.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin stories-Page-stories.1a3fed24.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 328.7374f406.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 328.7374f406.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 729.18d957e1.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 729.18d957e1.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 744.5fbdac06.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 744.5fbdac06.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 77.85e8ae4d.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 77.85e8ae4d.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 238.b171eab4.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 238.b171eab4.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 760.f2a5f513.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 760.f2a5f513.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 253.3721c141.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 253.3721c141.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 699.c241357f.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 699.c241357f.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 693.1cda5861.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 693.1cda5861.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 213.00ef82ab.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 213.00ef82ab.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 983.bb0386ee.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 983.bb0386ee.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 355.8a20a4d1.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 355.8a20a4d1.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 622.8581fe5f.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 622.8581fe5f.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 613.c3f98354.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 613.c3f98354.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 615.0b834962.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 615.0b834962.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 966.3b96dd3c.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 966.3b96dd3c.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 652.62ae8f28.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 652.62ae8f28.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 434.38498518.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 434.38498518.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 433.1fc3cd3f.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 433.1fc3cd3f.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 131.99bfcac0.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 131.99bfcac0.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 367.1addc190.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 367.1addc190.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 946.6a6b049a.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 946.6a6b049a.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 765.f9d3a76d.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 765.f9d3a76d.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin resolve sources + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/main.81d04a95.css attach SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/main.81d04a95.css attached SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Button-stories.4a867eda.chunk.css attach SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Button-stories.4a867eda.chunk.css attached SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Header-stories.519e766c.chunk.css attach SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Header-stories.519e766c.chunk.css attached SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Page-stories.419d359e.chunk.css attach SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin static/css/stories-Page-stories.419d359e.chunk.css attached SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 77.85e8ae4d.iframe.bundle.js attach SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 77.85e8ae4d.iframe.bundle.js attached SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 367.1addc190.iframe.bundle.js attach SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 367.1addc190.iframe.bundle.js attached SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 946.6a6b049a.iframe.bundle.js attach SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 946.6a6b049a.iframe.bundle.js attached SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 765.f9d3a76d.iframe.bundle.js attach SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin 765.f9d3a76d.iframe.bundle.js attached SourceMap + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin resolve sources + [webpack.Progress] 92% sealing asset processing SourceMapDevToolPlugin + [webpack.Progress] 92% sealing asset processing HtmlWebpackPlugin + [webpack.Progress] 92% sealing asset processing HtmlWebpackPlugin + [webpack.Progress] 92% sealing asset processing HtmlWebpackPlugin resolve sources + [webpack.Progress] 92% sealing asset processing HtmlWebpackPlugin + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin main.d5cc95ab.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin main.d5cc95ab.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin runtime~main.32b78a64.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin runtime~main.32b78a64.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin stories-Configure-mdx.044307fe.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin stories-Configure-mdx.044307fe.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-buttons-Buttons-stories.09e229d7.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-buttons-Buttons-stories.09e229d7.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-buttons-Checkbox-stories.2b77ec1c.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-buttons-Checkbox-stories.2b77ec1c.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-buttons-Toggle-stories.eea5f9d5.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-buttons-Toggle-stories.eea5f9d5.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-loading-Loading-stories.8d6a6d0d.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-loading-Loading-stories.8d6a6d0d.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-modal-ConfirmModal-stories.436a38a0.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-modal-ConfirmModal-stories.436a38a0.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-modal-Modal-stories.b227c8a1.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-modal-Modal-stories.b227c8a1.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-typographys-Typographys-stories.fbba3f39.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin atoms-typographys-Typographys-stories.fbba3f39.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin stories-Button-stories.57be70fa.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin stories-Button-stories.57be70fa.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin stories-Header-stories.6307af3c.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin stories-Header-stories.6307af3c.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin stories-Page-stories.1d18b17a.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin stories-Page-stories.1d18b17a.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 328.3909b22c.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 328.3909b22c.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 729.1afb8b9c.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 729.1afb8b9c.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 744.e49201e6.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 744.e49201e6.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 238.3d1ec06f.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 238.3d1ec06f.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 760.951795f1.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 760.951795f1.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 253.62180cc1.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 253.62180cc1.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 699.2ad300a8.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 699.2ad300a8.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 693.214f5a00.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 693.214f5a00.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 213.c91e88ef.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 213.c91e88ef.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 983.b3d0d9dd.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 983.b3d0d9dd.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 355.646121ec.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 355.646121ec.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 622.743d9a76.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 622.743d9a76.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 613.2db1d7cd.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 613.2db1d7cd.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 615.a7feaa88.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 615.a7feaa88.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 966.2268c07e.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 966.2268c07e.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 652.d23c736b.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 652.d23c736b.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 434.8169ff60.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 434.8169ff60.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 433.ea069299.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 433.ea069299.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 131.00fac6d8.iframe.bundle.js generate SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin 131.00fac6d8.iframe.bundle.js generated SourceMap + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin resolve sources + [webpack.Progress] 92% sealing asset processing RealContentHashPlugin + [webpack.Progress] 92% sealing asset processing + [webpack.Progress] 93% sealing after asset optimization + [webpack.Progress] 93% sealing after asset optimization + [webpack.Progress] 93% sealing recording + [webpack.Progress] 93% sealing recording + [webpack.Progress] 94% sealing after seal + [webpack.Progress] 94% sealing after seal + [webpack.Progress] 95% emitting emit + [webpack.Progress] 95% emitting emit + [webpack.Progress] 98% emitting after emit + [webpack.Progress] 98% emitting after emit SizeLimitsPlugin + [webpack.Progress] 98% emitting after emit + [webpack.Progress] 99% done plugins + [webpack.Progress] 99% done plugins CaseSensitivePathsPlugin + [webpack.Progress] 99% done plugins + [webpack.Progress] 99% + + [webpack.Progress] 99% cache store build dependencies + [webpack.Progress] 99% cache store build dependencies + [webpack.Progress] 99% cache begin idle + [webpack.Progress] 99% cache begin idle + [webpack.Progress] 100% + +info => Preview built (8.3 s) +WARN [eslint] +WARN src/atoms/typographys/Typographys.js +WARN Line 1:8: 'React' is defined but never used no-unused-vars +WARN +WARN +WARN asset size limit: The following asset(s) exceed the recommended size limit (244 KiB). +WARN This can impact web performance. +WARN Assets: +WARN 7a58d2cb9a6358f85e9b.png (456 KiB) +WARN 77.6d669cf2.iframe.bundle.js (583 KiB) +WARN 367.adaaa1ea.iframe.bundle.js (907 KiB) +WARN 946.396b2675.iframe.bundle.js (450 KiB) +WARN 765.825ff9ff.iframe.bundle.js (935 KiB) +WARN entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (244 KiB). This can impact web performance. +WARN Entrypoints: +WARN main (963 KiB) +WARN runtime~main.32b78a64.iframe.bundle.js +WARN 765.825ff9ff.iframe.bundle.js +WARN main.d5cc95ab.iframe.bundle.js +WARN static/css/main.6c9b7770.css +WARN + [webpack.Progress] 99% cache shutdown + [webpack.Progress] 99% cache shutdown + [webpack.Progress] 100% + +info => Output directory: /var/folders/qr/663ztf_s7jld7xx8wft33m0w0000gn/T/chromatic--4272-TJRLWLxRJ0Cl diff --git a/client/package-lock.json b/client/package-lock.json index c678ea80..9954151b 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -44,6 +44,7 @@ "@storybook/react-webpack5": "^7.3.2", "@storybook/testing-library": "^0.2.0", "babel-plugin-named-exports-order": "^0.0.2", + "chromatic": "^7.2.0", "eslint-plugin-storybook": "^0.6.13", "prop-types": "^15.8.1", "storybook": "^7.3.2", @@ -11214,6 +11215,17 @@ "node": ">=10" } }, + "node_modules/chromatic": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-7.2.0.tgz", + "integrity": "sha512-EbuvmsM6XAVFC4EQpqR2AT2PaXY4IS8qWxxg6N10AhpRulfX2b2AtW1hUc88cCosRyztd6esxkBdj3FSKR7zVw==", + "dev": true, + "bin": { + "chroma": "dist/bin.js", + "chromatic": "dist/bin.js", + "chromatic-cli": "dist/bin.js" + } + }, "node_modules/chrome-trace-event": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", diff --git a/client/package.json b/client/package.json index fa4cd992..6295d9f5 100644 --- a/client/package.json +++ b/client/package.json @@ -32,7 +32,8 @@ "test": "react-scripts test", "eject": "react-scripts eject", "storybook": "storybook dev -p 6006", - "build-storybook": "storybook build" + "build-storybook": "storybook build", + "chromatic": "npx chromatic --project-token=chpt_0323dbd0cc46e9a" }, "eslintConfig": { "extends": [ @@ -66,9 +67,12 @@ "@storybook/react-webpack5": "^7.3.2", "@storybook/testing-library": "^0.2.0", "babel-plugin-named-exports-order": "^0.0.2", + "chromatic": "^7.2.0", "eslint-plugin-storybook": "^0.6.13", "prop-types": "^15.8.1", "storybook": "^7.3.2", "webpack": "^5.88.2" - } + }, + "readme": "ERROR: No README data found!", + "_id": "client@0.1.0" } diff --git a/client/src/App.js b/client/src/App.js index ff4486e0..f2d193e6 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -32,6 +32,7 @@ import RewardPage from "./pages/userInfo/RewardPage"; import ReceiptPage from "./pages/userInfo/ReceiptPage"; import WatchedListPage from "./pages/contents/WatchedListPage"; import ResultPage from "./pages/contents/ResultPage"; +import IncomePage from "./pages/userInfo/IncomePage"; function App() { const dispatch = useDispatch(); @@ -111,6 +112,7 @@ function App() { } /> } /> } /> + } /> } /> } /> diff --git a/client/src/components/receiptPage/ReceiptItem.js b/client/src/components/receiptPage/ReceiptItem.js index 8e639370..0935b767 100644 --- a/client/src/components/receiptPage/ReceiptItem.js +++ b/client/src/components/receiptPage/ReceiptItem.js @@ -3,24 +3,67 @@ import { useSelector } from 'react-redux'; import { IconButtonContainer, IconButtonImg } from '../../atoms/buttons/IconButtons'; import arrowDown from '../../assets/images/icons/arrow/subscribe_arrow_down.svg'; import arrowUp from '../../assets/images/icons/arrow/subscribe_arrow_up.svg'; -import { ReceiptAmountTypo, ReceiptGrayTypo, ReceiptItemContainer, ReceiptStatusTypo, ReceiptTitleTypo } from './ReceiptItem.style'; +import { ReceiptAmountTypo, ReceiptCancelButton, ReceiptGrayTypo, ReceiptItemContainer, ReceiptStatusTypo, ReceiptTitleTypo } from './ReceiptItem.style'; import ReceiptArcodian from './ReceiptArcodian'; +import { cancelWholePurchaseService } from '../../services/receiptServices'; +import { AlertModal } from '../../atoms/modal/Modal' +import { useToken } from '../../hooks/useToken'; const ReceiptItem = ({item}) => { + const refreshToken = useToken(); const isDark = useSelector(state=>state.uiSetting.isDark); + const accessTokens = useSelector(state=>state.loginInfo.accessToken); let createDate = item.createdDate; let createDay = createDate.split('T')[0]; let createTime = createDate.split('T')[1]; const titleName = `${item.orderVideos[0].videoName} 외 ${item.orderCount-1}개`; const amount = item.amount; const [ isAcordianOpen, setIsAcordianOpen ] = useState(false); - console.log(item) + const [ is결제취소성공팝업, setIs결제취소성공팝업 ] = useState(false); + const [ is결제취소실패팝업, setIs결제취소실패팝업 ] = useState(false); + const [ 결제취소실패content, set결제취소실패content ] = useState(''); + const handleArcodianButtonClick = () => { setIsAcordianOpen(!isAcordianOpen); } + //결제 취소 버튼 선택시 동작 + const handleCancelButtonClick = async () => { + const response = await cancelWholePurchaseService( + accessTokens.authorization, + item.orderId + ); + if(response.status==='success') { + setIs결제취소성공팝업(true); + } else if(response.data==='만료된 토큰입니다.') { + refreshToken(handleCancelButtonClick); + } else{ + set결제취소실패content(response.data); + setIs결제취소실패팝업(true); + } + } return ( <> + { setIs결제취소실패팝업(false) }}/> + { + setIsModalOpen(false); + window.location.reload(); + }} + isBackdropClickClose={true} + content='결제 취소되었습니다.' + buttonTitle='확인' + handleButtonClick={()=>{ + setIs결제취소성공팝업(false); + window.location.reload(); + }}/> {`${createDay} ${createTime}`} @@ -39,7 +82,13 @@ const ReceiptItem = ({item}) => { - } + } + { item.orderStatus==='COMPLETED' && + + 결제취소 + } { isAcordianOpen && } diff --git a/client/src/components/receiptPage/ReceiptItem.style.js b/client/src/components/receiptPage/ReceiptItem.style.js index ed09d872..4502f873 100644 --- a/client/src/components/receiptPage/ReceiptItem.style.js +++ b/client/src/components/receiptPage/ReceiptItem.style.js @@ -1,6 +1,7 @@ import { styled } from 'styled-components'; import tokens from '../../styles/tokens.json'; import { BodyTextTypo } from '../../atoms/typographys/Typographys'; +import { NegativeTextButton } from '../../atoms/buttons/Buttons'; const globalTokens = tokens.global; @@ -29,4 +30,7 @@ export const ReceiptStatusTypo = styled(BodyTextTypo)` width: 150px; color: ${props=>props.isDark?globalTokens.LightGray.value:globalTokens.Gray.value}; text-align: center; +` +export const ReceiptCancelButton = styled(NegativeTextButton)` + width: 100px; ` \ No newline at end of file diff --git a/client/src/components/rewardPage/RewardCategory.js b/client/src/components/rewardPage/RewardCategory.js index b640d3d5..1b10caf9 100644 --- a/client/src/components/rewardPage/RewardCategory.js +++ b/client/src/components/rewardPage/RewardCategory.js @@ -53,6 +53,12 @@ const RewardCategory = ({category}) => { onClick={()=>{ navigate('/activity/receipt') }}> 결제 내역 + { navigate('/activity/income') }}> + 정산 내역 + ); diff --git a/client/src/pages/userInfo/IncomePage.js b/client/src/pages/userInfo/IncomePage.js new file mode 100644 index 00000000..bc9bcde8 --- /dev/null +++ b/client/src/pages/userInfo/IncomePage.js @@ -0,0 +1,34 @@ +import React, { useState } from 'react'; +import { useSelector } from 'react-redux'; +import { useToken } from '../../hooks/useToken'; +import { useInView } from 'react-intersection-observer'; +import { PageContainer } from '../../atoms/layouts/PageContainer'; +import { ContentNothing, RewardContentContainer, RewardMainContainer, RewardTitle } from './RewardPage'; +import RewardCategory from '../../components/rewardPage/RewardCategory'; + +const IncomePage = () => { + const isDark = useSelector(state=>state.uiSetting.isDark); + const accessToken = useSelector(state=>state.loginInfo.accessToken); + const refreshToken = useToken(); + const [ incomeList, setIncomeList ] = useState([]); + const [ page, setPage ] = useState(1); + const [ maxPage, setMaxPage ] = useState(10); + const [ month, setMonth ] = useState(1); + const [ loading, setLoading ] = useState(true); + const [ ref, inView ] = useInView(); + + return ( + + + 나의 활동 + + + { incomeList.length===0 && + 정산 내역이 없습니다. } + + + + ); +}; + +export default IncomePage; \ No newline at end of file diff --git a/client/src/pages/userInfo/ReceiptPage.js b/client/src/pages/userInfo/ReceiptPage.js index a4916a3d..98e8fedf 100644 --- a/client/src/pages/userInfo/ReceiptPage.js +++ b/client/src/pages/userInfo/ReceiptPage.js @@ -20,8 +20,8 @@ const ReceiptPage = () => { const accessToken = useSelector(state=>state.loginInfo.accessToken); const refreshToken = useToken(); const [ receiptList, setReceiptList ] = useState([]); - let [ page, setPage ] = useState(1); - let [ maxPage, setMaxPage ] = useState(10); + const [ page, setPage ] = useState(1); + const [ maxPage, setMaxPage ] = useState(10); const [ month, setMonth ] = useState(1); const [ loading, setLoading ] = useState(true); const [ ref, inView ] = useInView(); diff --git a/client/src/services/receiptServices.js b/client/src/services/receiptServices.js index e18d8bc2..e22f48be 100644 --- a/client/src/services/receiptServices.js +++ b/client/src/services/receiptServices.js @@ -47,4 +47,26 @@ export const cancelOnePurchaseService = async (authorization, orderId, videoId) data: err.response.data.message } } +} +//결제 전체 취소 +export const cancelWholePurchaseService = async (authorization, orderId) => { + try { + const response = await axios.delete( + `${ROOT_URL}/orders/${orderId}`, + { + headers: { + Authorization: authorization + } + } + ); + return { + status: 'success', + data: response.data, + } + } catch (err) { + return { + status: 'error', + data: err.response.data.message, + } + } } \ No newline at end of file