Skip to content

Commit c4d40b5

Browse files
committed
Merge branch 'main' into dialogs
2 parents f24213e + 347b83a commit c4d40b5

File tree

9 files changed

+22
-21
lines changed

9 files changed

+22
-21
lines changed

index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
/>
99
<meta
1010
name="description"
11-
content="A smart shopping list that learns your purchase habits and makes suggestions, so you don't forget to buy what's important."
11+
content="Despiensa, a smart shopping list that learns your purchase habits and makes suggestions, so you don't forget to buy what's important."
1212
/>
13-
<link rel="icon" type="image/svg+xml" href="/src/favicon.ico" />
13+
<link rel="icon" type="image/png" href="/src/assets/favicon.png" />
1414
<meta name="color-scheme" content="dark light" />
15-
<title>Smart Shopping List</title>
15+
<title>Despiensa</title>
1616
<script type="module" src="/src/index.jsx" async></script>
1717
<script
1818
src="https://kit.fontawesome.com/d9b2f1cd4a.js"

public/logo192.png

-8.38 KB
Binary file not shown.

public/logo512.png

-22.4 KB
Binary file not shown.

src/assets/favicon.png

935 Bytes
Loading

src/components/NavBar/NavBar.jsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ export function NavBar({ user, lists, listPath }) {
99
{/* DESKTOP MENU */}
1010
<nav className="h-16 hidden fixed z-20 w-full lg:flex shadow-md bg-offWhite text-darkPurple text-lg sm:text-xl">
1111
<div className="h-full w-full flex flex-row justify-between items-center xl:w-9/12 xl:mx-auto ">
12-
<div className="h-full flex items-center pl-12">
13-
<h2 className="font-amiri text-xl sm:text-2xl font-bold">
14-
Smart Shopping List
12+
<div className="h-full flex flex-col justify-center pl-12">
13+
<h2 className="font-amiri text-2xl sm:text-3xl font-bold">
14+
Despiensa
1515
</h2>
16+
<p className="text-xs font-poppins">Un-think your pantry</p>
1617
</div>
1718
{!!user && (
1819
<div className="h-full flex flex-row items-center">
@@ -29,8 +30,8 @@ export function NavBar({ user, lists, listPath }) {
2930
<nav className="h-12 w-full flex flex-row justify-between lg:hidden relative shadow-md text-darkPurple bg-offWhite text-lg sm:text-xl">
3031
{/* MOBILE-MENU */}
3132
<div className="h-full flex items-center pl-12">
32-
<h2 className="font-amiri text-xl sm:text-2xl font-bold">
33-
Smart Shopping List
33+
<h2 className="font-amiri text-2xl sm:text-3xl font-bold">
34+
Despiensa
3435
</h2>
3536
</div>
3637
{!!user && (

src/favicon.ico

-21.9 KB
Binary file not shown.

src/views/Home.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function Home({ data, setListPath, userId, userEmail }) {
1616
</p>
1717

1818
{data[0] && (
19-
<section className="mb-20">
19+
<section className="mb-8">
2020
<h2 className="text-lg sm:text-xl text-left text-darkPurple border-solid border-darkPurple border-b pb-2 mb-8">
2121
SELECT A LIST
2222
</h2>
@@ -35,7 +35,7 @@ export function Home({ data, setListPath, userId, userEmail }) {
3535
</section>
3636
)}
3737

38-
<section>
38+
<section className="mb-8">
3939
<h2 className="text-lg sm:text-xl text-left text-darkPurple border-solid border-darkPurple border-b pb-2 mb-8 ">
4040
CREATE A NEW LIST
4141
</h2>

src/views/Layout.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ export function Layout({ lists, listPath, user, isLoadingUser }) {
2222
<div className="lg:w-fit flex flex-col items-center">
2323
<h1 className="max-w-sm font-amiri text-3xl sm:text-4xl text-darkPurple leading-[3rem] sm:leading-[3rem]">
2424
Simplify your shopping with{' '}
25-
<span className="font-semibold">SmartShoppingList</span>, the
26-
intuitive list organizer.
25+
<span className="font-semibold">Despiensa</span>, the intuitive
26+
list organizer.
2727
</h1>
2828
<button
29-
className="w-80 mt-8 p-2 rounded-md font-poppins text-base sm:text-lg text-puurWhite bg-lightPurple"
29+
className="w-80 mt-8 p-2 rounded-md font-poppins text-base sm:text-lg text-puurWhite bg-lightPurple hover:bg-hoverPurple transition ease-in-out"
3030
type="button"
3131
onClick={handleClickSignIn}
3232
>

src/views/ManageList.jsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export function ManageList({ data, listPath, userId, userEmail }) {
108108
Add new items and share your list with other users
109109
</p>
110110
</div>
111-
<section className="flex flex-col w-full">
111+
<section className="flex flex-col w-full mb-8">
112112
<div className="flex flex-col">
113113
<form
114114
method="post"
@@ -127,12 +127,12 @@ export function ManageList({ data, listPath, userId, userEmail }) {
127127
className="grow shrink bg-lightGrey border border-darkPurple rounded-md shadow-lg px-4 py-2 placeholder:text-darkPurple mb-5"
128128
onChange={() => setAddItemErrMessage('')}
129129
></input>
130-
<div className="flex flex-col sm:flex-row gap-4 text-base sm:text-2xl">
130+
<div className="grid sm:grid-cols-3 grid-cols-1 grid-rows-2 sm:grid-rows-1 gap-y-4 sm:gap-x-2 text-base sm:text-lg">
131131
<select
132132
name="time"
133133
id="time-select "
134134
aria-label="When do you need this item?"
135-
className="grow shrink bg-lightGrey text-base sm:text-lg border border-darkPurple rounded-md shadow-lg px-4 py-2 placeholder:text-darkPurple"
135+
className="col-span-3 sm:col-span-2 bg-lightGrey text-base sm:text-lg border border-darkPurple rounded-md shadow-lg px-4 py-2 placeholder:text-darkPurple"
136136
>
137137
<option value="none" selected disabled hidden>
138138
Choose item's likely need date
@@ -144,7 +144,7 @@ export function ManageList({ data, listPath, userId, userEmail }) {
144144
</select>
145145
<button
146146
type="submit"
147-
className="flex items-center text-base sm:text-lg justify-center shrink-0 gap-6 shadow-lg rounded-md bg-lightPurple hover:bg-hoverPurple text-offWhite transition ease-in-out px-4 py-2"
147+
className=" col-span-3 sm:col-span-1 gap-6 flex items-center text-base sm:text-lg justify-center shadow-lg rounded-md bg-lightPurple hover:bg-hoverPurple text-offWhite transition ease-in-out px-4 py-2"
148148
>
149149
<span>
150150
<i className="fa-solid fa-plus"></i>
@@ -158,7 +158,7 @@ export function ManageList({ data, listPath, userId, userEmail }) {
158158
)}
159159
</div>
160160
</section>
161-
<section className="flex flex-col w-full my-20">
161+
<section className="flex flex-col w-full my-8">
162162
<form
163163
method="post"
164164
onSubmit={sendInvite}
@@ -167,19 +167,19 @@ export function ManageList({ data, listPath, userId, userEmail }) {
167167
<h2 className="text-lg sm:text-xl text-left text-darkPurple border-solid border-darkPurple border-b pb-2 mb-8">
168168
SHARE THE LIST
169169
</h2>
170-
<div className="flex flex-col sm:flex-row gap-4">
170+
<div className="grid sm:grid-cols-3 grid-cols-1 grid-rows-2 sm:grid-rows-1 gap-y-4 sm:gap-x-2 text-base sm:text-lg">
171171
<input
172172
aria-label="Share the list"
173173
type="email"
174174
name="email"
175175
id="email"
176176
placeholder="Share this list with another user"
177-
className="grow shrink bg-lightGrey border border-darkPurple rounded-md shadow-lg px-4 py-2 placeholder:text-darkPurple"
177+
className="col-span-3 sm:col-span-2 bg-lightGrey border border-darkPurple rounded-md shadow-lg px-4 py-2 placeholder:text-darkPurple"
178178
onChange={() => setShareListErrMessage('')}
179179
></input>
180180
<button
181181
type="submit"
182-
className="bg-lightGrey text-darkPurple border border-darkPurple flex justify-center items-center shadow-lg rounded-md transition ease-in-out hover:bg-hoverPurple hover:text-puurWhite px-4 py-2 gap-6 shrink-0"
182+
className="col-span-3 sm:col-span-1 flex bg-lightGrey text-darkPurple border border-darkPurple justify-center items-center shadow-lg rounded-md transition ease-in-out hover:bg-hoverPurple hover:text-puurWhite px-4 py-2 gap-6 shrink-0"
183183
>
184184
<span>
185185
<i className="fa-solid fa-share-nodes"></i>

0 commit comments

Comments
 (0)