From c12e803cfd067a058f7403bc153e1327f6f2a80d Mon Sep 17 00:00:00 2001
From: Jason Wall <jason@walljm.com>
Date: Sun, 9 Aug 2020 16:00:11 -0400
Subject: [PATCH] don't mind me...

---
 app/db/src/app/common/components/settings/settings.component.ts | 2 +-
 app/db/src/app/{models => common}/storable.ts                   | 0
 app/db/src/app/models/app-state.ts                              | 2 +-
 app/db/src/app/services/app-state-actions.ts                    | 2 +-
 app/db/src/app/services/app-state-reducer.spec.ts               | 2 +-
 app/db/src/app/services/app-state-reducer.ts                    | 2 +-
 app/db/src/app/services/app.service.ts                          | 2 +-
 app/db/src/app/services/storage.service.ts                      | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename app/db/src/app/{models => common}/storable.ts (100%)

diff --git a/app/db/src/app/common/components/settings/settings.component.ts b/app/db/src/app/common/components/settings/settings.component.ts
index 9ca4a4a9..6bb96585 100644
--- a/app/db/src/app/common/components/settings/settings.component.ts
+++ b/app/db/src/app/common/components/settings/settings.component.ts
@@ -8,7 +8,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { AngularFireAuth } from '@angular/fire/auth';
 import { auth } from 'firebase/app';
 
-import { Storable } from 'src/app/models/storable';
+import { Storable } from 'src/app/common/storable';
 import { SubscriberComponent } from '../subscriber.component';
 import { DisplaySettings, SavedPage } from 'src/app/models/app-state';
 import { CardFonts } from 'src/app/constants';
diff --git a/app/db/src/app/models/storable.ts b/app/db/src/app/common/storable.ts
similarity index 100%
rename from app/db/src/app/models/storable.ts
rename to app/db/src/app/common/storable.ts
diff --git a/app/db/src/app/models/app-state.ts b/app/db/src/app/models/app-state.ts
index f265dd24..e53d3e9e 100644
--- a/app/db/src/app/models/app-state.ts
+++ b/app/db/src/app/models/app-state.ts
@@ -1,4 +1,4 @@
-import { IStorable } from './storable';
+import { IStorable } from '../common/storable';
 import { NoteItem } from './note-state';
 import { BiblePassageResult } from './passage-state';
 import { StrongsResult } from './strongs-state';
diff --git a/app/db/src/app/services/app-state-actions.ts b/app/db/src/app/services/app-state-actions.ts
index 3ccc9abc..38b08579 100644
--- a/app/db/src/app/services/app-state-actions.ts
+++ b/app/db/src/app/services/app-state-actions.ts
@@ -1,5 +1,5 @@
 import { SavedPage, Error, CardItem, DisplaySettings, User } from '../models/app-state';
-import { IStorable } from '../models/storable';
+import { IStorable } from '../common/storable';
 import { NoteItem } from '../models/note-state';
 import { ListDirection } from '../common/list-direction';
 
diff --git a/app/db/src/app/services/app-state-reducer.spec.ts b/app/db/src/app/services/app-state-reducer.spec.ts
index 010738bb..9942619f 100644
--- a/app/db/src/app/services/app-state-reducer.spec.ts
+++ b/app/db/src/app/services/app-state-reducer.spec.ts
@@ -3,7 +3,7 @@ import { reducer } from './app-state-reducer';
 import { AppAction, AppActionFactory } from './app-state-actions';
 import { Overlap } from '../common/bible-reference';
 import { CardType, SavedPage } from '../models/app-state';
-import { IStorable, Storable } from '../models/storable';
+import { IStorable, Storable } from '../common/storable';
 
 describe('AppService Reducer', () => {
   const preState = {
diff --git a/app/db/src/app/services/app-state-reducer.ts b/app/db/src/app/services/app-state-reducer.ts
index ba2beb20..cc5dfda2 100644
--- a/app/db/src/app/services/app-state-reducer.ts
+++ b/app/db/src/app/services/app-state-reducer.ts
@@ -1,7 +1,7 @@
 import { UUID } from 'angular2-uuid';
 
 import { AppState, SavedPage, DisplaySettings, CardType, CardItem } from '../models/app-state';
-import { IStorable, Storable } from '../models/storable';
+import { IStorable, Storable } from '../common/storable';
 import { NoteItem } from '../models/note-state';
 
 import { ListDirection } from '../common/list-direction';
diff --git a/app/db/src/app/services/app.service.ts b/app/db/src/app/services/app.service.ts
index afc0c3c6..4cae26ff 100644
--- a/app/db/src/app/services/app.service.ts
+++ b/app/db/src/app/services/app.service.ts
@@ -5,7 +5,7 @@ import { Section, BibleReference, Overlap } from '../common/bible-reference';
 import { createStateService } from '../common/state-service';
 import { StorageMap } from '@ngx-pwa/local-storage';
 import { AngularFireDatabase } from '@angular/fire/database';
-import { IStorable } from '../models/storable';
+import { IStorable } from '../common/storable';
 import { NoteItem } from '../models/note-state';
 import { Paragraph, BiblePassage, BibleVerse, BibleParagraphPassage, BibleParagraph } from '../models/passage-state';
 import {
diff --git a/app/db/src/app/services/storage.service.ts b/app/db/src/app/services/storage.service.ts
index 075f12a7..9063ac80 100644
--- a/app/db/src/app/services/storage.service.ts
+++ b/app/db/src/app/services/storage.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { StorageMap } from '@ngx-pwa/local-storage';
 import { AngularFireDatabase, AngularFireObject } from '@angular/fire/database';
-import { IStorable } from '../models/storable';
+import { IStorable } from '../common/storable';
 import { AppService } from './app.service';
 import { DisplaySettings, SavedPage, User } from '../models/app-state';