Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/frontv2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Gab committed Feb 5, 2024
2 parents bf9483a + e7cfc2f commit a97afad
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 83 deletions.
11 changes: 11 additions & 0 deletions front/components/ChatWrapper.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Conversation from "./Conversation"

const ChatWrapper = () => {
return (
<div className="relative">
<Conversation/>
</div>
)
}

export default ChatWrapper
10 changes: 10 additions & 0 deletions front/components/Conversation.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

const Conversation = () => {
return (
<div className='absolute w-[320px] h-screen left-0 top-0 bottom-0 bg bg-[#1F1D1D]'>

</div>
)
}

export default Conversation
Binary file added front/public/images/bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions front/src/app/about/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react'

const page = () => {
return (
<div>About</div>
)
}

export default page
21 changes: 0 additions & 21 deletions front/src/app/component/Loading.module.css

This file was deleted.

14 changes: 0 additions & 14 deletions front/src/app/component/loading.tsx

This file was deleted.

9 changes: 9 additions & 0 deletions front/src/app/contact/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react'

const page = () => {
return (
<div>Contact</div>
)
}

export default page
33 changes: 13 additions & 20 deletions front/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
import type { Metadata } from "next";
import type { ReactNode } from "react";
import { Inter } from "next/font/google";
import "./globals.css";
import styles from "./Layout.module.css";

const inter = Inter({ subsets: ["latin"] });
import type { Metadata } from 'next'
import './globals.css'

export const metadata: Metadata = {
title: "Create Next App",
description: "Generated by create next app",
};
title: 'Real time Chat',
description: 'Real time chat application',
}

const RootLayout: React.FC<{ children?: ReactNode }> = ({ children }) => {
export default function RootLayout({
children,
}: {
children: React.ReactNode
}) {
return (
<html lang="en">
<head>
<title>SITE ELG</title>
{}
</head>
<body className={inter.className}>{children}</body>
<body className='bg-[url("/images/bg.jpg")] min-h-screen bg-cover bg-no-repeat bg-[#050505AB] bg-blend-overlay'>{children}</body>
</html>
);
};

export default RootLayout;
)
}
34 changes: 6 additions & 28 deletions front/src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
"use client"
import React, {useState, useEffect} from 'react'
import Link from "next/link";
import Loading from './component/loading'
import ChatWrapper from "../../components/ChatWrapper";

const Home = () => {
const [loading, setLoading] = useState(true);

useEffect(() => {

setTimeout(() => {
setLoading(true);
}, 3000);
}, []);

return (
<main>
{loading ? (
<Loading />
) : (
<>

</>
)}
</main>
);
};

export default Home;
export default function Home(){
return(
<ChatWrapper/>
)
}

0 comments on commit a97afad

Please sign in to comment.