Skip to content
Open

Noc2 #12

Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,6 @@ Direct Message Feature

###### upstream/main
###### main


test test test
38 changes: 31 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"axios": "^0.24.0",
"bootstrap": "^5.1.3",
"dotenv": "^8.2.0",
"express": "^4.18.2",
"react": "^17.0.2",
"react-bootstrap": "^2.0.3",
"react-dom": "^17.0.2",
Expand All @@ -19,7 +20,7 @@
"web-vitals": "^1.1.2"
},
"scripts": {
"start": "react-scripts start",
"start": "react-scripts --openssl-legacy-provider start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
Expand Down
81 changes: 47 additions & 34 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import SignUp from './components/auth/SignUp'
import SignIn from './components/auth/SignIn'
import SignOut from './components/auth/SignOut'
import ChangePassword from './components/auth/ChangePassword'
import Comments from './components/comments/comments'



const App = () => {

Expand Down Expand Up @@ -41,46 +44,56 @@ const App = () => {
}

return (
<Fragment>
<Header user={user} />
<Routes>
<Route path='/' element={<Home msgAlert={msgAlert} user={user} />} />
<Route
path='/sign-up'
element={<SignUp msgAlert={msgAlert} setUser={setUser} />}
/>
<Route
path='/sign-in'
element={<SignIn msgAlert={msgAlert} setUser={setUser} />}
/>
<Route
path='/sign-out'
element={
<RequireAuth user={user}>
<SignOut msgAlert={msgAlert} clearUser={clearUser} user={user} />
</RequireAuth>
}
/>
<Route
path='/change-password'
element={
<RequireAuth user={user}>
<ChangePassword msgAlert={msgAlert} user={user} />
</RequireAuth>}
/>
</Routes>
{msgAlerts.map((msgAlert) => (
<AutoDismissAlert
<div>

<Fragment>
<Header user={user} />
<Routes>
<Route path='/' element={<Home msgAlert={msgAlert} user={user} />} />
<Route
path='/sign-up'
element={<SignUp msgAlert={msgAlert} setUser={setUser} />}
/>
<Route
path='/sign-in'
element={<SignIn msgAlert={msgAlert} setUser={setUser} />}
/>
<Route
path='/sign-out'
element={
<RequireAuth user={user}>
<SignOut msgAlert={msgAlert} clearUser={clearUser} user={user} />
</RequireAuth>
}
/>
<Route
path='/change-password'
element={
<RequireAuth user={user}>
<ChangePassword msgAlert={msgAlert} user={user} />
</RequireAuth>}
/>
</Routes>
{msgAlerts.map((msgAlert) => (
<AutoDismissAlert
key={msgAlert.id}
heading={msgAlert.heading}
variant={msgAlert.variant}
message={msgAlert.message}
id={msgAlert.id}
deleteAlert={deleteAlert}
/>
))}
</Fragment>
/>
))}
</Fragment>

<Comments
user={user}
currentUserId="1"
commentsUrl="https://jsonplaceholder.typicode.com/comments"
/>

</div>
)
}
}

export default App
58 changes: 58 additions & 0 deletions src/api/auth.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import apiUrl from '../apiConfig'
import axios from 'axios'



export const signUp = (credentials) => {
return axios({
method: 'POST',
Expand Down Expand Up @@ -53,3 +55,59 @@ export const changePassword = (passwords, user) => {
},
})
}



export const getComments = async (user) => {
return axios({
url: apiUrl + '/comments',
method: 'GET',
headers: {
Authorization: `Token token=${user.token}`,
},
})
}

export const createComment = async (text, parentId, user) => {
console.log("hello world", user)

return axios({
url: apiUrl + '/comments/' + user._id,
method: 'POST',
headers: {
Authorization: `Token token=${user.token}`,
},
data: {
comments: {
body: text,
parentId: parentId,
},
},
})
}

export const updateComment = async (text, id, user) => {
return axios({
url: apiUrl + '/comments/' + id,
method: 'PATCH',
headers: {
Authorization: `Token token=${user.token}`,
},
data: {
comments: {
body: text,
},
},
})
}

export const deleteComment = async (id, user) => {
return axios({
url: apiUrl + '/comments/' + id,
method: 'DELETE',
headers: {
Authorization: `Token token=${user.token}`,
},
})
}

7 changes: 4 additions & 3 deletions src/components/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ const Home = (props) => {
console.log('props in home', props)

return (
<>
<h2>Home Page</h2>
</>
<div>
<h1>Home</h1>
</div>
)
}

export default Home

1 change: 1 addition & 0 deletions src/components/auth/SignUp.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import messages from '../shared/AutoDismissAlert/messages'
import Form from 'react-bootstrap/Form'
import Button from 'react-bootstrap/Button'


const SignUp = (props) => {
// constructor(props) {
// super(props)
Expand Down
Loading