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.

Sign up for GitHub

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

Dev frontend #87

Open
wants to merge 131 commits into
base: dev
Choose a base branch
from
Open

Dev frontend #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
023e91d
Set base structure and added tab content component
Jul 4, 2024
aa4a665
Added react hook form and started form component
Jul 8, 2024
018678a
Finished UI base of form
malenacaroline Jul 8, 2024
affba9c
Finished UI styles form
malenacaroline Jul 8, 2024
10b01c4
Fixed issues in the form
malenacaroline Jul 10, 2024
d61e717
Fix issue autocomplete and RHF
malenacaroline Jul 10, 2024
20cec56
Created departaments feature
malenacaroline Jul 10, 2024
8019f83
Load data from backend and fill in form
malenacaroline Jul 11, 2024
c9f3c81
Updated data info in database
malenacaroline Jul 12, 2024
0d4eec6
resolve conflicts
malenacaroline Aug 12, 2024
e6056ca
added validations, load data from db and showed data updated
malenacaroline Jul 15, 2024
44c90a2
fix upload file component
malenacaroline Jul 15, 2024
e21e9dd
got value file and add to rhf object
Jul 16, 2024
d024695
created table and load departments
malenacaroline Jul 16, 2024
1702097
added improvements to company profile
Jul 16, 2024
24c7ac7
ui table and integration data departments tab
Jul 17, 2024
8215040
fix border error textfield
malenacaroline Jul 17, 2024
08cc707
refactored API calls on setting pages component
malenacaroline Jul 18, 2024
1f059b6
fix issues about upload file component and blob type image
malenacaroline Jul 22, 2024
cbf83e0
Fix issue to show and save image
Jul 22, 2024
0d70577
add improvements
Jul 23, 2024
91a1594
add more functionalites on departments and job titles tabs
Jul 23, 2024
846a688
Add dialos to departments tab content
malenacaroline Jul 23, 2024
f5d6aa0
Add and edit departments features
Jul 24, 2024
277b665
data integration on add and edit new department
malenacaroline Jul 25, 2024
ce464f8
added delete functionalities
Jul 25, 2024
ac78c5f
Added delete functionality and some other adjustments
malenacaroline Jul 25, 2024
c2487ce
refactor dialogs
malenacaroline Jul 30, 2024
0fe6017
resolve rebase conflicts
malenacaroline Aug 12, 2024
1a95853
added transfer employees feature
malenacaroline Jul 31, 2024
4df24f6
fix edit new department error
Aug 1, 2024
9be9ae1
change structure and organize files
Aug 1, 2024
7452e20
wrap up job titles
malenacaroline Aug 9, 2024
353a4cf
fix errors
Aug 10, 2024
a11d9ad
resolve UI issues
malenacaroline Aug 12, 2024
81f5e95
restructure api calls
Aug 14, 2024
92539eb
remove duplicate api calls
malenacaroline Aug 15, 2024
73794ca
refactor components
malenacaroline Aug 15, 2024
d139524
refactor dialogs
malenacaroline Aug 16, 2024
8556e13
add adjustments dialogs
malenacaroline Aug 19, 2024
162bef3
change api requests
Aug 19, 2024
094aa6f
refactor job titles with new structure code
malenacaroline Aug 20, 2024
8515f44
add ajustments to timeoff policies
Aug 21, 2024
a228c5d
finish ui add policy
Aug 22, 2024
e34fa6c
create manage permissions UI
Aug 22, 2024
c56fc63
add api calls
malenacaroline Aug 27, 2024
0352a7e
add permissions logic
Aug 27, 2024
ab66d70
change dialog for permissions
malenacaroline Aug 28, 2024
4eb0e4d
Integrated components
olusegunawowole Aug 29, 2024
1bfe2b9
Integrated components
olusegunawowole Aug 29, 2024
098e906
add logic to handle permissions changes
Aug 30, 2024
e12c39e
fix issue in change permissions
Aug 30, 2024
b200d49
First integration commit
GabrielChan1 Aug 31, 2024
0d5798c
Modified .gitignore
GabrielChan1 Aug 31, 2024
9ae29fb
completed integration
fazlul-01 Sep 2, 2024
43caf92
Integrating front end API changes into home page and time off page
GabrielChan1 Sep 3, 2024
9a9b293
Merge branch 'dev-frontend' of github.com:bluewave-labs/bluewave-hrm …
GabrielChan1 Sep 3, 2024
eebe81a
add loading state
malenacaroline Sep 3, 2024
f328da8
add get policies by company
Sep 5, 2024
3f9000f
add table to show change in dialog
Sep 5, 2024
4e9cac1
Integrated home and time off pages into dashboard
GabrielChan1 Sep 5, 2024
cab2244
Merge branch 'dev-frontend' of github.com:bluewave-labs/bluewave-hrm …
GabrielChan1 Sep 5, 2024
4ae702e
Resolving conflict
GabrielChan1 Sep 5, 2024
37c5a1a
Modified header to be fixed and transparent
GabrielChan1 Sep 7, 2024
2f9114e
Modified time off teams tab to only display for admin and managers
GabrielChan1 Sep 7, 2024
29d6afb
fix company logo issue and add mock data
malenacaroline Sep 9, 2024
cddd796
organize ui and flows
Sep 9, 2024
6b4e085
Updated people section
olusegunawowole Sep 10, 2024
13f6775
Updated people section
olusegunawowole Sep 10, 2024
07e9238
installed few mui packages
fazlul-01 Sep 11, 2024
09f2e5f
add employees list through manager
malenacaroline Sep 11, 2024
45f6b07
Added loading symbols and modified sidebar to be static
GabrielChan1 Sep 17, 2024
85f6690
manipulate managed employees object
malenacaroline Sep 18, 2024
e28ea03
added new confirmation modal
fazlul-01 Sep 25, 2024
5a9d3e1
Merge pull request #94 from bluewave-labs/frontend-offboarding-integr…
fazlul-01 Sep 25, 2024
ebefffd
added new spacing standards in peoples page
fazlul-01 Sep 25, 2024
b9c4603
Merge pull request #95 from bluewave-labs/frontend-offboarding-integr…
fazlul-01 Sep 25, 2024
9194dd2
Merge branch 'dev-frontend' of https://github.com/bluewave-labs/bluew…
fazlul-01 Sep 25, 2024
de4db24
Reworked time off deletion process to require manager's confirmation
GabrielChan1 Sep 27, 2024
b49b99c
Resolving merge conflict
GabrielChan1 Sep 27, 2024
473c7c7
fixed localhost bug
fazlul-01 Oct 1, 2024
39b8fa1
Merge branch 'dev-frontend' of https://github.com/bluewave-labs/bluew…
fazlul-01 Oct 1, 2024
99d70ef
fixed dashboard spacing
fazlul-01 Oct 1, 2024
b553c24
add fixes in UI
malenacaroline Oct 2, 2024
93a413f
add new menu
Oct 2, 2024
e685d33
api integration timeoff
malenacaroline Oct 10, 2024
46374ec
add renewal month functionality and other functionalities
Oct 11, 2024
12c8441
adjust timeoff functionalities
malenacaroline Oct 11, 2024
c97e507
Merge branch 'dev-frontend' of https://github.com/bluewave-labs/bluew…
olusegunawowole Oct 15, 2024
0c5ccf1
updated people section
olusegunawowole Oct 15, 2024
c0429be
time off delete API integration
malenacaroline Oct 16, 2024
9df1d8b
fix errors in timeoff feature
malenacaroline Oct 16, 2024
680f188
Implemented onboarding pages for new employees
GabrielChan1 Oct 18, 2024
13216b6
Merge branch 'dev-frontend' of https://github.com/bluewave-labs/bluew…
olusegunawowole Oct 19, 2024
2bf4b24
People section updated.
olusegunawowole Oct 19, 2024
bf2c7e1
Merge branch 'dev-frontend' of https://github.com/bluewave-labs/bluew…
olusegunawowole Oct 19, 2024
1a22ece
Modified onboarding integration
olusegunawowole Oct 19, 2024
570c9ec
Integrated myinfo and reports components
olusegunawowole Oct 20, 2024
849c577
modified StateContext
olusegunawowole Oct 20, 2024
ed2d065
add adjustments
malenacaroline Oct 21, 2024
6fbfe4c
Fixed SetupCompanyPage
GabrielChan1 Oct 23, 2024
20afada
Modified size of menu components
GabrielChan1 Oct 23, 2024
53b18ff
Integrated back end API into onboarding process
GabrielChan1 Nov 1, 2024
5f565d7
Implemented download feature for base64 encoded files
GabrielChan1 Nov 2, 2024
2c1a132
Applied new tabs
GabrielChan1 Nov 3, 2024
a332cf6
Modified download feature for onboarding files
GabrielChan1 Nov 4, 2024
2704426
Fixed time period validation when requesting time off
GabrielChan1 Nov 6, 2024
916e754
Fixed automatic updates in Time Off page when a new time off request …
GabrielChan1 Nov 6, 2024
1ffac6b
Implemented automated email system when completing onboarding
GabrielChan1 Nov 20, 2024
1879962
resolve conflicts
malenacaroline Nov 25, 2024
aab4b2c
add some adjustments
malenacaroline Nov 25, 2024
91b068c
add more adjustments
malenacaroline Nov 28, 2024
4080584
add adjustments to contextAPI
malenacaroline Nov 28, 2024
2ff4fa4
resolve ui issues
Dec 2, 2024
de690b3
organize base url to API calls
malenacaroline Dec 4, 2024
b98eeb4
resolve permissions issues
malenacaroline Dec 4, 2024
e5ea6b6
add improvements
Dec 5, 2024
28d9a08
Add changes permissions logic and ui
malenacaroline Dec 19, 2024
296e478
add adjustments
malenacaroline Dec 19, 2024
aabb066
change manager to employee permission ui
malenacaroline Dec 20, 2024
19c5ef0
fix permissions issues
malenacaroline Dec 23, 2024
a19c72b
resolve permissions issues and add improvements
Dec 24, 2024
a9dd7cd
Merge pull request #109 from bluewave-labs/copy-settings-page
olusegunawowole Dec 30, 2024
a0d0f23
Offboarding modified
olusegunawowole Dec 31, 2024
eddbddd
Refactoring code in StaticComponents, PopupComponents, TimeOffPage an…
GabrielChan1 Jan 1, 2025
7da9f58
Implemented Surveys Page UI
GabrielChan1 Jan 5, 2025
3f80a27
Minor changes to NewSurveyPopup
GabrielChan1 Jan 7, 2025
334df90
Merge branch 'dev-frontend' of https://github.com/bluewave-labs/bluew…
olusegunawowole Jan 10, 2025
b93b8e2
Created additional fetch functions
olusegunawowole Jan 10, 2025
81d9dcf
Merge branch 'dev-frontend' of https://github.com/bluewave-labs/bluew…
olusegunawowole Jan 10, 2025
ee4a7d7
Minor changes to header and sidemenu
GabrielChan1 Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
/node_modules
/.pnp
.pnp.js
/client
/src/components/TestComponents

# testing
/coverage
Expand All @@ -13,6 +15,7 @@

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
Expand All @@ -21,12 +24,17 @@
/dev
/constants/data/images

.storybook
.vscode
/src/stories

npm-debug.log*
yarn-debug.log*
yarn-error.log*

*storybook.log
.storybook/
/src/stories
/src/assets/FetchServices/BaseUrl.json

.env
Empty file removed client/src/assets/admin-view.json
View file
Open in desktop
Empty file.
Binary file removed client/src/assets/images/logo.png
View file
Open in desktop
Binary file not shown.
Empty file removed client/src/assets/table-view-admin.json
View file
Open in desktop
Empty file.
Empty file removed client/src/assets/table-view-employee.json
View file
Open in desktop
Empty file.
84 changes: 0 additions & 84 deletions client/src/components/BasicMenus/BasicMenu.stories.js
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions client/src/components/BasicMenus/Clickable.stories.js
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions client/src/components/BasicMenus/DropDown.stories.js
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions client/src/components/BasicMenus/MenuItem.jsx
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions client/src/components/BasicMenus/MenuToggleButton.jsx
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions client/src/components/BasicMenus/MenuToggleButton.stories.js
View file
Open in desktop

This file was deleted.

Loading