Skip to content

947756: Need to fix the UI changes from UX team in employee management showcase application. #22

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

Merged
merged 2 commits into from
Mar 18, 2025
Merged
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
2 changes: 1 addition & 1 deletion Employee_Managment_App/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function App() {
<div className="xyz-management-content" style={{ width: '100%' }}>
<div className="row">
<div className="col-md-2 sidebar">
<div className="title">NexGen7 Software PVT LTD</div>
<div className="title">NexGen7 Software</div>
<ul className="nav flex-column">
<li className="nav-item">
<NavLink className="nav-link" to="/">
Expand Down
57 changes: 53 additions & 4 deletions Employee_Managment_App/src/components/Achievements.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ const Achievements = () => {
</div>
</div>
</div>
</div>
</div>
<div className="row">
<div className="row card-layout">
<div className="col-xs-6 col-sm-6 col-lg-6 col-md-6">
<div className="e-card" id="basic_card">
<div className="e-card-header">
Expand Down Expand Up @@ -94,10 +90,63 @@ const Achievements = () => {
</div>
</div>
</div>
<div className="col-xs-6 col-sm-6 col-lg-6 col-md-6">
<div className="e-card" id="basic_card">
<div className="e-card-header">
<div className="e-card-header-caption">
<div className="e-card-header-title">
Professional Development and Skills Mastery
</div>
<div className="e-card-sub-title">
Certification Attainment
</div>
</div>
</div>
<div className="e-card-content">
Celebrating individuals who acquire new skills and
certifications. Recognizing dedication to continuous
learning and professional growth. Validating expertise and
proficiency in specific technologies or methodologies.
Encouraging a culture of lifelong learning and skill
enhancement.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Read More
</a>
</div>
</div>
</div>
</div>
</div>
<div className="row">
<div className="row card-layout">
<div className="col-xs-6 col-sm-6 col-lg-6 col-md-6">
<div className="e-card" id="basic_card">
<div className="e-card-header">
<div className="e-card-header-caption">
<div className="e-card-header-title">
Client Impact and Customer Success
</div>
<div className="e-card-sub-title">
Customer Satisfaction Excellence
</div>
</div>
</div>
<div className="e-card-content">
Recognizing teams that go above and beyond to deliver exceptional
customer experiences. Celebrating innovative solutions that address
client needs and enhance user satisfaction. Acknowledging effortsin
building strong customer relationships through reliable support and service.
Encouraging a customer-first mindset to drive long-term business success.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Read More
</a>
</div>
</div>
</div>
<div className="col-xs-6 col-sm-6 col-lg-6 col-md-6">
<div className="e-card" id="basic_card">
<div className="e-card-header">
Expand Down
23 changes: 16 additions & 7 deletions Employee_Managment_App/src/components/Announcement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ const Announcement = () => {
growth and innovation. Expanding our reach allows us to
better serve our diverse clientele. Join us as we embark
on this exciting journey of expansion and opportunity.
We look forward to collaborating with new partners and strengthening our global presence.
This expansion will unlock new possibilities and create exciting opportunities for our customers and employees alike.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Expand All @@ -46,7 +48,8 @@ const Announcement = () => {
emerging market demands and challenges. Experience
unparalleled features designed to enhance productivity and
efficiency. Stay tuned for the official launch event and
product demonstrations.
product demonstrations. Be among the first to explore how this breakthrough technology can transform your workflow.
We are committed to pushing the boundaries of technology to bring you smarter, more efficient solutions.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Expand Down Expand Up @@ -74,7 +77,8 @@ const Announcement = () => {
invaluable in driving our company's success. We extend our
heartfelt appreciation for their commitment and passion.
Let's continue to inspire and support each other in
achieving greatness.
achieving greatness. Together, we create a workplace where excellence and teamwork thrive.
Your dedication and perseverance are the foundation of our continued success and innovation.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Expand All @@ -98,7 +102,8 @@ const Announcement = () => {
latest skills and knowledge to excel in your role. Explore
a range of professional development opportunities tailored
to your needs. Invest in your future success and unleash
your full potential with us.
your full potential with us. Continuous learning is key to staying ahead in today’s evolving industry landscape.
Take this opportunity to expand your expertise and gain a competitive edge in your field.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Expand Down Expand Up @@ -126,7 +131,8 @@ const Announcement = () => {
accomplishments and looking forward to the future. Join us
as we celebrate this momentous occasion with gratitude and
pride. Together, we celebrate our resilience, dedication,
and shared success.
and shared success. This achievement is a testament to our unwavering commitment and hard work.
We couldn't have reached this milestone without the collective efforts of our incredible team.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Expand All @@ -150,7 +156,8 @@ const Announcement = () => {
activities that contribute to sustainable development
goals. Join us in giving back to the community and
creating a brighter future for all. Together, we can drive
positive change and leave a lasting legacy.
positive change and leave a lasting legacy. By working together, we can make a tangible difference in the world.
Through collective action and responsibility, we aim to build a more sustainable and inclusive future.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Expand Down Expand Up @@ -178,7 +185,8 @@ const Announcement = () => {
in our operational guidelines and protocols. Stay informed
about changes that may affect your work and
responsibilities. Your compliance and cooperation are
vital in upholding our standards of excellence.
vital in upholding our standards of excellence. Adapting to these
updates ensures smooth operations and continued workplace efficiency.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Expand All @@ -202,7 +210,8 @@ const Announcement = () => {
range of wellness programs and resources. Join us in
fostering a supportive and healthy workplace culture for
all. Invest in your physical, mental, and emotional
wellness with us.
wellness with us. A healthier workforce leads to greater
productivity and overall happiness.
</div>
<div className="e-card-actions">
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
Expand Down
31 changes: 30 additions & 1 deletion Employee_Managment_App/src/components/EmployeeInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { TabComponent, TabItemDirective, TabItemsDirective } from '@syncfusion/ej2-react-navigations';
import { Internationalization } from '@syncfusion/ej2-base';
import { useLocation } from 'react-router-dom';
import { EmployeeDetails } from '../interface';
import { EmployeeDetails } from '../../interface';
import EmployeeLeave from './EmployeeLeave';
import EmployeePayStub from './EmployeePayStub';
import EmployeePayRoll from './EmployeePayRoll';
Expand Down Expand Up @@ -91,6 +91,34 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ
<span className="gap">:</span>
<span className="information">{experience}+ years</span>
</div>
<div className="detail">
<span className="sub-heading">User Work Shift</span>
<span className="gap">:</span>
<span className="information">
{"Regular"}
</span>
</div>
<div className="detail">
<span className="sub-heading">WFH</span>
<span className="gap">:</span>
<span className="information">
{"Yes"}
</span>
</div>
<div className="detail">
<span className="sub-heading">Employment Type</span>
<span className="gap">:</span>
<span className="information">
{"Full-Time"}
</span>
</div>
<div className="detail">
<span className="sub-heading">Company Benefits</span>
<span className="gap">:</span>
<span className="information">
{"Health Insurance, Gift Cards"}
</span>
</div>
</div>
);
};
Expand Down Expand Up @@ -192,6 +220,7 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ
<b>{employeeData.Name}</b>
</div>
<div className="profile-data">{employeeData.Designation}</div>
<div className="profile-data">Mail Id: {employeeData.Mail}</div>
<div className="profile-data">Branch: {employeeData.Branch}</div>
<div className="profile-data">Lead: {employeeData.TeamLead}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Employee_Managment_App/src/components/Employees.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ const Employees = (props?: { employeeData?: EmployeeDetails; userInfo?: Employee
dataSource={data}
query={props?.employeeData ? query : undefined}
allowPaging={true}
pageSettings={{ pageCount: 4, pageSize: 15 }}
allowExcelExport={true}
height={270}
width={'100%'}
allowGrouping={true}
groupSettings={{ enableLazyLoading: true }}
Expand Down
Loading