create new component Message; refine components and logic; b00tc4mp#87

staff/samuele-spinetti/project/api/handlers/authenticateUserHandler.js

@@ -1,7 +1,7 @@
 import jwt from 'jsonwebtoken'
 
-import { errors } from 'com'
-import { logic } from 'cor'
+import { errors } from '../../com/index.js'
+import { logic } from '../../cor/index.js'
 
 const { SessionError } = errors
 

staff/samuele-spinetti/project/api/handlers/createChatHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/createCommentHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/createPostHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/deleteCommentHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/deletePostHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getAllChatsHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getAllCommentsHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getAllHCPsHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getAllNewsHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getAllPostsHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getAllSavedNewsHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getChatMessagesHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getChatParticipantHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getPostCommentsHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/getUserHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/registerUserHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { name, surname, username, email, password, passwordRepeat } = req.body

staff/samuele-spinetti/project/api/handlers/searchHCPHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     let { userId, query: { q, distance, coords } } = req

staff/samuele-spinetti/project/api/handlers/sendMessageHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/toggleLikePostHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/toggleSaveNewsHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/updateAvatarHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/handlers/updatePasswordHandler.js

@@ -1,4 +1,4 @@
-import { logic } from 'cor'
+import { logic } from '../../cor/index.js'
 
 export default (req, res, next) => {
     const { userId } = req

staff/samuele-spinetti/project/api/index.js

@@ -4,9 +4,9 @@ import { CronJob as cron } from 'cron'
 
 import randomQuery from '../app/util/randomQuery.js'
 
-import { logic } from 'cor'
+import { logic } from '../cor/index.js'
 
-import { mongoose } from 'cor'
+import { mongoose } from '../cor/index.js'
 
 import { cors, jsonBodyParser, jwtVerifier, errorHandler } from './middlewares/index.js'
 
@@ -89,7 +89,7 @@ mongoose.connect(process.env.MONGODB_URI)
         api.delete('/comments/:commentId', jwtVerifier, deleteCommentHandler)
 
         new cron(
-            '*/30 * * * *',
+            '*/2 * * * *',
             () => {
 
                 console.log('news at ' + new Date(Date.now()))

staff/samuele-spinetti/project/api/middlewares/errorHandler.js

@@ -1,4 +1,4 @@
-import { errors } from 'com'
+import { errors } from '../../com/index.js'
 
 const { ValidationError, CredentialsError, NotFoundError, DuplicityError, SessionError, OwnerShipError, PermissionError } = errors
 

staff/samuele-spinetti/project/api/middlewares/jwtVerifier.js

@@ -1,6 +1,6 @@
 import jwt from 'jsonwebtoken'
 
-import { errors } from 'com'
+import { errors } from '../../com/index.js'
 
 const { SessionError } = errors
 

staff/samuele-spinetti/project/app/logic/getUser.js

@@ -1,8 +1,10 @@
-import { errors } from '../../com/index.js'
+import { errors, validate } from '../../com/index.js'
 
 const { SystemError } = errors
 
 export default targetUserId => {
+    validate.id(targetUserId, 'targetUserId')
+
     return fetch(`http://localhost:8080/users/${targetUserId}`, {
         headers: {
             Authorization: `Bearer ${sessionStorage.token}`

staff/samuele-spinetti/project/app/view/common/Alert.jsx

@@ -12,8 +12,7 @@ export default function Alert({ message, onAccept }) {
                 <Paragraph className="text-xl font-semibold text-gray-800 text-center">{message}</Paragraph>
                 <Button
                     className="bg-gradient-to-br from-green-400 to-fuchsia-500 text-white font-bold py-2 px-4 rounded-lg"
-                    onClick={onAccept}
-                >
+                    onClick={onAccept}>
                     Accept
                 </Button>
             </Container>

staff/samuele-spinetti/project/app/view/home/Chat.jsx

@@ -1,21 +1,25 @@
-import { useState, useEffect, useRef, Fragment } from 'react'
+import { useState, useEffect, useRef } from 'react'
 import { useNavigate, useParams } from 'react-router-dom'
 
+import useContext from '../context.js'
+
 import logic from '../../logic'
-import formatTime from '../../util/formatTime'
 
 import Container from '../library/Container'
 import Paragraph from '../library/Paragraph'
 import Button from '../library/Button'
 import Heading from '../library/Heading'
 import Image from '../library/Image'
 import Form from '../library/Form'
+import Message from './Message'
+
 
 export default function Chat() {
     const [messages, setMessages] = useState([])
     const [userId, setUserId] = useState(null)
     const [avatar, setAvatar] = useState(null)
     const navigate = useNavigate()
+    const { alert } = useContext()
 
     const messagesEndRef = useRef(null)
 
@@ -124,33 +128,12 @@ export default function Chat() {
                     </Container>
                 </Container>
 
-                <Container className="flex flex-col overflow-y-auto p-4 bg-gray-100">
-                    {messages.length === 0 ? (
-                        <Paragraph className="text-center text-gray-500">No messages yet.</Paragraph>
-                    ) : (
-                        messages.map(message => (
-                            (message.author.id === logic.getUserId()) ? (
-
-                                <Fragment key={message.id}>
-                                    <Container className="flex p-2 mb-1 rounded-lg max-w-[70%] bg-green-300 text-black self-end">
-                                        <Paragraph className="p-1 text-lg">{message.message}</Paragraph>
-                                    </Container>
-                                    <Container className="self-end mb-2">
-                                        <Paragraph className="text-xs text-gray-400">{formatTime(new Date(message.date))}</Paragraph>
-                                    </Container>
-                                </Fragment>
-                            ) : (
-                                <Fragment key={message.id}>
-                                    <Container className="flex p-2 mb-1 rounded-lg max-w-[70%] bg-fuchsia-200 text-black self-start">
-                                        <Paragraph className="p-1 text-lg">{message.message}</Paragraph>
-                                    </Container>
-                                    <Container className="self-start mb-2">
-                                        <Paragraph className="text-xs text-gray-400">{formatTime(new Date(message.date))}</Paragraph>
-                                    </Container>
-                                </Fragment>
-                            )
-                        ))
-                    )}
+                <Container className="flex flex-col h-screen w-screen overflow-y-auto p-4 bg-gray-100">
+                    {messages.length === 0
+                        ? <Paragraph className="text-center text-gray-500">No messages yet.</Paragraph>
+                        : messages.map(message => <Message key={message.id} message={message} />)
+                    }
+
                     <div ref={messagesEndRef} />
                 </Container>
 

staff/samuele-spinetti/project/app/view/home/Chats.jsx

@@ -1,6 +1,8 @@
 import { useState, useEffect } from 'react'
 import { useNavigate } from 'react-router-dom'
 
+import useContext from '../context.js'
+
 import logic from '../../logic'
 
 import Paragraph from '../library/Paragraph'
@@ -12,6 +14,7 @@ import Heading from '../library/Heading'
 export default function Chats() {
     const [chats, setChats] = useState([])
     const navigate = useNavigate()
+    const { alert } = useContext()
 
     useEffect(() => {
 

staff/samuele-spinetti/project/app/view/home/Comment.jsx

@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react'
+import useContext from '../context.js'
 
 import logic from '../../logic'
 
@@ -16,6 +17,7 @@ import Confirm from '../common/Confirm'
 export default function Comment({ comment, onCommentDeleted }) {
     const [confirmMessage, setConfirmMessage] = useState(null)
     const [user, setUser] = useState(null)
+    const { alert } = useContext()
 
     useEffect(() => {
         try {

staff/samuele-spinetti/project/app/view/home/Community.jsx

@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react'
+import useContext from '../context.js'
 
 import logic from '../../logic'
 
@@ -13,6 +14,7 @@ import Post from './Post'
 export default function Community() {
     const [createPostVisible, setCreatePostVisible] = useState(false)
     const [posts, setPosts] = useState([])
+    const { alert } = useContext()
 
     useEffect(() => {
         loadPosts()

staff/samuele-spinetti/project/app/view/home/CreatePost.jsx

@@ -1,11 +1,14 @@
 import logic from '../../logic'
 
+import useContext from '../context.js'
+
 import Container from '../library/Container'
 import Button from '../library/Button'
 import Form from '../library/Form'
 import Heading from '../library/Heading'
 
 export default function CreatePost({ onCancelCreatePost, onPostCreated }) {
+    const { alert } = useContext()
 
     const handleCreatePostSubmit = event => {
         event.preventDefault()

staff/samuele-spinetti/project/app/view/home/Header.jsx

@@ -1,4 +1,5 @@
 import { useLocation } from 'react-router-dom'
+import useContext from '../context.js'
 
 import logic from '../../logic'
 
@@ -7,6 +8,7 @@ import Button from '../library/Button'
 import Image from '../library/Image'
 
 export default function Header({ onProfileSettingsClicked, onNewsArticlesListClicked, onNewsArticlesSavedListClicked, onPrivateChatsClicked, onLogout }) {
+    const { alert } = useContext()
     const location = useLocation()
 
     const handleLogoutClick = () => {

staff/samuele-spinetti/project/app/view/home/Message.jsx

@@ -0,0 +1,19 @@
+import logic from '../../logic'
+
+import formatTime from '../../util/formatTime'
+
+import Container from '../library/Container'
+import Paragraph from '../library/Paragraph'
+
+export default function Message({ message }) {
+
+    return <>
+        <Container className={`flex p-2 mb-1 rounded-lg max-w-[70%] text-black ${(message.author.id === logic.getUserId()) ? 'bg-green-300 self-end' : 'bg-fuchsia-200 self-start'}`} >
+            <Paragraph className="p-1 text-lg">{message.message}</Paragraph>
+        </Container>
+        <Container className={`${(message.author.id === logic.getUserId()) ? 'self-end' : 'seld-start'} mb-2`}>
+            <Paragraph className="text-xs text-gray-400">{formatTime(new Date(message.date))}</Paragraph>
+        </Container>
+    </>
+
+}

staff/samuele-spinetti/project/app/view/home/NewsArticle.jsx

@@ -1,12 +1,15 @@
 import logic from '../../logic'
 
+import useContext from '../context.js'
+
 import Container from '../library/Container'
 import Heading from '../library/Heading'
 import Image from '../library/Image'
 import Paragraph from '../library/Paragraph'
 import Button from '../library/Button'
 
 export default function NewsArticle({ newsArticle, onNewsArticleSaveToggled }) {
+    const { alert } = useContext()
 
     const handleSaveNewsClick = () => {
         try {

staff/samuele-spinetti/project/app/view/home/NewsArticlesList.jsx

@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react'
+import useContext from '../context.js'
 
 import logic from '../../logic'
 
@@ -10,6 +11,7 @@ import Paragraph from '../library/Paragraph'
 export default function NewsArticlesList() {
     const [articles, setArticles] = useState([])
     const [loading, setLoading] = useState(true)
+    const { alert } = useContext()
 
     useEffect(() => {
         setLoading(true)