diff --git a/frontend/jobsnap/src/components/ConfirmDeleteModal.js b/frontend/jobsnap/src/components/ConfirmDeleteModal.js
index 54dc641..3905ece 100644
--- a/frontend/jobsnap/src/components/ConfirmDeleteModal.js
+++ b/frontend/jobsnap/src/components/ConfirmDeleteModal.js
@@ -1,24 +1,21 @@
 import React, { useState } from 'react';
 
 const ConfirmDeleteModal = ({ isOpen, onClose, onConfirm, cvId }) => {
-    if (!isOpen) return null; // Hide the modal if it's not open
+    if (!isOpen) return null;
 
     const handleConfirm = () => {
-        console.log("Confirm deleting CV with ID:", cvId); // Log the CV ID being deleted
-        onConfirm(cvId); // Pass the CV ID to confirm the deletion
+        console.log("Confirm deleting CV with ID:", cvId);
+        onConfirm(cvId);
     };
 
     return (
         <div className="modal-overlay">
             <div className="modal-content">
                 <h3>Are you sure you want to delete this?</h3>
-                <div className="modal-actions">
-                    <button onClick={handleConfirm} className="bg-red-500 text-white py-2 px-4 rounded-lg mr-2">
-                        Yes
-                    </button>
-                    <button onClick={onClose} className="bg-gray-500 text-white py-2 px-4 rounded-lg">
-                        Cancel
-                    </button>
+                <div className="modal">
+                    <h2>Are you sure you want to delete this CV?</h2>
+                    <button onClick={handleConfirm}>Yes</button>
+                    <button onClick={onClose}>No</button>
                 </div>
             </div>
         </div>
diff --git a/frontend/jobsnap/src/components/Header.js b/frontend/jobsnap/src/components/Header.js
index 8a0ed38..9d342a2 100644
--- a/frontend/jobsnap/src/components/Header.js
+++ b/frontend/jobsnap/src/components/Header.js
@@ -19,8 +19,8 @@ export default function Header() {
     const { user, logout } = useAuth(); // Accesăm datele utilizatorului și funcția de logout din context
     const navigate = useNavigate();
     const handleLogout = () => {
-        logout(); // Call the logout function
-        navigate('/home'); // Redirect to the home page after logging out
+        logout();
+        navigate('/home');
     };
     return (
         <header className="absolute inset-x-0 top-0 z-50">
diff --git a/frontend/jobsnap/src/components/Hero_Section.js b/frontend/jobsnap/src/components/Hero_Section.js
index b7ed630..c83c1aa 100644
--- a/frontend/jobsnap/src/components/Hero_Section.js
+++ b/frontend/jobsnap/src/components/Hero_Section.js
@@ -1,7 +1,7 @@
 'use client'
 import React, { useContext } from 'react';
-import { Link } from 'react-router-dom'; // Importăm Link pentru navigare
-import { AuthContext } from '../context/AuthContext'; // Importă contextul care conține informațiile despre utilizator
+import { Link } from 'react-router-dom';
+import { AuthContext } from '../context/AuthContext';
 
 export default function HeroSection() {
     const { user } = useContext(AuthContext); // Obținem utilizatorul din context
@@ -32,7 +32,7 @@ export default function HeroSection() {
                         {/* Afișează butonul doar dacă rolul utilizatorului este "student" */}
                         {user && user.role === 'student' && (
                             <Link
-                                to="/start" // Navighează către pagina "/start"
+                                to="/start"
                                 className="rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
                             >
                                 Get started
diff --git a/frontend/jobsnap/src/context/AuthContext.js b/frontend/jobsnap/src/context/AuthContext.js
index 66f2d59..6cba36d 100644
--- a/frontend/jobsnap/src/context/AuthContext.js
+++ b/frontend/jobsnap/src/context/AuthContext.js
@@ -29,7 +29,7 @@ export const AuthProvider = ({ children }) => {
             }
 
             const data = await response.json();
-            console.log('Server response:', data); // Verifică ce răspuns primești
+            console.log('Server response:', data);
             setUser(data); // Salvează utilizatorul în starea contextului
             localStorage.setItem("user", JSON.stringify(data)); // Salvează utilizatorul în localStorage
         } catch (error) {
diff --git a/frontend/jobsnap/src/index.js b/frontend/jobsnap/src/index.js
index 3c9a80e..7d62244 100644
--- a/frontend/jobsnap/src/index.js
+++ b/frontend/jobsnap/src/index.js
@@ -3,12 +3,12 @@ import ReactDOM from 'react-dom/client';
 import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
-import { AuthProvider } from './context/AuthContext'; // Importă AuthProvider
+import { AuthProvider } from './context/AuthContext';
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(
     <React.StrictMode>
-        <AuthProvider> {/* Adaugă AuthProvider pentru a împacheta aplicația */}
+        <AuthProvider>
             <App />
         </AuthProvider>
     </React.StrictMode>
diff --git a/frontend/jobsnap/src/pages/CVBuilder.js b/frontend/jobsnap/src/pages/CVBuilder.js
index 190f3d9..6d560a7 100644
--- a/frontend/jobsnap/src/pages/CVBuilder.js
+++ b/frontend/jobsnap/src/pages/CVBuilder.js
@@ -6,17 +6,17 @@ import html2pdf from 'html2pdf.js';
 import axios from 'axios';
 import { useAuth } from '../context/AuthContext';
 import { ToastContainer, toast } from 'react-toastify';
-import 'react-toastify/dist/ReactToastify.css'; // Importă stilurile pentru toast
+import 'react-toastify/dist/ReactToastify.css';
 
 
 export default function CVBuilder() {
-    const { cvType } = useParams();  // Preluăm tipul de CV din ruta curentă
-    const { user } = useAuth(); // Obținem user-ul din contextul de autentificare
-    const navigate = useNavigate(); // Folosim useNavigate pentru redirecționare după salvare
+    const { cvType } = useParams();
+    const { user } = useAuth();
+    const navigate = useNavigate();
 
-    const notifySuccess = () => toast.success("CV a fost adăugat cu succes!");
-    const notifyError = () => toast.error("A apărut o eroare la adăugarea CV-ului.");
-    // console.log("CV Type:", cvType);  // Verifică în consola browser-ului dacă preiei corect tipul de CV
+    const notifySuccess = () => toast.success("The CV has been saved successfully!");
+    const notifyError = () => toast.error("An error occurred while saving the CV.");
+    // console.log("CV Type:", cvType);
 
 
     const cvFields = {
@@ -97,7 +97,7 @@ export default function CVBuilder() {
     const [formData, setFormData] = useState({});
     const [image, setImage] = useState(null);
 
-    // Setăm câmpurile în funcție de tipul de CV selectat
+
     useEffect(() => {
         console.log('CV Type:', cvType);
         if (cvFields[cvType]) {
@@ -110,10 +110,10 @@ export default function CVBuilder() {
             console.log('Invalid cvType:', cvType);
         }
 
-        // Încarcă datele salvate la profil
+
         axios.get('http://localhost:8080/api/cv-templates')
             .then(response => {
-                setFormData(response.data); // Salvează datele în starea componentelor
+                setFormData(response.data);
             })
             .catch(error => {
                 console.error('Error loading CV data:', error);
@@ -136,35 +136,6 @@ export default function CVBuilder() {
         }
     };
 
-    // const handleSaveCV = () => {
-    //     const cvData = { ...formData, userId: user.id }; // Adăugăm userId
-    //     console.log(cvData)
-    //     // Verifică dacă există o imagine
-    //     if (image) {
-    //         cvData.image = image; // Adăugăm imaginea
-    //     }
-    //
-    //     fetch('http://localhost:8080/api/cv-templates', {
-    //         method: 'POST',
-    //         headers: {
-    //             'Content-Type': 'application/json'
-    //         },
-    //         body: JSON.stringify(cvData),
-    //     })
-    //         .then(response => {
-    //             if (!response.ok) {
-    //                 throw new Error('Error saving CV');
-    //             }
-    //             return response.json();
-    //         })
-    //         .then(data => {
-    //             console.log('CV saved:', data);
-    //             navigate('/profile'); // Redirecționează utilizatorul după salvare
-    //         })
-    //         .catch(error => {
-    //             console.error('Error:', error);
-    //         });
-    // };
 
     const handleSaveCV = async () => {
         const cvData = {
@@ -213,17 +184,15 @@ export default function CVBuilder() {
             // Redirecționează utilizatorul după 2 secunde
             setTimeout(() => {
                 navigate('/start');  // Redirecționează la pagina de start
-            }, 3000);  // 2000ms = 2 secunde
+            }, 3000);
         } catch (error) {
             console.error("Error adding cv:", error);
-            // Afișează notificare de eroare
+
             notifyError();
         }
     };
 
 
-
-
     const handleDownloadPDF = () => {
         const element = document.getElementById('cv-preview');
         const options = {
@@ -232,14 +201,17 @@ export default function CVBuilder() {
             html2canvas: { scale: 3 },
         };
 
+
         html2pdf().set(options).from(element).save();
     };
 
+
     return (
-        <div className="min-h-screen py-20 bg-gradient-to-r from-blue-100 to-blue-300 flex flex-col items-center justify-center">
+        <div
+            className="min-h-screen py-20 bg-gradient-to-r from-blue-100 to-blue-300 flex flex-col items-center justify-center">
             <h1 className="text-4xl font-extrabold text-gray-900 mb-8 text-center">
                 Start Building Your {cvType ? cvType.charAt(0).toUpperCase() + cvType.slice(1) : 'CV'} CV
-                <ToastContainer />
+                <ToastContainer/>
             </h1>
 
             <div className="flex flex-col lg:flex-row gap-8 w-full max-w-7xl px-4">
@@ -285,8 +257,8 @@ export default function CVBuilder() {
                 </form>
 
                 {/* Preview Section */}
-                <div id="cv-preview" className="bg-white shadow-lg rounded-lg p-6 w-full lg:w-1/2">
-                    <CVTemplate formData={formData} image={image} cvType={cvType} />
+                <div id="cv-preview" className="cv-preview transform scale-90">
+                    <CVTemplate formData={formData} image={image} cvType={cvType}/>
                 </div>
             </div>
 
@@ -298,6 +270,13 @@ export default function CVBuilder() {
                 Save CV
             </button>
 
+            <button
+                onClick={handleDownloadPDF}
+                className="mt-8 bg-blue-600 text-white py-2 px-4 rounded hover:bg-blue-700"
+            >
+                Download CV as PDF
+            </button>
+
 
         </div>
     );
diff --git a/frontend/jobsnap/src/pages/CVDetailPage.js b/frontend/jobsnap/src/pages/CVDetailPage.js
index a97ea54..1159df0 100644
--- a/frontend/jobsnap/src/pages/CVDetailPage.js
+++ b/frontend/jobsnap/src/pages/CVDetailPage.js
@@ -1,9 +1,11 @@
 import React, { useState, useEffect } from "react";
 import { useParams } from "react-router-dom";
+import CVTemplate from "../components/CVTemplate";
 
 const CVDetailPage = () => {
-    const { cvId } = useParams();  // Get cvId from URL
+    const { cvId } = useParams();  // Obținem cvId din URL
     const [cv, setCv] = useState(null);
+    const [isModalOpen, setIsModalOpen] = useState(false);
 
     useEffect(() => {
         const fetchCVDetails = async () => {
@@ -26,9 +28,12 @@ const CVDetailPage = () => {
         return <div>Loading...</div>;
     }
 
-    // Function to check if the field has valid content (not "N/A" or empty)
-    const hasValidContent = (field) => {
-        return field && field !== 'N/A';
+    const handleViewCV = () => {
+        setIsModalOpen(true);
+    };
+
+    const handleCloseCV = () => {
+        setIsModalOpen(false);
     };
 
     return (
@@ -44,54 +49,90 @@ const CVDetailPage = () => {
                 )}
             </div>
 
-            {/* Conditionally render fields based on content */}
-            {hasValidContent(cv.email) && (
-                <div className="contact-info mb-8">
-                    <h3 className="text-xl font-semibold text-blue-700 mb-4">Contact Information</h3>
-                    <p><strong>Email:</strong> {cv.email}</p>
-                    <p><strong>Phone:</strong> {cv.phone}</p>
-                </div>
-            )}
+            {/* Detalii CV */}
+            <div className="cv-details">
+                <h3 className="text-xl font-semibold text-blue-700 mb-4">Contact Information</h3>
+                <p><strong>Email:</strong> {cv.email}</p>
+                <p><strong>Phone:</strong> {cv.phone}</p>
 
-            {hasValidContent(cv.education) && (
-                <div className="education mb-8">
-                    <h3 className="text-xl font-semibold text-blue-700 mb-4">Education</h3>
-                    <p>{cv.education}</p>
-                </div>
-            )}
+                <h3 className="text-xl font-semibold text-blue-700 mb-4">Education</h3>
+                <p>{cv.education}</p>
 
-            {hasValidContent(cv.experience) && (
-                <div className="experience mb-8">
-                    <h3 className="text-xl font-semibold text-blue-700 mb-4">Professional Experience</h3>
-                    <p>{cv.experience}</p>
-                </div>
-            )}
+                <h3 className="text-xl font-semibold text-blue-700 mb-4">Experience</h3>
+                <p>{cv.experience}</p>
 
-            {hasValidContent(cv.skills) && (
-                <div className="skills mb-8">
-                    <h3 className="text-xl font-semibold text-blue-700 mb-4">Skills</h3>
-                    <p>{cv.skills}</p>
-                </div>
-            )}
+                <h3 className="text-xl font-semibold text-blue-700 mb-4">Skills</h3>
+                <p>{cv.skills}</p>
 
-            {hasValidContent(cv.technologies) && (
-                <div className="technologies mb-8">
-                    <h3 className="text-xl font-semibold text-blue-700 mb-4">Technologies</h3>
-                    <p>{cv.technologies}</p>
-                </div>
-            )}
+                {cv.cvType === 'it' && (
+                    <>
+                        <h3 className="text-xl font-semibold text-blue-700 mb-4">Technologies</h3>
+                        <p>{cv.technologies}</p>
+                    </>
+                )}
 
-            {hasValidContent(cv.certifications) && (
-                <div className="certifications mb-8">
-                    <h3 className="text-xl font-semibold text-blue-700 mb-4">Certifications</h3>
-                    <p>{cv.certifications}</p>
-                </div>
-            )}
+                {cv.cvType === 'business' && (
+                    <>
+                        <h3 className="text-xl font-semibold text-blue-700 mb-4">Business Skills</h3>
+                        <p>{cv.skills}</p>
+                    </>
+                )}
+
+                {cv.cvType === 'marketing' && (
+                    <>
+                        <h3 className="text-xl font-semibold text-blue-700 mb-4">Marketing Skills</h3>
+                        <p>{cv.skills}</p>
+                    </>
+                )}
+
+                {cv.cvType === 'graphicdesign' && (
+                    <>
+                        <h3 className="text-xl font-semibold text-blue-700 mb-4">Design Skills</h3>
+                        <p>{cv.skills}</p>
+                    </>
+                )}
+
+                {cv.cvType === 'healthcare' && (
+                    <>
+                        <h3 className="text-xl font-semibold text-blue-700 mb-4">Healthcare Skills</h3>
+                        <p>{cv.skills}</p>
+                    </>
+                )}
+
+                {cv.cvType === 'education' && (
+                    <>
+                        <h3 className="text-xl font-semibold text-blue-700 mb-4">Degree</h3>
+                        <p>{cv.degree}</p>
+                    </>
+                )}
+
+                {/* Render Projects and Certifications for any CV type */}
+                <h3 className="text-xl font-semibold text-blue-700 mb-4">Projects</h3>
+                <p>{cv.projects}</p>
+
+                <h3 className="text-xl font-semibold text-blue-700 mb-4">Certifications</h3>
+                <p>{cv.certifications}</p>
+            </div>
+
+            {/* Show CV Template in Modal */}
+            <button
+                onClick={handleViewCV}
+                className="mt-8 bg-blue-700 text-white py-2 px-4 rounded-lg hover:bg-blue-800"
+            >
+                View CV Template
+            </button>
 
-            {hasValidContent(cv.projects) && (
-                <div className="projects mb-8">
-                    <h3 className="text-xl font-semibold text-blue-700 mb-4">Projects</h3>
-                    <p>{cv.projects}</p>
+            {isModalOpen && (
+                <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+                    <div className="bg-white p-6 rounded-lg w-11/12 max-w-5xl shadow-2xl relative overflow-y-auto" style={{ height: "90vh" }}>
+                        <button
+                            onClick={handleCloseCV}
+                            className="absolute top-4 right-4 bg-red-500 text-white px-4 py-2 rounded-full shadow-lg hover:bg-red-600"
+                        >
+                            Close
+                        </button>
+                        <CVTemplate formData={cv} image={cv.imagePath} cvType={cv.cvType} />
+                    </div>
                 </div>
             )}
         </div>
diff --git a/frontend/jobsnap/src/pages/EditCV.js b/frontend/jobsnap/src/pages/EditCV.js
index c79a62c..f8528ed 100644
--- a/frontend/jobsnap/src/pages/EditCV.js
+++ b/frontend/jobsnap/src/pages/EditCV.js
@@ -5,6 +5,7 @@ import axios from 'axios';
 import { useAuth } from '../context/AuthContext';
 import { ToastContainer, toast } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
+import html2pdf from "html2pdf.js";
 
 export default function CVEdit() {
     const { cvId } = useParams();
@@ -94,11 +95,11 @@ export default function CVEdit() {
     };
 
     useEffect(() => {
-        // Încarcă datele CV-ului din backend pe baza cvId
+
         axios.get(`http://localhost:8080/api/cv/${cvId}`)
             .then(response => {
-                setFormData(response.data); // Setează datele CV-ului
-                setCvType(response.data.cvType); // Preia tipul de CV din răspunsul backend
+                setFormData(response.data);
+                setCvType(response.data.cvType);
                 if (response.data.imagePath) {
                     setImage(response.data.imagePath);
                 }
@@ -107,18 +108,18 @@ export default function CVEdit() {
                 console.error('Error loading CV data:', error);
                 alert('A apărut o eroare la încărcarea datelor CV-ului.');
             });
-    }, [cvId]); // Dependința corectă pentru încărcarea datelor doar la început
+    }, [cvId]);
 
     useEffect(() => {
         if (cvType && cvFields[cvType]) {
-            // Setează doar câmpurile relevante pentru tipul de CV
+
             const fields = cvFields[cvType].reduce((acc, field) => {
-                acc[field.name] = formData[field.name] || ''; // Preia valorile din formData
+                acc[field.name] = formData[field.name] || '';
                 return acc;
             }, {});
             setFormData(fields);
         }
-    }, [cvType]); // Actualizează doar când cvType se schimbă
+    }, [cvType]);
 
     const handleChange = (e) => {
         const { name, value } = e.target;
@@ -151,19 +152,34 @@ export default function CVEdit() {
             });
             notifySuccess1();
 
-            setImage(response.data.imagePath); // Actualizează imaginea cu calea din răspuns
-            // Redirecționează utilizatorul după 2 secunde
+            setImage(response.data.imagePath);
+
             setTimeout(() => {
-                navigate('/profile');  // Redirecționează la pagina de start
-            }, 3000);  // 2000ms = 2 secunde
+                navigate('/profile');
+            }, 3000);
         } catch (error) {
             console.error("Error updating cv:", error);
             notifyError1();
         }
     };
 
+
+    const handleDownloadPDF = () => {
+        const element = document.getElementById('cv-preview');
+        const options = {
+            filename: `${formData.fullName || 'My-CV'}.pdf`,
+            jsPDF: { unit: 'pt', format: 'a4' },
+            html2canvas: { scale: 3 },
+        };
+
+
+        html2pdf().set(options).from(element).save();
+    };
+
+
     return (
-        <div className="min-h-screen py-20 bg-gradient-to-r from-blue-100 to-blue-300 flex flex-col items-center justify-center">
+        <div
+            className="min-h-screen py-20 bg-gradient-to-r from-blue-100 to-blue-300 flex flex-col items-center justify-center">
             <h1 className="text-4xl font-extrabold text-gray-900 mb-8 text-center">Edit Your CV</h1>
 
             <div className="flex flex-col lg:flex-row gap-8 w-full max-w-7xl px-4">
@@ -219,8 +235,8 @@ export default function CVEdit() {
                 </form>
 
                 {/* Preview Section */}
-                <div id="cv-preview" className="bg-white shadow-lg rounded-lg p-6 w-full lg:w-1/2">
-                    <CVTemplate formData={formData} image={image} cvType={cvType} />
+                <div id="cv-preview" className="cv-preview transform scale-90">
+                    <CVTemplate formData={formData} image={image} cvType={cvType}/>
                 </div>
             </div>
 
@@ -233,7 +249,15 @@ export default function CVEdit() {
                 Save CV
             </button>
 
-            <ToastContainer />
+            <button
+                onClick={handleDownloadPDF}
+                className="mt-8 bg-blue-600 text-white py-2 px-4 rounded hover:bg-blue-700"
+            >
+                Download CV as PDF
+            </button>
+
+
+            <ToastContainer/>
         </div>
     );
 }
diff --git a/frontend/jobsnap/src/pages/LogIn.js b/frontend/jobsnap/src/pages/LogIn.js
index f03829a..f6c04a6 100644
--- a/frontend/jobsnap/src/pages/LogIn.js
+++ b/frontend/jobsnap/src/pages/LogIn.js
@@ -9,7 +9,7 @@ import { ToastContainer, toast } from 'react-toastify';
 
 
 export default function LoginPage() {
-    const { login } = useAuth(); // Obținem funcția de login din context
+    const { login } = useAuth();
     const navigate = useNavigate();
 
     const [email, setEmail] = useState('');
@@ -29,7 +29,7 @@ export default function LoginPage() {
             const data = await response.json();
 
             if (response.ok) {
-                // Save the user data, including the role, to localStorage
+
                 console.log('DATA:');
                 console.log(JSON.stringify(data));
                 localStorage.setItem('user', JSON.stringify(data));
diff --git a/frontend/jobsnap/src/pages/Profile.css b/frontend/jobsnap/src/pages/Profile.css
index fd63d51..e244a70 100644
--- a/frontend/jobsnap/src/pages/Profile.css
+++ b/frontend/jobsnap/src/pages/Profile.css
@@ -53,16 +53,16 @@
 }
 
 .cv-template {
-    overflow-wrap: break-word; /* Permite întreruperea cuvintelor pe linia următoare */
-    word-wrap: break-word; /* Asigură-te că se întrerupe pe cuvinte mari */
-    word-break: break-word; /* Întrerupe cuvintele prea lungi */
-    max-width: 100%; /* Asigură-te că containerul se ajustează la lățimea disponibilă */
-    font-size: 0.9rem; /* Reduce fontul pentru a economisi spațiu */
-    padding: 10px; /* Reducere padding pentru carduri mai mici */
-    margin: 10px 0; /* Margine mai mică între carduri */
-    max-height: 500px; /* Maximizează înălțimea pentru a preveni cardurile prea mari */
-    overflow-y: auto; /* Adaugă scroll dacă conținutul depășește înălțimea */
-    box-sizing: border-box; /* Asigură-te că padding-ul și marginile sunt incluse în dimensiunile elementului */
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    word-break: break-word;
+    max-width: 100%;
+    font-size: 0.9rem;
+    padding: 10px;
+    margin: 10px 0;
+    max-height: 500px;
+    overflow-y: auto;
+    box-sizing: border-box;
 }
 
 
@@ -139,7 +139,6 @@ button:focus {
 
 }
 
-/* Save button */
 .save-button {
     background-color: #4CAF50; /* Green */
     color: white;
@@ -147,7 +146,7 @@ button:focus {
 }
 
 .save-button:hover {
-    background-color: #45a049; /* Darker green when hovered */
+    background-color: #45a049;
 }
 
 /* Cancel button */
@@ -160,34 +159,31 @@ button:focus {
 
 
 
-/* Lista de CV-uri folosind un grid cu 1 coloană pe ecrane mici, 2 pe ecrane medii și 3 pe ecrane mari */
 .cv-list {
     display: grid;
     grid-template-columns: repeat(3, 1fr); /* 3 coloane pe ecranele mari */
     gap: 30px; /* Spațiu între cardurile de CV */
     margin-top: 20px;
     padding: 0 20px;
-    justify-items: center; /* Centrează cardurile pe orizontală */
+    justify-items: center;
 }
 
 /* Cardurile de CV */
 .cv-card {
     background-color: #fff;
-    padding: 20px; /* Mărim padding-ul pentru a face cardul mai generos */
+    padding: 20px;
     border-radius: 8px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
     border: 1px solid #ddd;
     text-align: center;
-    width: 100%; /* Cardurile vor ocupa toată lățimea disponibilă */
-    max-width: 500px; /* Limităm lățimea cardului */
+    width: 100%;
+    max-width: 500px;
     /*max-height: 500px; */
-    margin: 0 auto; /* Centrează cardurile pe axa orizontală */
+    margin: 0 auto;
     transition: transform 0.3s ease, box-shadow 0.3s ease;
     margin-bottom: 20px;
 }
-.cv-preview{
 
-}
 
 .cv-card:hover {
     transform: translateY(-8px);
@@ -212,13 +208,13 @@ button:focus {
 /* Butoanele din fiecare card de CV */
 .cv-actions {
     display: flex;
-    flex-wrap: wrap; /* Permite butoanelor să se mute pe rânduri în cazul în care nu se potrivesc pe un singur rând */
-    justify-content: center; /* Centrează butoanele pe orizontală */
-    gap: 10px; /* Spațiu între butoane */
-    width: 100%; /* Asigură-te că butoanele ocupă întreaga lățime disponibilă */
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 10px;
+    width: 100%;
 }
 
-/* Stilizarea butoanelor din carduri */
+
 .cv-actions button {
     background-color: #4CAF50;
     color: white;
@@ -227,38 +223,38 @@ button:focus {
     border-radius: 5px;
     cursor: pointer;
     font-size: 0.9rem;
-    width: 100%; /* Asigură-te că butoanele nu ies din card */
-    max-width: 120px; /* Limităm lățimea maximă a butoanelor pentru a se potrivi în mod corespunzător */
-    box-sizing: border-box; /* Asigură-te că padding-ul nu face ca butoanele să iasă din container */
+    width: 100%;
+    max-width: 120px;
+    box-sizing: border-box;
 }
 
 
-/* Stilizare la hover pentru butoane */
+
 .cv-actions button:hover {
     opacity: 0.8;
 }
 
-/* Media Queries pentru responsive design - 1 coloană pe ecranele mici */
+
 @media (max-width: 768px) {
     .cv-list {
-        grid-template-columns: 1fr; /* 1 coloană pe ecranele mici */
+        grid-template-columns: 1fr;
     }
 
     .cv-card {
-        max-width: 100%; /* Permite cardurilor să ocupe toată lățimea */
+        max-width: 100%;
     }
     .cv-actions button {
-        width: 100%; /* Pe ecranele mici, butoanele vor ocupa întreaga lățime */
+        width: 100%;
     }
 }
 
-/* Media Queries pentru responsive design - 3 coloane pe ecranele mari */
+
 @media (min-width: 1024px) {
     .cv-list {
-        grid-template-columns: repeat(3, 1fr); /* 3 coloane pe ecranele mari */
+        grid-template-columns: repeat(3, 1fr);
     }
 
     .cv-actions button {
-        width: 48%; /* Pe ecranele mari, butoanele vor ocupa doar 48% din lățimea cardului */
+        width: 48%;
     }
 }
diff --git a/frontend/jobsnap/src/pages/Profile.js b/frontend/jobsnap/src/pages/Profile.js
index 2de8d32..63db060 100644
--- a/frontend/jobsnap/src/pages/Profile.js
+++ b/frontend/jobsnap/src/pages/Profile.js
@@ -18,10 +18,8 @@ const Profile = () => {
     const [updatedProfile, setUpdatedProfile] = useState({});
     const [cvList, setCvList] = useState([]);
     const navigate = useNavigate();
-    const [isModalOpen, setIsModalOpen] = useState(false);
-    const [cvToDelete, setCvToDelete] = useState(null); // Stochează CV-ul care urmează să fie șters
-    const [cvToDownload, setCvToDownload] = useState(null); // Manage the CV to download
-    const [isDownloading, setIsDownloading] = useState(false); // Manage visibility when downloading
+    const [cvToDelete, setCvToDelete] = useState(null);
+
 
 
     const notifySuccess = () => toast.success("The CV has been deleted successfully!");
@@ -45,6 +43,7 @@ const Profile = () => {
             try {
                 console.log("User role:", user.role);
                 // Verificăm rolul utilizatorului pentru a alege endpoint-ul corect
+
                 const endpoint = user.role === 'student'
                     ? `http://localhost:8080/api/students/${user.id}`
                     : `http://localhost:8080/api/employers/${user.id}`;
@@ -106,7 +105,7 @@ const Profile = () => {
     };
 
     const handleUploadRedirect2 = () => {
-        navigate('/upload-cv-page'); // Redirecționează la pagina de upload pentru studenți
+        navigate('/upload-cv-page'); // Redirecționează la pagina de upload pentru employer
     };
 
     const handleUploadRedirect3 = () => {
@@ -168,36 +167,27 @@ const Profile = () => {
         html2pdf().set(options).from(element).save();
     };
 
-    const handleDeleteCV = (cvId) => {
-        console.log("CV to delete:", cvId); // Log the specific CV ID you are deleting
-        setCvToDelete(cvId); // Save the selected CV ID to delete
-        setIsModalOpen(true); // Open the modal for that specific CV
-    };
-
+    const handleDeleteCV = async (cvId) => {
 
-    const confirmDelete = async (cvId) => {
         try {
+
             const response = await axios.delete(`http://localhost:8080/api/cv/${cvId}`);
+
             if (response.status === 200 || response.status === 204) {
-                setCvList(cvList.filter(cv => cv.id !== cvId)); // Remove the deleted CV from the list
-                notifySuccess(); // Show success toast
+
+                setCvList(cvList.filter(cv => cv.id !== cvId));
+                notifySuccess();
             } else {
                 throw new Error('Failed to delete CV');
             }
         } catch (error) {
             console.error("Error deleting CV:", error);
-            notifyError(); // Show error toast
-        } finally {
-            setIsModalOpen(false); // Close the modal
-            setCvToDelete(null); // Reset the CV to delete
+          notifyError();
         }
     };
 
 
-    const cancelDelete = () => {
-        setIsModalOpen(false); // Close the modal without deleting
-        setCvToDelete(null); // Reset the CV to delete
-    };
+
 
 
     if (!user) {
@@ -243,7 +233,7 @@ const Profile = () => {
                         />
                     </label>
 
-                    {/* Render different fields based on the user role */}
+
                     {user.role === 'student' && (
                         <>
                             <label className="form-label">
@@ -366,18 +356,28 @@ const Profile = () => {
                             cvList.map((cv) => (
                                 <div key={cv.id}
                                      className="cv-card p-6 border rounded-lg shadow-md bg-white hover:shadow-xl transition-all">
-                                    <div id={`cv-preview-${cv.id}`} className="cv-preview transform scale-90">
-                                        <CVTemplate formData={cv} image={cv.imagePath} cvType={cv.cvType}/>
+                                    <div className="cv-preview">
+                                        <h2 className="font-semibold text-xl text-blue-700 mb-2">{cv.fullName}</h2>
+                                        <p className="text-gray-600">{cv.email}</p>
+                                        <p className="text-gray-500">{cv.phone}</p>
+
+                                        <div className="mt-4">
+                                            <div className="text-sm font-medium text-gray-700">Education:</div>
+                                            <p className="text-gray-800">{cv.education}</p>
+                                        </div>
+                                        <div className="mt-4">
+                                            <div className="text-sm font-medium text-gray-700">Experience:</div>
+                                            <p className="text-gray-800">{cv.experience}</p>
+                                        </div>
+                                        <div className="mt-4">
+                                            <div className="text-sm font-medium text-gray-700">Skills:</div>
+                                            <p className="text-gray-800">{cv.skills}</p>
+                                        </div>
                                     </div>
 
 
                                     <div className="cv-actions mt-6">
-                                        <button
-                                            onClick={() => handleDownloadPDF(cv.id)}
-                                            className="bg-blue-700 text-white py-2 px-4 rounded-lg w-full shadow-md hover:bg-blue-800 transition-all"
-                                        >
-                                            Download
-                                        </button>
+
                                         <button
                                             onClick={() => handleEditCV(cv.id)}
                                             className="bg-green-700 text-white py-2 px-4 rounded-lg w-full shadow-md hover:bg-green-800 transition-all mt-2"
@@ -391,18 +391,12 @@ const Profile = () => {
                                             Delete
                                         </button>
 
-                                        <ConfirmDeleteModal
-                                            isOpen={isModalOpen} // Modal will only open if a CV is selected for deletion
-                                            onClose={cancelDelete}
-                                            onConfirm={confirmDelete}
-                                            cvId={cv.id} // Pass the CV ID to the modal
-                                        />
 
 
                                         <button
                                             onClick={() => {
-                                                notifySuccess1();  // Show success toast
-                                                handleUploadCV(cv.id);  // Upload CV
+                                                notifySuccess1();
+                                                handleUploadCV(cv.id);
                                             }}
                                             className="bg-indigo-700 text-white py-2 px-4 rounded-lg w-full shadow-md hover:bg-indigo-800 transition-all mt-2"
                                         >
@@ -419,7 +413,7 @@ const Profile = () => {
             )}
             <ToastContainer/>
 
-            {/* Only display CV section for students */}
+            {/* Only display CV section for employers */}
             {user.role === 'employer' && (
                 <div className="cv-section text-center mt-6">
                     <button
diff --git a/frontend/jobsnap/src/pages/SignUp.js b/frontend/jobsnap/src/pages/SignUp.js
index 417d6f6..0e7de90 100644
--- a/frontend/jobsnap/src/pages/SignUp.js
+++ b/frontend/jobsnap/src/pages/SignUp.js
@@ -18,9 +18,9 @@ export default function SignUpPage() {
     const notifyError1 = () => toast.error("An error occurred. Please try again.");
 
     const notifyEmail = () => toast.error("The email is already in use.");
-    const notifyPhoneStudent = () => toast.error("The phone number is already used by a student.");
+    const notifyPhoneStudent = () => toast.error("The phone number is already used.");
 
-    const notifyPhoneEmployer = () => toast.error("The phone number is already used by an employer.");
+    const notifyPhoneEmployer = () => toast.error("The phone number is already used.");
 
 
     const [universityName, setUniversityName] = useState('');
@@ -88,7 +88,7 @@ export default function SignUpPage() {
                 body: JSON.stringify(body),
             });
 
-            // Verifică răspunsul serverului
+
             if (!response.ok) {
                 const error = await response.json();
                 alert(error.message || "Failed to sign up");
diff --git a/frontend/jobsnap/src/pages/UploadPageEmployer.js b/frontend/jobsnap/src/pages/UploadPageEmployer.js
index d6b8cbb..62dde4f 100644
--- a/frontend/jobsnap/src/pages/UploadPageEmployer.js
+++ b/frontend/jobsnap/src/pages/UploadPageEmployer.js
@@ -1,12 +1,14 @@
 import React, { useState, useEffect } from "react";
 import { useAuth } from "../context/AuthContext";
 import { useNavigate } from "react-router-dom";
+import CVTemplate from "../components/CVTemplate";
 
 const UploadCVStudent = () => {
     const { user } = useAuth();
     const [cvList, setCvList] = useState([]);
     const [allCvs, setAllCvs] = useState([]);
     const [cvType, setCvType] = useState('');
+    const [selectedCV, setSelectedCV] = useState(null);
     const [currentPage, setCurrentPage] = useState(1);
     const [cvsPerPage] = useState(6); // Number of CVs per page
     const navigate = useNavigate();
@@ -50,21 +52,26 @@ const UploadCVStudent = () => {
 
     const paginate = (pageNumber) => setCurrentPage(pageNumber);
 
-    // Navigate to the full CV details page
-    const handleViewFullCV = (cvId) => {
-        navigate(`/cv-detail/${cvId}`);
+
+    const handleViewFullCV = (cv) => {
+        setSelectedCV(cv);
+        console.log("Selected cv",selectedCV);
+    };
+
+    const handleCloseCV = () => {
+        setSelectedCV(null);
     };
 
     const totalPages = Math.ceil(cvList.length / cvsPerPage);
 
-// Handle previous page
+
     const handlePrevPage = () => {
         if (currentPage > 1) {
             setCurrentPage(currentPage - 1);
         }
     };
 
-// Handle next page
+
     const handleNextPage = () => {
         if (currentPage < totalPages) {
             setCurrentPage(currentPage + 1);
@@ -75,6 +82,24 @@ const UploadCVStudent = () => {
         <div className="cv-view-container mt-20 px-4">
             <h1 className="text-4xl font-semibold text-center text-blue-700 mb-10">All Student CVs</h1>
 
+            {/* Modal for full CV preview */}
+            {selectedCV && (
+                <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+                    <div className="bg-white p-6 rounded-lg w-11/12 max-w-5xl shadow-2xl relative overflow-y-auto" style={{ height: "90vh" }}>
+                        <button
+                            onClick={handleCloseCV}
+                            className="absolute top-4 right-4 bg-red-500 text-white px-4 py-2 rounded-full shadow-lg hover:bg-red-600"
+                        >
+                            Close
+                        </button>
+                        <div className="cv-preview-container overflow-y-auto max-h-[80vh]">
+                            <CVTemplate formData={selectedCV} image={selectedCV.imagePath} cvType={selectedCV.cvType} />
+                        </div>
+                    </div>
+                </div>
+            )}
+
+
             {/* CV Type Filter Dropdown */}
             <div className="mb-6 text-center">
                 <select
@@ -118,7 +143,7 @@ const UploadCVStudent = () => {
                             <div className="mt-4">
                                 <button
                                     className="bg-blue-700 text-white p-2 rounded-md w-full mb-2"
-                                    onClick={() => handleViewFullCV(cv.id)}
+                                    onClick={() => handleViewFullCV(cv)}
                                 >
                                     View Full CV
                                 </button>
diff --git a/frontend/jobsnap/src/pages/UploadPageStudent.css b/frontend/jobsnap/src/pages/UploadPageStudent.css
index cadc6ec..30cc8e0 100644
--- a/frontend/jobsnap/src/pages/UploadPageStudent.css
+++ b/frontend/jobsnap/src/pages/UploadPageStudent.css
@@ -1,4 +1,4 @@
-/* UploadCVStudent.css */
+
 .upload-cv-container {
     display: flex;
     flex-direction: column;
diff --git a/frontend/jobsnap/src/pages/UploadPageStudent.js b/frontend/jobsnap/src/pages/UploadPageStudent.js
index 170e041..3db98e5 100644
--- a/frontend/jobsnap/src/pages/UploadPageStudent.js
+++ b/frontend/jobsnap/src/pages/UploadPageStudent.js
@@ -10,7 +10,7 @@ const UploadCVStudent = () => {
     const [currentPage, setCurrentPage] = useState(1);
     const itemsPerPage = 6; // Number of CVs per page
 
-    // Fetch CVs only when the user is authenticated
+
     useEffect(() => {
         if (!user) return;
 
@@ -24,17 +24,19 @@ const UploadCVStudent = () => {
                 setCvList(data);  // Actualizezi lista de CV-uri uploadate
             } catch (error) {
                 console.error("Error fetching uploaded CVs:", error);
-                alert("Nu s-au putut încărca CV-urile uploadate.");
+
             }
         };
 
         fetchUploadedCVs();
-    }, [user]);  // Asigură-te că lista se reîncarcă dacă utilizatorul se schimbă
+    }, [user]);
+
 
 
-    // Handle viewing a CV (Modal)
     const handleViewCV = (cv) => {
         setSelectedCV(cv);
+        console.log("Selected cv",selectedCV);
+
     };
 
     const handleCloseCV = () => {
@@ -59,27 +61,9 @@ const UploadCVStudent = () => {
         }
     };
 
-    // Handle uploading the CV
-    const handleUploadCV = async (cvId) => {
-        const cvToUpload = cvList.find(cv => cv.id === cvId);
-        if (!cvToUpload) {
-            alert("CV-ul nu a fost găsit.");
-            return;
-        }
 
-        try {
-            const response = await axios.post('http://localhost:8080/api/cv/upload', cvToUpload);
-            if (response.status === 200) {
-                alert('CV-ul a fost încărcat cu succes!');
-                // Actualizează lista de CV-uri din pagina de upload
-            }
-        } catch (error) {
-            console.error("Error uploading CV:", error);
-            alert('A apărut o eroare la încărcarea CV-ului.');
-        }
-    };
 
-    // Handle deleting a CV from the page (but keeping it in the profile)
+
     const handleDeleteCV = (cvId) => {
         setCvList(cvList.filter(cv => cv.id !== cvId)); // Remove the CV from the list displayed on the page
     };
@@ -143,7 +127,7 @@ const UploadCVStudent = () => {
                                     View CV
                                 </button>
                                 <button
-                                    onClick={() => handleDeleteCV(cv.id)} // Call delete function
+                                    onClick={() => handleDeleteCV(cv.id)}
                                     className="bg-red-700 text-white py-2 px-4 rounded-lg w-full shadow-md hover:bg-red-800 transition-all"
                                 >
                                     Delete CV
diff --git a/pom.xml b/pom.xml
index a619314..31ca2f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,6 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 			<version>2.15.2</version>
-			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
diff --git a/src/main/java/com/example/jobsnap/config/SecurityConfig.java b/src/main/java/com/example/jobsnap/config/SecurityConfig.java
index c92feb3..9b7c089 100644
--- a/src/main/java/com/example/jobsnap/config/SecurityConfig.java
+++ b/src/main/java/com/example/jobsnap/config/SecurityConfig.java
@@ -28,14 +28,14 @@ public PasswordEncoder passwordEncoder() {
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http
                 .cors(cors -> cors.configurationSource(corsConfigurationSource())) // Activează CORS
-                .csrf(csrf -> csrf.disable())  // Dezactivăm CSRF (opțional)
+                .csrf(csrf -> csrf.disable())
                 .authorizeHttpRequests(authz -> authz
                         .requestMatchers("/auth/login", "/auth/signup").permitAll()  // Permitem accesul neautentificat la login și signup
                         .requestMatchers("/api/**").permitAll() // Permitem accesul pentru toate endpoint-urile API
                         .anyRequest().authenticated()  // Restul endpoint-urilor necesită autentificare
                 );
 
-        return http.build();  // Returnăm configurarea finală
+        return http.build();
     }
 
     // Configurăm sursa CORS
diff --git a/src/main/java/com/example/jobsnap/controller/AuthController.java b/src/main/java/com/example/jobsnap/controller/AuthController.java
index ec53570..629943b 100644
--- a/src/main/java/com/example/jobsnap/controller/AuthController.java
+++ b/src/main/java/com/example/jobsnap/controller/AuthController.java
@@ -45,7 +45,7 @@ public ResponseEntity<Object> login(@RequestBody LoginRequest loginRequest) {
         }
     }
 
-    // DTO pentru cererea de login
+
     public static class LoginRequest {
         private String email;
         private String password;
@@ -82,7 +82,7 @@ public String signUp(@RequestBody SignUpRequest signUpRequest) {
         return "User registered successfully!";
     }
 
-    // DTO for sign-up request
+
     public static class SignUpRequest {
         private String email;
         private String password;
@@ -97,7 +97,7 @@ public static class SignUpRequest {
         private String companyPhone;
         private String bio;
 
-        // Getters and setters for all fields
+
         public String getEmail() { return email; }
         public void setEmail(String email) { this.email = email; }
 
diff --git a/src/main/java/com/example/jobsnap/controller/CVController.java b/src/main/java/com/example/jobsnap/controller/CVController.java
index bcd1dd4..d41d517 100644
--- a/src/main/java/com/example/jobsnap/controller/CVController.java
+++ b/src/main/java/com/example/jobsnap/controller/CVController.java
@@ -24,13 +24,12 @@ public class CVController {
     @ResponseStatus(HttpStatus.CREATED)
     public ResponseEntity<CV> createCV(@RequestBody CV cv) {
         System.out.println("Received CV: " + cv);
-        CV createdCV = cvService.saveCV(cv); // Save the CV based on the provided data
-        return ResponseEntity.status(201).body(createdCV); // Return the created CV
+        CV createdCV = cvService.saveCV(cv);
+        return ResponseEntity.status(201).body(createdCV);
     }
 
 
 
-    // Endpoint pentru a obține un CV pe baza ID-ului
     @GetMapping("/{cvId}")
     public ResponseEntity<CV> getCVById(@PathVariable Long cvId) {
         System.out.println("Received GET request for CV with ID: " + cvId);
@@ -42,7 +41,6 @@ public ResponseEntity<CV> getCVById(@PathVariable Long cvId) {
         return ResponseEntity.ok(cv); // Returnează CV-ul găsit
     }
 
-    // Endpoint pentru a obține toate CV-urile unui utilizator
     @GetMapping("/user/{userId}")
     public ResponseEntity<List<CV>> getCVsByUserId(@PathVariable Long userId) {
         List<CV> cvs = cvService.getCVsByUserId(userId);
@@ -53,24 +51,9 @@ public ResponseEntity<List<CV>> getCVsByUserId(@PathVariable Long userId) {
     }
 
 
-//    @GetMapping("/allcvs")
-//    public ResponseEntity<List<CV>> getAllCVs() {
-//        try {
-//            List<CV> allCVs = cvService.getAllCVs(); // Apelează serviciul pentru a obține toate CV-urile
-//            if (allCVs.isEmpty()) {
-//                return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null); // Dacă nu sunt CV-uri
-//            }
-//            return ResponseEntity.ok(allCVs); // Returnează lista de CV-uri
-//        } catch (Exception e) {
-//            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); // Dacă apare o eroare
-//        }
-//    }
-
-
-    // Endpoint pentru a obține CV-urile uploadate de un utilizator
     @GetMapping("/uploaded/{userId}")
     public ResponseEntity<List<CV>> getUploadedCVsByUserId(@PathVariable Long userId) {
-        List<CV> uploadedCVs = cvService.getUploadedCVsByUserId(userId); // Folosește un serviciu pentru a obține doar CV-urile uploadate
+        List<CV> uploadedCVs = cvService.getUploadedCVsByUserId(userId);
         if (uploadedCVs.isEmpty()) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
         }
@@ -91,16 +74,11 @@ public ResponseEntity<CV> uploadCV(@RequestBody CV cv) {
 
 
 
-
-
-
-
-
     // Endpoint pentru a descărca CV-ul ca fișier (PDF sau alt format)
     @GetMapping("/download/{cvId}")
     public ResponseEntity<byte[]> downloadCV(@PathVariable Long cvId) {
         CV cv = cvService.findById(cvId);
-        // Logică pentru generarea și returnarea fișierului PDF
+
         return null;
     }
 
@@ -228,7 +206,7 @@ public ResponseEntity<List<CV>> getAllCVs(@RequestParam(value = "cvType", requir
             System.out.println("CvType: " + cvType);
             List<CV> allCVs;
 
-            // If cvType is provided, filter by cvType
+
             if (cvType != null && !cvType.isEmpty()) {
                 allCVs = cvService.getCVsByType(cvType);
                 System.out.println("CvType: " + cvType);
@@ -237,11 +215,11 @@ public ResponseEntity<List<CV>> getAllCVs(@RequestParam(value = "cvType", requir
             }
 
             if (allCVs.isEmpty()) {
-                return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null); // If no CVs found
+                return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
             }
             return ResponseEntity.ok(allCVs); // Return the list of CVs
         } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); // Handle error
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
         }
     }
 
diff --git a/src/main/java/com/example/jobsnap/controller/EmployerController.java b/src/main/java/com/example/jobsnap/controller/EmployerController.java
index f1127d9..7c1e81e 100644
--- a/src/main/java/com/example/jobsnap/controller/EmployerController.java
+++ b/src/main/java/com/example/jobsnap/controller/EmployerController.java
@@ -19,9 +19,9 @@ public class EmployerController {
     private EmployerService employerService;
 
     @Autowired
-    private EmployerRepository employerRepository;  // Repository pentru Employer
+    private EmployerRepository employerRepository;
     @Autowired
-    private UserRepository userRepository;  // Repository pentru User, pentru a verifica ID-ul utilizatorului
+    private UserRepository userRepository;
 
     // Get all employers
     @GetMapping
@@ -34,23 +34,21 @@ public List<Employer> getAllEmployers() {
     public ResponseEntity<Employer> getEmployerProfile(@PathVariable Long id) {
         Optional<Employer> employer = employerRepository.findById(id);
         if (employer.isPresent()) {
-            return ResponseEntity.ok(employer.get());  // Returnează profilul angajatorului
+            return ResponseEntity.ok(employer.get());
         } else {
-            return ResponseEntity.notFound().build();  // Returnează 404 dacă angajatorul nu este găsit
+            return ResponseEntity.notFound().build();
         }
     }
 
-    // Create a new employer
     @PostMapping
     public Employer createEmployer(@RequestBody Employer employer) {
-        System.out.println("Email primit în backend: " + employer.getEmail());  // Verifică dacă email-ul este corect primit
+        System.out.println("Email primit în backend: " + employer.getEmail());
         if (employer.getEmail() == null || employer.getEmail().isEmpty()) {
             throw new RuntimeException("Email is required");
         }
         return employerService.saveEmployer(employer);
     }
 
-    // Update employer profile by ID
     @PutMapping("/update/{id}")
     public ResponseEntity<Employer> updateEmployerProfile(@PathVariable Long id, @RequestBody Employer updatedEmployer) {
         Optional<Employer> employerOptional = employerRepository.findById(id);
@@ -64,11 +62,11 @@ public ResponseEntity<Employer> updateEmployerProfile(@PathVariable Long id, @Re
             employer.setBio(updatedEmployer.getBio());
             return ResponseEntity.ok(employerRepository.save(employer));
         } else {
-            return ResponseEntity.notFound().build();  // Returnează 404 dacă nu găsește angajatorul
+            return ResponseEntity.notFound().build();
         }
     }
 
-    // Delete employer by ID
+
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteEmployer(@PathVariable Long id) {
         if (employerService.getEmployerById(id).isPresent()) {
diff --git a/src/main/java/com/example/jobsnap/controller/ProfileController.java b/src/main/java/com/example/jobsnap/controller/ProfileController.java
index 477356d..156f8cd 100644
--- a/src/main/java/com/example/jobsnap/controller/ProfileController.java
+++ b/src/main/java/com/example/jobsnap/controller/ProfileController.java
@@ -9,7 +9,7 @@
 
 @RestController
 @RequestMapping("/profile")
-@CrossOrigin(origins = "http://localhost:3000") // Permite conexiuni din frontend
+@CrossOrigin(origins = "http://localhost:3000")
 public class ProfileController {
 
     @Autowired
@@ -17,20 +17,20 @@ public class ProfileController {
 
     @GetMapping("/{id}")
     public ResponseEntity<Profile> getProfile(@PathVariable int id) {
-        Profile profile = profileService.getProfileById(id);  // Using user_id
+        Profile profile = profileService.getProfileById(id);
         if (profile == null) {
-            return ResponseEntity.notFound().build();  // Return 404 if profile not found
+            return ResponseEntity.notFound().build();
         }
-        return ResponseEntity.ok(profile);  // Return 200 OK with the profile data
+        return ResponseEntity.ok(profile);
     }
 
     @PutMapping("/{id}")
     public ResponseEntity<Profile> updateProfile(@PathVariable int id, @RequestBody Profile updatedProfile) {
         try {
             Profile profile = profileService.updateProfile(id, updatedProfile);
-            return ResponseEntity.ok(profile);  // Return updated profile
+            return ResponseEntity.ok(profile);
         } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);  // Handle errors
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
         }
     }
 
diff --git a/src/main/java/com/example/jobsnap/controller/StudentController.java b/src/main/java/com/example/jobsnap/controller/StudentController.java
index 4cc9612..c80bd31 100644
--- a/src/main/java/com/example/jobsnap/controller/StudentController.java
+++ b/src/main/java/com/example/jobsnap/controller/StudentController.java
@@ -19,11 +19,11 @@ public class StudentController {
     private StudentService studentService;
 
     @Autowired
-    private StudentRepository studentRepository;  // Repository pentru Student
+    private StudentRepository studentRepository;
     @Autowired
-    private UserRepository userRepository;  // Repository pentru User, pentru a verifica ID-ul utilizatorului
+    private UserRepository userRepository;
+
 
-    // Get all students
     @GetMapping
     public List<Student> getAllStudents() {
         return studentService.getAllStudents();
@@ -34,9 +34,9 @@ public List<Student> getAllStudents() {
     public ResponseEntity<Student> getStudentProfile(@PathVariable Long id) {
         Optional<Student> student = studentRepository.findById(id);
         if (student.isPresent()) {
-            return ResponseEntity.ok(student.get());  // Returnează profilul studentului
+            return ResponseEntity.ok(student.get());
         } else {
-            return ResponseEntity.notFound().build();  // Returnează 404 dacă studentul nu este găsit
+            return ResponseEntity.notFound().build();
         }
     }
 
@@ -46,13 +46,13 @@ public Student createStudent(@RequestBody Student student) {
         return studentService.saveStudent(student);
     }
 
-    // Update student profile
+
     @PutMapping("/update/{id}")
     public ResponseEntity<Student> updateStudentProfile(@PathVariable Long id, @RequestBody Student updatedStudent) {
         Optional<Student> studentOptional = studentRepository.findById(id);
         if (studentOptional.isPresent()) {
             Student student = studentOptional.get();
-            // Actualizează informațiile studentului
+
             student.setFirstName(updatedStudent.getFirstName());
             student.setLastName(updatedStudent.getLastName());
             student.setUniversityName(updatedStudent.getUniversityName());
@@ -60,13 +60,13 @@ public ResponseEntity<Student> updateStudentProfile(@PathVariable Long id, @Requ
             student.setPhone(updatedStudent.getPhone());
             student.setBio(updatedStudent.getBio());
 
-            return ResponseEntity.ok(studentRepository.save(student));  // Salvează și returnează studentul actualizat
+            return ResponseEntity.ok(studentRepository.save(student));
         } else {
-            return ResponseEntity.notFound().build();  // Returnează 404 dacă nu găsește studentul
+            return ResponseEntity.notFound().build();
         }
     }
 
-    // Delete student by ID
+
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteStudent(@PathVariable Long id) {
         if (studentService.getStudentById(id).isPresent()) {
diff --git a/src/main/java/com/example/jobsnap/controller/UserController.java b/src/main/java/com/example/jobsnap/controller/UserController.java
index db2ed00..53a1220 100644
--- a/src/main/java/com/example/jobsnap/controller/UserController.java
+++ b/src/main/java/com/example/jobsnap/controller/UserController.java
@@ -4,6 +4,7 @@
 import com.example.jobsnap.repository.StudentRepository;
 import com.example.jobsnap.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +12,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -26,28 +28,34 @@ public class UserController {
     @Autowired
     private EmployerRepository employerRepository;
 
-    // Endpoint pentru verificarea emailului
     @GetMapping("/check-email")
     public ResponseEntity<Map<String, Boolean>> checkEmail(@RequestParam String email) {
-        System.out.println("Received email check for: " + email);  // Log pentru debugging
+        System.out.println("Received email check for: " + email);
         boolean exists = userRepository.findByEmail(email).isPresent();
-        return ResponseEntity.ok(Collections.singletonMap("exists", exists));
-    }
 
+        // Returnează un Map explicit
+        Map<String, Boolean> response = new HashMap<>();
+        response.put("exists", exists);
+
+        return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(response);
+    }
 
-    // Endpoint pentru verificarea numărului de telefon
     @GetMapping("/check-phone")
     public ResponseEntity<Map<String, String>> checkPhone(@RequestParam String phone) {
-        // Verifică dacă numărul de telefon există în tabela Student sau Employer
         boolean studentExists = studentRepository.findByPhone(phone).isPresent();
         boolean employerExists = employerRepository.findByCompanyPhone(phone).isPresent();
 
+        Map<String, String> response = new HashMap<>();
         if (studentExists) {
-            return ResponseEntity.ok(Collections.singletonMap("exists", "Student"));
+            response.put("exists", "Student");
         } else if (employerExists) {
-            return ResponseEntity.ok(Collections.singletonMap("exists", "Employer"));
+            response.put("exists", "Employer");
         } else {
-            return ResponseEntity.ok(Collections.singletonMap("exists", "No"));
+            response.put("exists", "No");
         }
+
+        return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(response);
     }
+
+
 }
diff --git a/src/main/java/com/example/jobsnap/entity/CVTemplate.java b/src/main/java/com/example/jobsnap/entity/CVTemplate.java
index ad2f04d..54edbdb 100644
--- a/src/main/java/com/example/jobsnap/entity/CVTemplate.java
+++ b/src/main/java/com/example/jobsnap/entity/CVTemplate.java
@@ -9,7 +9,7 @@ public class CVTemplate implements Cloneable {
     @Id
     private Long id;
 
-    // Constructori, getters și setters
+
 
     @Override
     public Object clone() throws CloneNotSupportedException {
diff --git a/src/main/java/com/example/jobsnap/entity/Employer.java b/src/main/java/com/example/jobsnap/entity/Employer.java
index f916dbb..29aff6b 100644
--- a/src/main/java/com/example/jobsnap/entity/Employer.java
+++ b/src/main/java/com/example/jobsnap/entity/Employer.java
@@ -18,7 +18,7 @@ public class Employer extends User {
     private String bio;
     // Constructor
     public Employer(String email, String password, String companyName, String companyEmail, String companyPhone, String firstName, String lastName, String bio) {
-        super(email, password);  // Calls the constructor of the User class
+        super(email, password);
         this.companyEmail = companyEmail;
         this.companyName = companyName;
         this.companyPhone = companyPhone;
diff --git a/src/main/java/com/example/jobsnap/repository/CVRepository.java b/src/main/java/com/example/jobsnap/repository/CVRepository.java
index 9010471..47c344b 100644
--- a/src/main/java/com/example/jobsnap/repository/CVRepository.java
+++ b/src/main/java/com/example/jobsnap/repository/CVRepository.java
@@ -7,7 +7,7 @@
 
 public interface CVRepository extends JpaRepository<CV, Long> {
 
-    // Custom query to find CVs by userId
+
     List<CV> findByUserId(Long userId);
     List<CV> findByCvTypeIgnoreCase(String cvType);
 
diff --git a/src/main/java/com/example/jobsnap/repository/UserRepository.java b/src/main/java/com/example/jobsnap/repository/UserRepository.java
index d6eaa32..e7f154a 100644
--- a/src/main/java/com/example/jobsnap/repository/UserRepository.java
+++ b/src/main/java/com/example/jobsnap/repository/UserRepository.java
@@ -5,6 +5,6 @@
 import java.util.Optional;
 
 public interface UserRepository extends JpaRepository<User, Integer> {
-    // Metodă personalizată pentru a căuta un user după email
+
     Optional<User> findByEmail(String email);
 }
diff --git a/src/main/java/com/example/jobsnap/service/AuthService.java b/src/main/java/com/example/jobsnap/service/AuthService.java
index d2e0f82..4303c13 100644
--- a/src/main/java/com/example/jobsnap/service/AuthService.java
+++ b/src/main/java/com/example/jobsnap/service/AuthService.java
@@ -34,10 +34,10 @@ public class AuthService {
     @Autowired
     private EmployerRepository employerRepository;
 
-    // Cream un PasswordEncoder (de exemplu, BCrypt)
+
     private final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 
-    // Secret key for JWT signing (should be stored securely in production)
+
     private final SecretKey secretKey = Keys.secretKeyFor(SignatureAlgorithm.HS256);
 
     /**
@@ -66,11 +66,11 @@ public void signUp(String email, String password, String role, String firstName,
         if ("student".equalsIgnoreCase(role)) {
             // Create and save a new Student entity with hashed password
             Student student = new Student(email, hashedPassword, universityName, universityEmail, phone, firstName, lastName, bio);
-            studentRepository.save(student);  // Save in the 'student' table
+            studentRepository.save(student);
         } else if ("employer".equalsIgnoreCase(role)) {
             // Create and save a new Employer entity with hashed password
             Employer employer = new Employer(email, hashedPassword, companyName, companyEmail, companyPhone, firstName, lastName, bio);
-            employerRepository.save(employer);  // Save in the 'employer' table
+            employerRepository.save(employer);
         } else {
             throw new RuntimeException("Invalid role");
         }
diff --git a/src/main/java/com/example/jobsnap/service/CVService.java b/src/main/java/com/example/jobsnap/service/CVService.java
index aec906a..25ca2f0 100644
--- a/src/main/java/com/example/jobsnap/service/CVService.java
+++ b/src/main/java/com/example/jobsnap/service/CVService.java
@@ -51,11 +51,11 @@ public List<CV> getAllCVs() {
     }
 
     public List<CV> getCVsByType(String cvType) {
-        return cvRepository.findByCvTypeIgnoreCase(cvType); // Make sure the repository supports this query
+        return cvRepository.findByCvTypeIgnoreCase(cvType);
     }
 
 
     public List<CV> getUploadedCVsByUserId(Long userId) {
-        return cvRepository.findByUserIdAndIsUploadedTrue(userId);  // Căutăm CV-urile care sunt uploadate
+        return cvRepository.findByUserIdAndIsUploadedTrue(userId);
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2a6ade7..11cae46 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -4,8 +4,8 @@ server.port=8080
 #adica modificati urm 3 linii ca altfel nu o sa va mearga
 
 spring.datasource.url=jdbc:oracle:thin:@localhost:1521:XE
-spring.datasource.username=cosmin
-spring.datasource.password=cosmin2003
+spring.datasource.username=c##letitia
+spring.datasource.password=parola26
 
 
 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver