add folder com to unsocial b00tc4mp#177

staff/juanp-arias/unsocial/api/index.js

@@ -38,11 +38,12 @@ server.post('/register', jsonBodyParser, (req, res) => {
     }
 })
 
-server.get('/users/:userId/name', (req, res) => {
-    const { userId } = req.params
+server.get('/users/:targetUserId/name', (req, res) => {
+    const userId = req.headers.authorization.slice(6)
+    const { targetUserId } = req.params
 
     try {
-        const name = logic.getUserName(userId)
+        const name = logic.getUserName(userId, targetUserId)
 
         res.json(name)
     } catch (error) {

staff/juanp-arias/unsocial/api/logic/addComments.js

@@ -1,5 +1,5 @@
 import { storage, uuid } from '../data/index.js'
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 
 
 export default (userId, postId, text) => {

staff/juanp-arias/unsocial/api/logic/authenticateUser.js

@@ -1,5 +1,5 @@
 import { storage } from '../data/index.js'
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 
 export default (username, password) => {
     validate.username(username)

staff/juanp-arias/unsocial/api/logic/createPost.js

@@ -1,4 +1,4 @@
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 
 import { storage, uuid } from '../data/index.js'
 

staff/juanp-arias/unsocial/api/logic/deletePost.js

@@ -1,5 +1,5 @@
 import { storage } from '../data/index.js'
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 
 export default (userId, postId) => {
     validate.id(userId, 'userId')

staff/juanp-arias/unsocial/api/logic/getComments.js

@@ -1,4 +1,4 @@
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 import { storage } from '../data/index.js'
 
 export default (userId, postId) => {

staff/juanp-arias/unsocial/api/logic/getPosts.js

@@ -1,5 +1,5 @@
 import { storage } from '../data/index.js'
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 
 export default userId => {
     validate.id(userId, 'userId')

staff/juanp-arias/unsocial/api/logic/getUserId.js

@@ -1,5 +1,5 @@
 import { storage } from '../data/index.js'
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 
 export default userId => {
     validate.id(userId, 'userId')

staff/juanp-arias/unsocial/api/logic/getUserName.js

@@ -1,14 +1,17 @@
 import { storage } from '../data/index.js'
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 
-export default userId => {
+export default (userId, targetUserId) => {
     validate.id(userId, 'userId')
+    validate.id(targetUserId, 'targetUserId')
 
     const { users } = storage
 
-    const user = users.find(user => user.id === userId)
+    const found = users.some(({ id }) => id === userId)
+    if (!found) throw new Error('user not found')
 
-    if (!user) throw new Error('user not found')
+    const user = users.find(({ id }) => id === targetUserId)
+    if (!user) throw new Error('target user not found')
 
     return user.name
 }

staff/juanp-arias/unsocial/api/logic/registerUser.js

@@ -1,6 +1,5 @@
 import { storage, uuid } from '../data/index.js'
-
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 
 export default (name, email, username, password, passwordRepeat) => {
     validate.name(name)

staff/juanp-arias/unsocial/api/logic/removeComment.js

@@ -1,4 +1,4 @@
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 import { storage } from '../data/index.js'
 
 export default (userId, postId, commentId) => {

staff/juanp-arias/unsocial/api/logic/toggleLikePosts.js

@@ -1,4 +1,4 @@
-import validate from './helpers/validate.js'
+import { validate } from 'com'
 import { storage } from '../data/index.js'
 
 export default (userId, postId) => {

staff/juanp-arias/unsocial/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -13,6 +13,7 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
+    "com": "file:../com",
     "cors": "^2.8.5",
     "express": "^4.21.1"
   }

staff/juanp-arias/unsocial/api/test/get-user-name.js

@@ -5,4 +5,5 @@ xhr.addEventListener('load', () => {
 })
 
 xhr.open('GET', 'http://localhost:7070/users/m2x63gb7wns/name')
+xhr.setRequestHeader('Authorization', 'Basic m2x63gb7wns')
 xhr.send()

staff/juanp-arias/unsocial/api/test/get-user-name.sh

@@ -1 +1 @@
- curl http://localhost:7070/users/m2x63gb7wns/name -v
+ curl -H 'Authorization: Basic m2x63gb7wns' http://localhost:7070/users/m2x63gb7wns/name -v

staff/juanp-arias/unsocial/app/package.json

@@ -11,6 +11,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "com": "file:../com",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
@@ -26,4 +27,4 @@
     "globals": "^15.9.0",
     "vite": "^5.4.8"
   }
-}
+}

staff/juanp-arias/unsocial/app/src/App.jsx

@@ -14,22 +14,43 @@ export default class extends Component {
         this.state = { view: logic.isUserLoggedIn() ? 'home' : 'login' }
     }
 
+    handlePostCreated = () => this.setState({ view: 'home' })
+
+    handleUserLoggedOut = () => this.setState({ view: 'login' })
+
+    handleUserLoggedIn = () => this.setState({ view: 'home' })
+
+    handleRegisterClick = () => this.setState({ view: 'register' })
+
+    handleLoginClick = () => this.setState({ view: 'login' })
+
+    handleUserRegistered = () => this.setState({ view: 'login' })
+
+    handleNewPostClick = () => this.setState({ view: 'new-post' })
+
+    handleHomeClick = () => this.setState({ view: 'home' })
+
     render() {
         return <div>
 
-            <Header view={this.state.view} onHomeClick={() => this.setState({ view: 'home' })} onLoggedOut={() => this.setState({ view: 'login' })} />
+            <Header view={this.state.view}
+                onHomeClick={this.handleHomeClick}
+                onLoggedOut={this.handleUserLoggedOut} />
+
             {this.state.view === 'login' && <Login
-                onLoggedIn={() => this.setState({ view: 'home' })}
-                onRegisterClick={() => this.setState({ view: 'register' })}
+                onLoggedIn={this.handleUserLoggedIn}
+                onRegisterClick={this.handleRegisterClick}
             />}
             {this.state.view === 'register' && <Register
-                onLoginClick={() => this.setState({ view: 'login' })}
-                onRegistered={() => this.setState({ view: 'login' })}
+                onLoginClick={this.handleLoginClick}
+                onRegistered={this.handleUserRegistered}
             />}
             {this.state.view === 'home' && <Home />}
 
-            {this.state.view === 'new-post' && <CreatePost onCreated={() => this.setState({ view: 'home' })} />}
-            <Footer onNewPostClick={() => this.setState({ view: 'new-post' })} view={this.state.view} />
+            {this.state.view === 'new-post' && <CreatePost onCreated={this.handlePostCreated} />}
+
+            <Footer
+                onNewPostClick={this.handleNewPostClick} view={this.state.view} />
         </div>
     }
 }

staff/juanp-arias/unsocial/app/src/logic/addComments.js

@@ -1,4 +1,4 @@
-import { validate } from './helpers'
+import { validate } from 'com'
 import uuid from '../data/uuid'
 
 export default (postId, text) => {

staff/juanp-arias/unsocial/app/src/logic/createPostLogic.js

@@ -1,4 +1,4 @@
-import validate from './helpers/validate'
+import { validate } from 'com'
 import uuid from '../data/uuid'
 
 export default (image, text) => {

staff/juanp-arias/unsocial/app/src/logic/deletePost.js

@@ -1,4 +1,7 @@
+import { validate } from 'com'
+
 export default postId => {
+    validate.id(postId, 'postId')
     const posts = JSON.parse(localStorage.posts)
 
     const index = posts.findIndex(({ id }) => id === postId)

staff/juanp-arias/unsocial/app/src/logic/getComments.js

@@ -1,4 +1,4 @@
-import { validate } from './helpers'
+import { validate } from 'com'
 
 export default postId => {
     validate.id(postId, 'PostID')

staff/juanp-arias/unsocial/app/src/logic/loginUser.js

@@ -1,4 +1,4 @@
-import { validate } from './helpers'
+import { validate } from 'com'
 
 export default (username, password) => {
     validate.username(username)

staff/juanp-arias/unsocial/app/src/logic/registerUser.js

@@ -1,4 +1,4 @@
-import { validate } from './helpers'
+import { validate } from 'com'
 
 export default (name, email, username, password, repeatpassword, callback) => {
     validate.name(name)

staff/juanp-arias/unsocial/app/src/logic/removeComment.js

@@ -1,4 +1,4 @@
-import { validate } from './helpers'
+import { validate } from 'com'
 
 export default (postId, commentId) => {
     validate.id(postId, 'Post ID')

staff/juanp-arias/unsocial/app/src/logic/toggleLikePosts.js

@@ -1,4 +1,4 @@
-import validate from './helpers/validate'
+import { validate } from 'com'
 
 export default (postId) => {
     validate.id(postId, 'PostID')

staff/juanp-arias/unsocial/api/logic/helpers/index.js → staff/juanp-arias/unsocial/com/index.js

@@ -1,5 +1,5 @@
 import validate from './validate.js'
 
-export default {
+export {
     validate
 }