Toggle navigation
Toggle navigation
This project
Loading...
Sign in
황선혁
/
weather_chatbot
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Eric Whale
2022-05-20 19:46:03 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
5c28eb8605e76b1e2a5b5573d0d7df4a0d13f8ca
5c28eb86
1 parent
6a96fefb
Edit routes
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
28 deletions
client/src/App.js
client/src/components/Bottombar.jsx
client/src/components/Topbar.jsx
client/src/index.js
client/src/routes/chatroom.jsx
client/src/styles/chatroom.scss
client/src/App.js
View file @
5c28eb8
// components
import
{
Outlet
,
useLocation
}
from
"react-router-dom"
;
// components
import
Bottombar
from
"./components/Bottombar"
;
import
Topbar
from
"./components/Topbar"
;
...
...
@@ -12,11 +12,7 @@ function App() {
}
return
(
<
div
>
<
h1
>
Notification
<
/h1
>
<
p
>
temporal
use
when
first
logged
in
<
/p
>
<
p
>
If
user
wants
to
use
notifications
after
moving
to
another
page
<
/p
>
<
p
>
the
notification
will
be
in
settings
page
<
/p
>
<
h1
>
chatroom
<
/h1
>
<
/div
>
);
};
...
...
client/src/components/Bottombar.jsx
View file @
5c28eb8
...
...
@@ -6,7 +6,7 @@ function Bottombar() {
return
(
<
div
className=
"bottombar"
>
<
nav
>
<
NavLink
to=
"/
chatroom
"
>
Chatroom
</
NavLink
>
|
{
" "
}
<
NavLink
to=
"/"
>
Chatroom
</
NavLink
>
|
{
" "
}
<
NavLink
to=
"/userroom"
>
Userroom
</
NavLink
>
</
nav
>
</
div
>
...
...
client/src/components/Topbar.jsx
View file @
5c28eb8
...
...
@@ -5,7 +5,7 @@ import "../styles/bar.scss";
function
Topbar
()
{
return
(
<
div
className=
"topbar"
>
<
Link
to=
"/
chatroom
"
>
LOGO
</
Link
>
<
Link
to=
"/"
>
LOGO
</
Link
>
<
div
>
Search Bar
</
div
>
<
Link
to=
"/settings"
>
Settings
</
Link
>
</
div
>
...
...
client/src/index.js
View file @
5c28eb8
...
...
@@ -6,7 +6,6 @@ import App from "./App";
// routes
import
Signup
from
"./routes/signup"
;
import
Login
from
"./routes/login"
;
import
Chatroom
from
"./routes/chatroom"
;
import
Userroom
from
"./routes/userroom"
;
import
Settings
from
"./routes/settings"
;
...
...
@@ -16,7 +15,6 @@ root.render(
<
BrowserRouter
>
<
Routes
>
<
Route
path
=
"/"
element
=
{
<
App
/>
}
>
<
Route
path
=
"/chatroom"
element
=
{
<
Chatroom
/>
}
/
>
<
Route
path
=
"/userroom"
element
=
{
<
Userroom
/>
}
/
>
<
Route
path
=
"/settings"
element
=
{
<
Settings
/>
}
/
>
<
/Route
>
...
...
client/src/routes/chatroom.jsx
deleted
100644 → 0
View file @
6a96fef
// styles
import
"../styles/chatroom.scss"
;
function
Chatroom
()
{
return
(
<
div
className=
"chatroom"
>
<
h1
>
Chatroom page
</
h1
>
</
div
>
);
}
export
default
Chatroom
;
client/src/styles/chatroom.scss
deleted
100644 → 0
View file @
6a96fef
.chatroom
{
margin
:
0
;
padding
:
0
;
display
:
flex
;
flex-direction
:
column
;
}
Please
register
or
login
to post a comment