From 528ae4c1ad6ec0e543ca3986d3f88c12a5a97cf4 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Mon, 16 May 2022 21:44:09 -0700 Subject: [PATCH] Add logo component and social links --- web/components/SocialLinks.tsx | 11 --------- web/components/ui/Content/Content.tsx | 21 +++++++++++++----- web/components/ui/Footer/Footer.tsx | 6 ++++- web/components/ui/Logo/Logo.module.scss | 9 ++++++++ web/components/ui/Logo/Logo.tsx | 5 +++++ .../NotifyReminderPopup.tsx | 2 +- .../ui/SocialLinks/SocialLinks.module.scss | 11 +++++++++ web/components/ui/SocialLinks/SocialLinks.tsx | 21 ++++++++++++++++++ web/next.config.js | 4 ++++ web/public/img/platformlogos/bandcamp.svg | 1 + web/public/img/platformlogos/default.svg | 1 + web/public/img/platformlogos/discord.svg | 1 + web/public/img/platformlogos/donate.svg | 1 + web/public/img/platformlogos/facebook.svg | 1 + web/public/img/platformlogos/follow.svg | 1 + web/public/img/platformlogos/github.svg | 1 + web/public/img/platformlogos/gitlab.svg | 1 + web/public/img/platformlogos/google.svg | 1 + web/public/img/platformlogos/instagram.svg | 1 + web/public/img/platformlogos/keyoxide.png | Bin 0 -> 4378 bytes web/public/img/platformlogos/ko-fi.svg | 1 + web/public/img/platformlogos/lbry.svg | 1 + web/public/img/platformlogos/liberapay.svg | 1 + web/public/img/platformlogos/link.svg | 1 + web/public/img/platformlogos/linkedin.svg | 1 + web/public/img/platformlogos/mastodon.svg | 1 + web/public/img/platformlogos/odysee.svg | 1 + web/public/img/platformlogos/patreon.svg | 1 + web/public/img/platformlogos/paypal.svg | 1 + web/public/img/platformlogos/snapchat.svg | 1 + web/public/img/platformlogos/soundcloud.svg | 1 + web/public/img/platformlogos/spotify.svg | 1 + web/public/img/platformlogos/steam.svg | 1 + web/public/img/platformlogos/tiktok.svg | 1 + web/public/img/platformlogos/twitch.svg | 1 + web/public/img/platformlogos/twitter.svg | 1 + web/public/img/platformlogos/youtube.svg | 1 + web/stories/SocialLinks.stories.tsx | 8 +++++-- web/styles/ant-overrides.scss | 14 ------------ 39 files changed, 104 insertions(+), 35 deletions(-) delete mode 100644 web/components/SocialLinks.tsx create mode 100644 web/components/ui/Logo/Logo.module.scss create mode 100644 web/components/ui/Logo/Logo.tsx create mode 100644 web/components/ui/SocialLinks/SocialLinks.module.scss create mode 100644 web/components/ui/SocialLinks/SocialLinks.tsx create mode 100644 web/public/img/platformlogos/bandcamp.svg create mode 100644 web/public/img/platformlogos/default.svg create mode 100644 web/public/img/platformlogos/discord.svg create mode 100644 web/public/img/platformlogos/donate.svg create mode 100644 web/public/img/platformlogos/facebook.svg create mode 100644 web/public/img/platformlogos/follow.svg create mode 100644 web/public/img/platformlogos/github.svg create mode 100644 web/public/img/platformlogos/gitlab.svg create mode 100644 web/public/img/platformlogos/google.svg create mode 100644 web/public/img/platformlogos/instagram.svg create mode 100644 web/public/img/platformlogos/keyoxide.png create mode 100644 web/public/img/platformlogos/ko-fi.svg create mode 100644 web/public/img/platformlogos/lbry.svg create mode 100644 web/public/img/platformlogos/liberapay.svg create mode 100644 web/public/img/platformlogos/link.svg create mode 100644 web/public/img/platformlogos/linkedin.svg create mode 100644 web/public/img/platformlogos/mastodon.svg create mode 100644 web/public/img/platformlogos/odysee.svg create mode 100644 web/public/img/platformlogos/patreon.svg create mode 100644 web/public/img/platformlogos/paypal.svg create mode 100644 web/public/img/platformlogos/snapchat.svg create mode 100644 web/public/img/platformlogos/soundcloud.svg create mode 100644 web/public/img/platformlogos/spotify.svg create mode 100644 web/public/img/platformlogos/steam.svg create mode 100644 web/public/img/platformlogos/tiktok.svg create mode 100644 web/public/img/platformlogos/twitch.svg create mode 100644 web/public/img/platformlogos/twitter.svg create mode 100644 web/public/img/platformlogos/youtube.svg diff --git a/web/components/SocialLinks.tsx b/web/components/SocialLinks.tsx deleted file mode 100644 index 83320859c..000000000 --- a/web/components/SocialLinks.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import { SocialLink } from '../interfaces/social-link.model'; - -interface Props { - // eslint-disable-next-line react/no-unused-prop-types - links: SocialLink[]; -} - -// eslint-disable-next-line @typescript-eslint/no-unused-vars -export default function SocialLinks(props: Props) { - return
Social links component goes here
; -} diff --git a/web/components/ui/Content/Content.tsx b/web/components/ui/Content/Content.tsx index 206ea0b85..6e4ce2cd1 100644 --- a/web/components/ui/Content/Content.tsx +++ b/web/components/ui/Content/Content.tsx @@ -1,5 +1,5 @@ import { useRecoilValue } from 'recoil'; -import { Layout, Button, Tabs } from 'antd'; +import { Layout, Button, Tabs, Typography } from 'antd'; import { chatVisibilityAtom, clientConfigStateAtom, @@ -23,9 +23,13 @@ import ActionButton from '../../action-buttons/ActionButton'; import Statusbar from '../Statusbar/Statusbar'; import { ServerStatus } from '../../../interfaces/server-status.model'; import { Follower } from '../../../interfaces/follower'; +import SocialLinks from '../SocialLinks/SocialLinks'; +import NotifyReminderPopup from '../NotifyReminderPopup/NotifyReminderPopup'; +import ServerLogo from '../Logo/Logo'; const { TabPane } = Tabs; const { Content } = Layout; +const { Title } = Typography; export default function ContentComponent() { const status = useRecoilValue(serverStatusState); @@ -34,7 +38,7 @@ export default function ContentComponent() { const messages = useRecoilValue(chatMessagesAtom); const chatState = useRecoilValue(chatStateAtom); - const { extraPageContent, version } = clientConfig; + const { extraPageContent, version, socialHandles, name, title, tags } = clientConfig; const { online, viewerCount, lastConnectTime, lastDisconnectTime } = status; const followers: Follower[] = []; @@ -73,26 +77,31 @@ export default function ContentComponent() { {externalActionButtons} - + {}} notificationClosed={() => {}}> + +
- + + {name} + {online && title !== '' && {title}} +
{tags.length > 0 && tags.map(tag => #{tag} )}
+ + - {chatVisibility && (
)} -
diff --git a/web/components/ui/Footer/Footer.tsx b/web/components/ui/Footer/Footer.tsx index 7a53889c5..f5edf007f 100644 --- a/web/components/ui/Footer/Footer.tsx +++ b/web/components/ui/Footer/Footer.tsx @@ -9,5 +9,9 @@ interface Props { export default function FooterComponent(props: Props) { const { version } = props; - return
Owncast {version}
; + return ( + + ); } diff --git a/web/components/ui/Logo/Logo.module.scss b/web/components/ui/Logo/Logo.module.scss new file mode 100644 index 000000000..9c062eed7 --- /dev/null +++ b/web/components/ui/Logo/Logo.module.scss @@ -0,0 +1,9 @@ +.logo { + width: 120px; + border-radius: 50%; + border-width: 3px; + border-style: solid; + border-color: var(--theme-primary-color); + background-color: var(--theme-background-secondary); + padding: 3px; +} \ No newline at end of file diff --git a/web/components/ui/Logo/Logo.tsx b/web/components/ui/Logo/Logo.tsx new file mode 100644 index 000000000..3a3e9f707 --- /dev/null +++ b/web/components/ui/Logo/Logo.tsx @@ -0,0 +1,5 @@ +import s from './Logo.module.scss'; + +export default function SocialLinks() { + return logo; +} diff --git a/web/components/ui/NotifyReminderPopup/NotifyReminderPopup.tsx b/web/components/ui/NotifyReminderPopup/NotifyReminderPopup.tsx index 99c1b73ea..140677013 100644 --- a/web/components/ui/NotifyReminderPopup/NotifyReminderPopup.tsx +++ b/web/components/ui/NotifyReminderPopup/NotifyReminderPopup.tsx @@ -5,7 +5,7 @@ import s from './NotifyReminderPopup.module.scss'; interface Props { visible: boolean; - children: React.ReactNode[]; + children: React.ReactNode; notificationClicked: () => void; notificationClosed: () => void; } diff --git a/web/components/ui/SocialLinks/SocialLinks.module.scss b/web/components/ui/SocialLinks/SocialLinks.module.scss new file mode 100644 index 000000000..4fc9f74de --- /dev/null +++ b/web/components/ui/SocialLinks/SocialLinks.module.scss @@ -0,0 +1,11 @@ +.link { + width: 2em; + margin-left: 4px; + margin-right: 4px; +} + +.links { + display: flex; + align-items: center; + justify-content: flex-end; +} \ No newline at end of file diff --git a/web/components/ui/SocialLinks/SocialLinks.tsx b/web/components/ui/SocialLinks/SocialLinks.tsx new file mode 100644 index 000000000..77227a7b0 --- /dev/null +++ b/web/components/ui/SocialLinks/SocialLinks.tsx @@ -0,0 +1,21 @@ +import { SocialLink } from '../../../interfaces/social-link.model'; +import s from './SocialLinks.module.scss'; + +interface Props { + // eslint-disable-next-line react/no-unused-prop-types + links: SocialLink[]; +} + +// eslint-disable-next-line @typescript-eslint/no-unused-vars +export default function SocialLinks(props: Props) { + const { links } = props; + return ( +
+ {links.map(link => ( + + {link.platform} + + ))} +
+ ); +} diff --git a/web/next.config.js b/web/next.config.js index f5f3a601c..c29eee1fe 100644 --- a/web/next.config.js +++ b/web/next.config.js @@ -12,6 +12,10 @@ module.exports = withLess({ source: '/hls/:path*', destination: 'http://localhost:8080/hls/:path*', // Proxy to Backend to work around CORS. }, + { + source: '/img/:path*', + destination: 'http://localhost:8080/hls/:path*', // Proxy to Backend to work around CORS. + }, { source: '/logo', destination: 'http://localhost:8080/logo', // Proxy to Backend to work around CORS. diff --git a/web/public/img/platformlogos/bandcamp.svg b/web/public/img/platformlogos/bandcamp.svg new file mode 100644 index 000000000..11764f43b --- /dev/null +++ b/web/public/img/platformlogos/bandcamp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/default.svg b/web/public/img/platformlogos/default.svg new file mode 100644 index 000000000..85d53e93e --- /dev/null +++ b/web/public/img/platformlogos/default.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/discord.svg b/web/public/img/platformlogos/discord.svg new file mode 100644 index 000000000..da184aecb --- /dev/null +++ b/web/public/img/platformlogos/discord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/donate.svg b/web/public/img/platformlogos/donate.svg new file mode 100644 index 000000000..42f27720d --- /dev/null +++ b/web/public/img/platformlogos/donate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/facebook.svg b/web/public/img/platformlogos/facebook.svg new file mode 100644 index 000000000..5517d3d5c --- /dev/null +++ b/web/public/img/platformlogos/facebook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/follow.svg b/web/public/img/platformlogos/follow.svg new file mode 100644 index 000000000..f988debfc --- /dev/null +++ b/web/public/img/platformlogos/follow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/github.svg b/web/public/img/platformlogos/github.svg new file mode 100644 index 000000000..3a8245bb0 --- /dev/null +++ b/web/public/img/platformlogos/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/gitlab.svg b/web/public/img/platformlogos/gitlab.svg new file mode 100644 index 000000000..1a766a7d8 --- /dev/null +++ b/web/public/img/platformlogos/gitlab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/google.svg b/web/public/img/platformlogos/google.svg new file mode 100644 index 000000000..96da1efb4 --- /dev/null +++ b/web/public/img/platformlogos/google.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/instagram.svg b/web/public/img/platformlogos/instagram.svg new file mode 100644 index 000000000..fd3fe9fe5 --- /dev/null +++ b/web/public/img/platformlogos/instagram.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/keyoxide.png b/web/public/img/platformlogos/keyoxide.png new file mode 100644 index 0000000000000000000000000000000000000000..d4476f4949c02f64ce9d211dbb8555d5262920f7 GIT binary patch literal 4378 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 literal 0 HcmV?d00001 diff --git a/web/public/img/platformlogos/ko-fi.svg b/web/public/img/platformlogos/ko-fi.svg new file mode 100644 index 000000000..1e53bd6a0 --- /dev/null +++ b/web/public/img/platformlogos/ko-fi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/lbry.svg b/web/public/img/platformlogos/lbry.svg new file mode 100644 index 000000000..cc26f9a12 --- /dev/null +++ b/web/public/img/platformlogos/lbry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/liberapay.svg b/web/public/img/platformlogos/liberapay.svg new file mode 100644 index 000000000..e12410977 --- /dev/null +++ b/web/public/img/platformlogos/liberapay.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/link.svg b/web/public/img/platformlogos/link.svg new file mode 100644 index 000000000..5f21fe22a --- /dev/null +++ b/web/public/img/platformlogos/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/linkedin.svg b/web/public/img/platformlogos/linkedin.svg new file mode 100644 index 000000000..e3099960e --- /dev/null +++ b/web/public/img/platformlogos/linkedin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/mastodon.svg b/web/public/img/platformlogos/mastodon.svg new file mode 100644 index 000000000..c5bc4af4a --- /dev/null +++ b/web/public/img/platformlogos/mastodon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/odysee.svg b/web/public/img/platformlogos/odysee.svg new file mode 100644 index 000000000..a900c51ab --- /dev/null +++ b/web/public/img/platformlogos/odysee.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/patreon.svg b/web/public/img/platformlogos/patreon.svg new file mode 100644 index 000000000..5d8671cbe --- /dev/null +++ b/web/public/img/platformlogos/patreon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/paypal.svg b/web/public/img/platformlogos/paypal.svg new file mode 100644 index 000000000..dbc668aa1 --- /dev/null +++ b/web/public/img/platformlogos/paypal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/snapchat.svg b/web/public/img/platformlogos/snapchat.svg new file mode 100644 index 000000000..6371b2abf --- /dev/null +++ b/web/public/img/platformlogos/snapchat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/soundcloud.svg b/web/public/img/platformlogos/soundcloud.svg new file mode 100644 index 000000000..9f52826af --- /dev/null +++ b/web/public/img/platformlogos/soundcloud.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/spotify.svg b/web/public/img/platformlogos/spotify.svg new file mode 100644 index 000000000..d5b89c722 --- /dev/null +++ b/web/public/img/platformlogos/spotify.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/steam.svg b/web/public/img/platformlogos/steam.svg new file mode 100644 index 000000000..712df4c91 --- /dev/null +++ b/web/public/img/platformlogos/steam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/tiktok.svg b/web/public/img/platformlogos/tiktok.svg new file mode 100644 index 000000000..b1da38f60 --- /dev/null +++ b/web/public/img/platformlogos/tiktok.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/twitch.svg b/web/public/img/platformlogos/twitch.svg new file mode 100644 index 000000000..052a086e3 --- /dev/null +++ b/web/public/img/platformlogos/twitch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/twitter.svg b/web/public/img/platformlogos/twitter.svg new file mode 100644 index 000000000..3dedf3e15 --- /dev/null +++ b/web/public/img/platformlogos/twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/public/img/platformlogos/youtube.svg b/web/public/img/platformlogos/youtube.svg new file mode 100644 index 000000000..5741120f6 --- /dev/null +++ b/web/public/img/platformlogos/youtube.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/stories/SocialLinks.stories.tsx b/web/stories/SocialLinks.stories.tsx index f12e6fb37..4cdca87d2 100644 --- a/web/stories/SocialLinks.stories.tsx +++ b/web/stories/SocialLinks.stories.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { ComponentStory, ComponentMeta } from '@storybook/react'; -import SocialLinks from '../components/SocialLinks'; +import SocialLinks from '../components/ui/SocialLinks/SocialLinks'; export default { title: 'owncast/Social links', @@ -20,7 +20,11 @@ Populated.args = { url: 'https://github.com/owncast/owncast', icon: '/img/platformlogos/github.svg', }, - { platform: 'Documentation', url: 'https://owncast.online' }, + { + platform: 'Documentation', + url: 'https://owncast.online', + icon: '/img/platformlogos/link.svg', + }, { platform: 'mastodon', url: 'https://fosstodon.org/users/owncast', diff --git a/web/styles/ant-overrides.scss b/web/styles/ant-overrides.scss index 02abe3cb0..92ddeaaf8 100644 --- a/web/styles/ant-overrides.scss +++ b/web/styles/ant-overrides.scss @@ -446,20 +446,6 @@ textarea.ant-input { border-radius: 0 0 var(--container-border-radius) var(--container-border-radius); } -// ANT POPOVER -.ant-popover-inner { - background-color: var(--popover-base-color); -} -.ant-popover-message, -.ant-popover-inner-content { - color: var(--default-text-color); -} -.ant-popover-placement-topLeft > .ant-popover-content > .ant-popover-arrow { - border-color: var(--popover-base-color); -} -.ant-popover-arrow-content { - background-color: var(--popover-base-color); -} // ANT TOOLTIP .ant-tooltip {