Skip to content

Commit 10a3553

Browse files
dterceroparkerdterceroparker
authored
Merge pull request #58 from the-collab-lab/dtp-logo
Issue #20: Finalize Logo and Favicon Integration
2 parents df5ac85 + 7a231b3 commit 10a3553

File tree

10 files changed

+26
-15
lines changed

10 files changed

+26
-15
lines changed

‎index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/>
1313
<meta name="color-scheme" content="dark light" />
1414
<title>CollabShop</title>
15+
<link rel="icon" href="public/favicon.ico" />
1516
<script type="module" src="/src/index.jsx" async></script>
1617
</head>
1718
<body>

‎public/favicon.ico‎

318 Bytes
Binary file not shown.

‎public/logo192.png‎

-8.38 KB
Binary file not shown.

‎public/logo512.png‎

-22.4 KB
Binary file not shown.

‎src/assets/fulllogo_transparent.png‎

-154 KB
Binary file not shown.

‎src/assets/logo.png‎

105 KB
Loading

‎src/components/Loading.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function Loading() {
77
<img
88
src={logo}
99
alt="CollabShop Logo, a collaboration platform for grocery shopping."
10-
className="w-24 h-24 sm:w-32 sm:h-32 md:w-40 md:h-40 mb-4 animate-pulse"
10+
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"
1111
/>
1212
<h2 className="text-txtPrimary text-sm sm:text-base md:text-lg font-semibold mb-2">
1313
Please hold on while we prepare your experience.

‎src/favicon.ico‎

-21.9 KB
Binary file not shown.

‎src/views/LandingPage.jsx‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@ import logo from '../assets/logo.png';
22

33
export function LandingPage() {
44
return (
5-
<div className="flex flex-col items-center justify-center min-h-screen bg-bgPrimary dark:bg-bgPrimaryDark p-6">
5+
<div className="bg-bgPrimary dark:bg-bgPrimaryDark flex flex-col items-center justify-center min-h-screen p-6 sm:p-8 md:p-10">
66
<img
77
src={logo}
88
alt="CollabShop Logo, a collaboration platform for grocery shopping."
9-
className="w-45 h-auto mb-6"
9+
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"
1010
/>
11-
<h1 className="text-txtPrimary dark:text-txtPrimaryDark text-2xl md:text-4xl font-bold text-center mb-4">
11+
<h1 className="bg-[#99D98C] text-txtPrimary dark:text-txtPrimaryDark text-2xl sm:text-3xl md:text-4xl font-extrabold text-center mb-4 p-4 rounded-lg max-w-2xl">
1212
<strong>CollabShop</strong> is more than just a grocery app—it&apos;s a
13-
tool that embodies the spirit of teamwork and collaboration. Created by
14-
early-career developers from{' '}
13+
tool that embodies the spirit of teamwork and collaboration.
14+
</h1>
15+
<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">
16+
Created by early-career developers from{' '}
1517
<a
1618
href="https://the-collab-lab.codes/"
1719
target="_blank"
@@ -22,12 +24,15 @@ export function LandingPage() {
2224
</a>
2325
, our smart shopping list app learns your buying habits, reminds you of
2426
what you might need for your next store run, and allows you to
25-
effortlessly share and collaborate on lists. With CollabShop, planning
26-
your grocery trips becomes a seamless and enjoyable experience!
27-
</h1>
28-
<p className="text-txtPrimary dark:text-txtPrimaryDark font-bold text-lg md:text-xl text-center mb-6">
29-
Ready to start your journey? Click the sign-in button below to begin
30-
planning your grocery runs with CollabShop today.
27+
effortlessly share and collaborate on lists.
28+
</p>
29+
30+
<p className="bg-[#99D98C] text-txtPrimary dark:text-txtPrimaryDark font-semibold text-base sm:text-lg md:text-xl text-center mb-6 p-4 rounded-lg max-w-xl">
31+
With CollabShop, planning your grocery trips becomes a seamless and
32+
enjoyable experience!
33+
</p>
34+
<p className="bg-[#99D98C] text-txtPrimary dark:text-txtPrimaryDark text-lg sm:text-xl md:text-2xl text-center font-bold mb-6 p-4 rounded-lg max-w-lg">
35+
Ready to start your journey? Click the sign-in button below to begin.
3136
</p>
3237
</div>
3338
);

‎src/views/Layout.jsx‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,16 @@ export function Layout() {
4444
return (
4545
<>
4646
<div className="flex flex-col min-h-screen">
47-
<header className="bg-bgPrimary dark:bg-bgPrimaryDark pb-2 pt-[max(env(safe-area-inset-top),1rem)] text-center">
47+
<header className="bg-bgPrimary dark:bg-bgPrimaryDark pb-4 pt-[max(env(safe-area-inset-top),1rem)] text-center">
4848
{!!user && (
49-
<div>
50-
<img src={logo} alt="Logo" className="mx-auto" />
49+
<div className="flex flex-col items-center justify-center">
50+
<img
51+
src={logo}
52+
alt="CollabShop Logo, a collaboration platform for grocery shopping."
53+
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"
54+
/>
5155
<span className="text-txtPrimary dark:text-txtPrimaryDark">
56+
5257
Signed in as {auth.currentUser.displayName}
5358
</span>
5459
</div>

0 commit comments

Comments
 (0)