Skip to content

Commit 364496d

Browse files
Mohamed-AlHabobMohamed-AlHabob
committed
update all
1 parent fc75b95 commit 364496d

28 files changed

+395
-411
lines changed

‎app/(auth)/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default function RootLayout({
2525
}}
2626
>
2727
<html lang='en'>
28-
<body className={`${inter.className} bg-dark-1`}>{children}</body>
28+
<body className={`${inter.className}`}>{children}</body>
2929
</html>
3030
</ClerkProvider>
3131
);

‎app/(auth)/onboarding/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async function Page() {
2424
<main className='mx-auto flex max-w-3xl flex-col justify-start px-10 py-20'>
2525
<h1 className='head-text'>Onboarding</h1>
2626
<p className='mt-3 text-base-regular text-light-2'>
27-
Complete your profile now, to use Threds.
27+
Complete your profile now, to use PainFX.
2828
</p>
2929

3030
<section className='mt-9 bg-dark-2 p-10'>

‎app/(root)/communities/[id]/page.tsx renamed to ‎app/(root)/Sessions/[id]/page.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,15 @@ async function Page({ params }: { params: { id: string } }) {
2525
username={communityDetails.username}
2626
imgUrl={communityDetails.image}
2727
bio={communityDetails.bio}
28-
type='Community'
28+
type='Sessions'
2929
/>
3030

3131
<div className='mt-9'>
3232
<Tabs defaultValue='threads' className='w-full'>
3333
<TabsList className='tab'>
3434
{communityTabs.map((tab) => (
3535
<TabsTrigger key={tab.label} value={tab.value} className='tab'>
36-
<Image
37-
src={tab.icon}
38-
alt={tab.label}
39-
width={24}
40-
height={24}
41-
className='object-contain'
42-
/>
36+
{tab.icon}
4337
<p className='max-sm:hidden'>{tab.label}</p>
4438

4539
{tab.label === "Threads" && (

‎app/(root)/communities/page.tsx renamed to ‎app/(root)/Sessions/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ async function Page({
2727

2828
return (
2929
<>
30-
<h1 className='head-text'>Communities</h1>
30+
<h1 className='head-text'>Sessions</h1>
3131

3232
<div className='mt-5'>
33-
<Searchbar routeType='communities' />
33+
<Searchbar routeType='Sessions' />
3434
</div>
3535

3636
<section className='mt-9 flex flex-wrap gap-4'>
@@ -54,7 +54,7 @@ async function Page({
5454
</section>
5555

5656
<Pagination
57-
path='communities'
57+
path='Sessions'
5858
pageNumber={searchParams?.page ? +searchParams.page : 1}
5959
isNext={result.isNext}
6060
/>

‎app/(root)/activity/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async function Page() {
3535
<span className='mr-1 text-primary-500'>
3636
{activity.author.name}
3737
</span>{" "}
38-
replied to your thread
38+
replied to your Info
3939
</p>
4040
</article>
4141
</Link>

‎app/(root)/create-thread/page.tsx renamed to ‎app/(root)/create-info/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ async function Page() {
1414

1515
return (
1616
<>
17-
<h1 className='head-text'>Create Thread</h1>
17+
<h1 className='head-text'>Create Info</h1>
1818

1919
<PostThread userId={userInfo._id} />
2020
</>

‎app/(root)/layout.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import LeftSidebar from "@/components/shared/LeftSidebar";
99
import Bottombar from "@/components/shared/Bottombar";
1010
import RightSidebar from "@/components/shared/RightSidebar";
1111
import Topbar from "@/components/shared/Topbar";
12+
import { ThemeProvider } from "@/components/providers/theme-provider";
1213

1314
const inter = Inter({ subsets: ["latin"] });
1415

1516
export const metadata: Metadata = {
16-
title: "Threads",
17-
description: "A Next.js 13 Meta Threads application",
17+
title: "PainFX",
18+
description: "A Next.js 13 PainFX application",
1819
};
1920

2021
export default function RootLayout({
@@ -30,8 +31,8 @@ export default function RootLayout({
3031
>
3132
<html lang='en'>
3233
<body className={inter.className}>
34+
<ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
3335
<Topbar />
34-
3536
<main className='flex flex-row'>
3637
<LeftSidebar />
3738
<section className='main-container'>
@@ -42,6 +43,7 @@ export default function RootLayout({
4243
</main>
4344

4445
<Bottombar />
46+
</ThemeProvider>
4547
</body>
4648
</html>
4749
</ClerkProvider>

‎app/(root)/profile/[id]/page.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,7 @@ async function Page({ params }: { params: { id: string } }) {
3333
<TabsList className='tab'>
3434
{profileTabs.map((tab) => (
3535
<TabsTrigger key={tab.label} value={tab.value} className='tab'>
36-
<Image
37-
src={tab.icon}
38-
alt={tab.label}
39-
width={24}
40-
height={24}
41-
className='object-contain'
42-
/>
36+
{tab.icon}
4337
<p className='max-sm:hidden'>{tab.label}</p>
4438

4539
{tab.label === "Threads" && (

‎app/globals.css

Lines changed: 75 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,80 +2,133 @@
22
@tailwind components;
33
@tailwind utilities;
44

5+
6+
7+
8+
9+
@layer base {
10+
:root {
11+
--background: 0 0% 100%;
12+
--foreground: 240 10% 3.9%;
13+
--card: 0 0% 100%;
14+
--card-foreground: 240 10% 3.9%;
15+
--popover: 0 0% 100%;
16+
--popover-foreground: 240 10% 3.9%;
17+
--primary: 240 5.9% 10%;
18+
--primary-foreground: 0 0% 98%;
19+
--secondary: 240 4.8% 95.9%;
20+
--secondary-foreground: 240 5.9% 10%;
21+
--muted: 240 4.8% 95.9%;
22+
--muted-foreground: 240 3.8% 46.1%;
23+
--accent: 240 4.8% 95.9%;
24+
--accent-foreground: 240 5.9% 10%;
25+
--destructive: 0 84.2% 60.2%;
26+
--destructive-foreground: 0 0% 98%;
27+
--border: 240 5.9% 90%;
28+
--input: 240 5.9% 90%;
29+
--ring: 240 5.9% 10%;
30+
--radius: 0.5rem;
31+
}
32+
33+
.dark {
34+
--background: 240 10% 3.9%;
35+
--foreground: 0 0% 98%;
36+
--card: 240 10% 3.9%;
37+
--card-foreground: 0 0% 98%;
38+
--popover: 240 10% 3.9%;
39+
--popover-foreground: 0 0% 98%;
40+
--primary: 0 0% 98%;
41+
--primary-foreground: 240 5.9% 10%;
42+
--secondary: 240 3.7% 15.9%;
43+
--secondary-foreground: 0 0% 98%;
44+
--muted: 240 3.7% 15.9%;
45+
--muted-foreground: 240 5% 64.9%;
46+
--accent: 240 3.7% 15.9%;
47+
--accent-foreground: 0 0% 98%;
48+
--destructive: 0 62.8% 30.6%;
49+
--destructive-foreground: 0 0% 98%;
50+
--border: 240 3.7% 15.9%;
51+
--input: 240 3.7% 15.9%;
52+
--ring: 240 4.9% 83.9%;
53+
}
54+
}
55+
56+
57+
558
@layer components {
659
/* main */
760
.main-container {
8-
@apply flex min-h-screen flex-1 flex-col items-center bg-dark-1 px-6 pb-10 pt-28 max-md:pb-32 sm:px-10;
61+
@apply flex min-h-screen flex-1 flex-col items-center px-6 pb-10 pt-28 max-md:pb-32 sm:px-10;
962
}
1063

1164
/* Head Text */
1265
.head-text {
13-
@apply text-heading2-bold text-light-1;
66+
@apply text-heading2-bold ;
1467
}
1568

1669
/* Activity */
1770
.activity-card {
18-
@apply flex items-center gap-2 rounded-md bg-dark-2 px-7 py-4;
71+
@apply flex items-center gap-2 rounded-md px-7 py-4;
1972
}
2073

2174
/* No Result */
2275
.no-result {
23-
@apply text-center !text-base-regular text-light-3;
76+
@apply text-center ;
2477
}
2578

2679
/* Community Card */
2780
.community-card {
28-
@apply w-full rounded-lg bg-dark-3 px-4 py-5 sm:w-96;
81+
@apply w-full rounded-lg px-4 py-5 sm:w-96;
2982
}
3083

3184
.community-card_btn {
32-
@apply rounded-lg bg-primary-500 px-5 py-1.5 text-small-regular !text-light-1 !important;
85+
@apply rounded-lg px-5 py-1.5 text-small-regular !important;
3386
}
3487

3588
/* thread card */
3689
.thread-card_bar {
37-
@apply relative mt-2 w-0.5 grow rounded-full bg-neutral-800;
90+
@apply relative mt-1 w-0.5 grow rounded-full bg-neutral-500;
3891
}
3992

4093
/* User card */
4194
.user-card {
42-
@apply flex flex-col justify-between gap-4 max-xs:rounded-xl max-xs:bg-dark-3 max-xs:p-4 xs:flex-row xs:items-center;
95+
@apply flex flex-col justify-between gap-4;
4396
}
4497

4598
.user-card_avatar {
46-
@apply flex flex-1 items-start justify-start gap-3 xs:items-center;
99+
@apply flex flex-1 items-start justify-start gap-3;
47100
}
48101

49102
.user-card_btn {
50-
@apply h-auto min-w-[74px] rounded-lg bg-primary-500 text-[12px] text-light-1 !important;
103+
@apply h-auto min-w-[74px] rounded-lg text-[12px] !important;
51104
}
52105

53106
.searchbar {
54-
@apply flex gap-1 rounded-lg bg-dark-3 px-4 py-2;
107+
@apply flex gap-1 rounded-lg px-4 py-2;
55108
}
56109

57110
.searchbar_input {
58-
@apply border-none bg-dark-3 text-base-regular text-light-4 outline-none !important;
111+
@apply border-none text-base-regular outline-none !important;
59112
}
60113

61114
.topbar {
62-
@apply fixed top-0 z-30 flex w-full items-center justify-between bg-dark-2 px-6 py-3;
115+
@apply fixed top-0 z-30 flex w-full items-center justify-between px-6 py-3;
63116
}
64117

65118
.bottombar {
66-
@apply fixed bottom-0 z-10 w-full rounded-t-3xl bg-glassmorphism p-4 backdrop-blur-lg xs:px-7 md:hidden;
119+
@apply fixed bottom-0 z-10 w-full rounded-t-3xl p-4 backdrop-blur-lg md:hidden;
67120
}
68121

69122
.bottombar_container {
70-
@apply flex items-center justify-between gap-3 xs:gap-5;
123+
@apply flex items-center justify-between gap-3;
71124
}
72125

73126
.bottombar_link {
74127
@apply relative flex flex-col items-center gap-2 rounded-lg p-2 sm:flex-1 sm:px-2 sm:py-2.5;
75128
}
76129

77130
.leftsidebar {
78-
@apply sticky left-0 top-0 z-20 flex h-screen w-fit flex-col justify-between overflow-auto border-r border-r-dark-4 bg-dark-2 pb-5 pt-28 max-md:hidden;
131+
@apply sticky left-0 top-0 z-20 flex h-screen w-fit flex-col justify-between overflow-auto pb-5 pt-28 max-md:hidden;
79132
}
80133

81134
.leftsidebar_link {
@@ -87,7 +140,7 @@
87140
}
88141

89142
.rightsidebar {
90-
@apply sticky right-0 top-0 z-20 flex h-screen w-fit flex-col justify-between gap-12 overflow-auto border-l border-l-dark-4 bg-dark-2 px-10 pb-6 pt-28 max-xl:hidden;
143+
@apply sticky right-0 top-0 z-20 flex h-screen w-fit flex-col justify-between gap-12 overflow-auto px-10 pb-6 pt-28 max-xl:hidden;
91144
}
92145
}
93146

@@ -131,7 +184,7 @@
131184

132185
/* Tab */
133186
.tab {
134-
@apply flex min-h-[50px] flex-1 items-center gap-3 bg-dark-2 text-light-2 data-[state=active]:bg-[#0e0e12] data-[state=active]:text-light-2 !important;
187+
@apply flex min-h-[50px] flex-1 items-center gap-3;
135188
}
136189

137190
.no-focus {
@@ -140,22 +193,19 @@
140193

141194
/* Account Profile */
142195
.account-form_image-label {
143-
@apply flex h-24 w-24 items-center justify-center rounded-full bg-dark-4 !important;
196+
@apply flex h-24 w-24 items-center justify-center rounded-full !important;
144197
}
145198

146199
.account-form_image-input {
147-
@apply cursor-pointer border-none bg-transparent outline-none file:text-blue !important;
200+
@apply cursor-pointer border-none bg-transparent outline-none !important;
148201
}
149202

150-
.account-form_input {
151-
@apply border border-dark-4 bg-dark-3 text-light-1 !important;
152-
}
153203

154204
/* Comment Form */
155205
.comment-form {
156-
@apply mt-10 flex items-center gap-4 border-y border-y-dark-4 py-5 max-xs:flex-col !important;
206+
@apply mt-10 flex items-center gap-4 !important;
157207
}
158208

159209
.comment-form_btn {
160-
@apply rounded-3xl bg-primary-500 px-8 py-2 !text-small-regular text-light-1 max-xs:w-full !important;
210+
@apply rounded-3xl px-8 py-2 !text-small-regular !important;
161211
}

‎components/action-tooltip.tsx

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎components/cards/CommunityCard.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function CommunityCard({ id, name, username, imgUrl, bio, members }: Props) {
2929

3030
<div>
3131
<Link href={`/communities/${id}`}>
32-
<h4 className='text-base-semibold text-light-1'>{name}</h4>
32+
<h4 className='text-base-semibold'>{name}</h4>
3333
</Link>
3434
<p className='text-small-medium text-gray-1'>@{username}</p>
3535
</div>
@@ -59,7 +59,7 @@ function CommunityCard({ id, name, username, imgUrl, bio, members }: Props) {
5959
/>
6060
))}
6161
{members.length > 3 && (
62-
<p className='ml-1 text-subtle-medium text-gray-1'>
62+
<p className='ml-1 text-subtle-medium'>
6363
{members.length}+ Users
6464
</p>
6565
)}

0 commit comments

Comments
 (0)