Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
a940aa7
Update README.md
ybihi2 Jan 23, 2025
72561d1
Update README.md
DiegoRiveraa Jan 23, 2025
3de2db4
Update README.md
ChrisJackson0313 Jan 23, 2025
7a4f2b4
Update README.md
jadelmasri00 Jan 23, 2025
f939945
Update README.md
DiegoRiveraa Jan 23, 2025
206c74e
Update README.md
AsmaJawad Jan 28, 2025
a45d3aa
Skeleton Prototype
ybihi2 Mar 25, 2025
35e2af0
Skeleton Prototype
ybihi2 Mar 25, 2025
3eccb6b
Update application.properties
ybihi2 Mar 25, 2025
eeb4c08
Delete Sprint 1/deliverable3 directory
ybihi2 Mar 25, 2025
b5f3c78
Add files via upload
ybihi2 Mar 25, 2025
77b75b5
Deleted unnecessary files
ybihi2 Mar 25, 2025
61c5d05
Documentation added.
ybihi2 Mar 25, 2025
912ea13
Documentation added, and repository methods
ybihi2 Mar 25, 2025
9ace6e2
Merge branch 'deHank:main' into main
ChrisJackson0313 Mar 25, 2025
db5f3da
Update pom.xml
AsmaJawad Mar 25, 2025
15d528c
Update UserDTO.java
AsmaJawad Mar 25, 2025
0495433
Documentation added, and repository methods
ybihi2 Mar 25, 2025
4c4d413
TEST Update UserDTO.java
ChrisJackson0313 Mar 25, 2025
0299c53
Update indexController.java
AsmaJawad Mar 25, 2025
2b1a63b
Merge pull request #1 from ChrisJackson0313/yaz
ybihi2 Mar 25, 2025
aa0cd7e
Update
ybihi2 Mar 25, 2025
821ba36
Create GlobalExceptionHandler.java
AsmaJawad Mar 25, 2025
619a4ed
Add files via upload
ybihi2 Mar 26, 2025
42a636a
Merge pull request #2 from ChrisJackson0313/ybihi2-patch-1
ybihi2 Mar 26, 2025
b642fc2
Registration System
ybihi2 Mar 26, 2025
e8f68ca
Merge branch 'main' of https://github.com/ChrisJackson0313/Assignment…
ybihi2 Mar 26, 2025
1d80dd0
Cleanup
ybihi2 Mar 26, 2025
bafa525
Update UserModel.java
ybihi2 Mar 26, 2025
d89e81c
Update UserDTO.java
ybihi2 Mar 26, 2025
7bc3745
Update indexController.java
ybihi2 Mar 26, 2025
8cce7ea
Update register.html
ybihi2 Mar 26, 2025
5bc422e
Update styles.css
ybihi2 Mar 26, 2025
1a22c2f
Update indexController.java
AsmaJawad Mar 26, 2025
e0721a0
Update application.properties
AsmaJawad Mar 26, 2025
4c03c24
Update login.html
AsmaJawad Mar 26, 2025
c832e5e
Update indexController.java
AsmaJawad Mar 26, 2025
6721e95
Cleanup
ybihi2 Mar 26, 2025
0594081
Working Version
ybihi2 Mar 26, 2025
3ba659c
Update Deliverable3ApplicationTests.java
ChrisJackson0313 Mar 26, 2025
33fee83
Update Deliverable3ApplicationTests.java
ChrisJackson0313 Mar 26, 2025
751394b
Updated test cases
ybihi2 Mar 26, 2025
40e69b2
Update codePlaceHolder.txt
DiegoRiveraa Mar 26, 2025
79c1d1d
Update codePlaceHolder.txt
DiegoRiveraa Mar 27, 2025
7a978c8
Update codePlaceHolder.txt
DiegoRiveraa Mar 27, 2025
e529982
Add files via upload
AsmaJawad Mar 27, 2025
ac3ae18
Rename Jydoc - Sheet1.pdf to JydocTestCases.pdf
AsmaJawad Mar 27, 2025
edfe3bc
Update codePlaceHolder.txt
AsmaJawad Mar 27, 2025
8ac08e3
Update TestCasesPlaceholder.txt
AsmaJawad Mar 27, 2025
295208a
Update codePlaceHolder.txt
AsmaJawad Mar 27, 2025
afc01b4
Second working version
ybihi2 Mar 28, 2025
f9727c7
Documentation and additional refactoring
ybihi2 Mar 28, 2025
c71c129
Bug patching
ybihi2 Mar 28, 2025
eedf8cf
Cleanup
ybihi2 Mar 28, 2025
0cda418
Cleanup
ybihi2 Mar 28, 2025
a7d27db
Additional documentation and refactoring
ybihi2 Mar 28, 2025
b7d02e0
Added @Serial to serialVersionUID
ybihi2 Mar 28, 2025
e9fc6ee
Merge pull request #3 from ChrisJackson0313/YazTest
ybihi2 Mar 28, 2025
b3871be
Added test cases and small verification changes
ybihi2 Mar 28, 2025
d99446c
Documentation and test cases
ybihi2 Mar 28, 2025
d1302f0
Login fix
ybihi2 Mar 28, 2025
07fd726
Test cases and documentation
ybihi2 Mar 28, 2025
cbf5a61
Merge pull request #4 from ChrisJackson0313/YazTest
ybihi2 Mar 28, 2025
5cce801
Documentation
ybihi2 Mar 28, 2025
912bdc1
Documentation
ybihi2 Mar 28, 2025
428adb6
Documentation
ybihi2 Mar 28, 2025
7468c31
Merge pull request #5 from ChrisJackson0313/YazTest
ybihi2 Mar 28, 2025
ee50c31
Additional testing
ybihi2 Mar 28, 2025
cb903c5
Admin dashboard
ybihi2 Mar 28, 2025
1e56c56
Bug fix
ybihi2 Mar 28, 2025
0acb07a
Bug fix
ybihi2 Mar 28, 2025
7f43604
Merge pull request #6 from ChrisJackson0313/YazTest
ybihi2 Mar 28, 2025
bcfcc7c
Bug fix
ybihi2 Mar 28, 2025
338bfc8
Additional testing and bug fixing
ybihi2 Mar 28, 2025
24aa533
Additional testing and bug fixing
ybihi2 Mar 29, 2025
aa80dcc
Improved registration handling
ybihi2 Mar 29, 2025
b271ce4
Documentation added
ybihi2 Mar 29, 2025
56c947b
Merge pull request #7 from ChrisJackson0313/YazTest
ybihi2 Mar 29, 2025
08ea3e0
Documentation added
ybihi2 Mar 29, 2025
69911d1
Merge pull request #8 from ChrisJackson0313/YazTest
ybihi2 Apr 3, 2025
3f9cf25
Minor changes
ybihi2 Apr 3, 2025
9c9cd1d
Merge pull request #9 from ChrisJackson0313/YazTest
ybihi2 Apr 3, 2025
d397a7f
Containerization fixes
ybihi2 Apr 3, 2025
d39d7c1
Containerization fixes
ybihi2 Apr 3, 2025
e31f488
Create maven-wrapper.properties
ybihi2 Apr 3, 2025
2c78300
Merge pull request #10 from ChrisJackson0313/YazTest
ybihi2 Apr 3, 2025
eff358c
Removed JDBC sessions
ybihi2 Apr 4, 2025
4f83212
Removed sessions properties
ybihi2 Apr 5, 2025
9ef1622
Renamed file
ybihi2 Apr 5, 2025
e7cfdf0
Minor edits
ybihi2 Apr 5, 2025
1552beb
Minor changes
ybihi2 Apr 6, 2025
e4281e1
Merge pull request #11 from ChrisJackson0313/Yassine
ybihi2 Apr 6, 2025
12fa851
Project restructuring
ybihi2 Apr 6, 2025
1aa730d
Merge pull request #12 from ChrisJackson0313/Yassine
ybihi2 Apr 6, 2025
a5a4cf1
Documentation added
ybihi2 Apr 6, 2025
f7a1888
Merge pull request #13 from ChrisJackson0313/Yassine
ybihi2 Apr 6, 2025
5ce7e5b
Documentation added
ybihi2 Apr 6, 2025
5f6fec4
Added medication saving feature
ybihi2 Apr 7, 2025
1bbadb8
Merge pull request #14 from ChrisJackson0313/Yassine
ybihi2 Apr 7, 2025
45204af
HTML updates
ybihi2 Apr 8, 2025
80b35d7
Merge pull request #15 from ChrisJackson0313/Yassine
ybihi2 Apr 8, 2025
27058a4
HTML updates
ybihi2 Apr 8, 2025
2bc553f
Merge pull request #16 from ChrisJackson0313/Yassine
ybihi2 Apr 8, 2025
ddd1ce5
Removed duplicate dependency and deprecate file
ybihi2 Apr 8, 2025
88b633a
Removed duplicate dependency and deprecate file
ybihi2 Apr 8, 2025
baa4e6b
Create dataSources.local.xml
ChrisJackson0313 Apr 8, 2025
dbc465f
Fixed bugs
ybihi2 Apr 8, 2025
d22fdf1
Merge pull request #17 from ChrisJackson0313/Yassine
ybihi2 Apr 8, 2025
79b399e
Bug: Couldn't change password in profile editor
ybihi2 Apr 9, 2025
2570df4
Removed 2auth section
ybihi2 Apr 9, 2025
31eb198
Removed 2auth section
ybihi2 Apr 9, 2025
6b699e6
Fixed user profile editing bugs
ybihi2 Apr 9, 2025
7faf37d
HTML Page updates and fixes
ybihi2 Apr 9, 2025
8b3494e
Updated login page
ybihi2 Apr 9, 2025
c8d992c
Updated login page
ybihi2 Apr 9, 2025
aa1372b
Added logging and documentation
ybihi2 Apr 9, 2025
e811364
Updated class
ybihi2 Apr 9, 2025
a9aa4fb
Updated HTML pages, added documentation, and fixed bugs
ybihi2 Apr 9, 2025
77e3e8b
Updated logout page
ybihi2 Apr 9, 2025
504cb8c
Removed deprecated files and updated html pages
ybihi2 Apr 9, 2025
098901d
Merge pull request #18 from ChrisJackson0313/Yassine
ybihi2 Apr 9, 2025
10c0336
HTML Tweaks
ybihi2 Apr 10, 2025
71b7abe
Added tracking for medication intake days
ybihi2 Apr 10, 2025
1385684
Fixed HTML bugs
ybihi2 Apr 10, 2025
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/Sprint 2/prototype2/target
*.log
*.iml
/Sprint 2/prototype2/docker-compose.yml
*.gz
Sprint 2/prototype2/qodana.yaml
26 changes: 26 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions .idea/dataSources.local.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/jsLibraryMappings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/runConfigurations/All_Tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
My groupmembers are:
- XXXX
- XXXX
- XXXX
- XXXX

