Resolve merge conflicts

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,25 @@
+---
+name: Bug
+about: An undesirable behaviour that needs correction. If this doesn't look right,
+  choose a different type.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the Bug**
+A clear and concise description of what the bug is.
+
+**Expected Behaviour**
+A clear and concise description of what you expected to happen.
+
+**Actual Behaviour**
+A clear and concise description of what actually happens.
+
+** Steps To Reproduce**
+Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error

.github/ISSUE_TEMPLATE/custom-issue-template.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/decision.md

@@ -0,0 +1,11 @@
+---
+name: Decision
+about: This is a big decision that has been made or raised to PO. If this doesn't
+  look right, choose a different type.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/documentation.md

@@ -0,0 +1,27 @@
+---
+name: Documentation
+about: Documentation for a specific area or need. If this doesn't look right, choose
+  a different type.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**As a** *(User Type/Persona)* **I want** *(Feature/enhancement)* **So That** *(Value, why is this wanted, what is the user trying to accomplish)*
+
+**Additional Context**
+- enter text here
+- enter text here
+
+**Acceptance Criteria**
+- [ ] Given (Context), When (action carried out), Then (expected outcome)
+- [ ] Given (Context), When (action carried out), Then (expected outcome)
+
+**Definition of Done**
+- [ ] Ready to Demo in Sprint Review
+- [ ] Does what I have made have appropriate test coverage?
+- [ ] Documentation and/or scientific documentation exists and can be found
+- [ ] Peer Reviewed by 2 people on the team
+- [ ] Manual testing of all PRs in Dev and Prod
+- [ ] Merged

.github/ISSUE_TEMPLATE/epic.md

@@ -0,0 +1,21 @@
+---
+name: Epic
+about: A User Story Large enough that it cannot be completed in a single sprint, the
+  desired end state of a feature. If this doesn't look right, choose a different type.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**As a** *(User Type/Persona)* **I want** *(Feature/enhancement)* **So That** *(Value, why is this wanted, what is the user trying to accomplish)*
+
+**Additional Context**
+
+- enter text here
+- enter text here
+
+**Acceptance Criteria**
+
+- [ ] Given (Context), When (action carried out), Then (expected outcome)
+- [ ] Given (Context), When (action carried out), Then (expected outcome)

.github/ISSUE_TEMPLATE/feature-request---user-story.md

@@ -0,0 +1,27 @@
+---
+name: Feature request / user story
+about: Suggest an idea from the perspective of a user. If this doesn't look right,
+  choose a different type.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**As a** *(User Type/Persona)* **I want** *(Feature/enhancement)* **So That** *(Value, why is this wanted, what is the user trying to accomplish)*
+
+**Additional Context**
+- enter text here
+- enter text here
+
+**Acceptance Criteria**
+- [ ] Given (Context), When (action carried out), Then (expected outcome)
+- [ ] Given (Context), When (action carried out), Then (expected outcome)
+
+**Definition of Done**
+- [ ] Ready to Demo in Sprint Review
+- [ ] Does what I have made have appropriate test coverage?
+- [ ] Documentation and/or scientific documentation exists and can be found
+- [ ] Peer Reviewed by 2 people on the team
+- [ ] Manual testing of all PRs in Dev and Prod
+- [ ] Merged

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,22 @@
+---
+name: Question
+about: Ask us a question! If this doesn't look right, choose a different type.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the task**
+basic description of the task, is it focuse on research with users or the business area? is it design focused on either co-design or wireframing? is it User Testing or compiling results?
+
+**Acceptance Criteria**
+- [ ] what is required for this task to be complete?
+- what is the finishing point or end state of this task?
+- [ ] what is the output of this task?
+
+**SME/User Contact**
+(may want to use a persona to fill this in)
+
+**Additional context**
+- any additional details that could not be captured above

.github/ISSUE_TEMPLATE/spike.md

@@ -0,0 +1,27 @@
+---
+name: Spike
+about: Research options prior to development work. If this doesn't look right, choose
+  a different type.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Problem Description** 
+**In order to** (achieve some goal), (a system or persona) **needs to** (some action).
+
+**Solution Needs**
+- Enter the non-negotiables of the solution (what are the needs vs. what are the wants)
+
+**Timebox**
+- How much effort are we committing to this research?
+
+**Outcome**
+Details describing the outcome of the research 
+- Was it successful? What direction should the work go? 
+- Was it unsuccessful? Discuss next steps with team
+
+**Additional Context**
+- enter text here
+- enter text here

.github/ISSUE_TEMPLATE/task.md

@@ -0,0 +1,23 @@
+---
+name: Task
+about: Any work that does not directly impact the user.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the task**
+A clear and concise description of what the task is.
+
+**Purpose**
+The reason why this task is needed and/or what value it adds.
+
+**Acceptance Criteria**
+- [ ] first
+- [ ] second
+- [ ] third
+
+**Additional context**
+- Add any other context about the task here.
+- Or here

.github/ISSUE_TEMPLATE/user-story.md

@@ -0,0 +1,18 @@
+---
+name: User Story
+about: This template is to be used when describing a feature from the user's perspective.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**As a** *(User Type/Persona)* **I want** *(Feature/enhancement)* **So That** *(Value, why is this wanted, what is the user trying to accomplish)*
+
+**Additional Context**
+- enter text here
+- enter text here
+
+**Acceptance Criteria**
+- [ ] Given (Context), When (action carried out), Then (expected outcome)
+- [ ] Given (Context), When (action carried out), Then (expected outcome)

