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

102 implementing satisfaction survey page #108

Open
wants to merge 60 commits into
base: main
Choose a base branch
from
Open

102 implementing satisfaction survey page #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
39cfbb5
implement-my-info-personal-and-job
ergunesra Jun 29, 2024
4eb0e4d
Integrated components
olusegunawowole Aug 29, 2024
1bfe2b9
Integrated components
olusegunawowole Aug 29, 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
b74e9f5
add actionbutton
ergunesra Sep 3, 2024
ad82758
updating myinfopage
ergunesra Sep 3, 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
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
a78b9d9
added reports file
ergunesra Sep 15, 2024
45f6b07
Added loading symbols and modified sidebar to be static
GabrielChan1 Sep 17, 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
71b5c5e
update myinfo and report pages
ergunesra 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
2d9518d
update for fixing issues on report and main pages
ergunesra Oct 17, 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
d506f1c
update
ergunesra Oct 21, 2024
89a1486
update
ergunesra Oct 21, 2024
b327130
new branch
ergunesra Oct 21, 2024
dfebfac
update
ergunesra Oct 21, 2024
6fbfe4c
Fixed SetupCompanyPage
GabrielChan1 Oct 23, 2024
20afada
Modified size of menu components
GabrielChan1 Oct 23, 2024
eb1e2be
new branch
ergunesra Oct 24, 2024
2e3ae18
report page update
ergunesra Oct 24, 2024
e3456ed
added custom tabs component
ergunesra Oct 31, 2024
939b16e
update for using CustomTabs component
ergunesra Oct 31, 2024
243e3b4
Merge branch '34-implement-my-info-personal-and-job' into 102-impleme…
ergunesra Oct 31, 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
520cfeb
implement satisfaction survey page and apply tabs
ergunesra Nov 6, 2024
955e86c
last update
ergunesra Nov 8, 2024
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
  •  
  •  
  •  
15 changes: 6 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/node_modules
/.pnp
.pnp.js
/client

# testing
/coverage
Expand All @@ -13,20 +14,16 @@

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
.env
/dev
/constants/data/images

.storybook
.vscode
/src/stories

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

*storybook.log
.storybook/
/src/stories

.env
0 client/src/assets/admin-view.json → .vscode/settings.json
View file
Open in desktop
File renamed without changes.
Binary file removed client/src/Images/a99b7c47182d3a04f5f3ed31db0dd8a6.jpg
View file
Open in desktop
Binary file not shown.
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