Skip to content

Commit 6de970e

Browse files
authored
Feature/new nav (#47)
* Add new navbar! * Minor design fixes * Fix build errors * Fix more build errors * Fix test errors * Rename NavTab to CircleButton
1 parent d44e00b commit 6de970e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+308
-2030
lines changed

package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
"@chakra-ui/core": "^0.8.0",
77
"@emotion/core": "^10.0.28",
88
"@emotion/styled": "^10.0.27",
9-
"@fortawesome/fontawesome-svg-core": "^1.2.30",
10-
"@fortawesome/free-solid-svg-icons": "^5.14.0",
11-
"@fortawesome/react-fontawesome": "^0.1.11",
129
"@types/react-router-dom": "^5.1.5",
1310
"emotion-theming": "^10.0.27",
1411
"mobx": "^5.15.4",

src/App.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import App from './App'
55

66
test('Renders Rapid header', () => {
77
const { getByText } = render(<App />)
8-
const linkElement = getByText(/Find/i)
9-
expect(linkElement).toBeInTheDocument()
8+
const placeholder = getByText(/Rapid/i)
9+
expect(placeholder).toBeInTheDocument()
1010
})

src/App.tsx

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,7 @@
1-
import { Box } from '@chakra-ui/core'
21
import React, { FunctionComponent } from 'react'
3-
import {
4-
BrowserRouter as Router,
5-
Redirect,
6-
Route,
7-
Switch,
8-
} from 'react-router-dom'
9-
10-
import ThemeX from './components/theme'
11-
import Chat from './pages/Chat'
12-
import Community from './pages/Community'
13-
import Explore from './pages/Explore'
14-
import Users from './pages/Users'
152

163
const App: FunctionComponent = () => {
17-
return (
18-
<div className="app">
19-
<ThemeX>
20-
<Box backgroundColor="#212226">
21-
<Router>
22-
<div>
23-
<Switch>
24-
<Route path="/community">
25-
<Community />
26-
</Route>
27-
<Route path="/users">
28-
<Users />
29-
</Route>
30-
<Route path="/explore">
31-
<Explore />
32-
</Route>
33-
<Route path="/chat">
34-
<Chat />
35-
</Route>
36-
<Route path="/">
37-
<Redirect to="/explore" />
38-
</Route>
39-
</Switch>
40-
</div>
41-
</Router>
42-
</Box>
43-
</ThemeX>
44-
</div>
45-
)
4+
return <div className="App">Rapid</div>
465
}
476

487
export default App

src/components/atoms/FriendSearchBarButton.tsx

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/components/atoms/GroupHeading.tsx

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/components/atoms/IconCall.tsx

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/components/atoms/IconMentions.tsx

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/components/atoms/IconMessage.tsx

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/components/atoms/IconSettings.tsx

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/components/atoms/ImageGrid.tsx

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)