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.

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

Closes #166 #170

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "OTP" ALTER COLUMN "expiresAt" SET DEFAULT CURRENT_TIMESTAMP + interval '10 minutes';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "OTP" ALTER COLUMN "expiresAt" SET DEFAULT CURRENT_TIMESTAMP + interval '10 minutes';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "OTP" ALTER COLUMN "expiresAt" SET DEFAULT CURRENT_TIMESTAMP + interval '10 minutes';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "OTP" ALTER COLUMN "expiresAt" SET DEFAULT CURRENT_TIMESTAMP + interval '10 minutes';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "OTP" ALTER COLUMN "expiresAt" SET DEFAULT CURRENT_TIMESTAMP + interval '10 minutes';
4 changes: 2 additions & 2 deletions apps/frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Hiring from "./components/hiring/Hired";
import Not_Found from "./components/not found/Not_Found";
import HelpRequest from "./components/help request/HelpRequest";
import ServiceP from "./components/serviceP/ServiceP";
import Component from "./components/marketplace/Card";
import MarketPlace from "./components/marketplace/Card";


function App() {
Expand All @@ -43,7 +43,7 @@ function App() {
<Route path="/hiring" element= {isProfileComplete ? <Hiring/> : <Navigate to="/profile" /> } />
<Route path="/help-request" element={isProfileComplete ? <HelpRequest /> : <Navigate to="/profile" /> } />
<Route path="/services" element={isProfileComplete ? <ServiceP/> : <Navigate to="/profile" /> }/>
<Route path="/market-place" element={<Component/> }/>
<Route path="/market-place" element={<MarketPlace/> }/>
<Route path="*" element={<Not_Found />} />
</Routes>
</ThemeProvider>
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/feed/Feed-post.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function FeedPost() {

return (

<div className="mt-[4rem] mb-8 lg:mb-auto mx-auto flex items-center justify-center dark:bg-slate-900 lg:fixed lg:right-[12%] xl:right-[6.3%] 2xl:right-[12.4%] top-0 lg:mt-[100px] ">
<div className="mt-[4rem] mb-8 lg:mb-auto mx-auto flex items-center justify-center dark:bg-slate-900 lg:fixed lg:right-[12%] xl:right-[6.3%] 2xl:right-[11.2%] top-0 lg:mt-[100px] ">
<Card className=" rounded-xl dark:bg-slate-900">
<CardContent className="px-[2.9rem] py-4 sm:px-[9rem] sm: lg:py-auto lg:px-auto lg:p-4 md:p-6">
<form className="grid gap-4">
Expand Down
9 changes: 4 additions & 5 deletions apps/frontend/src/components/feed/Feed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ import MainFeed from "./MainFeed"
const Feed = () => {
return (

<div className="flex flex-col-reverse items-start lg:flex-row w-auto lg:w-[80%] mx-auto pt-10 lg:pt-[100px] xl:gap-5 2xl:gap-0 min-h-screen ">

<div className="flex flex-col-reverse items-start lg:flex-row w-auto lg:w-[80%] mx-auto pt-10 lg:pt-[100px] xl:gap-5 2xl:gap-0 min-h-screen">
<AsideLeft />
{/* xl:ml-[23rem] */}
<main className="w-[88%] flex flex-col gap-10 lg:w-[50%] mx-auto ">
<main className="w-[95%] flex flex-col gap-10 lg:w-[45%] mx-auto ">
<MainFeed />
<MainFeed />

<MainFeed />
<MainFeed />
<MainFeed />

<MainFeed />
Expand All @@ -29,4 +28,4 @@ const Feed = () => {
)
}

export default Feed
export default Feed;
2 changes: 1 addition & 1 deletion apps/frontend/src/components/marketplace/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function Cart({ cart, onRemoveFromCart }: CartProps) {
);
}

export default function Component() {
export default function MarketPlace() {
const [searchTerm] = useState<string>('');
const [cart, setCart] = useState<Item[]>([]);
const [searchQuery, setSearchQuery] = useState('');
Expand Down
Loading