Merge branch 'develop' into feature/update-avatar

ls1intum · Aug 8, 2024 · 4324150 · 4324150
2 parents f1083df + 049c1bb
commit 4324150
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/webapp/src/app/example/counter/counter.component.ts b/webapp/src/app/example/counter/counter.component.ts
@@ -1,6 +1,6 @@
 import { Component, computed, effect, input, signal } from '@angular/core';
 import { counter } from './counter';
-import { AppButtonComponent } from 'app/ui/button/button/button.component';
+import { AppButtonComponent } from 'app/ui/button/button.component';
 
 interface CounterHistoryEntry {
   dec: number;

diff --git a/webapp/src/app/example/hello/hello.component.ts b/webapp/src/app/example/hello/hello.component.ts
@@ -3,7 +3,7 @@ import { injectMutation, injectQuery, injectQueryClient } from '@tanstack/angula
 import { AngularQueryDevtools } from '@tanstack/angular-query-devtools-experimental';
 import { lastValueFrom } from 'rxjs';
 import { HelloService } from 'app/core/modules/openapi';
-import { AppButtonComponent } from 'app/ui/button/button/button.component';
+import { AppButtonComponent } from 'app/ui/button/button.component';
 
 @Component({
   selector: 'app-hello',

diff --git a/...pp/ui/button/button/button.component.html → ...p/src/app/ui/button/button.component.html b/...pp/ui/button/button/button.component.html → ...p/src/app/ui/button/button.component.html
diff --git a/.../app/ui/button/button/button.component.ts → webapp/src/app/ui/button/button.component.ts b/.../app/ui/button/button/button.component.ts → webapp/src/app/ui/button/button.component.ts
diff --git a/...rc/app/ui/button/button/button.stories.ts → webapp/src/app/ui/button/button.stories.ts b/...rc/app/ui/button/button/button.stories.ts → webapp/src/app/ui/button/button.stories.ts
diff --git a/webapp/src/app/ui/input/input.stories.ts b/webapp/src/app/ui/input/input.stories.ts
@@ -1,7 +1,7 @@
 import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
 import { AppInputComponent, args, argTypes } from './input.component';
 import { action } from '@storybook/addon-actions';
-import { AppButtonComponent } from '@app/ui/button/button/button.component';
+import { AppButtonComponent } from '@app/ui/button/button.component';
 import { AppLabelComponent } from '@app/ui/label/label.component';
 
 const meta: Meta<AppInputComponent> = {