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

Final merge #28

Merged
merged 74 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
6e79a0d
feat(organisation): wip service/equipe
TheoRoblin Aug 16, 2024
314241e
Merge remote-tracking branch 'refs/remotes/origin/dev' into feat/sirh…
TheoRoblin Aug 16, 2024
f4e7a2f
feat(organisation): wip department/team
TheoRoblin Aug 16, 2024
46955f1
feat(organisation): delete agency
TheoRoblin Aug 18, 2024
3c79044
feat(ui): update badge color
jarod-empirys Aug 19, 2024
971a21d
fix(organisation): create department
TheoRoblin Aug 19, 2024
f150214
Merge remote-tracking branch 'origin/feat/sirh_39_organisation' into …
TheoRoblin Aug 19, 2024
edf83d7
fix(tables): add table row
jarod-empirys Aug 19, 2024
c1dda57
fix(users): fix paginator accessibility
jarod-empirys Aug 19, 2024
b24a598
fix(demand): delete toString()
TheoRoblin Aug 19, 2024
060ee7e
Merge remote-tracking branch 'origin/feat/sirh_39_organisation' into …
TheoRoblin Aug 19, 2024
897ee06
fix(users): fix accessibility
jarod-empirys Aug 19, 2024
78cfea2
fix(expense): fixed front-end
Ethan-C11 Aug 19, 2024
13b973c
fix(project): fix accessibility
jarod-empirys Aug 19, 2024
bbc473b
fix(demand): fix api call
TheoRoblin Aug 19, 2024
d2da5e8
Merge remote-tracking branch 'origin/feat/sirh_39_organisation' into …
TheoRoblin Aug 19, 2024
565eb0b
fix(users): fix typo
jarod-empirys Aug 19, 2024
43cd88b
feat(organisation): add data in front
TheoRoblin Aug 19, 2024
1134d1e
fix(organisation): fix front
TheoRoblin Aug 19, 2024
dbb1394
feat(notification): wip notifications
JarodCouprie Aug 19, 2024
b77b371
feat(notification): notifications tab front
JarodCouprie Aug 19, 2024
1cf7c05
feat(project): add gitignore
jarod-empirys Aug 20, 2024
e192b62
feat(organisation): wip team
TheoRoblin Aug 21, 2024
42e2dab
fix(project): add logo
TheoRoblin Aug 21, 2024
1a1f375
feat(organisation): detail team + suppresion team
TheoRoblin Aug 21, 2024
5319e64
feat(organisation): can edit member team
TheoRoblin Aug 22, 2024
6b9e119
fix(accessibility): add meta to index.html
JarodCouprie Aug 22, 2024
d105c4d
feat(project): update README.md and add tests
jarod-empirys Aug 23, 2024
07454db
feat(organisation): wip
TheoRoblin Aug 23, 2024
f27b03f
Merge remote-tracking branch 'origin/feat/sirh_39_organisation' into …
TheoRoblin Aug 23, 2024
f4dde05
feat(expense): wip tests expenses
Ethan-C11 Aug 23, 2024
c38ac2c
feat(swagger): implemented new swagger
Aug 25, 2024
98525c3
feat(swagger): put first documentation of route
Aug 25, 2024
8d7eb71
feat(swagger): Fixed example documentation & fixed Expense schema
Aug 31, 2024
5eb7541
feat(swagger): Fixed example documentation
Aug 31, 2024
75eee67
feat(swagger): Fixed example documentation
Aug 31, 2024
36cc837
fix(project): update README.md
JarodCouprie Aug 31, 2024
b9084d9
fix(navbar): fix accessibility
JarodCouprie Sep 1, 2024
d91b7cb
Merge branch 'refs/heads/dev' into feat/sirh_56_notifications
JarodCouprie Sep 1, 2024
9820f69
fix(notification): socket working
JarodCouprie Sep 1, 2024
74ec8eb
feat(organisation): done
TheoRoblin Sep 2, 2024
92090a1
fix(organisation): fix test
TheoRoblin Sep 2, 2024
949a3b9
Merge pull request #25 from JarodCouprie/feat/sirh_39_organisation
JarodCouprie Sep 2, 2024
4df63d1
Merge branch 'dev' into feat/sirh_56_notifications
jarod-empirys Sep 2, 2024
a86ceb3
feat(swagger): wip swagger doc
Ethan-C11 Sep 2, 2024
c87f2d6
Revert "feat(swagger): wip swagger doc"
Ethan-C11 Sep 2, 2024
2d76a65
Reapply "feat(swagger): wip swagger doc"
Ethan-C11 Sep 2, 2024
b60af56
feat(swagger): wip swagger doc
Ethan-C11 Sep 2, 2024
85965e2
feat(swagger): wip swagger doc
Ethan-C11 Sep 2, 2024
f50aa6d
Merge branch 'dev' into feat/sirh_swagger
Ethan-C11 Sep 2, 2024
7f45334
Merge branch 'dev' into feat/sirh_swagger
Ethan-C11 Sep 2, 2024
d2aef7f
feat(dev): add agency data
TheoRoblin Sep 2, 2024
9335d18
feat(tests): fix expenses tests
Ethan-C11 Sep 2, 2024
04ee019
Merge pull request #26 from JarodCouprie/feat/sirh_swagger
TheoRoblin Sep 2, 2024
6864100
fix(organisation): bug member present
TheoRoblin Sep 2, 2024
6f8f18b
Merge remote-tracking branch 'origin/dev' into feat/sirh_39_organisation
TheoRoblin Sep 2, 2024
06802ba
feat(notification): send notifications
jarod-empirys Sep 2, 2024
7a99363
feat(notification): wip websocket
jarod-empirys Sep 2, 2024
0a32907
feat(swagger): swagger agency, demand, department and team
TheoRoblin Sep 2, 2024
31673ba
feat(swagger): swagger expenses controller
Ethan-C11 Sep 2, 2024
64f4c2e
fix(expenses): Fixed data.sql to include data from september
Sep 2, 2024
e8dc58a
fix(expenses): Fixed getExpensesValuesByUserId Repository ORDER BY
Sep 2, 2024
1d359d7
fix(notification): socket working
JarodCouprie Sep 2, 2024
45a1e2c
fix(dashboard): wip layout
JarodCouprie Sep 2, 2024
9f2cbab
feat(dashboard): dashboard layout
jarod-empirys Sep 3, 2024
b0f6842
fix(dev): icone and data
TheoRoblin Sep 3, 2024
277e8a3
feat(notification): fix typo
jarod-empirys Sep 3, 2024
4077bbb
feat(dashboard): layout
jarod-empirys Sep 3, 2024
abc37d0
Merge branch 'dev' into feat/sirh_56_notifications
jarod-empirys Sep 3, 2024
150726a
feat(project): merge from dev
jarod-empirys Sep 3, 2024
3308038
feat(project): display routes
jarod-empirys Sep 3, 2024
efd496c
Merge pull request #27 from JarodCouprie/feat/sirh_56_notifications
Ethan-C11 Sep 3, 2024
3e59589
fix(validation): exepenses details validation
TheoRoblin Sep 3, 2024
0688e34
fix(expenses): Fixed expenses to match demands style
Sep 2, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea
6 changes: 0 additions & 6 deletions .idea/jsLibraryMappings.xml

