Skip to content

Commit 641122a

Browse files
chore: lock file fix
2 parents 3cbc8f4 + d4906d3 commit 641122a

File tree

5 files changed

+44
-51
lines changed

5 files changed

+44
-51
lines changed

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@
6161
"react-use": "^17.5.0",
6262
"resend": "2.1.0",
6363
"sharp": "0.33.1",
64-
"sonner": "^1.4.0",
65-
"tailwindcss": "^3.4.1",
66-
"typescript": "5.1.6"
64+
"sonner": "1.4.0",
65+
"tailwindcss": "3.4.1"
6766
},
6867
"devDependencies": {
6968
"@commitlint/cli": "19.0.3",

src/backend/auth.api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ const getUserByUserId = async (userId: string) => {
144144

145145
const login = async (email: string, password: string) => {
146146
try {
147+
await account.deleteSessions();
147148
const response = await account.createEmailSession(email, password);
148149

149150
if (!response) {

src/components/core/navbar/index.tsx

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ const Navbar = ({ starCount }: { starCount?: number }) => {
114114
return (
115115
<>
116116
<nav className="w-full sticky top-0 shadow-md py-2 backdrop-blur-sm dark:shadow-gray-600 z-50">
117-
118117
{/* Desktop menu items */}
119118

120119
<div className="max-w-screen-lg mx-auto flex items-center content-center justify-between backdrop-blur-sm bg-grey-100 bg-opacity-20 h-16 my-2">
@@ -129,15 +128,21 @@ const Navbar = ({ starCount }: { starCount?: number }) => {
129128
</Link>
130129

131130
{/* Hamburger menu button for small screens */}
132-
<div className="md:hidden flex items-center">
133-
<button
134-
onClick={() => setMenuOpen(!isMenuOpen)}
135-
className={`px-2 lg:hidden dark:text-white dark:hover:text-primary text-secondary hover:text-primary transition-all duration-300 focus:outline-none ${
136-
isMenuOpen ? "hidden" : "closed"
137-
}`}
138-
>
139-
<Menu size={32} />
140-
</button>
131+
132+
<div className="md:hidden flex justify-end items-center">
133+
<div className="mr-2">
134+
<ThemeButton iconSize={18} />
135+
</div>
136+
<div className="flex">
137+
<button
138+
onClick={() => setMenuOpen(!isMenuOpen)}
139+
className={`px-2 lg:hidden dark:text-white dark:hover:text-primary text-secondary hover:text-primary transition-all duration-300 focus:outline-none ${
140+
isMenuOpen ? "hidden" : "closed"
141+
}`}
142+
>
143+
<Menu size={32} />
144+
</button>
145+
</div>
141146
</div>
142147

143148
<div className="hidden md:flex gap-2 flex-row items-center">
@@ -198,51 +203,44 @@ const Navbar = ({ starCount }: { starCount?: number }) => {
198203

199204
{/* Mobile menu */}
200205
{isMenuOpen && (
201-
<div className="bg-secondary-light bg-opacity-25 dark:bg-primary-light dark:bg-opacity-25 h-full z-10 w-1/2 fixed inset-y-0 right-0 md:hidden transition-transform duration-300">
206+
<div className="bg-secondary-light backdrop-blur-sm bg-opacity-60 dark:bg-primary-light dark:bg-opacity-60 h-[100vh] z-50 w-1/2 fixed inset-y-0 right-0 md:hidden transition-transform duration-300">
202207
<button
203208
onClick={() => setMenuOpen(!isMenuOpen)}
204-
className={`absolute right-2 top-6 dark:text-white dark:hover:text-primary focus:outline-none ${
209+
className={`absolute right-2 top-6 text-white dark:hover:text-primary focus:outline-none ${
205210
isMenuOpen ? "open" : "closed"
206-
} text-gray-600 hover:text-primary lg:hidden`}
211+
} hover:text-primary lg:hidden`}
207212
>
208213
<X size={32} />
209214
</button>
210215

211-
<div className="grid grid-cols-1 gap-10 mt-24">
212-
<div className="text-center">
213-
<ThemeButton iconSize={24} />
214-
</div>
215-
216+
<div className="grid grid-cols-1 gap-4 mt-24 backdrop-blur-sm ">
216217
<Link
217218
href="https://github.com/Sanchitbajaj02/palettegram"
218219
target="_blank"
219220
rel="noopener noreferrer"
220-
className="flex items-center text-sm mx-2 px-10 py-2 rounded-full bg-primary text-white"
221+
className="flex items-center text-sm mx-2 px-10 py-2 rounded-full bg-primary text-white hover:border-2 hover:bg-transparent"
221222
>
222223
<Github size={20} className="mr-4" /> {starCount} Stars
223224
</Link>
224225

225-
{userAuth && userAuth.data?.$id && (
226-
<>
227-
<Link
228-
href="/register"
229-
className="inline-block mx-2 px-6 py-2 text-sm rounded-full text-white bg-primary text-center"
230-
>
231-
Register
232-
</Link>
226+
<Link
227+
href="/register"
228+
className="inline-block mx-2 px-6 py-2 text-sm rounded-full text-white bg-primary text-center hover:border-2 hover:bg-transparent "
229+
>
230+
Register
231+
</Link>
232+
233+
<Link
234+
href="/login"
235+
className="inline-block mx-2 px-6 py-2 text-sm rounded-full text-white bg-primary text-center hover:border-2 hover:bg-transparent"
236+
>
237+
Login
238+
</Link>
233239

234-
<Link
235-
href="/login"
236-
className="inline-block mx-2 px-6 py-2 text-sm rounded-full text-white bg-primary text-center"
237-
>
238-
Login
239-
</Link>
240-
</>
241-
)}
242240
{userAuth && userAuth.data?.$id && (
243241
<Link
244242
href={`/user/${userAuth.data?.$id}`}
245-
className="mx-2 px-2 py-2 rounded-full bg-primary text-white"
243+
className="mx-2 px-2 py-2 rounded-full bg-primary hover text-white "
246244
>
247245
<User size={22} className="transition-all duration-300 " />
248246
</Link>

src/components/core/themeButton/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ export default function ThemeButton({ iconSize }: { iconSize: number }) {
2828
<>
2929
{theme === "dark" ? (
3030
<button
31-
className="px-2 py-2 md:flex fixed md:static block md:top-0 md:m-0 top-1 m-2 rounded-full hover:bg-primary-light hover:scale-105 bg-primary text-white"
31+
className="px-2 py-2 md:flex rounded-full hover:bg-primary-light hover:scale-105 bg-primary text-white"
3232
onClick={() => setTheme("light")}
3333
>
3434
<Sun size={iconSize} cursor="pointer" className="transition-all duration-300" />
3535
<span className="sr-only">theme button</span>
3636
</button>
3737
) : (
3838
<button
39-
className="px-2 py-2 md:flex fixed md:static block md:top-0 md:m-0 top-1 m-2 rounded-full hover:bg-primary-light hover:scale-105 bg-primary text-white"
39+
className="px-2 py-2 md:flex rounded-full hover:bg-primary-light hover:scale-105 bg-primary text-white"
4040
onClick={() => setTheme("dark")}
4141
>
4242
<Moon size={iconSize} cursor="pointer" className="transition-all duration-300" />

yarn.lock

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384

385385
"@img/sharp-win32-x64@0.33.1":
386386
version "0.33.1"
387-
resolved "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.1.tgz"
387+
resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.1.tgz#8b56e97dc9d987b070d7530a357161d0f057c5af"
388388
integrity sha512-XaM69X0n6kTEsp9tVYYLhXdg7Qj32vYJlAKRutxUsm1UlgQNx6BOhHwZPwukCGXBU2+tH87ip2eV1I/E8MQnZg==
389389

390390
"@isaacs/cliui@^8.0.2":
@@ -588,9 +588,9 @@
588588
postcss-selector-parser "6.0.10"
589589

590590
"@tiptap/core@^2.1.16":
591-
version "2.3.2"
592-
resolved "https://registry.npmjs.org/@tiptap/core/-/core-2.3.2.tgz"
593-
integrity sha512-4sMpzYuxiG+fYMwPRXy+mLRVU315KEqzQUcBc2FEgSsmw9Kionykmkq3DvEco7rH8r0NdV/l9R49wVEtX54VqQ==
591+
version "2.4.0"
592+
resolved "https://registry.npmjs.org/@tiptap/core/-/core-2.4.0.tgz"
593+
integrity sha512-YJSahk8pkxpCs8SflCZfTnJpE7IPyUWIylfgXM2DefjRQa5DZ+c6sNY0s/zbxKYFQ6AuHVX40r9pCfcqHChGxQ==
594594

595595
"@tiptap/extension-blockquote@^2.1.16":
596596
version "2.2.4"
@@ -4782,12 +4782,7 @@ typed-array-length@^1.0.5:
47824782
is-typed-array "^1.1.13"
47834783
possible-typed-array-names "^1.0.0"
47844784

4785-
typescript@5.1.6:
4786-
version "5.1.6"
4787-
resolved "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz"
4788-
integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
4789-
4790-
typescript@^5.4.5:
4785+
typescript@^5.3.3:
47914786
version "5.4.5"
47924787
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
47934788
integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==

0 commit comments

Comments
 (0)