From 73584167886d19aac1d0f0868884ff4fa086c4c5 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Wed, 3 Jan 2024 14:41:53 +0900 Subject: [PATCH 001/653] =?UTF-8?q?chore:=20=EC=8A=A4=ED=83=80=EC=9D=BC?= =?UTF-8?q?=EB=A6=B0=ED=8A=B8=EA=B4=80=EB=A0=A8=20=EC=9D=98=EC=A1=B4?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80=20=EC=84=A4=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 + yarn.lock | 507 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 500 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index cbafd0bf..e316cb82 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", "eslint-plugin-react": "^7.33.2", + "postcss-styled-syntax": "^0.6.3", "prettier": "^3.1.1", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -31,6 +32,9 @@ "eslint-plugin-react-refresh": "^0.4.5", "eslint-plugin-simple-import-sort": "^10.0.0", "husky": "^8.0.3", + "stylelint": "^16.1.0", + "stylelint-config-standard": "^36.0.0", + "stylelint-order": "^6.0.4", "typescript": "^5.2.2", "vite": "^5.0.8" } diff --git a/yarn.lock b/yarn.lock index 9b8a18f6..6e21dcb7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -220,6 +220,26 @@ "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" +"@csstools/css-parser-algorithms@^2.4.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.5.0.tgz#0c03cd5418a9f404a05ff2ffcb1b69d04e8ec532" + integrity sha512-abypo6m9re3clXA00eu5syw+oaPHbJTPapu9C4pzNsJ4hdZDzushT50Zhu+iIYXgEe1CxnRMn7ngsbV+MLrlpQ== + +"@csstools/css-tokenizer@^2.2.2": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.3.tgz#b099d543ea57b64f495915a095ead583866c50c6" + integrity sha512-pp//EvZ9dUmGuGtG1p+n17gTHEOqu9jO+FiCUjNN3BDmyhdA2Jq9QsVeR7K8/2QCK17HSsioPlTW9ZkzoWb3Lg== + +"@csstools/media-query-list-parser@^2.1.6": + version "2.1.7" + resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.7.tgz#a4836e3dbd693081a30b32ce9c2a781e1be16788" + integrity sha512-lHPKJDkPUECsyAvD60joYfDmp8UERYxHGkFfyLJFTVK/ERJe0sVlIFLXU5XFxdjNDTerp5L4KeaKG+Z5S94qxQ== + +"@csstools/selector-specificity@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.1.tgz#d84597fbc0f897240c12fc0a31e492b036c70e40" + integrity sha512-NPljRHkq4a14YzZ3YD406uaxh7s0g6eAq3L9aLOWywoqe8PkYamAvtsh7KNX6c++ihDrJ0RiU+/z7rGnhlZ5ww== + "@emotion/babel-plugin@^11.11.0": version "11.11.0" resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c" @@ -493,6 +513,18 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" @@ -546,6 +578,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + "@remix-run/router@1.14.1": version "1.14.1" resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.14.1.tgz#6d2dd03d52e604279c38911afc1079d58c50a755" @@ -909,11 +946,26 @@ ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.1: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -921,13 +973,18 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.1.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -1001,6 +1058,11 @@ arraybuffer.prototype.slice@^1.0.2: is-array-buffer "^3.0.2" is-shared-array-buffer "^1.0.2" +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + asynciterator.prototype@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62" @@ -1027,6 +1089,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +balanced-match@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" + integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== + big-integer@^1.6.16: version "1.6.52" resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85" @@ -1143,6 +1210,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +colord@^2.9.3: + version "2.9.3" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" + integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -1179,7 +1251,17 @@ cosmiconfig@^8.1.3: parse-json "^5.2.0" path-type "^4.0.0" -cross-spawn@^7.0.2: +cosmiconfig@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d" + integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg== + dependencies: + env-paths "^2.2.1" + import-fresh "^3.3.0" + js-yaml "^4.1.0" + parse-json "^5.2.0" + +cross-spawn@^7.0.0, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1188,6 +1270,24 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" +css-functions-list@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.1.tgz#2eb205d8ce9f9ce74c5c1d7490b66b77c45ce3ea" + integrity sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ== + +css-tree@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" + integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== + dependencies: + mdn-data "2.0.30" + source-map-js "^1.0.1" + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + csstype@^3.0.2: version "3.1.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" @@ -1257,16 +1357,36 @@ dot-case@^3.0.4: no-case "^3.0.4" tslib "^2.0.3" +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + electron-to-chromium@^1.4.601: version "1.4.616" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.616.tgz#4bddbc2c76e1e9dbf449ecd5da3d8119826ea4fb" integrity sha512-1n7zWYh8eS0L9Uy+GskE0lkBUNK83cXTVJI0pU3mGprFsbfSdAc15VTFbo+A+Bq4pwstmL30AVcEU3Fo463lNg== +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + entities@^4.4.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== +env-paths@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -1545,7 +1665,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.2.9: +fast-glob@^3.2.9, fast-glob@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -1566,6 +1686,11 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== +fastest-levenshtein@^1.0.16: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + fastq@^1.6.0: version "1.16.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.16.0.tgz#83b9a9375692db77a822df081edb6a9cf6839320" @@ -1580,6 +1705,13 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +file-entry-cache@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f" + integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ== + dependencies: + flat-cache "^4.0.0" + fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -1609,6 +1741,15 @@ flat-cache@^3.0.4: keyv "^4.5.3" rimraf "^3.0.2" +flat-cache@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.0.tgz#d12437636f83bb8a12b8f300c36fd1614e1c7224" + integrity sha512-EryKbCE/wxpxKniQlyas6PY1I9vwtF3uCBweX+N8KYTCn3Y12RTGtQAJ/bd5pl7kxUAc8v/R3Ake/N17OZiFqA== + dependencies: + flatted "^3.2.9" + keyv "^4.5.4" + rimraf "^5.0.5" + flatted@^3.2.9: version "3.2.9" resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" @@ -1621,6 +1762,14 @@ for-each@^0.3.3: dependencies: is-callable "^1.1.3" +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -1688,6 +1837,17 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" +glob@^10.3.7: + version "10.3.10" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + glob@^7.1.3: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -1700,6 +1860,22 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +global-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== + dependencies: + global-prefix "^3.0.0" + +global-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== + dependencies: + ini "^1.3.5" + kind-of "^6.0.2" + which "^1.3.1" + globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -1731,6 +1907,11 @@ globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" +globjoin@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" + integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg== + gopd@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" @@ -1796,12 +1977,17 @@ hoist-non-react-statics@^3.3.1: dependencies: react-is "^16.7.0" +html-tags@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce" + integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ== + husky@^8.0.3: version "8.0.3" resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg== -ignore@^5.2.0, ignore@^5.2.4: +ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== @@ -1832,6 +2018,11 @@ inherits@2: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +ini@^1.3.5: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + internal-slot@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" @@ -1908,6 +2099,11 @@ is-finalizationregistry@^1.0.2: dependencies: call-bind "^1.0.2" +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + is-generator-function@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" @@ -1949,6 +2145,11 @@ is-path-inside@^3.0.3: resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -2031,6 +2232,15 @@ iterator.prototype@^1.1.2: reflect.getprototypeof "^1.0.4" set-function-name "^2.0.1" +jackspeak@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + js-sha3@0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" @@ -2068,6 +2278,11 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" @@ -2088,13 +2303,23 @@ json5@^2.2.3: object.assign "^4.1.4" object.values "^1.1.6" -keyv@^4.5.3: +keyv@^4.5.3, keyv@^4.5.4: version "4.5.4" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== dependencies: json-buffer "3.0.1" +kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +known-css-properties@^0.29.0: + version "0.29.0" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.29.0.tgz#e8ba024fb03886f23cb882e806929f32d814158f" + integrity sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ== + levn@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" @@ -2120,6 +2345,11 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== + loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -2148,6 +2378,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +"lru-cache@^9.1.1 || ^10.0.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484" + integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag== + match-sorter@^6.0.2: version "6.3.1" resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.1.tgz#98cc37fda756093424ddf3cbc62bfe9c75b92bda" @@ -2156,12 +2391,27 @@ match-sorter@^6.0.2: "@babel/runtime" "^7.12.5" remove-accents "0.4.2" +mathml-tag-names@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" + integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== + +mdn-data@2.0.30: + version "2.0.30" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" + integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== + +meow@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-13.0.0.tgz#123daf9c2c3afa59c55c4c163d973848a448ff02" + integrity sha512-4Hu+75Vo7EOR+8C9RmkabfLijuwd9SrzQ8f0SyC4qZZwU6BlxeOt5ulF3PGCpcMJX4hI+ktpJhea0P6PN1RiWw== + merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -micromatch@^4.0.4: +micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -2174,7 +2424,7 @@ microseconds@0.2.0: resolved "https://registry.yarnpkg.com/microseconds/-/microseconds-0.2.0.tgz#233b25f50c62a65d861f978a4a4f8ec18797dc39" integrity sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA== -minimatch@9.0.3: +minimatch@9.0.3, minimatch@^9.0.1: version "9.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== @@ -2188,6 +2438,11 @@ minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -2223,6 +2478,11 @@ node-releases@^2.0.14: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -2358,6 +2618,14 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +path-scurry@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== + dependencies: + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -2373,6 +2641,41 @@ picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +postcss-resolve-nested-selector@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" + integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw== + +postcss-safe-parser@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz#6273d4e5149e286db5a45bc6cf6eafcad464014a" + integrity sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg== + +postcss-selector-parser@^6.0.13: + version "6.0.15" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535" + integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-sorting@^8.0.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-8.0.2.tgz#6393385ece272baf74bee9820fb1b58098e4eeca" + integrity sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q== + +postcss-styled-syntax@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/postcss-styled-syntax/-/postcss-styled-syntax-0.6.3.tgz#9c7d646c11348e857cc3270294df471837fd9585" + integrity sha512-woEkwRaHWnVOVjToQKeQkRYasTwa3WY+0A7hcY0HmiBw458nxmWFbt7+XMvuGWwB4VYjNqeWYNr04Hx9/GVTpA== + dependencies: + typescript "^5.3.3" + +postcss-value-parser@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== + postcss@^8.4.32: version "8.4.32" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.32.tgz#1dac6ac51ab19adb21b8b34fd2d93a86440ef6c9" @@ -2491,11 +2794,21 @@ remove-accents@0.4.2: resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5" integrity sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA== +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + resolve@^1.19.0: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" @@ -2526,6 +2839,13 @@ rimraf@3.0.2, rimraf@^3.0.2: dependencies: glob "^7.1.3" +rimraf@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf" + integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A== + dependencies: + glob "^10.3.7" + rollup@^4.2.0: version "4.9.2" resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.9.2.tgz#19d730219b7ec5f51372c6cf15cfb841990489fe" @@ -2631,11 +2951,25 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + snake-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c" @@ -2644,7 +2978,7 @@ snake-case@^3.0.4: dot-case "^3.0.4" tslib "^2.0.3" -source-map-js@^1.0.2: +source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -2654,6 +2988,24 @@ source-map@^0.5.7: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + string.prototype.matchall@^4.0.8: version "4.0.10" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100" @@ -2696,18 +3048,89 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" +strip-ansi@^7.0.1, strip-ansi@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +stylelint-config-recommended@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-14.0.0.tgz#b395c7014838d2aaca1755eebd914d0bb5274994" + integrity sha512-jSkx290CglS8StmrLp2TxAppIajzIBZKYm3IxT89Kg6fGlxbPiTiyH9PS5YUuVAFwaJLl1ikiXX0QWjI0jmgZQ== + +stylelint-config-standard@^36.0.0: + version "36.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-36.0.0.tgz#6704c044d611edc12692d4a5e37b039a441604d4" + integrity sha512-3Kjyq4d62bYFp/Aq8PMKDwlgUyPU4nacXsjDLWJdNPRUgpuxALu1KnlAHIj36cdtxViVhXexZij65yM0uNIHug== + dependencies: + stylelint-config-recommended "^14.0.0" + +stylelint-order@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-6.0.4.tgz#3e80d876c61a98d2640de181433686f24284748b" + integrity sha512-0UuKo4+s1hgQ/uAxlYU4h0o0HS4NiQDud0NAUNI0aa8FJdmYHA5ZZTFHiV5FpmE3071e9pZx5j0QpVJW5zOCUA== + dependencies: + postcss "^8.4.32" + postcss-sorting "^8.0.2" + +stylelint@^16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.1.0.tgz#d289c36b0dd344a65c55897d636b3b8b213dc908" + integrity sha512-Sh1rRV0lN1qxz/QsuuooLWsIZ/ona7NKw/fRZd6y6PyXYdD2W0EAzJ8yJcwSx4Iw/muz0CF09VZ+z4EiTAcKmg== + dependencies: + "@csstools/css-parser-algorithms" "^2.4.0" + "@csstools/css-tokenizer" "^2.2.2" + "@csstools/media-query-list-parser" "^2.1.6" + "@csstools/selector-specificity" "^3.0.1" + balanced-match "^2.0.0" + colord "^2.9.3" + cosmiconfig "^9.0.0" + css-functions-list "^3.2.1" + css-tree "^2.3.1" + debug "^4.3.4" + fast-glob "^3.3.2" + fastest-levenshtein "^1.0.16" + file-entry-cache "^8.0.0" + global-modules "^2.0.0" + globby "^11.1.0" + globjoin "^0.1.4" + html-tags "^3.3.1" + ignore "^5.3.0" + imurmurhash "^0.1.4" + is-plain-object "^5.0.0" + known-css-properties "^0.29.0" + mathml-tag-names "^2.1.3" + meow "^13.0.0" + micromatch "^4.0.5" + normalize-path "^3.0.0" + picocolors "^1.0.0" + postcss "^8.4.32" + postcss-resolve-nested-selector "^0.1.1" + postcss-safe-parser "^7.0.0" + postcss-selector-parser "^6.0.13" + postcss-value-parser "^4.2.0" + resolve-from "^5.0.0" + string-width "^4.2.3" + strip-ansi "^7.1.0" + supports-hyperlinks "^3.0.0" + svg-tags "^1.0.0" + table "^6.8.1" + write-file-atomic "^5.0.1" + stylis@4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51" @@ -2720,13 +3143,21 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: +supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" +supports-hyperlinks@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz#c711352a5c89070779b4dad54c05a2f14b15c94b" + integrity sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -2737,6 +3168,22 @@ svg-parser@^2.0.4: resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA== + +table@^6.8.1: + version "6.8.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" + integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -2815,7 +3262,7 @@ typed-array-length@^1.0.4: for-each "^0.3.3" is-typed-array "^1.1.9" -typescript@^5.2.2: +typescript@^5.2.2, typescript@^5.3.3: version "5.3.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== @@ -2853,6 +3300,11 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +util-deprecate@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + vite-plugin-svgr@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/vite-plugin-svgr/-/vite-plugin-svgr-4.2.0.tgz#9f3bf5206b0ec510287e56d16f1915e729bb4e6b" @@ -2923,6 +3375,13 @@ which-typed-array@^1.1.11, which-typed-array@^1.1.13, which-typed-array@^1.1.9: gopd "^1.0.1" has-tostringtag "^1.0.0" +which@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -2930,11 +3389,37 @@ which@^2.0.1: dependencies: isexe "^2.0.0" +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== +write-file-atomic@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7" + integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== + dependencies: + imurmurhash "^0.1.4" + signal-exit "^4.0.1" + yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" From 0a428a7d2363034d5dfe9c97e7d28964c63dd85b Mon Sep 17 00:00:00 2001 From: eunbeann Date: Wed, 3 Jan 2024 14:42:25 +0900 Subject: [PATCH 002/653] =?UTF-8?q?feat:=20Button=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=A0=9C=EC=9E=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Button/Button.style.ts | 19 +++++++++++++ src/components/common/Button/index.tsx | 28 ++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/components/common/Button/Button.style.ts create mode 100644 src/components/common/Button/index.tsx diff --git a/src/components/common/Button/Button.style.ts b/src/components/common/Button/Button.style.ts new file mode 100644 index 00000000..bdd4a9b3 --- /dev/null +++ b/src/components/common/Button/Button.style.ts @@ -0,0 +1,19 @@ +import styled from '@emotion/styled'; + +export type ButtonStyle = 'choose' | 'complete'; + +export const CustomButton = styled.button<{ variant: ButtonStyle }>` + width: 34.4rem; + height: 6rem; + border-radius: 0.625rem; + + background-color: ${({ theme, variant }) => + variant === 'choose' ? theme.colors.key : theme.colors.BG}; + + ${({ theme }) => theme.fonts.Head2_SB_18}; + color: ${({ theme }) => theme.colors.white}; + + :disabled { + background-color: ${({ theme }) => theme.colors.MG}; + } +`; diff --git a/src/components/common/Button/index.tsx b/src/components/common/Button/index.tsx new file mode 100644 index 00000000..b98ee569 --- /dev/null +++ b/src/components/common/Button/index.tsx @@ -0,0 +1,28 @@ +import { ButtonHTMLAttributes, ReactNode } from 'react'; + +import * as S from './Button.style'; + +export interface ButtonProps + extends Pick< + ButtonHTMLAttributes, + 'type' | 'disabled' | 'onClick' + > { + variant: S.ButtonStyle; + children: ReactNode; +} + +function Button(props: ButtonProps) { + const { children, onClick, disabled, variant } = props; + return ( + + {children} + + ); +} + +export default Button; From c8f981d2a6893975d1ccc27f94edf4020dd44fe6 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Wed, 3 Jan 2024 17:38:30 +0900 Subject: [PATCH 003/653] =?UTF-8?q?chore:=20stylelint=20=EC=86=8D=EC=84=B1?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .stylelintrc.json | 59 ++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/.stylelintrc.json b/.stylelintrc.json index 2aa0c545..e67f227e 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -15,22 +15,30 @@ } ], "order/order": ["custom-properties", "declarations"], - "order/properties-order": [ { "groupName": "Layout", + "emptyLineBefore": "always", "noEmptyLineBetween": true, "properties": [ "display", - "visibility", - "overflow", - "float", - "clear", + "justify-content", + "align-items", + "flex-direction", + "flex-wrap", + "flex-flow", + "flex-grow", + "flex-shrink", + "flex-basis", "position", "top", "right", "bottom", "left", + "float", + "clear", + "visibility", + "overflow", "z-index" ] }, @@ -41,30 +49,34 @@ "properties": [ "width", "height", - "margin", - "margin-top", - "margin-right", - "margin-bottom", - "margin-left", "padding", "padding-top", "padding-right", "padding-bottom", "padding-left", - "border" + "margin", + "margin-top", + "margin-right", + "margin-bottom", + "margin-left" ] }, { "groupName": "Background", "emptyLineBefore": "always", "noEmptyLineBetween": true, - "properties": ["background-color"] - }, - { - "groupName": "Font", - "emptyLineBefore": "always", - "noEmptyLineBetween": true, "properties": [ + "border", + "border-radius", + "border-top", + "border-right", + "border-bottom", + "border-left", + "border-color", + "border-width", + "border-style", + "background", + "background-color", "color", "font-style", "font-weight", @@ -73,15 +85,20 @@ "letter-spacing", "text-align", "text-indent", - "vertical-align", - "white-space" + "vertical-align" ] }, { - "groupName": "Animation", + "groupName": "Text", + "emptyLineBefore": "always", + "noEmptyLineBetween": true, + "properties": ["text-decoration", "text-align", "vertical-align"] + }, + { + "groupName": "ETC", "emptyLineBefore": "always", "noEmptyLineBetween": true, - "properties": ["animation"] + "properties": ["white-space"] } ] } From 322b60e16f477847963d4e943f80327dccf760e4 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Wed, 3 Jan 2024 17:39:00 +0900 Subject: [PATCH 004/653] =?UTF-8?q?style:=20CSS=20=EA=B0=9C=ED=96=89=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Button/Button.style.ts | 4 +- src/styles/GlobalStyles.ts | 45 ++++++++++++++------ 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/components/common/Button/Button.style.ts b/src/components/common/Button/Button.style.ts index bdd4a9b3..6db19e2d 100644 --- a/src/components/common/Button/Button.style.ts +++ b/src/components/common/Button/Button.style.ts @@ -5,13 +5,13 @@ export type ButtonStyle = 'choose' | 'complete'; export const CustomButton = styled.button<{ variant: ButtonStyle }>` width: 34.4rem; height: 6rem; - border-radius: 0.625rem; + border-radius: 0.625rem; background-color: ${({ theme, variant }) => variant === 'choose' ? theme.colors.key : theme.colors.BG}; + color: ${({ theme }) => theme.colors.white}; ${({ theme }) => theme.fonts.Head2_SB_18}; - color: ${({ theme }) => theme.colors.white}; :disabled { background-color: ${({ theme }) => theme.colors.MG}; diff --git a/src/styles/GlobalStyles.ts b/src/styles/GlobalStyles.ts index 05cba252..42924de2 100644 --- a/src/styles/GlobalStyles.ts +++ b/src/styles/GlobalStyles.ts @@ -4,6 +4,7 @@ const resetCss = css` :root { --vh: 100%; } + html, body, div, @@ -50,7 +51,6 @@ const resetCss = css` dl, dt, dd, - menu, ol, ul, li, @@ -87,13 +87,15 @@ const resetCss = css` mark, audio, video { + padding: 0; margin: 0; + border: 0; - padding: 0; - vertical-align: baseline; - font: inherit; font-size: 100%; + + vertical-align: baseline; } + article, aside, details, @@ -108,32 +110,38 @@ const resetCss = css` section { display: block; } + *[hidden] { display: none; } - body { - touch-action: manipulation; - line-height: 1; + body { width: 37.5rem; height: 66.7rem; + + line-height: 1; + touch-action: manipulation; } + menu, ol, ul { list-style: none; } + blockquote, q { quotes: none; } - blockquote:before, - blockquote:after, - q:before, - q:after { + + blockquote::before, + blockquote::after, + q::before, + q::after { content: ''; content: none; } + table { border-collapse: collapse; border-spacing: 0; @@ -146,9 +154,10 @@ const gStyle = css` * { box-sizing: border-box; } + html { -webkit-touch-callout: none; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + -webkit-tap-highlight-color: rgb(0 0 0 / 0%); scroll-behavior: smooth; @@ -159,25 +168,33 @@ const gStyle = css` font-size: 62.5%; } + ul, li { - padding-left: 0rem; + padding-left: 0; list-style: none; } + a { - text-decoration: none; color: inherit; + + text-decoration: none; } + input, button { outline: none; + border: none; background-color: transparent; } + button { cursor: pointer; + padding: 0; } + input { appearance: none; From c9b09694e47d82c1d197e77153ed3221d1707b88 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 3 Jan 2024 18:57:06 +0900 Subject: [PATCH 005/653] =?UTF-8?q?docs:=20.gitkeep=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/components/.gitkeep diff --git a/src/components/.gitkeep b/src/components/.gitkeep deleted file mode 100644 index e69de29b..00000000 From ebb98e4e75fe95b9b1a686733ddfa00dcf619774 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 3 Jan 2024 19:00:28 +0900 Subject: [PATCH 006/653] =?UTF-8?q?feat:=20=EA=B3=B5=ED=86=B5=20Header=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Header/Header.style.ts | 21 ++++++++++++++ src/components/common/Header/index.tsx | 30 ++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 src/components/common/Header/Header.style.ts create mode 100644 src/components/common/Header/index.tsx diff --git a/src/components/common/Header/Header.style.ts b/src/components/common/Header/Header.style.ts new file mode 100644 index 00000000..4a6e5f3c --- /dev/null +++ b/src/components/common/Header/Header.style.ts @@ -0,0 +1,21 @@ +import styled from '@emotion/styled'; + +export const HeaderWrapper = styled.header` + display: flex; + justify-content: space-between; + align-items: center; + + height: 5.4rem; + padding: 0 1.6rem; + + border-bottom: 1px solid ${({ theme }) => theme.colors.BG}; +`; + +export const HeaderTitle = styled.p` + ${({ theme }) => theme.fonts.E_Title1_SB_18}; +`; + +export const HeaderButton = styled.button` + width: 3.2rem; + height: 3.2rem; +`; diff --git a/src/components/common/Header/index.tsx b/src/components/common/Header/index.tsx new file mode 100644 index 00000000..67c8e64b --- /dev/null +++ b/src/components/common/Header/index.tsx @@ -0,0 +1,30 @@ +import * as S from './Header.style'; +import { IcHome, IcSharing } from '../../assets/icon/svgs'; + +interface HeaderProps { + headerTitle: string; +} + +function Header({ headerTitle }: HeaderProps) { + const handleClickHomeButton = () => { + // 홈으로 이동하는 로직 추후 구현 필요 + }; + + const handleClickShareButton = () => { + // 공유(?) 페이지로 이동하는 로직 추후 구현 필요 + }; + + return ( + + + + + {headerTitle} + + + + + ); +} + +export default Header; From 58ca473bd45bdb5558150c0ccfd7799c34117645 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 3 Jan 2024 19:07:08 +0900 Subject: [PATCH 007/653] =?UTF-8?q?fix:=20icon=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20import=20=EA=B2=BD=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Header/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/Header/index.tsx b/src/components/common/Header/index.tsx index 67c8e64b..b5f5d333 100644 --- a/src/components/common/Header/index.tsx +++ b/src/components/common/Header/index.tsx @@ -1,5 +1,5 @@ +import { IcHome, IcSharing } from '../../../assets/icon/svgs'; import * as S from './Header.style'; -import { IcHome, IcSharing } from '../../assets/icon/svgs'; interface HeaderProps { headerTitle: string; From a7ef0c240c27548d6caa62f5ec1c149b64c0498b Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Thu, 4 Jan 2024 01:49:11 +0900 Subject: [PATCH 008/653] =?UTF-8?q?docs:=20svg=20=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EB=B0=8D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../svgs/{ic_btn_floating_list.svg => btn_floating_list.svg} | 0 .../{ic_btn_floating_postit.svg => btn_floating_postit.svg} | 0 .../{ic_btn_floating_sticker.svg => btn_floating_sticker.svg} | 0 .../svgs/{ic_btn_floating_write.svg => btn_floating_write.svg} | 0 src/assets/icon/svgs/ic_arrow_left.svg | 2 +- src/assets/icon/svgs/{ic_le.svg => img_le.svg} | 0 src/assets/icon/svgs/{ic_logo_lecue.svg => img_logo_lecue.svg} | 0 src/assets/icon/svgs/{ic_star.svg => img_star.svg} | 0 src/assets/icon/svgs/{ic_sticker.svg => img_sticker.svg} | 0 9 files changed, 1 insertion(+), 1 deletion(-) rename src/assets/icon/svgs/{ic_btn_floating_list.svg => btn_floating_list.svg} (100%) rename src/assets/icon/svgs/{ic_btn_floating_postit.svg => btn_floating_postit.svg} (100%) rename src/assets/icon/svgs/{ic_btn_floating_sticker.svg => btn_floating_sticker.svg} (100%) rename src/assets/icon/svgs/{ic_btn_floating_write.svg => btn_floating_write.svg} (100%) rename src/assets/icon/svgs/{ic_le.svg => img_le.svg} (100%) rename src/assets/icon/svgs/{ic_logo_lecue.svg => img_logo_lecue.svg} (100%) rename src/assets/icon/svgs/{ic_star.svg => img_star.svg} (100%) rename src/assets/icon/svgs/{ic_sticker.svg => img_sticker.svg} (100%) diff --git a/src/assets/icon/svgs/ic_btn_floating_list.svg b/src/assets/icon/svgs/btn_floating_list.svg similarity index 100% rename from src/assets/icon/svgs/ic_btn_floating_list.svg rename to src/assets/icon/svgs/btn_floating_list.svg diff --git a/src/assets/icon/svgs/ic_btn_floating_postit.svg b/src/assets/icon/svgs/btn_floating_postit.svg similarity index 100% rename from src/assets/icon/svgs/ic_btn_floating_postit.svg rename to src/assets/icon/svgs/btn_floating_postit.svg diff --git a/src/assets/icon/svgs/ic_btn_floating_sticker.svg b/src/assets/icon/svgs/btn_floating_sticker.svg similarity index 100% rename from src/assets/icon/svgs/ic_btn_floating_sticker.svg rename to src/assets/icon/svgs/btn_floating_sticker.svg diff --git a/src/assets/icon/svgs/ic_btn_floating_write.svg b/src/assets/icon/svgs/btn_floating_write.svg similarity index 100% rename from src/assets/icon/svgs/ic_btn_floating_write.svg rename to src/assets/icon/svgs/btn_floating_write.svg diff --git a/src/assets/icon/svgs/ic_arrow_left.svg b/src/assets/icon/svgs/ic_arrow_left.svg index d940b353..fb71f49c 100644 --- a/src/assets/icon/svgs/ic_arrow_left.svg +++ b/src/assets/icon/svgs/ic_arrow_left.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/icon/svgs/ic_le.svg b/src/assets/icon/svgs/img_le.svg similarity index 100% rename from src/assets/icon/svgs/ic_le.svg rename to src/assets/icon/svgs/img_le.svg diff --git a/src/assets/icon/svgs/ic_logo_lecue.svg b/src/assets/icon/svgs/img_logo_lecue.svg similarity index 100% rename from src/assets/icon/svgs/ic_logo_lecue.svg rename to src/assets/icon/svgs/img_logo_lecue.svg diff --git a/src/assets/icon/svgs/ic_star.svg b/src/assets/icon/svgs/img_star.svg similarity index 100% rename from src/assets/icon/svgs/ic_star.svg rename to src/assets/icon/svgs/img_star.svg diff --git a/src/assets/icon/svgs/ic_sticker.svg b/src/assets/icon/svgs/img_sticker.svg similarity index 100% rename from src/assets/icon/svgs/ic_sticker.svg rename to src/assets/icon/svgs/img_sticker.svg From 3cdaeacf89fbdbd1d16e75f4120c6e9b743a47be Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Thu, 4 Jan 2024 01:50:20 +0900 Subject: [PATCH 009/653] =?UTF-8?q?chore:=20svg=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?index.ts=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon/svgs/index.ts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/assets/icon/svgs/index.ts b/src/assets/icon/svgs/index.ts index b58a584c..a0022152 100644 --- a/src/assets/icon/svgs/index.ts +++ b/src/assets/icon/svgs/index.ts @@ -1,33 +1,33 @@ /// +import BtnFloatingList from './btn_floating_list.svg?react'; +import BtnFloatingPostit from './btn_floating_postit.svg?react'; +import BtnFloatingSticker from './btn_floating_sticker.svg?react'; +import BtnFloatingWrite from './btn_floating_write.svg?react'; import IcArrowLeft from './ic_arrow_left.svg?react'; -import IcBtnFloatingList from './ic_btn_floating_list.svg?react'; -import IcBtnFloatingPostit from './ic_btn_floating_postit.svg?react'; -import IcBtnFloatingSticker from './ic_btn_floating_sticker.svg?react'; -import IcBtnFloatingWrite from './ic_btn_floating_write.svg?react'; import IcCrown from './ic_crown.svg?react'; import IcDate from './ic_date.svg?react'; import IcHome from './ic_home.svg?react'; -import IcLe from './ic_le.svg?react'; -import IcLogoLecue from './ic_logo_lecue.svg?react'; import IcNotice from './ic_notice.svg?react'; import IcSharing from './ic_sharing.svg?react'; -import IcStar from './ic_star.svg?react'; -import IcSticker from './ic_sticker.svg?react'; +import ImgLe from './img_le.svg?react'; +import ImgLogoLecue from './img_logo_lecue.svg?react'; +import ImgStar from './img_star.svg?react'; +import ImgSticker from './img_sticker.svg?react'; export { + BtnFloatingList, + BtnFloatingPostit, + BtnFloatingSticker, + BtnFloatingWrite, IcArrowLeft, - IcBtnFloatingList, - IcBtnFloatingPostit, - IcBtnFloatingSticker, - IcBtnFloatingWrite, IcCrown, IcDate, IcHome, - IcLe, - IcLogoLecue, IcNotice, IcSharing, - IcStar, - IcSticker, + ImgLe, + ImgLogoLecue, + ImgStar, + ImgSticker, }; From 9495a238b073099a0ea1e64f6f7e30cd08ad0cdc Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Thu, 4 Jan 2024 14:49:07 +0900 Subject: [PATCH 010/653] =?UTF-8?q?init:=20assets=20=ED=8F=B4=EB=8D=94?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD,=20svg=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../svgs => button}/btn_floating_list.svg | 0 .../svgs => button}/btn_floating_postit.svg | 0 .../svgs => button}/btn_floating_sticker.svg | 0 .../svgs => button}/btn_floating_write.svg | 0 src/assets/icon/ic_arrow_left_black.svg | 3 ++ src/assets/icon/ic_arrow_left_white.svg | 3 ++ src/assets/icon/{svgs => }/ic_crown.svg | 0 src/assets/icon/{svgs => }/ic_date.svg | 0 src/assets/icon/{svgs => }/ic_home.svg | 0 src/assets/icon/{svgs => }/ic_notice.svg | 0 src/assets/icon/{svgs => }/ic_sharing.svg | 0 src/assets/icon/svgs/ic_arrow_left.svg | 3 -- src/assets/icon/svgs/index.ts | 33 ----------------- src/assets/{icon/svgs => img}/img_le.svg | 0 .../{icon/svgs => img}/img_logo_lecue.svg | 0 src/assets/{icon/svgs => img}/img_star.svg | 0 src/assets/{icon/svgs => img}/img_sticker.svg | 0 src/assets/index.ts | 35 +++++++++++++++++++ 18 files changed, 41 insertions(+), 36 deletions(-) rename src/assets/{icon/svgs => button}/btn_floating_list.svg (100%) rename src/assets/{icon/svgs => button}/btn_floating_postit.svg (100%) rename src/assets/{icon/svgs => button}/btn_floating_sticker.svg (100%) rename src/assets/{icon/svgs => button}/btn_floating_write.svg (100%) create mode 100644 src/assets/icon/ic_arrow_left_black.svg create mode 100644 src/assets/icon/ic_arrow_left_white.svg rename src/assets/icon/{svgs => }/ic_crown.svg (100%) rename src/assets/icon/{svgs => }/ic_date.svg (100%) rename src/assets/icon/{svgs => }/ic_home.svg (100%) rename src/assets/icon/{svgs => }/ic_notice.svg (100%) rename src/assets/icon/{svgs => }/ic_sharing.svg (100%) delete mode 100644 src/assets/icon/svgs/ic_arrow_left.svg delete mode 100644 src/assets/icon/svgs/index.ts rename src/assets/{icon/svgs => img}/img_le.svg (100%) rename src/assets/{icon/svgs => img}/img_logo_lecue.svg (100%) rename src/assets/{icon/svgs => img}/img_star.svg (100%) rename src/assets/{icon/svgs => img}/img_sticker.svg (100%) create mode 100644 src/assets/index.ts diff --git a/src/assets/icon/svgs/btn_floating_list.svg b/src/assets/button/btn_floating_list.svg similarity index 100% rename from src/assets/icon/svgs/btn_floating_list.svg rename to src/assets/button/btn_floating_list.svg diff --git a/src/assets/icon/svgs/btn_floating_postit.svg b/src/assets/button/btn_floating_postit.svg similarity index 100% rename from src/assets/icon/svgs/btn_floating_postit.svg rename to src/assets/button/btn_floating_postit.svg diff --git a/src/assets/icon/svgs/btn_floating_sticker.svg b/src/assets/button/btn_floating_sticker.svg similarity index 100% rename from src/assets/icon/svgs/btn_floating_sticker.svg rename to src/assets/button/btn_floating_sticker.svg diff --git a/src/assets/icon/svgs/btn_floating_write.svg b/src/assets/button/btn_floating_write.svg similarity index 100% rename from src/assets/icon/svgs/btn_floating_write.svg rename to src/assets/button/btn_floating_write.svg diff --git a/src/assets/icon/ic_arrow_left_black.svg b/src/assets/icon/ic_arrow_left_black.svg new file mode 100644 index 00000000..345aad30 --- /dev/null +++ b/src/assets/icon/ic_arrow_left_black.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/ic_arrow_left_white.svg b/src/assets/icon/ic_arrow_left_white.svg new file mode 100644 index 00000000..5d496eb9 --- /dev/null +++ b/src/assets/icon/ic_arrow_left_white.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/svgs/ic_crown.svg b/src/assets/icon/ic_crown.svg similarity index 100% rename from src/assets/icon/svgs/ic_crown.svg rename to src/assets/icon/ic_crown.svg diff --git a/src/assets/icon/svgs/ic_date.svg b/src/assets/icon/ic_date.svg similarity index 100% rename from src/assets/icon/svgs/ic_date.svg rename to src/assets/icon/ic_date.svg diff --git a/src/assets/icon/svgs/ic_home.svg b/src/assets/icon/ic_home.svg similarity index 100% rename from src/assets/icon/svgs/ic_home.svg rename to src/assets/icon/ic_home.svg diff --git a/src/assets/icon/svgs/ic_notice.svg b/src/assets/icon/ic_notice.svg similarity index 100% rename from src/assets/icon/svgs/ic_notice.svg rename to src/assets/icon/ic_notice.svg diff --git a/src/assets/icon/svgs/ic_sharing.svg b/src/assets/icon/ic_sharing.svg similarity index 100% rename from src/assets/icon/svgs/ic_sharing.svg rename to src/assets/icon/ic_sharing.svg diff --git a/src/assets/icon/svgs/ic_arrow_left.svg b/src/assets/icon/svgs/ic_arrow_left.svg deleted file mode 100644 index fb71f49c..00000000 --- a/src/assets/icon/svgs/ic_arrow_left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/icon/svgs/index.ts b/src/assets/icon/svgs/index.ts deleted file mode 100644 index a0022152..00000000 --- a/src/assets/icon/svgs/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -/// - -import BtnFloatingList from './btn_floating_list.svg?react'; -import BtnFloatingPostit from './btn_floating_postit.svg?react'; -import BtnFloatingSticker from './btn_floating_sticker.svg?react'; -import BtnFloatingWrite from './btn_floating_write.svg?react'; -import IcArrowLeft from './ic_arrow_left.svg?react'; -import IcCrown from './ic_crown.svg?react'; -import IcDate from './ic_date.svg?react'; -import IcHome from './ic_home.svg?react'; -import IcNotice from './ic_notice.svg?react'; -import IcSharing from './ic_sharing.svg?react'; -import ImgLe from './img_le.svg?react'; -import ImgLogoLecue from './img_logo_lecue.svg?react'; -import ImgStar from './img_star.svg?react'; -import ImgSticker from './img_sticker.svg?react'; - -export { - BtnFloatingList, - BtnFloatingPostit, - BtnFloatingSticker, - BtnFloatingWrite, - IcArrowLeft, - IcCrown, - IcDate, - IcHome, - IcNotice, - IcSharing, - ImgLe, - ImgLogoLecue, - ImgStar, - ImgSticker, -}; diff --git a/src/assets/icon/svgs/img_le.svg b/src/assets/img/img_le.svg similarity index 100% rename from src/assets/icon/svgs/img_le.svg rename to src/assets/img/img_le.svg diff --git a/src/assets/icon/svgs/img_logo_lecue.svg b/src/assets/img/img_logo_lecue.svg similarity index 100% rename from src/assets/icon/svgs/img_logo_lecue.svg rename to src/assets/img/img_logo_lecue.svg diff --git a/src/assets/icon/svgs/img_star.svg b/src/assets/img/img_star.svg similarity index 100% rename from src/assets/icon/svgs/img_star.svg rename to src/assets/img/img_star.svg diff --git a/src/assets/icon/svgs/img_sticker.svg b/src/assets/img/img_sticker.svg similarity index 100% rename from src/assets/icon/svgs/img_sticker.svg rename to src/assets/img/img_sticker.svg diff --git a/src/assets/index.ts b/src/assets/index.ts new file mode 100644 index 00000000..b2c44018 --- /dev/null +++ b/src/assets/index.ts @@ -0,0 +1,35 @@ +/// + +import BtnFloatingPostit from './button/btn_floating_postit.svg?react'; +import BtnFloatingSticker from './button/btn_floating_sticker.svg?react'; +import BtnFloatingWrite from './button/btn_floating_write.svg?react'; +import BtnFloatingList from './button/button/btn_floating_list.svg?react'; +import IcArrowLeftBlack from './icon/ic_arrow_left_black.svg?react'; +import IcArrowLeftWhite from './icon/ic_arrow_left_white.svg?react'; +import IcCrown from './icon/ic_crown.svg?react'; +import IcDate from './icon/ic_date.svg?react'; +import IcHome from './icon/ic_home.svg?react'; +import IcNotice from './icon/ic_notice.svg?react'; +import IcSharing from './icon/ic_sharing.svg?react'; +import ImgLe from './img/img_le.svg?react'; +import ImgLogoLecue from './img/img_logo_lecue.svg?react'; +import ImgStar from './img/img_star.svg?react'; +import ImgSticker from './img/img_sticker.svg?react'; + +export { + BtnFloatingList, + BtnFloatingPostit, + BtnFloatingSticker, + BtnFloatingWrite, + IcArrowLeftBlack, + IcArrowLeftWhite, + IcCrown, + IcDate, + IcHome, + IcNotice, + IcSharing, + ImgLe, + ImgLogoLecue, + ImgStar, + ImgSticker, +}; From 6970be0d6dd229410a7f5f25bcdbbe854bc8de9b Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Thu, 4 Jan 2024 15:03:34 +0900 Subject: [PATCH 011/653] =?UTF-8?q?fix:=20svg=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/index.ts b/src/assets/index.ts index b2c44018..7de154c9 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -3,7 +3,7 @@ import BtnFloatingPostit from './button/btn_floating_postit.svg?react'; import BtnFloatingSticker from './button/btn_floating_sticker.svg?react'; import BtnFloatingWrite from './button/btn_floating_write.svg?react'; -import BtnFloatingList from './button/button/btn_floating_list.svg?react'; +import BtnFloatingList from './button/btn_floating_list.svg?react'; import IcArrowLeftBlack from './icon/ic_arrow_left_black.svg?react'; import IcArrowLeftWhite from './icon/ic_arrow_left_white.svg?react'; import IcCrown from './icon/ic_crown.svg?react'; From 1af5b0331a346b8f6378ca97da3cd03c604b5b3c Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Thu, 4 Jan 2024 15:06:54 +0900 Subject: [PATCH 012/653] =?UTF-8?q?feat:=20Header=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=B6=94=EC=83=81=ED=99=94=20&=20?= =?UTF-8?q?=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Header/Header.style.ts | 27 +++++++-- src/components/common/Header/index.tsx | 62 ++++++++++++++++---- 2 files changed, 73 insertions(+), 16 deletions(-) diff --git a/src/components/common/Header/Header.style.ts b/src/components/common/Header/Header.style.ts index 4a6e5f3c..828192d2 100644 --- a/src/components/common/Header/Header.style.ts +++ b/src/components/common/Header/Header.style.ts @@ -1,21 +1,38 @@ import styled from '@emotion/styled'; -export const HeaderWrapper = styled.header` +export const HeaderWrapper = styled.header<{ isDarkMode: boolean }>` display: flex; - justify-content: space-between; + justify-content: center; align-items: center; + position: relative; height: 5.4rem; padding: 0 1.6rem; - border-bottom: 1px solid ${({ theme }) => theme.colors.BG}; + border-bottom: 0.1rem solid + ${({ isDarkMode, theme }) => + isDarkMode ? theme.colors.white : theme.colors.BG}; + background-color: ${({ isDarkMode, theme }) => + isDarkMode ? theme.colors.BG : theme.colors.white}; `; -export const HeaderTitle = styled.p` +export const HeaderTitle = styled.p<{ isDarkMode: boolean }>` + color: ${({ isDarkMode, theme }) => + isDarkMode ? theme.colors.white : theme.colors.BG}; ${({ theme }) => theme.fonts.E_Title1_SB_18}; `; -export const HeaderButton = styled.button` +export const HeaderButtonWrapper = styled.div<{ + isLeft: boolean; +}>` + position: absolute; + ${({ isLeft }) => (isLeft ? 'left' : 'right')}: 1.6rem; + width: 3.2rem; height: 3.2rem; `; + +export const HeaderButton = styled.button` + width: 100%; + height: 100%; +`; diff --git a/src/components/common/Header/index.tsx b/src/components/common/Header/index.tsx index b5f5d333..36872d2d 100644 --- a/src/components/common/Header/index.tsx +++ b/src/components/common/Header/index.tsx @@ -1,29 +1,69 @@ -import { IcHome, IcSharing } from '../../../assets/icon/svgs'; +import { ReactNode } from 'react'; import * as S from './Header.style'; +import { + IcArrowLeftBlack, + IcArrowLeftWhite, + IcHome, + IcSharing, +} from '../../../assets'; interface HeaderProps { headerTitle: string; + isDarkMode: boolean; + isDetailPage?: boolean; } -function Header({ headerTitle }: HeaderProps) { +interface HeaderButtonProps { + isDarkMode: boolean; +} + +function Header({ headerTitle, isDarkMode, isDetailPage }: HeaderProps) { + return ( + + + {isDetailPage ? : } + + {headerTitle} + + {isDetailPage ? : <>} + + + ); +} + +export function HomeButton() { const handleClickHomeButton = () => { // 홈으로 이동하는 로직 추후 구현 필요 }; + return ( + + + + ); +} + +export function ShareButton() { const handleClickShareButton = () => { // 공유(?) 페이지로 이동하는 로직 추후 구현 필요 }; return ( - - - - - {headerTitle} - - - - + + + + ); +} + +export function BackButton({ isDarkMode }: HeaderButtonProps) { + const handleClickBackButton = () => { + // 뒤로 이동하는 로직 추후 구현 필요 + }; + + return ( + + {isDarkMode ? : } + ); } From 5b5967c873be38a1390285847fc95264e2998635 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Thu, 4 Jan 2024 15:30:12 +0900 Subject: [PATCH 013/653] =?UTF-8?q?fix:=20isDarkMode=20prop=20=EC=98=B5?= =?UTF-8?q?=EC=85=94=EB=84=90=20prop=EC=9C=BC=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Header/Header.style.ts | 4 ++-- src/components/common/Header/index.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/common/Header/Header.style.ts b/src/components/common/Header/Header.style.ts index 828192d2..96955b56 100644 --- a/src/components/common/Header/Header.style.ts +++ b/src/components/common/Header/Header.style.ts @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -export const HeaderWrapper = styled.header<{ isDarkMode: boolean }>` +export const HeaderWrapper = styled.header<{ isDarkMode?: boolean }>` display: flex; justify-content: center; align-items: center; @@ -16,7 +16,7 @@ export const HeaderWrapper = styled.header<{ isDarkMode: boolean }>` isDarkMode ? theme.colors.BG : theme.colors.white}; `; -export const HeaderTitle = styled.p<{ isDarkMode: boolean }>` +export const HeaderTitle = styled.p<{ isDarkMode?: boolean }>` color: ${({ isDarkMode, theme }) => isDarkMode ? theme.colors.white : theme.colors.BG}; ${({ theme }) => theme.fonts.E_Title1_SB_18}; diff --git a/src/components/common/Header/index.tsx b/src/components/common/Header/index.tsx index 36872d2d..1d98c12d 100644 --- a/src/components/common/Header/index.tsx +++ b/src/components/common/Header/index.tsx @@ -9,12 +9,12 @@ import { interface HeaderProps { headerTitle: string; - isDarkMode: boolean; + isDarkMode?: boolean; isDetailPage?: boolean; } interface HeaderButtonProps { - isDarkMode: boolean; + isDarkMode?: boolean; } function Header({ headerTitle, isDarkMode, isDetailPage }: HeaderProps) { From 3f24a5e79c42e4feaf8c99cd9984a00179641327 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Thu, 4 Jan 2024 15:50:12 +0900 Subject: [PATCH 014/653] =?UTF-8?q?chore:=20theme=20px=20->=20rem=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/theme.ts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/styles/theme.ts b/src/styles/theme.ts index 685a0416..1e052ae4 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -25,7 +25,7 @@ const fonts = { fontWeight: 700, fontSize: '2rem', lineHeight: '140%', - letterSpacing: '-0.2px', + letterSpacing: '-0.02rem', }, Head2_SB_18: { fontFamily: 'Pretendard', @@ -33,7 +33,7 @@ const fonts = { fontWeight: 600, fontSize: '1.8rem', lineHeight: '140%', - letterSpacing: '-0.18px', + letterSpacing: '-0.018rem', }, Title1_SB_16: { fontFamily: 'Pretendard', @@ -41,7 +41,7 @@ const fonts = { fontWeight: 600, fontSize: '1.6rem', lineHeight: 'auto', - letterSpacing: '-0.16px', + letterSpacing: '-0.016rem', }, Title2_M_16: { fontFamily: 'Pretendard', @@ -49,7 +49,7 @@ const fonts = { fontWeight: 500, fontSize: '1.6rem', lineHeight: 'auto', - letterSpacing: '-0.16px', + letterSpacing: '-0.016rem', }, Body1_R_16: { fontFamily: 'Pretendard', @@ -57,7 +57,7 @@ const fonts = { fontWeight: 400, fontSize: '1.6rem', lineHeight: '150%', - letterSpacing: '-0.4px', + letterSpacing: '-0.04rem', }, Body2_M_14: { fontFamily: 'Pretendard', @@ -65,7 +65,7 @@ const fonts = { fontWeight: 500, fontSize: '1.4rem', lineHeight: '145%', - letterSpacing: '-0.35px', + letterSpacing: '-0.035rem', }, Body3_R_14: { fontFamily: 'Pretendard', @@ -73,7 +73,7 @@ const fonts = { fontWeight: 400, fontSize: '1.4rem', lineHeight: '145%', - letterSpacing: '-0.35px', + letterSpacing: '-0.035rem', }, Body4_SB_14: { fontFamily: 'Pretendard', @@ -81,7 +81,7 @@ const fonts = { fontWeight: 600, fontSize: '1.4rem', lineHeight: '145%', - letterSpacing: '-0.35px', + letterSpacing: '-0.035rem', }, Caption1_R_12: { fontFamily: 'Pretendard', @@ -89,7 +89,7 @@ const fonts = { fontWeight: 400, fontSize: '1.2rem', lineHeight: 'auto', - letterSpacing: '-0.3px', + letterSpacing: '-0.03rem', }, Caption2_SB_12: { fontFamily: 'Pretendard', @@ -97,7 +97,7 @@ const fonts = { fontWeight: 600, fontSize: '1.2rem', lineHeight: 'auto', - letterSpacing: '-0.3px', + letterSpacing: '-0.03rem', }, E_Title1_SB_18: { fontFamily: 'Pretendard', @@ -105,7 +105,7 @@ const fonts = { fontWeight: 600, fontSize: '1.8rem', lineHeight: 'auto', - letterSpacing: '0px', + letterSpacing: '0', }, E_Title2_SB_16: { fontFamily: 'Pretendard', @@ -113,7 +113,7 @@ const fonts = { fontWeight: 600, fontSize: '1.6rem', lineHeight: 'auto', - letterSpacing: '0px', + letterSpacing: '0', }, E_Body1_SB_14: { fontFamily: 'Pretendard', @@ -121,7 +121,7 @@ const fonts = { fontWeight: 600, fontSize: '1.4rem', lineHeight: 'auto', - letterSpacing: '0px', + letterSpacing: '0', }, E_Body2_R_14: { fontFamily: 'Pretendard', @@ -129,7 +129,7 @@ const fonts = { fontWeight: 400, fontSize: '1.4rem', lineHeight: 'auto', - letterSpacing: '0px', + letterSpacing: '0', }, E_Caption_R_12: { fontFamily: 'Pretendard', @@ -137,7 +137,7 @@ const fonts = { fontWeight: 400, fontSize: '1.2rem', lineHeight: 'auto', - letterSpacing: '0px', + letterSpacing: '0', }, Orange: { fontFamily: 'Sequel Sans', @@ -145,7 +145,7 @@ const fonts = { fontWeight: 317, fontSize: '2.2rem', lineHeight: 'auto', - letterSpacing: '-0.66px', + letterSpacing: '-0.066rem', }, }; From 3afe1fd70ed664e1d72a405cfb2557e1e92f1270 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Thu, 4 Jan 2024 15:57:15 +0900 Subject: [PATCH 015/653] =?UTF-8?q?chore:=20import=20=EC=88=9C=EC=84=9C=20?= =?UTF-8?q?stylelint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/index.ts b/src/assets/index.ts index 7de154c9..eb55900c 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -1,9 +1,9 @@ /// +import BtnFloatingList from './button/btn_floating_list.svg?react'; import BtnFloatingPostit from './button/btn_floating_postit.svg?react'; import BtnFloatingSticker from './button/btn_floating_sticker.svg?react'; import BtnFloatingWrite from './button/btn_floating_write.svg?react'; -import BtnFloatingList from './button/btn_floating_list.svg?react'; import IcArrowLeftBlack from './icon/ic_arrow_left_black.svg?react'; import IcArrowLeftWhite from './icon/ic_arrow_left_white.svg?react'; import IcCrown from './icon/ic_crown.svg?react'; From cfae82aa74b11946e23cdc3c67121437d6ff7921 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Thu, 4 Jan 2024 15:57:33 +0900 Subject: [PATCH 016/653] =?UTF-8?q?init:=20font=20smoothing=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/GlobalStyles.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/styles/GlobalStyles.ts b/src/styles/GlobalStyles.ts index 42924de2..db80ee59 100644 --- a/src/styles/GlobalStyles.ts +++ b/src/styles/GlobalStyles.ts @@ -121,6 +121,9 @@ const resetCss = css` line-height: 1; touch-action: manipulation; + + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } menu, From 013609541917cb79d259a9af11a51e961f59e3fa Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Thu, 4 Jan 2024 16:01:47 +0900 Subject: [PATCH 017/653] =?UTF-8?q?chore:=20Pretendard=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EB=B3=80=EA=B2=BD(index.html->GlobalStyles.ts)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 6 ------ src/styles/GlobalStyles.ts | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 1754121c..2f69458c 100644 --- a/index.html +++ b/index.html @@ -2,12 +2,6 @@ - Lecue diff --git a/src/styles/GlobalStyles.ts b/src/styles/GlobalStyles.ts index db80ee59..691584c3 100644 --- a/src/styles/GlobalStyles.ts +++ b/src/styles/GlobalStyles.ts @@ -210,6 +210,11 @@ const gStyle = css` font-family: 'Sequel Sans'; src: url('src/styles/fonts/SequelSansMediumOblBody.woff') format('woff'); } + + @font-face { + font-family: 'Pretendard'; + src: url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.6/dist/web/static/pretendard.css'); + } `; export default gStyle; From c4684eec66152886b65d6e57dd4f157907a57d3c Mon Sep 17 00:00:00 2001 From: eunbeann Date: Thu, 4 Jan 2024 16:21:57 +0900 Subject: [PATCH 018/653] =?UTF-8?q?feat:StickerPack=20=ED=8F=B4=EB=8D=94?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StickerPack/components/.gitkeep | 0 src/StickerPack/constants/.gitkeep | 0 src/StickerPack/hooks/.gitkeep | 0 src/StickerPack/page/StickerPack.style.ts | 1 + src/StickerPack/page/StickerPack.tsx | 5 +++++ 5 files changed, 6 insertions(+) create mode 100644 src/StickerPack/components/.gitkeep create mode 100644 src/StickerPack/constants/.gitkeep create mode 100644 src/StickerPack/hooks/.gitkeep create mode 100644 src/StickerPack/page/StickerPack.style.ts create mode 100644 src/StickerPack/page/StickerPack.tsx diff --git a/src/StickerPack/components/.gitkeep b/src/StickerPack/components/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/StickerPack/constants/.gitkeep b/src/StickerPack/constants/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/StickerPack/hooks/.gitkeep b/src/StickerPack/hooks/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/StickerPack/page/StickerPack.style.ts b/src/StickerPack/page/StickerPack.style.ts new file mode 100644 index 00000000..8337712e --- /dev/null +++ b/src/StickerPack/page/StickerPack.style.ts @@ -0,0 +1 @@ +// diff --git a/src/StickerPack/page/StickerPack.tsx b/src/StickerPack/page/StickerPack.tsx new file mode 100644 index 00000000..ed113580 --- /dev/null +++ b/src/StickerPack/page/StickerPack.tsx @@ -0,0 +1,5 @@ +function StickerPack() { + return
StickerPack
; +} + +export default StickerPack; From 4e2f16b92dbcbb0f11c010e479c3ad9e0affb51f Mon Sep 17 00:00:00 2001 From: eunbeann Date: Thu, 4 Jan 2024 16:34:58 +0900 Subject: [PATCH 019/653] =?UTF-8?q?style:=20postion=20=EA=B0=92=20fixed=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Button/Button.style.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/common/Button/Button.style.ts b/src/components/common/Button/Button.style.ts index 6db19e2d..830e734a 100644 --- a/src/components/common/Button/Button.style.ts +++ b/src/components/common/Button/Button.style.ts @@ -3,6 +3,9 @@ import styled from '@emotion/styled'; export type ButtonStyle = 'choose' | 'complete'; export const CustomButton = styled.button<{ variant: ButtonStyle }>` + position: fixed; + bottom: 2rem; + width: 34.4rem; height: 6rem; From fecd1298ae638f787a0332b9aaa4194623cd7f30 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Fri, 5 Jan 2024 01:02:29 +0900 Subject: [PATCH 020/653] =?UTF-8?q?style:=20Orange=20=ED=8F=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/GlobalStyles.ts | 5 ----- src/styles/fonts/SequelSansMediumOblBody.woff | Bin 24680 -> 0 bytes src/styles/theme.ts | 6 +++--- 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 src/styles/fonts/SequelSansMediumOblBody.woff diff --git a/src/styles/GlobalStyles.ts b/src/styles/GlobalStyles.ts index 42924de2..159f3038 100644 --- a/src/styles/GlobalStyles.ts +++ b/src/styles/GlobalStyles.ts @@ -202,11 +202,6 @@ const gStyle = css` outline: none; } } - - @font-face { - font-family: 'Sequel Sans'; - src: url('src/styles/fonts/SequelSansMediumOblBody.woff') format('woff'); - } `; export default gStyle; diff --git a/src/styles/fonts/SequelSansMediumOblBody.woff b/src/styles/fonts/SequelSansMediumOblBody.woff deleted file mode 100644 index 60fe05890f1fee15103ca39792d914859589b873..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24680 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 Date: Fri, 5 Jan 2024 01:14:29 +0900 Subject: [PATCH 021/653] =?UTF-8?q?chore:=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EC=9C=A0=EC=A7=80=EC=9A=A9.gitkeep=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/constants/.gitkeep | 0 src/Detail/hooks/.gitkeep | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/Detail/constants/.gitkeep create mode 100644 src/Detail/hooks/.gitkeep diff --git a/src/Detail/constants/.gitkeep b/src/Detail/constants/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/Detail/hooks/.gitkeep b/src/Detail/hooks/.gitkeep new file mode 100644 index 00000000..e69de29b From 107e7cd2542800eb4845a2b7d0d24161da88c567 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Fri, 5 Jan 2024 01:15:32 +0900 Subject: [PATCH 022/653] =?UTF-8?q?feat:=20=EC=83=81=EB=8B=A8=20=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=AC=B4=ED=95=9C=20=EB=A1=A4=EB=A7=81=20?= =?UTF-8?q?=EC=8A=AC=EB=9D=BC=EC=9D=B4=EB=93=9C=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/.gitkeep | 0 src/Detail/components/Profile/index.tsx | 11 ++++ .../SlideBanner/SlideBanner.style.ts | 35 +++++++++++ src/Detail/components/SlideBanner/index.tsx | 60 +++++++++++++++++++ .../SlideBannerItem/SlideBannerItem.style.ts | 14 +++++ .../components/SlideBannerItem/index.tsx | 23 +++++++ src/Detail/page/DetailPage.tsx | 13 ++++ 7 files changed, 156 insertions(+) create mode 100644 src/Detail/components/.gitkeep create mode 100644 src/Detail/components/Profile/index.tsx create mode 100644 src/Detail/components/SlideBanner/SlideBanner.style.ts create mode 100644 src/Detail/components/SlideBanner/index.tsx create mode 100644 src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts create mode 100644 src/Detail/components/SlideBannerItem/index.tsx create mode 100644 src/Detail/page/DetailPage.tsx diff --git a/src/Detail/components/.gitkeep b/src/Detail/components/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/Detail/components/Profile/index.tsx b/src/Detail/components/Profile/index.tsx new file mode 100644 index 00000000..e492f96e --- /dev/null +++ b/src/Detail/components/Profile/index.tsx @@ -0,0 +1,11 @@ +import SlideBanner from '../SlideBanner'; + +function Profile() { + return ( +

+ ); +} + +export default Profile; diff --git a/src/Detail/components/SlideBanner/SlideBanner.style.ts b/src/Detail/components/SlideBanner/SlideBanner.style.ts new file mode 100644 index 00000000..6c5281a6 --- /dev/null +++ b/src/Detail/components/SlideBanner/SlideBanner.style.ts @@ -0,0 +1,35 @@ +import { keyframes } from '@emotion/react'; +import styled from '@emotion/styled'; + +export const infiniteSlide = keyframes` + 0% { + transform: translateX(0); + } + + 100% { + transform: translateX(-50%); + } +`; + +export const SliderBannerWrapper = styled.div` + width: 100%; + height: 4.4rem; + background-color: ${({ theme }) => theme.colors.key}; + overflow: hidden; +`; + +export const AnimationBox = styled.div` + height: 100%; + display: flex; + animation: ${infiniteSlide}; + animation-timing-function: linear; + animation-iteration-count: infinite; +`; + +export const SlideBannerItemList = styled.div` + height: 100%; + display: flex; + align-items: center; + /* column-gap: 0.6rem; */ + font-size: 24px; +`; diff --git a/src/Detail/components/SlideBanner/index.tsx b/src/Detail/components/SlideBanner/index.tsx new file mode 100644 index 00000000..7dbb1ff4 --- /dev/null +++ b/src/Detail/components/SlideBanner/index.tsx @@ -0,0 +1,60 @@ +import { useEffect, useRef, useState } from 'react'; + +import SlideBannerItem from '../SlideBannerItem'; +import { + AnimationBox, + SlideBannerItemList, + SliderBannerWrapper, +} from './SlideBanner.style'; + +interface SlideBannerProps { + name: string; +} + +function SlideBanner({ name }: SlideBannerProps) { + const itemBoxRef = useRef(null); + const [itemListWidth, setItemListWidth] = useState(0); + const [animationListWidth, setAnimationListWidth] = useState(0); + const [animationDuration, setAnimationDuration] = useState(10); + + useEffect(() => { + if (itemBoxRef.current) { + const itemBoxWidth = itemBoxRef.current.offsetWidth; + + const itemListWidth = itemBoxWidth * 10 + 57; + + setItemListWidth(itemListWidth); + setAnimationListWidth(itemListWidth * 2); + + const nameLength = name.length; + const newAnimationDuration = Math.max(1, nameLength * 7); + setAnimationDuration(newAnimationDuration); + } + }, [name]); + + const renderSlideBannerItems = () => { + return Array.from({ length: 10 }, (_, index) => ( + + )); + }; + + return ( + + + + {renderSlideBannerItems()} + + + {renderSlideBannerItems()} + + + + ); +} + +export default SlideBanner; diff --git a/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts b/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts new file mode 100644 index 00000000..685a07f2 --- /dev/null +++ b/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts @@ -0,0 +1,14 @@ +import styled from '@emotion/styled'; + +export const SliderBannerItemWrapper = styled.div` + margin-right: 0.6rem; + display: flex; + width: auto; + flex-shrink: 0; +`; + +export const Name = styled.p` + margin: 0 0.6rem; + + ${({ theme }) => theme.fonts.Orange}; +`; diff --git a/src/Detail/components/SlideBannerItem/index.tsx b/src/Detail/components/SlideBannerItem/index.tsx new file mode 100644 index 00000000..6df4a69c --- /dev/null +++ b/src/Detail/components/SlideBannerItem/index.tsx @@ -0,0 +1,23 @@ +import React, { forwardRef } from 'react'; + +import { ImgLe, ImgStar } from '../../../assets'; +import { Name, SliderBannerItemWrapper } from './SlideBannerItem.style'; + +interface SlideBannerItemProps { + name: string; +} + +const SlideBannerItem = forwardRef(function SlideBannerItem( + { name }: SlideBannerItemProps, + ref: React.Ref, +) { + return ( + }> + + {`( ${name} )`} + + + ); +}); + +export default SlideBannerItem; diff --git a/src/Detail/page/DetailPage.tsx b/src/Detail/page/DetailPage.tsx new file mode 100644 index 00000000..052241e5 --- /dev/null +++ b/src/Detail/page/DetailPage.tsx @@ -0,0 +1,13 @@ +import Header from '../../components/common/Header'; +import Profile from '../components/Profile'; + +function DetailPage() { + return ( +
+
+ +
+ ); +} + +export default DetailPage; From f53f6694f38a660e876d670a751eac3dcf22ec32 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Fri, 5 Jan 2024 13:12:07 +0900 Subject: [PATCH 023/653] =?UTF-8?q?feat:=20=EC=8A=A4=ED=8B=B0=EC=BB=A4=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StickerPack/components/.gitkeep | 0 .../StickerList/StickerList.style.ts | 45 +++++ .../components/StickerList/index.tsx | 175 ++++++++++++++++++ 3 files changed, 220 insertions(+) delete mode 100644 src/StickerPack/components/.gitkeep create mode 100644 src/StickerPack/components/StickerList/StickerList.style.ts create mode 100644 src/StickerPack/components/StickerList/index.tsx diff --git a/src/StickerPack/components/.gitkeep b/src/StickerPack/components/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/StickerPack/components/StickerList/StickerList.style.ts b/src/StickerPack/components/StickerList/StickerList.style.ts new file mode 100644 index 00000000..74016fb6 --- /dev/null +++ b/src/StickerPack/components/StickerList/StickerList.style.ts @@ -0,0 +1,45 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; + align-items: start; + flex-direction: column; + + width: 100%; +`; + +export const Title = styled.header` + margin: 1.4rem 0; + + color: ${({ theme }) => theme.colors.white}; + + ${({ theme }) => theme.fonts.Head2_SB_18}; +`; + +export const StickerGridWrapper = styled.div` + display: grid; + + width: 100%; + + grid-template-columns: repeat(3, 1fr); + + gap: 2.15rem 1.6rem; +`; + +export const ImageComponent = styled.button<{ + isSelected: boolean; + url: string; +}>` + width: 10rem; + height: 10rem; + + border: solid 0.1rem + ${({ theme, isSelected }) => + isSelected ? theme.colors.key : theme.colors.BG}; + border-radius: 0.4rem; + background: url(${({ url }) => url};); + + background-size: 10rem 10rem; + + background-position: center; +`; diff --git a/src/StickerPack/components/StickerList/index.tsx b/src/StickerPack/components/StickerList/index.tsx new file mode 100644 index 00000000..1d99782a --- /dev/null +++ b/src/StickerPack/components/StickerList/index.tsx @@ -0,0 +1,175 @@ +import React, { Dispatch } from 'react'; + +import * as S from './StickerList.style'; + +interface StickerListProps { + isSelectedId: number | null; + setIsSelectedId: Dispatch>; +} + +function StickerList(props: StickerListProps) { + const { isSelectedId, setIsSelectedId } = props; + + const handleStickerClick = (stickerId: number) => { + setIsSelectedId(stickerId); + }; + + return ( + + {MockSticker.map((data) => ( + + {data.stickerCategory} + + {data.stickerInfoList.map((sticker) => ( + handleStickerClick(sticker.stickerId)} + isSelected={sticker.stickerId === isSelectedId} + url={sticker.stickerImage} + /> + ))} + + + ))} + + ); +} + +export default StickerList; + +const MockSticker = [ + { + stickerCategory: '레큐잉', + stickerInfoList: [ + { + stickerId: 1, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=1', + }, + { + stickerId: 2, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=2', + }, + { + stickerId: 3, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=3', + }, + { + stickerId: 4, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=4', + }, + { + stickerId: 5, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=5', + }, + { + stickerId: 6, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=6', + }, + { + stickerId: 7, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=7', + }, + { + stickerId: 8, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=8', + }, + { + stickerId: 9, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=9', + }, + { + stickerId: 10, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=10', + }, + { + stickerId: 11, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=11', + }, + { + stickerId: 12, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=12', + }, + { + stickerId: 13, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=13', + }, + { + stickerId: 14, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=14', + }, + { + stickerId: 15, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=15', + }, + { + stickerId: 16, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=16', + }, + { + stickerId: 17, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=17', + }, + { + stickerId: 18, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=18', + }, + { + stickerId: 19, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=19', + }, + { + stickerId: 20, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=20', + }, + ], + }, + { + stickerCategory: '큐비링', + stickerInfoList: [ + { + stickerId: 91, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=1', + }, + { + stickerId: 92, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=2', + }, + { + stickerId: 93, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=3', + }, + { + stickerId: 94, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=4', + }, + { + stickerId: 95, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=5', + }, + { + stickerId: 96, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=6', + }, + { + stickerId: 97, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=7', + }, + { + stickerId: 98, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=8', + }, + { + stickerId: 99, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=9', + }, + { + stickerId: 910, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=10', + }, + { + stickerId: 911, + stickerImage: 'https://source.unsplash.com/random/100x100?sig=11', + }, + ], + }, +]; From 3c846841d5dabb78bd2df89406db2e3292270f92 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Fri, 5 Jan 2024 13:12:28 +0900 Subject: [PATCH 024/653] =?UTF-8?q?feat:=20=EC=8A=A4=ED=8B=B0=EC=BB=A4?= =?UTF-8?q?=ED=8C=A9=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StickerPack/page/StickerPack.style.ts | 1 - src/StickerPack/page/StickerPack.tsx | 5 --- .../page/StickerPack/StickerPack.style.ts | 15 ++++++++ src/StickerPack/page/StickerPack/index.tsx | 35 +++++++++++++++++++ 4 files changed, 50 insertions(+), 6 deletions(-) delete mode 100644 src/StickerPack/page/StickerPack.style.ts delete mode 100644 src/StickerPack/page/StickerPack.tsx create mode 100644 src/StickerPack/page/StickerPack/StickerPack.style.ts create mode 100644 src/StickerPack/page/StickerPack/index.tsx diff --git a/src/StickerPack/page/StickerPack.style.ts b/src/StickerPack/page/StickerPack.style.ts deleted file mode 100644 index 8337712e..00000000 --- a/src/StickerPack/page/StickerPack.style.ts +++ /dev/null @@ -1 +0,0 @@ -// diff --git a/src/StickerPack/page/StickerPack.tsx b/src/StickerPack/page/StickerPack.tsx deleted file mode 100644 index ed113580..00000000 --- a/src/StickerPack/page/StickerPack.tsx +++ /dev/null @@ -1,5 +0,0 @@ -function StickerPack() { - return
StickerPack
; -} - -export default StickerPack; diff --git a/src/StickerPack/page/StickerPack/StickerPack.style.ts b/src/StickerPack/page/StickerPack/StickerPack.style.ts new file mode 100644 index 00000000..f3eef296 --- /dev/null +++ b/src/StickerPack/page/StickerPack/StickerPack.style.ts @@ -0,0 +1,15 @@ +import styled from '@emotion/styled'; + +export const Body = styled.div` + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + width: 100%; + height: 100%; + padding: 0 1.64rem; + padding-bottom: 10rem; + + background-color: ${({ theme }) => theme.colors.BG}; +`; diff --git a/src/StickerPack/page/StickerPack/index.tsx b/src/StickerPack/page/StickerPack/index.tsx new file mode 100644 index 00000000..20b4b1c3 --- /dev/null +++ b/src/StickerPack/page/StickerPack/index.tsx @@ -0,0 +1,35 @@ +import { useState } from 'react'; + +// component +import Button from '../../../components/common/Button/index.tsx'; +import Header from '../../../components/common/Header/index.tsx'; +import StickerList from '../../components/StickerList/index.tsx'; +// style +import * as S from './StickerPack.style.ts'; + +function StickerPack() { + const [isSelectedId, setIsSelectedId] = useState(null); + const handleClickDone = () => { + alert(`${isSelectedId}`); + }; + return ( + <> +
+ + + + + + ); +} + +export default StickerPack; From 8963b8c7dfda5cee09cf23e415f233f6070f530a Mon Sep 17 00:00:00 2001 From: eunbeann Date: Fri, 5 Jan 2024 13:12:41 +0900 Subject: [PATCH 025/653] =?UTF-8?q?chore:=20=EB=9D=BC=EC=9A=B0=ED=84=B0=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Router.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Router.tsx b/src/Router.tsx index 16e4af3a..43c60061 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -1,12 +1,14 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; import HomePage from './Home/page/HomePage'; +import StickerPack from './StickerPack/page/StickerPack'; function Router() { return ( } /> + } /> ); From ed7ec33ac442eb55a86214b931b088031cade82e Mon Sep 17 00:00:00 2001 From: eunbeann Date: Fri, 5 Jan 2024 18:43:21 +0900 Subject: [PATCH 026/653] =?UTF-8?q?chore:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?assets=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon/ic_camera.svg | 6 +++ src/assets/img/img_book.svg | 40 +++++++++++++++++++ .../{img_star.svg => img_star_orangeline.svg} | 0 src/assets/img/img_star_postit.svg | 3 ++ src/assets/index.ts | 10 ++++- 5 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 src/assets/icon/ic_camera.svg create mode 100644 src/assets/img/img_book.svg rename src/assets/img/{img_star.svg => img_star_orangeline.svg} (100%) create mode 100644 src/assets/img/img_star_postit.svg diff --git a/src/assets/icon/ic_camera.svg b/src/assets/icon/ic_camera.svg new file mode 100644 index 00000000..21e38ef9 --- /dev/null +++ b/src/assets/icon/ic_camera.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/img_book.svg b/src/assets/img/img_book.svg new file mode 100644 index 00000000..9119d3d5 --- /dev/null +++ b/src/assets/img/img_book.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/img_star.svg b/src/assets/img/img_star_orangeline.svg similarity index 100% rename from src/assets/img/img_star.svg rename to src/assets/img/img_star_orangeline.svg diff --git a/src/assets/img/img_star_postit.svg b/src/assets/img/img_star_postit.svg new file mode 100644 index 00000000..b170b73e --- /dev/null +++ b/src/assets/img/img_star_postit.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/index.ts b/src/assets/index.ts index eb55900c..ecbc85f6 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -6,14 +6,17 @@ import BtnFloatingSticker from './button/btn_floating_sticker.svg?react'; import BtnFloatingWrite from './button/btn_floating_write.svg?react'; import IcArrowLeftBlack from './icon/ic_arrow_left_black.svg?react'; import IcArrowLeftWhite from './icon/ic_arrow_left_white.svg?react'; +import IcCamera from './icon/ic_camera.svg?react'; import IcCrown from './icon/ic_crown.svg?react'; import IcDate from './icon/ic_date.svg?react'; import IcHome from './icon/ic_home.svg?react'; import IcNotice from './icon/ic_notice.svg?react'; import IcSharing from './icon/ic_sharing.svg?react'; +import ImgBook from './img/img_book.svg?react'; import ImgLe from './img/img_le.svg?react'; import ImgLogoLecue from './img/img_logo_lecue.svg?react'; -import ImgStar from './img/img_star.svg?react'; +import ImgStarOrangeLine from './img/img_star_orangeline.svg?react'; +import ImgStarPosit from './img/img_star_postit.svg?react'; import ImgSticker from './img/img_sticker.svg?react'; export { @@ -23,13 +26,16 @@ export { BtnFloatingWrite, IcArrowLeftBlack, IcArrowLeftWhite, + IcCamera, IcCrown, IcDate, IcHome, IcNotice, IcSharing, + ImgBook, ImgLe, ImgLogoLecue, - ImgStar, + ImgStarPosit, + ImgStarOrangeLine, ImgSticker, }; From e295832b06630dd9dc60de9b4babb28862599047 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Fri, 5 Jan 2024 18:43:46 +0900 Subject: [PATCH 027/653] =?UTF-8?q?fix:=20header=20=EB=8B=A4=ED=81=AC?= =?UTF-8?q?=EB=AA=A8=EB=93=9C=20bottom=20=EC=83=89=EC=83=81=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Header/Header.style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/Header/Header.style.ts b/src/components/common/Header/Header.style.ts index 96955b56..e7ada58a 100644 --- a/src/components/common/Header/Header.style.ts +++ b/src/components/common/Header/Header.style.ts @@ -11,7 +11,7 @@ export const HeaderWrapper = styled.header<{ isDarkMode?: boolean }>` border-bottom: 0.1rem solid ${({ isDarkMode, theme }) => - isDarkMode ? theme.colors.white : theme.colors.BG}; + isDarkMode ? theme.colors.DG : theme.colors.BG}; background-color: ${({ isDarkMode, theme }) => isDarkMode ? theme.colors.BG : theme.colors.white}; `; From 9b2db1b3433783bdef1f8101297293ea2fa13eef Mon Sep 17 00:00:00 2001 From: eunbeann Date: Fri, 5 Jan 2024 18:44:09 +0900 Subject: [PATCH 028/653] =?UTF-8?q?style:=20=EC=BB=AC=EB=9F=AC=20=EA=B0=92?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/emotion.d.ts | 12 +++++++++++- src/styles/theme.ts | 21 +++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/styles/emotion.d.ts b/src/styles/emotion.d.ts index 1e32f849..dc4f6d35 100644 --- a/src/styles/emotion.d.ts +++ b/src/styles/emotion.d.ts @@ -15,11 +15,21 @@ type colors = | 'sub_yellow' | 'sub_green' | 'sub_blue' - | 'sub_purple'; + | 'sub_purple' + | 'white90' + | 'white80' + | 'white70' + | 'white60' + | 'white50' + | 'white40' + | 'white30' + | 'white20' + | 'white10'; type fonts = | 'Head1_B_20' | 'Head2_SB_18' + | 'Head3_B_18' | 'Title1_SB_16' | 'Title2_M_16' | 'Body1_R_16' diff --git a/src/styles/theme.ts b/src/styles/theme.ts index 1e052ae4..785981f5 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -16,6 +16,15 @@ const colors = { sub_green: '#85CEAF', sub_blue: '#B3CBE8', sub_purple: '#929DD9', + white90: '#FFFFFFE5', + white80: '#FFFFFFCC', + white70: '#FFFFFFB2', + white60: '#FFFFFF99', + white50: '#FFFFFF80', + white40: '#FFFFFF66', + white30: '#FFFFFF4D', + white20: '#FFFFFF33', + white10: '#FFFFFF1A', }; const fonts = { @@ -35,6 +44,14 @@ const fonts = { lineHeight: '140%', letterSpacing: '-0.018rem', }, + Head3_B_18: { + fontFamily: 'Pretendard', + fontStyle: 'normal', + fontWeight: 700, + fontSize: '1.8rem', + lineHeight: '140%', + letterSpacing: '-0.018rem', + }, Title1_SB_16: { fontFamily: 'Pretendard', fontStyle: 'normal', @@ -48,7 +65,7 @@ const fonts = { fontStyle: 'normal', fontWeight: 500, fontSize: '1.6rem', - lineHeight: 'auto', + lineHeight: '145%', letterSpacing: '-0.016rem', }, Body1_R_16: { @@ -72,7 +89,7 @@ const fonts = { fontStyle: 'normal', fontWeight: 400, fontSize: '1.4rem', - lineHeight: '145%', + lineHeight: '150%', letterSpacing: '-0.035rem', }, Body4_SB_14: { From d9e55132ca5c74a0bf43ec4ef7b774edd21d9c24 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Fri, 5 Jan 2024 21:50:42 +0900 Subject: [PATCH 029/653] =?UTF-8?q?docs:=20svg=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon/ic_crown.svg | 8 ++++---- src/assets/icon/ic_date.svg | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/assets/icon/ic_crown.svg b/src/assets/icon/ic_crown.svg index 9be88a21..14d35d5d 100644 --- a/src/assets/icon/ic_crown.svg +++ b/src/assets/icon/ic_crown.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/src/assets/icon/ic_date.svg b/src/assets/icon/ic_date.svg index 29d18268..da392351 100644 --- a/src/assets/icon/ic_date.svg +++ b/src/assets/icon/ic_date.svg @@ -1,8 +1,8 @@ - - - - - - + + + + + + From 9a179df55d8c9a7167001b3e0713657e92268fb7 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Fri, 5 Jan 2024 21:51:46 +0900 Subject: [PATCH 030/653] =?UTF-8?q?docs:=20Profile=20=ED=8F=B4=EB=8D=94=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/Profile/index.tsx | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 src/Detail/components/Profile/index.tsx diff --git a/src/Detail/components/Profile/index.tsx b/src/Detail/components/Profile/index.tsx deleted file mode 100644 index e492f96e..00000000 --- a/src/Detail/components/Profile/index.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import SlideBanner from '../SlideBanner'; - -function Profile() { - return ( -
- -
- ); -} - -export default Profile; From 2d1229ed16ee8770222d8d6773dbaebba5fecf72 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Fri, 5 Jan 2024 21:52:41 +0900 Subject: [PATCH 031/653] =?UTF-8?q?style:=20=EC=9D=B4=EB=A6=84=20=EB=A0=8C?= =?UTF-8?q?=EB=8D=94=20=EB=B6=80=EB=B6=84=20=EC=83=81=EB=8B=A8=20=EC=97=AC?= =?UTF-8?q?=EB=B0=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts b/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts index 685a07f2..0e13eb5c 100644 --- a/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts +++ b/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts @@ -8,7 +8,7 @@ export const SliderBannerItemWrapper = styled.div` `; export const Name = styled.p` - margin: 0 0.6rem; + margin: 0.3rem 0.6rem 0 0.6rem; ${({ theme }) => theme.fonts.Orange}; `; From f6bc7ea33fa57ae5ff5438dd289edc8e420cea87 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Fri, 5 Jan 2024 21:53:13 +0900 Subject: [PATCH 032/653] =?UTF-8?q?style:=20=EC=8A=AC=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=93=9C=20=EB=B0=B0=EB=84=88=20=ED=95=98=EB=8B=A8=20border=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/SlideBanner/SlideBanner.style.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Detail/components/SlideBanner/SlideBanner.style.ts b/src/Detail/components/SlideBanner/SlideBanner.style.ts index 6c5281a6..9a934dab 100644 --- a/src/Detail/components/SlideBanner/SlideBanner.style.ts +++ b/src/Detail/components/SlideBanner/SlideBanner.style.ts @@ -16,6 +16,7 @@ export const SliderBannerWrapper = styled.div` height: 4.4rem; background-color: ${({ theme }) => theme.colors.key}; overflow: hidden; + border-bottom: 0.1rem solid ${({ theme }) => theme.colors.BG}; `; export const AnimationBox = styled.div` From 8f8b540d3482db88bd5018599613090904b6d72e Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Fri, 5 Jan 2024 21:59:54 +0900 Subject: [PATCH 033/653] =?UTF-8?q?feat:=20=EC=83=81=EB=8B=A8=20=EC=B6=95?= =?UTF-8?q?=ED=95=98=EA=B8=80=20UI=20=EA=B5=AC=ED=98=84=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookInfoBox/BookInfoBox.style.ts | 69 +++++++++++++++++++ src/Detail/components/BookInfoBox/index.tsx | 58 ++++++++++++++++ .../components/BookInfoContainer/index.tsx | 38 ++++++++++ src/Detail/page/DetailPage.tsx | 18 ++++- src/Router.tsx | 2 + 5 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 src/Detail/components/BookInfoBox/BookInfoBox.style.ts create mode 100644 src/Detail/components/BookInfoBox/index.tsx create mode 100644 src/Detail/components/BookInfoContainer/index.tsx diff --git a/src/Detail/components/BookInfoBox/BookInfoBox.style.ts b/src/Detail/components/BookInfoBox/BookInfoBox.style.ts new file mode 100644 index 00000000..99ad13ca --- /dev/null +++ b/src/Detail/components/BookInfoBox/BookInfoBox.style.ts @@ -0,0 +1,69 @@ +import styled from '@emotion/styled'; + +export const BookInfoBoxWrapper = styled.div<{ isDarkMode?: boolean }>` + display: flex; + + width: 100%; + height: 18.3em; + + background-color: ${({ isDarkMode, theme }) => + isDarkMode ? theme.colors.white : theme.colors.BG}; +`; + +export const ProfileImageWrapper = styled.div` + display: flex; + align-items: center; + + margin-left: 1.6rem; +`; + +export const ProfileImg = styled.img` + width: 12.6rem; + height: 12.6rem; + + border-radius: 8.2rem; + + object-fit: cover; +`; + +export const BookInfoWrapper = styled.div` + padding: 2.2rem 1.7rem; +`; + +export const BookInfoHeader = styled.div` + display: flex; + align-items: center; + column-gap: 0.9rem; +`; + +export const BookInfoHeaderItemWrapper = styled.div` + display: flex; + align-items: center; + column-gap: 0.3rem; +`; + +export const BookInfoHeaderItem = styled.p<{ isDarkMode: boolean }>` + height: 1.8rem; + padding-top: 0.4rem; + + ${({ theme }) => theme.fonts.E_Caption_R_12}; + color: ${({ isDarkMode, theme }) => + isDarkMode ? theme.colors.MG : 'rgba(255, 255, 255, 0.3)'}; +`; + +export const BookInfoTitle = styled.p<{ isDarkMode: boolean }>` + margin-top: 0.7rem; + + ${({ theme }) => theme.fonts.Head2_SB_18}; + color: ${({ isDarkMode, theme }) => + isDarkMode ? theme.colors.BG : theme.colors.white}; +`; + +export const BookInfoContent = styled.p<{ isDarkMode: boolean }>` + height: 8.5rem; + margin-top: 1rem; + + ${({ theme }) => theme.fonts.Body3_R_14}; + color: ${({ isDarkMode, theme }) => + isDarkMode ? theme.colors.BG : 'rgba(255, 255, 255, 0.8)'}; +`; diff --git a/src/Detail/components/BookInfoBox/index.tsx b/src/Detail/components/BookInfoBox/index.tsx new file mode 100644 index 00000000..8f42e4d7 --- /dev/null +++ b/src/Detail/components/BookInfoBox/index.tsx @@ -0,0 +1,58 @@ +import { IcCrown, IcDate } from '../../../assets'; +import { + BookInfoBoxWrapper, + BookInfoContent, + BookInfoHeader, + BookInfoHeaderItem, + BookInfoHeaderItemWrapper, + BookInfoTitle, + BookInfoWrapper, + ProfileImageWrapper, + ProfileImg, +} from './BookInfoBox.style'; + +interface BookInfoBoxProps { + profileImg: string; + date: string; + nickname: string; + title: string; + content: string; + isDarkMode: boolean; +} + +function BookInfoBox({ + profileImg, + date, + nickname, + title, + content, + isDarkMode, +}: BookInfoBoxProps) { + return ( + + + + + + + + + + {date} + + + + + + {nickname} + + + + {title} + {content} + + + ); +} + +export default BookInfoBox; diff --git a/src/Detail/components/BookInfoContainer/index.tsx b/src/Detail/components/BookInfoContainer/index.tsx new file mode 100644 index 00000000..8830a269 --- /dev/null +++ b/src/Detail/components/BookInfoContainer/index.tsx @@ -0,0 +1,38 @@ +import BookInfoBox from '../BookInfoBox'; +import SlideBanner from '../SlideBanner'; + +interface BookInfoContainerProps { + name: string; + profileImg: string; + date: string; + nickname: string; + title: string; + content: string; + isDarkMode: boolean; +} + +function BookInfoContainer({ + name, + profileImg, + date, + nickname, + title, + content, + isDarkMode, +}: BookInfoContainerProps) { + return ( +
+ + +
+ ); +} + +export default BookInfoContainer; diff --git a/src/Detail/page/DetailPage.tsx b/src/Detail/page/DetailPage.tsx index 052241e5..37ffa32a 100644 --- a/src/Detail/page/DetailPage.tsx +++ b/src/Detail/page/DetailPage.tsx @@ -1,11 +1,25 @@ import Header from '../../components/common/Header'; -import Profile from '../components/Profile'; +import BookInfoContainer from '../components/BookInfoContainer'; + +// test + +const testProp = { + name: 'LeoJ', + profileImg: + 'https://s3-alpha-sig.figma.com/img/db13/905b/40596e7ff9d7e2c5d23d2b59eaed1a7f?Expires=1705276800&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=YdVtmax5JokofS88zzvQYV8dhDYNr5gALJf1s0eyCl9siaRilm9ZtXOtCSOe~UsH~~K5jEkb81jG3ccCA9FJ25BvUgR9K388K7h90OcCHmn-Wo4enHTIV85J2U2yIiOqh8IDoKNxG9H2hHxKVBU8GzdNitXCkUHtAaxTZRN4taiMZkVFyrFCEw-04VBKywXmAAOd3EaWJ0rJgKqecBpOKnB6DT6HgHlX3wxWhHsQI1KKqueJmXLhT4n-AxWCVALVJDdoT3VvB9-AsecG5C6og89535kPkOmVxUhwhQunmAmWYev0bPDhaSQpVDUwyVDUHgVUmuENYB4Y017o5RjiFA__', + date: '2024.01.25', + nickname: '큐야', + title: '첫 예능 라디오스타 축하해!', + content: + '우리만의 스타 레오제이 !! 3년만에 첫 예능이자 라디오스타 출연 넘 축하해~!! 앞으로 계속 이렇게 우리 옆에 있어줘! 항상 응원할게! 어그래그래어엉', + isDarkMode: true, +}; function DetailPage() { return (
- +
); } diff --git a/src/Router.tsx b/src/Router.tsx index 16e4af3a..7467967f 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -1,5 +1,6 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; +import DetailPage from './Detail/page/DetailPage'; import HomePage from './Home/page/HomePage'; function Router() { @@ -7,6 +8,7 @@ function Router() { } /> + } /> ); From 219f36a7e630e5ab7d9c02cc6b2d9f9d5052e21b Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Fri, 5 Jan 2024 22:16:56 +0900 Subject: [PATCH 034/653] =?UTF-8?q?style:=20css=20=EC=86=8D=EC=84=B1=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BookInfoBox/BookInfoBox.style.ts | 6 +++--- .../components/SlideBanner/SlideBanner.style.ts | 13 ++++++++----- .../SlideBannerItem/SlideBannerItem.style.ts | 5 +++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Detail/components/BookInfoBox/BookInfoBox.style.ts b/src/Detail/components/BookInfoBox/BookInfoBox.style.ts index 99ad13ca..a59a95f6 100644 --- a/src/Detail/components/BookInfoBox/BookInfoBox.style.ts +++ b/src/Detail/components/BookInfoBox/BookInfoBox.style.ts @@ -46,24 +46,24 @@ export const BookInfoHeaderItem = styled.p<{ isDarkMode: boolean }>` height: 1.8rem; padding-top: 0.4rem; - ${({ theme }) => theme.fonts.E_Caption_R_12}; color: ${({ isDarkMode, theme }) => isDarkMode ? theme.colors.MG : 'rgba(255, 255, 255, 0.3)'}; + ${({ theme }) => theme.fonts.E_Caption_R_12}; `; export const BookInfoTitle = styled.p<{ isDarkMode: boolean }>` margin-top: 0.7rem; - ${({ theme }) => theme.fonts.Head2_SB_18}; color: ${({ isDarkMode, theme }) => isDarkMode ? theme.colors.BG : theme.colors.white}; + ${({ theme }) => theme.fonts.Head2_SB_18}; `; export const BookInfoContent = styled.p<{ isDarkMode: boolean }>` height: 8.5rem; margin-top: 1rem; - ${({ theme }) => theme.fonts.Body3_R_14}; color: ${({ isDarkMode, theme }) => isDarkMode ? theme.colors.BG : 'rgba(255, 255, 255, 0.8)'}; + ${({ theme }) => theme.fonts.Body3_R_14}; `; diff --git a/src/Detail/components/SlideBanner/SlideBanner.style.ts b/src/Detail/components/SlideBanner/SlideBanner.style.ts index 9a934dab..dbebb5d6 100644 --- a/src/Detail/components/SlideBanner/SlideBanner.style.ts +++ b/src/Detail/components/SlideBanner/SlideBanner.style.ts @@ -14,23 +14,26 @@ export const infiniteSlide = keyframes` export const SliderBannerWrapper = styled.div` width: 100%; height: 4.4rem; + + border-bottom: 0.1rem solid ${({ theme }) => theme.colors.BG}; background-color: ${({ theme }) => theme.colors.key}; + overflow: hidden; - border-bottom: 0.1rem solid ${({ theme }) => theme.colors.BG}; `; export const AnimationBox = styled.div` - height: 100%; display: flex; + + height: 100%; + animation: ${infiniteSlide}; animation-timing-function: linear; animation-iteration-count: infinite; `; export const SlideBannerItemList = styled.div` - height: 100%; display: flex; align-items: center; - /* column-gap: 0.6rem; */ - font-size: 24px; + + height: 100%; `; diff --git a/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts b/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts index 0e13eb5c..ca223881 100644 --- a/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts +++ b/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts @@ -1,10 +1,11 @@ import styled from '@emotion/styled'; export const SliderBannerItemWrapper = styled.div` - margin-right: 0.6rem; display: flex; - width: auto; flex-shrink: 0; + + width: auto; + margin-right: 0.6rem; `; export const Name = styled.p` From a08c49a9a595cb77b90d00068699ee1e86e32207 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Sat, 6 Jan 2024 17:04:55 +0900 Subject: [PATCH 035/653] =?UTF-8?q?refactor:=20=ED=98=B8=EC=B6=9C=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=A0=AC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/SlideBanner/index.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Detail/components/SlideBanner/index.tsx b/src/Detail/components/SlideBanner/index.tsx index 7dbb1ff4..5644ce90 100644 --- a/src/Detail/components/SlideBanner/index.tsx +++ b/src/Detail/components/SlideBanner/index.tsx @@ -17,6 +17,12 @@ function SlideBanner({ name }: SlideBannerProps) { const [animationListWidth, setAnimationListWidth] = useState(0); const [animationDuration, setAnimationDuration] = useState(10); + const renderSlideBannerItems = () => { + return Array.from({ length: 10 }, (_, index) => ( + + )); + }; + useEffect(() => { if (itemBoxRef.current) { const itemBoxWidth = itemBoxRef.current.offsetWidth; @@ -32,12 +38,6 @@ function SlideBanner({ name }: SlideBannerProps) { } }, [name]); - const renderSlideBannerItems = () => { - return Array.from({ length: 10 }, (_, index) => ( - - )); - }; - return ( Date: Sat, 6 Jan 2024 17:55:01 +0900 Subject: [PATCH 036/653] =?UTF-8?q?fix:=20isDarkMode=20prop=20=EC=98=B5?= =?UTF-8?q?=EC=85=94=EB=84=90=20=EA=B0=92=EC=97=90=EC=84=9C=20=ED=95=84?= =?UTF-8?q?=EC=88=98=20=EA=B0=92=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/BookInfoBox/BookInfoBox.style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Detail/components/BookInfoBox/BookInfoBox.style.ts b/src/Detail/components/BookInfoBox/BookInfoBox.style.ts index a59a95f6..ba49202a 100644 --- a/src/Detail/components/BookInfoBox/BookInfoBox.style.ts +++ b/src/Detail/components/BookInfoBox/BookInfoBox.style.ts @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -export const BookInfoBoxWrapper = styled.div<{ isDarkMode?: boolean }>` +export const BookInfoBoxWrapper = styled.div<{ isDarkMode: boolean }>` display: flex; width: 100%; From d237e56896bca10edd641514517f1047a8d86814 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Sat, 6 Jan 2024 17:56:38 +0900 Subject: [PATCH 037/653] =?UTF-8?q?feat:=20Home/Main=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/.gitkeep | 0 src/Home/components/Main/Main.style.ts | 39 ++++++++++++++++++++++++++ src/Home/components/Main/index.tsx | 28 ++++++++++++++++++ src/Router.tsx | 4 +-- 4 files changed, 69 insertions(+), 2 deletions(-) delete mode 100644 src/Home/components/.gitkeep create mode 100644 src/Home/components/Main/Main.style.ts create mode 100644 src/Home/components/Main/index.tsx diff --git a/src/Home/components/.gitkeep b/src/Home/components/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/Main/Main.style.ts new file mode 100644 index 00000000..22b053a5 --- /dev/null +++ b/src/Home/components/Main/Main.style.ts @@ -0,0 +1,39 @@ +import styled from '@emotion/styled'; + +export type ButtonStyle = 'making' | 'mypage'; + +export const MainWrapper = styled.div` + background-color: ${({ theme }) => theme.colors.background}; + width: 100%; + height: 34.7rem; +`; + +export const IconWrapper = styled.section` + display: flex; + width: 100%; + padding: 6rem 1.6rem 5rem 1.6rem; + gap: 15.7rem; +`; + +export const ButtonWrapper = styled.section` + display: flex; + flex-direction: column; + gap: 1rem; +`; + +export const Button = styled.button<{ variant: ButtonStyle }>` + width: 28rem; + height: 6.4rem; + + background-color: ${({ theme, variant }) => + variant === 'making' ? theme.colors.white : theme.colors.BG}; + + color: ${({ theme, variant }) => + variant === 'making' ? theme.colors.BG : theme.colors.white}; + + border: 0.1rem solid ${({ theme }) => theme.colors.BG}; + border-left: none; + border-radius: 0 0.2rem 0.2rem 0; + + ${({ theme }) => theme.fonts.Title1_SB_16} +`; diff --git a/src/Home/components/Main/index.tsx b/src/Home/components/Main/index.tsx new file mode 100644 index 00000000..6f641e9b --- /dev/null +++ b/src/Home/components/Main/index.tsx @@ -0,0 +1,28 @@ +import { IcNotice, ImgLogoLecue } from '../../../assets'; +import * as S from './Main.style'; + +function Main() { + return ( + + + + + + + + + 레큐북 만들기 + + + 내 기록 보러가기 + + + + ); +} + +export default Main; diff --git a/src/Router.tsx b/src/Router.tsx index 16e4af3a..d0902a02 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -1,12 +1,12 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; -import HomePage from './Home/page/HomePage'; +import Home from './Home/page'; function Router() { return ( - } /> + } /> ); From 67586d5f96f830c265a5fdf4630b13319aabae22 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Sat, 6 Jan 2024 18:09:30 +0900 Subject: [PATCH 038/653] =?UTF-8?q?chore:=20stylelint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/Main/Main.style.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/Main/Main.style.ts index 22b053a5..8455511d 100644 --- a/src/Home/components/Main/Main.style.ts +++ b/src/Home/components/Main/Main.style.ts @@ -3,21 +3,24 @@ import styled from '@emotion/styled'; export type ButtonStyle = 'making' | 'mypage'; export const MainWrapper = styled.div` - background-color: ${({ theme }) => theme.colors.background}; width: 100%; height: 34.7rem; + + background-color: ${({ theme }) => theme.colors.background}; `; export const IconWrapper = styled.section` display: flex; + width: 100%; - padding: 6rem 1.6rem 5rem 1.6rem; + padding: 6rem 1.6rem 5rem; gap: 15.7rem; `; export const ButtonWrapper = styled.section` display: flex; flex-direction: column; + gap: 1rem; `; @@ -25,15 +28,13 @@ export const Button = styled.button<{ variant: ButtonStyle }>` width: 28rem; height: 6.4rem; + border: 0.1rem solid ${({ theme }) => theme.colors.BG}; + border-radius: 0 0.2rem 0.2rem 0; + border-left: none; background-color: ${({ theme, variant }) => variant === 'making' ? theme.colors.white : theme.colors.BG}; - color: ${({ theme, variant }) => variant === 'making' ? theme.colors.BG : theme.colors.white}; - border: 0.1rem solid ${({ theme }) => theme.colors.BG}; - border-left: none; - border-radius: 0 0.2rem 0.2rem 0; - ${({ theme }) => theme.fonts.Title1_SB_16} `; From 60a5991651b80fd7cd91d827d808f726968fd469 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Sat, 6 Jan 2024 18:10:50 +0900 Subject: [PATCH 039/653] =?UTF-8?q?chore:=20stylelint=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=20(font=20=EA=B0=9C=ED=96=89=20=EC=88=98=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/Main/Main.style.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/Main/Main.style.ts index 8455511d..0e0099c4 100644 --- a/src/Home/components/Main/Main.style.ts +++ b/src/Home/components/Main/Main.style.ts @@ -35,6 +35,5 @@ export const Button = styled.button<{ variant: ButtonStyle }>` variant === 'making' ? theme.colors.white : theme.colors.BG}; color: ${({ theme, variant }) => variant === 'making' ? theme.colors.BG : theme.colors.white}; - ${({ theme }) => theme.fonts.Title1_SB_16} `; From d4c984e18adf187889395a6419364da50aa05f50 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Sat, 6 Jan 2024 18:26:29 +0900 Subject: [PATCH 040/653] =?UTF-8?q?refactor:=20=EC=9D=B8=EB=9D=BC=EC=9D=B8?= =?UTF-8?q?=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EA=B0=92=20prop=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=84=98=EA=B2=A8=EC=A3=BC=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/SlideBanner/SlideBanner.style.ts | 10 ++++++++-- src/Detail/components/SlideBanner/index.tsx | 12 +++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Detail/components/SlideBanner/SlideBanner.style.ts b/src/Detail/components/SlideBanner/SlideBanner.style.ts index dbebb5d6..92086105 100644 --- a/src/Detail/components/SlideBanner/SlideBanner.style.ts +++ b/src/Detail/components/SlideBanner/SlideBanner.style.ts @@ -21,19 +21,25 @@ export const SliderBannerWrapper = styled.div` overflow: hidden; `; -export const AnimationBox = styled.div` +export const AnimationBox = styled.div<{ + width: number; + animationDuration: number; +}>` display: flex; + width: ${(props) => props.width}rem; height: 100%; animation: ${infiniteSlide}; + animation-duration: ${(props) => props.animationDuration}s; animation-timing-function: linear; animation-iteration-count: infinite; `; -export const SlideBannerItemList = styled.div` +export const SlideBannerItemList = styled.div<{ width: number }>` display: flex; align-items: center; + width: ${(props) => props.width}rem; height: 100%; `; diff --git a/src/Detail/components/SlideBanner/index.tsx b/src/Detail/components/SlideBanner/index.tsx index 5644ce90..98d9e4a7 100644 --- a/src/Detail/components/SlideBanner/index.tsx +++ b/src/Detail/components/SlideBanner/index.tsx @@ -27,7 +27,7 @@ function SlideBanner({ name }: SlideBannerProps) { if (itemBoxRef.current) { const itemBoxWidth = itemBoxRef.current.offsetWidth; - const itemListWidth = itemBoxWidth * 10 + 57; + const itemListWidth = itemBoxWidth + 6; setItemListWidth(itemListWidth); setAnimationListWidth(itemListWidth * 2); @@ -41,15 +41,13 @@ function SlideBanner({ name }: SlideBannerProps) { return ( - + {renderSlideBannerItems()} - + {renderSlideBannerItems()} From 58df9426b98508535318fe667cceaf03689b5c06 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Sat, 6 Jan 2024 18:35:48 +0900 Subject: [PATCH 041/653] =?UTF-8?q?refactor:=20=EC=8A=A4=ED=83=80=EC=9D=BC?= =?UTF-8?q?=20=EC=BB=A8=EB=B2=A4=EC=85=98=EA=B3=BC=20=EC=9D=BC=EC=B9=98?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/BookInfoBox/index.tsx | 50 ++++++++----------- src/Detail/components/SlideBanner/index.tsx | 22 ++++---- .../components/SlideBannerItem/index.tsx | 8 +-- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/src/Detail/components/BookInfoBox/index.tsx b/src/Detail/components/BookInfoBox/index.tsx index 8f42e4d7..d6ef74d0 100644 --- a/src/Detail/components/BookInfoBox/index.tsx +++ b/src/Detail/components/BookInfoBox/index.tsx @@ -1,15 +1,5 @@ import { IcCrown, IcDate } from '../../../assets'; -import { - BookInfoBoxWrapper, - BookInfoContent, - BookInfoHeader, - BookInfoHeaderItem, - BookInfoHeaderItemWrapper, - BookInfoTitle, - BookInfoWrapper, - ProfileImageWrapper, - ProfileImg, -} from './BookInfoBox.style'; +import * as S from './BookInfoBox.style'; interface BookInfoBoxProps { profileImg: string; @@ -29,29 +19,29 @@ function BookInfoBox({ isDarkMode, }: BookInfoBoxProps) { return ( - - - - - - - + + + + + + + - + {date} - - - + + + - + {nickname} - - - - {title} - {content} - - + + + + {title} + {content} + + ); } diff --git a/src/Detail/components/SlideBanner/index.tsx b/src/Detail/components/SlideBanner/index.tsx index 98d9e4a7..289e3bee 100644 --- a/src/Detail/components/SlideBanner/index.tsx +++ b/src/Detail/components/SlideBanner/index.tsx @@ -1,11 +1,7 @@ import { useEffect, useRef, useState } from 'react'; import SlideBannerItem from '../SlideBannerItem'; -import { - AnimationBox, - SlideBannerItemList, - SliderBannerWrapper, -} from './SlideBanner.style'; +import * as S from './SlideBanner.style'; interface SlideBannerProps { name: string; @@ -39,19 +35,19 @@ function SlideBanner({ name }: SlideBannerProps) { }, [name]); return ( - - + - + {renderSlideBannerItems()} - - + + {renderSlideBannerItems()} - - - + + + ); } diff --git a/src/Detail/components/SlideBannerItem/index.tsx b/src/Detail/components/SlideBannerItem/index.tsx index 6df4a69c..2a0cf1e9 100644 --- a/src/Detail/components/SlideBannerItem/index.tsx +++ b/src/Detail/components/SlideBannerItem/index.tsx @@ -1,7 +1,7 @@ import React, { forwardRef } from 'react'; import { ImgLe, ImgStar } from '../../../assets'; -import { Name, SliderBannerItemWrapper } from './SlideBannerItem.style'; +import * as S from './SlideBannerItem.style'; interface SlideBannerItemProps { name: string; @@ -12,11 +12,11 @@ const SlideBannerItem = forwardRef(function SlideBannerItem( ref: React.Ref, ) { return ( - }> + }> - {`( ${name} )`} + {`( ${name} )`} - + ); }); From 2220850c7493e060e687305ac58d7446c67e470a Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Sat, 6 Jan 2024 19:21:10 +0900 Subject: [PATCH 042/653] =?UTF-8?q?docs:=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=ED=8F=B4=EB=8D=94=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EB=B0=8F=20=ED=8C=8C=EC=9D=BC=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/page/{DetailPage.tsx => DetailPage/index.tsx} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename src/Detail/page/{DetailPage.tsx => DetailPage/index.tsx} (86%) diff --git a/src/Detail/page/DetailPage.tsx b/src/Detail/page/DetailPage/index.tsx similarity index 86% rename from src/Detail/page/DetailPage.tsx rename to src/Detail/page/DetailPage/index.tsx index 37ffa32a..b18f5b3c 100644 --- a/src/Detail/page/DetailPage.tsx +++ b/src/Detail/page/DetailPage/index.tsx @@ -1,10 +1,10 @@ -import Header from '../../components/common/Header'; -import BookInfoContainer from '../components/BookInfoContainer'; +import Header from '../../../components/common/Header'; +import BookInfoContainer from '../../components/BookInfoContainer'; // test const testProp = { - name: 'LeoJ', + name: '레오제이', profileImg: 'https://s3-alpha-sig.figma.com/img/db13/905b/40596e7ff9d7e2c5d23d2b59eaed1a7f?Expires=1705276800&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=YdVtmax5JokofS88zzvQYV8dhDYNr5gALJf1s0eyCl9siaRilm9ZtXOtCSOe~UsH~~K5jEkb81jG3ccCA9FJ25BvUgR9K388K7h90OcCHmn-Wo4enHTIV85J2U2yIiOqh8IDoKNxG9H2hHxKVBU8GzdNitXCkUHtAaxTZRN4taiMZkVFyrFCEw-04VBKywXmAAOd3EaWJ0rJgKqecBpOKnB6DT6HgHlX3wxWhHsQI1KKqueJmXLhT4n-AxWCVALVJDdoT3VvB9-AsecG5C6og89535kPkOmVxUhwhQunmAmWYev0bPDhaSQpVDUwyVDUHgVUmuENYB4Y017o5RjiFA__', date: '2024.01.25', @@ -12,7 +12,7 @@ const testProp = { title: '첫 예능 라디오스타 축하해!', content: '우리만의 스타 레오제이 !! 3년만에 첫 예능이자 라디오스타 출연 넘 축하해~!! 앞으로 계속 이렇게 우리 옆에 있어줘! 항상 응원할게! 어그래그래어엉', - isDarkMode: true, + isDarkMode: false, }; function DetailPage() { From fad6d762b4d260054f93a964661e13cae230a128 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Sat, 6 Jan 2024 19:22:29 +0900 Subject: [PATCH 043/653] =?UTF-8?q?chore:=20stylelint=20gap,grid=20?= =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .stylelintrc.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.stylelintrc.json b/.stylelintrc.json index e67f227e..e7750f1a 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -22,6 +22,7 @@ "noEmptyLineBetween": true, "properties": [ "display", + "gap", "justify-content", "align-items", "flex-direction", @@ -30,6 +31,12 @@ "flex-grow", "flex-shrink", "flex-basis", + "grid-template-columns", + "grid-area", + "grid-template-rows", + "grid-column", + "grid-template-areas", + "grid-gap", "position", "top", "right", @@ -77,6 +84,8 @@ "border-style", "background", "background-color", + "background-position", + "background-size", "color", "font-style", "font-weight", From 29bfc0ec9044be75ff4244d5b0fd353f5068483d Mon Sep 17 00:00:00 2001 From: eunbeann Date: Sat, 6 Jan 2024 19:23:45 +0900 Subject: [PATCH 044/653] =?UTF-8?q?style:=20stylelint=20=EB=8B=B9=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/StickerList/StickerList.style.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/StickerPack/components/StickerList/StickerList.style.ts b/src/StickerPack/components/StickerList/StickerList.style.ts index 74016fb6..296e13f8 100644 --- a/src/StickerPack/components/StickerList/StickerList.style.ts +++ b/src/StickerPack/components/StickerList/StickerList.style.ts @@ -18,12 +18,10 @@ export const Title = styled.header` export const StickerGridWrapper = styled.div` display: grid; - - width: 100%; - + gap: 2.15rem 1.6rem; grid-template-columns: repeat(3, 1fr); - gap: 2.15rem 1.6rem; + width: 100%; `; export const ImageComponent = styled.button<{ @@ -38,8 +36,6 @@ export const ImageComponent = styled.button<{ isSelected ? theme.colors.key : theme.colors.BG}; border-radius: 0.4rem; background: url(${({ url }) => url};); - - background-size: 10rem 10rem; - background-position: center; + background-size: 10rem 10rem; `; From 1f51d0ee3a88eb3b82488a57be523fb7912f8346 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Sat, 6 Jan 2024 19:41:11 +0900 Subject: [PATCH 045/653] =?UTF-8?q?style:=20sticker=20handle=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/StickerList/StickerList.style.ts | 4 ++-- src/StickerPack/components/StickerList/index.tsx | 10 +++------- src/StickerPack/page/StickerPack/StickerPack.style.ts | 2 +- src/StickerPack/page/StickerPack/index.tsx | 8 +++++++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/StickerPack/components/StickerList/StickerList.style.ts b/src/StickerPack/components/StickerList/StickerList.style.ts index 296e13f8..63755bef 100644 --- a/src/StickerPack/components/StickerList/StickerList.style.ts +++ b/src/StickerPack/components/StickerList/StickerList.style.ts @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -export const Wrapper = styled.div` +export const Wrapper = styled.section` display: flex; align-items: start; flex-direction: column; @@ -16,7 +16,7 @@ export const Title = styled.header` ${({ theme }) => theme.fonts.Head2_SB_18}; `; -export const StickerGridWrapper = styled.div` +export const StickerGridWrapper = styled.article` display: grid; gap: 2.15rem 1.6rem; grid-template-columns: repeat(3, 1fr); diff --git a/src/StickerPack/components/StickerList/index.tsx b/src/StickerPack/components/StickerList/index.tsx index 1d99782a..007d12b7 100644 --- a/src/StickerPack/components/StickerList/index.tsx +++ b/src/StickerPack/components/StickerList/index.tsx @@ -1,18 +1,14 @@ -import React, { Dispatch } from 'react'; +import React from 'react'; import * as S from './StickerList.style'; interface StickerListProps { isSelectedId: number | null; - setIsSelectedId: Dispatch>; + handleStickerClick: (stickerId: number) => void; } function StickerList(props: StickerListProps) { - const { isSelectedId, setIsSelectedId } = props; - - const handleStickerClick = (stickerId: number) => { - setIsSelectedId(stickerId); - }; + const { isSelectedId, handleStickerClick } = props; return ( diff --git a/src/StickerPack/page/StickerPack/StickerPack.style.ts b/src/StickerPack/page/StickerPack/StickerPack.style.ts index f3eef296..2175191d 100644 --- a/src/StickerPack/page/StickerPack/StickerPack.style.ts +++ b/src/StickerPack/page/StickerPack/StickerPack.style.ts @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -export const Body = styled.div` +export const Body = styled.section` display: flex; justify-content: center; align-items: center; diff --git a/src/StickerPack/page/StickerPack/index.tsx b/src/StickerPack/page/StickerPack/index.tsx index 20b4b1c3..b8452399 100644 --- a/src/StickerPack/page/StickerPack/index.tsx +++ b/src/StickerPack/page/StickerPack/index.tsx @@ -9,16 +9,22 @@ import * as S from './StickerPack.style.ts'; function StickerPack() { const [isSelectedId, setIsSelectedId] = useState(null); + + const handleStickerClick = (stickerId: number) => { + setIsSelectedId(stickerId); + }; + const handleClickDone = () => { alert(`${isSelectedId}`); }; + return ( <>
- + - + 레큐북 만들기 - + 내 기록 보러가기 From fd711e5b370a970f2d8af8c0d92ab732de336530 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 01:17:11 +0900 Subject: [PATCH 051/653] =?UTF-8?q?feat:=20=EC=9D=B8=EA=B8=B0=EB=A0=88?= =?UTF-8?q?=ED=81=90=EB=B6=81=20=EC=9A=94=EC=86=8C=20=EB=B3=84=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/LecueBookList/LecueBookList.style.ts | 2 ++ src/Home/components/LecueBookList/index.tsx | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Home/components/LecueBookList/LecueBookList.style.ts b/src/Home/components/LecueBookList/LecueBookList.style.ts index 04ec0361..3cfa1820 100644 --- a/src/Home/components/LecueBookList/LecueBookList.style.ts +++ b/src/Home/components/LecueBookList/LecueBookList.style.ts @@ -39,6 +39,8 @@ export const LecueBook = styled.li` width: 10rem; height: 14rem; gap: 1rem; + + cursor: pointer; `; export const BookImage = styled.img` diff --git a/src/Home/components/LecueBookList/index.tsx b/src/Home/components/LecueBookList/index.tsx index 191e2973..42713c66 100644 --- a/src/Home/components/LecueBookList/index.tsx +++ b/src/Home/components/LecueBookList/index.tsx @@ -1,12 +1,19 @@ import * as S from './LecueBookList.style'; function LecueBookList() { + const handleClickLecueBook = (bookName: string) => { + alert(`${bookName} 선택되었습니다.`); + }; + return ( 인기 레큐북 구경하기 {BOOK_LIST.map((book) => ( - + handleClickLecueBook(book.favoriteName)} + > {book.favoriteName} From 6addf5e1f52ee922abf2ac2716ec323f7303d55d Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 19:40:43 +0900 Subject: [PATCH 052/653] =?UTF-8?q?chore:=20=ED=95=84=EC=9A=94=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/LecueBookList/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Home/components/LecueBookList/index.tsx b/src/Home/components/LecueBookList/index.tsx index 42713c66..eae43468 100644 --- a/src/Home/components/LecueBookList/index.tsx +++ b/src/Home/components/LecueBookList/index.tsx @@ -18,7 +18,6 @@ function LecueBookList() { {book.favoriteName} ))} - ; ); From 8494f595618ac7da374cd9804cca98b4aa5dc300 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 19:53:10 +0900 Subject: [PATCH 053/653] =?UTF-8?q?feat:=20BookTitle=20style=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/LecueBookList/LecueBookList.style.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Home/components/LecueBookList/LecueBookList.style.ts b/src/Home/components/LecueBookList/LecueBookList.style.ts index 3cfa1820..6d88bd28 100644 --- a/src/Home/components/LecueBookList/LecueBookList.style.ts +++ b/src/Home/components/LecueBookList/LecueBookList.style.ts @@ -51,11 +51,11 @@ export const BookImage = styled.img` `; export const BookTitle = styled.p` - width: 80%; + width: 100%; ${({ theme }) => theme.fonts.E_Body1_SB_14}; text-align: center; word-wrap: normal; - word-break: keep-all; + word-break: break-all; `; From b83f392679fdcc8f138f10d5a4efbbf9bfeffc94 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 19:54:00 +0900 Subject: [PATCH 054/653] =?UTF-8?q?feat:=20theme=20=EB=B3=80=EA=B2=BD(E=5F?= =?UTF-8?q?Body1=5FSB=5F14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/theme.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/theme.ts b/src/styles/theme.ts index 1e052ae4..6380a961 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -120,7 +120,7 @@ const fonts = { fontStyle: 'normal', fontWeight: 600, fontSize: '1.4rem', - lineHeight: 'auto', + lineHeight: '120%', letterSpacing: '0', }, E_Body2_R_14: { From 712980564dc98c11f1d1f9afeb6a50f6386914f0 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Mon, 8 Jan 2024 20:10:13 +0900 Subject: [PATCH 055/653] =?UTF-8?q?feat:=20a=ED=83=9C=EA=B7=B8=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/Main/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Home/components/Main/index.tsx b/src/Home/components/Main/index.tsx index 323486ba..a69d1cfa 100644 --- a/src/Home/components/Main/index.tsx +++ b/src/Home/components/Main/index.tsx @@ -19,6 +19,7 @@ function Main() { From 07dbe771c61694f4b9352cfdf56eaf9244110941 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 9 Jan 2024 01:57:39 +0900 Subject: [PATCH 056/653] =?UTF-8?q?fix:=20=ED=99=95=EC=9E=A5=EC=84=B1=20?= =?UTF-8?q?=EC=9C=84=ED=95=B4=20backgroundColor=20prop=EC=9D=84=20number?= =?UTF-8?q?=20type=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookInfoBox/BookInfoBox.style.ts | 48 ++++++++++++++----- src/Detail/components/BookInfoBox/index.tsx | 18 ++++--- .../components/BookInfoContainer/index.tsx | 6 +-- src/Detail/page/DetailPage/index.tsx | 2 +- 4 files changed, 51 insertions(+), 23 deletions(-) diff --git a/src/Detail/components/BookInfoBox/BookInfoBox.style.ts b/src/Detail/components/BookInfoBox/BookInfoBox.style.ts index ba49202a..ce4ca4a4 100644 --- a/src/Detail/components/BookInfoBox/BookInfoBox.style.ts +++ b/src/Detail/components/BookInfoBox/BookInfoBox.style.ts @@ -1,13 +1,19 @@ import styled from '@emotion/styled'; -export const BookInfoBoxWrapper = styled.div<{ isDarkMode: boolean }>` +export const BookInfoBoxWrapper = styled.div<{ backgroundColor: number }>` display: flex; width: 100%; height: 18.3em; - background-color: ${({ isDarkMode, theme }) => - isDarkMode ? theme.colors.white : theme.colors.BG}; + background-color: ${({ theme, backgroundColor }) => { + switch (backgroundColor) { + case 0: + return theme.colors.BG; + case 1: + return theme.colors.white; + } + }}; `; export const ProfileImageWrapper = styled.div` @@ -42,28 +48,46 @@ export const BookInfoHeaderItemWrapper = styled.div` column-gap: 0.3rem; `; -export const BookInfoHeaderItem = styled.p<{ isDarkMode: boolean }>` +export const BookInfoHeaderItem = styled.p<{ backgroundColor: number }>` height: 1.8rem; padding-top: 0.4rem; - color: ${({ isDarkMode, theme }) => - isDarkMode ? theme.colors.MG : 'rgba(255, 255, 255, 0.3)'}; + color: ${({ theme, backgroundColor }) => { + switch (backgroundColor) { + case 0: + return 'rgba(255, 255, 255, 0.3)'; + case 1: + return theme.colors.MG; + } + }}; ${({ theme }) => theme.fonts.E_Caption_R_12}; `; -export const BookInfoTitle = styled.p<{ isDarkMode: boolean }>` +export const BookInfoTitle = styled.p<{ backgroundColor: number }>` margin-top: 0.7rem; - color: ${({ isDarkMode, theme }) => - isDarkMode ? theme.colors.BG : theme.colors.white}; + color: ${({ theme, backgroundColor }) => { + switch (backgroundColor) { + case 0: + return theme.colors.white; + case 1: + return theme.colors.BG; + } + }}; ${({ theme }) => theme.fonts.Head2_SB_18}; `; -export const BookInfoContent = styled.p<{ isDarkMode: boolean }>` +export const BookInfoContent = styled.p<{ backgroundColor: number }>` height: 8.5rem; margin-top: 1rem; - color: ${({ isDarkMode, theme }) => - isDarkMode ? theme.colors.BG : 'rgba(255, 255, 255, 0.8)'}; + color: ${({ theme, backgroundColor }) => { + switch (backgroundColor) { + case 0: + return 'rgba(255, 255, 255, 0.8)'; + case 1: + return theme.colors.BG; + } + }}; ${({ theme }) => theme.fonts.Body3_R_14}; `; diff --git a/src/Detail/components/BookInfoBox/index.tsx b/src/Detail/components/BookInfoBox/index.tsx index d6ef74d0..4fcaea64 100644 --- a/src/Detail/components/BookInfoBox/index.tsx +++ b/src/Detail/components/BookInfoBox/index.tsx @@ -7,7 +7,7 @@ interface BookInfoBoxProps { nickname: string; title: string; content: string; - isDarkMode: boolean; + backgroundColor: number; } function BookInfoBox({ @@ -16,10 +16,10 @@ function BookInfoBox({ nickname, title, content, - isDarkMode, + backgroundColor, }: BookInfoBoxProps) { return ( - + @@ -27,19 +27,23 @@ function BookInfoBox({ - + {date} - + {nickname} - {title} - {content} + + {title} + + + {content} + ); diff --git a/src/Detail/components/BookInfoContainer/index.tsx b/src/Detail/components/BookInfoContainer/index.tsx index 8830a269..0deae386 100644 --- a/src/Detail/components/BookInfoContainer/index.tsx +++ b/src/Detail/components/BookInfoContainer/index.tsx @@ -8,7 +8,7 @@ interface BookInfoContainerProps { nickname: string; title: string; content: string; - isDarkMode: boolean; + backgroundColor: number; } function BookInfoContainer({ @@ -18,7 +18,7 @@ function BookInfoContainer({ nickname, title, content, - isDarkMode, + backgroundColor, }: BookInfoContainerProps) { return (
@@ -29,7 +29,7 @@ function BookInfoContainer({ nickname={nickname} title={title} content={content} - isDarkMode={isDarkMode} + backgroundColor={backgroundColor} />
); diff --git a/src/Detail/page/DetailPage/index.tsx b/src/Detail/page/DetailPage/index.tsx index b18f5b3c..1d45756e 100644 --- a/src/Detail/page/DetailPage/index.tsx +++ b/src/Detail/page/DetailPage/index.tsx @@ -12,7 +12,7 @@ const testProp = { title: '첫 예능 라디오스타 축하해!', content: '우리만의 스타 레오제이 !! 3년만에 첫 예능이자 라디오스타 출연 넘 축하해~!! 앞으로 계속 이렇게 우리 옆에 있어줘! 항상 응원할게! 어그래그래어엉', - isDarkMode: false, + backgroundColor: 0, }; function DetailPage() { From 4ec0704923e530167c8e9e14af9028d8ddbe81bf Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 9 Jan 2024 02:15:56 +0900 Subject: [PATCH 057/653] =?UTF-8?q?fix:=20icon=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20import=20=EA=B2=BD=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/SlideBannerItem/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Detail/components/SlideBannerItem/index.tsx b/src/Detail/components/SlideBannerItem/index.tsx index 2a0cf1e9..db6dae47 100644 --- a/src/Detail/components/SlideBannerItem/index.tsx +++ b/src/Detail/components/SlideBannerItem/index.tsx @@ -1,6 +1,6 @@ import React, { forwardRef } from 'react'; -import { ImgLe, ImgStar } from '../../../assets'; +import { ImgLe, ImgStarOrangeLine } from '../../../assets'; import * as S from './SlideBannerItem.style'; interface SlideBannerItemProps { @@ -15,7 +15,7 @@ const SlideBannerItem = forwardRef(function SlideBannerItem( }> {`( ${name} )`} - + ); }); From 28fda115456ee3ebc42614f52e587c787464049b Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 9 Jan 2024 03:25:01 +0900 Subject: [PATCH 058/653] =?UTF-8?q?fix:=20svg=20=ED=8C=8C=EC=9D=BC=20width?= =?UTF-8?q?,=20height,=20viewBox=20=EC=86=8D=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/button/btn_floating_list.svg | 2 +- src/assets/button/btn_floating_postit.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/button/btn_floating_list.svg b/src/assets/button/btn_floating_list.svg index cb5228e7..e4095c5d 100644 --- a/src/assets/button/btn_floating_list.svg +++ b/src/assets/button/btn_floating_list.svg @@ -1,4 +1,4 @@ - + diff --git a/src/assets/button/btn_floating_postit.svg b/src/assets/button/btn_floating_postit.svg index 80403ef2..a9a22efe 100644 --- a/src/assets/button/btn_floating_postit.svg +++ b/src/assets/button/btn_floating_postit.svg @@ -1,4 +1,4 @@ - + From a0990ff17a26601d0246951a67c344429ed894f5 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 9 Jan 2024 03:37:12 +0900 Subject: [PATCH 059/653] =?UTF-8?q?feat:=20=EB=A0=88=ED=81=90=EB=85=B8?= =?UTF-8?q?=ED=8A=B8=20=EA=B0=9C=EC=88=98=20&=20=EC=A0=95=EB=A0=AC=20?= =?UTF-8?q?=EB=AA=A8=EB=93=9C=20=EB=B3=80=EA=B2=BD=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LecueNoteListHeader.style.ts | 40 +++++++++++++++++++ .../components/LecueNoteLIstHeader/index.tsx | 29 ++++++++++++++ .../LecueNoteListContainer.style.ts | 5 +++ .../LecueNoteListContainer/index.tsx | 29 ++++++++++++++ src/Detail/page/DetailPage/index.tsx | 6 +++ 5 files changed, 109 insertions(+) create mode 100644 src/Detail/components/LecueNoteLIstHeader/LecueNoteListHeader.style.ts create mode 100644 src/Detail/components/LecueNoteLIstHeader/index.tsx create mode 100644 src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts create mode 100644 src/Detail/components/LecueNoteListContainer/index.tsx diff --git a/src/Detail/components/LecueNoteLIstHeader/LecueNoteListHeader.style.ts b/src/Detail/components/LecueNoteLIstHeader/LecueNoteListHeader.style.ts new file mode 100644 index 00000000..27612994 --- /dev/null +++ b/src/Detail/components/LecueNoteLIstHeader/LecueNoteListHeader.style.ts @@ -0,0 +1,40 @@ +import styled from '@emotion/styled'; + +export const LecueNoteListHeaderWrapper = styled.div` + display: flex; + column-gap: 1rem; + + padding-top: 1.2rem; +`; + +export const LecueNoteCountBox = styled.div<{ backgroundColor: number }>` + display: flex; + justify-content: center; + align-items: center; + + padding: 1.05rem 1.8rem; + + border-radius: 7rem; + background-color: ${({ theme, backgroundColor }) => { + switch (backgroundColor) { + case 0: + return theme.colors.BG; + case 1: + return theme.colors.white; + } + }}; + color: ${({ theme, backgroundColor }) => { + switch (backgroundColor) { + case 0: + return theme.colors.white; + case 1: + return theme.colors.BG; + } + }}; + ${({ theme }) => theme.fonts.E_Body2_R_14}; +`; + +export const LecueNoteRenderModeButton = styled.button` + width: 3.8rem; + height: 3.8rem; +`; diff --git a/src/Detail/components/LecueNoteLIstHeader/index.tsx b/src/Detail/components/LecueNoteLIstHeader/index.tsx new file mode 100644 index 00000000..d68e152c --- /dev/null +++ b/src/Detail/components/LecueNoteLIstHeader/index.tsx @@ -0,0 +1,29 @@ +import { BtnFloatingList, BtnFloatingPostit } from '../../../assets'; +import * as S from './LecueNoteListHeader.style'; + +interface LecueNoteListHeaderProps { + noteNum: number; + backgroundColor: number; + isZigZagView: boolean; + buttonOnClick: () => void; +} + +function LecueNoteListHeader({ + noteNum, + backgroundColor, + isZigZagView, + buttonOnClick, +}: LecueNoteListHeaderProps) { + return ( + + {`${noteNum}개`} + + {isZigZagView ? : } + + + ); +} + +export default LecueNoteListHeader; diff --git a/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts b/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts new file mode 100644 index 00000000..08859479 --- /dev/null +++ b/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts @@ -0,0 +1,5 @@ +import styled from '@emotion/styled'; + +export const LecueNoteListContainerWrapper = styled.div` + padding: 0 1.65rem; +`; diff --git a/src/Detail/components/LecueNoteListContainer/index.tsx b/src/Detail/components/LecueNoteListContainer/index.tsx new file mode 100644 index 00000000..b45a95b5 --- /dev/null +++ b/src/Detail/components/LecueNoteListContainer/index.tsx @@ -0,0 +1,29 @@ +import { useState } from 'react'; + +import LecueNoteListHeader from '../LecueNoteLIstHeader'; +import * as S from './LecueNoteListContainer.style'; + +interface LecueNoteListContainerProps { + noteNum: number; + backgroundColor: number; +} + +function LecueNoteListContainer({ + noteNum, + backgroundColor, +}: LecueNoteListContainerProps) { + const [isZigZagView, setIsZigZagView] = useState(true); + + return ( + + setIsZigZagView(!isZigZagView)} + /> + + ); +} + +export default LecueNoteListContainer; diff --git a/src/Detail/page/DetailPage/index.tsx b/src/Detail/page/DetailPage/index.tsx index 1d45756e..57e700f3 100644 --- a/src/Detail/page/DetailPage/index.tsx +++ b/src/Detail/page/DetailPage/index.tsx @@ -1,5 +1,6 @@ import Header from '../../../components/common/Header'; import BookInfoContainer from '../../components/BookInfoContainer'; +import LecueNoteListContainer from '../../components/LecueNoteListContainer'; // test @@ -12,6 +13,7 @@ const testProp = { title: '첫 예능 라디오스타 축하해!', content: '우리만의 스타 레오제이 !! 3년만에 첫 예능이자 라디오스타 출연 넘 축하해~!! 앞으로 계속 이렇게 우리 옆에 있어줘! 항상 응원할게! 어그래그래어엉', + noteNum: 30, backgroundColor: 0, }; @@ -20,6 +22,10 @@ function DetailPage() {
+
); } From c349268c3ea1af79ef23e8461c9c237caad28e6a Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 9 Jan 2024 03:42:04 +0900 Subject: [PATCH 060/653] =?UTF-8?q?feat:=20=EB=A0=88=ED=81=90=EB=85=B8?= =?UTF-8?q?=ED=8A=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B7=B0=20=EB=8B=A4?= =?UTF-8?q?=ED=81=AC=EB=AA=A8=EB=93=9C=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LecueNoteListContainer.style.ts | 15 ++++++++++++++- .../components/LecueNoteListContainer/index.tsx | 2 +- src/Detail/page/DetailPage/index.tsx | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts b/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts index 08859479..15ef9d28 100644 --- a/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts +++ b/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts @@ -1,5 +1,18 @@ import styled from '@emotion/styled'; -export const LecueNoteListContainerWrapper = styled.div` +export const LecueNoteListContainerWrapper = styled.div<{ + backgroundColor: number; +}>` + height: 100vh; + + background-color: ${({ theme, backgroundColor }) => { + switch (backgroundColor) { + case 0: + return theme.colors.white; + case 1: + return theme.colors.BG; + } + }}; + padding: 0 1.65rem; `; diff --git a/src/Detail/components/LecueNoteListContainer/index.tsx b/src/Detail/components/LecueNoteListContainer/index.tsx index b45a95b5..31a95715 100644 --- a/src/Detail/components/LecueNoteListContainer/index.tsx +++ b/src/Detail/components/LecueNoteListContainer/index.tsx @@ -15,7 +15,7 @@ function LecueNoteListContainer({ const [isZigZagView, setIsZigZagView] = useState(true); return ( - + Date: Tue, 9 Jan 2024 13:17:03 +0900 Subject: [PATCH 061/653] =?UTF-8?q?refactor:=20type=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Home/components/Main/Main.style.ts | 8 +++----- src/Home/components/Main/index.tsx | 12 ++---------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/Main/Main.style.ts index d79e0d4b..5af2a3f0 100644 --- a/src/Home/components/Main/Main.style.ts +++ b/src/Home/components/Main/Main.style.ts @@ -1,7 +1,5 @@ import styled from '@emotion/styled'; -export type ButtonStyle = 'making' | 'mypage'; - export const MainWrapper = styled.div` width: 100%; height: 34.7rem; @@ -25,7 +23,7 @@ export const ButtonWrapper = styled.section` gap: 1rem; `; -export const Button = styled.button<{ variant: ButtonStyle }>` +export const Button = styled.button<{ variant?: boolean }>` width: 28rem; height: 6.4rem; @@ -33,8 +31,8 @@ export const Button = styled.button<{ variant: ButtonStyle }>` border-radius: 0 0.2rem 0.2rem 0; border-left: none; background-color: ${({ theme, variant }) => - variant === 'making' ? theme.colors.white : theme.colors.BG}; + variant ? theme.colors.white : theme.colors.BG}; color: ${({ theme, variant }) => - variant === 'making' ? theme.colors.BG : theme.colors.white}; + variant ? theme.colors.BG : theme.colors.white}; ${({ theme }) => theme.fonts.Title1_SB_16} `; diff --git a/src/Home/components/Main/index.tsx b/src/Home/components/Main/index.tsx index a69d1cfa..e24d28c6 100644 --- a/src/Home/components/Main/index.tsx +++ b/src/Home/components/Main/index.tsx @@ -26,18 +26,10 @@ function Main() { - + 레큐북 만들기 - + 내 기록 보러가기 From ca2a1f71b3cae70a99aac234cb0656a4d2462c35 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Tue, 9 Jan 2024 14:08:52 +0900 Subject: [PATCH 062/653] =?UTF-8?q?feat:=20=ED=95=84=EC=9A=94=ED=95=9C=20s?= =?UTF-8?q?vg=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/img_kakao_01.svg | 9 +++++++++ src/assets/img/img_kakao_02.svg | 9 +++++++++ src/assets/img/img_kakao_03.svg | 10 ++++++++++ src/assets/img/img_kakao_book.svg | 3 +++ src/assets/img/img_kakao_line.svg | 9 +++++++++ src/assets/img/img_kakao_logo.svg | 10 ++++++++++ src/assets/img/img_kakao_star_orange.svg | 3 +++ src/assets/img/img_kakao_star_white.svg | 3 +++ src/assets/index.ts | 18 +++++++++++++++++- 9 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 src/assets/img/img_kakao_01.svg create mode 100644 src/assets/img/img_kakao_02.svg create mode 100644 src/assets/img/img_kakao_03.svg create mode 100644 src/assets/img/img_kakao_book.svg create mode 100644 src/assets/img/img_kakao_line.svg create mode 100644 src/assets/img/img_kakao_logo.svg create mode 100644 src/assets/img/img_kakao_star_orange.svg create mode 100644 src/assets/img/img_kakao_star_white.svg diff --git a/src/assets/img/img_kakao_01.svg b/src/assets/img/img_kakao_01.svg new file mode 100644 index 00000000..68b2c297 --- /dev/null +++ b/src/assets/img/img_kakao_01.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/img/img_kakao_02.svg b/src/assets/img/img_kakao_02.svg new file mode 100644 index 00000000..c631b18c --- /dev/null +++ b/src/assets/img/img_kakao_02.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/img/img_kakao_03.svg b/src/assets/img/img_kakao_03.svg new file mode 100644 index 00000000..8b5db7e5 --- /dev/null +++ b/src/assets/img/img_kakao_03.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/img/img_kakao_book.svg b/src/assets/img/img_kakao_book.svg new file mode 100644 index 00000000..bc54ccc4 --- /dev/null +++ b/src/assets/img/img_kakao_book.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/img_kakao_line.svg b/src/assets/img/img_kakao_line.svg new file mode 100644 index 00000000..5f249bcc --- /dev/null +++ b/src/assets/img/img_kakao_line.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/img/img_kakao_logo.svg b/src/assets/img/img_kakao_logo.svg new file mode 100644 index 00000000..8843fc3a --- /dev/null +++ b/src/assets/img/img_kakao_logo.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/img/img_kakao_star_orange.svg b/src/assets/img/img_kakao_star_orange.svg new file mode 100644 index 00000000..ff05fa8f --- /dev/null +++ b/src/assets/img/img_kakao_star_orange.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/img_kakao_star_white.svg b/src/assets/img/img_kakao_star_white.svg new file mode 100644 index 00000000..fdfbf5d3 --- /dev/null +++ b/src/assets/img/img_kakao_star_white.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/index.ts b/src/assets/index.ts index ecbc85f6..fb3c9e34 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -13,6 +13,14 @@ import IcHome from './icon/ic_home.svg?react'; import IcNotice from './icon/ic_notice.svg?react'; import IcSharing from './icon/ic_sharing.svg?react'; import ImgBook from './img/img_book.svg?react'; +import ImgKakao01 from './img/img_kakao_01.svg?react'; +import ImgKakao02 from './img/img_kakao_02.svg?react'; +import ImgKakao03 from './img/img_kakao_03.svg?react'; +import ImgKakaoBook from './img/img_kakao_book.svg?react'; +import ImgKakaoLine from './img/img_kakao_line.svg?react'; +import ImgKakaoLogo from './img/img_kakao_logo.svg?react'; +import ImgKakaoStarOrange from './img/img_kakao_star_orange.svg?react'; +import ImgKakaoStarWhite from './img/img_kakao_star_white.svg?react'; import ImgLe from './img/img_le.svg?react'; import ImgLogoLecue from './img/img_logo_lecue.svg?react'; import ImgStarOrangeLine from './img/img_star_orangeline.svg?react'; @@ -33,9 +41,17 @@ export { IcNotice, IcSharing, ImgBook, + ImgKakao01, + ImgKakao02, + ImgKakao03, + ImgKakaoBook, + ImgKakaoLine, + ImgKakaoLogo, + ImgKakaoStarOrange, + ImgKakaoStarWhite, ImgLe, ImgLogoLecue, - ImgStarPosit, ImgStarOrangeLine, + ImgStarPosit, ImgSticker, }; From 224104379112d265d6ffd260c8e5e4ff1b3ced9a Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Tue, 9 Jan 2024 15:22:03 +0900 Subject: [PATCH 063/653] =?UTF-8?q?feat:=20=EB=9D=BC=EC=9A=B0=ED=84=B0=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Login/components/.gitkeep | 0 src/Login/constants/.gitkeep | 0 src/Login/hooks/.gitkeep | 0 src/Router.tsx | 2 ++ 4 files changed, 2 insertions(+) create mode 100644 src/Login/components/.gitkeep create mode 100644 src/Login/constants/.gitkeep create mode 100644 src/Login/hooks/.gitkeep diff --git a/src/Login/components/.gitkeep b/src/Login/components/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/Login/constants/.gitkeep b/src/Login/constants/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/Login/hooks/.gitkeep b/src/Login/hooks/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/Router.tsx b/src/Router.tsx index 16e4af3a..81050803 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -1,12 +1,14 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; import HomePage from './Home/page/HomePage'; +import Login from './Login/page'; function Router() { return ( } /> + }> ); From e67c028f6a6566749f0ae74de103ef474362a149 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 15:51:25 +0900 Subject: [PATCH 064/653] =?UTF-8?q?fix:=20=EA=B8=B0=EC=A1=B4=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EB=84=88=EB=B9=84,=20=EB=86=92=EC=9D=B4=20?= =?UTF-8?q?=EC=A0=9C=ED=95=9C=20=EC=A7=80=EC=9A=B0=EA=B3=A0=20=EC=B5=9C?= =?UTF-8?q?=EB=8C=80=20=EB=84=88=EB=B9=84=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/GlobalStyles.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/styles/GlobalStyles.ts b/src/styles/GlobalStyles.ts index 691584c3..f6b64ebd 100644 --- a/src/styles/GlobalStyles.ts +++ b/src/styles/GlobalStyles.ts @@ -116,9 +116,6 @@ const resetCss = css` } body { - width: 37.5rem; - height: 66.7rem; - line-height: 1; touch-action: manipulation; @@ -154,6 +151,11 @@ const resetCss = css` const gStyle = css` ${resetCss} + #root, body, html { + max-width: 43rem; + margin: 0 auto; + } + * { box-sizing: border-box; } From 64374f8298907ac74fa106308bc31fd1c9897bdd Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 15:52:41 +0900 Subject: [PATCH 065/653] =?UTF-8?q?init:=20postcss=20=EC=84=A4=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + yarn.lock | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/package.json b/package.json index e316cb82..743eb4b4 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", "eslint-plugin-react": "^7.33.2", + "postcss": "^8.4.33", "postcss-styled-syntax": "^0.6.3", "prettier": "^3.1.1", "react": "^18.2.0", diff --git a/yarn.lock b/yarn.lock index 6e21dcb7..493a5854 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2685,6 +2685,15 @@ postcss@^8.4.32: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.33: + version "8.4.33" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742" + integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" From fa1cdb15cc948c9df7f70cb7a495819beafde5e6 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:09:42 +0900 Subject: [PATCH 066/653] Create Dockerfile --- deploy/Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 deploy/Dockerfile diff --git a/deploy/Dockerfile b/deploy/Dockerfile new file mode 100644 index 00000000..13c28c9f --- /dev/null +++ b/deploy/Dockerfile @@ -0,0 +1,15 @@ +FROM node:18.17.0-slim + +WORKDIR /app + +RUN npm install -g serve + +COPY package*.json . + +RUN npm install --legacy-peer-deps + +COPY . . + +RUN npm run build + +CMD ["serve", "-s", "build"] From a1c52ca3762e7c44b66fd1c5d1aff85357e5c071 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:17:49 +0900 Subject: [PATCH 067/653] Create CD.yml --- .github/workflows/CD.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/CD.yml diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml new file mode 100644 index 00000000..889dc306 --- /dev/null +++ b/.github/workflows/CD.yml @@ -0,0 +1,27 @@ +name: CD + +on: + push: + branches: [ "develop" ] + +env: + HOST: ${{ secrets.HOST }} + USERNAME: ${{ secrets.USERNAME }} + KEY: ${{ secrets.SSH_KEY }} + PORT: ${{ secrets.PORT }} + +jobs: + deploy-ci: + runs-on: ubuntu-22.04 + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: . + file: ./deploy/Dockerfile + push: true + tags: lequu/lequu-client:latest From 6919933d38c4171bdb28698433757eb4fe22f984 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:19:34 +0900 Subject: [PATCH 068/653] Update CD.yml --- .github/workflows/CD.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 889dc306..ddce86f4 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -8,7 +8,6 @@ env: HOST: ${{ secrets.HOST }} USERNAME: ${{ secrets.USERNAME }} KEY: ${{ secrets.SSH_KEY }} - PORT: ${{ secrets.PORT }} jobs: deploy-ci: From 698facb4605648e58d85e4879b4843f9d233889f Mon Sep 17 00:00:00 2001 From: eunbeann Date: Tue, 9 Jan 2024 16:26:40 +0900 Subject: [PATCH 069/653] =?UTF-8?q?chore:=20axios=20=EC=84=A4=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + yarn.lock | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/package.json b/package.json index e316cb82..84f484ad 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "dependencies": { "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", + "axios": "^1.6.5", "eslint-plugin-react": "^7.33.2", "postcss-styled-syntax": "^0.6.3", "prettier": "^3.1.1", diff --git a/yarn.lock b/yarn.lock index 6e21dcb7..a5ca0bc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1070,11 +1070,25 @@ asynciterator.prototype@^1.0.0: dependencies: has-symbols "^1.0.3" +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== +axios@^1.6.5: + version "1.6.5" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.5.tgz#2c090da14aeeab3770ad30c3a1461bc970fb0cd8" + integrity sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg== + dependencies: + follow-redirects "^1.15.4" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + babel-plugin-macros@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" @@ -1215,6 +1229,13 @@ colord@^2.9.3: resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -1323,6 +1344,11 @@ define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: has-property-descriptors "^1.0.0" object-keys "^1.1.1" +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + detect-node@^2.0.4, detect-node@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" @@ -1755,6 +1781,11 @@ flatted@^3.2.9: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== +follow-redirects@^1.15.4: + version "1.15.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" + integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== + for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -1770,6 +1801,15 @@ foreground-child@^3.1.0: cross-spawn "^7.0.0" signal-exit "^4.0.1" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -2424,6 +2464,18 @@ microseconds@0.2.0: resolved "https://registry.yarnpkg.com/microseconds/-/microseconds-0.2.0.tgz#233b25f50c62a65d861f978a4a4f8ec18797dc39" integrity sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + minimatch@9.0.3, minimatch@^9.0.1: version "9.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" @@ -2704,6 +2756,11 @@ prop-types@^15.8.1: object-assign "^4.1.1" react-is "^16.13.1" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + punycode@^2.1.0: version "2.3.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" From f0c2ed5049e81112f1483d53a50f98da7ae16b62 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Tue, 9 Jan 2024 16:27:08 +0900 Subject: [PATCH 070/653] =?UTF-8?q?feat:=20api=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libs/api.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libs/api.ts b/src/libs/api.ts index e69de29b..a71c3a88 100644 --- a/src/libs/api.ts +++ b/src/libs/api.ts @@ -0,0 +1,6 @@ +import axios from 'axios'; + +console.log(import.meta.env.VITE_APP_BASE_URL); +export const api = axios.create({ + baseURL: import.meta.env.VITE_APP_BASE_URL, +}); From 9f321c05250f1a364922e497f2d6a0de913d6bc7 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 16:29:20 +0900 Subject: [PATCH 071/653] =?UTF-8?q?fix:=20build=20error=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Header/index.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/common/Header/index.tsx b/src/components/common/Header/index.tsx index 1d98c12d..a3cf11e8 100644 --- a/src/components/common/Header/index.tsx +++ b/src/components/common/Header/index.tsx @@ -1,11 +1,10 @@ -import { ReactNode } from 'react'; -import * as S from './Header.style'; import { IcArrowLeftBlack, IcArrowLeftWhite, IcHome, IcSharing, } from '../../../assets'; +import * as S from './Header.style'; interface HeaderProps { headerTitle: string; From d85da56d76b5b7db6a68d9f53488b1a80945a9c0 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:34:00 +0900 Subject: [PATCH 072/653] Update CD.yml --- .github/workflows/CD.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index ddce86f4..b68e4271 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -17,6 +17,15 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Docker build 가능하도록 환경 설정 + uses: docker/setup-buildx-action@v2.9.1 + + - name: Docker Hub에 로그인 + uses: docker/login-action@v2.2.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESSTOKEN }} + - name: Build and push Docker image uses: docker/build-push-action@v2 with: From e87c18ad2702843689af3d0949c5fc9621a13be0 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Tue, 9 Jan 2024 16:42:01 +0900 Subject: [PATCH 073/653] =?UTF-8?q?feat:=20Login/Header=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Login/components/.gitkeep | 0 src/Login/components/Header/Header.style.ts | 29 +++++++++++++++++++++ src/Login/components/Header/index.tsx | 16 ++++++++++++ src/Login/page/Login.style.ts | 18 +++++++++++++ src/Login/page/index.tsx | 14 ++++++++++ 5 files changed, 77 insertions(+) delete mode 100644 src/Login/components/.gitkeep create mode 100644 src/Login/components/Header/Header.style.ts create mode 100644 src/Login/components/Header/index.tsx create mode 100644 src/Login/page/Login.style.ts create mode 100644 src/Login/page/index.tsx diff --git a/src/Login/components/.gitkeep b/src/Login/components/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Login/components/Header/Header.style.ts b/src/Login/components/Header/Header.style.ts new file mode 100644 index 00000000..6904292a --- /dev/null +++ b/src/Login/components/Header/Header.style.ts @@ -0,0 +1,29 @@ +import styled from '@emotion/styled'; + +export const HeaderWrapper = styled.section` + display: flex; + flex-direction: column; + + width: 100%; + height: 8rem; +`; + +export const Logo = styled.header` + display: flex; + align-items: center; + gap: 0.5rem; + + width: 100%; + height: 4.4rem; + padding: 0.8rem 1.3rem; + + background-color: ${({ theme }) => theme.colors.black}; +`; + +export const OrangeBlock = styled.div` + width: 100%; + height: 3.6rem; + + border-bottom: 0.1rem solid ${({ theme }) => theme.colors.black}; + background-color: ${({ theme }) => theme.colors.key}; +`; diff --git a/src/Login/components/Header/index.tsx b/src/Login/components/Header/index.tsx new file mode 100644 index 00000000..02ac1461 --- /dev/null +++ b/src/Login/components/Header/index.tsx @@ -0,0 +1,16 @@ +import { ImgKakaoBook, ImgKakaoStarWhite } from '../../../assets'; +import * as S from './Header.style'; + +function Header() { + return ( + + + + + + + + ); +} + +export default Header; diff --git a/src/Login/page/Login.style.ts b/src/Login/page/Login.style.ts new file mode 100644 index 00000000..d99b7746 --- /dev/null +++ b/src/Login/page/Login.style.ts @@ -0,0 +1,18 @@ +import styled from '@emotion/styled'; + +export const LoginWrapper = styled.section` + width: 100%; + + background-color: ${({ theme }) => theme.colors.background}; +`; + +export const Gradient = styled.div` + width: 100%; + height: 66.7rem; + + background: linear-gradient( + 180deg, + ${({ theme }) => theme.colors.key} 1%, + ${({ theme }) => theme.colors.background} 50% + ); +`; diff --git a/src/Login/page/index.tsx b/src/Login/page/index.tsx new file mode 100644 index 00000000..31d23294 --- /dev/null +++ b/src/Login/page/index.tsx @@ -0,0 +1,14 @@ +import Header from '../components/Header'; +import * as S from './Login.style'; + +function Login() { + return ( + + +
+ + + ); +} + +export default Login; From d5c7ac4d4199c781a63b743682536deb1945899a Mon Sep 17 00:00:00 2001 From: eunbeann Date: Tue, 9 Jan 2024 16:43:02 +0900 Subject: [PATCH 074/653] =?UTF-8?q?fix:=20console=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libs/api.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/api.ts b/src/libs/api.ts index a71c3a88..4709304d 100644 --- a/src/libs/api.ts +++ b/src/libs/api.ts @@ -1,6 +1,5 @@ import axios from 'axios'; -console.log(import.meta.env.VITE_APP_BASE_URL); export const api = axios.create({ baseURL: import.meta.env.VITE_APP_BASE_URL, }); From f455d38dcd3086218ae5b805b9bced83484405e0 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 18:11:51 +0900 Subject: [PATCH 075/653] =?UTF-8?q?style:=20=ED=99=94=EB=A9=B4=20=EC=B5=9C?= =?UTF-8?q?=EB=8C=80=20=EB=84=88=EB=B9=84,=20=EC=B5=9C=EC=86=8C=20?= =?UTF-8?q?=EB=86=92=EC=9D=B4=20=EA=B4=80=EB=A0=A8=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 21 +++++++++++++++------ src/styles/GlobalStyles.ts | 10 +++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index a28422c9..c05b3f69 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,5 @@ import { Global, ThemeProvider } from '@emotion/react'; +import styled from '@emotion/styled'; import { QueryClient, QueryClientProvider } from 'react-query'; import Router from './Router'; @@ -9,13 +10,21 @@ const queryClient = new QueryClient(); function App() { return ( - - - - - - + + + + + + + + ); } +const Wrapper = styled.div` + border: none; + background-color: '#F5F5F5'; + min-height: calc(var(--vh, 1vh) * 100); +`; + export default App; diff --git a/src/styles/GlobalStyles.ts b/src/styles/GlobalStyles.ts index f6b64ebd..afcbed10 100644 --- a/src/styles/GlobalStyles.ts +++ b/src/styles/GlobalStyles.ts @@ -153,10 +153,18 @@ const gStyle = css` #root, body, html { max-width: 43rem; + margin: 0 auto; + -ms-overflow-style: none; /* 인터넷 익스플로러 */ + scrollbar-width: none; /* 파이어폭스 */ + } + + #root::-webkit-scrollbar { + display: none; /* 크롬, 사파리, 오페라, 엣지 */ } * { + max-width: 43rem; box-sizing: border-box; } @@ -214,7 +222,7 @@ const gStyle = css` } @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; src: url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.6/dist/web/static/pretendard.css'); } `; From 3384f32fbd47530697849c15ac1ff1f4880b4d75 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Tue, 9 Jan 2024 18:25:23 +0900 Subject: [PATCH 076/653] =?UTF-8?q?feat:=20grid=20section=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LecueExplain/LecueExplain.style.ts | 24 +++++++++++++++++++ src/Login/components/LecueExplain/index.tsx | 15 ++++++++++++ src/Login/page/Login.style.ts | 10 ++------ 3 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 src/Login/components/LecueExplain/LecueExplain.style.ts create mode 100644 src/Login/components/LecueExplain/index.tsx diff --git a/src/Login/components/LecueExplain/LecueExplain.style.ts b/src/Login/components/LecueExplain/LecueExplain.style.ts new file mode 100644 index 00000000..82ee7c50 --- /dev/null +++ b/src/Login/components/LecueExplain/LecueExplain.style.ts @@ -0,0 +1,24 @@ +import styled from '@emotion/styled'; + +export const GirdWrapper = styled.section` + display: grid; + + width: 100vw; + height: 40.7rem; + + grid-template-columns: 11.2rem 26.3rem; + grid-template-rows: 11.2rem 29.5rem; +`; + +export const GridElement = styled.div` + border-bottom: 0.1rem solid ${({ theme }) => theme.colors.black}; + + &:nth-child(1) { + border-right: 0.1rem solid ${({ theme }) => theme.colors.black}; + } + + &:nth-child(3) { + grid-column: 1/3; + grid-row: 2/3; + } +`; diff --git a/src/Login/components/LecueExplain/index.tsx b/src/Login/components/LecueExplain/index.tsx new file mode 100644 index 00000000..9f07a37c --- /dev/null +++ b/src/Login/components/LecueExplain/index.tsx @@ -0,0 +1,15 @@ +import { ImgKakaoLogo } from '../../../assets'; +import * as S from './LecueExplain.style'; +function LecueExplain() { + return ( + + + + + + + + ); +} + +export default LecueExplain; diff --git a/src/Login/page/Login.style.ts b/src/Login/page/Login.style.ts index d99b7746..06305810 100644 --- a/src/Login/page/Login.style.ts +++ b/src/Login/page/Login.style.ts @@ -1,14 +1,8 @@ import styled from '@emotion/styled'; export const LoginWrapper = styled.section` - width: 100%; - - background-color: ${({ theme }) => theme.colors.background}; -`; - -export const Gradient = styled.div` - width: 100%; - height: 66.7rem; + width: 100vw; + height: 100dvh; background: linear-gradient( 180deg, From e076b080ecdc8c39e1d1cbe479cc4dfd23cb849b Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Tue, 9 Jan 2024 18:26:11 +0900 Subject: [PATCH 077/653] =?UTF-8?q?feat:=20Login/header=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Login/page/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Login/page/index.tsx b/src/Login/page/index.tsx index 31d23294..a49e9f83 100644 --- a/src/Login/page/index.tsx +++ b/src/Login/page/index.tsx @@ -1,12 +1,12 @@ import Header from '../components/Header'; +import LecueExplain from '../components/LecueExplain'; import * as S from './Login.style'; function Login() { return ( - -
- +
+ ); } From 24d7eba6ae63bfb9c1903d5eb66881c8ef3f143a Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Tue, 9 Jan 2024 21:08:20 +0900 Subject: [PATCH 078/653] =?UTF-8?q?feat:=20=EC=B9=B4=EC=B9=B4=EC=98=A4?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20svg=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/button/btn_kakaologin.svg | 9 +++++++++ src/assets/index.ts | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 src/assets/button/btn_kakaologin.svg diff --git a/src/assets/button/btn_kakaologin.svg b/src/assets/button/btn_kakaologin.svg new file mode 100644 index 00000000..c7394af9 --- /dev/null +++ b/src/assets/button/btn_kakaologin.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/index.ts b/src/assets/index.ts index fb3c9e34..b65c7bd4 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -4,6 +4,7 @@ import BtnFloatingList from './button/btn_floating_list.svg?react'; import BtnFloatingPostit from './button/btn_floating_postit.svg?react'; import BtnFloatingSticker from './button/btn_floating_sticker.svg?react'; import BtnFloatingWrite from './button/btn_floating_write.svg?react'; +import BtnKakaologin from './button/btn_kakaologin.svg?react'; import IcArrowLeftBlack from './icon/ic_arrow_left_black.svg?react'; import IcArrowLeftWhite from './icon/ic_arrow_left_white.svg?react'; import IcCamera from './icon/ic_camera.svg?react'; @@ -32,6 +33,7 @@ export { BtnFloatingPostit, BtnFloatingSticker, BtnFloatingWrite, + BtnKakaologin, IcArrowLeftBlack, IcArrowLeftWhite, IcCamera, From a192806d07d44865bcd5b6cc00e592e57148103e Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Tue, 9 Jan 2024 21:11:23 +0900 Subject: [PATCH 079/653] =?UTF-8?q?feat:=20LecueExplain=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LecueExplain/LecueExplain.style.ts | 47 +++++++++++++++++-- src/Login/components/LecueExplain/index.tsx | 27 +++++++++-- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/src/Login/components/LecueExplain/LecueExplain.style.ts b/src/Login/components/LecueExplain/LecueExplain.style.ts index 82ee7c50..09e52495 100644 --- a/src/Login/components/LecueExplain/LecueExplain.style.ts +++ b/src/Login/components/LecueExplain/LecueExplain.style.ts @@ -6,19 +6,58 @@ export const GirdWrapper = styled.section` width: 100vw; height: 40.7rem; - grid-template-columns: 11.2rem 26.3rem; - grid-template-rows: 11.2rem 29.5rem; + grid-template-columns: 1.4fr 3.3fr; + grid-template-rows: 1.4fr 3.3fr; `; export const GridElement = styled.div` border-bottom: 0.1rem solid ${({ theme }) => theme.colors.black}; - &:nth-child(1) { + &:nth-of-type(1) { border-right: 0.1rem solid ${({ theme }) => theme.colors.black}; } - &:nth-child(3) { + &:nth-of-type(2) { + display: flex; + justify-content: end; + + padding: 1.8rem 1.4rem 2.2rem 2.9rem; + } + + &:nth-of-type(3) { grid-column: 1/3; grid-row: 2/3; + + display: flex; + justify-content: end; } `; + +export const CommentWrapper = styled.div` + display: flex; + flex-direction: column; + + width: 29rem; +`; + +export const Comment = styled.i` + &:nth-of-type(1) { + padding: 4.1rem 8rem 0 7.7rem; + } + + &:nth-of-type(2) { + padding: 1.4rem 14.1rem 0 3.3rem; + } + + &:nth-of-type(3) { + padding: 6.6rem 2.3rem 0 10.3rem; + } +`; + +export const Line = styled.div` + display: flex; + justify-content: end; + + width: 8.5rem; + padding-right: 2.4rem; +`; diff --git a/src/Login/components/LecueExplain/index.tsx b/src/Login/components/LecueExplain/index.tsx index 9f07a37c..77a4bb11 100644 --- a/src/Login/components/LecueExplain/index.tsx +++ b/src/Login/components/LecueExplain/index.tsx @@ -1,13 +1,34 @@ -import { ImgKakaoLogo } from '../../../assets'; +import { + ImgKakao01, + ImgKakao02, + ImgKakao03, + ImgKakaoLine, + ImgKakaoLogo, +} from '../../../assets'; import * as S from './LecueExplain.style'; function LecueExplain() { return ( - + - + + + + + + + + + + + + + + + + ); } From cecdf3650e3f04e6cc846266ae290593b1a6bf95 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Tue, 9 Jan 2024 21:12:38 +0900 Subject: [PATCH 080/653] =?UTF-8?q?feat:=20Login=20=EB=B0=B0=EA=B2=BD=20?= =?UTF-8?q?=EA=B7=B8=EB=9D=BC=EB=94=94=EC=96=B8=ED=8A=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Login/page/Login.style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Login/page/Login.style.ts b/src/Login/page/Login.style.ts index 06305810..59231566 100644 --- a/src/Login/page/Login.style.ts +++ b/src/Login/page/Login.style.ts @@ -7,6 +7,6 @@ export const LoginWrapper = styled.section` background: linear-gradient( 180deg, ${({ theme }) => theme.colors.key} 1%, - ${({ theme }) => theme.colors.background} 50% + ${({ theme }) => theme.colors.background} 55% ); `; From dc83ef722150385de8dd7ada30b7cc8cd55174c1 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 21:41:17 +0900 Subject: [PATCH 081/653] =?UTF-8?q?style:=20=EB=A1=9C=EA=B3=A0=20img=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/img_splash_logo.svg | 10 ++++++++++ src/assets/index.ts | 2 ++ yarn.lock | 12 ++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 src/assets/img/img_splash_logo.svg diff --git a/src/assets/img/img_splash_logo.svg b/src/assets/img/img_splash_logo.svg new file mode 100644 index 00000000..2987e398 --- /dev/null +++ b/src/assets/img/img_splash_logo.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/index.ts b/src/assets/index.ts index ecbc85f6..818ff166 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -15,6 +15,7 @@ import IcSharing from './icon/ic_sharing.svg?react'; import ImgBook from './img/img_book.svg?react'; import ImgLe from './img/img_le.svg?react'; import ImgLogoLecue from './img/img_logo_lecue.svg?react'; +import ImgSplashLogo from './img/img_splash_logo.svg?react'; import ImgStarOrangeLine from './img/img_star_orangeline.svg?react'; import ImgStarPosit from './img/img_star_postit.svg?react'; import ImgSticker from './img/img_sticker.svg?react'; @@ -38,4 +39,5 @@ export { ImgStarPosit, ImgStarOrangeLine, ImgSticker, + ImgSplashLogo, }; diff --git a/yarn.lock b/yarn.lock index 2a6aa08e..2a0abfc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2397,6 +2397,18 @@ loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" +lottie-react@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/lottie-react/-/lottie-react-2.4.0.tgz#f7249eee2b1deee70457a2d142194fdf2456e4bd" + integrity sha512-pDJGj+AQlnlyHvOHFK7vLdsDcvbuqvwPZdMlJ360wrzGFurXeKPr8SiRCjLf3LrNYKANQtSsh5dz9UYQHuqx4w== + dependencies: + lottie-web "^5.10.2" + +lottie-web@^5.10.2: + version "5.12.2" + resolved "https://registry.yarnpkg.com/lottie-web/-/lottie-web-5.12.2.tgz#579ca9fe6d3fd9e352571edd3c0be162492f68e5" + integrity sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg== + lower-case@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" From 152a66de33b997f7dcb91084c03d018eee1d4337 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 21:41:39 +0900 Subject: [PATCH 082/653] =?UTF-8?q?chore:=20lottie-react=20=EC=84=AA?= =?UTF-8?q?=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index c6d16e90..d85788ef 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "@emotion/styled": "^11.11.0", "axios": "^1.6.5", "eslint-plugin-react": "^7.33.2", + "lottie-react": "^2.4.0", "postcss": "^8.4.33", "postcss-styled-syntax": "^0.6.3", "prettier": "^3.1.1", From d120b6211d6b839ec4457b57072910d16a80bd43 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 21:42:14 +0900 Subject: [PATCH 083/653] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=8C=EB=9E=98?= =?UTF-8?q?=EC=8B=9C=EB=B7=B0=20=ED=97=A4=EB=8D=94=20=ED=8D=BC=EB=B8=94?= =?UTF-8?q?=EB=A6=AC=EC=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Splash/component/Bottom/index.tsx | 16 ++++++++++++++++ src/Splash/component/Header/Header.style.ts | 12 ++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 src/Splash/component/Bottom/index.tsx create mode 100644 src/Splash/component/Header/Header.style.ts diff --git a/src/Splash/component/Bottom/index.tsx b/src/Splash/component/Bottom/index.tsx new file mode 100644 index 00000000..2b2b3ac4 --- /dev/null +++ b/src/Splash/component/Bottom/index.tsx @@ -0,0 +1,16 @@ +import * as S from './Bottom.style'; + +function Bottom() { + return ( + + + 지금까지 120개의 + 포스트잇이 붙여졌어요! + + + 시작하기 + + ); +} + +export default Bottom; diff --git a/src/Splash/component/Header/Header.style.ts b/src/Splash/component/Header/Header.style.ts new file mode 100644 index 00000000..edc8bf03 --- /dev/null +++ b/src/Splash/component/Header/Header.style.ts @@ -0,0 +1,12 @@ +import styled from '@emotion/styled'; + +export const Header = styled.header` + display: flex; + justify-content: left; + + width: 100vw; +`; + +export const Wrapper = styled.div` + margin: 1.8rem 0 0.8rem 1.8rem; +`; From f451d0473b368de51d5c6a0b0c7f5b71c1670849 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 21:42:33 +0900 Subject: [PATCH 084/653] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=8C=EB=9E=98?= =?UTF-8?q?=EC=8B=9C=20=EB=B7=B0=20=EB=B0=94=EB=94=94=20=ED=8D=BC=EB=B8=94?= =?UTF-8?q?=EB=A6=AC=EC=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Splash/component/Body/Body.style.ts | 6 ++++++ src/Splash/component/Body/index.tsx | 13 +++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 src/Splash/component/Body/Body.style.ts create mode 100644 src/Splash/component/Body/index.tsx diff --git a/src/Splash/component/Body/Body.style.ts b/src/Splash/component/Body/Body.style.ts new file mode 100644 index 00000000..a5e1e986 --- /dev/null +++ b/src/Splash/component/Body/Body.style.ts @@ -0,0 +1,6 @@ +import styled from '@emotion/styled'; + +export const LottieWrapper = styled.section` + width: 100vw; + height: 39rem; +`; diff --git a/src/Splash/component/Body/index.tsx b/src/Splash/component/Body/index.tsx new file mode 100644 index 00000000..5c9b3412 --- /dev/null +++ b/src/Splash/component/Body/index.tsx @@ -0,0 +1,13 @@ +// import Lottie from 'lottie-react' + +import * as S from './Body.style'; + +function Body() { + return ( + + {/* */} + + ) +} + +export default Body; From e570b12ee612edcc86b89c4d700c430343454c08 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 21:42:53 +0900 Subject: [PATCH 085/653] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=8C=EB=9E=98?= =?UTF-8?q?=EC=8B=9C=20=EB=B7=B0=20=ED=95=98=EB=8B=A8=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Splash/component/Bottom/Bottom.style.ts | 37 +++++++++++++++++++++ src/Splash/component/Header/index.tsx | 14 ++++++++ 2 files changed, 51 insertions(+) create mode 100644 src/Splash/component/Bottom/Bottom.style.ts create mode 100644 src/Splash/component/Header/index.tsx diff --git a/src/Splash/component/Bottom/Bottom.style.ts b/src/Splash/component/Bottom/Bottom.style.ts new file mode 100644 index 00000000..be0d7260 --- /dev/null +++ b/src/Splash/component/Bottom/Bottom.style.ts @@ -0,0 +1,37 @@ +import styled from '@emotion/styled'; + +export const BottomWrapper = styled.section` + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + margin: 2.3rem 1.5rem 2rem; + + gap: 4.7rem; +`; + +export const TextWrapper = styled.article` + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; +`; + +export const Text = styled.p` + ${({ theme }) => theme.fonts.Title2_M_16}; +`; + +export const StartBtn = styled.button` + display: flex; + justify-content: center; + align-items: center; + + width: 100%; + padding: 1.7rem 0; + + border-radius: 1rem; + background-color: ${({ theme }) => theme.colors.BG}; + ${({ theme }) => theme.fonts.Head2_SB_18}; + color: ${({ theme }) => theme.colors.white}; +`; diff --git a/src/Splash/component/Header/index.tsx b/src/Splash/component/Header/index.tsx new file mode 100644 index 00000000..d9c5e060 --- /dev/null +++ b/src/Splash/component/Header/index.tsx @@ -0,0 +1,14 @@ +import { ImgSplashLogo } from '../../../assets'; +import * as S from './Header.style'; + +function Header() { + return ( + + + + + + ); +} + +export default Header; From 9706b8c2458ae6894e7b8e07c1c6307cac3f5920 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 21:43:06 +0900 Subject: [PATCH 086/653] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=8C=EB=9E=98?= =?UTF-8?q?=EC=8B=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Splash/page/SplashPage/SplashPage.tsx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/Splash/page/SplashPage/SplashPage.tsx diff --git a/src/Splash/page/SplashPage/SplashPage.tsx b/src/Splash/page/SplashPage/SplashPage.tsx new file mode 100644 index 00000000..1fc5475e --- /dev/null +++ b/src/Splash/page/SplashPage/SplashPage.tsx @@ -0,0 +1,17 @@ +import React from 'react'; + +import Body from '../../component/Body'; +import Bottom from '../../component/Bottom'; +import Header from '../../component/Header'; + +function SplashPage() { + return ( + +
+ + + + ); +} + +export default SplashPage; From 8665d6c018412b300bb418bd21e13127e4f900cb Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Tue, 9 Jan 2024 23:01:38 +0900 Subject: [PATCH 087/653] =?UTF-8?q?fix:=20=EC=A4=91=EC=95=99=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=20=EC=95=88=20=EB=90=98=EB=8A=94=20=EC=9D=B4=EC=8A=88?= =?UTF-8?q?=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Splash/page/SplashPage/SplashPage.style.ts | 11 +++++++++++ .../page/SplashPage/{SplashPage.tsx => index.tsx} | 7 +++---- 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 src/Splash/page/SplashPage/SplashPage.style.ts rename src/Splash/page/SplashPage/{SplashPage.tsx => index.tsx} (77%) diff --git a/src/Splash/page/SplashPage/SplashPage.style.ts b/src/Splash/page/SplashPage/SplashPage.style.ts new file mode 100644 index 00000000..286cb659 --- /dev/null +++ b/src/Splash/page/SplashPage/SplashPage.style.ts @@ -0,0 +1,11 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + width: 100vw; + height: 100dvh; +`; diff --git a/src/Splash/page/SplashPage/SplashPage.tsx b/src/Splash/page/SplashPage/index.tsx similarity index 77% rename from src/Splash/page/SplashPage/SplashPage.tsx rename to src/Splash/page/SplashPage/index.tsx index 1fc5475e..6fb0a1f8 100644 --- a/src/Splash/page/SplashPage/SplashPage.tsx +++ b/src/Splash/page/SplashPage/index.tsx @@ -1,16 +1,15 @@ -import React from 'react'; - import Body from '../../component/Body'; import Bottom from '../../component/Bottom'; import Header from '../../component/Header'; +import * as S from './SplashPage.style' function SplashPage() { return ( - +
- + ); } From 09524e37f67d09bfba52699b617de23bcf1b1a47 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:11:11 +0900 Subject: [PATCH 088/653] Update Dockerfile --- deploy/Dockerfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 13c28c9f..dd73fb96 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -2,14 +2,18 @@ FROM node:18.17.0-slim WORKDIR /app -RUN npm install -g serve +# Install Yarn globally +RUN npm install -g yarn -COPY package*.json . - -RUN npm install --legacy-peer-deps +# Copy package files and install dependencies +COPY package*.json ./ +RUN yarn install --legacy-peer-deps +# Copy the rest of the application code COPY . . -RUN npm run build +# Run the build command using Yarn +RUN yarn build -CMD ["serve", "-s", "build"] +# Set the command to start the server +CMD ["yarn", "serve", "-s", "build"] From ee1ca7c1ba8d2c8ac01cccfda739f64ae84ba24b Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:12:57 +0900 Subject: [PATCH 089/653] Update Dockerfile --- deploy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index dd73fb96..0e9a043a 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -3,7 +3,7 @@ FROM node:18.17.0-slim WORKDIR /app # Install Yarn globally -RUN npm install -g yarn +RUN yarn install # Copy package files and install dependencies COPY package*.json ./ From 68b8e1fb2f222aacb457c7a26b2825af2bac067b Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:32:59 +0900 Subject: [PATCH 090/653] Update Dockerfile --- deploy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 0e9a043a..0bd5c918 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -13,7 +13,7 @@ RUN yarn install --legacy-peer-deps COPY . . # Run the build command using Yarn -RUN yarn build +RUN vite build # Set the command to start the server CMD ["yarn", "serve", "-s", "build"] From 22f2e794c25f7568bf5b8aa197cbf4ebe4fbe496 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:35:28 +0900 Subject: [PATCH 091/653] Update Dockerfile --- deploy/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 0bd5c918..452b4d41 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -13,7 +13,9 @@ RUN yarn install --legacy-peer-deps COPY . . # Run the build command using Yarn -RUN vite build +RUN yarn build + +EXPOSE 5173 # Set the command to start the server CMD ["yarn", "serve", "-s", "build"] From 3a2db193923255e68a6d837ad0c43592d575bda2 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 9 Jan 2024 23:47:40 +0900 Subject: [PATCH 092/653] =?UTF-8?q?feat:=20=EB=A0=88=ED=81=90=EB=85=B8?= =?UTF-8?q?=ED=8A=B8=20=EC=A7=80=EA=B7=B8=EC=9E=AC=EA=B7=B8=20=EB=B7=B0=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LecueNoteListContainer.style.ts | 2 +- .../LecueNoteListContainer/index.tsx | 17 ++++ .../SmallLecueNote/SmallLecueNote.style.ts | 91 +++++++++++++++++++ .../components/SmallLecueNote/index.tsx | 30 ++++++ .../components/ZigZagView/ZigZagView.style.ts | 14 +++ src/Detail/components/ZigZagView/index.tsx | 29 ++++++ src/Detail/page/DetailPage/index.tsx | 63 ++++++++++++- 7 files changed, 242 insertions(+), 4 deletions(-) create mode 100644 src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts create mode 100644 src/Detail/components/SmallLecueNote/index.tsx create mode 100644 src/Detail/components/ZigZagView/ZigZagView.style.ts create mode 100644 src/Detail/components/ZigZagView/index.tsx diff --git a/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts b/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts index 15ef9d28..f24f2c96 100644 --- a/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts +++ b/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts @@ -3,7 +3,7 @@ import styled from '@emotion/styled'; export const LecueNoteListContainerWrapper = styled.div<{ backgroundColor: number; }>` - height: 100vh; + flex: 1; background-color: ${({ theme, backgroundColor }) => { switch (backgroundColor) { diff --git a/src/Detail/components/LecueNoteListContainer/index.tsx b/src/Detail/components/LecueNoteListContainer/index.tsx index 31a95715..4c4b68d1 100644 --- a/src/Detail/components/LecueNoteListContainer/index.tsx +++ b/src/Detail/components/LecueNoteListContainer/index.tsx @@ -1,16 +1,28 @@ import { useState } from 'react'; import LecueNoteListHeader from '../LecueNoteLIstHeader'; +import ZigZagView from '../ZigZagView'; import * as S from './LecueNoteListContainer.style'; +interface Note { + noteId: number; + renderType: number; + content: string; + noteDate: string; + noteNickname: string; + noteBackgroundColor: number; +} + interface LecueNoteListContainerProps { noteNum: number; backgroundColor: number; + noteList: Note[]; } function LecueNoteListContainer({ noteNum, backgroundColor, + noteList, }: LecueNoteListContainerProps) { const [isZigZagView, setIsZigZagView] = useState(true); @@ -22,6 +34,11 @@ function LecueNoteListContainer({ isZigZagView={isZigZagView} buttonOnClick={() => setIsZigZagView(!isZigZagView)} /> + {isZigZagView ? ( + + ) : ( + + )} ); } diff --git a/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts b/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts new file mode 100644 index 00000000..0889f355 --- /dev/null +++ b/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts @@ -0,0 +1,91 @@ +import styled from '@emotion/styled'; + +export const SmallLecueNoteWrapper = styled.div<{ + renderType: number; + noteBackgroundColor: number; +}>` + width: 15.2rem; + height: 16.6rem; + padding: 1.4rem 1rem 0.9rem 1rem; + + margin: ${({ renderType }) => { + switch (renderType) { + case 1: + return '3.5rem 0 0 0.803rem'; + case 2: + return '0.6rem 0 0 0.86rem'; + case 3: + return '3.2rem 0 0 0.86rem'; + case 4: + return '0.81rem 0 0 0.803rem'; + case 5: + return '3rem 0 0 0.991rem'; + case 6: + return '1rem 0 0 0.926rem'; + } + }}; + + transform: ${({ renderType }) => { + switch (renderType) { + case 1: + return 'rotate(4deg)'; + case 2: + return 'rotate(-4deg)'; + case 3: + return 'rotate(-4deg)'; + case 4: + return 'rotate(4deg)'; + case 5: + return 'rotate(6deg)'; + case 6: + return 'rotate(-6deg)'; + } + }}; + + border-radius: 0.4rem; + background-color: ${({ theme, noteBackgroundColor }) => { + switch (noteBackgroundColor) { + case 1: + return theme.colors.sub_pink; + case 2: + return theme.colors.sub_blue; + case 3: + return theme.colors.sub_green; + case 4: + return theme.colors.sub_purple; + case 5: + return theme.colors.sub_yellow; + case 6: + return theme.colors.sub_ivory; + } + }}; +`; + +export const SmallLecueNoteNickName = styled.p` + color: ${({ theme }) => theme.colors.black}; + ${({ theme }) => theme.fonts.Title1_SB_16}; +`; + +export const SmallLecueNoteContent = styled.p` + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + + -webkit-line-clamp: 5; + + height: 10rem; + margin-top: 0.6rem; + + color: ${({ theme }) => theme.colors.BG}; + ${({ theme }) => theme.fonts.Body2_M_14}; +`; + +export const SmallLecueNoteDate = styled.p` + margin-top: 0.8rem; + width: 100%; + text-align: right; + + color: rgba(75, 75, 75, 0.5); + ${({ theme }) => theme.fonts.E_Caption_R_12}; +`; diff --git a/src/Detail/components/SmallLecueNote/index.tsx b/src/Detail/components/SmallLecueNote/index.tsx new file mode 100644 index 00000000..55a82988 --- /dev/null +++ b/src/Detail/components/SmallLecueNote/index.tsx @@ -0,0 +1,30 @@ +import * as S from './SmallLecueNote.style'; + +interface SmallLecueNoteProps { + renderType: number; + content: string; + noteDate: string; + noteNickname: string; + noteBackgroundColor: number; +} + +function SmallLecueNote({ + renderType, + content, + noteDate, + noteNickname, + noteBackgroundColor, +}: SmallLecueNoteProps) { + return ( + + {noteNickname} + {content} + {noteDate} + + ); +} + +export default SmallLecueNote; diff --git a/src/Detail/components/ZigZagView/ZigZagView.style.ts b/src/Detail/components/ZigZagView/ZigZagView.style.ts new file mode 100644 index 00000000..a712de4e --- /dev/null +++ b/src/Detail/components/ZigZagView/ZigZagView.style.ts @@ -0,0 +1,14 @@ +import styled from '@emotion/styled'; + +export const ZigZagViewWrapper = styled.div` + display: grid; + grid-template-columns: repeat(2, 1fr); + + width: 100%; + margin-top: 0.4rem; +`; + +export const LecueNoteContainer = styled.div` + width: 100%; + height: 20.6rem; +`; diff --git a/src/Detail/components/ZigZagView/index.tsx b/src/Detail/components/ZigZagView/index.tsx new file mode 100644 index 00000000..6838eb9a --- /dev/null +++ b/src/Detail/components/ZigZagView/index.tsx @@ -0,0 +1,29 @@ +import SmallLecueNote from '../SmallLecueNote'; +import * as S from './ZigZagView.style'; + +interface Note { + noteId: number; + renderType: number; + content: string; + noteDate: string; + noteNickname: string; + noteBackgroundColor: number; +} + +interface ZigZagViewProps { + noteList: Note[]; +} + +function ZigZagView({ noteList }: ZigZagViewProps) { + return ( + + {noteList.map((note) => ( + + + + ))} + + ); +} + +export default ZigZagView; diff --git a/src/Detail/page/DetailPage/index.tsx b/src/Detail/page/DetailPage/index.tsx index 33fef27d..94034036 100644 --- a/src/Detail/page/DetailPage/index.tsx +++ b/src/Detail/page/DetailPage/index.tsx @@ -5,7 +5,7 @@ import LecueNoteListContainer from '../../components/LecueNoteListContainer'; // test const testProp = { - name: '레오제이', + name: 'LeoJ', profileImg: 'https://s3-alpha-sig.figma.com/img/db13/905b/40596e7ff9d7e2c5d23d2b59eaed1a7f?Expires=1705276800&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=YdVtmax5JokofS88zzvQYV8dhDYNr5gALJf1s0eyCl9siaRilm9ZtXOtCSOe~UsH~~K5jEkb81jG3ccCA9FJ25BvUgR9K388K7h90OcCHmn-Wo4enHTIV85J2U2yIiOqh8IDoKNxG9H2hHxKVBU8GzdNitXCkUHtAaxTZRN4taiMZkVFyrFCEw-04VBKywXmAAOd3EaWJ0rJgKqecBpOKnB6DT6HgHlX3wxWhHsQI1KKqueJmXLhT4n-AxWCVALVJDdoT3VvB9-AsecG5C6og89535kPkOmVxUhwhQunmAmWYev0bPDhaSQpVDUwyVDUHgVUmuENYB4Y017o5RjiFA__', date: '2024.01.25', @@ -13,18 +13,75 @@ const testProp = { title: '첫 예능 라디오스타 축하해!', content: '우리만의 스타 레오제이 !! 3년만에 첫 예능이자 라디오스타 출연 넘 축하해~!! 앞으로 계속 이렇게 우리 옆에 있어줘! 항상 응원할게! 어그래그래어엉', - noteNum: 30, + noteNum: 123123243, backgroundColor: 1, + noteList: [ + { + noteId: 1, + renderType: 1, + content: + '야야야양야야야양야양 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에', + noteDate: '2024. 01. 09', + noteNickname: '웹팟이미래다크크', + noteBackgroundColor: 1, + }, + { + noteId: 2, + renderType: 2, + content: + '야야야양야야야양야양 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에', + noteDate: '2024. 01. 09', + noteNickname: '웹팟이미래다크크', + noteBackgroundColor: 2, + }, + { + noteId: 3, + renderType: 3, + content: + '야야야양야야야양야양 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에', + noteDate: '2024. 01. 09', + noteNickname: '웹팟이미래다크크', + noteBackgroundColor: 3, + }, + { + noteId: 4, + renderType: 4, + content: + '야야야양야야야양야양 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에', + noteDate: '2024. 01. 09', + noteNickname: '웹팟이미래다크크', + noteBackgroundColor: 4, + }, + { + noteId: 5, + renderType: 5, + content: + '야야야양야야야양야양 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에', + noteDate: '2024. 01. 09', + noteNickname: '웹팟이미래다크크', + noteBackgroundColor: 5, + }, + { + noteId: 6, + renderType: 6, + content: + '야야야양야야야양야양 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에 웨비고? 다음에', + noteDate: '2024. 01. 09', + noteNickname: '웹팟이미래다크크', + noteBackgroundColor: 6, + }, + ], }; function DetailPage() { return ( -
+
); From 6bec96551c4ab85597d26407a74f79959d406904 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 9 Jan 2024 23:49:17 +0900 Subject: [PATCH 093/653] =?UTF-8?q?style:=20Header=EC=97=90=20flex-shrink?= =?UTF-8?q?=20=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A0=84=EC=B2=B4=20flex=20?= =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=A0=81=EC=9A=A9=20=EC=8B=9C=20=EB=86=92?= =?UTF-8?q?=EC=9D=B4=20=EB=B3=80=ED=99=94=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Header/Header.style.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/common/Header/Header.style.ts b/src/components/common/Header/Header.style.ts index e7ada58a..f4c2de17 100644 --- a/src/components/common/Header/Header.style.ts +++ b/src/components/common/Header/Header.style.ts @@ -5,6 +5,7 @@ export const HeaderWrapper = styled.header<{ isDarkMode?: boolean }>` justify-content: center; align-items: center; position: relative; + flex-shrink: 0; height: 5.4rem; padding: 0 1.6rem; From cd71e44c081c062ddef9169a3cd2a6517b56b73b Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:55:58 +0900 Subject: [PATCH 094/653] Update Dockerfile --- deploy/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 452b4d41..3debeb21 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -6,8 +6,9 @@ WORKDIR /app RUN yarn install # Copy package files and install dependencies -COPY package*.json ./ -RUN yarn install --legacy-peer-deps +COPY package.json . +COPY yarn.lock . + # Copy the rest of the application code COPY . . @@ -15,7 +16,7 @@ COPY . . # Run the build command using Yarn RUN yarn build -EXPOSE 5173 +EXPOSE 5173/tcp # Set the command to start the server -CMD ["yarn", "serve", "-s", "build"] +CMD ["yarn", “dev”] From 045d2e8b9823f0ce0ef46ca2878492c383b95d5c Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:59:22 +0900 Subject: [PATCH 095/653] Update Dockerfile --- deploy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 3debeb21..f6f0f15c 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -19,4 +19,4 @@ RUN yarn build EXPOSE 5173/tcp # Set the command to start the server -CMD ["yarn", “dev”] +CMD ["yarn", "dev"] From 3f5acf0f589e4f219c20775e8c9f5464fc76614e Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Wed, 10 Jan 2024 00:02:12 +0900 Subject: [PATCH 096/653] Update Dockerfile --- deploy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index f6f0f15c..4bf76d27 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -14,7 +14,7 @@ COPY yarn.lock . COPY . . # Run the build command using Yarn -RUN yarn build +# RUN yarn build EXPOSE 5173/tcp From b2000389b77c9d4770a307578ffcf33c9fd4aa12 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 10 Jan 2024 00:10:04 +0900 Subject: [PATCH 097/653] =?UTF-8?q?style:=20css=20=EC=86=8D=EC=84=B1=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SmallLecueNote/SmallLecueNote.style.ts | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts b/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts index 0889f355..ffa84999 100644 --- a/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts +++ b/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts @@ -7,7 +7,6 @@ export const SmallLecueNoteWrapper = styled.div<{ width: 15.2rem; height: 16.6rem; padding: 1.4rem 1rem 0.9rem 1rem; - margin: ${({ renderType }) => { switch (renderType) { case 1: @@ -25,23 +24,6 @@ export const SmallLecueNoteWrapper = styled.div<{ } }}; - transform: ${({ renderType }) => { - switch (renderType) { - case 1: - return 'rotate(4deg)'; - case 2: - return 'rotate(-4deg)'; - case 3: - return 'rotate(-4deg)'; - case 4: - return 'rotate(4deg)'; - case 5: - return 'rotate(6deg)'; - case 6: - return 'rotate(-6deg)'; - } - }}; - border-radius: 0.4rem; background-color: ${({ theme, noteBackgroundColor }) => { switch (noteBackgroundColor) { @@ -59,6 +41,23 @@ export const SmallLecueNoteWrapper = styled.div<{ return theme.colors.sub_ivory; } }}; + + transform: ${({ renderType }) => { + switch (renderType) { + case 1: + return 'rotate(4deg)'; + case 2: + return 'rotate(-4deg)'; + case 3: + return 'rotate(-4deg)'; + case 4: + return 'rotate(4deg)'; + case 5: + return 'rotate(6deg)'; + case 6: + return 'rotate(-6deg)'; + } + }}; `; export const SmallLecueNoteNickName = styled.p` @@ -71,7 +70,6 @@ export const SmallLecueNoteContent = styled.p` -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; - -webkit-line-clamp: 5; height: 10rem; @@ -82,10 +80,11 @@ export const SmallLecueNoteContent = styled.p` `; export const SmallLecueNoteDate = styled.p` - margin-top: 0.8rem; width: 100%; - text-align: right; + margin-top: 0.8rem; color: rgba(75, 75, 75, 0.5); ${({ theme }) => theme.fonts.E_Caption_R_12}; + + text-align: right; `; From 9b640a5d840fc3791c6ae58266af47b5cc8e8ef3 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Wed, 10 Jan 2024 00:10:27 +0900 Subject: [PATCH 098/653] Update Dockerfile --- deploy/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 4bf76d27..eb8c0c6f 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -16,7 +16,5 @@ COPY . . # Run the build command using Yarn # RUN yarn build -EXPOSE 5173/tcp - # Set the command to start the server CMD ["yarn", "dev"] From 4702849db2d8a0bb0edda2f3e5fe67b5d05e41c4 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Wed, 10 Jan 2024 00:13:22 +0900 Subject: [PATCH 099/653] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c6d16e90..91e56f79 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "vite", + "dev": "vite —host 0.0.0.0 —port 3000", "build": "tsc && vite build", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview" From 3819944621a299c3f3eb43c809ecbeb6497e60b4 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Wed, 10 Jan 2024 00:21:56 +0900 Subject: [PATCH 100/653] fix: docker fix --- package.json | 2 +- vite.config.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 91e56f79..c6d16e90 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "vite —host 0.0.0.0 —port 3000", + "dev": "vite", "build": "tsc && vite build", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview" diff --git a/vite.config.ts b/vite.config.ts index 6afcf675..4a68da60 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -4,5 +4,9 @@ import svgr from 'vite-plugin-svgr'; // https://vitejs.dev/config/ export default defineConfig({ + server: { + port: 3000, + host: '0.0.0.0', + }, plugins: [react(), svgr()], }); From 4c9290a3a237770cf5718a936186995125cf3764 Mon Sep 17 00:00:00 2001 From: eunbeann Date: Wed, 10 Jan 2024 00:34:59 +0900 Subject: [PATCH 101/653] feat: docker deploy test --- deploy/Dockerfile | 7 ++++--- package.json | 2 +- vite.config.ts | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index eb8c0c6f..c7860efa 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -2,17 +2,18 @@ FROM node:18.17.0-slim WORKDIR /app -# Install Yarn globally -RUN yarn install - # Copy package files and install dependencies COPY package.json . COPY yarn.lock . +RUN yarn + # Copy the rest of the application code COPY . . +EXPOSE 3000 + # Run the build command using Yarn # RUN yarn build diff --git a/package.json b/package.json index c6d16e90..f51ae401 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "vite", + "dev": "vite --host 0.0.0.0 --port 3000", "build": "tsc && vite build", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview" diff --git a/vite.config.ts b/vite.config.ts index 4a68da60..6afcf675 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -4,9 +4,5 @@ import svgr from 'vite-plugin-svgr'; // https://vitejs.dev/config/ export default defineConfig({ - server: { - port: 3000, - host: '0.0.0.0', - }, plugins: [react(), svgr()], }); From ee1a6c8c7fe4ed6a1753687a005ca41dd69abf43 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Wed, 10 Jan 2024 00:39:48 +0900 Subject: [PATCH 102/653] Update Dockerfile --- deploy/Dockerfile | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index c7860efa..1312534e 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,21 +1,15 @@ FROM node:18.17.0-slim - WORKDIR /app -# Copy package files and install dependencies -COPY package.json . -COPY yarn.lock . - -RUN yarn - +# Install Yarn globally +RUN yarn install +# Copy package files and install dependencies +COPY package*.json ./ +RUN yarn install --legacy-peer-deps # Copy the rest of the application code COPY . . - -EXPOSE 3000 - # Run the build command using Yarn -# RUN yarn build - +RUN yarn build # Set the command to start the server -CMD ["yarn", "dev"] +CMD ["yarn", "serve", "-s", "build"] From b52e781b808ad123c4af1656217509d8ed25d359 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 10 Jan 2024 00:43:06 +0900 Subject: [PATCH 103/653] =?UTF-8?q?feat:=20=EB=85=B8=ED=8A=B8=20=EA=B0=9C?= =?UTF-8?q?=EC=88=98=20=EA=B0=80=EC=83=81=EC=9D=98=20=EC=83=81=EC=88=98?= =?UTF-8?q?=EB=A1=9C=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Splash/component/Bottom/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Splash/component/Bottom/index.tsx b/src/Splash/component/Bottom/index.tsx index 2b2b3ac4..35fd8a47 100644 --- a/src/Splash/component/Bottom/index.tsx +++ b/src/Splash/component/Bottom/index.tsx @@ -1,10 +1,12 @@ import * as S from './Bottom.style'; function Bottom() { + const noteNum = 30; + return ( - 지금까지 120개의 + 지금까지 {noteNum}개의 포스트잇이 붙여졌어요! From 1623f06f889ee5530abb5ee68a7f5b396ccc304b Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Wed, 10 Jan 2024 00:51:00 +0900 Subject: [PATCH 104/653] Update Dockerfile --- deploy/Dockerfile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 1312534e..8ab3a86a 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,15 +1,19 @@ FROM node:18.17.0-slim -WORKDIR /app -# Install Yarn globally -RUN yarn install +WORKDIR /app # Copy package files and install dependencies -COPY package*.json ./ -RUN yarn install --legacy-peer-deps +COPY package.json . +COPY yarn.lock . + +RUN yarn + + # Copy the rest of the application code COPY . . + # Run the build command using Yarn -RUN yarn build +# RUN yarn build + # Set the command to start the server -CMD ["yarn", "serve", "-s", "build"] +CMD ["yarn", "dev"] From 48a60c2a951f609d5f8015a52c357a0f175601b5 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Wed, 10 Jan 2024 00:57:09 +0900 Subject: [PATCH 105/653] =?UTF-8?q?feat:=20grid->flex=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LecueExplain/LecueExplain.style.ts | 63 ------------------- src/Login/components/LecueExplain/index.tsx | 36 ----------- .../components/LequeLogo/LequeLogo.style.ts | 24 +++++++ src/Login/components/LequeLogo/index.tsx | 15 +++++ 4 files changed, 39 insertions(+), 99 deletions(-) delete mode 100644 src/Login/components/LecueExplain/LecueExplain.style.ts delete mode 100644 src/Login/components/LecueExplain/index.tsx create mode 100644 src/Login/components/LequeLogo/LequeLogo.style.ts create mode 100644 src/Login/components/LequeLogo/index.tsx diff --git a/src/Login/components/LecueExplain/LecueExplain.style.ts b/src/Login/components/LecueExplain/LecueExplain.style.ts deleted file mode 100644 index 09e52495..00000000 --- a/src/Login/components/LecueExplain/LecueExplain.style.ts +++ /dev/null @@ -1,63 +0,0 @@ -import styled from '@emotion/styled'; - -export const GirdWrapper = styled.section` - display: grid; - - width: 100vw; - height: 40.7rem; - - grid-template-columns: 1.4fr 3.3fr; - grid-template-rows: 1.4fr 3.3fr; -`; - -export const GridElement = styled.div` - border-bottom: 0.1rem solid ${({ theme }) => theme.colors.black}; - - &:nth-of-type(1) { - border-right: 0.1rem solid ${({ theme }) => theme.colors.black}; - } - - &:nth-of-type(2) { - display: flex; - justify-content: end; - - padding: 1.8rem 1.4rem 2.2rem 2.9rem; - } - - &:nth-of-type(3) { - grid-column: 1/3; - grid-row: 2/3; - - display: flex; - justify-content: end; - } -`; - -export const CommentWrapper = styled.div` - display: flex; - flex-direction: column; - - width: 29rem; -`; - -export const Comment = styled.i` - &:nth-of-type(1) { - padding: 4.1rem 8rem 0 7.7rem; - } - - &:nth-of-type(2) { - padding: 1.4rem 14.1rem 0 3.3rem; - } - - &:nth-of-type(3) { - padding: 6.6rem 2.3rem 0 10.3rem; - } -`; - -export const Line = styled.div` - display: flex; - justify-content: end; - - width: 8.5rem; - padding-right: 2.4rem; -`; diff --git a/src/Login/components/LecueExplain/index.tsx b/src/Login/components/LecueExplain/index.tsx deleted file mode 100644 index 77a4bb11..00000000 --- a/src/Login/components/LecueExplain/index.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { - ImgKakao01, - ImgKakao02, - ImgKakao03, - ImgKakaoLine, - ImgKakaoLogo, -} from '../../../assets'; -import * as S from './LecueExplain.style'; -function LecueExplain() { - return ( - - - - - - - - - - - - - - - - - - - - - - - ); -} - -export default LecueExplain; diff --git a/src/Login/components/LequeLogo/LequeLogo.style.ts b/src/Login/components/LequeLogo/LequeLogo.style.ts new file mode 100644 index 00000000..1521b16c --- /dev/null +++ b/src/Login/components/LequeLogo/LequeLogo.style.ts @@ -0,0 +1,24 @@ +import styled from '@emotion/styled'; + +export const LogoWrapper = styled.section` + display: flex; + + width: 100vw; + height: 11.2rem; + + border-bottom: 0.1rem solid ${({ theme }) => theme.colors.black}; +`; + +export const Line = styled.div` + width: 30%; + + border-right: 0.1rem solid ${({ theme }) => theme.colors.black}; +`; + +export const Logo = styled.i` + display: flex; + justify-content: end; + + width: 70%; + padding: 1.8rem 1.4rem 2.2rem 2.9rem; +`; diff --git a/src/Login/components/LequeLogo/index.tsx b/src/Login/components/LequeLogo/index.tsx new file mode 100644 index 00000000..6cd0e92a --- /dev/null +++ b/src/Login/components/LequeLogo/index.tsx @@ -0,0 +1,15 @@ +import { ImgKakaoLogo } from '../../../assets'; +import * as S from './LequeLogo.style'; + +function LequeLogo() { + return ( + + + + + + + ); +} + +export default LequeLogo; From 054db1a4d99029cf1e5c5d4d2af91e65ac835cea Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Wed, 10 Jan 2024 01:00:56 +0900 Subject: [PATCH 106/653] =?UTF-8?q?chore:=20file=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LequeLogo.style.ts => LecueLogo/LecueLogo.style.ts} | 0 src/Login/components/{LequeLogo => LecueLogo}/index.tsx | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/Login/components/{LequeLogo/LequeLogo.style.ts => LecueLogo/LecueLogo.style.ts} (100%) rename src/Login/components/{LequeLogo => LecueLogo}/index.tsx (67%) diff --git a/src/Login/components/LequeLogo/LequeLogo.style.ts b/src/Login/components/LecueLogo/LecueLogo.style.ts similarity index 100% rename from src/Login/components/LequeLogo/LequeLogo.style.ts rename to src/Login/components/LecueLogo/LecueLogo.style.ts diff --git a/src/Login/components/LequeLogo/index.tsx b/src/Login/components/LecueLogo/index.tsx similarity index 67% rename from src/Login/components/LequeLogo/index.tsx rename to src/Login/components/LecueLogo/index.tsx index 6cd0e92a..032759b4 100644 --- a/src/Login/components/LequeLogo/index.tsx +++ b/src/Login/components/LecueLogo/index.tsx @@ -1,7 +1,7 @@ import { ImgKakaoLogo } from '../../../assets'; -import * as S from './LequeLogo.style'; +import * as S from './LecueLogo.style'; -function LequeLogo() { +function LecueLogo() { return ( @@ -12,4 +12,4 @@ function LequeLogo() { ); } -export default LequeLogo; +export default LecueLogo; From 0edeba767e017a68948419e979360193563b4fd8 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 10 Jan 2024 01:06:25 +0900 Subject: [PATCH 107/653] =?UTF-8?q?style:=20Header=20position=EC=9D=84=20f?= =?UTF-8?q?ixed=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/page/DetailPage/index.tsx | 18 ++++++++++++------ src/components/common/Header/Header.style.ts | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Detail/page/DetailPage/index.tsx b/src/Detail/page/DetailPage/index.tsx index 94034036..d8989f16 100644 --- a/src/Detail/page/DetailPage/index.tsx +++ b/src/Detail/page/DetailPage/index.tsx @@ -77,12 +77,18 @@ function DetailPage() { return (
- - +
+ + +
); } diff --git a/src/components/common/Header/Header.style.ts b/src/components/common/Header/Header.style.ts index f4c2de17..98d7ea05 100644 --- a/src/components/common/Header/Header.style.ts +++ b/src/components/common/Header/Header.style.ts @@ -4,9 +4,11 @@ export const HeaderWrapper = styled.header<{ isDarkMode?: boolean }>` display: flex; justify-content: center; align-items: center; - position: relative; + position: fixed; + z-index: 1; flex-shrink: 0; + width: 100%; height: 5.4rem; padding: 0 1.6rem; From fa8c2fbb5964e331caae7d2d8682085235c46835 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Wed, 10 Jan 2024 01:43:29 +0900 Subject: [PATCH 108/653] feat: kakaoSpring svg import --- src/assets/img/img_kakao_spring.svg | 4 ++++ src/assets/index.ts | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 src/assets/img/img_kakao_spring.svg diff --git a/src/assets/img/img_kakao_spring.svg b/src/assets/img/img_kakao_spring.svg new file mode 100644 index 00000000..41208688 --- /dev/null +++ b/src/assets/img/img_kakao_spring.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/index.ts b/src/assets/index.ts index b65c7bd4..5a720d44 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -20,6 +20,7 @@ import ImgKakao03 from './img/img_kakao_03.svg?react'; import ImgKakaoBook from './img/img_kakao_book.svg?react'; import ImgKakaoLine from './img/img_kakao_line.svg?react'; import ImgKakaoLogo from './img/img_kakao_logo.svg?react'; +import ImgKakaoSpring from './img/img_kakao_spring.svg?react'; import ImgKakaoStarOrange from './img/img_kakao_star_orange.svg?react'; import ImgKakaoStarWhite from './img/img_kakao_star_white.svg?react'; import ImgLe from './img/img_le.svg?react'; @@ -49,6 +50,7 @@ export { ImgKakaoBook, ImgKakaoLine, ImgKakaoLogo, + ImgKakaoSpring, ImgKakaoStarOrange, ImgKakaoStarWhite, ImgLe, From a0edbe60c51c45ff9b9ac68a60eb7e27c0e84d35 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 10 Jan 2024 03:15:20 +0900 Subject: [PATCH 109/653] =?UTF-8?q?style:=20=EC=8A=AC=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=93=9C=20=EB=B0=B0=EB=84=88=20fixed=20&=20=EB=A0=88=ED=81=90?= =?UTF-8?q?=EB=85=B8=ED=8A=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=97=A4?= =?UTF-8?q?=EB=8D=94=20sticky=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BookInfoContainer/index.tsx | 3 -- .../LecueNoteListHeader.style.ts | 14 ++++++++-- .../components/LecueNoteLIstHeader/index.tsx | 2 +- .../LecueNoteListContainer/index.tsx | 1 - .../SlideBanner/SlideBanner.style.ts | 3 ++ .../components/ZigZagView/ZigZagView.style.ts | 2 +- src/Detail/page/DetailPage/index.tsx | 28 ++++++++++++++----- 7 files changed, 38 insertions(+), 15 deletions(-) diff --git a/src/Detail/components/BookInfoContainer/index.tsx b/src/Detail/components/BookInfoContainer/index.tsx index 0deae386..f023ec79 100644 --- a/src/Detail/components/BookInfoContainer/index.tsx +++ b/src/Detail/components/BookInfoContainer/index.tsx @@ -1,5 +1,4 @@ import BookInfoBox from '../BookInfoBox'; -import SlideBanner from '../SlideBanner'; interface BookInfoContainerProps { name: string; @@ -12,7 +11,6 @@ interface BookInfoContainerProps { } function BookInfoContainer({ - name, profileImg, date, nickname, @@ -22,7 +20,6 @@ function BookInfoContainer({ }: BookInfoContainerProps) { return (
- ` display: flex; column-gap: 1rem; + position: sticky; + z-index: 2; + top: 9.8rem; - padding-top: 1.2rem; + padding: 1.2rem 1.65rem 0 1.65rem; + + background-color: transparent; `; export const LecueNoteCountBox = styled.div<{ backgroundColor: number }>` @@ -35,6 +42,9 @@ export const LecueNoteCountBox = styled.div<{ backgroundColor: number }>` `; export const LecueNoteRenderModeButton = styled.button` + position: relative; + z-index: 2; + width: 3.8rem; height: 3.8rem; `; diff --git a/src/Detail/components/LecueNoteLIstHeader/index.tsx b/src/Detail/components/LecueNoteLIstHeader/index.tsx index d68e152c..44e01590 100644 --- a/src/Detail/components/LecueNoteLIstHeader/index.tsx +++ b/src/Detail/components/LecueNoteLIstHeader/index.tsx @@ -15,7 +15,7 @@ function LecueNoteListHeader({ buttonOnClick, }: LecueNoteListHeaderProps) { return ( - + {`${noteNum}개`} diff --git a/src/Detail/components/LecueNoteListContainer/index.tsx b/src/Detail/components/LecueNoteListContainer/index.tsx index 4c4b68d1..79324b2a 100644 --- a/src/Detail/components/LecueNoteListContainer/index.tsx +++ b/src/Detail/components/LecueNoteListContainer/index.tsx @@ -25,7 +25,6 @@ function LecueNoteListContainer({ noteList, }: LecueNoteListContainerProps) { const [isZigZagView, setIsZigZagView] = useState(true); - return ( - - + +
+ + {/* setIsZigZagView(!isZigZagView)} + /> */} + +
); From e7b25924a77a134198d8e76dcb6241cc1ff45d18 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 10 Jan 2024 04:00:11 +0900 Subject: [PATCH 110/653] =?UTF-8?q?style:=20=EC=9D=B8=EB=9D=BC=EC=9D=B8=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20div=20=3D>=20emotion=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/DetailPage/DetailPage.style.ts | 18 +++++++++++++ src/Detail/page/DetailPage/index.tsx | 27 +++++-------------- 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 src/Detail/page/DetailPage/DetailPage.style.ts diff --git a/src/Detail/page/DetailPage/DetailPage.style.ts b/src/Detail/page/DetailPage/DetailPage.style.ts new file mode 100644 index 00000000..b3bf6bb9 --- /dev/null +++ b/src/Detail/page/DetailPage/DetailPage.style.ts @@ -0,0 +1,18 @@ +import styled from '@emotion/styled'; + +export const DetailPageWrapper = styled.div` + display: flex; + align-items: center; + flex-direction: column; + + width: 100vw; + height: 100dvh; +`; + +export const DetailPageBody = styled.div` + margin-top: 5.4rem; +`; + +export const LecueBookContainer = styled.div` + margin-top: 4.4rem; +`; diff --git a/src/Detail/page/DetailPage/index.tsx b/src/Detail/page/DetailPage/index.tsx index 76b10967..37d9c3f5 100644 --- a/src/Detail/page/DetailPage/index.tsx +++ b/src/Detail/page/DetailPage/index.tsx @@ -2,6 +2,7 @@ import Header from '../../../components/common/Header'; import BookInfoContainer from '../../components/BookInfoContainer'; import LecueNoteListContainer from '../../components/LecueNoteListContainer'; import SlideBanner from '../../components/SlideBanner'; +import * as S from './DetailPage.style'; // test @@ -76,34 +77,20 @@ const testProp = { function DetailPage() { return ( -
+
-
+ -
+ - {/* setIsZigZagView(!isZigZagView)} - /> */} -
-
-
+ + + ); } From d19d9e0a3c2596a0cc8284163d1b158ed7f5a69f Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 04:07:10 +0900 Subject: [PATCH 111/653] =?UTF-8?q?style:=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StickerList/StickerList.style.ts | 22 +++++++++---------- .../page/StickerPack/StickerPack.style.ts | 17 ++++++++------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/StickerPack/components/StickerList/StickerList.style.ts b/src/StickerPack/components/StickerList/StickerList.style.ts index 63755bef..a2555d72 100644 --- a/src/StickerPack/components/StickerList/StickerList.style.ts +++ b/src/StickerPack/components/StickerList/StickerList.style.ts @@ -2,16 +2,13 @@ import styled from '@emotion/styled'; export const Wrapper = styled.section` display: flex; - align-items: start; flex-direction: column; - - width: 100%; `; export const Title = styled.header` margin: 1.4rem 0; - color: ${({ theme }) => theme.colors.white}; + color: ${({ theme }) => theme.colors.BG}; ${({ theme }) => theme.fonts.Head2_SB_18}; `; @@ -21,21 +18,24 @@ export const StickerGridWrapper = styled.article` gap: 2.15rem 1.6rem; grid-template-columns: repeat(3, 1fr); - width: 100%; + margin-bottom: 5rem; `; -export const ImageComponent = styled.button<{ +export const ImageWrapper = styled.button<{ isSelected: boolean; - url: string; }>` width: 10rem; height: 10rem; border: solid 0.1rem ${({ theme, isSelected }) => - isSelected ? theme.colors.key : theme.colors.BG}; + isSelected ? theme.colors.key : theme.colors.background}; border-radius: 0.4rem; - background: url(${({ url }) => url};); - background-position: center; - background-size: 10rem 10rem; +`; + +export const ImageComponent = styled.img` + width: 10rem; + height: 10rem; + + object-fit: contain; `; diff --git a/src/StickerPack/page/StickerPack/StickerPack.style.ts b/src/StickerPack/page/StickerPack/StickerPack.style.ts index 2175191d..2d2a698e 100644 --- a/src/StickerPack/page/StickerPack/StickerPack.style.ts +++ b/src/StickerPack/page/StickerPack/StickerPack.style.ts @@ -1,15 +1,18 @@ import styled from '@emotion/styled'; -export const Body = styled.section` +export const Body = styled.article` + padding: 0 1.64rem; + padding-bottom: 5rem; + + background-color: ${({ theme }) => theme.colors.background}; +`; + +export const Wrapper = styled.section` display: flex; justify-content: center; align-items: center; flex-direction: column; - width: 100%; - height: 100%; - padding: 0 1.64rem; - padding-bottom: 10rem; - - background-color: ${({ theme }) => theme.colors.BG}; + width: 100vw; + height: 100dvh; `; From ff8c8109ca31e8473d22266798b95afcd65c0140 Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 04:10:13 +0900 Subject: [PATCH 112/653] =?UTF-8?q?feat:=20=EC=8A=A4=ED=8B=B0=EC=BB=A4?= =?UTF-8?q?=ED=8C=A9=20api=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=ED=8C=A8?= =?UTF-8?q?=EC=B9=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libs/hooks/getStickerPack.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/libs/hooks/getStickerPack.ts diff --git a/src/libs/hooks/getStickerPack.ts b/src/libs/hooks/getStickerPack.ts new file mode 100644 index 00000000..551e61c5 --- /dev/null +++ b/src/libs/hooks/getStickerPack.ts @@ -0,0 +1,12 @@ +import { api } from '../api'; + +export async function getStickerPack() { + const data = await api.get(`/api/stickers/1`, { + headers: { + 'Content-Type': 'application/json', + Authorization: `Bearer ${import.meta.env.VITE_APP_TOKEN}`, + }, + }); + + return data; +} From 70ffc11a7b888ace2aa832d11f5459ce05c6b616 Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 04:11:07 +0900 Subject: [PATCH 113/653] =?UTF-8?q?feat:=20get=20=EC=8A=A4=ED=8B=B0?= =?UTF-8?q?=EC=BB=A4=ED=8C=A9=20=EC=BF=BC=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StickerPack/hooks/useGetStickerPack.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/StickerPack/hooks/useGetStickerPack.ts diff --git a/src/StickerPack/hooks/useGetStickerPack.ts b/src/StickerPack/hooks/useGetStickerPack.ts new file mode 100644 index 00000000..714fac58 --- /dev/null +++ b/src/StickerPack/hooks/useGetStickerPack.ts @@ -0,0 +1,13 @@ +import { useQuery } from 'react-query'; + +import { getStickerPack } from '../../libs/hooks/getStickerPack'; + +export default function useGetStickerPack() { + const { data } = useQuery(['useGetStickerPack'], getStickerPack, { + onError: () => { + console.error; + }, + }); + + return { data }; +} From b74099401cc4996e548c30e55982f63477512338 Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 04:11:37 +0900 Subject: [PATCH 114/653] =?UTF-8?q?style:=20=ED=97=A4=EB=8D=94=20=EB=8B=A4?= =?UTF-8?q?=ED=81=AC=EB=AA=A8=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StickerPack/page/StickerPack/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StickerPack/page/StickerPack/index.tsx b/src/StickerPack/page/StickerPack/index.tsx index b8452399..2f25afa2 100644 --- a/src/StickerPack/page/StickerPack/index.tsx +++ b/src/StickerPack/page/StickerPack/index.tsx @@ -20,7 +20,7 @@ function StickerPack() { return ( <> -
+
Date: Wed, 10 Jan 2024 04:12:16 +0900 Subject: [PATCH 115/653] =?UTF-8?q?feat:=20div=ED=83=9C=EA=B7=B8=20img=20?= =?UTF-8?q?=ED=83=9C=EA=B7=B8=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StickerPack/components/StickerList/index.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/StickerPack/components/StickerList/index.tsx b/src/StickerPack/components/StickerList/index.tsx index 007d12b7..0cdb4fd8 100644 --- a/src/StickerPack/components/StickerList/index.tsx +++ b/src/StickerPack/components/StickerList/index.tsx @@ -16,13 +16,17 @@ function StickerList(props: StickerListProps) { {data.stickerCategory} - {data.stickerInfoList.map((sticker) => ( - ( + handleStickerClick(sticker.stickerId)} isSelected={sticker.stickerId === isSelectedId} - url={sticker.stickerImage} + > + + ))} From f3bb9219e6cf293da95de290c86d33ed0158bea3 Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 04:12:48 +0900 Subject: [PATCH 116/653] =?UTF-8?q?chore:=20=EC=8A=A4=ED=8B=B0=EC=BB=A4?= =?UTF-8?q?=ED=8C=A9=20=ED=83=80=EC=9E=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StickerPack/type/stickerPackType.ts | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/StickerPack/type/stickerPackType.ts diff --git a/src/StickerPack/type/stickerPackType.ts b/src/StickerPack/type/stickerPackType.ts new file mode 100644 index 00000000..f2e513ed --- /dev/null +++ b/src/StickerPack/type/stickerPackType.ts @@ -0,0 +1,9 @@ +export interface stickerPackType { + stickerCategory: string; + stickerList: [ + { + stickerId: number; + stickerImage: string; + }, + ]; +} From f7a75094560f9c6c8a03287cc7af67723ac13d1b Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 04:13:14 +0900 Subject: [PATCH 117/653] =?UTF-8?q?chore:=20=EB=AA=A9=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=8B=A4=EC=A0=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/StickerList/index.tsx | 144 +----------------- 1 file changed, 5 insertions(+), 139 deletions(-) diff --git a/src/StickerPack/components/StickerList/index.tsx b/src/StickerPack/components/StickerList/index.tsx index 0cdb4fd8..2279afa1 100644 --- a/src/StickerPack/components/StickerList/index.tsx +++ b/src/StickerPack/components/StickerList/index.tsx @@ -1,5 +1,7 @@ import React from 'react'; +import useGetStickerPack from '../../hooks/useGetStickerPack'; +import { stickerPackType } from '../../type/stickerPackType'; import * as S from './StickerList.style'; interface StickerListProps { @@ -9,10 +11,11 @@ interface StickerListProps { function StickerList(props: StickerListProps) { const { isSelectedId, handleStickerClick } = props; + const { stickerPack } = useGetStickerPack(); return ( - {MockSticker.map((data) => ( + {stickerPack.map((data: stickerPackType) => ( {data.stickerCategory} @@ -25,7 +28,7 @@ function StickerList(props: StickerListProps) { + /> ))} @@ -36,140 +39,3 @@ function StickerList(props: StickerListProps) { } export default StickerList; - -const MockSticker = [ - { - stickerCategory: '레큐잉', - stickerInfoList: [ - { - stickerId: 1, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=1', - }, - { - stickerId: 2, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=2', - }, - { - stickerId: 3, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=3', - }, - { - stickerId: 4, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=4', - }, - { - stickerId: 5, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=5', - }, - { - stickerId: 6, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=6', - }, - { - stickerId: 7, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=7', - }, - { - stickerId: 8, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=8', - }, - { - stickerId: 9, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=9', - }, - { - stickerId: 10, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=10', - }, - { - stickerId: 11, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=11', - }, - { - stickerId: 12, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=12', - }, - { - stickerId: 13, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=13', - }, - { - stickerId: 14, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=14', - }, - { - stickerId: 15, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=15', - }, - { - stickerId: 16, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=16', - }, - { - stickerId: 17, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=17', - }, - { - stickerId: 18, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=18', - }, - { - stickerId: 19, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=19', - }, - { - stickerId: 20, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=20', - }, - ], - }, - { - stickerCategory: '큐비링', - stickerInfoList: [ - { - stickerId: 91, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=1', - }, - { - stickerId: 92, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=2', - }, - { - stickerId: 93, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=3', - }, - { - stickerId: 94, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=4', - }, - { - stickerId: 95, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=5', - }, - { - stickerId: 96, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=6', - }, - { - stickerId: 97, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=7', - }, - { - stickerId: 98, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=8', - }, - { - stickerId: 99, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=9', - }, - { - stickerId: 910, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=10', - }, - { - stickerId: 911, - stickerImage: 'https://source.unsplash.com/random/100x100?sig=11', - }, - ], - }, -]; From 70713020b241ddb5dfadd9a97dde369e786a28ad Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 10 Jan 2024 04:28:52 +0900 Subject: [PATCH 118/653] =?UTF-8?q?chore:=20router=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Router.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Router.tsx b/src/Router.tsx index 16e4af3a..eb7f49c3 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -1,12 +1,12 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; -import HomePage from './Home/page/HomePage'; +import SplashPage from './Splash/page/SplashPage'; function Router() { return ( - } /> + } /> ); From 99be4ec4b6c5108b6ca6f502ca6b99b3a6f18dec Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Wed, 10 Jan 2024 04:29:59 +0900 Subject: [PATCH 119/653] =?UTF-8?q?feat:=20Comment=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Login/components/Comment/Comment.style.ts | 51 +++++++++++++++++++ src/Login/components/Comment/index.tsx | 41 +++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 src/Login/components/Comment/Comment.style.ts create mode 100644 src/Login/components/Comment/index.tsx diff --git a/src/Login/components/Comment/Comment.style.ts b/src/Login/components/Comment/Comment.style.ts new file mode 100644 index 00000000..d182874d --- /dev/null +++ b/src/Login/components/Comment/Comment.style.ts @@ -0,0 +1,51 @@ +import styled from '@emotion/styled'; + +export const CommentWrapper = styled.section` + display: flex; + justify-content: center; + align-items: center; + + width: 100%; + height: calc(100dvh - 36.3rem); + + border-bottom: 0.1rem solid ${({ theme }) => theme.colors.black}; +`; + +export const CommentSection = styled.div` + display: flex; + justify-content: center; + flex-direction: column; + + width: 33rem; + height: 100%; +`; + +export const Comment = styled.i` + &:nth-of-type(1) { + padding: 4.1rem 12.2rem 0 7.7rem; + } + + &:nth-of-type(2) { + padding: 1.4rem 18.3rem 0 3.3rem; + } + + &:nth-of-type(3) { + padding: 6.6rem 6.5rem 5.3rem 10.3rem; + } +`; + +export const Line = styled.div` + display: flex; + justify-content: space-between; + flex-direction: column; + + width: 4.2rem; + height: 100%; + padding: 5.3rem 0; + + border-left: 0.1rem solid ${({ theme }) => theme.colors.black}; +`; + +export const Spring = styled.i` + margin-left: -2.1rem; +`; diff --git a/src/Login/components/Comment/index.tsx b/src/Login/components/Comment/index.tsx new file mode 100644 index 00000000..3871b7db --- /dev/null +++ b/src/Login/components/Comment/index.tsx @@ -0,0 +1,41 @@ +import { + ImgKakao01, + ImgKakao02, + ImgKakao03, + ImgKakaoSpring, +} from '../../../assets'; +import * as S from './Comment.style'; + +function Comment() { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +} + +export default Comment; From 1d587130c3fce766ea166bba6f610be9732d86d6 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Wed, 10 Jan 2024 04:30:32 +0900 Subject: [PATCH 120/653] =?UTF-8?q?feat:=20width=20=EB=8B=A8=EC=9C=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Login/components/LecueLogo/LecueLogo.style.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Login/components/LecueLogo/LecueLogo.style.ts b/src/Login/components/LecueLogo/LecueLogo.style.ts index 1521b16c..056a4b40 100644 --- a/src/Login/components/LecueLogo/LecueLogo.style.ts +++ b/src/Login/components/LecueLogo/LecueLogo.style.ts @@ -2,6 +2,7 @@ import styled from '@emotion/styled'; export const LogoWrapper = styled.section` display: flex; + justify-content: center; width: 100vw; height: 11.2rem; @@ -10,7 +11,7 @@ export const LogoWrapper = styled.section` `; export const Line = styled.div` - width: 30%; + width: 11.2rem; border-right: 0.1rem solid ${({ theme }) => theme.colors.black}; `; @@ -19,6 +20,6 @@ export const Logo = styled.i` display: flex; justify-content: end; - width: 70%; + width: 26.3rem; padding: 1.8rem 1.4rem 2.2rem 2.9rem; `; From 6afd1ad0c09181fc1d63a242a875fa2c966813a2 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 10 Jan 2024 04:30:35 +0900 Subject: [PATCH 121/653] =?UTF-8?q?style:=20stylelint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LecueNoteLIstHeader/LecueNoteListHeader.style.ts | 6 +++--- .../LecueNoteListContainer/LecueNoteListContainer.style.ts | 5 ++--- src/Detail/components/SlideBanner/SlideBanner.style.ts | 3 +-- .../components/SlideBannerItem/SlideBannerItem.style.ts | 2 +- .../components/SmallLecueNote/SmallLecueNote.style.ts | 5 +++-- src/Detail/page/DetailPage/index.tsx | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Detail/components/LecueNoteLIstHeader/LecueNoteListHeader.style.ts b/src/Detail/components/LecueNoteLIstHeader/LecueNoteListHeader.style.ts index adea5cc4..1c4dc714 100644 --- a/src/Detail/components/LecueNoteLIstHeader/LecueNoteListHeader.style.ts +++ b/src/Detail/components/LecueNoteLIstHeader/LecueNoteListHeader.style.ts @@ -4,14 +4,14 @@ export const LecueNoteListHeaderWrapper = styled.div<{ backgroundColor: number; }>` display: flex; - column-gap: 1rem; position: sticky; - z-index: 2; top: 9.8rem; + z-index: 2; - padding: 1.2rem 1.65rem 0 1.65rem; + padding: 1.2rem 1.65rem 0; background-color: transparent; + column-gap: 1rem; `; export const LecueNoteCountBox = styled.div<{ backgroundColor: number }>` diff --git a/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts b/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts index f24f2c96..88a55088 100644 --- a/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts +++ b/src/Detail/components/LecueNoteListContainer/LecueNoteListContainer.style.ts @@ -3,7 +3,7 @@ import styled from '@emotion/styled'; export const LecueNoteListContainerWrapper = styled.div<{ backgroundColor: number; }>` - flex: 1; + padding: 0 1.65rem; background-color: ${({ theme, backgroundColor }) => { switch (backgroundColor) { @@ -13,6 +13,5 @@ export const LecueNoteListContainerWrapper = styled.div<{ return theme.colors.BG; } }}; - - padding: 0 1.65rem; + flex: 1; `; diff --git a/src/Detail/components/SlideBanner/SlideBanner.style.ts b/src/Detail/components/SlideBanner/SlideBanner.style.ts index 246a64b3..cbc22792 100644 --- a/src/Detail/components/SlideBanner/SlideBanner.style.ts +++ b/src/Detail/components/SlideBanner/SlideBanner.style.ts @@ -13,6 +13,7 @@ export const infiniteSlide = keyframes` export const SliderBannerWrapper = styled.div` position: fixed; + overflow: hidden; z-index: 1; width: 100%; @@ -20,8 +21,6 @@ export const SliderBannerWrapper = styled.div` border-bottom: 0.1rem solid ${({ theme }) => theme.colors.BG}; background-color: ${({ theme }) => theme.colors.key}; - - overflow: hidden; `; export const AnimationBox = styled.div<{ diff --git a/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts b/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts index ca223881..971b0261 100644 --- a/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts +++ b/src/Detail/components/SlideBannerItem/SlideBannerItem.style.ts @@ -9,7 +9,7 @@ export const SliderBannerItemWrapper = styled.div` `; export const Name = styled.p` - margin: 0.3rem 0.6rem 0 0.6rem; + margin: 0.3rem 0.6rem 0; ${({ theme }) => theme.fonts.Orange}; `; diff --git a/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts b/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts index ffa84999..d21b59fb 100644 --- a/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts +++ b/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts @@ -6,7 +6,7 @@ export const SmallLecueNoteWrapper = styled.div<{ }>` width: 15.2rem; height: 16.6rem; - padding: 1.4rem 1rem 0.9rem 1rem; + padding: 1.4rem 1rem 0.9rem; margin: ${({ renderType }) => { switch (renderType) { case 1: @@ -68,6 +68,7 @@ export const SmallLecueNoteNickName = styled.p` export const SmallLecueNoteContent = styled.p` display: -webkit-box; -webkit-box-orient: vertical; + overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 5; @@ -83,7 +84,7 @@ export const SmallLecueNoteDate = styled.p` width: 100%; margin-top: 0.8rem; - color: rgba(75, 75, 75, 0.5); + color: rgb(75 75 75 / 50%); ${({ theme }) => theme.fonts.E_Caption_R_12}; text-align: right; diff --git a/src/Detail/page/DetailPage/index.tsx b/src/Detail/page/DetailPage/index.tsx index 37d9c3f5..7fa8f010 100644 --- a/src/Detail/page/DetailPage/index.tsx +++ b/src/Detail/page/DetailPage/index.tsx @@ -16,7 +16,7 @@ const testProp = { content: '우리만의 스타 레오제이 !! 3년만에 첫 예능이자 라디오스타 출연 넘 축하해~!! 앞으로 계속 이렇게 우리 옆에 있어줘! 항상 응원할게! 어그래그래어엉', noteNum: 123123243, - backgroundColor: 0, + backgroundColor: 1, noteList: [ { noteId: 1, From 2cef340b50ca7333d01f55827aed551110f9b5fc Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Wed, 10 Jan 2024 04:38:44 +0900 Subject: [PATCH 122/653] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoginBtnContainer.style.ts | 24 +++++++++++++++++++ .../components/LoginBtnContainer/index.tsx | 24 +++++++++++++++++++ src/Login/page/index.tsx | 8 +++++-- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 src/Login/components/LoginBtnContainer/LoginBtnContainer.style.ts create mode 100644 src/Login/components/LoginBtnContainer/index.tsx diff --git a/src/Login/components/LoginBtnContainer/LoginBtnContainer.style.ts b/src/Login/components/LoginBtnContainer/LoginBtnContainer.style.ts new file mode 100644 index 00000000..c97ef9ea --- /dev/null +++ b/src/Login/components/LoginBtnContainer/LoginBtnContainer.style.ts @@ -0,0 +1,24 @@ +import styled from '@emotion/styled'; + +export const LoginBtnWrapper = styled.section` + display: flex; + justify-content: end; + align-items: center; + flex-direction: column; + + width: 100%; + margin: 3.4rem 0 5.5rem; + gap: 1.9rem; +`; + +export const TextWrapper = styled.div` + display: flex; + justify-content: center; + + width: 100%; + gap: 0.3rem; +`; + +export const Text = styled.p` + ${({ theme }) => theme.fonts.Body2_M_14} +`; diff --git a/src/Login/components/LoginBtnContainer/index.tsx b/src/Login/components/LoginBtnContainer/index.tsx new file mode 100644 index 00000000..e4a6bc0e --- /dev/null +++ b/src/Login/components/LoginBtnContainer/index.tsx @@ -0,0 +1,24 @@ +import { BtnKakaologin, ImgKakaoStarOrange } from '../../../assets'; +import * as S from './LoginBtnContainer.style'; + +function LoginBtnContainer() { + const handleClickLoginBtn = () => { + //로그인 버튼 클릭 시 이벤트 + alert('로그인 버튼 클릭'); + }; + + return ( + + + + 소중한 마음을 전달해보세요! + + + + + ); +} + +export default LoginBtnContainer; diff --git a/src/Login/page/index.tsx b/src/Login/page/index.tsx index a49e9f83..2e3e27bd 100644 --- a/src/Login/page/index.tsx +++ b/src/Login/page/index.tsx @@ -1,12 +1,16 @@ +import Comment from '../components/Comment'; import Header from '../components/Header'; -import LecueExplain from '../components/LecueExplain'; +import LecueLogo from '../components/LecueLogo'; +import LoginBtnContainer from '../components/LoginBtnContainer'; import * as S from './Login.style'; function Login() { return (
- + + + ); } From 606d75edb4e1f4727e0b7b647837648c33cb0cc3 Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 04:52:36 +0900 Subject: [PATCH 123/653] =?UTF-8?q?chore:=20Dockerfile=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 8ab3a86a..e5568939 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -2,18 +2,11 @@ FROM node:18.17.0-slim WORKDIR /app -# Copy package files and install dependencies COPY package.json . COPY yarn.lock . RUN yarn - -# Copy the rest of the application code COPY . . -# Run the build command using Yarn -# RUN yarn build - -# Set the command to start the server CMD ["yarn", "dev"] From 5a249cd0193fdf74b89134963e76dc45eee48f4d Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 10 Jan 2024 04:54:10 +0900 Subject: [PATCH 124/653] =?UTF-8?q?style:=20stylelint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Header/Header.style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/Header/Header.style.ts b/src/components/common/Header/Header.style.ts index 98d7ea05..b2f62cff 100644 --- a/src/components/common/Header/Header.style.ts +++ b/src/components/common/Header/Header.style.ts @@ -4,9 +4,9 @@ export const HeaderWrapper = styled.header<{ isDarkMode?: boolean }>` display: flex; justify-content: center; align-items: center; + flex-shrink: 0; position: fixed; z-index: 1; - flex-shrink: 0; width: 100%; height: 5.4rem; From 025748c4480036237494d8c96ac6fd30a899ed9a Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Wed, 10 Jan 2024 05:12:12 +0900 Subject: [PATCH 125/653] =?UTF-8?q?refactor:=20BookInfoContainer=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BookInfoContainer/index.tsx | 35 ------------------- src/Detail/page/DetailPage/index.tsx | 4 +-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 src/Detail/components/BookInfoContainer/index.tsx diff --git a/src/Detail/components/BookInfoContainer/index.tsx b/src/Detail/components/BookInfoContainer/index.tsx deleted file mode 100644 index f023ec79..00000000 --- a/src/Detail/components/BookInfoContainer/index.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import BookInfoBox from '../BookInfoBox'; - -interface BookInfoContainerProps { - name: string; - profileImg: string; - date: string; - nickname: string; - title: string; - content: string; - backgroundColor: number; -} - -function BookInfoContainer({ - profileImg, - date, - nickname, - title, - content, - backgroundColor, -}: BookInfoContainerProps) { - return ( -
- -
- ); -} - -export default BookInfoContainer; diff --git a/src/Detail/page/DetailPage/index.tsx b/src/Detail/page/DetailPage/index.tsx index 7fa8f010..b968b2d7 100644 --- a/src/Detail/page/DetailPage/index.tsx +++ b/src/Detail/page/DetailPage/index.tsx @@ -1,5 +1,5 @@ import Header from '../../../components/common/Header'; -import BookInfoContainer from '../../components/BookInfoContainer'; +import BookInfoBox from '../../components/BookInfoBox'; import LecueNoteListContainer from '../../components/LecueNoteListContainer'; import SlideBanner from '../../components/SlideBanner'; import * as S from './DetailPage.style'; @@ -82,7 +82,7 @@ function DetailPage() { - + Date: Wed, 10 Jan 2024 05:45:25 +0900 Subject: [PATCH 126/653] =?UTF-8?q?refactor:=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EB=B0=98=EC=98=81,=20Wrapper=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NavigateLecueBook.style.ts} | 3 ++- .../components/{Main => NavigateLecueBook}/index.tsx | 6 +++--- src/Home/page/Home.style.ts | 10 ++++++++++ src/Home/page/index.tsx | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) rename src/Home/components/{Main/Main.style.ts => NavigateLecueBook/NavigateLecueBook.style.ts} (96%) rename src/Home/components/{Main => NavigateLecueBook}/index.tsx (89%) create mode 100644 src/Home/page/Home.style.ts diff --git a/src/Home/components/Main/Main.style.ts b/src/Home/components/NavigateLecueBook/NavigateLecueBook.style.ts similarity index 96% rename from src/Home/components/Main/Main.style.ts rename to src/Home/components/NavigateLecueBook/NavigateLecueBook.style.ts index 5af2a3f0..83864970 100644 --- a/src/Home/components/Main/Main.style.ts +++ b/src/Home/components/NavigateLecueBook/NavigateLecueBook.style.ts @@ -2,7 +2,6 @@ import styled from '@emotion/styled'; export const MainWrapper = styled.div` width: 100%; - height: 34.7rem; background-color: ${({ theme }) => theme.colors.background}; `; @@ -20,6 +19,8 @@ export const ButtonWrapper = styled.section` display: flex; flex-direction: column; + padding: 0 9.5rem 4.9rem 0; + gap: 1rem; `; diff --git a/src/Home/components/Main/index.tsx b/src/Home/components/NavigateLecueBook/index.tsx similarity index 89% rename from src/Home/components/Main/index.tsx rename to src/Home/components/NavigateLecueBook/index.tsx index e24d28c6..3de2cebe 100644 --- a/src/Home/components/Main/index.tsx +++ b/src/Home/components/NavigateLecueBook/index.tsx @@ -1,7 +1,7 @@ import { IcNotice, ImgLogoLecue } from '../../../assets'; -import * as S from './Main.style'; +import * as S from './NavigateLecueBook.style'; -function Main() { +function NavigateLecueBook() { const handleClickMakingBtn = () => { // 로그인 여부 판별 후 레큐북 생성으로 이동 alert('레큐북 만들기 버튼 클릭'); @@ -37,4 +37,4 @@ function Main() { ); } -export default Main; +export default NavigateLecueBook; diff --git a/src/Home/page/Home.style.ts b/src/Home/page/Home.style.ts new file mode 100644 index 00000000..e3c719f3 --- /dev/null +++ b/src/Home/page/Home.style.ts @@ -0,0 +1,10 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; + align-items: center; + flex-direction: column; + + width: 100vw; + height: 100dvh; +`; diff --git a/src/Home/page/index.tsx b/src/Home/page/index.tsx index fe795347..711aa5be 100644 --- a/src/Home/page/index.tsx +++ b/src/Home/page/index.tsx @@ -1,12 +1,12 @@ import React from 'react'; import LecueBookList from '../components/LecueBookList'; -import Main from '../components/Main'; +import NavigateLecueBook from '../components/NavigateLecueBook'; function Home() { return ( -
+ ); From cad460744828f25b1ff7929d39c11e1291272745 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Wed, 10 Jan 2024 06:10:29 +0900 Subject: [PATCH 127/653] =?UTF-8?q?feat:=20Wrapper=20=EC=86=8D=EC=84=B1=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Login/page/Login.style.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Login/page/Login.style.ts b/src/Login/page/Login.style.ts index 59231566..7e793e9a 100644 --- a/src/Login/page/Login.style.ts +++ b/src/Login/page/Login.style.ts @@ -1,6 +1,10 @@ import styled from '@emotion/styled'; export const LoginWrapper = styled.section` + display: flex; + align-items: center; + flex-direction: column; + width: 100vw; height: 100dvh; From 2b7df3f6e05e08796a24b832a1ffaadfb41e7e23 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Wed, 10 Jan 2024 06:37:00 +0900 Subject: [PATCH 128/653] =?UTF-8?q?feat:=20=EB=9D=BC=EC=9A=B0=ED=84=B0=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Router.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Router.tsx b/src/Router.tsx index 16e4af3a..0a8f9d2a 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -1,12 +1,14 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; import HomePage from './Home/page/HomePage'; +import Register from './Register/page'; function Router() { return ( } /> + } /> ); From 43cd1e5945ff8e012f341d9e65a1dd1290a5aa53 Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 12:55:22 +0900 Subject: [PATCH 129/653] =?UTF-8?q?style:=20fragment=20import=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StickerPack/components/StickerList/index.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/StickerPack/components/StickerList/index.tsx b/src/StickerPack/components/StickerList/index.tsx index 2279afa1..bd03882b 100644 --- a/src/StickerPack/components/StickerList/index.tsx +++ b/src/StickerPack/components/StickerList/index.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import { Fragment } from 'react'; import useGetStickerPack from '../../hooks/useGetStickerPack'; import { stickerPackType } from '../../type/stickerPackType'; @@ -15,8 +15,7 @@ function StickerList(props: StickerListProps) { return ( - {stickerPack.map((data: stickerPackType) => ( - + {data.stickerCategory} {data.stickerList.map((sticker) => ( @@ -32,7 +31,7 @@ function StickerList(props: StickerListProps) { ))} - + ))} ); From 80328a372658ae927d53dfc9fb2b4ac2b7b5cbc0 Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 12:58:12 +0900 Subject: [PATCH 130/653] =?UTF-8?q?feat:=20=EC=A1=B0=EA=B1=B4=EB=B6=80?= =?UTF-8?q?=EB=A0=8C=EB=8D=94=EB=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StickerPack/components/StickerList/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/StickerPack/components/StickerList/index.tsx b/src/StickerPack/components/StickerList/index.tsx index bd03882b..f216f5f6 100644 --- a/src/StickerPack/components/StickerList/index.tsx +++ b/src/StickerPack/components/StickerList/index.tsx @@ -15,6 +15,8 @@ function StickerList(props: StickerListProps) { return ( + {stickerPack?.length > 0 && + stickerPack.map((data: stickerPackType) => ( {data.stickerCategory} From 4c99aaed8bf138903e774f78f33bc5453935b2a1 Mon Sep 17 00:00:00 2001 From: eunbenn Date: Wed, 10 Jan 2024 12:59:04 +0900 Subject: [PATCH 131/653] =?UTF-8?q?feat:=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?= =?UTF-8?q?=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/StickerList/index.tsx | 35 ++++++++++--------- src/StickerPack/hooks/useGetStickerPack.ts | 16 +++++---- src/libs/hooks/getStickerPack.ts | 6 ++-- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/StickerPack/components/StickerList/index.tsx b/src/StickerPack/components/StickerList/index.tsx index f216f5f6..07e2a26f 100644 --- a/src/StickerPack/components/StickerList/index.tsx +++ b/src/StickerPack/components/StickerList/index.tsx @@ -11,30 +11,31 @@ interface StickerListProps { function StickerList(props: StickerListProps) { const { isSelectedId, handleStickerClick } = props; - const { stickerPack } = useGetStickerPack(); + //TODO 임시 값 수정 + const { stickerPack } = useGetStickerPack(1); return ( {stickerPack?.length > 0 && stickerPack.map((data: stickerPackType) => ( - {data.stickerCategory} - - {data.stickerList.map((sticker) => ( - handleStickerClick(sticker.stickerId)} - isSelected={sticker.stickerId === isSelectedId} - > - - - ))} - + {data.stickerCategory} + + {data.stickerList.map((sticker) => ( + handleStickerClick(sticker.stickerId)} + isSelected={sticker.stickerId === isSelectedId} + > + + + ))} + - ))} + ))} ); } diff --git a/src/StickerPack/hooks/useGetStickerPack.ts b/src/StickerPack/hooks/useGetStickerPack.ts index 714fac58..bb7618c7 100644 --- a/src/StickerPack/hooks/useGetStickerPack.ts +++ b/src/StickerPack/hooks/useGetStickerPack.ts @@ -2,12 +2,16 @@ import { useQuery } from 'react-query'; import { getStickerPack } from '../../libs/hooks/getStickerPack'; -export default function useGetStickerPack() { - const { data } = useQuery(['useGetStickerPack'], getStickerPack, { - onError: () => { - console.error; +export default function useGetStickerPack(bookId: number) { + const { data: stickerPack } = useQuery( + ['useGetStickerPack'], + () => getStickerPack(bookId), + { + onError: () => { + console.error; + }, }, - }); + ); - return { data }; + return { stickerPack }; } diff --git a/src/libs/hooks/getStickerPack.ts b/src/libs/hooks/getStickerPack.ts index 551e61c5..44641a43 100644 --- a/src/libs/hooks/getStickerPack.ts +++ b/src/libs/hooks/getStickerPack.ts @@ -1,12 +1,12 @@ import { api } from '../api'; -export async function getStickerPack() { - const data = await api.get(`/api/stickers/1`, { +export async function getStickerPack(bookId: number) { + const data = await api.get(`/api/stickers/${bookId}`, { headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${import.meta.env.VITE_APP_TOKEN}`, }, }); - return data; + return data.data.data; } From 0fdb0e4c267cbed30be96bd34776536656a204b9 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Wed, 10 Jan 2024 15:46:58 +0900 Subject: [PATCH 132/653] =?UTF-8?q?init:=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EC=84=A4=EA=B3=84=20=EC=B4=88=EA=B8=B0=20=EC=84=B8?= =?UTF-8?q?=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BgColor/BgColor.style.ts | 9 +++++++++ src/LecueNote/components/BgColor/index.tsx | 11 +++++++++++ .../components/CreateNote/CreateNote.style.ts | 6 ++++++ src/LecueNote/components/CreateNote/index.tsx | 14 ++++++++++++++ src/LecueNote/components/Footer/Footer.style.ts | 9 +++++++++ src/LecueNote/components/Footer/index.tsx | 11 +++++++++++ .../components/SelectColor/SelectColor.style.ts | 5 +++++ src/LecueNote/components/SelectColor/index.tsx | 14 ++++++++++++++ .../components/TextColor/TextColor.style.ts | 9 +++++++++ src/LecueNote/components/TextColor/index.tsx | 11 +++++++++++ .../components/WriteNote/WriteNote.style.ts | 9 +++++++++ src/LecueNote/components/WriteNote/index.tsx | 11 +++++++++++ .../page/LeceuNotePage/LecueNotePage.style.ts | 11 +++++++++++ src/LecueNote/page/LeceuNotePage/index.tsx | 16 ++++++++++++++++ 14 files changed, 146 insertions(+) create mode 100644 src/LecueNote/components/BgColor/BgColor.style.ts create mode 100644 src/LecueNote/components/BgColor/index.tsx create mode 100644 src/LecueNote/components/CreateNote/CreateNote.style.ts create mode 100644 src/LecueNote/components/CreateNote/index.tsx create mode 100644 src/LecueNote/components/Footer/Footer.style.ts create mode 100644 src/LecueNote/components/Footer/index.tsx create mode 100644 src/LecueNote/components/SelectColor/SelectColor.style.ts create mode 100644 src/LecueNote/components/SelectColor/index.tsx create mode 100644 src/LecueNote/components/TextColor/TextColor.style.ts create mode 100644 src/LecueNote/components/TextColor/index.tsx create mode 100644 src/LecueNote/components/WriteNote/WriteNote.style.ts create mode 100644 src/LecueNote/components/WriteNote/index.tsx create mode 100644 src/LecueNote/page/LeceuNotePage/LecueNotePage.style.ts create mode 100644 src/LecueNote/page/LeceuNotePage/index.tsx diff --git a/src/LecueNote/components/BgColor/BgColor.style.ts b/src/LecueNote/components/BgColor/BgColor.style.ts new file mode 100644 index 00000000..9b074b19 --- /dev/null +++ b/src/LecueNote/components/BgColor/BgColor.style.ts @@ -0,0 +1,9 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; +`; + +export const Contents = styled.p` + color: blue; +`; diff --git a/src/LecueNote/components/BgColor/index.tsx b/src/LecueNote/components/BgColor/index.tsx new file mode 100644 index 00000000..6e28e513 --- /dev/null +++ b/src/LecueNote/components/BgColor/index.tsx @@ -0,0 +1,11 @@ +import * as S from './BgColor.style'; + +function BgColor() { + return ( + + BgColor + + ); +} + +export default BgColor; diff --git a/src/LecueNote/components/CreateNote/CreateNote.style.ts b/src/LecueNote/components/CreateNote/CreateNote.style.ts new file mode 100644 index 00000000..788baba2 --- /dev/null +++ b/src/LecueNote/components/CreateNote/CreateNote.style.ts @@ -0,0 +1,6 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; + flex-direction: column; +`; diff --git a/src/LecueNote/components/CreateNote/index.tsx b/src/LecueNote/components/CreateNote/index.tsx new file mode 100644 index 00000000..db18f86b --- /dev/null +++ b/src/LecueNote/components/CreateNote/index.tsx @@ -0,0 +1,14 @@ +import SelectColor from '../SelectColor'; +import WriteNote from '../WriteNote'; +import * as S from './CreateNote.style'; + +function CreateNote() { + return ( + + + + + ); +} + +export default CreateNote; diff --git a/src/LecueNote/components/Footer/Footer.style.ts b/src/LecueNote/components/Footer/Footer.style.ts new file mode 100644 index 00000000..9b074b19 --- /dev/null +++ b/src/LecueNote/components/Footer/Footer.style.ts @@ -0,0 +1,9 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; +`; + +export const Contents = styled.p` + color: blue; +`; diff --git a/src/LecueNote/components/Footer/index.tsx b/src/LecueNote/components/Footer/index.tsx new file mode 100644 index 00000000..4bd7045c --- /dev/null +++ b/src/LecueNote/components/Footer/index.tsx @@ -0,0 +1,11 @@ +import * as S from './Footer.style'; + +function Footer() { + return ( + + Footer + + ); +} + +export default Footer; diff --git a/src/LecueNote/components/SelectColor/SelectColor.style.ts b/src/LecueNote/components/SelectColor/SelectColor.style.ts new file mode 100644 index 00000000..fa9ba94f --- /dev/null +++ b/src/LecueNote/components/SelectColor/SelectColor.style.ts @@ -0,0 +1,5 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; +`; diff --git a/src/LecueNote/components/SelectColor/index.tsx b/src/LecueNote/components/SelectColor/index.tsx new file mode 100644 index 00000000..fc2b8f04 --- /dev/null +++ b/src/LecueNote/components/SelectColor/index.tsx @@ -0,0 +1,14 @@ +import BgColor from '../BgColor'; +import TextColor from '../TextColor'; +import * as S from './SelectColor.style'; + +function SelectColor() { + return ( + + + + + ); +} + +export default SelectColor; diff --git a/src/LecueNote/components/TextColor/TextColor.style.ts b/src/LecueNote/components/TextColor/TextColor.style.ts new file mode 100644 index 00000000..9b074b19 --- /dev/null +++ b/src/LecueNote/components/TextColor/TextColor.style.ts @@ -0,0 +1,9 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; +`; + +export const Contents = styled.p` + color: blue; +`; diff --git a/src/LecueNote/components/TextColor/index.tsx b/src/LecueNote/components/TextColor/index.tsx new file mode 100644 index 00000000..390c1f3e --- /dev/null +++ b/src/LecueNote/components/TextColor/index.tsx @@ -0,0 +1,11 @@ +import * as S from './TextColor.style'; + +function TextColor() { + return ( + + TextColor + + ); +} + +export default TextColor; diff --git a/src/LecueNote/components/WriteNote/WriteNote.style.ts b/src/LecueNote/components/WriteNote/WriteNote.style.ts new file mode 100644 index 00000000..9b074b19 --- /dev/null +++ b/src/LecueNote/components/WriteNote/WriteNote.style.ts @@ -0,0 +1,9 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; +`; + +export const Contents = styled.p` + color: blue; +`; diff --git a/src/LecueNote/components/WriteNote/index.tsx b/src/LecueNote/components/WriteNote/index.tsx new file mode 100644 index 00000000..4458f422 --- /dev/null +++ b/src/LecueNote/components/WriteNote/index.tsx @@ -0,0 +1,11 @@ +import * as S from './WriteNote.style'; + +function WriteNote() { + return ( + + WriteNote + + ); +} + +export default WriteNote; diff --git a/src/LecueNote/page/LeceuNotePage/LecueNotePage.style.ts b/src/LecueNote/page/LeceuNotePage/LecueNotePage.style.ts new file mode 100644 index 00000000..286cb659 --- /dev/null +++ b/src/LecueNote/page/LeceuNotePage/LecueNotePage.style.ts @@ -0,0 +1,11 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + width: 100vw; + height: 100dvh; +`; diff --git a/src/LecueNote/page/LeceuNotePage/index.tsx b/src/LecueNote/page/LeceuNotePage/index.tsx new file mode 100644 index 00000000..9c8283a7 --- /dev/null +++ b/src/LecueNote/page/LeceuNotePage/index.tsx @@ -0,0 +1,16 @@ +// import Header from '../../../components/common/Header'; +import CreateNote from '../../components/CreateNote'; +import Footer from '../../components/Footer'; +import * as S from './LecueNotePage.style'; + +function LecueNotePage() { + return ( + + {/*
*/} + +