Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed identified bugs n tested #37

Closed
wants to merge 1 commit into from
Closed
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
16 changes: 8 additions & 8 deletions src/main/webapp/app/entities/message/message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -652,9 +652,9 @@ export const Message = () => {
<Table responsive>
<thead>
<tr>
<th className="hand" onClick={sort('id')}>
{/* <th className="hand" onClick={sort('id')}>
ID <FontAwesomeIcon icon={getSortIconByFieldName('id')} />
</th>
</th> */}
<th className="hand" onClick={sort('content')}>
Content <FontAwesomeIcon icon={getSortIconByFieldName('content')} />
</th>
Expand All @@ -664,23 +664,23 @@ export const Message = () => {
<th className="hand" onClick={sort('createdDate')}>
Created Date <FontAwesomeIcon icon={getSortIconByFieldName('createdDate')} />
</th>
<th>Sender Profile</th>
<th>Receiver Profile</th>
{/* <th>Sender Profile</th>
<th>Receiver Profile</th> */}
<th />
</tr>
</thead>
<tbody>
{messageList.map((message, i) => (
<tr key={`entity-${i}`} data-cy="entityTable">
<td>
{/* <td>
<Button tag={Link} to={`/message/${message.id}`} color="link" size="sm">
{message.id}
</Button>
</td>
</td> */}
<td>{message.content}</td>
<td>{message.createdBy}</td>
<td>{message.createdDate ? <TextFormat type="date" value={message.createdDate} format={APP_DATE_FORMAT} /> : null}</td>
<td>
{/* <td>
{message.senderProfile ? <Link to={`/user-profile/${message.senderProfile.id}`}>{message.senderProfile.id}</Link> : ''}
</td>
<td>
Expand All @@ -689,7 +689,7 @@ export const Message = () => {
) : (
''
)}
</td>
</td> */}
<td className="text-end">
<div className="btn-group flex-btn-group-container">
<Button tag={Link} to={`/message/${message.id}`} color="info" size="sm" data-cy="entityDetailsButton">
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/app/modules/account/activate/activate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import { activateAction, reset } from './activate.reducer';

const successAlert = (
<Alert color="success">
<strong>Your user account has been activated.</strong> Please
<strong>Your user account has been activated. </strong>
<Link to="/login" className="alert-link">
sign in
Please sign in
</Link>
.
</Alert>
Expand Down
6 changes: 4 additions & 2 deletions src/main/webapp/app/modules/account/register/register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
import { ValidatedField, ValidatedForm, isEmail } from 'react-jhipster';
import { Row, Col, Alert, Button } from 'reactstrap';
import { toast } from 'react-toastify';
import { Link } from 'react-router-dom';
import { Link, useNavigate } from 'react-router-dom'; // Import useNavigate

import PasswordStrengthBar from 'app/shared/layout/password/password-strength-bar';
import { useAppDispatch, useAppSelector } from 'app/config/store';
Expand All @@ -11,6 +11,7 @@ import { handleRegister, reset } from './register.reducer';
export const RegisterPage = () => {
const [password, setPassword] = useState('');
const dispatch = useAppDispatch();
const navigate = useNavigate(); // Initialize useNavigate

useEffect(
() => () => {
Expand All @@ -30,8 +31,9 @@ export const RegisterPage = () => {
useEffect(() => {
if (successMessage) {
toast.success(successMessage);
navigate('/login'); // Redirect to login after showing the toast
}
}, [successMessage]);
}, [successMessage, navigate]); // Add navigate to dependency array

return (
<div>
Expand Down
1 change: 0 additions & 1 deletion src/main/webapp/app/modules/home/home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ ul {
list-style: none;

li {
margin-bottom: 10px;
a {
color: #007bff;
text-decoration: none;
Expand Down
Loading