diff --git a/src/app/(withLayout)/layout.tsx b/src/app/(withLayout)/layout.tsx
index eecf5b01..b04c8c34 100644
--- a/src/app/(withLayout)/layout.tsx
+++ b/src/app/(withLayout)/layout.tsx
@@ -1,6 +1,47 @@
+import UpcomingEvent from '@/components/molecules/UpcomingEvent'
import LeftNavbar from '@/components/organisms/LeftNavbar'
+import Recommendations from '@/components/Timeline/Recommendations'
import React, { useState } from 'react'
+const recommendations = [
+ {
+ name: 'Roberta Green',
+ university: 'Nagoya University',
+ affilation: '2nd Yr. Undergraduate, Psychology',
+ avatar: '/timeline/avatar.png',
+ },
+ {
+ name: 'Roberta Green',
+ university: 'Nagoya University',
+ affilation: '2nd Yr. Undergraduate, Psychology',
+ avatar: '/timeline/avatar2.png',
+ },
+ {
+ name: 'Roberta Green',
+ university: 'Nagoya University',
+ affilation: '2nd Yr. Undergraduate, Psychology',
+ avatar: '/timeline/avatar.png',
+ },
+ {
+ name: 'Roberta Green',
+ university: 'Nagoya University',
+ affilation: '2nd Yr. Undergraduate, Psychology',
+ avatar: '/timeline/avatar2.png',
+ },
+ {
+ name: 'Roberta Green',
+ university: 'Nagoya University',
+ affilation: '2nd Yr. Undergraduate, Psychology',
+ avatar: '/timeline/avatar.png',
+ },
+ {
+ name: 'Roberta Green',
+ university: 'Nagoya University',
+ affilation: '2nd Yr. Undergraduate, Psychology',
+ avatar: '/timeline/avatar2.png',
+ },
+]
+
export default function Layout({ children }: { children: React.ReactNode }) {
return (
@@ -10,7 +51,10 @@ export default function Layout({ children }: { children: React.ReactNode }) {
{children}
-
+
+
+
+
)
}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 439cd147..61f7d7ce 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -10,6 +10,7 @@ import Title from '@/components/atoms/Title'
import { FaCheckCircle } from 'react-icons/fa'
import { motion } from 'framer-motion'
import LoginButtons from '@/components/atoms/LoginButtons'
+import Footer from '@/components/Footer/Footer'
export default function LandingPage() {
const contentVariants = {
@@ -175,16 +176,21 @@ export default function LandingPage() {
BECOME A PART OF YOUR UNIVERSITY
-
Create an Account to Get Started
+
+ Create an Account to Get Started
+
-
Search universities worldwide and become part of their online communities
+
+ Search universities worldwide and become part of their online communities{' '}
+
Get Started
Get Started
+
)
}
diff --git a/src/assets/event-image.jpg b/src/assets/event-image.jpg
new file mode 100644
index 00000000..c08949bc
Binary files /dev/null and b/src/assets/event-image.jpg differ
diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx
index 6701b065..5cb5349b 100644
--- a/src/components/Footer/Footer.tsx
+++ b/src/components/Footer/Footer.tsx
@@ -3,10 +3,11 @@ import './Footer.css'
import Image from 'next/image'
import React from 'react'
-import facebook from '@assets/facebook.svg'
-import insta from '@assets/instagram.svg'
-import linkedin from '@assets/linkedin.svg'
-import x from '@assets/X.svg'
+//import facebook from '@assets/facebook.svg'
+//import insta from '@assets/instagram.svg'
+//import linkedin from '@assets/linkedin.svg'
+//import x from '@assets/X.svg'
+import unibuzzLogo from '@assets/unibuzz_logo.svg'
const Footer: React.FC = () => {
const handleRedirect = (platform: number) => {
@@ -36,19 +37,24 @@ const Footer: React.FC = () => {
window.open(url, '_blank')
}
return (
-
+
-
*/}
-
-
Copyright © 2024, Unibuzz Networks
+
+
+
Copyright © 2024, Unibuzz Networks
-
-
handleRedirect(1)}>
+
*/}
diff --git a/src/components/Timeline/Recommendations.tsx b/src/components/Timeline/Recommendations.tsx
index d7187fc2..7656acb7 100644
--- a/src/components/Timeline/Recommendations.tsx
+++ b/src/components/Timeline/Recommendations.tsx
@@ -1,6 +1,7 @@
/* eslint-disable @next/next/no-img-element */
import { cn } from '@/lib/utils'
import React from 'react'
+import LoginButtons from '../atoms/LoginButtons'
interface User {
name: string
@@ -15,9 +16,9 @@ interface Props {
itemStyle?: string
}
-const UserCard = ({ user, buttonStyle, itemStyle }: { user: User; buttonStyle?: string; itemStyle?: string }) => {
+const UserCard = ({ user }: { user: User }) => {
return (
-
+
@@ -26,25 +27,25 @@ const UserCard = ({ user, buttonStyle, itemStyle }: { user: User; buttonStyle?:
{user.affilation}
-
+
+ {/*
+ Following
+ */}
+
+ Follow
+
+
)
}
const Recommendations: React.FC
= ({ people, userItemButtonStyle, containerStyle, itemStyle }) => {
return (
-
-
Recommendations
+
+
Recommendations
{people.map((user) => (
-
+
))}
diff --git a/src/components/atoms/LoginButtons/index.tsx b/src/components/atoms/LoginButtons/index.tsx
index b47574cc..f0e2097a 100644
--- a/src/components/atoms/LoginButtons/index.tsx
+++ b/src/components/atoms/LoginButtons/index.tsx
@@ -3,9 +3,10 @@ import React from 'react'
interface LoginButtonProps extends React.ButtonHTMLAttributes
{
className?: string
variant?: 'primary' | 'secondary' | 'danger' | 'shade' | 'border' | 'border_primary'
+ size?: 'small' | 'medium' | 'large' | 'extra_small'
}
-const LoginButtons: React.FC = ({ className = '', variant = 'primary', children, ...props }) => {
+const LoginButtons: React.FC = ({ className = '', variant = 'primary', size = 'small', children, ...props }) => {
const variantClasses = {
primary: 'bg-primary-500 text-white',
secondary: 'bg-gray-500 text-white',
@@ -14,10 +15,17 @@ const LoginButtons: React.FC = ({ className = '', variant = 'p
danger: 'bg-red-500 text-white',
shade: 'bg-secondary border border-shade-button-border text-primary-500 drop-shadow-sm',
}
+ const variantSizes = {
+ small: 'text-sm py-2 px-4 ',
+ medium: 'text-md py-2 px-4 ',
+ large: 'text-lg py-2 px-4 ',
+ extra_small: 'text-2xs py-1 px-2',
+ }
const variantClass = variantClasses[variant]
+ const variantSize = variantSizes[size]
return (
-