This file was deleted.

22 changes: 21 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
# Bienvue sur SIRH


## Participants

- Jarod Couprie
- Ethan Collignon
- Théo Roblin

## Démarrage du projet

Pour démarrer le projet et créer les différents conteneurs dont l'application a besoin, il faut utiliser la commande
suivante
> Attention cependant, le dossier contient des variables d'environnement qu'il sera nécessaire de prendre en
> compte lors de la première initialisation. Ce projet ne contient que des variables d'environnement de développement et
> ne sont en aucun cas à prendre telles quelles pour mettre l'application en phase de production.

### Développement

```bash
docker compose -f ./docker-compose.dev.yml -p sirh-dev up -d
```

### Production

```bash
docker compose -f ./docker-compose.yml -p sirh up -d
```

8 changes: 3 additions & 5 deletions api-server/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
#MINIO_PORT=9000
#MINIO_USE_SSL=false
#MINIO_REGION=eu-west-1
#MINIO_ACCESS_KEY=iHmA43LQkS23AYmhbtRK
#MINIO_SECRET_KEY=GVmxeDPREQZvNCimm03OMxvPtVpOrwEtqOyZLWol
#PC MAISON
#MINIO_ACCESS_KEY=PocckwfAMBZ8ZCfAYiom
#MINIO_SECRET_KEY=2BbG0VQNz0n3nYQJ23ptDVqyB0tdwaht1M55TAcO
#MINIO_ACCESS_KEY=HfHQdNRNGexTknt6JFhq
#MINIO_SECRET_KEY=Eg8uv3EwYMlGnvOZb5Yo1tMj9sdbCvaPZ7QIsUPm

Loading