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.

Sign up for GitHub

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

Delete chat room #71

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Delete chat room #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c3e1ed
initial changes made in delete contact
Jhanvi528 Feb 5, 2022
4f8c5d6
Adding files after navigate
Jhanvi528 Feb 8, 2022
31ef31a
Update App.js
Jhanvi528 Feb 9, 2022
1034680
Update ChatHomePage.js
Jhanvi528 Feb 9, 2022
cce9ad8
Update SidebarChat.js
Jhanvi528 Feb 9, 2022
7a57dcc
Update SidebarChat.js
Jhanvi528 Feb 9, 2022
7c9339b
Update SidebarChat.js
Jhanvi528 Feb 9, 2022
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
50,184 changes: 46,895 additions & 3,289 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
"@testing-library/user-event": "^12.1.10",
"emoji-mart": "^3.0.1",
"firebase": "^8.6.5",
"firebase-tools": "^10.1.4",
"material-ui-dropzone": "^3.5.0",
"react": "^17.0.2",
"react-clear-cache": "^1.4.12",
"react-dom": "^17.0.2",
"react-router-dom": "^5.2.0",
"react-router-dom": "^6.2.1",
"react-scripts": "4.0.3",
"web-vitals": "^1.0.1"
},
Expand Down
1 change: 1 addition & 0 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
height: 90vh;
width: 90vw;
box-shadow: -1px 4px 20px -6px rgba(0, 0, 0, 0.75);

}
44 changes: 21 additions & 23 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
import './App.css';
import React from 'react';
import Sidebar from './Sidebar';
import Chat from './Chat';
import Login from './Login';
import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
import { useStateValue } from './StateProvider';
import './App.css'
import React from 'react'
import Sidebar from './Sidebar'
import Chat from './Chat'
import Login from './Login'
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom'
import { useStateValue } from './StateProvider'
import ChatHomePage from './ChatHomePage'


function App() {
const [{ user }] = useStateValue();
function App () {
const [{ user }] = useStateValue()

return (
<div className="app">
<div className='app'>
{!user ? (
<Login />
) : (
<div className="app__body">
<div className='app__body'>
<Router>
<Sidebar />
<Switch>
<Route path="/rooms/:roomId">
<Chat />
</Route>
<Route path="/">
<Chat />
</Route>
</Switch>
<Routes>
<Route exact path='/' element={<ChatHomePage />}></Route>

<Route path='/rooms/:roomId' element={<Chat />}></Route>

</Routes>
</Router>
</div>
)}

</div>
);
)
}

export default App;
export default App
Loading