From 4bde42f6f4d939f7f14e13abb7168fe3b3c457db Mon Sep 17 00:00:00 2001 From: Matheusdoe-dev Date: Wed, 18 Nov 2020 13:43:30 -0300 Subject: [PATCH 1/6] :heavy_plus_sign: feat: react-helmet --- web/package.json | 1 + yarn.lock | 43 ++++++++++++++++++++----------------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/web/package.json b/web/package.json index e9ac1d7..502c03d 100644 --- a/web/package.json +++ b/web/package.json @@ -31,6 +31,7 @@ "react": "^16.13.1", "react-dom": "^16.13.1", "react-dropzone": "^11.2.1", + "react-helmet": "^6.1.0", "react-image-crop": "^8.6.6", "rich-markdown-editor": "^11.0.2", "styled-components": "^5.2.0", diff --git a/yarn.lock b/yarn.lock index aa27fb9..f4b74bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11912,24 +11912,16 @@ open@^7.0.0: is-docker "^2.0.0" is-wsl "^2.1.1" -opencascade.js@0.1.15: - version "0.1.15" - resolved "https://registry.yarnpkg.com/opencascade.js/-/opencascade.js-0.1.15.tgz#2898494707472c53b99bc6e3b5f99ff24c33b4e0" - integrity sha512-Xg3Po97wkNaBGjDR88+xI6vJPrxrAnF0eYZ1+jhIjy9p/GYp3fVi4zO4mL9H+F1aagd977XY5kHdScOlWiQfhQ== +opencascade.js@^0.1.15: + version "0.1.19" + resolved "https://registry.yarnpkg.com/opencascade.js/-/opencascade.js-0.1.19.tgz#32d545ca4add213d168eb6e6973dceba1bcab35b" + integrity sha512-7q8LNihtU7BzsIXXoqTHq2/7ASfDdK5OycuI1oscc/9Opmew8OXjcv/oTSF+w5U+0dwUt8LewdG/xYSIkkf8Ig== opener@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA== -opentype.js@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/opentype.js/-/opentype.js-1.3.3.tgz#65b8645b090a1ad444065b784d442fa19d1061f6" - integrity sha512-/qIY/+WnKGlPIIPhbeNjynfD2PO15G9lA/xqlX2bDH+4lc3Xz5GCQ68mqxj3DdUv6AJqCeaPvuAoH8mVL0zcuA== - dependencies: - string.prototype.codepointat "^0.2.1" - tiny-inflate "^1.0.3" - opn@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" @@ -13148,7 +13140,7 @@ react-error-overlay@^6.0.1, react-error-overlay@^6.0.3: resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108" integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA== -react-fast-compare@^3.0.1: +react-fast-compare@^3.0.1, react-fast-compare@^3.1.1: version "3.2.0" resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== @@ -13176,6 +13168,16 @@ react-helmet-async@^1.0.2: react-fast-compare "^3.0.1" shallowequal "^1.1.0" +react-helmet@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" + integrity sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw== + dependencies: + object-assign "^4.1.1" + prop-types "^15.7.2" + react-fast-compare "^3.1.1" + react-side-effect "^2.1.0" + react-hook-form@^6.5.3: version "6.7.1" resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-6.7.1.tgz#58f1ce3ba6b0f3cb05b665a4cc268d0623ea9e1a" @@ -13240,6 +13242,11 @@ react-portal@^4.2.1: dependencies: prop-types "^15.5.8" +react-side-effect@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" + integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ== + react-sizeme@^2.6.7: version "2.6.12" resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e" @@ -14594,11 +14601,6 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.codepointat@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc" - integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg== - "string.prototype.matchall@^4.0.0 || ^3.0.1", string.prototype.matchall@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" @@ -15099,11 +15101,6 @@ tiny-emitter@^2.0.0: resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== -tiny-inflate@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4" - integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== - tiny-warning@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" -- 2.39.5 From 5a2e825336cb9e831c162cf212c3373b85260365 Mon Sep 17 00:00:00 2001 From: Matheusdoe-dev Date: Wed, 18 Nov 2020 13:43:47 -0300 Subject: [PATCH 2/6] :mag: feat: seo component --- web/src/components/Seo/Seo.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 web/src/components/Seo/Seo.js diff --git a/web/src/components/Seo/Seo.js b/web/src/components/Seo/Seo.js new file mode 100644 index 0000000..8445fda --- /dev/null +++ b/web/src/components/Seo/Seo.js @@ -0,0 +1,28 @@ +import React from 'react' +import { Helmet } from 'react-helmet' + +const Seo = ({ title, description, lang }) => { + return ( + <> + + + + + + + + + Cadhub - {title} + + + + ) +} + +export default Seo -- 2.39.5 From 38e7d82da53f60d35158d9b65f30ff2f53bb6871 Mon Sep 17 00:00:00 2001 From: Matheusdoe-dev Date: Wed, 18 Nov 2020 13:44:36 -0300 Subject: [PATCH 3/6] :mag: chore: seo component on all pages --- web/src/pages/CommentPage/CommentPage.js | 3 +++ web/src/pages/CommentsPage/CommentsPage.js | 3 +++ web/src/pages/EditCommentPage/EditCommentPage.js | 3 +++ web/src/pages/EditPart2Page/EditPart2Page.js | 3 +++ web/src/pages/EditPartPage/EditPartPage.js | 3 +++ web/src/pages/EditPartReactionPage/EditPartReactionPage.js | 7 +++++++ web/src/pages/EditUser2Page/EditUser2Page.js | 3 +++ web/src/pages/EditUserPage/EditUserPage.js | 3 +++ web/src/pages/FatalErrorPage/FatalErrorPage.js | 3 +++ web/src/pages/IdePartPage/IdePartPage.js | 3 +++ web/src/pages/NewCommentPage/NewCommentPage.js | 7 +++++++ web/src/pages/NewPart2Page/NewPart2Page.js | 3 +++ web/src/pages/NewPartPage/NewPartPage.js | 3 +++ web/src/pages/NewPartReactionPage/NewPartReactionPage.js | 7 +++++++ web/src/pages/NewUserPage/NewUserPage.js | 3 +++ web/src/pages/NotFoundPage/NotFoundPage.js | 3 +++ web/src/pages/Part2Page/Part2Page.js | 3 +++ web/src/pages/PartPage/PartPage.js | 3 +++ web/src/pages/PartReactionPage/PartReactionPage.js | 7 +++++++ web/src/pages/PartReactionsPage/PartReactionsPage.js | 7 +++++++ web/src/pages/PartsPage/PartsPage.js | 3 +++ web/src/pages/User2Page/User2Page.js | 3 +++ web/src/pages/UserPage/UserPage.js | 3 +++ web/src/pages/UsersPage/UsersPage.js | 3 +++ 24 files changed, 92 insertions(+) diff --git a/web/src/pages/CommentPage/CommentPage.js b/web/src/pages/CommentPage/CommentPage.js index ea476db..9ebef8d 100644 --- a/web/src/pages/CommentPage/CommentPage.js +++ b/web/src/pages/CommentPage/CommentPage.js @@ -1,9 +1,12 @@ import MainLayout from 'src/layouts/MainLayout' import CommentCell from 'src/components/CommentCell' +import Seo from 'src/components/Seo/Seo' const CommentPage = ({ id }) => { return ( + + ) diff --git a/web/src/pages/CommentsPage/CommentsPage.js b/web/src/pages/CommentsPage/CommentsPage.js index eae6bf3..e4b0c16 100644 --- a/web/src/pages/CommentsPage/CommentsPage.js +++ b/web/src/pages/CommentsPage/CommentsPage.js @@ -1,9 +1,12 @@ import MainLayout from 'src/layouts/MainLayout' import CommentsCell from 'src/components/CommentsCell' +import Seo from 'src/components/Seo/Seo' const CommentsPage = () => { return ( + + ) diff --git a/web/src/pages/EditCommentPage/EditCommentPage.js b/web/src/pages/EditCommentPage/EditCommentPage.js index 966739f..49ae36c 100644 --- a/web/src/pages/EditCommentPage/EditCommentPage.js +++ b/web/src/pages/EditCommentPage/EditCommentPage.js @@ -1,9 +1,12 @@ import MainLayout from 'src/layouts/MainLayout' import EditCommentCell from 'src/components/EditCommentCell' +import Seo from 'src/components/Seo/Seo' const EditCommentPage = ({ id }) => { return ( + + ) diff --git a/web/src/pages/EditPart2Page/EditPart2Page.js b/web/src/pages/EditPart2Page/EditPart2Page.js index 808dafa..983a591 100644 --- a/web/src/pages/EditPart2Page/EditPart2Page.js +++ b/web/src/pages/EditPart2Page/EditPart2Page.js @@ -2,11 +2,14 @@ import { useAuth } from '@redwoodjs/auth' import MainLayout from 'src/layouts/MainLayout' import Part2Cell from 'src/components/Part2Cell' +import Seo from 'src/components/Seo/Seo' const EditPart2Page = ({ userName, partTitle }) => { const { currentUser } = useAuth() return ( + + { return ( + + ) diff --git a/web/src/pages/EditPartReactionPage/EditPartReactionPage.js b/web/src/pages/EditPartReactionPage/EditPartReactionPage.js index f57b936..45f98d2 100644 --- a/web/src/pages/EditPartReactionPage/EditPartReactionPage.js +++ b/web/src/pages/EditPartReactionPage/EditPartReactionPage.js @@ -1,9 +1,16 @@ import MainLayout from 'src/layouts/MainLayout' import EditPartReactionCell from 'src/components/EditPartReactionCell' +import Seo from 'src/components/Seo/Seo' const EditPartReactionPage = ({ id }) => { return ( + + ) diff --git a/web/src/pages/EditUser2Page/EditUser2Page.js b/web/src/pages/EditUser2Page/EditUser2Page.js index 86c8d1a..a2f4545 100644 --- a/web/src/pages/EditUser2Page/EditUser2Page.js +++ b/web/src/pages/EditUser2Page/EditUser2Page.js @@ -1,9 +1,12 @@ import MainLayout from 'src/layouts/MainLayout' import EditUser2Cell from 'src/components/EditUser2Cell' +import Seo from 'src/components/Seo/Seo' const UserPage = ({ userName }) => { return ( + + ) diff --git a/web/src/pages/EditUserPage/EditUserPage.js b/web/src/pages/EditUserPage/EditUserPage.js index 5c8fa8d..be558ba 100644 --- a/web/src/pages/EditUserPage/EditUserPage.js +++ b/web/src/pages/EditUserPage/EditUserPage.js @@ -1,9 +1,12 @@ import MainLayout from 'src/layouts/MainLayout' import EditUserCell from 'src/components/EditUserCell' +import Seo from 'src/components/Seo/Seo' const EditUserPage = ({ id }) => { return ( + + ) diff --git a/web/src/pages/FatalErrorPage/FatalErrorPage.js b/web/src/pages/FatalErrorPage/FatalErrorPage.js index b21e3cc..790906a 100644 --- a/web/src/pages/FatalErrorPage/FatalErrorPage.js +++ b/web/src/pages/FatalErrorPage/FatalErrorPage.js @@ -6,9 +6,12 @@ // avoid the possibility that it will cause its own error. If it does, Redwood will // still render a generic error page, but your users will prefer something a bit more // thoughtful. =) +import Seo from 'src/components/Seo/Seo' export default () => (
+ +