Revize c7d2ced1

From feature/#9196_Connect_Frontend_With_Backend into develop

.gitignore

@@ +1 @@
+.idea

backend/src/main/java/cz/zcu/kiv/backendapi/BackendApiApplication.java

@@ -11 +11 @@
 	public static final Logger LOGGER = Logger.getLogger(BackendApiApplication.class.getName());
 
 	public static void main(String[] args) {
-		LOGGER.info("Starting ...");
 		SpringApplication.run(BackendApiApplication.class, args);
+		LOGGER.info("Swagger is running at: http://localhost:8080/swagger-ui.html");
 	}
 
 }

backend/src/main/java/cz/zcu/kiv/backendapi/catalog/CatalogController.java

@@ +1 @@
+package cz.zcu.kiv.backendapi.catalog;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Controller for catalog
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/catalog")
+public class CatalogController {
+
+    /**
+     * Catalog service
+     */
+    private final ICatalogService catalogService;
+
+    @PostMapping("")
+    public void addCatalogEntry(@RequestBody CatalogDto catalogDto) {
+        catalogService.saveCatalogEntry(catalogDto);
+    }
+
+    /**
+     * Returns catalog
+     *
+     * @return catalog
+     */
+    @GetMapping("")
+    public ResponseEntity<List<CatalogDto>> getAllUsers() {
+        return new ResponseEntity<>(catalogService.getCatalog(), HttpStatus.OK);
+    }
+
+    /**
+     * Updates catalog entry with given ID
+     *
+     * @param id         ID
+     * @param catalogDto catalog DTO
+     */
+    @PutMapping("/{id}")
+    public void updateCatalogEntry(@PathVariable UUID id, @RequestBody CatalogDto catalogDto) {
+        catalogService.updateCatalogEntry(id, catalogDto);
+    }
+
+    /**
+     * Deletes catalog entry with given ID
+     *
+     * @param id ID
+     */
+    @DeleteMapping("/{id}")
+    public void deleteCatalogEntry(@PathVariable UUID id) {
+        catalogService.deleteCatalogEntry(id);
+    }
+}

backend/src/main/java/cz/zcu/kiv/backendapi/catalog/CatalogDto.java

@@ +1 @@
+package cz.zcu.kiv.backendapi.catalog;
+
+import lombok.Data;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Class representing catalog DTO
+ */
+@Data
+public class CatalogDto {
+    /**
+     * Id
+     */
+    private UUID id;
+
+    /**
+     * Name of geographic entry
+     */
+    private String name;
+
+    /**
+     * Certainty
+     */
+    private int certainty;
+
+    /**
+     * Longitude
+     */
+    private double longitude;
+
+    /**
+     * Latitude
+     */
+    private double latitude;
+
+    /**
+     * Bibliography
+     */
+    private Set<String> bibliography = Collections.emptySet();
+
+    /**
+     * Countries
+     */
+    private Set<String> countries = Collections.emptySet();
+
+    /**
+     * Written forms
+     */
+    private Set<String> writtenForms = Collections.emptySet();
+
+    /**
+     * Alternative names
+     */
+    private Set<String> alternativeNames = Collections.emptySet();
+
+    /**
+     * Types
+     */
+    private Set<String> types = Collections.emptySet();
+
+}

backend/src/main/java/cz/zcu/kiv/backendapi/catalog/CatalogEntity.java

@@ -79 +79 @@
     private Set<WrittenFormEntity> writtenForms;
 
     /**
-     * Alternative name
+     * Alternative names
      */
     @OneToMany(mappedBy = "catalog", cascade = CascadeType.ALL)
     @LazyCollection(LazyCollectionOption.FALSE)
@@ -104 +104 @@
 
         this.name = csvFields.get(1);
         List<String> stringList = processListField(csvFields.get(2));
-        this.alternativeNames = new HashSet<>(stringList.size());
-        for (String s : stringList) {
-            this.alternativeNames.add(new AlternativeNameEntity(s, this));
-        }
+        this.alternativeNames = stringList.stream().map(s->new AlternativeNameEntity(s, this)).collect(Collectors.toSet());
+
         this.certainty = processIntField(csvFields.get(3));
         this.latitude = processDoubleField(csvFields.get(4));
         this.longitude = processDoubleField(csvFields.get(5));
+
         stringList = processListField(csvFields.get(6));
-        this.writtenForms = new HashSet<>(stringList.size());
-        for (String s : stringList) {
-            this.writtenForms.add(new WrittenFormEntity(s, this));
-        }
+        this.writtenForms = stringList.stream().map(s->new WrittenFormEntity(s, this)).collect(Collectors.toSet());
+
         stringList = processListField(csvFields.get(7));
