Merge branch 'release/Sprint-4' of... (3eb4f9f8) · Commits · Beth Davies / polish-community-beth

Commit 3eb4f9f8 authored 4 months ago by Marnuri Nitish -

Merge branch 'release/Sprint-4' of...

Merge branch 'release/Sprint-4' of https://git.cardiff.ac.uk/c24108486/team-11-polish-community-group into 29-super-admin-view-the-admin-dashboard-so-that-i-can-manage-platform

parents 646be814 70c5bbcf

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/polish_community_group_11/polish_community/feed/controllers/FeedApisController.java 12 additions, 9 deletions

...polish_community/feed/controllers/FeedApisController.java
src/main/java/polish_community_group_11/polish_community/profile/controllers/ProfileController.java 81 additions, 0 deletions

...lish_community/profile/controllers/ProfileController.java
src/main/java/polish_community_group_11/polish_community/profile/controllers/ProfileRestController.java 30 additions, 0 deletions

..._community/profile/controllers/ProfileRestController.java
src/main/java/polish_community_group_11/polish_community/profile/models/Profile.java 23 additions, 0 deletions

...ity_group_11/polish_community/profile/models/Profile.java
src/main/java/polish_community_group_11/polish_community/profile/repositories/ProfileRepository.java 13 additions, 0 deletions

...ish_community/profile/repositories/ProfileRepository.java
src/main/java/polish_community_group_11/polish_community/profile/repositories/ProfileRepositoryImpl.java 52 additions, 0 deletions

...community/profile/repositories/ProfileRepositoryImpl.java
src/main/java/polish_community_group_11/polish_community/profile/services/ProfileService.java 22 additions, 0 deletions

..._11/polish_community/profile/services/ProfileService.java
src/main/java/polish_community_group_11/polish_community/register/controllers/RegisterController.java 9 additions, 0 deletions

...sh_community/register/controllers/RegisterController.java
src/main/java/polish_community_group_11/polish_community/security/WebSecurityConfig.java 5 additions, 1 deletion

...group_11/polish_community/security/WebSecurityConfig.java
src/main/java/polish_community_group_11/polish_community/translation/controller/TranslationApisController.java 93 additions, 0 deletions

...ity/translation/controller/TranslationApisController.java
src/main/java/polish_community_group_11/polish_community/translation/model/Translation.java 93 additions, 0 deletions

...up_11/polish_community/translation/model/Translation.java
src/main/java/polish_community_group_11/polish_community/translation/repository/TranslationRepository.java 32 additions, 0 deletions

...mmunity/translation/repository/TranslationRepository.java
src/main/java/polish_community_group_11/polish_community/translation/repository/TranslationRepositoryImpl.java 109 additions, 0 deletions

...ity/translation/repository/TranslationRepositoryImpl.java
src/main/java/polish_community_group_11/polish_community/translation/service/TranslationService.java 34 additions, 0 deletions

...ish_community/translation/service/TranslationService.java
src/main/java/polish_community_group_11/polish_community/translation/service/TranslationServiceImpl.java 57 additions, 0 deletions

...community/translation/service/TranslationServiceImpl.java
src/main/resources/application.properties 1 addition, 1 deletion

src/main/resources/application.properties
src/main/resources/data.sql 3 additions, 1 deletion

src/main/resources/data.sql
src/main/resources/schema.sql 29 additions, 2 deletions

src/main/resources/schema.sql
src/main/resources/static/assets/default-profile.jpg 0 additions, 0 deletions

src/main/resources/static/assets/default-profile.jpg
src/main/resources/static/css/profile/profile.css 105 additions, 0 deletions

src/main/resources/static/css/profile/profile.css

with 803 additions and 14 deletions

Please register or to comment