Merge remote-tracking branch...

Merge remote-tracking branch 'origin/286-gitlab-messages-wieder-in-austauschplattform-einblenden' into development

src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java

 package at.ac.uibk.gitsearch.repository.search;
 
+import at.ac.uibk.gitsearch.domain.Authority;
+import at.ac.uibk.gitsearch.service.dto.AutoCompleteEntry;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -19,10 +26,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javax.annotation.PostConstruct;
 import javax.ws.rs.NotFoundException;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -52,15 +57,6 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.stereotype.Repository;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-
-import at.ac.uibk.gitsearch.domain.Authority;
-import at.ac.uibk.gitsearch.service.dto.AutoCompleteEntry;
-
 @Repository
 public class MetaDataRepository {
 

src/main/java/at/ac/uibk/gitsearch/web/rest/ExerciseResource.java

 package at.ac.uibk.gitsearch.web.rest;
 
+import at.ac.uibk.gitsearch.es.model.ArtemisExerciseInfo;
+import at.ac.uibk.gitsearch.security.SecurityUtils;
+import at.ac.uibk.gitsearch.service.ArtemisImportError;
+import at.ac.uibk.gitsearch.service.ExerciseService;
+import at.ac.uibk.gitsearch.service.GitlabService;
+import at.ac.uibk.gitsearch.service.SearchService;
+import at.ac.uibk.gitsearch.service.SearchService.ExtractionDepth;
+import at.ac.uibk.gitsearch.service.StatisticsService;
+import at.ac.uibk.gitsearch.service.dto.StatisticsDTO;
+import at.ac.uibk.gitsearch.web.rest.utils.RestUtils;
+import at.ac.uibk.gitsearch.web.util.HeaderUtil;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -12,10 +23,8 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.text.ParseException;
 import java.util.Optional;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Response;
-
 import org.apache.commons.lang3.StringUtils;
 import org.codeability.sharing.plugins.api.search.SearchResultDTO;
 import org.codeability.sharing.plugins.api.search.util.ExerciseId;
@@ -39,18 +48,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.HandlerMapping;
 
-import at.ac.uibk.gitsearch.es.model.ArtemisExerciseInfo;
-import at.ac.uibk.gitsearch.security.SecurityUtils;
-import at.ac.uibk.gitsearch.service.ArtemisImportError;
-import at.ac.uibk.gitsearch.service.ExerciseService;
-import at.ac.uibk.gitsearch.service.GitlabService;
-import at.ac.uibk.gitsearch.service.SearchService;
-import at.ac.uibk.gitsearch.service.SearchService.ExtractionDepth;
-import at.ac.uibk.gitsearch.service.StatisticsService;
-import at.ac.uibk.gitsearch.service.dto.StatisticsDTO;
-import at.ac.uibk.gitsearch.web.rest.utils.RestUtils;
-import at.ac.uibk.gitsearch.web.util.HeaderUtil;
-
 /**
  * this resource should give access to various aspects of an exercise or course
  * @author Michael Breu

src/main/java/at/ac/uibk/gitsearch/web/rest/LikesResource.java

 package at.ac.uibk.gitsearch.web.rest;
 
+import at.ac.uibk.gitsearch.domain.Likes;
+import at.ac.uibk.gitsearch.service.LikesQueryService;
+import at.ac.uibk.gitsearch.service.LikesService;
+import at.ac.uibk.gitsearch.service.SearchService;
+import at.ac.uibk.gitsearch.service.UserService;
+import at.ac.uibk.gitsearch.service.dto.LikesCriteria;
+import at.ac.uibk.gitsearch.web.rest.errors.BadRequestAlertException;
+import at.ac.uibk.gitsearch.web.rest.utils.RestUtils;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -23,15 +29,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.HandlerMapping;
-
-import at.ac.uibk.gitsearch.domain.Likes;
-import at.ac.uibk.gitsearch.service.LikesQueryService;
-import at.ac.uibk.gitsearch.service.LikesService;
-import at.ac.uibk.gitsearch.service.SearchService;
-import at.ac.uibk.gitsearch.service.UserService;
-import at.ac.uibk.gitsearch.service.dto.LikesCriteria;
-import at.ac.uibk.gitsearch.web.rest.errors.BadRequestAlertException;
-import at.ac.uibk.gitsearch.web.rest.utils.RestUtils;
 import tech.jhipster.web.util.HeaderUtil;
 import tech.jhipster.web.util.ResponseUtil;
 

src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java

 package at.ac.uibk.gitsearch.web.rest;
 
+import at.ac.uibk.gitsearch.repository.StatisticsRepository;
+import at.ac.uibk.gitsearch.service.SearchService;
+import at.ac.uibk.gitsearch.service.StatisticsService;
+import at.ac.uibk.gitsearch.service.dto.StatisticsDTO;
+import at.ac.uibk.gitsearch.web.rest.errors.BadRequestAlertException;
+import at.ac.uibk.gitsearch.web.rest.utils.RestUtils;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Optional;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,13 +30,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-
-import at.ac.uibk.gitsearch.repository.StatisticsRepository;
-import at.ac.uibk.gitsearch.service.SearchService;
-import at.ac.uibk.gitsearch.service.StatisticsService;
-import at.ac.uibk.gitsearch.service.dto.StatisticsDTO;
-import at.ac.uibk.gitsearch.web.rest.errors.BadRequestAlertException;
-import at.ac.uibk.gitsearch.web.rest.utils.RestUtils;
 import tech.jhipster.web.util.HeaderUtil;
 import tech.jhipster.web.util.PaginationUtil;
 import tech.jhipster.web.util.ResponseUtil;

src/main/webapp/app/layouts/main/main.component.html

 <div style="width: 100%">
-  <!-- TODO
+  <div class="container-fluid">
     <div *ngFor="let m of getActiveMessages()">
-     <div class="alert alert-warning">{{m.message}}</div>
+      <div class="alert alert-warning text-center">{{ m.message }}</div>
     </div>
-     -->
-  <div class="container-fluid">
+    <!-- codeability bar -->
+    <div class="row" id="top-space">
+      <div><img src="/content/img/logo-top.png" alt="codeAbility" width="168px" /></div>
+    </div>
+
     <div class="row">
       <div style="width: 100%">
         <router-outlet name="navbar"></router-outlet>

src/main/webapp/app/layouts/main/main.component.ts

@@ -7,6 +7,7 @@ import dayjs from 'dayjs/esm';
 import { AccountService } from 'app/core/auth/account.service';
 import { AuthServerProvider } from 'app/core/auth/auth-jwt.service';
 import { CookieService } from 'ngx-cookie-service';
+import { MessageService, BroadCastMessage } from 'app/shared/service/message-service';
 
 @Component({
   selector: 'jhi-main',
@@ -23,6 +24,7 @@ export class MainComponent implements OnInit {
     private translateService: TranslateService,
     private cookieService: CookieService,
     private authServerProvider: AuthServerProvider,
+    private messageService: MessageService,
     rootRenderer: RendererFactory2
   ) {
     this.renderer = rootRenderer.createRenderer(document.querySelector('html'), null);
@@ -62,6 +64,10 @@ export class MainComponent implements OnInit {
     }
   }
 
+  public getActiveMessages(): Array<BroadCastMessage> {
+    return this.messageService.getActiveMessages(); //
+  }
+
   private getPageTitle(routeSnapshot: ActivatedRouteSnapshot): string {
     const title: string = routeSnapshot.data['pageTitle'] ?? '';
     if (routeSnapshot.firstChild) {