diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5276c0ebe5..703ca5d732 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,35 +1,21 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-<<<<<<< HEAD
import { AppRoutingModule } from './app-routing.module';
-=======
+import { AppComponent } from './app.component';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { HeaderComponent } from './header/header.component';
import { ShellModule } from './shell/shell.module';
->>>>>>> origin/develop
import { FlexLayoutModule } from '@angular/flex-layout';
-
-
import { AppState } from './shared/store/app.state';
import { NgxsModule } from '@ngxs/store';
import { NgxsReduxDevtoolsPluginModule } from '@ngxs/devtools-plugin';
import { NgxsLoggerPluginModule } from '@ngxs/logger-plugin';
import { environment } from 'src/environments/environment';
-import { AppComponent } from './app.component';
-import { HeaderComponent } from './header/header.component';
-import { ShellModule } from './shell/shell.module';
-import { ShellComponent } from './shell/shell.component';
-
@NgModule({
declarations: [
AppComponent,
-<<<<<<< HEAD
- HeaderComponent,
- ShellComponent,
-=======
HeaderComponent
->>>>>>> origin/develop
],
imports: [
BrowserModule,
diff --git a/src/app/shared/result.actions.ts b/src/app/shared/result.actions.ts
new file mode 100644
index 0000000000..2b7ad15dc9
--- /dev/null
+++ b/src/app/shared/result.actions.ts
@@ -0,0 +1,4 @@
+export class UpdateCurrentView {
+ static readonly type = '[Result] EditView';
+ constructor(public payload: string) {}
+}
diff --git a/src/app/shell/main/main.component.html b/src/app/shell/main/main.component.html
index 2b3e4bdb13..7840cf3914 100644
--- a/src/app/shell/main/main.component.html
+++ b/src/app/shell/main/main.component.html
@@ -1 +1,2 @@
+
diff --git a/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.html b/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.html
new file mode 100644
index 0000000000..034be4b737
--- /dev/null
+++ b/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.html
@@ -0,0 +1 @@
+
hobby-groups-list works!
diff --git a/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.scss b/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.spec.ts b/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.spec.ts
new file mode 100644
index 0000000000..634aa8c746
--- /dev/null
+++ b/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HobbyGroupsListComponent } from './hobby-groups-list.component';
+
+describe('HobbyGroupsListComponent', () => {
+ let component: HobbyGroupsListComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ HobbyGroupsListComponent ]
+ })
+ .compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(HobbyGroupsListComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.ts b/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.ts
new file mode 100644
index 0000000000..0bb2318bf0
--- /dev/null
+++ b/src/app/shell/main/result/hobby-groups-list/hobby-groups-list.component.ts
@@ -0,0 +1,23 @@
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs';
+import { Store } from '@ngxs/store';
+
+@Component({
+ selector: 'app-hobby-groups-list',
+ templateUrl: './hobby-groups-list.component.html',
+ styleUrls: ['./hobby-groups-list.component.scss']
+})
+export class HobbyGroupsListComponent implements OnInit {
+ stateCards: Observable