diff --git a/package.json b/package.json index 01a723ec..933c663a 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "sqlite3": "^5.0.2", "swagger-ui-express": "^4.1.6", "swr": "^0.5.6", - "typeorm": "0.2.34", + "typeorm": "0.2.32", "web-push": "^3.4.4", "winston": "^3.3.3", "winston-daily-rotate-file": "^4.5.5", diff --git a/src/components/Layout/SearchInput/index.tsx b/src/components/Layout/SearchInput/index.tsx index 1b0aca2a..d8857dac 100644 --- a/src/components/Layout/SearchInput/index.tsx +++ b/src/components/Layout/SearchInput/index.tsx @@ -24,7 +24,7 @@ const SearchInput: React.FC = () => { 0 ? '1.75rem' : '' }} - className="block w-full py-2 pl-10 text-white placeholder-gray-300 bg-gray-900 border border-gray-600 rounded-full focus:border-gray-500 hover:border-gray-500 focus:outline-none focus:ring-0 focus:placeholder-gray-400 sm:text-base" + className="block w-full py-2 pl-10 text-white placeholder-gray-300 bg-gray-900 border border-gray-600 rounded-full bg-opacity-80 focus:bg-opacity-100 focus:border-gray-500 hover:border-gray-500 focus:outline-none focus:ring-0 focus:placeholder-gray-400 sm:text-base" placeholder={intl.formatMessage(messages.searchPlaceholder)} type="search" inputMode="search" diff --git a/src/components/Layout/Sidebar/index.tsx b/src/components/Layout/Sidebar/index.tsx index 50e48f53..bc6da872 100644 --- a/src/components/Layout/Sidebar/index.tsx +++ b/src/components/Layout/Sidebar/index.tsx @@ -2,9 +2,9 @@ import { ClockIcon, CogIcon, SparklesIcon, + UsersIcon, XIcon, } from '@heroicons/react/outline'; -import { UsersIcon } from '@heroicons/react/solid'; import Link from 'next/link'; import { useRouter } from 'next/router'; import React, { ReactNode, useRef } from 'react'; @@ -39,34 +39,26 @@ const SidebarLinks: SidebarLinkProps[] = [ { href: '/', messagesKey: 'dashboard', - svgIcon: ( - - ), + svgIcon: , activeRegExp: /^\/(discover\/?(movies|tv)?)?$/, }, { href: '/requests', messagesKey: 'requests', - svgIcon: ( - - ), + svgIcon: , activeRegExp: /^\/requests/, }, { href: '/users', messagesKey: 'users', - svgIcon: ( - - ), + svgIcon: , activeRegExp: /^\/users/, requiredPermission: Permission.MANAGE_USERS, }, { href: '/settings', messagesKey: 'settings', - svgIcon: ( - - ), + svgIcon: , activeRegExp: /^\/settings/, requiredPermission: Permission.MANAGE_SETTINGS, }, @@ -93,7 +85,7 @@ const Sidebar: React.FC = ({ open, setClosed }) => { leaveTo="opacity-0" >
-
+
= ({ open, setClosed }) => {
-
- +
+ Logo
-
@@ -182,16 +176,16 @@ const Sidebar: React.FC = ({ open, setClosed }) => {
-
-
-
- +
+
+
+ Logo
-
diff --git a/src/components/Layout/VersionStatus/index.tsx b/src/components/Layout/VersionStatus/index.tsx index 0a2ac43c..39ca6807 100644 --- a/src/components/Layout/VersionStatus/index.tsx +++ b/src/components/Layout/VersionStatus/index.tsx @@ -53,7 +53,7 @@ const VersionStatus: React.FC = ({ onClick }) => { className={`flex items-center p-2 mx-2 text-xs transition duration-300 rounded-lg ring-1 ring-gray-700 ${ data.updateAvailable ? 'bg-yellow-500 text-white hover:bg-yellow-400' - : 'bg-gray-800 text-gray-300 hover:bg-gray-700' + : 'bg-gray-900 text-gray-300 hover:bg-gray-800' }`} > {data.commitTag === 'local' ? ( diff --git a/src/styles/globals.css b/src/styles/globals.css index ceca131d..0671d385 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -19,8 +19,10 @@ body { } .sidebar { + @apply border-r border-gray-700; padding-top: env(safe-area-inset-top); padding-left: env(safe-area-inset-left); + background: linear-gradient(180deg, #232a36 0%, #131928 100%); } .slideover { diff --git a/yarn.lock b/yarn.lock index ade5d1f9..6a714b93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13792,10 +13792,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typeorm@0.2.34: - version "0.2.34" - resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.34.tgz#637b3cec2de54ee7f423012b813a2022c0aacc8b" - integrity sha512-FZAeEGGdSGq7uTH3FWRQq67JjKu0mgANsSZ04j3kvDYNgy9KwBl/6RFgMVgiSgjf7Rqd7NrhC2KxVT7I80qf7w== +typeorm@0.2.32: + version "0.2.32" + resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.32.tgz#544dbfdfe0cd0887548d9bcbd28527ea4f4b3c9b" + integrity sha512-LOBZKZ9As3f8KRMPCUT2H0JZbZfWfkcUnO3w/1BFAbL/X9+cADTF6bczDGGaKVENJ3P8SaKheKmBgpt5h1x+EQ== dependencies: "@sqltools/formatter" "^1.2.2" app-root-path "^3.0.0"