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

Feature/UI hanzla #6

Merged
merged 9 commits into from
Dec 6, 2024
Merged
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
31 changes: 31 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"date-fns": "^3.6.0",
"dotenv": "^16.4.5",
"drizzle-orm": "^0.36.4",
"embla-carousel-react": "^8.5.1",
"lucide-react": "^0.462.0",
"next": "14.2.16",
"react": "^18",
Expand Down
Binary file added public/Mentor-image1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Mentor-image2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Mentor-image3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/graphic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/hearticon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/java.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/js.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/js1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/mentor-image4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/next.logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/next.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/node.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/session-image1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/session-image2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/session-image3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/session-image4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/ux.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 0 additions & 24 deletions src/app/(home)/home-layout.css

This file was deleted.

21 changes: 16 additions & 5 deletions src/app/(home)/home.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
.hero{
@apply w-full flex h-screen items-center justify-center;
background-image: linear-gradient(120deg, #a1c4fd 0%, #c2e9fb 100%);
@apply w-full h-screen bg-home-secondary
}
.content{
@apply w-5/12 flex flex-col gap-8
@apply w-full text-center md:text-left md:w-5/12 flex flex-col gap-8
}
.Main-Heading{
@apply text-[44px] font-bold
@apply text-4xl md:text-[44px] font-bold
}
.avatars{
@apply w-1/2 relative
@apply w-1/2 hidden md:block
}
.section-content-wrapper{
@apply flex flex-wrap mt-10
}
.section-button{
@apply text-center mt-8
}
.carousel-content{
@apply lg:gap-8 pl-8
}
.section-card{
@apply flex flex-wrap mt-10 justify-around md:justify-between gap-4
}
56 changes: 8 additions & 48 deletions src/app/(home)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,57 +1,17 @@
import Link from 'next/link'
import Footer from '@/src/components/HomeLayoutComponents/FooterComponent'
import Header from '@/src/components/HomeLayoutComponents/HeaderComponent'
import React, { ReactNode } from 'react'
import './home-layout.css'
import { LinkAsButton } from '@/src/components/LinkAsButton/LinkAsButton'
import { SignedIn, SignedOut, UserButton } from '@clerk/nextjs'

const PublicLayout = ({ children }: { children: ReactNode }) => {
return (
<>
<div className="header">


<div className='header-nav'>

<Link className='nav-brand' href="#">Spark</Link>

<ul className='nav'>
<li className='nav-items'>
<Link className='nav-link' href="/dashboard">
Dashboard</Link>
</li>
<li className='nav-items'>
<Link className='nav-link' href="#">
Find a Mentor</Link>
</li>
<li className='nav-items'>
<Link className='nav-link' href="#">
About Us</Link>
</li>
<li className='nav-items'>
<Link className='nav-link' href="#">
Pricing</Link>
</li>
<li className='nav-items'>
<Link className='nav-link' href="#">
Become a Member</Link>
</li>
</ul>
</div>

<div className="button-wrapper">
<SignedIn>
<UserButton userProfileUrl='/profile'/>
</SignedIn>
<SignedOut>
<LinkAsButton href='/sign-up' className='button' variant={'ghost'}>Sign Up</LinkAsButton>
<LinkAsButton href='/sign-in' variant={'default'}>Log In</LinkAsButton>
</SignedOut>
</div>

</div>

const PublicLayout = ({ children }: { children: ReactNode }) => {
return (
<>
<Header />
{children}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a content wrapper class around children

<div>footer</div>
<Footer />

</>
)
}
Expand Down
Loading