-        this.types = new HashSet<>(stringList.size());
-        for (String s : stringList) {
-            this.types.add(new TypeEntity(s));
-        }
+        this.types = stringList.stream().map(TypeEntity::new).collect(Collectors.toSet());
+
         stringList = processListField(csvFields.get(8));
-        this.countries = new HashSet<>(stringList.size());
-        for (String s : stringList) {
-            this.countries.add(new CountryEntity(s, this));
-        }
+        this.countries = stringList.stream().map(s->new CountryEntity(s, this)).collect(Collectors.toSet());
+
         stringList = processListField(csvFields.get(10));
-        this.bibliography = new HashSet<>(stringList.size());
-        for (String s : stringList) {
-            this.bibliography.add(new BibliographyEntity(s, this));
-        }
+        this.bibliography = stringList.stream().map(s->new BibliographyEntity(s, this)).collect(Collectors.toSet());
     }
 
     private int processIntField(String field) {

backend/src/main/java/cz/zcu/kiv/backendapi/catalog/CatalogRepository.java

@@ -6 +6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 /**
@@ -22 +23 @@
      */
     @Query("SELECT DISTINCT c FROM CatalogEntity c LEFT JOIN AlternativeNameEntity a ON c = a.catalog WHERE (?1 = c.name OR ?1 = a.name)")
     List<CatalogEntity> getCatalogEntitiesByName(String name);
+
+//    @Query("SELECT DISTINCT c FROM CatalogEntity c LEFT JOIN AlternativeNameEntity a ON c = a.catalog WHERE (?1 IS NULL OR ?1 = c.name OR ?1 = a.name)" +
+//            "LEFT JOIN TypeEntity e on c = e.catalog WHERE (?2 IS NULL OR e.)")
+//    Set<CatalogEntity> filterCatalog(String name, String type, String country);
 }

backend/src/main/java/cz/zcu/kiv/backendapi/catalog/CatalogServiceImpl.java

@@ -1 +1 @@
 package cz.zcu.kiv.backendapi.catalog;
 
+import cz.zcu.kiv.backendapi.alternativename.AlternativeNameEntity;
+import cz.zcu.kiv.backendapi.bibliography.BibliographyEntity;
+import cz.zcu.kiv.backendapi.country.CountryEntity;
 import cz.zcu.kiv.backendapi.type.TypeEntity;
 import cz.zcu.kiv.backendapi.type.ITypeService;
+import cz.zcu.kiv.backendapi.writtenform.WrittenFormEntity;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * Catalog service implementation
@@ -14 +22 @@
 @Service
 @Transactional
 @RequiredArgsConstructor
