From cf864452f1445071ce0ef7352b9e7a83aace5f02 Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Fri, 19 Aug 2022 22:52:29 -0500 Subject: [PATCH 01/13] build: add generate sitemap process --- .gitignore | 1 + next-sitemap.config.mjs | 8 ++++++++ package.json | 12 +++++++----- yarn.lock | 23 ++++++++++++++++++----- 4 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 next-sitemap.config.mjs diff --git a/.gitignore b/.gitignore index 3550eff..39a6210 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ # production /build /public/robots.txt +/public/sitemap.xml # misc .DS_Store diff --git a/next-sitemap.config.mjs b/next-sitemap.config.mjs new file mode 100644 index 0000000..a7c7073 --- /dev/null +++ b/next-sitemap.config.mjs @@ -0,0 +1,8 @@ +/** @type {import('next-sitemap').IConfig} */ +const config = { + siteUrl: process.env.NEXTAUTH_URL, + generateIndexSitemap: false, + generateRobotsTxt: false, +}; + +export default config; diff --git a/package.json b/package.json index 2fc3598..93e9279 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "dev:debug": "cross-env NODE_OPTIONS='--inspect' next dev", "dev": "next dev", "build": "next build", + "postbuild": "next-sitemap --config next-sitemap.config.mjs", "start": "next start", "lint": "next lint", "prettier": "prettier --write .", @@ -43,17 +44,18 @@ "react-dom": "18.2.0" }, "devDependencies": { - "@commitlint/cli": "^17.0.3", - "@commitlint/config-conventional": "^17.0.3", + "@commitlint/cli": "17.0.3", + "@commitlint/config-conventional": "17.0.3", "@types/cookie": "0.5.1", "@types/node": "18.7.6", "@types/react": "18.0.17", "@types/react-dom": "18.0.6", - "cross-env": "^7.0.3", + "cross-env": "7.0.3", "eslint": "8.22.0", "eslint-config-next": "12.2.5", - "husky": "^8.0.1", - "prettier": "^2.7.1", + "husky": "8.0.1", + "next-sitemap": "3.1.20", + "prettier": "2.7.1", "typescript": "4.7.4" } } diff --git a/yarn.lock b/yarn.lock index d0207c6..0e34ab3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,7 +38,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@commitlint/cli@^17.0.3": +"@commitlint/cli@17.0.3": version "17.0.3" resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.0.3.tgz#50be9d9a8d79f6c47bfd2703638fe65215eb2526" integrity sha512-oAo2vi5d8QZnAbtU5+0cR2j+A7PO8zuccux65R/EycwvsZrDVyW518FFrnJK2UQxbRtHFFIG+NjQ6vOiJV0Q8A== @@ -54,7 +54,7 @@ resolve-global "1.0.0" yargs "^17.0.0" -"@commitlint/config-conventional@^17.0.3": +"@commitlint/config-conventional@17.0.3": version "17.0.3" resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.0.3.tgz#61e937357ce63ea08a2017e58b918748fcf3abc5" integrity sha512-HCnzTm5ATwwwzNVq5Y57poS0a1oOOcd5pc1MmBpLbGmSysc4i7F/++JuwtdFPu16sgM3H9J/j2zznRLOSGVO2A== @@ -191,6 +191,11 @@ dependencies: chalk "^4.1.0" +"@corex/deepmerge@^4.0.29": + version "4.0.29" + resolved "https://registry.yarnpkg.com/@corex/deepmerge/-/deepmerge-4.0.29.tgz#af9debf07d7f6b0d2a9d04a266abf2c1418ed2f6" + integrity sha512-q/yVUnqckA8Do+EvAfpy7RLdumnBy9ZsducMUtZTvpdbJC7azEf1hGtnYYxm0QfphYxjwggv6XtH64prvS1W+A== + "@cspotcode/source-map-support@^0.8.0": version "0.8.1" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" @@ -839,7 +844,7 @@ critters@0.0.16: postcss "^8.3.7" pretty-bytes "^5.3.0" -cross-env@^7.0.3: +cross-env@7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== @@ -1604,7 +1609,7 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -husky@^8.0.1: +husky@8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9" integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw== @@ -2075,6 +2080,14 @@ next-i18next@11.3.0: i18next-fs-backend "^1.1.4" react-i18next "^11.18.0" +next-sitemap@^3.1.20: + version "3.1.20" + resolved "https://registry.yarnpkg.com/next-sitemap/-/next-sitemap-3.1.20.tgz#3b5839b452688a5eaebec22603d2f9e59ef70088" + integrity sha512-ugcSQpAtwc9fk7fsr5to0yrlA/RjY0kw2wHOUqcrRXnZDwFfBwGnEVvaYbI7C4ZlhvxjJTA3G15QMpvpmvPquw== + dependencies: + "@corex/deepmerge" "^4.0.29" + minimist "^1.2.6" + next@12.2.5: version "12.2.5" resolved "https://registry.yarnpkg.com/next/-/next-12.2.5.tgz#14fb5975e8841fad09553b8ef41fe1393602b717" @@ -2378,7 +2391,7 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@^2.7.1: +prettier@2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== From 121f513f157d777557b337a36fc832e8e6d05d28 Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Fri, 19 Aug 2022 23:03:30 -0500 Subject: [PATCH 02/13] fix: environment url --- next-sitemap.config.mjs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/next-sitemap.config.mjs b/next-sitemap.config.mjs index a7c7073..f734e76 100644 --- a/next-sitemap.config.mjs +++ b/next-sitemap.config.mjs @@ -1,6 +1,12 @@ /** @type {import('next-sitemap').IConfig} */ + +const BASE_URL = + process.env.NODE_ENV !== 'production' + ? process.env.NEXTAUTH_URL + : `https://${process.env.VERCEL_URL}`; + const config = { - siteUrl: process.env.NEXTAUTH_URL, + siteUrl: BASE_URL, generateIndexSitemap: false, generateRobotsTxt: false, }; From dc9176cab3ba5068979a61a3d87a1a2e8ceedc1d Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Fri, 19 Aug 2022 23:24:07 -0500 Subject: [PATCH 03/13] fix: enviroment test --- next-sitemap.config.mjs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/next-sitemap.config.mjs b/next-sitemap.config.mjs index f734e76..26df8c7 100644 --- a/next-sitemap.config.mjs +++ b/next-sitemap.config.mjs @@ -1,12 +1,7 @@ /** @type {import('next-sitemap').IConfig} */ -const BASE_URL = - process.env.NODE_ENV !== 'production' - ? process.env.NEXTAUTH_URL - : `https://${process.env.VERCEL_URL}`; - const config = { - siteUrl: BASE_URL, + siteUrl: process.env.NEXTAUTH_URL || `https://${process.env.VERCEL_URL}`, generateIndexSitemap: false, generateRobotsTxt: false, }; From 9b6af19b7adb2586beb1b1abe159cfa9988280fe Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Fri, 19 Aug 2022 23:38:38 -0500 Subject: [PATCH 04/13] build: add nextjs experimental legacyBrowsers --- next.config.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/next.config.js b/next.config.js index c8b56f8..83ffd98 100644 --- a/next.config.js +++ b/next.config.js @@ -11,6 +11,8 @@ const nextConfig = { allowFutureImage: true, }, optimizeCss: true, + legacyBrowsers: false, + browsersListForSwc: true, }, webpack(config, { isServer }) { if (isServer) { From 12485490bd17aff5559d864d5a5b74291be378f7 Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Sat, 20 Aug 2022 00:07:52 -0500 Subject: [PATCH 05/13] ci: add github action file for accessibility test --- .github/workflows/accessibility-test.yml | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/accessibility-test.yml diff --git a/.github/workflows/accessibility-test.yml b/.github/workflows/accessibility-test.yml new file mode 100644 index 0000000..4500c81 --- /dev/null +++ b/.github/workflows/accessibility-test.yml @@ -0,0 +1,28 @@ +name: Accessibility tests + +on: [push] + +jobs: + wait_for_vercel: + name: Wait for vercel + runs-on: ubuntu-latest + outputs: + preview_url: ${{ steps.waitForVercelPreviewDeployment.outputs.url }} + steps: + - name: Wait for Vercel preview deployment to be ready + uses: patrickedqvist/wait-for-vercel-preview@master + id: waitForVercelPreviewDeployment + with: + token: ${{ secrets.GITHUB_TOKEN }} + max_timeout: 120 + pa11y: + name: Accessibility tests + needs: wait_for_vercel + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 16.x + - run: npm install -g pa11y-ci + - run: pa11y-ci --sitemap ${{ needs.wait_for_vercel.outputs.preview_url }}/sitemap.xml From 03588b35d374d726d437e743d924d107d87cf6af Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Sat, 20 Aug 2022 00:17:04 -0500 Subject: [PATCH 06/13] fix: github action waitforvercelpreview path --- .github/workflows/accessibility-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/accessibility-test.yml b/.github/workflows/accessibility-test.yml index 4500c81..1ab53d6 100644 --- a/.github/workflows/accessibility-test.yml +++ b/.github/workflows/accessibility-test.yml @@ -10,7 +10,7 @@ jobs: preview_url: ${{ steps.waitForVercelPreviewDeployment.outputs.url }} steps: - name: Wait for Vercel preview deployment to be ready - uses: patrickedqvist/wait-for-vercel-preview@master + uses: patrickedqvist/wait-for-vercel-preview@v1.2.0 id: waitForVercelPreviewDeployment with: token: ${{ secrets.GITHUB_TOKEN }} From 67a589c77138c7ecb9168be986859f404e3ca461 Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Sat, 20 Aug 2022 00:52:49 -0500 Subject: [PATCH 07/13] ci: add run-test workflow --- .../{accessibility-test.yml => run-test.yml} | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) rename .github/workflows/{accessibility-test.yml => run-test.yml} (85%) diff --git a/.github/workflows/accessibility-test.yml b/.github/workflows/run-test.yml similarity index 85% rename from .github/workflows/accessibility-test.yml rename to .github/workflows/run-test.yml index 1ab53d6..a690dc4 100644 --- a/.github/workflows/accessibility-test.yml +++ b/.github/workflows/run-test.yml @@ -1,6 +1,11 @@ -name: Accessibility tests +name: ci -on: [push] +on: + push: + pull_request: + branches: + - develop + - 'feature/**' jobs: wait_for_vercel: @@ -24,5 +29,5 @@ jobs: - uses: actions/setup-node@v1 with: node-version: 16.x - - run: npm install -g pa11y-ci + - run: yarn add -g pa11y-ci - run: pa11y-ci --sitemap ${{ needs.wait_for_vercel.outputs.preview_url }}/sitemap.xml From 64c4403f89ecbbd41f239b1177aaa8023765db4d Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Sat, 20 Aug 2022 01:00:37 -0500 Subject: [PATCH 08/13] ci: update run-test workflow --- .github/workflows/run-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index a690dc4..a26798b 100644 --- a/.github/workflows/run-test.yml +++ b/.github/workflows/run-test.yml @@ -1,4 +1,4 @@ -name: ci +name: CI/CD on: push: @@ -29,5 +29,5 @@ jobs: - uses: actions/setup-node@v1 with: node-version: 16.x - - run: yarn add -g pa11y-ci + - run: npm install -g pa11y-ci - run: pa11y-ci --sitemap ${{ needs.wait_for_vercel.outputs.preview_url }}/sitemap.xml From 5ba0b379267fdae4176e0a1140f89eef3a8508b0 Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Sat, 20 Aug 2022 07:40:46 -0500 Subject: [PATCH 09/13] fix: next-sitemap package unmeet peer dependencie --- package.json | 3 +++ yarn.lock | 51 ++++++++++++++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 93e9279..715f45a 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,8 @@ "next-sitemap": "3.1.20", "prettier": "2.7.1", "typescript": "4.7.4" + }, + "resolutions": { + "@next/env": "12.2.5" } } diff --git a/yarn.lock b/yarn.lock index 0e34ab3..48d3810 100644 --- a/yarn.lock +++ b/yarn.lock @@ -413,11 +413,16 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== -"@types/node@18.7.6", "@types/node@>=12": +"@types/node@18.7.6": version "18.7.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.6.tgz#31743bc5772b6ac223845e18c3fc26f042713c83" integrity sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A== +"@types/node@>=12": + version "18.7.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.8.tgz#6bbf2be6fbf9c187a5040d4277d24a06a18957a1" + integrity sha512-/YP55EMK2341JkODUb8DM9O0x1SIz2aBvyF33Uf1c76St3VpsMXEIW0nxuKkq/5cxnbz0RD9cfwNZHEAZQD3ag== + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -692,9 +697,9 @@ camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-lite@^1.0.30001332: - version "1.0.30001376" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001376.tgz#af2450833e5a06873fbb030a9556ca9461a2736d" - integrity sha512-I27WhtOQ3X3v3it9gNs/oTpoE5KpwmqKR5oKPA8M0G7uMXh9Ty81Q904HpKUrM30ei7zfcL5jE7AXefgbOfMig== + version "1.0.30001379" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001379.tgz#c42f61d3ee45152ad0fa5005a6b5b34c27797a07" + integrity sha512-zXf+qxuN8OJrK5Bl5HbJg8cc5/Zm01WNW4ooVWUh92YlKqQZW3fwN5lXLB+kI8wkP5vTWkIIN+rutZuJhf4ykw== chalk@^2.0.0: version "2.4.2" @@ -1377,9 +1382,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2" - integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ== + version "3.2.7" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" + integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== fs-extra@^10.0.0: version "10.1.0" @@ -1620,9 +1625,9 @@ i18next-fs-backend@^1.1.4: integrity sha512-raTel3EfshiUXxR0gvmIoqp75jhkj8+7R1LjB006VZKPTFBbXyx6TlUVhb8Z9+7ahgpFbcQg1QWVOdf/iNzI5A== i18next@^21.8.13: - version "21.9.0" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.0.tgz#b63ebb0d4e1b23709951ca4774dc19d2ffac9553" - integrity sha512-B+6/yd7rCpJidyPuBaEApUECx7G8Ai6+tqYhrChsY4MmQqJhG7qJ4eT6Lm1OnRhieVelEtfxh4aAQktdNVZtDA== + version "21.9.1" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.1.tgz#9e3428990f5b2cc9ac1b98dd025f3e411c368249" + integrity sha512-ITbDrAjbRR73spZAiu6+ex5WNlHRr1mY+acDi2ioTHuUiviJqSz269Le1xHAf0QaQ6GgIHResUhQNcxGwa/PhA== dependencies: "@babel/runtime" "^7.17.2" @@ -1813,9 +1818,9 @@ isexe@^2.0.0: integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== jose@^4.1.4, jose@^4.3.7: - version "4.8.3" - resolved "https://registry.yarnpkg.com/jose/-/jose-4.8.3.tgz#5a754fb4aa5f2806608d083f438e6916b11087da" - integrity sha512-7rySkpW78d8LBp4YU70Wb7+OTgE3OwAALNVZxhoIhp4Kscp+p/fBkdpxGAMKxvCAMV4QfXBU9m6l9nX/vGwd2g== + version "4.9.0" + resolved "https://registry.yarnpkg.com/jose/-/jose-4.9.0.tgz#98ecaf81b13361d1931c0126e3f765549c782f92" + integrity sha512-RgaqEOZLkVO+ViN3KkN44XJt9g7+wMveUv59sVLaTxONcUPc8ZpfqOCeLphVBZyih2dgkvZ0Ap1CNcokvY7Uyw== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -2080,7 +2085,7 @@ next-i18next@11.3.0: i18next-fs-backend "^1.1.4" react-i18next "^11.18.0" -next-sitemap@^3.1.20: +next-sitemap@3.1.20: version "3.1.20" resolved "https://registry.yarnpkg.com/next-sitemap/-/next-sitemap-3.1.20.tgz#3b5839b452688a5eaebec22603d2f9e59ef70088" integrity sha512-ugcSQpAtwc9fk7fsr5to0yrlA/RjY0kw2wHOUqcrRXnZDwFfBwGnEVvaYbI7C4ZlhvxjJTA3G15QMpvpmvPquw== @@ -2174,9 +2179,9 @@ object-keys@^1.1.1: integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== object.assign@^4.1.2, object.assign@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.3.tgz#d36b7700ddf0019abb6b1df1bb13f6445f79051f" - integrity sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA== + version "4.1.4" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== dependencies: call-bind "^1.0.2" define-properties "^1.1.4" @@ -2375,16 +2380,16 @@ postcss@^8.3.7: source-map-js "^1.0.2" preact-render-to-string@^5.1.19: - version "5.2.1" - resolved "https://registry.yarnpkg.com/preact-render-to-string/-/preact-render-to-string-5.2.1.tgz#71f3e8cda65f33dbc8ad8d904ff58e3f532e59f3" - integrity sha512-Wp3ner1aIVBpKg02C4AoLdBiw4kNaiFSYHr4wUF+fR7FWKAQzNri+iPfPp31sEhAtBfWoJrSxiEFzd5wp5zCgQ== + version "5.2.2" + resolved "https://registry.yarnpkg.com/preact-render-to-string/-/preact-render-to-string-5.2.2.tgz#865174418f2e4e8e37fc40f1a20c5a23dfdc0971" + integrity sha512-ZBPfzWmHjasQIzysj72VYJ6oa2bphpxNvzLRdRj/XGFKyeTBJIDmoiKJlBGfxzU4TYL2CjpAWmcFIXcV+HQEBg== dependencies: pretty-format "^3.8.0" preact@^10.6.3: - version "10.10.2" - resolved "https://registry.yarnpkg.com/preact/-/preact-10.10.2.tgz#3460d456d84c4701af33ac37e9bd3054271d5b1e" - integrity sha512-GUXSsfwq4NKhlLYY5ctfNE0IjFk7Xo4952yPI8yMkXdhzeQmQ+FahZITe7CeHXMPyKBVQ8SoCmGNIy9TSOdhgQ== + version "10.10.6" + resolved "https://registry.yarnpkg.com/preact/-/preact-10.10.6.tgz#1fe62aecf93974b64e6a42e09ba1f00f93207d14" + integrity sha512-w0mCL5vICUAZrh1DuHEdOWBjxdO62lvcO++jbzr8UhhYcTbFkpegLH9XX+7MadjTl/y0feoqwQ/zAnzkc/EGog== prelude-ls@^1.2.1: version "1.2.1" From b5629bfd72f59736c0a50c50f9d1975c0626f0d9 Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Sat, 20 Aug 2022 07:59:39 -0500 Subject: [PATCH 10/13] fix: missing sitemap on production robots.txt --- src/utils/generate-robots-txt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/generate-robots-txt.js b/src/utils/generate-robots-txt.js index ec0b713..fa0ef99 100644 --- a/src/utils/generate-robots-txt.js +++ b/src/utils/generate-robots-txt.js @@ -1,6 +1,6 @@ const fs = require('fs'); -const crawlableRobotsTxt = `User-agent: *\nAllow: /`; +const crawlableRobotsTxt = `User-agent: *\nAllow: /\n\nSitemap: https://next-batatabit.vercel.app/sitemap.xml`; const uncrawlableRobotsTxt = `User-agent: *\nDisallow: /`; From bd6bc70e541c0e682056177f5690fe0fda017e6d Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Sun, 21 Aug 2022 10:31:02 -0500 Subject: [PATCH 11/13] style: improve contrast errors, missing headers --- src/components/Exchange/Exchange.module.css | 6 +++--- src/components/Exchange/Exchange.tsx | 4 ++-- src/components/Plans/Plans.module.css | 4 ++-- src/components/Plans/Plans.tsx | 12 ++++++------ .../ProductDetails/ProductDetails.module.css | 4 ++-- src/components/ProductDetails/ProductDetails.tsx | 8 ++++---- src/styles/globals.css | 4 ++++ 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/components/Exchange/Exchange.module.css b/src/components/Exchange/Exchange.module.css index 37e2024..0ac6bd6 100644 --- a/src/components/Exchange/Exchange.module.css +++ b/src/components/Exchange/Exchange.module.css @@ -33,7 +33,7 @@ font-style: normal; font-weight: 500; line-height: 1.6rem; - color: #757575; + color: var(--subtitle); } .tables { @@ -96,14 +96,14 @@ font-size: 1.6rem; font-weight: 500; line-height: 1.9rem; - color: #b5b0ac; + color: var(--table-name); } .tableRight { font-size: 1.4rem; font-weight: normal; line-height: 1.7rem; - color: #757575; + color: var(--subtitle); } .tableTopLeft { diff --git a/src/components/Exchange/Exchange.tsx b/src/components/Exchange/Exchange.tsx index 6a3aa6b..f6d1d3c 100644 --- a/src/components/Exchange/Exchange.tsx +++ b/src/components/Exchange/Exchange.tsx @@ -25,7 +25,7 @@ const Exchange = () => {
-

