diff --git a/.dockerignore b/.dockerignore index ddb02133b..3ddaa574e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -21,7 +21,7 @@ docker-compose.yml docs LICENSE node_modules -public/os_logo_square.png +public/os_logo_filled.png public/preview.jpg snap stylelint.config.js diff --git a/README.md b/README.md index c6475890f..63bae8345 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

-Overseerr +Overseerr

Overseerr Release diff --git a/docs/extending-overseerr/reverse-proxy.md b/docs/extending-overseerr/reverse-proxy.md index 970adb166..1ebb4b469 100644 --- a/docs/extending-overseerr/reverse-proxy.md +++ b/docs/extending-overseerr/reverse-proxy.md @@ -145,7 +145,8 @@ location ^~ /overseerr { sub_filter '/android-' '/$app/android-'; sub_filter '/apple-' '/$app/apple-'; sub_filter '/favicon' '/$app/favicon'; - sub_filter '/logo.png' '/$app/logo.png'; + sub_filter '/logo_full.svg' '/$app/logo_full.svg'; + sub_filter '/logo_stacked.svg' '/$app/logo_stacked.svg'; sub_filter '/site.webmanifest' '/$app/site.webmanifest'; } ``` diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png index f246f9fa2..6090ba193 100644 Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ diff --git a/public/android-chrome-192x192_maskable.png b/public/android-chrome-192x192_maskable.png index ecdd73670..b1850000b 100644 Binary files a/public/android-chrome-192x192_maskable.png and b/public/android-chrome-192x192_maskable.png differ diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png index 4910ced2d..dd8d07f34 100644 Binary files a/public/android-chrome-512x512.png and b/public/android-chrome-512x512.png differ diff --git a/public/android-chrome-512x512_maskable.png b/public/android-chrome-512x512_maskable.png index 475cf85e9..d94f0b7f7 100644 Binary files a/public/android-chrome-512x512_maskable.png and b/public/android-chrome-512x512_maskable.png differ diff --git a/public/apple-splash-1125-2436.jpg b/public/apple-splash-1125-2436.jpg index 92d5e50f1..775572220 100644 Binary files a/public/apple-splash-1125-2436.jpg and b/public/apple-splash-1125-2436.jpg differ diff --git a/public/apple-splash-1136-640.jpg b/public/apple-splash-1136-640.jpg index c78884e4f..008490825 100644 Binary files a/public/apple-splash-1136-640.jpg and b/public/apple-splash-1136-640.jpg differ diff --git a/public/apple-splash-1170-2532.jpg b/public/apple-splash-1170-2532.jpg index a75e5e099..bef6cb45e 100644 Binary files a/public/apple-splash-1170-2532.jpg and b/public/apple-splash-1170-2532.jpg differ diff --git a/public/apple-splash-1242-2208.jpg b/public/apple-splash-1242-2208.jpg index 8fa857218..15cf9c5be 100644 Binary files a/public/apple-splash-1242-2208.jpg and b/public/apple-splash-1242-2208.jpg differ diff --git a/public/apple-splash-1242-2688.jpg b/public/apple-splash-1242-2688.jpg index 27b300240..0b822f692 100644 Binary files a/public/apple-splash-1242-2688.jpg and b/public/apple-splash-1242-2688.jpg differ diff --git a/public/apple-splash-1284-2778.jpg b/public/apple-splash-1284-2778.jpg index 6c2f69938..41d3f3827 100644 Binary files a/public/apple-splash-1284-2778.jpg and b/public/apple-splash-1284-2778.jpg differ diff --git a/public/apple-splash-1334-750.jpg b/public/apple-splash-1334-750.jpg index a0637f83f..29b88104b 100644 Binary files a/public/apple-splash-1334-750.jpg and b/public/apple-splash-1334-750.jpg differ diff --git a/public/apple-splash-1536-2048.jpg b/public/apple-splash-1536-2048.jpg index 151a7a8e0..04e839bc9 100644 Binary files a/public/apple-splash-1536-2048.jpg and b/public/apple-splash-1536-2048.jpg differ diff --git a/public/apple-splash-1620-2160.jpg b/public/apple-splash-1620-2160.jpg index 39f2beec9..31fb906fe 100644 Binary files a/public/apple-splash-1620-2160.jpg and b/public/apple-splash-1620-2160.jpg differ diff --git a/public/apple-splash-1668-2224.jpg b/public/apple-splash-1668-2224.jpg index 1a2276dad..c7eae485f 100644 Binary files a/public/apple-splash-1668-2224.jpg and b/public/apple-splash-1668-2224.jpg differ diff --git a/public/apple-splash-1668-2388.jpg b/public/apple-splash-1668-2388.jpg index 6d9363186..be83d63cb 100644 Binary files a/public/apple-splash-1668-2388.jpg and b/public/apple-splash-1668-2388.jpg differ diff --git a/public/apple-splash-1792-828.jpg b/public/apple-splash-1792-828.jpg index 82a1414f9..fdd950f3e 100644 Binary files a/public/apple-splash-1792-828.jpg and b/public/apple-splash-1792-828.jpg differ diff --git a/public/apple-splash-2048-1536.jpg b/public/apple-splash-2048-1536.jpg index f6d31f0ab..a35fcadd6 100644 Binary files a/public/apple-splash-2048-1536.jpg and b/public/apple-splash-2048-1536.jpg differ diff --git a/public/apple-splash-2048-2732.jpg b/public/apple-splash-2048-2732.jpg index 35205f1f5..51ba30752 100644 Binary files a/public/apple-splash-2048-2732.jpg and b/public/apple-splash-2048-2732.jpg differ diff --git a/public/apple-splash-2160-1620.jpg b/public/apple-splash-2160-1620.jpg index 3d42ae044..f7bc1a1b4 100644 Binary files a/public/apple-splash-2160-1620.jpg and b/public/apple-splash-2160-1620.jpg differ diff --git a/public/apple-splash-2208-1242.jpg b/public/apple-splash-2208-1242.jpg index 445024774..5485fa8f0 100644 Binary files a/public/apple-splash-2208-1242.jpg and b/public/apple-splash-2208-1242.jpg differ diff --git a/public/apple-splash-2224-1668.jpg b/public/apple-splash-2224-1668.jpg index 46549038f..0ccadef6e 100644 Binary files a/public/apple-splash-2224-1668.jpg and b/public/apple-splash-2224-1668.jpg differ diff --git a/public/apple-splash-2388-1668.jpg b/public/apple-splash-2388-1668.jpg index e08eb7c4f..f9d3c2d12 100644 Binary files a/public/apple-splash-2388-1668.jpg and b/public/apple-splash-2388-1668.jpg differ diff --git a/public/apple-splash-2436-1125.jpg b/public/apple-splash-2436-1125.jpg index 64cb66a3b..ee7916dba 100644 Binary files a/public/apple-splash-2436-1125.jpg and b/public/apple-splash-2436-1125.jpg differ diff --git a/public/apple-splash-2532-1170.jpg b/public/apple-splash-2532-1170.jpg index f732a3edf..896f739ee 100644 Binary files a/public/apple-splash-2532-1170.jpg and b/public/apple-splash-2532-1170.jpg differ diff --git a/public/apple-splash-2688-1242.jpg b/public/apple-splash-2688-1242.jpg index 878895005..0b5672183 100644 Binary files a/public/apple-splash-2688-1242.jpg and b/public/apple-splash-2688-1242.jpg differ diff --git a/public/apple-splash-2732-2048.jpg b/public/apple-splash-2732-2048.jpg index 8d4328280..b6dac3e70 100644 Binary files a/public/apple-splash-2732-2048.jpg and b/public/apple-splash-2732-2048.jpg differ diff --git a/public/apple-splash-2778-1284.jpg b/public/apple-splash-2778-1284.jpg index a5a74684d..25fdea363 100644 Binary files a/public/apple-splash-2778-1284.jpg and b/public/apple-splash-2778-1284.jpg differ diff --git a/public/apple-splash-640-1136.jpg b/public/apple-splash-640-1136.jpg index 9a64bba68..36b8d0b9a 100644 Binary files a/public/apple-splash-640-1136.jpg and b/public/apple-splash-640-1136.jpg differ diff --git a/public/apple-splash-750-1334.jpg b/public/apple-splash-750-1334.jpg index a69426295..0bab31b6f 100644 Binary files a/public/apple-splash-750-1334.jpg and b/public/apple-splash-750-1334.jpg differ diff --git a/public/apple-splash-828-1792.jpg b/public/apple-splash-828-1792.jpg index 95f97c08e..bf48283bf 100644 Binary files a/public/apple-splash-828-1792.jpg and b/public/apple-splash-828-1792.jpg differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index 34c700e21..e72e3a8c1 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/badge-128x128.png b/public/badge-128x128.png index 0ef0e6a02..8c694c090 100644 Binary files a/public/badge-128x128.png and b/public/badge-128x128.png differ diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png index b632b9f19..4f85c3063 100644 Binary files a/public/favicon-16x16.png and b/public/favicon-16x16.png differ diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png index 8cd58e542..5648b8f62 100644 Binary files a/public/favicon-32x32.png and b/public/favicon-32x32.png differ diff --git a/public/favicon.ico b/public/favicon.ico index 7346f636d..c15cf8bf2 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/images/overseerr_poster_not_found.png b/public/images/overseerr_poster_not_found.png index 2f5bc203d..0838b0f82 100644 Binary files a/public/images/overseerr_poster_not_found.png and b/public/images/overseerr_poster_not_found.png differ diff --git a/public/images/overseerr_poster_not_found_logo_center.png b/public/images/overseerr_poster_not_found_logo_center.png index 2ecd84b0f..1a1e5752d 100644 Binary files a/public/images/overseerr_poster_not_found_logo_center.png and b/public/images/overseerr_poster_not_found_logo_center.png differ diff --git a/public/images/overseerr_poster_not_found_logo_top.png b/public/images/overseerr_poster_not_found_logo_top.png index a74b096e1..6e58dfdab 100644 Binary files a/public/images/overseerr_poster_not_found_logo_top.png and b/public/images/overseerr_poster_not_found_logo_top.png differ diff --git a/public/logo.png b/public/logo.png deleted file mode 100644 index 7b61ea02f..000000000 Binary files a/public/logo.png and /dev/null differ diff --git a/public/logo_full.svg b/public/logo_full.svg new file mode 100644 index 000000000..d45c91570 --- /dev/null +++ b/public/logo_full.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/logo_stacked.svg b/public/logo_stacked.svg new file mode 100644 index 000000000..c91cfec5e --- /dev/null +++ b/public/logo_stacked.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/os_icon.svg b/public/os_icon.svg new file mode 100644 index 000000000..cb5ea9d7d --- /dev/null +++ b/public/os_icon.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/public/os_logo_filled.png b/public/os_logo_filled.png new file mode 100644 index 000000000..58c2a5b44 Binary files /dev/null and b/public/os_logo_filled.png differ diff --git a/public/os_logo_square.png b/public/os_logo_square.png deleted file mode 100644 index 9b9d6c53f..000000000 Binary files a/public/os_logo_square.png and /dev/null differ diff --git a/public/preview.jpg b/public/preview.jpg index e393f1667..e30b98c2e 100644 Binary files a/public/preview.jpg and b/public/preview.jpg differ diff --git a/src/components/Layout/Sidebar/index.tsx b/src/components/Layout/Sidebar/index.tsx index dbd156252..50e48f539 100644 --- a/src/components/Layout/Sidebar/index.tsx +++ b/src/components/Layout/Sidebar/index.tsx @@ -122,7 +122,7 @@ const Sidebar: React.FC = ({ open, setClosed }) => {

- Logo + Logo
@@ -187,7 +187,7 @@ const Sidebar: React.FC = ({ open, setClosed }) => {
- Logo + Logo
diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx index 3825970c0..ecf9566a1 100644 --- a/src/components/Layout/index.tsx +++ b/src/components/Layout/index.tsx @@ -1,27 +1,20 @@ import { MenuAlt2Icon } from '@heroicons/react/outline'; -import { ArrowLeftIcon, InformationCircleIcon } from '@heroicons/react/solid'; +import { ArrowLeftIcon } from '@heroicons/react/solid'; import { useRouter } from 'next/router'; import React, { useEffect, useState } from 'react'; -import { defineMessages, useIntl } from 'react-intl'; import { AvailableLocale } from '../../context/LanguageContext'; import useLocale from '../../hooks/useLocale'; import useSettings from '../../hooks/useSettings'; -import { Permission, useUser } from '../../hooks/useUser'; +import { useUser } from '../../hooks/useUser'; import SearchInput from './SearchInput'; import Sidebar from './Sidebar'; import UserDropdown from './UserDropdown'; -const messages = defineMessages({ - betawarning: - 'This is BETA software. Features may be broken and/or unstable. Please report any issues on GitHub!', -}); - const Layout: React.FC = ({ children }) => { const [isSidebarOpen, setSidebarOpen] = useState(false); const [isScrolled, setIsScrolled] = useState(false); - const { user, hasPermission } = useUser(); + const { user } = useUser(); const router = useRouter(); - const intl = useIntl(); const { currentSettings } = useSettings(); const { setLocale } = useLocale(); @@ -95,33 +88,7 @@ const Layout: React.FC = ({ children }) => {
-
- {router.pathname === '/' && hasPermission(Permission.ADMIN) && ( -
-
-
- -
-
-

- {intl.formatMessage(messages.betawarning)} -

-

- - GitHub → - -

-
-
-
- )} - {children} -
+
{children}
diff --git a/src/components/Login/index.tsx b/src/components/Login/index.tsx index d877e1605..347524fdf 100644 --- a/src/components/Login/index.tsx +++ b/src/components/Login/index.tsx @@ -77,8 +77,8 @@ const Login: React.FC = () => {
-
- Logo +
+ Logo

{intl.formatMessage(messages.signinheader)}

diff --git a/src/components/ResetPassword/RequestResetLink.tsx b/src/components/ResetPassword/RequestResetLink.tsx index 496f423d1..3c479dbc5 100644 --- a/src/components/ResetPassword/RequestResetLink.tsx +++ b/src/components/ResetPassword/RequestResetLink.tsx @@ -48,7 +48,7 @@ const ResetPassword: React.FC = () => {
- Logo + Logo

{intl.formatMessage(messages.resetpassword)}

diff --git a/src/components/ResetPassword/index.tsx b/src/components/ResetPassword/index.tsx index 3b7b5849a..957a73153 100644 --- a/src/components/ResetPassword/index.tsx +++ b/src/components/ResetPassword/index.tsx @@ -62,7 +62,7 @@ const ResetPassword: React.FC = () => {
- Logo + Logo

{intl.formatMessage(messages.resetpassword)}

diff --git a/src/components/Settings/SettingsAbout/index.tsx b/src/components/Settings/SettingsAbout/index.tsx index a151001d4..5f10bffcb 100644 --- a/src/components/Settings/SettingsAbout/index.tsx +++ b/src/components/Settings/SettingsAbout/index.tsx @@ -1,3 +1,4 @@ +import { InformationCircleIcon } from '@heroicons/react/solid'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import useSWR from 'swr'; @@ -28,6 +29,8 @@ const messages = defineMessages({ preferredmethod: 'Preferred', outofdate: 'Out of Date', uptodate: 'Up to Date', + betawarning: + 'This is BETA software. Features may be broken and/or unstable. Please report any issues on GitHub!', }); const SettingsAbout: React.FC = () => { @@ -54,6 +57,28 @@ const SettingsAbout: React.FC = () => { intl.formatMessage(globalMessages.settings), ]} /> +
+
+
+ +
+
+

+ {intl.formatMessage(messages.betawarning)} +

+

+ + GitHub → + +

+
+
+
{
Logo diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json index 6ba6e46a5..1a1fb6a4d 100644 --- a/src/i18n/locale/en.json +++ b/src/i18n/locale/en.json @@ -47,7 +47,6 @@ "components.Layout.VersionStatus.outofdate": "Out of Date", "components.Layout.VersionStatus.streamdevelop": "Overseerr Develop", "components.Layout.VersionStatus.streamstable": "Overseerr Stable", - "components.Layout.betawarning": "This is BETA software. Features may be broken and/or unstable. Please report any issues on GitHub!", "components.Login.email": "Email Address", "components.Login.forgotpassword": "Forgot Password?", "components.Login.loginerror": "Something went wrong while trying to sign in.", @@ -433,6 +432,7 @@ "components.Settings.SettingsAbout.Releases.viewchangelog": "View Changelog", "components.Settings.SettingsAbout.Releases.viewongithub": "View on GitHub", "components.Settings.SettingsAbout.about": "About", + "components.Settings.SettingsAbout.betawarning": "This is BETA software. Features may be broken and/or unstable. Please report any issues on GitHub!", "components.Settings.SettingsAbout.documentation": "Documentation", "components.Settings.SettingsAbout.gettingsupport": "Getting Support", "components.Settings.SettingsAbout.githubdiscussions": "GitHub Discussions", diff --git a/src/styles/globals.css b/src/styles/globals.css index 08e76b6e2..ef23ee658 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -106,7 +106,7 @@ a.slider-title svg { } .media-title > h1 { - @apply text-2xl xl:text-4xl; + @apply text-2xl font-bold xl:text-4xl; } h1 > .media-year {