Skip to content

Commit

Permalink
Merge pull request #41 from tanish35/master
Browse files Browse the repository at this point in the history
Minor change
  • Loading branch information
tanish35 authored Aug 3, 2024
2 parents 97353be + 0939594 commit 11f4881
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 115 deletions.
23 changes: 9 additions & 14 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,17 @@ import React, { useState } from "react";
import { BrowserRouter, Routes, Route } from "react-router-dom";
import { chatRoomApi } from "./components/contexts/chatRoomApi";
import { RouterProvider } from "react-router-dom";
import Mainrouter from "./components/routes/mainroute"
import Mainrouter from "./components/routes/mainroute";


const App = ()=>{
const [user1,setUser1] = useState("");
const [user2,setUser2] = useState("");
const [roomId,setRoomId] = useState("");
const App = () => {
const [user1, setUser1] = useState("");
const [user2, setUser2] = useState("");
const [roomId, setRoomId] = useState("");
return (

<ChakraProvider>
<RouterProvider
router = {Mainrouter}
/>
<RouterProvider router={Mainrouter} />
</ChakraProvider>
)

}
);
};

export default App;
export default App;
Binary file removed frontend2/public/favicon.ico
Binary file not shown.
Binary file removed frontend2/public/logo192.png
Binary file not shown.
Binary file removed frontend2/public/logo512.png
Binary file not shown.
25 changes: 0 additions & 25 deletions frontend2/public/manifest.json

This file was deleted.

38 changes: 0 additions & 38 deletions frontend2/src/App.css

This file was deleted.

19 changes: 8 additions & 11 deletions frontend2/src/App.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import logo from './logo.svg';
import './App.css';

import React from 'react';
import Header from './Components/Header';
import Discover from './Components/Discover';
import Services from './Components/Services';
import Explore from './Components/Explore';
import Testimonials from './Components/Testimonials';
import Footer from './Components/Footer';
import './styles.css';
import React from "react";
import Header from "./Components/Header";
import Discover from "./Components/Discover";
import Services from "./Components/Services";
import Explore from "./Components/Explore";
import Testimonials from "./Components/Testimonials";
import Footer from "./Components/Footer";
import "./styles.css";

function App() {
return (
Expand Down
8 changes: 0 additions & 8 deletions frontend2/src/App.test.js

This file was deleted.

1 change: 0 additions & 1 deletion frontend2/src/logo.svg

This file was deleted.

13 changes: 0 additions & 13 deletions frontend2/src/reportWebVitals.js

This file was deleted.

5 changes: 0 additions & 5 deletions frontend2/src/setupTests.js

This file was deleted.

0 comments on commit 11f4881

Please sign in to comment.