From d1e8b0017dee12e04dbad9e85f7a8b497e584d1b Mon Sep 17 00:00:00 2001 From: MohamedBassem Date: Tue, 26 Mar 2024 02:26:33 +0000 Subject: ui: Migrate to the new logo everywhere --- apps/browser-extension/public/logo-128.png | Bin 2362 -> 2909 bytes apps/browser-extension/public/logo-16.png | Bin 287 -> 1860 bytes apps/browser-extension/public/logo-48.png | Bin 780 -> 2120 bytes apps/browser-extension/public/logo.png | Bin 412 -> 2909 bytes apps/landing/app/favicon.ico | Bin 15406 -> 15086 bytes apps/landing/app/page.tsx | 8 +++--- apps/landing/components/HoarderLogo.tsx | 20 ++++++++++++++ apps/landing/next.config.mjs | 7 +++++ apps/landing/package.json | 1 + apps/landing/public/icons/logo-full.svg | 16 ++++++++++++ apps/landing/public/icons/logo-icon.svg | 7 +++++ apps/landing/public/icons/logo-text.svg | 25 ++++++++++++++++++ apps/mobile/app/signin.tsx | 2 +- apps/mobile/assets/icon.png | Bin 2362 -> 13691 bytes apps/mobile/assets/splash.png | Bin 117993 -> 12200 bytes apps/mobile/components/Logo.tsx | 29 ++++++++++++++------- apps/mobile/package.json | 1 + apps/web/app/favicon.ico | Bin 15406 -> 15086 bytes apps/web/app/signin/page.tsx | 7 ++--- apps/web/components/HoarderIcon.tsx | 20 ++++++++++++++ .../components/dashboard/sidebar/ModileSidebar.tsx | 14 +++++----- .../dashboard/sidebar/ModileSidebarItem.tsx | 2 +- apps/web/components/dashboard/sidebar/Sidebar.tsx | 8 +++--- apps/web/next.config.mjs | 7 +++++ apps/web/package.json | 1 + apps/web/public/icons/logo-128.png | Bin 2362 -> 2909 bytes apps/web/public/icons/logo-16.png | Bin 287 -> 1860 bytes apps/web/public/icons/logo-48.png | Bin 780 -> 2120 bytes apps/web/public/icons/logo-full.svg | 16 ++++++++++++ apps/web/public/icons/logo-icon.svg | 7 +++++ apps/web/public/icons/logo-text.svg | 25 ++++++++++++++++++ apps/web/public/landing/app-store-badge.png | Bin 16782 -> 0 bytes apps/web/public/landing/extension-badge.png | Bin 9171 -> 0 bytes apps/web/public/landing/screenshot.png | Bin 3196208 -> 0 bytes 34 files changed, 188 insertions(+), 35 deletions(-) create mode 100644 apps/landing/components/HoarderLogo.tsx create mode 100644 apps/landing/public/icons/logo-full.svg create mode 100644 apps/landing/public/icons/logo-icon.svg create mode 100644 apps/landing/public/icons/logo-text.svg create mode 100644 apps/web/components/HoarderIcon.tsx create mode 100644 apps/web/public/icons/logo-full.svg create mode 100644 apps/web/public/icons/logo-icon.svg create mode 100644 apps/web/public/icons/logo-text.svg delete mode 100644 apps/web/public/landing/app-store-badge.png delete mode 100644 apps/web/public/landing/extension-badge.png delete mode 100644 apps/web/public/landing/screenshot.png (limited to 'apps') diff --git a/apps/browser-extension/public/logo-128.png b/apps/browser-extension/public/logo-128.png index 71ead90c..a6e80bdb 100644 Binary files a/apps/browser-extension/public/logo-128.png and b/apps/browser-extension/public/logo-128.png differ diff --git a/apps/browser-extension/public/logo-16.png b/apps/browser-extension/public/logo-16.png index dd864d44..25ba8fb1 100644 Binary files a/apps/browser-extension/public/logo-16.png and b/apps/browser-extension/public/logo-16.png differ diff --git a/apps/browser-extension/public/logo-48.png b/apps/browser-extension/public/logo-48.png index 7ba1cd49..b7442d94 100644 Binary files a/apps/browser-extension/public/logo-48.png and b/apps/browser-extension/public/logo-48.png differ diff --git a/apps/browser-extension/public/logo.png b/apps/browser-extension/public/logo.png index ebe0a6a3..a6e80bdb 100644 Binary files a/apps/browser-extension/public/logo.png and b/apps/browser-extension/public/logo.png differ diff --git a/apps/landing/app/favicon.ico b/apps/landing/app/favicon.ico index 750e3c04..d940a939 100644 Binary files a/apps/landing/app/favicon.ico and b/apps/landing/app/favicon.ico differ diff --git a/apps/landing/app/page.tsx b/apps/landing/app/page.tsx index 9a7b023c..a038eb51 100644 --- a/apps/landing/app/page.tsx +++ b/apps/landing/app/page.tsx @@ -1,9 +1,10 @@ import Image from "next/image"; import Link from "next/link"; +import HoarderLogo from "@/components/HoarderLogo"; import { buttonVariants } from "@/components/ui/button"; import { cn } from "@/lib/utils"; import screenshot from "@/public/screenshot.png"; -import { ExternalLink, Github, PackageOpen } from "lucide-react"; +import { ExternalLink, Github } from "lucide-react"; const GITHUB_LINK = "https://github.com/MohamedBassem/hoarder-app"; const DOCS_LINK = "https://docs.hoarder.app"; @@ -12,10 +13,7 @@ const DEMO_LINK = "https://try.hoarder.app"; function NavBar() { return (
-
- -

Hoarder

-
+
+ + + + ); +} diff --git a/apps/landing/next.config.mjs b/apps/landing/next.config.mjs index 743e4d69..c9153017 100644 --- a/apps/landing/next.config.mjs +++ b/apps/landing/next.config.mjs @@ -1,5 +1,12 @@ /** @type {import('next').NextConfig} */ const nextConfig = { + webpack: (config) => { + config.module.rules.push({ + test: /\.svg$/, + use: ["@svgr/webpack"], + }); + return config; + }, /** We already do linting and typechecking as separate tasks in CI */ eslint: { ignoreDuringBuilds: true }, typescript: { ignoreBuildErrors: true }, diff --git a/apps/landing/package.json b/apps/landing/package.json index 78e72d7c..3f3e3287 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -15,6 +15,7 @@ }, "dependencies": { "@radix-ui/react-slot": "^1.0.2", + "@svgr/webpack": "^8.1.0", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", "lucide-react": "^0.330.0", diff --git a/apps/landing/public/icons/logo-full.svg b/apps/landing/public/icons/logo-full.svg new file mode 100644 index 00000000..3526f580 --- /dev/null +++ b/apps/landing/public/icons/logo-full.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/apps/landing/public/icons/logo-icon.svg b/apps/landing/public/icons/logo-icon.svg new file mode 100644 index 00000000..dc8f9f4b --- /dev/null +++ b/apps/landing/public/icons/logo-icon.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/apps/landing/public/icons/logo-text.svg b/apps/landing/public/icons/logo-text.svg new file mode 100644 index 00000000..c6f18209 --- /dev/null +++ b/apps/landing/public/icons/logo-text.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/mobile/app/signin.tsx b/apps/mobile/app/signin.tsx index ceb4c8d1..2255424e 100644 --- a/apps/mobile/app/signin.tsx +++ b/apps/mobile/app/signin.tsx @@ -56,7 +56,7 @@ export default function Signin() { - + {error && ( {error} diff --git a/apps/mobile/assets/icon.png b/apps/mobile/assets/icon.png index 71ead90c..cbda413d 100644 Binary files a/apps/mobile/assets/icon.png and b/apps/mobile/assets/icon.png differ diff --git a/apps/mobile/assets/splash.png b/apps/mobile/assets/splash.png index 3759c518..399fce63 100644 Binary files a/apps/mobile/assets/splash.png and b/apps/mobile/assets/splash.png differ diff --git a/apps/mobile/components/Logo.tsx b/apps/mobile/components/Logo.tsx index f5f823b5..9fdd1083 100644 --- a/apps/mobile/components/Logo.tsx +++ b/apps/mobile/components/Logo.tsx @@ -1,11 +1,20 @@ -import { Text, View } from "react-native"; -import { PackageOpen } from "lucide-react-native"; +import * as React from "react" +import type { SvgProps} from "react-native-svg"; +import Svg, { Path } from "react-native-svg" +const Logo = (props: SvgProps) => ( + + + + +) +export default Logo -export default function Logo() { - return ( - - - Hoarder - - ); -} diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 63c30426..7c14f5fe 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -29,6 +29,7 @@ "expo-secure-store": "^12.8.1", "expo-share-intent": "^1.1.0", "expo-status-bar": "~1.11.1", + "expo-system-ui": "^2.9.3", "expo-web-browser": "^12.8.2", "lucide-react-native": "^0.354.0", "nativewind": "^4.0.1", diff --git a/apps/web/app/favicon.ico b/apps/web/app/favicon.ico index 750e3c04..d940a939 100644 Binary files a/apps/web/app/favicon.ico and b/apps/web/app/favicon.ico differ diff --git a/apps/web/app/signin/page.tsx b/apps/web/app/signin/page.tsx index 4dc81376..441187e1 100644 --- a/apps/web/app/signin/page.tsx +++ b/apps/web/app/signin/page.tsx @@ -1,7 +1,7 @@ import { redirect } from "next/dist/client/components/navigation"; +import HoarderLogo from "@/components/HoarderIcon"; import SignInForm from "@/components/signin/SignInForm"; import { getServerAuthSession } from "@/server/auth"; -import { PackageOpen } from "lucide-react"; export default async function SignInPage() { const session = await getServerAuthSession(); @@ -12,10 +12,7 @@ export default async function SignInPage() { return (
- - - -

Hoarder

+
diff --git a/apps/web/components/HoarderIcon.tsx b/apps/web/components/HoarderIcon.tsx new file mode 100644 index 00000000..a4b76f6a --- /dev/null +++ b/apps/web/components/HoarderIcon.tsx @@ -0,0 +1,20 @@ +import HoarderLogoIcon from "@/public/icons/logo-icon.svg"; +import HoarderLogoText from "@/public/icons/logo-text.svg"; + +export default function HoarderLogo({ + height, + gap, +}: { + height: number; + gap: string; +}) { + return ( + + + + + ); +} diff --git a/apps/web/components/dashboard/sidebar/ModileSidebar.tsx b/apps/web/components/dashboard/sidebar/ModileSidebar.tsx index 7306308d..635f63bd 100644 --- a/apps/web/components/dashboard/sidebar/ModileSidebar.tsx +++ b/apps/web/components/dashboard/sidebar/ModileSidebar.tsx @@ -1,10 +1,5 @@ -import { - ClipboardList, - PackageOpen, - Search, - Settings, - Tag, -} from "lucide-react"; +import HoarderLogoIcon from "@/public/icons/logo-icon.svg"; +import { ClipboardList, Search, Settings, Tag } from "lucide-react"; import MobileSidebarItem from "./ModileSidebarItem"; import SidebarProfileOptions from "./SidebarProfileOptions"; @@ -13,7 +8,10 @@ export default async function MobileSidebar() { return (