@@ -6,7 +6,7 @@ import { useLocalStorage } from '/src/hooks'
66import { Routes , Route , Navigate , BrowserRouter } from 'react-router-dom'
77
88import WebsocketListener from '/src/websocket'
9- import NavBar from '/src/containers/Navbar '
9+ import MainNavbar from '/src/containers/MainNavbar '
1010import LoginPage from '/src/pages/LoginPage'
1111import LoadingPage from '/src/pages/LoadingPage'
1212import MAMPage from '/src/pages/MAMPage'
@@ -15,14 +15,12 @@ import ServicesPage from '/src/pages/ServicesPage'
1515import ToolPage from '/src/pages/ToolPage'
1616import ProfilePage from '/src/pages/ProfilePage'
1717import UsersPage from '/src/pages/UsersPage'
18- import Dropdown from '/src/components/Dropdown'
1918
2019const App = ( ) => {
2120 const [ accessToken , setAccessToken ] = useLocalStorage ( 'accessToken' , null )
2221 const [ errorCode , setErrorCode ] = useState ( null )
2322 const [ loading , setLoading ] = useState ( true )
2423 const [ initData , setInitData ] = useState ( null )
25- const [ channels , setChannels ] = useState ( [ ] )
2624
2725 // Ensure server connection
2826
@@ -58,28 +56,9 @@ const App = () => {
5856 . finally ( ( ) => setLoading ( false ) )
5957 } , [ accessToken ] )
6058
61- useEffect ( ( ) => {
62- if ( initData ?. settings ?. channels ) {
63- setChannels ( initData . settings . channels )
64- const mostRecentChannel = JSON . parse (
65- localStorage . getItem ( 'currentChannel' )
66- )
67- if ( mostRecentChannel ) {
68- setCurrentChannel ( mostRecentChannel )
69- } else if ( initData . settings . channels . length > 0 ) {
70- setCurrentChannel ( initData . settings . channels [ 0 ] )
71- }
72- }
73- } , [ initData ] )
74-
75- const handleChannelChange = ( channel ) => {
76- setCurrentChannel ( channel )
77- }
78-
7959 // Render
8060
8161 if ( loading ) return < LoadingPage />
82-
8362 if ( errorCode > 401 ) return < main className = "center" > server unavailable</ main >
8463
8564 if ( ! initData . installed )
@@ -92,7 +71,7 @@ const App = () => {
9271 < Suspense fallback = { < LoadingPage /> } >
9372 < WebsocketListener />
9473 < BrowserRouter >
95- < NavBar />
74+ < MainNavbar />
9675 < Routes >
9776 < Route
9877 path = "/"
0 commit comments