+@Slf4j
 public class CatalogServiceImpl implements ICatalogService {
+    /**
+     * Message for exception when catalog entry is not found by id
+     */
+    private static final String CATALOG_ENTRY_NOT_FOUND = "Catalog entry not found";
     /**
      * Catalog repository
      */
     private final CatalogRepository catalogRepository;
 
+    /**
+     * Type service
+     */
     private final ITypeService typeService;
 
     @Override
     public void saveCatalog(List<CatalogEntity> catalogEntities) {
-        for (CatalogEntity catalogEntity : catalogEntities) {
-            for (TypeEntity type: catalogEntity.getTypes()                 ) {
+        log.info("Saving catalog");
+        catalogEntities.forEach(this::saveCatalogEntity);
+    }
+
+    @Override
+    public void saveCatalogEntry(CatalogDto catalogDto) {
+        log.info("Saving catalog entry");
+        CatalogEntity catalogEntity = new CatalogEntity();
+        convertDtoToEntity(catalogDto, catalogEntity);
+        saveCatalogEntity(catalogEntity);
+    }
+
+    @Override
+    public void updateCatalogEntry(UUID id, CatalogDto catalogDto) {
+        CatalogEntity catalogEntity = catalogRepository.findById(id).orElseThrow(() -> {
+            log.error(CATALOG_ENTRY_NOT_FOUND);
+            throw new UsernameNotFoundException(CATALOG_ENTRY_NOT_FOUND);
+        });
+        convertDtoToEntity(catalogDto, catalogEntity);
+        catalogRepository.save(catalogEntity);
+        log.info("Catalog entry updated");
+    }
+
+    @Override
+    public void deleteCatalogEntry(UUID id) {
+        CatalogEntity catalogEntity = catalogRepository.findById(id).orElseThrow(() -> {
+            log.error(CATALOG_ENTRY_NOT_FOUND);
+            throw new UsernameNotFoundException(CATALOG_ENTRY_NOT_FOUND);
+        });
+        catalogRepository.delete(catalogEntity);
+        log.info("Catalog entry deleted");
+    }
 
-                if (typeService.getTypeByName(type.getType()).isEmpty()){
-                    typeService.saveType(type);
-                }
+    @Override
+    public List<CatalogDto> getCatalog() {
+        log.info("Retrieving catalog");
+        List<CatalogEntity> entities = catalogRepository.findAll();
+        return entities.stream().map(this::convertEntityToDto).collect(Collectors.toList());
+    }
+
+    /**
+     * Saves catalog entity to database
+     *
+     * @param catalogEntity catalog entity
+     */
+    private void saveCatalogEntity(CatalogEntity catalogEntity) {
+        for (TypeEntity type : catalogEntity.getTypes()) {
+            if (typeService.getTypeByName(type.getType()).isEmpty()) {
+                typeService.saveType(type);
             }
         }
-        catalogRepository.saveAll(catalogEntities);
+        catalogRepository.save(catalogEntity);
+    }
+
+    /**
+     * Converts catalog DTO to catalog entity
+     *
+     * @param catalogDto    catalog DTO
+     * @param catalogEntity catalog entity
+     */
+    private void convertDtoToEntity(CatalogDto catalogDto, CatalogEntity catalogEntity) {
+        catalogEntity.setName(catalogDto.getName());
+        catalogEntity.setCertainty(catalogDto.getCertainty());
+        catalogEntity.setLatitude(catalogDto.getLatitude());
+        catalogEntity.setLongitude(catalogDto.getLongitude());
+        catalogEntity.setBibliography(catalogDto.getBibliography()
+                .stream().map(s -> new BibliographyEntity(s, catalogEntity)).collect(Collectors.toSet()));
+        catalogEntity.setTypes(catalogDto.getTypes()
+                .stream().map(TypeEntity::new).collect(Collectors.toSet()));
+        catalogEntity.setCountries(catalogDto.getCountries()
+                .stream().map(s -> new CountryEntity(s, catalogEntity)).collect(Collectors.toSet()));
+        catalogEntity.setAlternativeNames(catalogDto.getAlternativeNames()
+                .stream().map(s -> new AlternativeNameEntity(s, catalogEntity)).collect(Collectors.toSet()));
+        catalogEntity.setWrittenForms(catalogDto.getWrittenForms()
+                .stream().map(s -> new WrittenFormEntity(s, catalogEntity)).collect(Collectors.toSet()));
     }
+
+    /**
+     * Converts catalog entity to catalog DTO
+     *
+     * @param entity catalog entity
+     * @return catalog DTO
+     */
+    private CatalogDto convertEntityToDto(CatalogEntity entity) {
+        CatalogDto catalogDto = new CatalogDto();
+        catalogDto.setId(entity.getId());
+        catalogDto.setName(entity.getName());
+        catalogDto.setLatitude(entity.getLatitude());
+        catalogDto.setLongitude(entity.getLongitude());
+        catalogDto.setCertainty(entity.getCertainty());
+        catalogDto.setBibliography(entity.getBibliography()
+                .stream().map(BibliographyEntity::getSource).collect(Collectors.toSet()));
+        catalogDto.setTypes(entity.getTypes()
+                .stream().map(TypeEntity::getType).collect(Collectors.toSet()));
+        catalogDto.setCountries(entity.getCountries()
+                .stream().map(CountryEntity::getName).collect(Collectors.toSet()));
+        catalogDto.setAlternativeNames(entity.getAlternativeNames()
+                .stream().map(AlternativeNameEntity::getName).collect(Collectors.toSet()));
+        catalogDto.setWrittenForms(entity.getWrittenForms()
+                .stream().map(WrittenFormEntity::getForm).collect(Collectors.toSet()));
+        return catalogDto;
+    }
+
 }

backend/src/main/java/cz/zcu/kiv/backendapi/catalog/ICatalogService.java

@@ -1 +1 @@
 package cz.zcu.kiv.backendapi.catalog;
 
 import java.util.List;
+import java.util.UUID;
 
 /**
  * Catalog service interface
  */
 public interface ICatalogService {
+    /**
+     * Saves list of catalog entries
+     *
+     * @param catalogEntities catalog entris
+     */
     void saveCatalog(List<CatalogEntity> catalogEntities);
+
+    /**
+     * Saves one catalog entry
+     *
+     * @param catalogDto catalog DTO
+     */
+    void saveCatalogEntry(CatalogDto catalogDto);
+
+    /**
+     * Updates catalog entry with given ID
+     *
+     * @param id         ID
+     * @param catalogDto catalog DTO
+     */
+    void updateCatalogEntry(UUID id, CatalogDto catalogDto);
+
+    /**
+     * Deletes catalog entry with given ID
+     *
+     * @param id ID
+     */
+    void deleteCatalogEntry(UUID id);
+
+    /**
+     * Returns whole catalog
+     *
+     * @return catalog (as list of catalog entries)
+     */
+    List<CatalogDto> getCatalog();
+
 }

backend/src/main/java/cz/zcu/kiv/backendapi/exception/ApiExceptionHandler.java

@@ -43 +43 @@
     public ResponseEntity<Object> handleApiRequestException(ApiRequestException exception) {
         return new ResponseEntity<>(exception.getMessage(), exception.getHttpStatus());
     }
+
+    /**
+     * Handles illegal argument exception
+     *
+     * @param exception illegal argument exception
+     * @return response entity with message and status
+     */
+    @ExceptionHandler(value = {IllegalArgumentException.class})
+    public ResponseEntity<Object> handleIllegalArgumentException(IllegalArgumentException exception) {
+        return new ResponseEntity<>(exception.getMessage(), HttpStatus.BAD_REQUEST);
+    }
 }

backend/src/main/java/cz/zcu/kiv/backendapi/security/SecurityConfig.java

@@ -74 +74 @@
                 .addFilterAfter(new JwtTokenVerifier(jwtUtils, permittedUrls), JwtUsernameAndPasswordAuthenticationFilter.class);
 
     }
