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.

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

Main #70

Closed
wants to merge 54 commits into from
Closed

Main #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
316f45d
ProgressBar and Popup
sejunpark2002 Apr 30, 2024
a3d7ece
UI Component
sejunpark2002 May 7, 2024
494d219
UI modification
sejunpark2002 May 30, 2024
f6ddd3d
minor UI change
sejunpark2002 Jun 4, 2024
de77cae
Merge pull request #24 from bluewave-labs/main
GabrielChan1 Jun 6, 2024
893d425
Issue 25: Implement tables for available and upcoming time off
GabrielChan1 Jun 7, 2024
a58458e
Implemented file uploading functionaliy
sejunpark2002 Jun 9, 2024
3aea6de
Issue 25: Implement time off menu component
GabrielChan1 Jun 10, 2024
af3aa77
Issue 25: Implement time off page
GabrielChan1 Jun 10, 2024
1af8318
Implemented delete button on the filelist
sejunpark2002 Jun 10, 2024
2effc15
Created employee activation email template
louisv20 Jun 12, 2024
26efac9
Created HR email templates
louisv20 Jun 13, 2024
648cfb8
created HR email templates
louisv20 Jun 13, 2024
72416a4
Merge branch 'bluewave-labs:dev' into dev
louisv20 Jun 13, 2024
1f9e9f8
added new template.html file
louisv20 Jun 13, 2024
578f8c7
Merge branch 'dev' of https://github.com/louisv20/bluewave-hrm into dev
louisv20 Jun 13, 2024
1354347
Implemented date format change function
sejunpark2002 Jun 15, 2024
5062b65
Issue 25: Implement Popup menu components for requesting time off
GabrielChan1 Jun 16, 2024
858bc71
Cleaned up code and added more documentation
GabrielChan1 Jun 17, 2024
2d76c47
modified templates
louisv20 Jun 17, 2024
f72cfe3
Merge pull request #28 from bluewave-labs/25-implement-time-off-menus…
zaidi201 Jun 18, 2024
1363704
Merge pull request #26 from louisv20/dev
zaidi201 Jun 19, 2024
01e5d69
Merge branch '25-implement-time-off-menus-and-pages' into dev
GabrielChan1 Jun 19, 2024
5cf8979
Merge branch '25-implement-time-off-menus-and-pages' into dev
GabrielChan1 Jun 19, 2024
d78fae6
Merge branch 'dev' of github.com:bluewave-labs/bluewave-hrm into dev
GabrielChan1 Jun 19, 2024
5e53686
updates
sejunpark2002 Jun 19, 2024
34a1e0a
Merge branch 'dev' of github.com:bluewave-labs/bluewave-hrm into dev
GabrielChan1 Jun 22, 2024
efea761
Minor changes
GabrielChan1 Jun 22, 2024
9c2988e
Added scroll bar to TimeOffRequest table
GabrielChan1 Jun 24, 2024
6779845
Issue 32: Include additional filter controls and restrictions for tim…
GabrielChan1 Jun 24, 2024
ec6d10d
Issue 32: Refactor page components
GabrielChan1 Jun 26, 2024
fb3518c
Issue 32: Add .env file for back end development
GabrielChan1 Jun 26, 2024
bd93bdc
Issue 32: Implement front end API calls to post new companies, depart…
GabrielChan1 Jul 4, 2024
c31495a
Issue 32: Implement front end API calls to retrieve employee notifica…
GabrielChan1 Jul 8, 2024
e294323
Merge remote-tracking branch 'origin/5-implement-progress-announcemen…
GabrielChan1 Jul 8, 2024
e63df05
Issue 32: Implement front end API calls to modify employee notifications
GabrielChan1 Jul 11, 2024
d0c85db
Added Offboarding UI
fazlul-01 Jul 12, 2024
8a87204
Issue 32: Implement popup components for editing and deleting time off
GabrielChan1 Jul 15, 2024
84e93a9
Issue 32: Add additional documentation
GabrielChan1 Jul 15, 2024
c5cc0ef
Merge pull request #50 from bluewave-labs/32-sign-up-registration-and…
zaidi201 Jul 16, 2024
db41956
Merge branch '32-sign-up-registration-and-updates-api-coding-logic' i…
GabrielChan1 Jul 16, 2024
2bb9ea0
Merge pull request #52 from fazlul-01/dev
zaidi201 Jul 19, 2024
7330019
Merge branch 'dev' of github.com:bluewave-labs/bluewave-hrm into dev
GabrielChan1 Jul 22, 2024
dbc44fd
Resolving inital commit conflict
GabrielChan1 Jul 22, 2024
2bcca0e
Issue 58: Implement front end API calls for home page
GabrielChan1 Jul 30, 2024
68a78b0
Issue 58: Implement API calls for approving and rejecting time off re…
GabrielChan1 Jul 31, 2024
5576493
Integrated components
olusegunawowole Aug 1, 2024
529c68e
Issue 58: Adjust logo size and modified header to be transparent
GabrielChan1 Aug 1, 2024
882e431
Merge pull request #62 from bluewave-labs/58-implement-front-end-call…
zaidi201 Aug 2, 2024
3cb6b25
Merge pull request #60 from bluewave-labs/6-implement-table-with-sear…
zaidi201 Aug 4, 2024
7ad7a31
Update README.md
gorkem-bwl Aug 9, 2024
0fac896
Update issue templates
gorkem-bwl Aug 9, 2024
a52667e
Update README.md
gorkem-bwl Aug 10, 2024
5cce127
Merge pull request #65 from bluewave-labs/dev
zaidi201 Aug 11, 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
  •  
  •  
  •  
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- Browser [e.g. Chrome, Safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
30 changes: 29 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@

<p align="center"><strong>An open source human resource management application</strong></p>

![Github social](https://github.com/user-attachments/assets/0ce6f478-bed8-4fd6-a287-2a5cf31148ed)

![Time off settings](https://github.com/bluewave-labs/hrm/blob/main/Time%20off.png?raw=true)
## Features

The BlueWave HRM is a people and resource management application for your organization. It has the following features:

Expand All @@ -20,3 +21,30 @@ The BlueWave HRM is a people and resource management application for your organi
- Time off & vacation management
- Reporting

## Tech stack

* [ReactJs](https://react.dev/)
* [MUI (React framework)](https://mui.com/)
* [Node.js](https://nodejs.org/en)
* [PostgreSQL](https://www.postgresql.org/)

This application doesn't rely on any 3rd party proprietary software to run.

## Contributing

We love contributors. Here's how you can contribute:

* Check [Contributor's guideline](https://github.com/bluewave-labs/bluewave-hrm/blob/master/CONTRIBUTING.md).
* Have a look at our Figma designs [here](https://www.figma.com/design/GC5nLN8GAXV9NJkzEnDRj3/HRM-app?node-id=1-1207&t=adcmoAcr96lq7Fkb-1). We encourage you to copy to your own Figma page, then work on it as it is read-only.
* Open an issue if you believe you've encountered a bug.
* Make a pull request to add new features/make quality-of-life improvements/fix bugs.

Additional links:

- [Authorized viewers list and pages they can view](https://docs.google.com/spreadsheets/d/14uDT2n0oRYgZLE3BzrQIvzmSzGA2C8588glhEPP7ILA/edit?gid=0#gid=0)

<a href="https://github.com/bluewave-labs/hrm/graphs/contributors">
<img src="https://contrib.rocks/image?repo=bluewave-labs/hrm" />
</a>


24 changes: 0 additions & 24 deletions client/.gitignore

This file was deleted.

Loading