From abc6e4e8af709288e0ed1dc5431a4c830ff09003 Mon Sep 17 00:00:00 2001
From: Jason Wall <jason@walljm.com>
Date: Sat, 8 Aug 2020 15:37:25 -0400
Subject: [PATCH] fix bugs and render xrefs

---
 app/db/README.md                                         | 1 +
 .../note/edit-modal/note-edit-modal.component.ts         | 3 ++-
 .../app/search/components/note/note-card.component.html  | 7 ++++++-
 .../app/search/components/note/note-card.component.ts    | 9 +++++++++
 .../app/search/components/strongs/strongs.component.ts   | 2 +-
 app/db/src/app/services/app.service.ts                   | 2 +-
 app/db/src/app/services/storage.service.ts               | 4 +++-
 7 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/db/README.md b/app/db/README.md
index 29f17f9b..4ae29a83 100644
--- a/app/db/README.md
+++ b/app/db/README.md
@@ -52,6 +52,7 @@ To get more help on the Angular CLI use `ng help` or go check out the [Angular C
 - Test note persistence
 - Test note search
 - remove old ionic project
+- setup CI/CD
 
 ## Optionally for Future
 
diff --git a/app/db/src/app/search/components/note/edit-modal/note-edit-modal.component.ts b/app/db/src/app/search/components/note/edit-modal/note-edit-modal.component.ts
index 2f84e216..d087f7c5 100644
--- a/app/db/src/app/search/components/note/edit-modal/note-edit-modal.component.ts
+++ b/app/db/src/app/search/components/note/edit-modal/note-edit-modal.component.ts
@@ -1,7 +1,8 @@
 import { Component, Inject } from '@angular/core';
 import { FormGroup, FormBuilder } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { CardItem, NoteItem } from '../../../../models/app-state';
+import { CardItem } from '../../../../models/app-state';
+import { NoteItem } from '../../../../models/note-state';
 import { AppService } from '../../../../services/app.service';
 import { UUID } from 'angular2-uuid';
 
diff --git a/app/db/src/app/search/components/note/note-card.component.html b/app/db/src/app/search/components/note/note-card.component.html
index 171c3e29..8e31c915 100644
--- a/app/db/src/app/search/components/note/note-card.component.html
+++ b/app/db/src/app/search/components/note/note-card.component.html
@@ -22,7 +22,12 @@
         Cross References
       </mat-panel-title>
     </mat-expansion-panel-header>
-    {{ cardItem.data.xref }}
+    <ng-container *ngIf="prepXref(cardItem.data.xref) as refs">
+      <span *ngFor="let ref of refs">
+        <a (click)="openPassage(ref)">{{ ref.toString() }}</a
+        >,
+      </span>
+    </ng-container>
   </mat-expansion-panel>
 </div>
 <div class="card-actions">
diff --git a/app/db/src/app/search/components/note/note-card.component.ts b/app/db/src/app/search/components/note/note-card.component.ts
index 10d8e194..959298a8 100644
--- a/app/db/src/app/search/components/note/note-card.component.ts
+++ b/app/db/src/app/search/components/note/note-card.component.ts
@@ -4,6 +4,7 @@ import { NoteEditModalComponent } from './edit-modal/note-edit-modal.component';
 import { CardComponent } from '../../../common/components/card.component';
 import { AppService } from '../../../services/app.service';
 import { NoteItem } from '../../../models/note-state';
+import { BibleReference } from 'src/app/common/bible-reference';
 
 @Component({
   selector: 'app-note-card',
@@ -25,6 +26,14 @@ export class NoteCardComponent extends CardComponent {
     this.copyToClip(text, html);
   }
 
+  prepXref(xref: string) {
+    return xref.split(';').map((o) => new BibleReference(o));
+  }
+
+  openPassage(ref: BibleReference) {
+    this.appService.getPassage(ref);
+  }
+
   edit() {
     this.dialog.open(NoteEditModalComponent, {
       data: this.cardItem,
diff --git a/app/db/src/app/search/components/strongs/strongs.component.ts b/app/db/src/app/search/components/strongs/strongs.component.ts
index f2d14bd8..6fe6b3da 100644
--- a/app/db/src/app/search/components/strongs/strongs.component.ts
+++ b/app/db/src/app/search/components/strongs/strongs.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
-import { StrongsResult } from 'src/app/models/app-state';
+import { StrongsResult } from '../../../models/strongs-state';
 import { BibleReference } from 'src/app/common/bible-reference';
 
 @Component({
diff --git a/app/db/src/app/services/app.service.ts b/app/db/src/app/services/app.service.ts
index f492c965..4584331d 100644
--- a/app/db/src/app/services/app.service.ts
+++ b/app/db/src/app/services/app.service.ts
@@ -30,7 +30,7 @@ const initialState: AppState = {
       type: 'Note',
       data: {
         id: UUID.UUID(),
-        xref: '',
+        xref: '1 pe 2:16; jn 3:16',
         title: 'Title Here',
         content: '# Content Here\nIn Markdown format.',
       },
diff --git a/app/db/src/app/services/storage.service.ts b/app/db/src/app/services/storage.service.ts
index a04064d9..075f12a7 100644
--- a/app/db/src/app/services/storage.service.ts
+++ b/app/db/src/app/services/storage.service.ts
@@ -3,8 +3,10 @@ import { StorageMap } from '@ngx-pwa/local-storage';
 import { AngularFireDatabase, AngularFireObject } from '@angular/fire/database';
 import { IStorable } from '../models/storable';
 import { AppService } from './app.service';
-import { DisplaySettings, SavedPage, User, NoteItem } from '../models/app-state';
+import { DisplaySettings, SavedPage, User } from '../models/app-state';
+
 import { SubscriberComponent } from '../common/components/subscriber.component';
+import { NoteItem } from '../models/note-state';
 
 @Injectable({
   providedIn: 'root',