-//    @Override
-//    public void configure(WebSecurity web) throws Exception {
-//        web.ignoring().antMatchers("/swagger-ui/**", "/v3/api-docs","/v3/api-docs/swagger-config", "/swagger-ui.html", "/swagger-ui-custom.html");
-//    }
-
 
     /**
      * Sets authentication provider to authentication manager

backend/src/main/java/cz/zcu/kiv/backendapi/user/IUserService.java

@@ -15 +15 @@
      */
     UserEntity getUserByName(String username);
 
+    /**
+     * Registers new user
+     *
+     * @param userDto user DTO
+     */
     void registerNewUser(UserDto userDto);
 
-    void updateUser(UserDto userDto);
+    void updateUser(String username, UserDto userDto);
 
     void deleteUser(String username);
 
+    /**
+     * Returns list of all users
+     *
+     * @return list of all users
+     */
     List<UserDto> getAllUsers();
 }

backend/src/main/java/cz/zcu/kiv/backendapi/user/UserController.java

@@ -66 +66 @@
 
     //TODO check if need, if needed probably change new dto without email, comment otherwise
     @PutMapping("/user/{username}")
-    @ResponseStatus(value = HttpStatus.OK)
     public void updateUser(@PathVariable String username, @RequestBody @Valid UserDto userDto) {
-        userService.updateUser(userDto);
+        userService.updateUser(username, userDto);
     }
 
     //TODO check if needed, comment otherwise
     @DeleteMapping("/user/{username}")
-    @ResponseStatus(value = HttpStatus.OK)
     public void deleteUser(@PathVariable String username) {
         userService.deleteUser(username);
     }

backend/src/main/java/cz/zcu/kiv/backendapi/user/UserServiceImpl.java

@@ -62 +62 @@
     }
 
     @Override
