Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #20: Finalize Logo and Favicon Integration #58

Merged
merged 10 commits into from
Oct 11, 2024
Merged

Issue #20: Finalize Logo and Favicon Integration #58

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b122e1b
feat(#20): replace screenshot logo with purchased logo. Rename file t…
dterceroparker Oct 9, 2024
27196f4
update LandingPage logo tailwind width for mobile responsiveness
dterceroparker Oct 9, 2024
408f81a
update layout header and img tags to center and ensure device respons…
dterceroparker Oct 9, 2024
b8e0d70
add favicon.ico to public folder and index.html file. Delete React fa…
dterceroparker Oct 9, 2024
95a5dd5
Add larger logo to Landing page and update tailwind of h1 and p eleme…
dterceroparker Oct 10, 2024
2687ca7
update logo tailwind in Layout component
dterceroparker Oct 10, 2024
d0ab514
update logo tailwind code in loading component
dterceroparker Oct 10, 2024
688f9aa
delete extra comments in Landing page
dterceroparker Oct 10, 2024
7876477
delete shadow tailwind on Landing Page h1 elements
dterceroparker Oct 10, 2024
7a231b3
Merge branch 'main' into dtp-logo
dterceroparker Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/>
<meta name="color-scheme" content="dark light" />
<title>CollabShop</title>
<link rel="icon" href="public/favicon.ico" />
<script type="module" src="/src/index.jsx" async></script>
</head>
<body>
Expand Down
Binary file added public/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file removed public/logo192.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/logo512.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/assets/fulllogo_transparent.png
View file
Open in desktop
Binary file not shown.
Binary file modified src/assets/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Loading.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export function Loading() {
<img
src={logo}
alt="CollabShop Logo, a collaboration platform for grocery shopping."
className="w-24 h-24 sm:w-32 sm:h-32 md:w-40 md:h-40 mb-4 animate-pulse"
className="w-64 sm:w-72 md:w-80 lg:w-96 h-auto mb-6 max-w-full rounded-lg shadow-sm transform hover:scale-105 transition-all duration-300 ease-in-out"
/>
<h2 className="text-txtPrimary text-sm sm:text-base md:text-lg font-semibold mb-2">
Please hold on while we prepare your experience.
Expand Down
Binary file removed src/favicon.ico
View file
Open in desktop
Binary file not shown.
27 changes: 16 additions & 11 deletions src/views/LandingPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@ import logo from '../assets/logo.png';

export function LandingPage() {
return (
<div className="flex flex-col items-center justify-center min-h-screen bg-bgPrimary p-6">
<div className="flex flex-col items-center justify-center min-h-screen bg-bgPrimary p-6 sm:p-8 md:p-10">
<img
src={logo}
alt="CollabShop Logo, a collaboration platform for grocery shopping."
className="w-45 h-auto mb-6"
className="w-64 sm:w-72 md:w-80 lg:w-96 h-auto mb-6 max-w-full rounded-lg shadow-sm transform hover:scale-105 transition-all duration-300 ease-in-out"
/>
<h1 className="text-txtPrimary text-2xl md:text-4xl font-bold text-center mb-4">
<h1 className="bg-[#99D98C] text-txtPrimary text-2xl sm:text-3xl md:text-4xl font-extrabold text-center mb-4 p-4 rounded-lg max-w-2xl">
<strong>CollabShop</strong> is more than just a grocery app—it&apos;s a
tool that embodies the spirit of teamwork and collaboration. Created by
early-career developers from{' '}
tool that embodies the spirit of teamwork and collaboration.
</h1>
<p className="bg-[#99D98C] text-txtPrimary text-base sm:text-lg md:text-xl text-center mb-4 p-4 rounded-lg max-w-2xl leading-relaxed">
Created by early-career developers from{' '}
<a
href="https://the-collab-lab.codes/"
target="_blank"
Expand All @@ -22,12 +24,15 @@ export function LandingPage() {
</a>
, our smart shopping list app learns your buying habits, reminds you of
what you might need for your next store run, and allows you to
effortlessly share and collaborate on lists. With CollabShop, planning
your grocery trips becomes a seamless and enjoyable experience!
</h1>
<p className="text-txtPrimary font-bold text-lg md:text-xl text-center mb-6">
Ready to start your journey? Click the sign-in button below to begin
planning your grocery runs with CollabShop today.
effortlessly share and collaborate on lists.
</p>

<p className="bg-[#99D98C] text-txtPrimary font-semibold text-base sm:text-lg md:text-xl text-center mb-6 p-4 rounded-lg max-w-xl">
With CollabShop, planning your grocery trips becomes a seamless and
enjoyable experience!
</p>
<p className="bg-[#99D98C] text-txtPrimary text-lg sm:text-xl md:text-2xl text-center font-bold mb-6 p-4 rounded-lg max-w-lg">
Ready to start your journey? Click the sign-in button below to begin.
</p>
</div>
);
Expand Down
14 changes: 10 additions & 4 deletions src/views/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,17 @@ export function Layout() {
return (
<>
<div className="flex flex-col min-h-screen">
<header className="bg-[var(--color-bg)] pb-2 pt-[max(env(safe-area-inset-top),1rem)] text-center">
<header className="bg-[var(--color-bg)] pb-4 pt-[max(env(safe-area-inset-top),1rem)] text-center">
{!!user && (
<div>
<img src={logo} alt="Logo" className="mx-auto" />
<span>Signed in as {auth.currentUser.displayName}</span>
<div className="flex flex-col items-center justify-center">
<img
src={logo}
alt="CollabShop Logo, a collaboration platform for grocery shopping."
className="w-64 sm:w-72 md:w-80 lg:w-96 h-auto mb-6 max-w-full rounded-lg shadow-sm transform hover:scale-105 transition-all duration-300 ease-in-out"
/>
<span className="text-txtPrimary">
Signed in as {auth.currentUser.displayName}
</span>
</div>
)}
</header>
Expand Down