{t('coins')}

+

{t('coins')}

@@ -101,7 +101,7 @@ const Exchange = () => {
-

{t('commissions')}

+

{t('commissions')}

diff --git a/src/components/Plans/Plans.module.css b/src/components/Plans/Plans.module.css index 931b469..19046f3 100644 --- a/src/components/Plans/Plans.module.css +++ b/src/components/Plans/Plans.module.css @@ -25,7 +25,7 @@ font-style: normal; font-weight: 500; line-height: 1.8rem; - color: #757575; + color: var(--subtitle); } .sliderContainer { display: flex; @@ -102,7 +102,7 @@ font-size: 1.2rem; font-style: normal; font-weight: 500; - color: #757575; + color: var(--subtitle); } .cardCta { width: 150px; diff --git a/src/components/Plans/Plans.tsx b/src/components/Plans/Plans.tsx index 6c08a08..c417eec 100644 --- a/src/components/Plans/Plans.tsx +++ b/src/components/Plans/Plans.tsx @@ -16,9 +16,9 @@ const Plans = () => {

{t('plans.0.payment')}

-

+

$ {t('plans.0.price')} -

+

* {t('plans.0.description')}

@@ -39,7 +39,7 @@ const ProductDetails = () => { height={20} className={styles.cardIcon} /> -

{t('details.1.name')}

+

{t('details.1.name')}

{t('details.1.description')}

@@ -50,7 +50,7 @@ const ProductDetails = () => { height={20} className={styles.cardIcon} /> -

{t('details.2.name')}

+

{t('details.2.name')}

{t('details.2.description')}

@@ -61,7 +61,7 @@ const ProductDetails = () => { height={20} className={styles.cardIcon} /> -

{t('details.3.name')}

+

{t('details.3.name')}

{t('details.3.description')}

diff --git a/src/styles/globals.css b/src/styles/globals.css index dda05b5..ad820fd 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -7,6 +7,10 @@ --warm-black: #201e1c; --black: #282623; --grey: #bababa; + --subtitle: #717171; /*#757575*/ + --table-name: #787572; /*#b5b0ac*/ + --card-subtitle: #878787; /*#808080*/ + --card-text: #8e8e8e; /*#808080*/ --off-white: #faf8f7; --just-white: #ffffff; From a892d34fa0829fb25033a5c0b5231a829e00b3ff Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Sun, 21 Aug 2022 12:51:51 -0500 Subject: [PATCH 12/13] style: improve more contrast errors --- src/components/Exchange/Exchange.module.css | 12 +++++++++--- .../LocaleOptions/LocaleOptions.module.css | 8 ++++---- src/components/Plans/Plans.module.css | 4 +++- src/components/Poster/Poster.module.css | 1 + src/layout/Footer/Footer.module.css | 2 +- src/layout/Header/Header.module.css | 2 +- src/styles/globals.css | 4 ++-- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/components/Exchange/Exchange.module.css b/src/components/Exchange/Exchange.module.css index 0ac6bd6..7e042a4 100644 --- a/src/components/Exchange/Exchange.module.css +++ b/src/components/Exchange/Exchange.module.css @@ -64,7 +64,10 @@ font-style: normal; font-weight: bold; line-height: 2.3rem; - color: #ff9536; + color: var(--subtitle); + padding: 8px; + border-radius: 8px; + background-color: var(--soft-orange); } .comisionesTableTitle { margin-bottom: 15px; @@ -72,7 +75,10 @@ font-style: normal; font-weight: bold; line-height: 2.3rem; - color: var(--secundary-blue); + color: var(--subtitle); + padding: 8px; + border-radius: 8px; + background-color: var(--soft-blue); } .currencyTableContainer, .comisionesTableContainer { @@ -144,7 +150,7 @@ font-size: 1.2rem; font-weight: 300; line-height: 1.5rem; - color: var(--warm-black); + color: #6a6a6a; } .currencyDateBg { diff --git a/src/components/LocaleOptions/LocaleOptions.module.css b/src/components/LocaleOptions/LocaleOptions.module.css index 9196811..9b6a937 100644 --- a/src/components/LocaleOptions/LocaleOptions.module.css +++ b/src/components/LocaleOptions/LocaleOptions.module.css @@ -13,7 +13,7 @@ font-style: normal; line-height: 1.8rem; margin-bottom: 4px; - color: var(--just-white); + color: var(--warm-black); } .section a { @@ -23,15 +23,15 @@ line-height: 1.8rem; padding: 4px; text-decoration: none; - color: var(--just-white); + color: var(--warm-black); } .section a:hover, .section a:active, .section a:focus { - border: 1px solid var(--just-white); + border: 1px solid var(--warm-black); } .active { - border: 1px solid var(--just-white); + border: 1px solid var(--warm-black); } diff --git a/src/components/Plans/Plans.module.css b/src/components/Plans/Plans.module.css index 19046f3..b423f92 100644 --- a/src/components/Plans/Plans.module.css +++ b/src/components/Plans/Plans.module.css @@ -63,11 +63,12 @@ padding: 6px; top: -15px; left: calc(50% - 60px); + font-family: var(--Secondary-FF); font-size: 1.2rem; border-radius: 8px; font-style: normal; font-weight: bold; - color: var(--just-white); + color: var(--warm-black); background-color: var(--bitcoin-orange); } @@ -121,4 +122,5 @@ .cardCtaIcon { vertical-align: middle; + margin-left: 5px; } diff --git a/src/components/Poster/Poster.module.css b/src/components/Poster/Poster.module.css index ceb96ec..6762c57 100644 --- a/src/components/Poster/Poster.module.css +++ b/src/components/Poster/Poster.module.css @@ -24,4 +24,5 @@ font-weight: bold; line-height: 2.6rem; color: var(--just-white); + text-shadow: 1px 1px 2px black; } diff --git a/src/layout/Footer/Footer.module.css b/src/layout/Footer/Footer.module.css index d8aa3f7..ee4b23c 100644 --- a/src/layout/Footer/Footer.module.css +++ b/src/layout/Footer/Footer.module.css @@ -26,5 +26,5 @@ .a { text-decoration: none; - color: var(--just-white); + color: var(--warm-black); } diff --git a/src/layout/Header/Header.module.css b/src/layout/Header/Header.module.css index 3b0e54d..60ba47f 100644 --- a/src/layout/Header/Header.module.css +++ b/src/layout/Header/Header.module.css @@ -7,7 +7,7 @@ min-width: 320px; height: 334px; text-align: center; - background: linear-gradient(207.8deg, #201e1c 16.69%, #f7931a 100%); + background: linear-gradient(207.8deg, #201e1c 16.69%, #ff9933 100%); } .logo { diff --git a/src/styles/globals.css b/src/styles/globals.css index ad820fd..bb9c7a4 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -1,8 +1,8 @@ :root { /* Colors */ - --bitcoin-orange: #f7931a; + --bitcoin-orange: #ff9933; --soft-orange: #ffe9d5; - --secundary-blue: #1a9af7; + --secundary-blue: #1a63f7; /*#1a9af7*/ --soft-blue: #e7f5ff; --warm-black: #201e1c; --black: #282623; From e128c50b56d5da7e1f5491bbd481ffaf5f67fb63 Mon Sep 17 00:00:00 2001 From: Hugomndez Date: Sun, 21 Aug 2022 12:58:34 -0500 Subject: [PATCH 13/13] style: improve contrast error --- src/components/Exchange/Exchange.module.css | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/components/Exchange/Exchange.module.css b/src/components/Exchange/Exchange.module.css index 7e042a4..d245429 100644 --- a/src/components/Exchange/Exchange.module.css +++ b/src/components/Exchange/Exchange.module.css @@ -65,9 +65,6 @@ font-weight: bold; line-height: 2.3rem; color: var(--subtitle); - padding: 8px; - border-radius: 8px; - background-color: var(--soft-orange); } .comisionesTableTitle { margin-bottom: 15px; @@ -76,9 +73,6 @@ font-weight: bold; line-height: 2.3rem; color: var(--subtitle); - padding: 8px; - border-radius: 8px; - background-color: var(--soft-blue); } .currencyTableContainer, .comisionesTableContainer { @@ -158,5 +152,5 @@ } .comisionesDateBg { - background-color: var(--soft-blue); + background-color: var(--soft-orange); }