-    public void updateUser(UserDto userDto) {
-        UserEntity userEntity = userRepository.findByEmail(userDto.getEmail()).orElseThrow(() ->{
-            log.error(String.format(USER_NOT_FOUND, userDto.getEmail()));
-            throw new UsernameNotFoundException(String.format(USER_NOT_FOUND, userDto.getEmail()));
+    public void updateUser(String username, UserDto userDto) {
+        UserEntity userEntity = userRepository.findByEmail(username).orElseThrow(() ->{
+            log.error(String.format(USER_NOT_FOUND, username));
+            throw new UsernameNotFoundException(String.format(USER_NOT_FOUND, username));
         });
         convertDtoToEntity(userDto, userEntity);
+        userEntity.setEmail(username);
         userRepository.save(userEntity);
     }
 
-    //TODO maybe chceck if user is not deleting himself - or it might be ok
+    //TODO maybe check if user is not deleting himself - or it might be ok
     @Override
     public void deleteUser(String username) {
         UserEntity userEntity = userRepository.findByEmail(username).orElseThrow(() ->{

frontend/package.json

@@ -1 +1 @@
 {
   "name": "frontend",
+  "type": "module",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@emotion/react": "^11.8.2",
+    "@emotion/styled": "^11.8.1",
+    "@mui/material": "^5.5.1",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
@@ -12 +16 @@
     "@types/react-dom": "^17.0.9",
     "axios": "^0.26.0",
     "dotenv": "^16.0.0",
+    "formik": "^2.2.9",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-router-dom": "^6.2.2",
     "react-scripts": "5.0.0",
+    "swagger-typescript-api": "^9.3.1",
+    "ts-node": "^10.7.0",
     "typescript": "^4.4.2",
     "web-vitals": "^2.1.0"
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "react-scripts build && yarn run gen:swagger",
     "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "eject": "react-scripts eject",
+    "gen:swagger": "swagger-typescript-api -p http://localhost:8080/v3/api-docs -o ./src/swagger --modular"
   },
   "eslintConfig": {
     "extends": [

frontend/src/.env

@@ +1 @@
+REACT_APP_API_BASE_URL=http://localhost:8080

frontend/src/App.test.tsx

@@ -1 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});

frontend/src/App.tsx

@@ -1 @@
-import React from 'react';
-import './App.css';
-import StubComponent from './components/StubComponent'
+import React from 'react'
+import './App.css'
+import { Routes, Route, Link } from 'react-router-dom'
+import Home from './features/Home/Home'
+import Catalog from './features/Catalog/Catalog'
+import NotFound from './features/NotFound/NotFound'
 
-function App() {
-  return (
+const App = () => (
     <div className="App">
-      <StubComponent />
+        <nav>
+            <Link to="/">Home</Link>
+            <Link to="/catalog">Catalog</Link>
+        </nav>
+        <Routes>
+            <Route path="/" element={ <Home /> } />
+            <Route path="/catalog" element={ <Catalog /> } />
+            <Route path="*" element={ <NotFound /> } />
+        </Routes>
     </div>
-  );
-}
+)
 
-export default App;
+export default App

frontend/src/api/axios.ts

@@ +1 @@
+import axios from 'axios'
+import Config from '../config/Config'
+
+export default axios.create({
+    baseURL: Config.baseUrl,
+
+})
+

frontend/src/api/axiosInstance.ts

@@ +1 @@
+import axios from 'axios'
+import { Store } from 'redux'
+import config from '../config/conf'
+import { AppStore } from '../features/redux/store'
+
+let store: AppStore // this will get injected later
+
+export const injectStore = (_store: Store) => {
+    store = _store
+}
+
+const axiosInstance = axios.create({
+    baseURL: config.baseUrl,
+})
+
+axiosInstance.interceptors.request.use(config => {
+    config.headers = {
+        ...config.headers,
+        Authorization: store.getState().auth.token
+    }
+})
+
+axiosInstance.interceptors.response.use(response => response, error => {
+
+    if (error?.response?.status === 401) {
+        const refreshToken = store.getState().auth.refreshToken
+        // TODO send the refresh token correctly
+        console.log('401 called they want their token refreshed');
+    }
+
+})
+
+export default axiosInstance

frontend/src/components/StubComponent.tsx

@@ -1 @@
-// Example component that connects to the backend API and fetches dummy data
-
-import { useState } from 'react'
-import AxiosClient from '../services/AxiosClient'
-
-const StubComponent = () => {
-
-    const [text, setText] = useState<string>('')
-
-    // Sends api request to the backend
-    const fetchStub = async () => {
-        try {
-            const { data } = await AxiosClient.get('/stub')
-            if (!!data && data.success) {
-                setText(data.message as string)
-            }
-        }
-        catch (err) {
-            console.log(`An error has occurred: ${err}`)
-        }
-    }
-
-    return (
-        <>
-            <h1>Welcome to the internet</h1>
-            <p>Click the button to fetch the message</p>
-            <p>The message: {text}</p>
-            <button onClick={fetchStub}>Fetch the message</button>
-        </>
-    )
-
-}
-
-export default StubComponent

frontend/src/config/Config.ts

@@ -1 @@
-
-export default {
+const Config = {
     baseUrl: process.env.REACT_APP_API_BASE_URL || 'http://localhost:8080'
-}
+}
+
+export default Config

frontend/src/config/conf.ts

@@ +1 @@
+export default {
+    baseUrl: process.env.REACT_APP_API_BASE_URL || 'http://localhost:8080'
+}

frontend/src/features/Auth/AuthService.ts

@@ +1 @@
+import axios from "../../api/axios"
+import { UserDto } from "../../swagger/data-contracts"
+import ApiCallError from "../../utils/ApiCallError"
+
+export const getAccessToken = () => localStorage.getItem('accessToken') as string | null
+export const getRefreshToken = () => localStorage.getItem('refreshToken') as string | null
+
+export const setAccessToken = (accessToken: string) => localStorage.setItem('accessToken', accessToken)
+export const setRefreshToken = (refreshToken: string) => localStorage.setItem('refreshToken', refreshToken)
+
+
+export const sendRegisterRequest = (userDto: UserDto) => {
+    
+}
+
+export const sendLoginRequest = async (username: string, password: string, setLoggedInState: (loggedIn: boolean) => void) => {
+    try {
+        const { data } = await axios.post('/login', {username, password})
+
+        if (!data) {
+            throw new ApiCallError("An authentication error has occurred. Please try again later")
+        }
+
+        // TODO - set state as logged in
+        const { accessToken, refreshToken } = data
+        setAccessToken(accessToken)
+        setRefreshToken(refreshToken)
+        setLoggedInState(true)
+    }
+    catch (err) {
+
+    }
+}

frontend/src/features/Auth/Login.tsx

@@ +1 @@
+
+const Login = () => {
+
+    return (
+        <>
+
+        </>
+    )
+}
+
+export default Login

frontend/src/features/Auth/authReducer.ts

@@ +1 @@
+import { AnyAction } from 'redux'
+import { persist, load } from '../../utils/statePersistence'
+
+export interface UserInfo {
+    accessToken: string | undefined // to send api requests
+    refreshToken: string | undefined // to refresh the api key
+    username: string // to display the username
+    roles: string[]
+}
+
+export interface AuthState extends UserInfo {
+    isAuthenticated: boolean // if this is false all other values should be ignored
+}
+
+const statePersistName = 'auth'
+
+// Initial state when the user first starts the application
+const initialState: AuthState = (load(statePersistName) as AuthState) || {
+    isAuthenticated: false,
+    username: '',
+    roles: [],
+}
+
+// All possible actions
+export enum AuthStateActions {
+    LOG_IN = 'LOG_IN',
+    LOG_OUT = 'LOG_OUT',
+    UPDATE_ACCESS_TOKEN = 'REFRESH_ACCESS_TOKEN',
+    UPDATE_REFRESH_TOKEN = 'UPDATE_REFRESH_TOKEN',
+    UPDATE_TOKENS = 'UPDATE_TOKENS',
+}
+
+// Actions
+const authReducer = (state: AuthState = initialState, action: AnyAction) => {
+    switch (action.type) {
+        case AuthStateActions.LOG_IN:
+            return persist(statePersistName, {
+                ...action.payload,
+                isAuthenticated: true,
+            })
+
+        case AuthStateActions.LOG_OUT:
+            return persist(statePersistName, initialState)
+
+        case AuthStateActions.UPDATE_ACCESS_TOKEN:
+            return persist(statePersistName, {
+                ...state,
+                accessToken: action.payload,
+            })
+
+        case AuthStateActions.UPDATE_REFRESH_TOKEN:
+            return persist(statePersistName, {
+                ...state,
+                refreshToken: action.payload,
+            })
+
+        case AuthStateActions.UPDATE_TOKENS:
+            return persist(statePersistName, { ...state, ...action.payload })
+
+        default:
+            return state
+    }
+}
+
+export default authReducer

frontend/src/features/Catalog/Catalog.tsx

@@ +1 @@
+
+const Catalog = () => {
+
+    return (
+        <>
+            <h1>Catalog</h1>
+        </>
+    )
+}
+
+export default Catalog

frontend/src/features/Catalog/CatalogService.ts

@@ +1 @@
+import axios from "../../api/axios"
+import { CatalogDto } from "../../swagger/data-contracts"
+
+export const getCatalogItems = async (componentMounted: boolean, setCatalog: (catalogItems: CatalogDto[]) => void, ) => {
+    try {
+        const { data } = await axios.get('/catalog')
+    }
+    catch (err: any) {
+
+    }
+}
+
+export const getCatalogItem = (id: string) => {
+
+}

frontend/src/features/Home/Home.tsx

@@ +1 @@
+const Home = () => {
+
+    return (<>
+    <h1>Home</h1>
+    </>)
+}
+
+export default Home

frontend/src/features/NotFound/NotFound.tsx

@@ +1 @@
+const NotFound = () => {
+
+    return (
+        <>
+            <h1>Page Not Found 😡😡😡</h1>
+        </>
+    )
+}
+
+export default NotFound

frontend/src/features/redux/store.ts

@@ +1 @@
+// Store that holds the state of the application
+
+import { combineReducers, createStore } from 'redux'
+import authReducer from '../Auth/authReducer'
+import themeReducer from '../Theme/themeReducer'
+
+const store = createStore(
+    combineReducers({ auth: authReducer, theme: themeReducer }),
+    {}
+)
+
+export default store
+
+export type AppStore = typeof store
+
+export type RootState = ReturnType<typeof store.getState>
+
+export type AppDispatch = typeof store.dispatch

frontend/src/index.tsx

@@ -1 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-import App from './App';
-import reportWebVitals from './reportWebVitals';
+import React from 'react'
+import ReactDOM from 'react-dom'
+import './index.css'
+import App from './App'
+import reportWebVitals from './reportWebVitals'
+import { BrowserRouter } from 'react-router-dom'
 
 ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById('root')
-);
+    <React.StrictMode>
+        <BrowserRouter>
+            <App />
+        </BrowserRouter>
+    </React.StrictMode>,
+    document.getElementById('root')
+)
 
 // If you want to start measuring performance in your app, pass a function
 // to log results (for example: reportWebVitals(console.log))
 // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
+reportWebVitals()

frontend/src/logo.svg

@@ -1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

frontend/src/react-app-env.d.ts

@@ -1 @@
-/// <reference types="react-scripts" />

frontend/src/services/AxiosClient.ts

@@ -1 @@
-import axios from 'axios'
-import Config from '../config/Config'
-
-export default axios.create({
-    baseURL: Config.baseUrl,
-})

frontend/src/setupTests.ts

@@ -1 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';

frontend/src/swagger/Catalog.ts

@@ +1 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+import { CatalogDto } from "./data-contracts";
+import { ContentType, HttpClient, RequestParams } from "./http-client";
+
+export class Catalog<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+  /**
+   * No description
+   *
+   * @tags catalog-controller
+   * @name UpdateCatalogEntry
+   * @request PUT:/catalog/{id}
+   */
+  updateCatalogEntry = (id: string, data: CatalogDto, params: RequestParams = {}) =>
+    this.request<void, any>({
+      path: `/catalog/${id}`,
+      method: "PUT",
+      body: data,
+      type: ContentType.Json,
+      ...params,
+    });
+  /**
+   * No description
+   *
+   * @tags catalog-controller
+   * @name DeleteCatalogEntry
+   * @request DELETE:/catalog/{id}
+   */
+  deleteCatalogEntry = (id: string, params: RequestParams = {}) =>
+    this.request<void, any>({
+      path: `/catalog/${id}`,
+      method: "DELETE",
+      ...params,
+    });
+  /**
+   * No description
+   *
+   * @tags catalog-controller
+   * @name GetAllUsers1
+   * @request GET:/catalog
+   */
+  getAllUsers1 = (params: RequestParams = {}) =>
+    this.request<CatalogDto[], any>({
+      path: `/catalog`,
+      method: "GET",
+      ...params,
+    });
+  /**
+   * No description
+   *
+   * @tags catalog-controller
+   * @name AddCatalogEntry
+   * @request POST:/catalog
+   */
+  addCatalogEntry = (data: CatalogDto, params: RequestParams = {}) =>
+    this.request<void, any>({
+      path: `/catalog`,
+      method: "POST",
+      body: data,
+      type: ContentType.Json,
+      ...params,
+    });
+}

frontend/src/swagger/Register.ts

@@ +1 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+import { UserDto } from "./data-contracts";
+import { ContentType, HttpClient, RequestParams } from "./http-client";
+
+export class Register<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+  /**
+   * No description
+   *
+   * @tags user-controller
+   * @name RegisterNewUser
+   * @request POST:/register
+   */
+  registerNewUser = (data: UserDto, params: RequestParams = {}) =>
+    this.request<void, any>({
+      path: `/register`,
+      method: "POST",
+      body: data,
+      type: ContentType.Json,
+      ...params,
+    });
+}

frontend/src/swagger/Token.ts

@@ +1 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+import { HttpClient, RequestParams } from "./http-client";
+
+export class Token<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+  /**
+   * No description
+   *
+   * @tags user-controller
+   * @name RefreshToken
+   * @request GET:/token/refresh
+   */
+  refreshToken = (params: RequestParams = {}) =>
+    this.request<void, any>({
+      path: `/token/refresh`,
+      method: "GET",
+      ...params,
+    });
+}

frontend/src/swagger/User.ts

@@ +1 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+import { UserDto } from "./data-contracts";
+import { ContentType, HttpClient, RequestParams } from "./http-client";
+
+export class User<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+  /**
+   * No description
+   *
+   * @tags user-controller
+   * @name UpdateUser
+   * @request PUT:/user/{username}
+   */
+  updateUser = (username: string, data: UserDto, params: RequestParams = {}) =>
+    this.request<void, any>({
+      path: `/user/${username}`,
+      method: "PUT",
+      body: data,
+      type: ContentType.Json,
+      ...params,
+    });
+  /**
+   * No description
+   *
+   * @tags user-controller
+   * @name DeleteUser
+   * @request DELETE:/user/{username}
+   */
+  deleteUser = (username: string, params: RequestParams = {}) =>
+    this.request<void, any>({
+      path: `/user/${username}`,
+      method: "DELETE",
+      ...params,
+    });
+}

