Development: Move client course and layouts module to core and assessment-dasboard to assessment (#10532)

Author: tobias-lippert

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

@@ -1,19 +1,19 @@
 import { Component, OnDestroy, OnInit, Renderer2, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, NavigationEnd, NavigationError, NavigationStart, Router, RouterOutlet } from '@angular/router';
 import { JhiLanguageHelper } from 'app/core/language/shared/language.helper';
-import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { SentryErrorHandler } from 'app/core/sentry/sentry.error-handler';
 import { ThemeService } from 'app/core/theme/shared/theme.service';
 import { DOCUMENT, NgClass, NgStyle } from '@angular/common';
 import { Subscription } from 'rxjs';
 import { ExamParticipationService } from 'app/exam/overview/exam-participation.service';
-import { CourseManagementService } from 'app/course/manage/course-management.service';
+import { CourseManagementService } from 'app/core/course/manage/course-management.service';
 import { LtiService } from 'app/shared/service/lti.service';
 import { AlertOverlayComponent } from 'app/core/alert/alert-overlay.component';
 import { CdkScrollable } from '@angular/cdk/scrolling';
-import { PageRibbonComponent } from './shared/layouts/profiles/page-ribbon.component';
-import { NotificationPopupComponent } from './shared/notification/notification-popup/notification-popup.component';
-import { FooterComponent } from './shared/layouts/footer/footer.component';
+import { PageRibbonComponent } from 'app/shared/layouts/profiles/page-ribbon.component';
+import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
+import { NotificationPopupComponent } from 'app/shared/notification/notification-popup/notification-popup.component';
+import { FooterComponent } from 'app/shared/layouts/footer/footer.component';
 
 @Component({
     selector: 'jhi-app',

src/main/webapp/app/app.config.ts

@@ -25,12 +25,11 @@ import { ErrorHandlerInterceptor } from 'app/core/interceptor/errorhandler.inter
 import { NotificationInterceptor } from 'app/core/interceptor/notification.interceptor';
 import { SentryErrorHandler } from 'app/core/sentry/sentry.error-handler';
 
-import { LoadingNotificationInterceptor } from 'app/shared/notification/loading-notification/loading-notification.interceptor';
-
-import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
+import { ArtemisNavigationUtilService } from 'app/shared/util/navigation.utils';
 import { provideNgxWebstorage, withLocalStorage, withNgxWebstorageConfig, withSessionStorage } from 'ngx-webstorage';
 import { OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
+import { LoadingNotificationInterceptor } from 'app/shared/notification/loading-notification/loading-notification.interceptor';
 
 export const appConfig: ApplicationConfig = {
     providers: [

src/main/webapp/app/app.main.ts

@@ -3,7 +3,6 @@ import { appConfig } from 'app/app.config';
 import { MonacoConfig } from 'app/core/config/monaco.config';
 import { ProdConfig } from 'app/core/config/prod.config';
 import { JhiLanguageHelper } from 'app/core/language/shared/language.helper';
-import { artemisIconPack } from 'app/icons/icons';
 import { AppComponent } from './app.component';
 import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
 import isMobile from 'ismobilejs-es5';
@@ -13,6 +12,7 @@ import dayjs from 'dayjs/esm';
 import { NgbDatepickerConfig, NgbTooltipConfig } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 import { SessionStorageService } from 'ngx-webstorage';
+import { artemisIconPack } from 'app/icons/icons';
 
 ProdConfig();
 MonacoConfig();

src/main/webapp/app/app.routes.ts

@@ -3,7 +3,6 @@ import { UserRouteAccessService } from 'app/core/auth/user-route-access-service'
 import { Authority } from 'app/shared/constants/authority.constants';
 import { navbarRoute } from 'app/shared/layouts/navbar/navbar.route';
 import { errorRoute } from 'app/shared/layouts/error/error.route';
-
 const LAYOUT_ROUTES: Routes = [navbarRoute, ...errorRoute];
 
 const routes: Routes = [
@@ -17,7 +16,7 @@ const routes: Routes = [
     },
     {
         path: '',
-        loadChildren: () => import('./shared/user-settings/user-settings.route').then((m) => m.routes),
+        loadChildren: () => import('app/shared/user-settings/user-settings.route').then((m) => m.routes),
     },
     {
         path: 'admin',
@@ -134,7 +133,7 @@ const routes: Routes = [
     // ===== COURSE MANAGEMENT =====
     {
         path: 'course-management',
-        loadChildren: () => import('./course/manage/course-management.route').then((m) => m.courseManagementState),
+        loadChildren: () => import('./core/course/manage/course-management.route').then((m) => m.courseManagementState),
     },
     {
         path: 'course-management/:courseId/programming-exercises/:exerciseId/code-editor',
@@ -143,7 +142,7 @@ const routes: Routes = [
 
     {
         path: 'courses',
-        loadChildren: () => import('app/course/overview/courses.route').then((m) => m.routes),
+        loadChildren: () => import('app/core/course/overview/courses.route').then((m) => m.routes),
     },
     {
         path: 'course-management/:courseId/lectures/:lectureId/attachments/:attachmentId',
@@ -159,12 +158,12 @@ const routes: Routes = [
     {
         path: 'courses/:courseId/exercises/:exerciseId/problem-statement',
         pathMatch: 'full',
-        loadComponent: () => import('app/course/overview/exercise-details/problem-statement/problem-statement.component').then((m) => m.ProblemStatementComponent),
+        loadComponent: () => import('app/core/course/overview/exercise-details/problem-statement/problem-statement.component').then((m) => m.ProblemStatementComponent),
     },
     {
         pathMatch: 'full',
         path: 'courses/:courseId/exercises/:exerciseId/problem-statement/:participationId',
-        loadComponent: () => import('app/course/overview/exercise-details/problem-statement/problem-statement.component').then((m) => m.ProblemStatementComponent),
+        loadComponent: () => import('app/core/course/overview/exercise-details/problem-statement/problem-statement.component').then((m) => m.ProblemStatementComponent),
     },
     {
         path: 'courses/:courseId/exercises/:exerciseId/participations/:participationId/results/:resultId/feedback',

src/main/webapp/app/assessment/manage/assessment-instructions/assessment-instructions/assessment-instructions.component.ts

@@ -12,10 +12,10 @@ import { ProgrammingExerciseStudentParticipation } from 'app/entities/participat
 import { ExpandableSectionComponent } from '../expandable-section/expandable-section.component';
 import { StructuredGradingInstructionsAssessmentLayoutComponent } from 'app/assessment/manage/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component';
 import { ProgrammingExerciseInstructionComponent } from 'app/programming/shared/instructions-render/programming-exercise-instruction.component';
-import { SecureLinkDirective } from 'app/shared/http/secure-link.directive';
 import { ButtonComponent } from 'app/shared/components/button.component';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { ModelingEditorComponent } from 'app/modeling/shared/modeling-editor.component';
+import { SecureLinkDirective } from 'app/shared/http/secure-link.directive';
 
 @Component({
     selector: 'jhi-assessment-instructions',

src/main/webapp/app/assessment/manage/assessment-locks/assessment-locks.component.ts

@@ -3,7 +3,7 @@ import { ActivatedRoute, RouterLink } from '@angular/router';
 import { FileUploadAssessmentService } from 'app/fileupload/manage/assess/file-upload-assessment.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Submission, SubmissionExerciseType } from 'app/entities/submission.model';
-import { CourseManagementService } from 'app/course/manage/course-management.service';
+import { CourseManagementService } from 'app/core/course/manage/course-management.service';
 import { HttpResponse } from '@angular/common/http';
 import { Course } from 'app/entities/course.model';
 import { Exercise, ExerciseType, getIcon, getIconTooltip } from 'app/entities/exercise.model';

src/main/webapp/app/assessment/manage/assessment-locks/assessment-locks.route.ts

@@ -2,7 +2,7 @@ import { Routes } from '@angular/router';
 import { UserRouteAccessService } from 'app/core/auth/user-route-access-service';
 
 import { Authority } from 'app/shared/constants/authority.constants';
-import { CourseManagementResolve } from 'app/course/manage/course-management-resolve.service';
+import { CourseManagementResolve } from 'app/core/course/manage/course-management-resolve.service';
 
 export const assessmentLocksRoute: Routes = [
     {

src/main/webapp/app/assessment/manage/complaint-response.service.ts

@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
 import { ComplaintResponse } from 'app/entities/complaint-response.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { Exercise } from 'app/entities/exercise.model';
-import { convertDateFromServer } from 'app/utils/date.utils';
+import { convertDateFromServer } from 'app/shared/util/date.utils';
 import { ComplaintResponseUpdateDTO } from 'app/entities/complaint-response-dto.model';
 
 type EntityResponseType = HttpResponse<ComplaintResponse>;

src/main/webapp/app/assessment/manage/grading-system/base-grading-system/base-grading-system.component.ts

@@ -10,7 +10,7 @@ import { catchError, finalize } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 import { Course } from 'app/entities/course.model';
 import { Exam } from 'app/entities/exam/exam.model';
-import { CourseManagementService } from 'app/course/manage/course-management.service';
+import { CourseManagementService } from 'app/core/course/manage/course-management.service';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { download, generateCsv, mkConfig } from 'export-to-csv';
 import { faExclamationTriangle, faInfo, faPlus, faSave, faTimes } from '@fortawesome/free-solid-svg-icons';

src/main/webapp/app/assessment/manage/grading-system/grading-key-overview/grading-key-helper.ts

@@ -1,4 +1,4 @@
-import { findParamInRouteHierarchy } from 'app/utils/navigation.utils';
+import { findParamInRouteHierarchy } from 'app/shared/util/navigation.utils';
 import { ActivatedRoute } from '@angular/router';
 
 export type GradingKeyUrlParams = {