.github/ISSUE_TEMPLATE/ux-task.md

@@ -0,0 +1,22 @@
+---
+name: UX Task
+about: This is a Task for UX Research, Design or Testing.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the task**
+basic description of the task, is it focuse on research with users or the business area? is it design focused on either co-design or wireframing? is it User Testing or compiling results?
+
+**Acceptance Criteria**
+- [ ] what is required for this task to be complete?
+- what is the finishing point or end state of this task?
+- [ ] what is the output of this task?
+
+**SME/User Contact**
+(may want to use a persona to fill this in)
+
+**Additional context**
+- any additional details that could not be captured above

bcmi/src/app/app.component.spec.ts

@@ -7,14 +7,18 @@ import { ConfigService } from '@services/config.service';
 import { HttpClientModule } from '@angular/common/http';
 import { AppComponent } from './app.component';
 import { SafeHtmlPipe } from '@pipes/safe-html.pipe';
+import { Apollo } from 'apollo-angular';
+import { ContentService } from './services/content-service';
 
 describe('AppComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       providers: [
         CookieService,
         Api,
-        ConfigService
+        ConfigService,
+        Apollo,
+        ContentService
       ],
       declarations: [
         AppComponent,

bcmi/src/app/enforcement-actions/enforcement-actions-list/enforcement-actions-list.component.spec.ts

@@ -5,14 +5,16 @@ import { HttpClientModule } from '@angular/common/http';
 
 import { EnforcementActionsListComponent } from './enforcement-actions-list.component';
 import { ConfigService } from '@services/config.service';
+import { ContentService } from '@app/services/content-service';
+import { Apollo } from 'apollo-angular';
 
 describe('EnforcementActionsListComponent', () => {
   let component: EnforcementActionsListComponent;
   let fixture: ComponentFixture<EnforcementActionsListComponent>;
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      providers: [ConfigService],
+      providers: [ConfigService,ContentService, Apollo],
       declarations: [EnforcementActionsListComponent],
       imports: [HttpClientModule, RouterTestingModule]
     }).compileComponents();

bcmi/src/app/home/home.component.spec.ts

@@ -6,6 +6,8 @@ import { Api } from '@services/api';
 import { HttpClientModule } from '@angular/common/http';
 import { HomeComponent } from '../home/home.component';
 import { Project } from '@models/project';
+import { ContentService } from '@app/services/content-service';
+import { Apollo } from 'apollo-angular';
 
 window.scrollTo = jest.fn();
 
@@ -24,7 +26,7 @@ describe('HomeComponent', () => {
     };
     TestBed.configureTestingModule({
       declarations: [HomeComponent],
-      providers: [{ provide: ProjectService, useValue: ProjectServiceStub }, Api, ConfigService],
+      providers: [{ provide: ProjectService, useValue: ProjectServiceStub }, Api, ConfigService, ContentService, Apollo],
       imports: [RouterTestingModule, HttpClientModule]
     }).compileComponents();
   }));

bcmi/src/app/map/main-map/main-map.component.spec.ts

@@ -15,6 +15,8 @@ import { TestConstants } from '@shared/test-constants';
 import { GeocoderService } from '@services/geocoder.service';
 import { Api } from '@services/api';
 import { ConfigService } from '@services/config.service';
+import { ContentService } from '@app/services/content-service';
+import { Apollo } from 'apollo-angular';
 
 @Component({
   selector: 'app-leaflet-map',
@@ -62,7 +64,9 @@ describe('MainMapComponent', () => {
         { provide: ProjectService, useValue: ProjectServiceStub },
         GeocoderService,
         Api,
-        ConfigService
+        ConfigService,
+        ContentService,
+        Apollo
       ],
       declarations: [
         MainMapComponent,

bcmi/src/app/map/search/search.component.spec.ts

@@ -10,6 +10,7 @@ import { GeocoderService } from '@services/geocoder.service';
 import { Api } from '@services/api';
 import { ConfigService } from '@services/config.service';
 import { HttpClient, HttpHandler } from '@angular/common/http';
+import { ContentService } from '@app/services/content-service';
 
 
 
@@ -34,6 +35,7 @@ describe('SearchComponent', () => {
         {provide: GeocoderService, useValue: GeocoderServiceStub },
         Api,
         ConfigService,
+        ContentService,
         HttpClient,
         HttpHandler
       ],

bcmi/src/app/models/content/page.ts

@@ -1,15 +1,11 @@
 export class Page {
-    Title: String
-    Description: String
-    Content: String
-    Ongoing_card: String
-    External_card: String
-    Related_card: String
-    route: String
-    tooltip: String
-
-    constructor() {
-
-    }
+    Title: string
+    Description: string
+    Content: string
+    Ongoing_card: string
+    External_card: string
+    Related_card: string
+    route: string
+    tooltip: string
   }
 

bcmi/src/app/projects/project-detail-resolver.service.spec.ts

@@ -6,6 +6,8 @@ import { ProjectService } from '@services/project.service';
 import { Api } from '@services/api';
 import { ConfigService } from '@services/config.service';
 import { HttpClientModule } from '@angular/common/http';
+import { ContentService } from '@app/services/content-service';
+import { Apollo } from 'apollo-angular';
 
 describe('ProjectDetailResolverService', () => {
   beforeEach(() => {
@@ -14,7 +16,9 @@ describe('ProjectDetailResolverService', () => {
         ProjectService,
         ProjectDetailResolver,
         Api,
-        ConfigService
+        ConfigService,
+        ContentService,
+        Apollo
       ],
       declarations: [],
       imports: [