From 6f9937f16667adc237596a8d99e3f4b11f13b823 Mon Sep 17 00:00:00 2001 From: gurusainath Date: Wed, 16 Aug 2023 16:11:52 +0530 Subject: [PATCH 1/3] dev: custom error messages. --- apps/space/app/404/page.tsx | 30 ++++++++++++++++++ .../[project_slug]/layout.tsx | 30 ++++++++++++------ apps/space/app/project-not-published/page.tsx | 31 +++++++++++++++++++ .../issues/board-views/kanban/block.tsx | 2 +- apps/space/package.json | 2 +- apps/space/public/404.svg | 17 ++++++++++ apps/space/public/project-not-published.svg | 17 ++++++++++ 7 files changed, 117 insertions(+), 12 deletions(-) create mode 100644 apps/space/app/404/page.tsx create mode 100644 apps/space/app/project-not-published/page.tsx create mode 100644 apps/space/public/404.svg create mode 100644 apps/space/public/project-not-published.svg diff --git a/apps/space/app/404/page.tsx b/apps/space/app/404/page.tsx new file mode 100644 index 00000000000..d10d95fb9bd --- /dev/null +++ b/apps/space/app/404/page.tsx @@ -0,0 +1,30 @@ +// next imports +import Image from "next/image"; + +const Custom404Error = () => ( +
+
+
+
+ 404- Page not found +
+
Oops! Something went wrong.
+
+ Sorry, the page you are looking for cannot be found. It may have been removed, had its name changed, or is + temporarily unavailable. +
+
+ +
+ + Go to your Workspace + +
+
+
+); + +export default Custom404Error; diff --git a/apps/space/app/[workspace_slug]/[project_slug]/layout.tsx b/apps/space/app/[workspace_slug]/[project_slug]/layout.tsx index fde4f5d99df..7b4ed614233 100644 --- a/apps/space/app/[workspace_slug]/[project_slug]/layout.tsx +++ b/apps/space/app/[workspace_slug]/[project_slug]/layout.tsx @@ -7,6 +7,7 @@ import IssueNavbar from "components/issues/navbar"; import IssueFilter from "components/issues/filters-render"; // service import ProjectService from "services/project.service"; +import { redirect } from "next/navigation"; type LayoutProps = { params: { workspace_slug: string; project_slug: string }; @@ -17,17 +18,26 @@ export async function generateMetadata({ params }: LayoutProps): Promise${ - typeof project?.project_details?.emoji != "object" - ? String.fromCodePoint(parseInt(project?.project_details?.emoji)) - : "✈️" - }`, - }; + return { + title: `${project?.project_details?.name} | ${workspace_slug}`, + description: `${ + project?.project_details?.description || `${project?.project_details?.name} | ${workspace_slug}` + }`, + icons: `data:image/svg+xml,${ + typeof project?.project_details?.emoji != "object" + ? String.fromCodePoint(parseInt(project?.project_details?.emoji)) + : "✈️" + }`, + }; + } catch (error: any) { + if (error?.data?.error) { + redirect(`/project-not-published`); + } + return {}; + } } const RootLayout = ({ children }: { children: React.ReactNode }) => ( diff --git a/apps/space/app/project-not-published/page.tsx b/apps/space/app/project-not-published/page.tsx new file mode 100644 index 00000000000..82a2ff5da42 --- /dev/null +++ b/apps/space/app/project-not-published/page.tsx @@ -0,0 +1,31 @@ +// next imports +import Image from "next/image"; + +const CustomProjectNotPublishedError = () => ( +
+
+
+
+ 404- Page not found +
+
+ Oops! The page you{`'`}re looking for isn{`'`}t live at the moment. +
+
+ If this is your project, login to your workspace to adjust its visibility settings and make it public. +
+
+ +
+ + Go to your Workspace + +
+
+
+); + +export default CustomProjectNotPublishedError; diff --git a/apps/space/components/issues/board-views/kanban/block.tsx b/apps/space/components/issues/board-views/kanban/block.tsx index 304e05612bc..22af77568b9 100644 --- a/apps/space/components/issues/board-views/kanban/block.tsx +++ b/apps/space/components/issues/board-views/kanban/block.tsx @@ -27,7 +27,7 @@ export const IssueListBlock = ({ issue }: { issue: IIssue }) => {
{issue.name}
{/* priority */} -
+
{issue?.priority && (
diff --git a/apps/space/package.json b/apps/space/package.json index c2eaa8af194..dd7a3058c9f 100644 --- a/apps/space/package.json +++ b/apps/space/package.json @@ -20,7 +20,7 @@ "js-cookie": "^3.0.1", "mobx": "^6.10.0", "mobx-react-lite": "^4.0.3", - "next": "^13.4.13", + "next": "^13.4.16", "nprogress": "^0.2.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/apps/space/public/404.svg b/apps/space/public/404.svg new file mode 100644 index 00000000000..4c298417dcb --- /dev/null +++ b/apps/space/public/404.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/apps/space/public/project-not-published.svg b/apps/space/public/project-not-published.svg new file mode 100644 index 00000000000..4c298417dcb --- /dev/null +++ b/apps/space/public/project-not-published.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + From e03fe4efabee8b7ec9a14bd71ca4bbae5bd8e803 Mon Sep 17 00:00:00 2001 From: gurusainath Date: Wed, 16 Aug 2023 16:21:22 +0530 Subject: [PATCH 2/3] dev: updated next version in yarn.lock --- yarn.lock | 108 +++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4d62e7f7cbd..b4cf55f2f5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1384,10 +1384,10 @@ resolved "https://registry.yarnpkg.com/@next/env/-/env-12.3.2.tgz#fb819366771f5721e9438ca3a42ad18684f0949b" integrity sha512-upwtMaHxlv/udAWGq0kE+rg8huwmcxQPsKZFhS1R5iVO323mvxEBe1YrSXe1awLbg9sTIuEHbgxjLLt7JbeuAQ== -"@next/env@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/env/-/env-13.4.13.tgz#50250cec7626904b93a4a934933d6a747763259d" - integrity sha512-fwz2QgVg08v7ZL7KmbQBLF2PubR/6zQdKBgmHEl3BCyWTEDsAQEijjw2gbFhI1tcKfLdOOJUXntz5vZ4S0Polg== +"@next/env@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/env/-/env-13.4.16.tgz#382b565b35a2a69bd0e6b50f74c7b95f0c4b1097" + integrity sha512-pCU0sJBqdfKP9mwDadxvZd+eLz3fZrTlmmDHY12Hdpl3DD0vy8ou5HWKVfG0zZS6tqhL4wnQqRbspdY5nqa7MA== "@next/eslint-plugin-next@12.2.2": version "12.2.2" @@ -1425,20 +1425,20 @@ resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.2.tgz#97c532d35c66ce6b6941ae24b5b8b267b9b0d0d8" integrity sha512-PTUfe1ZrwjsiuTmr3bOM9lsoy5DCmfYsLOUF9ZVhtbi5MNJVmUTy4VZ06GfrvnCO5hGCr48z3vpFE9QZ0qLcPw== -"@next/swc-darwin-arm64@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.13.tgz#700fddf66c936c89f98eb60d88cc3d06642aa0bf" - integrity sha512-ZptVhHjzUuivnXMNCJ6lER33HN7lC+rZ01z+PM10Ows21NHFYMvGhi5iXkGtBDk6VmtzsbqnAjnx4Oz5um0FjA== +"@next/swc-darwin-arm64@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.16.tgz#ed6a342f95e5f21213fdadbceb65b40ae678cee0" + integrity sha512-Rl6i1uUq0ciRa3VfEpw6GnWAJTSKo9oM2OrkGXPsm7rMxdd2FR5NkKc0C9xzFCI4+QtmBviWBdF2m3ur3Nqstw== "@next/swc-darwin-x64@12.3.2": version "12.3.2" resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.2.tgz#e0cb4ff4b11faaff3a891bd1d18ed72f71e30ebe" integrity sha512-1HkjmS9awwlaeEY8Y01nRSNkSv3y+qnC/mjMPe/W66hEh3QKa/LQHqHeS7NOdEs19B2mhZ7w+EgMRXdLQ0Su8w== -"@next/swc-darwin-x64@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.13.tgz#762d422cb31b27807c9bf4eac766986742a051fe" - integrity sha512-t9nTiWCLApw8W4G1kqJyYP7y6/7lyal3PftmRturIxAIBlZss9wrtVN8nci50StDHmIlIDxfguYIEGVr9DbFTg== +"@next/swc-darwin-x64@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.16.tgz#36c16066a1a3ef8211e84a6a5d72bef15826b291" + integrity sha512-o1vIKYbZORyDmTrPV1hApt9NLyWrS5vr2p5hhLGpOnkBY1cz6DAXjv8Lgan8t6X87+83F0EUDlu7klN8ieZ06A== "@next/swc-freebsd-x64@12.3.2": version "12.3.2" @@ -1455,70 +1455,70 @@ resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.2.tgz#26df7d7cdc18cf413f12a408179ee4ac315f383a" integrity sha512-T9GCFyOIb4S3acA9LqflUYD+QZ94iZketHCqKdoO0Nx0OCHIgGJV5rotDe8TDXwh/goYpIfyHU4j1qqw4w4VnA== -"@next/swc-linux-arm64-gnu@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.13.tgz#d567943a0111dcf26de6e5e034874b405057facc" - integrity sha512-xEHUqC8eqR5DHe8SOmMnDU1K3ggrJ28uIKltrQAwqFSSSmzjnN/XMocZkcVhuncuxYrpbri0iMQstRyRVdQVWg== +"@next/swc-linux-arm64-gnu@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.16.tgz#a5b5500737f07e3aa7f184014d8df7973420df26" + integrity sha512-JRyAl8lCfyTng4zoOmE6hNI2f1MFUr7JyTYCHl1RxX42H4a5LMwJhDVQ7a9tmDZ/yj+0hpBn+Aan+d6lA3v0UQ== "@next/swc-linux-arm64-musl@12.3.2": version "12.3.2" resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.2.tgz#fd42232a6b10d9f9a4f71433d59c280a4532d06f" integrity sha512-hxNVZS6L3c2z3l9EH2GP0MGQ9exu6O8cohYNZyqC9WUl6C03sEn8xzDH1y+NgD3fVurvYkGU5F0PDddJJLfDIw== -"@next/swc-linux-arm64-musl@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.13.tgz#775f246123b8f1f3726dc14d80c7f7b67bc50cb4" - integrity sha512-sNf3MnLAm8rquSSAoeD9nVcdaDeRYOeey4stOWOyWIgbBDtP+C93amSgH/LPTDoUV7gNiU6f+ghepTjTjRgIUQ== +"@next/swc-linux-arm64-musl@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.16.tgz#381b7662c5b10ed5750dce41dd57841aa0713e77" + integrity sha512-9gqVqNzUMWbUDgDiND18xoUqhwSm2gmksqXgCU0qaOKt6oAjWz8cWYjgpPVD0WICKFylEY/gvPEP1fMZDVFZ/g== "@next/swc-linux-x64-gnu@12.3.2": version "12.3.2" resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.3.2.tgz#5307579e3d8fbdb03adbe6cfc915b51548e0a103" integrity sha512-fCPkLuwDwY8/QeXxciJJjDHG09liZym/Bhb4A+RLFQ877wUkwFsNWDUTSdUx0YXlYK/1gf67BKauqKkOKp6CYw== -"@next/swc-linux-x64-gnu@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.13.tgz#d5fc6441c181bfa09f3cb0285bf3cbb5b111e53b" - integrity sha512-WhcRaJJSHyx9OWmKjjz+OWHumiPZWRqmM/09Bt7Up4UqUJFFhGExeztR4trtv3rflvULatu9IH/nTV8fUUgaMA== +"@next/swc-linux-x64-gnu@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.16.tgz#6e0b0eab1c316506950aeb4a09a5ea5c38edabe7" + integrity sha512-KcQGwchAKmZVPa8i5PLTxvTs1/rcFnSltfpTm803Tr/BtBV3AxCkHLfhtoyVtVzx/kl/oue8oS+DSmbepQKwhw== "@next/swc-linux-x64-musl@12.3.2": version "12.3.2" resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.3.2.tgz#d5cb920a825a8dc80ffba8a6b797fb845af0b84c" integrity sha512-o+GifBIQ2K+/MEFxHsxUZoU3bsuVFLXZYWd3idimFHiVdDCVYiKsY6mYMmKDlucX+9xRyOCkKL9Tjf+3tuXJpw== -"@next/swc-linux-x64-musl@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.13.tgz#6286557e7cc7a0acb3cf0c69e279b3ae2b9a9259" - integrity sha512-+Y4LLhOWWZQIDKVwr2R17lq2KSN0F1c30QVgGIWfnjjHpH8nrIWHEndhqYU+iFuW8It78CiJjQKTw4f51HD7jA== +"@next/swc-linux-x64-musl@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.16.tgz#36b84e4509168a5cadf9dfd728c239002d4311fe" + integrity sha512-2RbMZNxYnJmW8EPHVBsGZPq5zqWAyBOc/YFxq/jIQ/Yn3RMFZ1dZVCjtIcsiaKmgh7mjA/W0ApbumutHNxRqqQ== "@next/swc-win32-arm64-msvc@12.3.2": version "12.3.2" resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.2.tgz#2a0d619e5bc0cec17ed093afd1ca6b1c37c2690c" integrity sha512-crii66irzGGMSUR0L8r9+A06eTv7FTXqw4rgzJ33M79EwQJOdpY7RVKXLQMurUhniEeQEEOfamiEdPIi/qxisw== -"@next/swc-win32-arm64-msvc@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.13.tgz#6a50b4b8ee55eb5564c2bd33eefedb9306986b0a" - integrity sha512-rWurdOR20uxjfqd1X9vDAgv0Jb26KjyL8akF9CBeFqX8rVaBAnW/Wf6A2gYEwyYY4Bai3T7p1kro6DFrsvBAAw== +"@next/swc-win32-arm64-msvc@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.16.tgz#52d36f909ccdefa2761617b6d4e9ae65f99880a9" + integrity sha512-thDcGonELN7edUKzjzlHrdoKkm7y8IAdItQpRvvMxNUXa4d9r0ElofhTZj5emR7AiXft17hpen+QAkcWpqG7Jg== "@next/swc-win32-ia32-msvc@12.3.2": version "12.3.2" resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.2.tgz#769bef60d0d678c3d7606a4dc7fee018d6199227" integrity sha512-5hRUSvn3MdQ4nVRu1rmKxq5YJzpTtZfaC/NyGw6wa4NSF1noUn/pdQGUr+I5Qz3CZkd1gZzzC0eaXQHlrk0E2g== -"@next/swc-win32-ia32-msvc@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.13.tgz#02e98e1d4cd7a81de58a78044c5f2a5d7fdf4c83" - integrity sha512-E8bSPwRuY5ibJ3CzLQmJEt8qaWrPYuUTwnrwygPUEWoLzD5YRx9SD37oXRdU81TgGwDzCxpl7z5Nqlfk50xAog== +"@next/swc-win32-ia32-msvc@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.16.tgz#a9cb0556d19c33fbb39ac9bef195fd490d6c7673" + integrity sha512-f7SE1Mo4JAchUWl0LQsbtySR9xCa+x55C0taetjUApKtcLR3AgAjASrrP+oE1inmLmw573qRnE1eZN8YJfEBQw== "@next/swc-win32-x64-msvc@12.3.2": version "12.3.2" resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.2.tgz#45beb4b9d28e6dd6abf63cab1c5b92dc84323a6b" integrity sha512-tpQJYUH+TzPMIsdVl9fH8uDg47iwiNjKY+8e9da3dXqlkztKzjSw0OwSADoqh3KrifplXeKSta+BBGLdBqg3sg== -"@next/swc-win32-x64-msvc@13.4.13": - version "13.4.13" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.13.tgz#db150b7d84e6218e53e748a6f0ab2159afc2cd6a" - integrity sha512-4KlyC6jWRubPnppgfYsNTPeWfGCxtWLh5vaOAW/kdzAk9widqho8Qb5S4K2vHmal1tsURi7Onk2MMCV1phvyqA== +"@next/swc-win32-x64-msvc@13.4.16": + version "13.4.16" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.16.tgz#79a151d94583e03992c80df3d3e7f7686390ddac" + integrity sha512-WamDZm1M/OEM4QLce3lOmD1XdLEl37zYZwlmOLhmF7qYJ2G6oYm9+ejZVv+LakQIsIuXhSpVlOvrxIAHqwRkPQ== "@nivo/annotations@0.80.0": version "0.80.0" @@ -5884,12 +5884,12 @@ next@12.3.2: "@next/swc-win32-ia32-msvc" "12.3.2" "@next/swc-win32-x64-msvc" "12.3.2" -next@^13.4.13: - version "13.4.13" - resolved "https://registry.yarnpkg.com/next/-/next-13.4.13.tgz#8824c5702daa2ef691386871c9158a6324df33d6" - integrity sha512-A3YVbVDNeXLhWsZ8Nf6IkxmNlmTNz0yVg186NJ97tGZqPDdPzTrHotJ+A1cuJm2XfuWPrKOUZILl5iBQkIf8Jw== +next@^13.4.16: + version "13.4.16" + resolved "https://registry.yarnpkg.com/next/-/next-13.4.16.tgz#327ef6885b22161ed001cd5943c20b5e409a9406" + integrity sha512-1xaA/5DrfpPu0eV31Iro7JfPeqO8uxQWb1zYNTe+KDKdzqkAGapLcDYHMLNKXKB7lHjZ7LfKUOf9dyuzcibrhA== dependencies: - "@next/env" "13.4.13" + "@next/env" "13.4.16" "@swc/helpers" "0.5.1" busboy "1.6.0" caniuse-lite "^1.0.30001406" @@ -5898,15 +5898,15 @@ next@^13.4.13: watchpack "2.4.0" zod "3.21.4" optionalDependencies: - "@next/swc-darwin-arm64" "13.4.13" - "@next/swc-darwin-x64" "13.4.13" - "@next/swc-linux-arm64-gnu" "13.4.13" - "@next/swc-linux-arm64-musl" "13.4.13" - "@next/swc-linux-x64-gnu" "13.4.13" - "@next/swc-linux-x64-musl" "13.4.13" - "@next/swc-win32-arm64-msvc" "13.4.13" - "@next/swc-win32-ia32-msvc" "13.4.13" - "@next/swc-win32-x64-msvc" "13.4.13" + "@next/swc-darwin-arm64" "13.4.16" + "@next/swc-darwin-x64" "13.4.16" + "@next/swc-linux-arm64-gnu" "13.4.16" + "@next/swc-linux-arm64-musl" "13.4.16" + "@next/swc-linux-x64-gnu" "13.4.16" + "@next/swc-linux-x64-musl" "13.4.16" + "@next/swc-win32-arm64-msvc" "13.4.16" + "@next/swc-win32-ia32-msvc" "13.4.16" + "@next/swc-win32-x64-msvc" "13.4.16" no-case@^3.0.4: version "3.0.4" From 4d9ab0ecab5b58d088ca351c753911644d6934e5 Mon Sep 17 00:00:00 2001 From: gurusainath Date: Wed, 16 Aug 2023 16:24:17 +0530 Subject: [PATCH 3/3] dev: updated project-not-published icon --- apps/space/public/project-not-published.svg | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/apps/space/public/project-not-published.svg b/apps/space/public/project-not-published.svg index 4c298417dcb..db4b404df03 100644 --- a/apps/space/public/project-not-published.svg +++ b/apps/space/public/project-not-published.svg @@ -1,17 +1,4 @@ - - - - - - - - - - - - - - - - + + +