diff --git a/.hgignore b/.hgignore
index b4e2de0b..a1e7ab24 100644
--- a/.hgignore
+++ b/.hgignore
@@ -38,3 +38,5 @@ DynamicBibleIonic/platforms/android/AndroidManifest.xml
DynamicBibleIonic/platforms/android/.gitignore
DynamicBibleIonic/.idea
DynamicBibleIonic/nbproject
+DynamicBibleIonic/obj
+DynamicBibleIonic/bin
diff --git a/DynamicBibleIonic/.vscode/settings.json b/DynamicBibleIonic/.vscode/settings.json
deleted file mode 100644
index b44c2020..00000000
--- a/DynamicBibleIonic/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "typescript.tsdk": "./node_modules/typescript/lib"
-}
\ No newline at end of file
diff --git a/DynamicBibleIonic/DynamicBibleIonic.njsproj b/DynamicBibleIonic/DynamicBibleIonic.njsproj
new file mode 100644
index 00000000..a311e38e
--- /dev/null
+++ b/DynamicBibleIonic/DynamicBibleIonic.njsproj
@@ -0,0 +1,3115 @@
+
+
+
+ Debug
+ 2.0
+ {78f6c2b6-208e-4a76-a214-921afa081284}
+
+ ProjectFiles
+
+
+ .
+ .
+ {3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}
+ true
+ CommonJS
+ true
+ 11.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ False
+
+
+
+ ES5
+ None
+ False
+ False
+
+ False
+ walljm.js
+ C:\Projects\dynamicbible\DynamicBibleIonic\bin
+ False
+ True
+ False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+ True
+ 0
+ /
+ http://localhost:48022/
+ False
+ True
+ http://localhost:1337
+ False
+
+
+
+
+
+
+ CurrentPage
+ True
+ False
+ False
+ False
+
+
+
+
+
+
+
+
+ False
+ False
+
+
+
+
+
\ No newline at end of file
diff --git a/DynamicBibleIonic/DynamicBibleIonic.sln b/DynamicBibleIonic/DynamicBibleIonic.sln
new file mode 100644
index 00000000..d6874123
--- /dev/null
+++ b/DynamicBibleIonic/DynamicBibleIonic.sln
@@ -0,0 +1,19 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "DynamicBibleIonic", "DynamicBibleIonic.njsproj", "{78F6C2B6-208E-4A76-A214-921AFA081284}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {78F6C2B6-208E-4A76-A214-921AFA081284}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {78F6C2B6-208E-4A76-A214-921AFA081284}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/DynamicBibleIonic/config.xml b/DynamicBibleIonic/config.xml
index f5d0e358..18abd71f 100644
--- a/DynamicBibleIonic/config.xml
+++ b/DynamicBibleIonic/config.xml
@@ -46,7 +46,7 @@
-
+
diff --git a/DynamicBibleIonic/platforms/android/walljm.keystore b/DynamicBibleIonic/platforms/android/walljm.keystore
new file mode 100644
index 00000000..152ddd26
Binary files /dev/null and b/DynamicBibleIonic/platforms/android/walljm.keystore differ
diff --git a/DynamicBibleIonic/src/app/app.component.ts b/DynamicBibleIonic/src/app/app.component.ts
index 16c8cb9f..b523c657 100644
--- a/DynamicBibleIonic/src/app/app.component.ts
+++ b/DynamicBibleIonic/src/app/app.component.ts
@@ -1,31 +1,27 @@
import { Component, ViewChild } from '@angular/core';
import { Platform, MenuController, Nav } from 'ionic-angular';
import { StatusBar, Splashscreen } from 'ionic-native';
-import {SearchPage} from "../pages/search/search";
-import {SettingsPage} from "../pages/settings/settings";
+import { SearchPage } from "../pages/search/search";
+import { SettingsPage } from "../pages/settings/settings";
+import { PagesService } from "../services/pages-service";
@Component({
- templateUrl: 'app.html'
+ templateUrl: 'app.html',
+ providers: [PagesService]
})
export class MyApp
{
@ViewChild(Nav) nav: Nav;
rootPage: any = SearchPage;
- pages: Array<{ title: string, component: any }>;
constructor(
public platform: Platform,
- public menu: MenuController
+ public menu: MenuController,
+ private pagesSvc: PagesService
)
{
this.initializeApp();
-
- // set our app's pages
- this.pages = [
- { title: 'Search', component: SearchPage },
- { title: 'Settings', component: SettingsPage }
- ];
}
initializeApp()
@@ -42,8 +38,8 @@ export class MyApp
openPage(page)
{
// close the menu when clicking a link from the menu
- this.menu.close();
+ this.menu.close();
// navigate to the new page if it is not the current page
- this.nav.setRoot(page.component);
+ this.nav.setRoot(page.component, page.params);
}
-}
+}
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/app/app.html b/DynamicBibleIonic/src/app/app.html
index 5c201281..17d91695 100644
--- a/DynamicBibleIonic/src/app/app.html
+++ b/DynamicBibleIonic/src/app/app.html
@@ -8,7 +8,7 @@
-
diff --git a/DynamicBibleIonic/src/app/app.module.ts b/DynamicBibleIonic/src/app/app.module.ts
index ee637391..234d586a 100644
--- a/DynamicBibleIonic/src/app/app.module.ts
+++ b/DynamicBibleIonic/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import { NgModule, ErrorHandler } from '@angular/core';
+import { NgModule, ErrorHandler } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
@@ -6,15 +6,15 @@ import { Storage } from '@ionic/storage';
import { MyApp } from './app.component';
-import {SearchPage} from "../pages/search/search";
-import {SettingsPage} from "../pages/settings/settings";
+import { SearchPage } from "../pages/search/search";
+import { SettingsPage } from "../pages/settings/settings";
-import {ComponentLoader} from "../components/component-loader/component-loader";
-import {Passage} from "../components/passage/passage";
-import {Strongs} from "../components/strongs/strongs";
-import {Words} from "../components/words/words";
-import {Error} from "../components/error/error";
-import {StrongsModal} from "../components/strongs-modal/strongs-modal";
+import { ComponentLoader } from "../components/component-loader/component-loader";
+import { Passage } from "../components/passage/passage";
+import { Strongs } from "../components/strongs/strongs";
+import { Words } from "../components/words/words";
+import { Error } from "../components/error/error";
+import { StrongsModal } from "../components/strongs-modal/strongs-modal";
@NgModule({
declarations: [
@@ -45,4 +45,4 @@ import {StrongsModal} from "../components/strongs-modal/strongs-modal";
],
providers: [{ provide: ErrorHandler, useClass: IonicErrorHandler }, Storage]
})
-export class AppModule { }
+export class AppModule { }
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/components/component-loader/component-loader.ts b/DynamicBibleIonic/src/components/component-loader/component-loader.ts
index 119416c0..801e55b9 100644
--- a/DynamicBibleIonic/src/components/component-loader/component-loader.ts
+++ b/DynamicBibleIonic/src/components/component-loader/component-loader.ts
@@ -25,7 +25,7 @@ export class ComponentLoader {
}
let factory = this.componentFactoryResolver.resolveComponentFactory(this.type);
- this.cmpRef = this.target.createComponent(factory)
+ this.cmpRef = this.target.createComponent(factory);
// to access the created instance use
// this.compRef.instance.someProperty = 'someValue';
// this.compRef.instance.someOutput.subscribe(val => doSomething());
diff --git a/DynamicBibleIonic/src/components/error/error.html b/DynamicBibleIonic/src/components/error/error.html
index 22d0c783..71f254f4 100644
--- a/DynamicBibleIonic/src/components/error/error.html
+++ b/DynamicBibleIonic/src/components/error/error.html
@@ -7,4 +7,8 @@
{{item}}
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/components/error/error.ts b/DynamicBibleIonic/src/components/error/error.ts
index f62369cd..423e814a 100644
--- a/DynamicBibleIonic/src/components/error/error.ts
+++ b/DynamicBibleIonic/src/components/error/error.ts
@@ -1,4 +1,5 @@
import { EventEmitter, Component, Input, Output } from "@angular/core";
+import { CardItem } from "../../pages/search/search";
@Component({
selector: "error",
diff --git a/DynamicBibleIonic/src/components/passage/passage.html b/DynamicBibleIonic/src/components/passage/passage.html
index f447208d..87fe134a 100644
--- a/DynamicBibleIonic/src/components/passage/passage.html
+++ b/DynamicBibleIonic/src/components/passage/passage.html
@@ -1,4 +1,4 @@
-
+
{{item.ref}}
-
+
-
Chapter {{ch.ch}}
+
+ Chapter {{ch.ch}}
- {{vs.v}}.
-{{w.t}}{{w.t}}
+
+ {{vs.v}}.
+
+ {{w.t}}
+
+ {{w.t}}
+
+
+
+
+ {{p.title}}
+
+
+
+
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/pages/settings/settings.ts b/DynamicBibleIonic/src/pages/settings/settings.ts
index e420d219..7272e205 100644
--- a/DynamicBibleIonic/src/pages/settings/settings.ts
+++ b/DynamicBibleIonic/src/pages/settings/settings.ts
@@ -1,9 +1,8 @@
-///
///
import { Component } from '@angular/core';
import { NavController } from 'ionic-angular';
import { Storage } from '@ionic/storage';
-import { UserProfile } from '../../UserProfile';
+import { SavedPage, UserProfile } from '../../libs/UserProfile';
@Component({
selector: 'settings',
@@ -48,4 +47,13 @@ export class SettingsPage
{
this.userProfile.reset(this.local);
}
+
+ removePage(page: SavedPage)
+ {
+ let idx = this.userProfile.user.saved_pages.indexOf(page);
+ this.userProfile.user.saved_pages.splice(idx, 1);
+
+ // save the users settings.
+ this.userProfile.save(this.local);
+ }
}
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/bible-service.spec.ts b/DynamicBibleIonic/src/services/bible-service.spec.ts
similarity index 94%
rename from DynamicBibleIonic/src/bible-service.spec.ts
rename to DynamicBibleIonic/src/services/bible-service.spec.ts
index cec6c977..272f00b5 100644
--- a/DynamicBibleIonic/src/bible-service.spec.ts
+++ b/DynamicBibleIonic/src/services/bible-service.spec.ts
@@ -1,5 +1,5 @@
-import {getTestBed, TestBed, inject} from '@angular/core/testing';
-import {XHRBackend, BaseRequestOptions, HttpModule, Http,} from '@angular/http';
+import {getTestBed, TestBed} from '@angular/core/testing';
+import {BaseRequestOptions, HttpModule, Http,} from '@angular/http';
import {MockBackend} from '@angular/http/testing';
import {BibleService} from './bible-service';
import {Reference} from './Reference';
diff --git a/DynamicBibleIonic/src/bible-service.ts b/DynamicBibleIonic/src/services/bible-service.ts
similarity index 84%
rename from DynamicBibleIonic/src/bible-service.ts
rename to DynamicBibleIonic/src/services/bible-service.ts
index 64647b30..0cb15b49 100644
--- a/DynamicBibleIonic/src/bible-service.ts
+++ b/DynamicBibleIonic/src/services/bible-service.ts
@@ -1,8 +1,7 @@
-///
-///
+///
import { Injectable } from "@angular/core";
import { Http } from "@angular/http";
-import { Reference } from "./Reference";
+import { Section, Reference } from "../libs/Reference";
@Injectable()
export class BibleService
@@ -15,7 +14,7 @@ export class BibleService
constructor(private http: Http)
{
}
-
+
getResult(section: Section): BiblePassageResult
{
try
@@ -34,7 +33,7 @@ export class BibleService
for (let i = Number(section.start.chapter); i <= Number(section.end.chapter); i++)
{
const url = "data/bibles/kjv_strongs/" + section.start.book + "-" + i + ".json";
-
+
$.ajax({
async: false,
type: "GET",
@@ -92,13 +91,35 @@ export class BibleService
this.result.testament = "new";
else
this.result.testament = "old";
-
+
return this.result;
- }
+ }
catch (error)
{
console.log(error);
}
return null;
}
+}
+
+export type BiblePassageResult = {
+ cs: BiblePassage[],
+ testament: string,
+ ref: string,
+ status: number,
+ msg: string
+}
+
+type BiblePassage = {
+ ch: number,
+ vss: BibleVerse[]
+}
+
+type BibleVerse = {
+ v: number,
+ w: [
+ {
+ t: string, s: string
+ }
+ ]
}
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/services/pages-service.ts b/DynamicBibleIonic/src/services/pages-service.ts
new file mode 100644
index 00000000..e71df034
--- /dev/null
+++ b/DynamicBibleIonic/src/services/pages-service.ts
@@ -0,0 +1,42 @@
+import { Injectable } from "@angular/core";
+import { Storage } from '@ionic/storage';
+import { SearchPage } from "../pages/search/search";
+import { SettingsPage } from "../pages/settings/settings";
+import { SavedPage } from "../libs/UserProfile";
+
+@Injectable()
+export class PagesService
+{
+ pages: Array<{ title: string, component: any, params: any }>;
+
+ constructor(public local: Storage)
+ {
+ this.pages = [
+ { title: 'Search', component: SearchPage, params: { queries: []} },
+ { title: 'Settings', component: SettingsPage, params: {} }
+ ];
+ }
+
+ getResult(): Array<{ title: string, component: any }>
+ {
+ return this.pages;
+ }
+
+ addPage(page: SavedPage)
+ {
+ this.pages.push({ title: page.title, component: SearchPage, params: { queries: page.queries } });
+ }
+
+ initializePages(page_array: SavedPage[])
+ {
+ this.pages = [
+ { title: 'Search', component: SearchPage, params: { queries: [] } },
+ { title: 'Settings', component: SettingsPage, params: {} }
+ ];
+
+ for (let p of page_array)
+ {
+ this.pages.push({ title: p.title, component: SearchPage, params: { queries: p.queries } });
+ }
+ }
+}
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/strongs-service.spec.ts b/DynamicBibleIonic/src/services/strongs-service.spec.ts
similarity index 100%
rename from DynamicBibleIonic/src/strongs-service.spec.ts
rename to DynamicBibleIonic/src/services/strongs-service.spec.ts
diff --git a/DynamicBibleIonic/src/strongs-service.ts b/DynamicBibleIonic/src/services/strongs-service.ts
similarity index 62%
rename from DynamicBibleIonic/src/strongs-service.ts
rename to DynamicBibleIonic/src/services/strongs-service.ts
index e92b4a4a..cd6f92b8 100644
--- a/DynamicBibleIonic/src/strongs-service.ts
+++ b/DynamicBibleIonic/src/services/strongs-service.ts
@@ -1,17 +1,19 @@
-///
-///
+///
import { Injectable } from "@angular/core";
import { Http } from "@angular/http";
@Injectable()
-export class StrongsService {
+export class StrongsService
+{
result: StrongsResult;
count = 0;
- constructor(private http: Http) {
+ constructor(private http: Http)
+ {
}
- getResult(sn: number, dict: string): StrongsResult {
+ getResult(sn: number, dict: string): StrongsResult
+ {
const self = this;
this.result = {
prefix: "",
@@ -25,15 +27,20 @@ export class StrongsService {
msg: ":)"
};
let url = dict + Math.ceil(sn / 100) + ".json";
- if (dict === "grk") {
+ if (dict === "grk")
+ {
self.result.prefix = "G";
- if (sn > 5624 || sn < 1) {
+ if (sn > 5624 || sn < 1)
+ {
self.result.status = -1;
self.result.msg = "Strongs Number G" + sn + " is out of range.";
}
- } else {
+ }
+ else
+ {
self.result.prefix = "H";
- if (sn > 8674 || sn < 1) {
+ if (sn > 8674 || sn < 1)
+ {
self.result.status = -1;
self.result.msg = "Strongs Number H" + sn + " is out of range.";
}
@@ -48,10 +55,12 @@ export class StrongsService {
type: "GET",
url: "data/strongs/" + url,
dataType: "json",
- success: function (d: StrongsDefinition[], t, x) {
+ success: function (d: StrongsDefinition[], t, x)
+ {
self.result.strongs = d;
},
- error: function (request, status, error) {
+ error: function (request, status, error)
+ {
console.log(error);
self.result.status = -1;
self.result.msg = "Unable to retrieve Strongs Data for " + self.result.prefix + self.result.sn;
@@ -69,15 +78,19 @@ export class StrongsService {
type: "GET",
url: "data/strongscr/cr" + url,
dataType: "json",
- success: function (d: StrongsCrossReference[], t, x) {
- for (let cr of d) {
- if (cr.id.toUpperCase() == self.result.prefix + self.result.sn) {
+ success: function (d: StrongsCrossReference[], t, x)
+ {
+ for (let cr of d)
+ {
+ if (cr.id.toUpperCase() == self.result.prefix + self.result.sn)
+ {
self.result.crossrefs = cr;
break;
}
}
},
- error: function (request, status, error) {
+ error: function (request, status, error)
+ {
console.log(error);
self.result.status = -1;
self.result.msg = "Unable to retrieve Strongs Cross References for " + self.result.prefix + self.result.sn;
@@ -87,7 +100,8 @@ export class StrongsService {
if (self.result.status === -1)
return self.result;
- if (dict === "grk") {
+ if (dict === "grk")
+ {
url = "data/rmac/rs" + (Math.ceil(sn / 1000)) + ".json";
let rmac_cross_references: RMACCrossReference[];
@@ -97,36 +111,43 @@ export class StrongsService {
type: "GET",
url: url,
dataType: "json",
- success: function (d: RMACCrossReference[], t, x) {
+ success: function (d: RMACCrossReference[], t, x)
+ {
rmac_cross_references = d;
},
- error: function (request, status, error) {
+ error: function (request, status, error)
+ {
console.log(error);
}
});
// deal with RMAC
- let tmp = $.grep(rmac_cross_references, (el, i) => { if (el.i == sn + "") { return true; } else { return false; } });
+ let tmp = $.grep(rmac_cross_references, (el, i) => { return el.i == sn + "" ? true : false; });
if (tmp.length == 0)
return this.result;
-
+
this.result.rmaccode = tmp[0].r;
- if (this.result.rmaccode != undefined) {
+ if (this.result.rmaccode != undefined)
+ {
url = `data/rmac/r-${this.result.rmaccode.substring(0, 1)}.json`;
$.ajax({
async: false,
type: "GET",
url: url,
dataType: "json",
- success: function (d: RMACDefinition[], t, x) {
- for (let rmac of d) {
- if (rmac.id.toLowerCase() == self.result.rmaccode) {
+ success: function (d: RMACDefinition[], t, x)
+ {
+ for (let rmac of d)
+ {
+ if (rmac.id.toLowerCase() == self.result.rmaccode)
+ {
self.result.rmac = rmac;
break;
}
}
},
- error: function (request, status, error) {
+ error: function (request, status, error)
+ {
console.log(error);
}
});
@@ -134,4 +155,37 @@ export class StrongsService {
}
return this.result;
}
-}
\ No newline at end of file
+}
+export type StrongsResult =
+ {
+ prefix: string,
+ sn: number,
+ strongs: StrongsDefinition[],
+ def: StrongsDefinition,
+ rmac: RMACDefinition,
+ crossrefs: StrongsCrossReference,
+ rmaccode: string,
+ status: number,
+ msg: string
+ };
+
+type StrongsDefinition = { n: number, i: string, tr: string, de: string, lemma: string, p: string }
+
+type StrongsCrossReference =
+ {
+ id: string, // strongs id H1|G1
+ t: string, // strongs testament grk|heb
+ d: string, // strongs word/data Aaron {ah-ar-ohn'}
+ ss: [
+ {
+ w: string,
+ rs: [
+ { r: string }
+ ]
+ }
+ ]
+ }
+
+type RMACDefinition = { id: string, d: string[] }
+
+type RMACCrossReference = { i: string, r: string }
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/word-service.ts b/DynamicBibleIonic/src/services/word-service.ts
similarity index 95%
rename from DynamicBibleIonic/src/word-service.ts
rename to DynamicBibleIonic/src/services/word-service.ts
index 35d6bf99..ad7ba58b 100644
--- a/DynamicBibleIonic/src/word-service.ts
+++ b/DynamicBibleIonic/src/services/word-service.ts
@@ -1,5 +1,4 @@
-///
-///
+///
import { Injectable } from "@angular/core";
import { Http } from "@angular/http";
@@ -34,7 +33,7 @@ export class WordService
results.unshift(this.getSearchReferences("data/index/" + words[w] + "idx.json", q));
break;
}
- }
+ }
else
{
if (q <= words[w] && q > words[w - 1])
@@ -444,4 +443,16 @@ export class WordService
// are identical.
return x;
}
+}
+
+export type WordLookupResult = {
+ refs: string[],
+ word: string,
+ status: number,
+ msg: string
+}
+
+type IndexResult = {
+ refs: string[];
+ word: string;
}
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/types.ts b/DynamicBibleIonic/src/types.ts
deleted file mode 100644
index 763a48c2..00000000
--- a/DynamicBibleIonic/src/types.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-type OpenData = {
- card: CardItem,
- qry: string
-}
-
-type WordLookupResult = {
- refs: string[],
- word: string,
- status: number,
- msg: string
-}
-
-type IndexResult = {
- refs: string[];
- word: string;
-}
-type CardItem = { data: any, type: string, dict: string }
-
-type User = {
- strongs_modal: boolean,
- clear_search_after_query: boolean,
- items: CardItem[],
- append_to_bottom: boolean,
- insert_next_to_item: boolean,
- font_size: number
-}
-
-type BiblePassage = {
- ch: number,
- vss: BibleVerse[]
-}
-
-type BibleVerse = {
- v: number,
- w: [
- {
- t: string, s: string
- }
- ]
-}
-
-type BiblePassageResult = {
- cs: BiblePassage[],
- testament: string,
- ref: string,
- status: number,
- msg: string
-}
-
-type StrongsDefinition = { n: number, i: string, tr: string, de: string, lemma: string, p: string }
-type StrongsCrossReference =
- {
- id: string, // strongs id H1|G1
- t: string, // strongs testament grk|heb
- d: string, // strongs word/data Aaron {ah-ar-ohn'}
- ss: [
- {
- w: string,
- rs: [
- { r: string }
- ]
- }
- ]
- }
-type RMACDefinition = { id: string, d: string[] }
-type RMACCrossReference = { i: string, r: string }
-type StrongsResult =
- {
- prefix: string,
- sn: number,
- strongs: StrongsDefinition[],
- def: StrongsDefinition,
- rmac: RMACDefinition,
- crossrefs: StrongsCrossReference,
- rmaccode: string,
- status: number,
- msg: string
- };
-
-type Section = {
- start: {
- book: number,
- bookname: string,
- longbookname: string,
- lastchapter: number,
- chapter: string,
- verse: string
- },
- end: {
- book: number,
- bookname: string,
- longbookname: string,
- lastchapter: number,
- chapter: string,
- verse: string
- }
-};
\ No newline at end of file