Skip to content

Commit d55f623

Browse files
Ahtesham QuraishAhtesham Quraish
authored andcommitted
address the feedback
1 parent 7d25eb8 commit d55f623

32 files changed

Lines changed: 61 additions & 328 deletions

frontends/main/next.config.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@ const nextConfig = {
5757
destination: "/enrollmentcode/:code",
5858
permanent: true,
5959
},
60-
{
61-
// can be removed once fastly redirect is in place
62-
source: "/articles/:slug*",
63-
destination: "/news/:slug*",
64-
permanent: true,
65-
},
66-
{
67-
// can be removed once fastly redirect is in place
68-
source: "/articles",
69-
destination: "/news",
70-
permanent: true,
71-
},
7260
]
7361
},
7462

frontends/main/src/app-pages/Articles/ArticleDetailPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import React from "react"
44
import { useArticleDetailRetrieve } from "api/hooks/articles"
55
import { LoadingSpinner, styled } from "ol-components"
6-
import { ArticleEditor } from "@/page-components/TiptapEditor/ArticleEditor"
6+
import { NewsEditor } from "@/page-components/TiptapEditor/contentTypes/news/NewsEditor"
77
import { notFound } from "next/navigation"
88
import { LearningResourceProvider } from "@/page-components/TiptapEditor/extensions/node/LearningResource/LearningResourceDataProvider"
99

@@ -43,7 +43,7 @@ export const ArticleDetailPage = ({
4343
return (
4444
<PageContainer>
4545
<LearningResourceProvider resourceIds={learningResourceIds}>
46-
<ArticleEditor article={article} readOnly />
46+
<NewsEditor article={article} readOnly />
4747
</LearningResourceProvider>
4848
</PageContainer>
4949
)

frontends/main/src/app-pages/Articles/ArticleEditPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Permission } from "api/hooks/user"
77
import { useArticleDetailRetrieve } from "api/hooks/articles"
88
import RestrictedRoute from "@/components/RestrictedRoute/RestrictedRoute"
99
import { styled, LoadingSpinner } from "ol-components"
10-
import { ArticleEditor } from "@/page-components/TiptapEditor/ArticleEditor"
10+
import { NewsEditor } from "@/page-components/TiptapEditor/contentTypes/news/NewsEditor"
1111
import { articlesView, articlesDraftView } from "@/common/urls"
1212
import invariant from "tiny-invariant"
1313

@@ -43,7 +43,7 @@ const ArticleEditPage = ({ articleId }: { articleId: string }) => {
4343
return (
4444
<RestrictedRoute requires={Permission.ArticleEditor}>
4545
<PageContainer>
46-
<ArticleEditor
46+
<NewsEditor
4747
article={article}
4848
onSave={(article) => {
4949
if (article.is_published) {

frontends/main/src/app-pages/Articles/ArticleNewPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useRouter } from "next-nprogress-bar"
55
import { Permission } from "api/hooks/user"
66
import RestrictedRoute from "@/components/RestrictedRoute/RestrictedRoute"
77
import { styled } from "ol-components"
8-
import { ArticleEditor } from "@/page-components/TiptapEditor/ArticleEditor"
8+
import { NewsEditor } from "@/page-components/TiptapEditor/contentTypes/news/NewsEditor"
99
import { articlesDraftView, articlesView } from "@/common/urls"
1010
import invariant from "tiny-invariant"
1111

@@ -21,7 +21,7 @@ const ArticleNewPage: React.FC = () => {
2121
return (
2222
<RestrictedRoute requires={Permission.ArticleEditor}>
2323
<PageContainer>
24-
<ArticleEditor
24+
<NewsEditor
2525
onSave={(article) => {
2626
if (article.is_published) {
2727
invariant(article.slug, "Published article must have a slug")

frontends/main/src/app/articles/[slugOrId]/draft/page.tsx renamed to frontends/main/src/app/(site)/articles/[slugOrId]/draft/page.tsx

File renamed without changes.

frontends/main/src/app/articles/[slugOrId]/edit/page.tsx renamed to frontends/main/src/app/(site)/articles/[slugOrId]/edit/page.tsx

File renamed without changes.

frontends/main/src/app/articles/[slugOrId]/page.tsx renamed to frontends/main/src/app/(site)/articles/[slugOrId]/page.tsx

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)