diff --git a/src/containers/unit/Footer/DesktopView/CoolGuideLayout.tsx b/src/containers/unit/Footer/DesktopView/GeneralLayout.tsx old mode 100755 new mode 100644 similarity index 82% rename from src/containers/unit/Footer/DesktopView/CoolGuideLayout.tsx rename to src/containers/unit/Footer/DesktopView/GeneralLayout.tsx index 98aa3ee4f..7646be6e2 --- a/src/containers/unit/Footer/DesktopView/CoolGuideLayout.tsx +++ b/src/containers/unit/Footer/DesktopView/GeneralLayout.tsx @@ -1,7 +1,7 @@ import { FC, memo } from 'react' +import type { TMetric } from '@/spec' import { ISSUE_ADDR, API_SERVER_ADDR, GITHUB } from '@/config' -import { METRIC } from '@/constant' import { joinUS } from '@/utils/helper' import TopInfo from './TopInfo' @@ -14,13 +14,17 @@ import { BaseInfo, Item, NoLinkItem, -} from '../styles/desktop_view/cool_guide_layout' +} from '../styles/desktop_view/general_layout' -const CoolGuideLayout: FC = () => { +type TProps = { + metric: TMetric +} + +const GeneralLayout: FC = ({ metric }) => { return ( - + @@ -54,9 +58,9 @@ const CoolGuideLayout: FC = () => { - + ) } -export default memo(CoolGuideLayout) +export default memo(GeneralLayout) diff --git a/src/containers/unit/Footer/DesktopView/TopInfo/Drink.tsx b/src/containers/unit/Footer/DesktopView/TopInfo/Drink.tsx new file mode 100644 index 000000000..47b1d1482 --- /dev/null +++ b/src/containers/unit/Footer/DesktopView/TopInfo/Drink.tsx @@ -0,0 +1,25 @@ +import { FC, memo } from 'react' + +import { ICON } from '@/config' + +import { + Wrapper, + InfoBar, + CommunityTitle, + ArrowDividerIcon, + Logo, +} from '../../styles/desktop_view/top_info/article' + +const Drink: FC = () => { + return ( + + + + + + 来一杯 + + ) +} + +export default memo(Drink) diff --git a/src/containers/unit/Footer/DesktopView/TopInfo/Works.tsx b/src/containers/unit/Footer/DesktopView/TopInfo/Works.tsx new file mode 100644 index 000000000..51589256f --- /dev/null +++ b/src/containers/unit/Footer/DesktopView/TopInfo/Works.tsx @@ -0,0 +1,25 @@ +import { FC, memo } from 'react' + +import { ICON } from '@/config' + +import { + Wrapper, + InfoBar, + CommunityTitle, + ArrowDividerIcon, + Logo, +} from '../../styles/desktop_view/top_info/article' + +const Works: FC = () => { + return ( + + + + + + 作品集市 + + ) +} + +export default memo(Works) diff --git a/src/containers/unit/Footer/DesktopView/TopInfo/index.tsx b/src/containers/unit/Footer/DesktopView/TopInfo/index.tsx index 413babfd9..bca2b980c 100644 --- a/src/containers/unit/Footer/DesktopView/TopInfo/index.tsx +++ b/src/containers/unit/Footer/DesktopView/TopInfo/index.tsx @@ -8,6 +8,8 @@ import HomeCommunity from './HomeCommunity' import Article from './Article' import WorksArticle from './WorksArticle' import CoolGuide from './CoolGuide' +import Works from './Works' +import Drink from './Drink' export type TProps = { metric?: TMetric @@ -31,6 +33,14 @@ const TopInfo: FC = ({ metric = METRIC.COMMUNITY, ...restProps }) => { return } + case METRIC.WORKS: { + return + } + + case METRIC.HAVE_A_DRINK: { + return + } + // case VIEW.HOSTING_COMMUNITY: { // return // } diff --git a/src/containers/unit/Footer/DesktopView/index.tsx b/src/containers/unit/Footer/DesktopView/index.tsx index 017c20b2e..8bfb36766 100644 --- a/src/containers/unit/Footer/DesktopView/index.tsx +++ b/src/containers/unit/Footer/DesktopView/index.tsx @@ -17,13 +17,13 @@ import JoinModal from '@/containers/tool/JoinModal' import HomeLayout from './HomeLayout' import ArticleLayout from './ArticleLayout' import WorksArticleLayout from './WorksArticleLayout' -import CoolGuideLayout from './CoolGuideLayout' +import GeneralLayout from './GeneralLayout' // import CommunityView from './CommunityView' // import HostingCommunityView from './HostingCommunityView' import type { TStore } from '../store' import { Wrapper } from '../styles' -import { useInit, toggleSponsorHelper, onLogin } from '../logic' +import { useInit } from '../logic' /* eslint-disable-next-line */ const log = buildLog('C:Footer') @@ -41,7 +41,7 @@ const FooterContainer: FC = ({ }) => { useInit(store, metric) - const { showSponsor, viewingArticle, c11n } = store + const { viewingArticle, c11n } = store return ( @@ -52,7 +52,14 @@ const FooterContainer: FC = ({ {metric === METRIC.WORKS_ARTICLE && ( )} - {metric === METRIC.COOL_GUIDE && } + {metric === METRIC.COOL_GUIDE && ( + + )} + {metric === METRIC.MEETUPS && } + {metric === METRIC.WORKS && } + {metric === METRIC.HAVE_A_DRINK && ( + + )} {/* {type === VIEW.HOME && ( )} */} diff --git a/src/containers/unit/Footer/styles/desktop_view/cool_guide_layout.ts b/src/containers/unit/Footer/styles/desktop_view/general_layout.ts old mode 100755 new mode 100644 similarity index 89% rename from src/containers/unit/Footer/styles/desktop_view/cool_guide_layout.ts rename to src/containers/unit/Footer/styles/desktop_view/general_layout.ts index 09225aead..415115cf5 --- a/src/containers/unit/Footer/styles/desktop_view/cool_guide_layout.ts +++ b/src/containers/unit/Footer/styles/desktop_view/general_layout.ts @@ -9,9 +9,10 @@ export { NoLinkItem } from './article_layout' export const Wrapper = styled.div` ${css.flexColumn('align-start')}; width: 100%; - ${css.fitContentWidth(METRIC.COOL_GUIDE)}; + ${css.fitContentWidth(METRIC.WORKS)}; ` export const InnerWrapper = styled.div` + ${css.flex('align-center', 'justify-between')}; width: 100%; ` export const MainInfos = styled.footer`