From 928646c60ea9d7dd3bf69d5d83170f6da1e6a935 Mon Sep 17 00:00:00 2001
From: Yusuf Yusuf <yusuf.1.yusuf@kcl.ac.uk>
Date: Tue, 30 Jul 2024 16:35:39 +0100
Subject: [PATCH] Moved Banner

---
 .../__snapshots__/banner.test.tsx.snap        |  0
 .../banner/__tests__/banner.test.tsx          |  0
 .../banner}/assets/CloseIconBlack.tsx         |  0
 .../components/banner}/assets/EmailIcon.tsx   |  0
 .../src/components}/banner/banner.stories.mdx |  2 +-
 .../src/components}/banner/banner.tsx         |  3 +-
 .../src/components}/banner/styles.ts          |  0
 packages/ts-components/src/index.ts           |  1 +
 .../__snapshots__/index.test.tsx.snap         | 34 -------------------
 packages/ts-newskit/src/assets/index.tsx      |  2 --
 packages/ts-newskit/src/index.ts              |  1 -
 packages/ts-newskit/tsconfig.json             |  8 +++--
 12 files changed, 10 insertions(+), 41 deletions(-)
 rename packages/{ts-newskit/src/components/misc => ts-components/src/components}/banner/__tests__/__snapshots__/banner.test.tsx.snap (100%)
 rename packages/{ts-newskit/src/components/misc => ts-components/src/components}/banner/__tests__/banner.test.tsx (100%)
 rename packages/{ts-newskit/src => ts-components/src/components/banner}/assets/CloseIconBlack.tsx (100%)
 rename packages/{ts-newskit/src => ts-components/src/components/banner}/assets/EmailIcon.tsx (100%)
 rename packages/{ts-newskit/src/components/misc => ts-components/src/components}/banner/banner.stories.mdx (98%)
 rename packages/{ts-newskit/src/components/misc => ts-components/src/components}/banner/banner.tsx (89%)
 rename packages/{ts-newskit/src/components/misc => ts-components/src/components}/banner/styles.ts (100%)

