Merge pull request #63 from wethmiranasinghe/main

Action buttons for news added

back-end/src/main/java/com/example/demo/appuser/AppUser.java

@@ -39,6 +39,7 @@ public class AppUser implements UserDetails {
     )
     @Id
     @GeneratedValue(
+
             strategy = GenerationType.SEQUENCE,
             generator = "member_sequence"
     )

back-end/src/main/resources/application.yml

@@ -7,7 +7,7 @@ server:
 spring:
   datasource:
     url: jdbc:mysql://localhost:3306/cycle
-    password: "&*531cW9/?"
+    password:
     username: root
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:

front-end/src/Pages/Contact.jsx

@@ -23,7 +23,7 @@ function Contact() {
       <ul>
         <li><FontAwesomeIcon className = "contactIcons" icon={faUser} /> <a href="https://people.ce.pdn.ac.lk/staff/academic/upul/">Dr. Upul Jayasinghe</a></li>
         <li><FontAwesomeIcon className = "contactIcons" icon={faPhone} /> <a href="tel:+94760416590">+94 76 0416 590</a></li>
-        <li><FontAwesomeIcon className = "contactIcons" icon={faEnvelope} /> <a href="mailto:eftu@eng.pdn.ac.lk">eftu@eng.pdn.ac.lk</a></li>
+        <li><FontAwesomeIcon className = "contactIcons" icon={faEnvelope} /> <a href="mailto:upuljm@eng.pdn.ac.lk">upuljm@eng.pdn.ac.lk</a></li>
       </ul>
     </nav>
     </div>

front-end/src/Pages/Home.jsx

@@ -12,15 +12,15 @@ import { faGraduationCap, faShield, faUsers, faBuilding} from '@fortawesome/free
 const fadeImages = [
   {
     url: 'https://lh3.googleusercontent.com/pw/AP1GczM5KKxhVpddOvmafamm46DH9DtSlJKvRTUcoibtfAmrs0ySHY0-KIND3m8kO8xNC5v0aRCSn0z4T3C9ub8iBIyI6vgq9XCWexwDvEt24miVwBLABA=w2400',
-    caption: 'Third Slide'
+    caption: ''
   },
   {
     url: 'https://lh3.googleusercontent.com/pw/AP1GczOf4JkUYn4FXbDiHPPs5iy-EU_cS3YeO7X650OK1bGajP9ApyK5V4PKmQpnoIroDJb4QSRSZR_bG8KNpfY4PRJrAqA3wKZhUZRaGy4DaO5Nhvte8w=w2400',
-    caption: 'Third Slide'
+    caption: ''
   },
   {
     url: 'https://lh3.googleusercontent.com/pw/AP1GczNKdk1z2rkWNBQ2zNRCdqWn_9KensUFqQ_AcjYPxVQV79vqJMnFImwFCYWh3ETzNxdTe9YDkbatKXq_eRgy2jas2ZrMmJbLjYjzKk5RIbWW8s2Org=w2400',
-    caption: 'Third Slide'
+    caption: ''
   },
 ];
 

front-end/src/Pages/News.jsx

@@ -2,6 +2,8 @@ import React, { useEffect, useState } from "react";
 import axios from "axios";
 import { loggedInUser } from '../Pages/Login';
 import '../components/News.css'; // Import your CSS file
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faPen, faEye, faTrash } from '@fortawesome/free-solid-svg-icons';
 
 const fetchNews = async () => {
   try {
@@ -53,6 +55,17 @@ const News = () => {
       });
   };
 
+  const onDeleteClick = async (newsID) => {
+    console.log("Delete button clicked");
+    console.log(newsID);
+    try {
+      await axios.delete(`http://localhost:8080/api/v1/news/${newsID}`);
+      fetchNews();
+    } catch (error) {
+      console.error("Error deleting deliverable:", error);
+    }
+  }
+
   return (
     <>
       <div className="News">
@@ -109,6 +122,13 @@ const News = () => {
             <b><p>Date: {item.newsDate}</p></b>
             <b><p>Author: {item.newsAuthor}</p></b>
             <a href={item.newsUrl} target="_blank" rel="noopener noreferrer">Read more</a>
+            {loggedInUser.isLoggedIn && <td>
+              <div>
+                <button className="actionButton" onClick={() => onEditClick(newsData)}><FontAwesomeIcon icon={faPen}/></button>
+                <button className="actionButton" onClick={() => onViewClick(newsData)}><FontAwesomeIcon icon={faEye}/></button>
+                <button className="actionButton" onClick={() => onDeleteClick(item.newsID)}><FontAwesomeIcon icon={faTrash} /></button>
+              </div>         
+              </td>}
           </div>
         ))}
       </div>

front-end/src/Pages/Team.jsx

@@ -42,7 +42,7 @@ function Team() {
         <li className = "TeamMemberName">Dr. Upul Jayasinghe</li>
         <li>Manager</li>
         <li><a href="tel:+94760416590">+94 76 041 6590</a></li>
-        <li><a href="mailto:[email protected]">eftu@eng.pdn.ac.lk</a></li>
+        <li><a href="mailto:[email protected]">upuljm@eng.pdn.ac.lk</a></li>
       </ul>
     </div>
 

front-end/src/components/Footer.jsx

@@ -45,7 +45,7 @@ function Footer() {
                     <ul>
                         <li>Manager: <a href="https://people.ce.pdn.ac.lk/staff/academic/upul/">Dr. Upul Jayasinghe</a></li>
                         <li>Tel: <a href="tel:+94760416590">+94 76 0416 590</a></li>
-                        <li>Email: <a href="mailto:eftu@eng.pdn.ac.lk">eftu@eng.pdn.ac.lk</a></li>
+                        <li>Email: <a href="mailto:upuljm@eng.pdn.ac.lk">upuljm@eng.pdn.ac.lk</a></li>
 
                         <li> Coordinator: <a href="https://sci.pdn.ac.lk/scs/staff/Erunika-Dayaratna">Dr. Erunika Dayaratna</a></li>
                         <li>Tel: <a href="tel:+94766986500">+94 76 698 6500</a></li>

front-end/src/components/Header.css

@@ -139,7 +139,6 @@
 .headerNavBar .menu{
   display: none;
   position: absolute;
-  top: 1rem;
   right: 3rem;
   flex-direction: column;
   justify-content: space-between;

front-end/src/components/News.css

@@ -197,8 +197,15 @@
     text-decoration: underline;
 }
 
-/* @media screen and (max-width: 1220px) {
-    .News{
-        display: none;
-    }
-} */
+
+.actionButton{
+  margin-right: 5px;
+  padding:0;
+  background-color:#ffffff;
+  border: none;
+  cursor: pointer;
+  transition: background-color 0.2s ease;
+  color: #000;
+  align-items: right;
+}
+

front-end/src/components/Overview.css

@@ -52,5 +52,5 @@
 
 /* CYCLE overview and goals titles */
 .overview-para h3, .Goals h3 {
-    color:hsl(211, 57%, 59%);
+    color: #000;
 }

front-end/src/components/Team.css

@@ -18,7 +18,7 @@
     text-align: left;
     margin-bottom: 1%;
     font-size: 18px;
-    color: hsl(211, 57%, 59%);
+    color: #004494;
 }
 
 .TeamCards {
@@ -58,7 +58,7 @@
 }
 
 .TeamCard a{
-    color: hsl(211, 57%, 59%); /* Default link color */
+    color: #004494; /* Default link color */
     text-decoration: none;
     font-size: 16px;
 }