frontend/src/swagger/Users.ts

@@ +1 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+import { UserDto } from "./data-contracts";
+import { HttpClient, RequestParams } from "./http-client";
+
+export class Users<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+  /**
+   * No description
+   *
+   * @tags user-controller
+   * @name GetAllUsers
+   * @request GET:/users
+   */
+  getAllUsers = (params: RequestParams = {}) =>
+    this.request<UserDto[], any>({
+      path: `/users`,
+      method: "GET",
+      ...params,
+    });
+}

frontend/src/swagger/data-contracts.ts

@@ +1 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+export interface UserDto {
+  name?: string;
+  email: string;
+  canRead?: boolean;
+  canWrite?: boolean;
+  canDelete?: boolean;
+}
+
+export interface CatalogDto {
+  /** @format uuid */
+  id?: string;
+  name?: string;
+
+  /** @format int32 */
+  certainty?: number;
+
+  /** @format double */
+  longitude?: number;
+
+  /** @format double */
+  latitude?: number;
+  bibliography?: string[];
+  countries?: string[];
+  writtenForms?: string[];
+  alternativeNames?: string[];
+  types?: string[];
+}

frontend/src/swagger/http-client.ts

@@ +1 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+export type QueryParamsType = Record<string | number, any>;
+export type ResponseFormat = keyof Omit<Body, "body" | "bodyUsed">;
+
+export interface FullRequestParams extends Omit<RequestInit, "body"> {
+  /** set parameter to `true` for call `securityWorker` for this request */
+  secure?: boolean;
+  /** request path */
+  path: string;
+  /** content type of request body */
+  type?: ContentType;
+  /** query params */
+  query?: QueryParamsType;
+  /** format of response (i.e. response.json() -> format: "json") */
+  format?: ResponseFormat;
+  /** request body */
+  body?: unknown;
+  /** base url */
+  baseUrl?: string;
+  /** request cancellation token */
+  cancelToken?: CancelToken;
+}
+
+export type RequestParams = Omit<FullRequestParams, "body" | "method" | "query" | "path">;
+
+export interface ApiConfig<SecurityDataType = unknown> {
+  baseUrl?: string;
+  baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
+  securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
+  customFetch?: typeof fetch;
+}
+
+export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
+  data: D;
+  error: E;
+}
+
+type CancelToken = Symbol | string | number;
+
+export enum ContentType {
+  Json = "application/json",
+  FormData = "multipart/form-data",
+  UrlEncoded = "application/x-www-form-urlencoded",
+}
+
+export class HttpClient<SecurityDataType = unknown> {
+  public baseUrl: string = "http://localhost:8080";
+  private securityData: SecurityDataType | null = null;
+  private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
+  private abortControllers = new Map<CancelToken, AbortController>();
+  private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
+
+  private baseApiParams: RequestParams = {
+    credentials: "same-origin",
+    headers: {},
+    redirect: "follow",
+    referrerPolicy: "no-referrer",
+  };
+
+  constructor(apiConfig: ApiConfig<SecurityDataType> = {}) {
+    Object.assign(this, apiConfig);
+  }
+
+  public setSecurityData = (data: SecurityDataType | null) => {
+    this.securityData = data;
+  };
+
+  private encodeQueryParam(key: string, value: any) {
+    const encodedKey = encodeURIComponent(key);
+    return `${encodedKey}=${encodeURIComponent(typeof value === "number" ? value : `${value}`)}`;
+  }
+
+  private addQueryParam(query: QueryParamsType, key: string) {
+    return this.encodeQueryParam(key, query[key]);
+  }
+
+  private addArrayQueryParam(query: QueryParamsType, key: string) {
+    const value = query[key];
+    return value.map((v: any) => this.encodeQueryParam(key, v)).join("&");
+  }
+
+  protected toQueryString(rawQuery?: QueryParamsType): string {
+    const query = rawQuery || {};
+    const keys = Object.keys(query).filter((key) => "undefined" !== typeof query[key]);
+    return keys
+      .map((key) => (Array.isArray(query[key]) ? this.addArrayQueryParam(query, key) : this.addQueryParam(query, key)))
+      .join("&");
+  }
+
+  protected addQueryParams(rawQuery?: QueryParamsType): string {
+    const queryString = this.toQueryString(rawQuery);
+    return queryString ? `?${queryString}` : "";
+  }
+
+  private contentFormatters: Record<ContentType, (input: any) => any> = {
+    [ContentType.Json]: (input: any) =>
+      input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
+    [ContentType.FormData]: (input: any) =>
+      Object.keys(input || {}).reduce((formData, key) => {
+        const property = input[key];
+        formData.append(
+          key,
+          property instanceof Blob
+            ? property
+            : typeof property === "object" && property !== null
+            ? JSON.stringify(property)
+            : `${property}`,
+        );
+        return formData;
+      }, new FormData()),
+    [ContentType.UrlEncoded]: (input: any) => this.toQueryString(input),
+  };
+
+  private mergeRequestParams(params1: RequestParams, params2?: RequestParams): RequestParams {
+    return {
+      ...this.baseApiParams,
+      ...params1,
+      ...(params2 || {}),
+      headers: {
+        ...(this.baseApiParams.headers || {}),
+        ...(params1.headers || {}),
+        ...((params2 && params2.headers) || {}),