diff --git a/apps/client/src/pages/onBoarding/components/funnel/step/FinalStep.tsx b/apps/client/src/pages/onBoarding/components/funnel/step/FinalStep.tsx index d6a8d3a1..8b7a2282 100644 --- a/apps/client/src/pages/onBoarding/components/funnel/step/FinalStep.tsx +++ b/apps/client/src/pages/onBoarding/components/funnel/step/FinalStep.tsx @@ -4,7 +4,7 @@ import extImg from '/assets/onBoarding/icons/ext.svg'; import pinImg from '/assets/onBoarding/icons/pin.svg'; const FinalStep = () => { return ( -
+
dotori

Pinback에 오신 걸 환영해요

diff --git a/apps/extension/src/App.tsx b/apps/extension/src/App.tsx index 2128587b..b9fd24f5 100644 --- a/apps/extension/src/App.tsx +++ b/apps/extension/src/App.tsx @@ -4,13 +4,20 @@ import MainPop from './pages/MainPop'; import { useState, useEffect } from 'react'; import { useGetArticleSaved } from '@apis/query/queries'; import { usePageMeta } from './hooks/usePageMeta'; +import LogOutPop from './pages/LogOutPop'; const App = () => { const { url } = usePageMeta(); const { data: isSaved } = useGetArticleSaved(url); const [isDuplicatePop, setIsDuplicatePop] = useState(false); const [mainPopType, setMainPopType] = useState<'add' | 'edit'>('add'); + const [isToken, setIsToken] = useState(null); + useEffect(() => { + chrome.storage.local.get('token', (result) => { + setIsToken(!!result.token); + }); + }, []); useEffect(() => { if (isSaved?.data) { setIsDuplicatePop(true); @@ -28,13 +35,18 @@ const App = () => { return ( <> - {isDuplicatePop ? ( - + {/* */} + {isToken ? ( + isDuplicatePop ? ( + + ) : ( + + ) ) : ( - + )} ); diff --git a/apps/extension/src/assets/home.svg b/apps/extension/src/assets/home.svg new file mode 100644 index 00000000..2df751b7 --- /dev/null +++ b/apps/extension/src/assets/home.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/extension/src/hooks/usePageMeta.ts b/apps/extension/src/hooks/usePageMeta.ts index 73fb3c77..c7407ac9 100644 --- a/apps/extension/src/hooks/usePageMeta.ts +++ b/apps/extension/src/hooks/usePageMeta.ts @@ -47,7 +47,7 @@ export const usePageMeta = () => { // // chrome-extension:// 은 내부 페이지로 취급하지 않음 // if (isInternalChromePage || !imageUrl?.title) { - // window.close(); + // // return; // } setMeta(newMeta); diff --git a/apps/extension/src/pages/LogOutPop.tsx b/apps/extension/src/pages/LogOutPop.tsx new file mode 100644 index 00000000..8d10de18 --- /dev/null +++ b/apps/extension/src/pages/LogOutPop.tsx @@ -0,0 +1,34 @@ +import { Icon } from '@pinback/design-system/icons'; + +const LogOutPop = () => { + return ( +

+
+ +
+
+ +
+

+ 치삐를 만나려면 로그인이 필요해요! +

+

+ 지금 로그인하고 북마크한 정보의 +
리마인드 알람을 받아보세요 +

+ +
+ ); +}; +export default LogOutPop; diff --git a/apps/extension/src/pages/MainPop.tsx b/apps/extension/src/pages/MainPop.tsx index 1fd23388..7571f316 100644 --- a/apps/extension/src/pages/MainPop.tsx +++ b/apps/extension/src/pages/MainPop.tsx @@ -14,8 +14,7 @@ import { import { useState, useEffect } from 'react'; import { usePageMeta } from '@hooks/usePageMeta'; import { useSaveBookmark } from '@hooks/useSaveBookmarks'; -import { Icon } from '@pinback/design-system/icons'; - +import Header from '@shared/components/Header'; import { usePostArticle, useGetCategoriesExtension, @@ -221,7 +220,6 @@ const MainPop = ({ type, savedData }: MainPopProps) => { date: isRemindOn ? currentDate : date, time: isRemindOn ? currentTime : time, }); - //window.close(); }, } ); @@ -284,18 +282,9 @@ const MainPop = ({ type, savedData }: MainPopProps) => { onRightClick={saveHandleCategory} /> )} -
-
- { - chrome.tabs.create({ url: 'https://www.pinback.today/' }); - }} - /> -
+
+
{loading ? (
) : ( diff --git a/apps/extension/src/shared/components/Header.tsx b/apps/extension/src/shared/components/Header.tsx new file mode 100644 index 00000000..2b32e4d6 --- /dev/null +++ b/apps/extension/src/shared/components/Header.tsx @@ -0,0 +1,23 @@ +import { Icon } from '@pinback/design-system/icons'; +import { useState } from 'react'; +const Header = () => { + const [isHover, setIsHover] = useState(false); + return ( +
+ setIsHover(true)} + onMouseLeave={() => setIsHover(false)} + onClick={() => { + chrome.tabs.create({ url: 'https://www.pinback.today/' }); + }} + /> + +
+ ); +}; + +export default Header; diff --git a/apps/extension/tsconfig.json b/apps/extension/tsconfig.json index 274da4a8..2ec2e49c 100644 --- a/apps/extension/tsconfig.json +++ b/apps/extension/tsconfig.json @@ -25,10 +25,11 @@ "@components/*": ["src/components/*"], "@utils/*": ["src/utils/*"], "@apis/*": ["src/apis/*"], - "@hooks/*":["src/hooks/*"], + "@hooks/*": ["src/hooks/*"], "@constants/*": ["src/constants/*"], "@shared-types/*": ["src/types/*"], "@api/*": ["src/api/*"], + "@shared/*": ["src/shared/*"] } }, "include": ["src/**/*", "manifest.json", "popup.html", "vite.config.ts"], diff --git a/packages/design-system/src/icons/iconNames.ts b/packages/design-system/src/icons/iconNames.ts index c10c1fa5..92067508 100644 --- a/packages/design-system/src/icons/iconNames.ts +++ b/packages/design-system/src/icons/iconNames.ts @@ -2,8 +2,11 @@ export const iconNames = [ 'chippi_profile', 'dotori', + 'ext_home1', + 'ext_home2', 'extension_pop', 'extension_thumb', + 'google', 'ic_arrow_down_active', 'ic_arrow_down_disable', 'ic_bookmark_active', @@ -17,6 +20,7 @@ export const iconNames = [ 'ic_info', 'ic_plus', 'logo', + 'logout_chippi.2512', 'main_header_logo', 'main_logo', 'saved', diff --git a/packages/design-system/src/icons/source/chippi_profile.svg b/packages/design-system/src/icons/source/chippi_profile.svg index dab69827..06674b69 100644 --- a/packages/design-system/src/icons/source/chippi_profile.svg +++ b/packages/design-system/src/icons/source/chippi_profile.svg @@ -1,11 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/packages/design-system/src/icons/source/ext_home1.svg b/packages/design-system/src/icons/source/ext_home1.svg new file mode 100644 index 00000000..862e3397 --- /dev/null +++ b/packages/design-system/src/icons/source/ext_home1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/design-system/src/icons/source/ext_home2.svg b/packages/design-system/src/icons/source/ext_home2.svg new file mode 100644 index 00000000..5f99f4ff --- /dev/null +++ b/packages/design-system/src/icons/source/ext_home2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/design-system/src/icons/source/google.svg b/packages/design-system/src/icons/source/google.svg new file mode 100644 index 00000000..d3c8193a --- /dev/null +++ b/packages/design-system/src/icons/source/google.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/design-system/src/icons/source/logout_chippi.2512.svg b/packages/design-system/src/icons/source/logout_chippi.2512.svg new file mode 100644 index 00000000..56472b08 --- /dev/null +++ b/packages/design-system/src/icons/source/logout_chippi.2512.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/design-system/src/icons/source/tooltip_1.svg b/packages/design-system/src/icons/source/tooltip_1.svg index c25703d9..1a8bdf23 100644 --- a/packages/design-system/src/icons/source/tooltip_1.svg +++ b/packages/design-system/src/icons/source/tooltip_1.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/packages/design-system/src/icons/source/tooltip_2.svg b/packages/design-system/src/icons/source/tooltip_2.svg index de33bb2c..9b686cd5 100644 --- a/packages/design-system/src/icons/source/tooltip_2.svg +++ b/packages/design-system/src/icons/source/tooltip_2.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/packages/design-system/src/icons/source/tooltip_3.svg b/packages/design-system/src/icons/source/tooltip_3.svg index 358c3cd8..04036629 100644 --- a/packages/design-system/src/icons/source/tooltip_3.svg +++ b/packages/design-system/src/icons/source/tooltip_3.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/packages/design-system/src/icons/source/tooltip_4.svg b/packages/design-system/src/icons/source/tooltip_4.svg index de2cfae4..3ae5a095 100644 --- a/packages/design-system/src/icons/source/tooltip_4.svg +++ b/packages/design-system/src/icons/source/tooltip_4.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/packages/design-system/src/icons/source/tooltip_5.svg b/packages/design-system/src/icons/source/tooltip_5.svg index 3e396488..614e01f7 100644 --- a/packages/design-system/src/icons/source/tooltip_5.svg +++ b/packages/design-system/src/icons/source/tooltip_5.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file