- Yassine Bihi
- Diego Rivera
- Christian Jackson
- Jad El Masri
- Ozi Jawad

------------------ Fill in some information about your project under this ------------------
Binary file added Sprint 1/JydocTestCases.pdf
Binary file not shown.
1 change: 1 addition & 0 deletions Sprint 1/TestCasesPlaceholder.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//check JydocTestCases.pdf
1 change: 1 addition & 0 deletions Sprint 1/codePlaceHolder.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//Check deliverable3 folder
29 changes: 29 additions & 0 deletions Sprint 1/deliverable3/HELP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Getting Started

### Reference Documentation
For further reference, please consider the following sections:

* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/3.4.4/maven-plugin)
* [Create an OCI image](https://docs.spring.io/spring-boot/3.4.4/maven-plugin/build-image.html)
* [Spring Web](https://docs.spring.io/spring-boot/3.4.4/reference/web/servlet.html)
* [Thymeleaf](https://docs.spring.io/spring-boot/3.4.4/reference/web/servlet.html#web.servlet.spring-mvc.template-engines)
* [htmx](https://github.com/wimdeblauwe/htmx-spring-boot)

### Guides
The following guides illustrate how to use some features concretely:

* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/)
* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/)
* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/)
* [Handling Form Submission](https://spring.io/guides/gs/handling-form-submission/)
* [htmx](https://www.youtube.com/watch?v=j-rfPoXe5aE)
* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/)

### Maven Parent overrides

Due to Maven's design, elements are inherited from the parent POM to the project POM.
While most of the inheritance is fine, it also inherits unwanted elements like `<license>` and `<developers>` from the parent.
To prevent this, the project POM contains empty overrides for these elements.
If you manually switch to a different parent and actually want the inheritance, you need to remove those overrides.

Loading