Profile, Search ans tags, Material-UI#3
Open
SlavaLatokhin wants to merge 267 commits intoalexeevna:masterfrom
Open
Profile, Search ans tags, Material-UI#3SlavaLatokhin wants to merge 267 commits intoalexeevna:masterfrom
SlavaLatokhin wants to merge 267 commits intoalexeevna:masterfrom
Conversation
creating a moderator
creating a moderator
delete logs
Search by all, users, doctors without moderator
All users now have profiles. You can go to the profile of any person by clicking on his name
@SlavaLatokhin Added profiles for all users
Added tag <React.Component>
# Conflicts: # med-web-app-front/src/App.js # med-web-app-front/src/components/login.component.js # med-web-app-front/src/components/pipelines.component.js # med-web-app-front/src/components/record-card.component.js # med-web-app-front/src/components/record-thread.component.js # med-web-app-front/src/components/upload-attachments.component.js # med-web-app-front/src/components/user-card.component.js # med-web-app-front/src/components/view-attachments.component.js # med-web-app-front/src/services/record.service.js
Added search by all, username, doctors without moderator.
# Conflicts: # med-web-app-front/src/components/view-records.component.js # med-web-app-front/src/services/topic.service.js # med-web-app-front/src/styles/Record.css # src/main/java/com/app/medicalwebapp/controllers/RecordController.java # src/main/java/com/app/medicalwebapp/model/Topic.java # src/main/java/com/app/medicalwebapp/repositories/RecordRepository.java # src/main/java/com/app/medicalwebapp/repositories/TopicRepository.java # src/test/java/com/app/medicalwebapp/RecordServiceTest.java
Pull from Slava.
# Conflicts: # med-web-app-front/src/components/view-records.component.js # src/main/java/com/app/medicalwebapp/controllers/TopicController.java
# Conflicts: # med-web-app-front/src/components/view-records.component.js
refactor ui in sign in and sign up
Added a test for the messenger service. Refactor code.
Merge the shared version.
…json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-AXIOS-1579269 - https://snyk.io/vuln/SNYK-JS-VALIDATOR-1090599 - https://snyk.io/vuln/SNYK-JS-VALIDATOR-1090600 - https://snyk.io/vuln/SNYK-JS-VALIDATOR-1090601 - https://snyk.io/vuln/SNYK-JS-VALIDATOR-1090602
…96a36efa408e8 [Snyk] Fix for 5 vulnerabilities
Merge the shared version.
…iving the uid from the server to the messenger.
Added saving the uid from dicom images via messenger, as well as receiving the uid from the server to the messenger.
Deleted unnecessary functions.
Added saving the uid from dicom images via messenger, as well as receiving the uid from the server to the messenger.
Transferring the develop branch to master.
…to 2.13.2.2 Snyk has created this PR to upgrade com.fasterxml.jackson.core:jackson-databind from 2.11.3 to 2.13.2.2. See this package in Maven Repository: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/ See this project in Snyk: https://app.snyk.io/org/kuvalda2002/project/ce7368c1-7b76-4616-a24f-8d88687c073e?utm_source=github&utm_medium=referral&page=upgrade-pr
Snyk has created this PR to upgrade commons-io:commons-io from 2.6 to 2.11.0. See this package in Maven Repository: https://mvnrepository.com/artifact/commons-io/commons-io/ See this project in Snyk: https://app.snyk.io/org/kuvalda2002/project/ce7368c1-7b76-4616-a24f-8d88687c073e?utm_source=github&utm_medium=referral&page=upgrade-pr
…rom 2.6.3 to 2.6.7 Snyk has created this PR to upgrade org.springframework.boot:spring-boot-starter-websocket from 2.6.3 to 2.6.7. See this package in Maven Repository: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-websocket/ See this project in Snyk: https://app.snyk.io/org/kuvalda2002/project/ce7368c1-7b76-4616-a24f-8d88687c073e?utm_source=github&utm_medium=referral&page=upgrade-pr
Snyk has created this PR to upgrade org.apache.httpcomponents:httpclient from 4.5.12 to 4.5.13. See this package in Maven Repository: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/ See this project in Snyk: https://app.snyk.io/org/kuvalda2002/project/ce7368c1-7b76-4616-a24f-8d88687c073e?utm_source=github&utm_medium=referral&page=upgrade-pr
Snyk has created this PR to upgrade org.apache.httpcomponents:httpmime from 4.5.12 to 4.5.13. See this package in Maven Repository: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime/ See this project in Snyk: https://app.snyk.io/org/kuvalda2002/project/ce7368c1-7b76-4616-a24f-8d88687c073e?utm_source=github&utm_medium=referral&page=upgrade-pr
…3c7b3a457491c9f7b [Snyk] Upgrade org.springframework.boot:spring-boot-starter-websocket from 2.6.3 to 2.6.7
…825f7e1841e51a75a [Snyk] Upgrade org.apache.httpcomponents:httpmime from 4.5.12 to 4.5.13
…fb9e9f084501d2d6d [Snyk] Upgrade org.apache.httpcomponents:httpclient from 4.5.12 to 4.5.13
…62a2ae9eec3809c77 [Snyk] Upgrade commons-io:commons-io from 2.6 to 2.11.0
…019787b16fdcdcf68 [Snyk] Upgrade com.fasterxml.jackson.core:jackson-databind from 2.11.3 to 2.13.2.2
Updated versions of dependencies from snyk.
Refactoring.
…r with HashRouter. Distributed the files into folders.
Fixed a bug with setting the time of sending messages> Replaced Route…
Fixed a bug with setting the time of sending messages. Replaced Router with HashRouter. Distributed the files into folders.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A profile was made for all users and the ability to leave reviews in it was added, tags to posts were added, the functionality of searching for users with different settings appeared and users were divided by roles. UI on all site was changed to Material-UI.