Skip to content

unifying user and resarcher login #4

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

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

unifying user and resarcher login #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d60359f
unifying user and resarcher login
TheresaNgguyen Mar 31, 2025
197ad86
resolving conflict for Dashboard.js
TheresaNgguyen Mar 31, 2025
920e643
Merge branch 'EPW80:main' into main
TheresaNgguyen Mar 31, 2025
c0e5080
Merge branch 'EPW80:main' into main
TheresaNgguyen Mar 31, 2025
89bbc27
Merge branch 'EPW80:main' into main
TheresaNgguyen Mar 31, 2025
a5f15ca
resolving pull request conflict
TheresaNgguyen Mar 31, 2025
35e3a89
Merge branch 'EPW80:main' into main
TheresaNgguyen Mar 31, 2025
e3ac189
Merge branch 'EPW80:main' into main
TheresaNgguyen Apr 1, 2025
ce83be4
patching logDataAcess problem for researchers requesting access to da…
TheresaNgguyen Apr 1, 2025
272d50f
resolving conflict for hipaaComplianceService.js
TheresaNgguyen Apr 1, 2025
35c857d
Merge branch 'main' into main
TheresaNgguyen Apr 1, 2025
a37a756
Merge branch 'EPW80:main' into main
TheresaNgguyen Apr 2, 2025
c184b14
simulated dataset payment
TheresaNgguyen Apr 2, 2025
7226e5a
Merge branch 'main' of https://github.com/TheresaNgguyen/Healthmint1
TheresaNgguyen Apr 2, 2025
1a8d71a
Merge branch 'EPW80:main' into main
TheresaNgguyen Apr 2, 2025
e70ee75
resolving conflicts to merge
TheresaNgguyen Apr 5, 2025
c410fd6
Merge branch 'main' of https://github.com/TheresaNgguyen/Healthmint1
TheresaNgguyen Apr 5, 2025
7ea9265
Merge branch 'EPW80:main' into main
TheresaNgguyen Apr 5, 2025
b7996c3
Merge branch 'EPW80:main' into main
TheresaNgguyen Apr 16, 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
2 changes: 1 addition & 1 deletion client/src/components/DataBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,4 +1118,4 @@ DataBrowser.propTypes = {
onDatasetSelect: PropTypes.func,
};

export default DataBrowser;
export default DataBrowser;
6 changes: 3 additions & 3 deletions client/src/components/DataUpload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ const DataUpload = ({ onUploadSuccess, onUploadError }) => {
htmlFor="category"
className="block text-sm font-medium text-gray-700 mb-1"
>
Category
Category *
</label>
<select
id="category"
Expand All @@ -317,7 +317,7 @@ const DataUpload = ({ onUploadSuccess, onUploadError }) => {
htmlFor="description"
className="block text-sm font-medium text-gray-700 mb-1"
>
Description
Description *
</label>
<textarea
id="description"
Expand All @@ -335,7 +335,7 @@ const DataUpload = ({ onUploadSuccess, onUploadError }) => {
htmlFor="price"
className="block text-sm font-medium text-gray-700 mb-1"
>
Price (ETH)
Price (ETH) *
</label>
<input
id="price"
Expand Down
Loading