ASWI - Pokročilé softwarové inženýrství » ASWI 2022 » Zpracování geografických údajů v novoasyrských textech (KBS FF) - Code of Duty

Merge branch 'develop'

1. Conflicts:
2. .gitignore
3. backend/pom.xml
4. backend/src/main/java/cz/zcu/kiv/backendapi/BackendApiApplication.java
5. backend/src/main/java/cz/zcu/kiv/backendapi/alternativename/AlternativeNameRepository.java
6. backend/src/main/java/cz/zcu/kiv/backendapi/bibliography/BibliographyRepository.java
7. backend/src/main/java/cz/zcu/kiv/backendapi/catalog/CatalogController.java
8. backend/src/main/java/cz/zcu/kiv/backendapi/config/CorsConfig.java
9. backend/src/main/java/cz/zcu/kiv/backendapi/config/DataInitiator.java
10. backend/src/main/java/cz/zcu/kiv/backendapi/country/CountryRepository.java
11. backend/src/main/java/cz/zcu/kiv/backendapi/exception/ApiRequestException.java
12. backend/src/main/java/cz/zcu/kiv/backendapi/security/SecurityConfig.java
13. backend/src/main/java/cz/zcu/kiv/backendapi/security/jwt/JwtTokenVerifier.java
14. backend/src/main/java/cz/zcu/kiv/backendapi/security/jwt/JwtUsernameAndPasswordAuthenticationFilter.java
15. backend/src/main/java/cz/zcu/kiv/backendapi/security/jwt/JwtUtils.java
16. backend/src/main/java/cz/zcu/kiv/backendapi/type/ITypeService.java
17. backend/src/main/java/cz/zcu/kiv/backendapi/type/TypeRepository.java
18. backend/src/main/java/cz/zcu/kiv/backendapi/type/TypeServiceImpl.java
19. backend/src/main/java/cz/zcu/kiv/backendapi/user/IUserService.java
20. backend/src/main/java/cz/zcu/kiv/backendapi/user/UserController.java
21. backend/src/main/java/cz/zcu/kiv/backendapi/user/UserDto.java
22. backend/src/main/java/cz/zcu/kiv/backendapi/user/UserEntity.java
23. backend/src/main/java/cz/zcu/kiv/backendapi/user/UserRepository.java
24. backend/src/main/java/cz/zcu/kiv/backendapi/user/UserServiceImpl.java
25. backend/src/main/java/cz/zcu/kiv/backendapi/validation/EmailValidator.java
26. backend/src/main/java/cz/zcu/kiv/backendapi/writtenform/WrittenFormRepository.java
27. backend/src/main/resources/application.properties
28. frontend/.gitignore
29. frontend/package.json
30. frontend/requests/login.http
31. frontend/requests/register.http
32. frontend/src/.env
33. frontend/src/App.tsx
34. frontend/src/config/conf.ts
35. frontend/src/features/Auth/Login.tsx
36. frontend/src/features/Catalog/Catalog.tsx
37. frontend/src/features/Catalog/CatalogItemDetail.tsx
38. frontend/src/features/Catalog/CatalogTable.tsx
39. frontend/src/features/Home/Home.tsx
40. frontend/src/features/NotFound/NotFound.tsx
41. frontend/src/features/redux/store.ts
42. frontend/src/index.tsx
43. frontend/src/swagger/Users.ts
44. frontend/src/swagger/data-contracts.ts
45. frontend/src/swagger/http-client.ts
46. frontend/yarn.lock