diff --git a/packages/ts-newskit/src/components/misc/banner/__tests__/__snapshots__/banner.test.tsx.snap b/packages/ts-components/src/components/banner/__tests__/__snapshots__/banner.test.tsx.snap
similarity index 100%
rename from packages/ts-newskit/src/components/misc/banner/__tests__/__snapshots__/banner.test.tsx.snap
rename to packages/ts-components/src/components/banner/__tests__/__snapshots__/banner.test.tsx.snap
diff --git a/packages/ts-newskit/src/components/misc/banner/__tests__/banner.test.tsx b/packages/ts-components/src/components/banner/__tests__/banner.test.tsx
similarity index 100%
rename from packages/ts-newskit/src/components/misc/banner/__tests__/banner.test.tsx
rename to packages/ts-components/src/components/banner/__tests__/banner.test.tsx
diff --git a/packages/ts-newskit/src/assets/CloseIconBlack.tsx b/packages/ts-components/src/components/banner/assets/CloseIconBlack.tsx
similarity index 100%
rename from packages/ts-newskit/src/assets/CloseIconBlack.tsx
rename to packages/ts-components/src/components/banner/assets/CloseIconBlack.tsx
diff --git a/packages/ts-newskit/src/assets/EmailIcon.tsx b/packages/ts-components/src/components/banner/assets/EmailIcon.tsx
similarity index 100%
rename from packages/ts-newskit/src/assets/EmailIcon.tsx
rename to packages/ts-components/src/components/banner/assets/EmailIcon.tsx
diff --git a/packages/ts-newskit/src/components/misc/banner/banner.stories.mdx b/packages/ts-components/src/components/banner/banner.stories.mdx
similarity index 98%
rename from packages/ts-newskit/src/components/misc/banner/banner.stories.mdx
rename to packages/ts-components/src/components/banner/banner.stories.mdx
index 20b7e7934d0..e87eff70352 100644
--- a/packages/ts-newskit/src/components/misc/banner/banner.stories.mdx
+++ b/packages/ts-components/src/components/banner/banner.stories.mdx
@@ -27,4 +27,4 @@ export const BannerStory = ({ group }) => (
 
 <Story name="Banner">
   {BannerStory.bind({})}
-</Story>
\ No newline at end of file
+</Story>
diff --git a/packages/ts-newskit/src/components/misc/banner/banner.tsx b/packages/ts-components/src/components/banner/banner.tsx
similarity index 89%
rename from packages/ts-newskit/src/components/misc/banner/banner.tsx
rename to packages/ts-components/src/components/banner/banner.tsx
index 14fb576f91d..34786a7213e 100644
--- a/packages/ts-newskit/src/components/misc/banner/banner.tsx
+++ b/packages/ts-components/src/components/banner/banner.tsx
@@ -9,7 +9,8 @@ import {
   BannerWrapper,
   BannerContentWrapper
 } from './styles';
-import { CloseIconBlack, EmailIcon } from '../../../assets';
+import CloseIconBlack from './assets/CloseIconBlack';
+import EmailIcon from './assets/EmailIcon';
 
 type Props = {
   onClose: () => void;
diff --git a/packages/ts-newskit/src/components/misc/banner/styles.ts b/packages/ts-components/src/components/banner/styles.ts
similarity index 100%
rename from packages/ts-newskit/src/components/misc/banner/styles.ts
rename to packages/ts-components/src/components/banner/styles.ts
diff --git a/packages/ts-components/src/index.ts b/packages/ts-components/src/index.ts
index b6cac729d28..93e256c0be2 100644
--- a/packages/ts-components/src/index.ts
+++ b/packages/ts-components/src/index.ts
@@ -106,3 +106,4 @@ export {
   default as safeDecodeURIComponent
 } from './utils/safeDecodeURIComponent';
 export { ArticleSidebar } from './components/article-sidebar/ArticleSidebar';
+export { Banner } from './components/banner/banner';
diff --git a/packages/ts-newskit/src/assets/__tests__/__snapshots__/index.test.tsx.snap b/packages/ts-newskit/src/assets/__tests__/__snapshots__/index.test.tsx.snap
index a463f7d8ef9..7f379c74a54 100644
--- a/packages/ts-newskit/src/assets/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/ts-newskit/src/assets/__tests__/__snapshots__/index.test.tsx.snap
@@ -15,40 +15,6 @@ exports[`Icons Component: BreadcrumbIcon BreadcrumbIcon renders with default pro
 </DocumentFragment>
 `;
 
-exports[`Icons Component: CloseIconBlack CloseIconBlack renders with default props 1`] = `
-<DocumentFragment>
-  <svg
-    fill="none"
-    height="24"
-    viewBox="0 0 14 14"
-    width="24"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M14 1.41L12.59 0L7 5.59L1.41 0L0 1.41L5.59 7L0 12.59L1.41 14L7 8.41L12.59 14L14 12.59L8.41 7L14 1.41Z"
-      fill="#000"
-    />
-  </svg>
-</DocumentFragment>
-`;
-
-exports[`Icons Component: EmailIcon EmailIcon renders with default props 1`] = `
-<DocumentFragment>
-  <svg
-    fill="none"
-    height="24"
-    viewBox="0 0 24 24"
-    width="24"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M22 9.98V19C22 20.1 21.1 21 20 21H4C2.9 21 2 20.1 2 19L2.01 7C2.01 5.9 2.9 5 4 5H14.1C14.04 5.32 14 5.66 14 6C14 6.34 14.04 6.68 14.1 7H4L12 12L15.67 9.71C16.14 10.14 16.69 10.47 17.3 10.69L12 14L4 9V19H20V10.9C20.74 10.75 21.42 10.42 22 9.98ZM16 6C16 7.66 17.34 9 19 9C20.66 9 22 7.66 22 6C22 4.34 20.66 3 19 3C17.34 3 16 4.34 16 6Z"
-      fill="#000"
-    />
-  </svg>
-</DocumentFragment>
-`;
-
 exports[`Icons Component: FilledArrowIcon FilledArrowIcon renders with default props 1`] = `
 <DocumentFragment>
   <svg
diff --git a/packages/ts-newskit/src/assets/index.tsx b/packages/ts-newskit/src/assets/index.tsx
index 806c8d1d26e..c11725292a5 100644
--- a/packages/ts-newskit/src/assets/index.tsx
+++ b/packages/ts-newskit/src/assets/index.tsx
@@ -1,5 +1,3 @@
 export { default as TooltipIcon } from '../assets/TooltipIcon';
-export { default as CloseIconBlack } from '../assets/CloseIconBlack';
-export { default as EmailIcon } from '../assets/EmailIcon';
 export { default as FilledArrowIcon } from './FilledArrowIcon';
 export { default as BreadcrumbIcon } from './BreadcrumbIcon';
diff --git a/packages/ts-newskit/src/index.ts b/packages/ts-newskit/src/index.ts
index 5f0f0cb4946..44758dd352d 100644
--- a/packages/ts-newskit/src/index.ts
+++ b/packages/ts-newskit/src/index.ts
@@ -6,6 +6,5 @@ export { JobTitle } from './components/misc/job-title/job-title';
 export {
   UpdateButtonWithDelay
 } from './components/misc/update-button/update-button-with-delay';
-export { Banner } from './components/misc/banner/banner';
 
 // TODO Remove after tests - borisovy
diff --git a/packages/ts-newskit/tsconfig.json b/packages/ts-newskit/tsconfig.json
index ac64f57fd4e..3d8ac994451 100644
--- a/packages/ts-newskit/tsconfig.json
+++ b/packages/ts-newskit/tsconfig.json
@@ -41,9 +41,13 @@
 
     "lib": ["es6", "dom", "es2019"],
     "types": ["jest"],
-    "typeRoots": ["node_modules/@types", "src/types", "../../node_modules/@types"]
+    "typeRoots": [
+      "node_modules/@types",
+      "src/types",
+      "../../node_modules/@types"
+    ]
   },
   "include": ["src/**/*.ts", "src/**/*.tsx"],
   "exclude": ["node_modules/**"],
   "compileOnSave": false
-}
\ No newline at end of file
+}