mirror of
https://gitlab.com/walljm/dynamicbible.git
synced 2025-07-23 07:19:50 -04:00
add google login with firebase
This commit is contained in:
Jason Wall
parent
49439ed857
commit
aaa7ec151b
11
app/db/.firebaserc
Normal file
11
app/db/.firebaserc
Normal file
@ -0,0 +1,11 @@
|
||||
{
|
||||
"targets": {
|
||||
"dynamicbible-7c6cf": {
|
||||
"hosting": {
|
||||
"db": [
|
||||
"dynamicbible-7c6cf"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -121,8 +121,13 @@
|
||||
"devServerTarget": "db:serve:production"
|
||||
}
|
||||
}
|
||||
},
|
||||
"deploy": {
|
||||
"builder": "@angular/fire:deploy",
|
||||
"options": {}
|
||||
}
|
||||
}
|
||||
}},
|
||||
}
|
||||
},
|
||||
"defaultProject": "db"
|
||||
}
|
||||
}
|
||||
28
app/db/firebase.json
Normal file
28
app/db/firebase.json
Normal file
@ -0,0 +1,28 @@
|
||||
{
|
||||
"hosting": [
|
||||
{
|
||||
"target": "db",
|
||||
"public": "dist/db",
|
||||
"ignore": [
|
||||
"**/.*"
|
||||
],
|
||||
"headers": [
|
||||
{
|
||||
"source": "*.[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].+(css|js)",
|
||||
"headers": [
|
||||
{
|
||||
"key": "Cache-Control",
|
||||
"value": "public,max-age=31536000,immutable"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"rewrites": [
|
||||
{
|
||||
"source": "**",
|
||||
"destination": "/index.html"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
4127
app/db/package-lock.json
generated
4127
app/db/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -16,6 +16,7 @@
|
||||
"@angular/common": "~10.0.4",
|
||||
"@angular/compiler": "~10.0.4",
|
||||
"@angular/core": "~10.0.4",
|
||||
"@angular/fire": "^6.0.2",
|
||||
"@angular/forms": "~10.0.4",
|
||||
"@angular/material": "^10.0.2",
|
||||
"@angular/platform-browser": "~10.0.4",
|
||||
@ -30,7 +31,8 @@
|
||||
"reselect": "^4.0.0",
|
||||
"rxjs": "~6.5.5",
|
||||
"tslib": "^2.0.0",
|
||||
"zone.js": "~0.10.3"
|
||||
"zone.js": "~0.10.3",
|
||||
"firebase": "^7.13.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "~0.1000.3",
|
||||
@ -50,6 +52,12 @@
|
||||
"protractor": "~7.0.0",
|
||||
"ts-node": "~8.3.0",
|
||||
"tslint": "~6.1.0",
|
||||
"typescript": "~3.9.5"
|
||||
"typescript": "~3.9.5",
|
||||
"@angular-devkit/architect": ">= 0.900 < 0.1100",
|
||||
"firebase-tools": "^8.0.0",
|
||||
"fuzzy": "^0.1.3",
|
||||
"inquirer": "^6.2.2",
|
||||
"inquirer-autocomplete-prompt": "^1.0.1",
|
||||
"open": "^7.0.3"
|
||||
}
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
position="end"
|
||||
[opened]="false"
|
||||
>
|
||||
<mat-toolbar>Search Settings</mat-toolbar>
|
||||
<mat-toolbar>Page Settings</mat-toolbar>
|
||||
<mat-nav-list>
|
||||
<mat-list-item>
|
||||
<a mat-list-item (click)="savePage()"
|
||||
|
||||
@ -60,6 +60,8 @@ import { MatDividerModule } from '@angular/material/divider';
|
||||
import { MatNativeDateModule, MatRippleModule } from '@angular/material/core';
|
||||
import { MatTreeModule } from '@angular/material/tree';
|
||||
import { ClipboardModule } from '@angular/cdk/clipboard';
|
||||
import { AngularFireModule } from '@angular/fire';
|
||||
import { FirebaseConfig } from './constants';
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
@ -88,6 +90,8 @@ import { ClipboardModule } from '@angular/cdk/clipboard';
|
||||
|
||||
NgxMdModule.forRoot(),
|
||||
|
||||
AngularFireModule.initializeApp(FirebaseConfig),
|
||||
|
||||
MatSidenavModule,
|
||||
MatToolbarModule,
|
||||
MatIconModule,
|
||||
|
||||
@ -98,3 +98,32 @@
|
||||
</mat-slider>
|
||||
</div>
|
||||
</mat-nav-list>
|
||||
<mat-toolbar>Profile</mat-toolbar>
|
||||
<mat-nav-list>
|
||||
<mat-list-item *ngIf="user$ | async as user; else showLogin">
|
||||
<button
|
||||
mat-icon-button
|
||||
aria-label="Login with Google"
|
||||
color="primary"
|
||||
class="auth-button"
|
||||
(click)="logout()"
|
||||
>
|
||||
{{ user.displayName }}
|
||||
<mat-icon>logout</mat-icon>
|
||||
</button>
|
||||
</mat-list-item>
|
||||
<ng-template #showLogin>
|
||||
<mat-list-item>
|
||||
<button
|
||||
mat-raised-button
|
||||
aria-label="Logout"
|
||||
color="accent"
|
||||
class="auth-button"
|
||||
(click)="login()"
|
||||
>
|
||||
Login with Google
|
||||
<mat-icon>login</mat-icon>
|
||||
</button>
|
||||
</mat-list-item>
|
||||
</ng-template>
|
||||
</mat-nav-list>
|
||||
|
||||
@ -11,3 +11,6 @@
|
||||
.settings-h2 {
|
||||
font-size: 12pt;
|
||||
}
|
||||
.auth-button {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@ -6,6 +6,8 @@ import { DisplaySettings } from 'src/app/models/app-state';
|
||||
import { CardFonts } from 'src/app/constants';
|
||||
import { MatSelectChange } from '@angular/material/select';
|
||||
import { MatSliderChange } from '@angular/material/slider';
|
||||
import { AngularFireAuth } from '@angular/fire/auth';
|
||||
import { auth } from 'firebase/app';
|
||||
|
||||
@Component({
|
||||
selector: 'app-settings',
|
||||
@ -17,8 +19,9 @@ export class SettingsComponent extends SubscriberComponent {
|
||||
fonts: string[];
|
||||
cardFont = '';
|
||||
cardFontSize = 10;
|
||||
user$ = this.appService.select((state) => state.user);
|
||||
|
||||
constructor(public appService: AppService) {
|
||||
constructor(public appService: AppService, public authService: AngularFireAuth) {
|
||||
super();
|
||||
this.fonts = CardFonts;
|
||||
this.addSubscription(
|
||||
@ -27,8 +30,28 @@ export class SettingsComponent extends SubscriberComponent {
|
||||
this.cardFont = state.displaySettings.cardFont;
|
||||
})
|
||||
);
|
||||
|
||||
this.addSubscription(
|
||||
this.authService.authState.subscribe((user) => {
|
||||
this.appService.setUser({
|
||||
uid: user.uid,
|
||||
displayName: user.displayName,
|
||||
providerId: user.providerId,
|
||||
email: user.email,
|
||||
});
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
login() {
|
||||
this.authService.signInWithPopup(new auth.GoogleAuthProvider());
|
||||
}
|
||||
logout() {
|
||||
this.authService.signOut();
|
||||
}
|
||||
|
||||
//#region Font Settings
|
||||
|
||||
cardFontSelected(evt: MatSelectChange) {
|
||||
this.appService.changeCardFontFamily(evt.value);
|
||||
}
|
||||
@ -37,6 +60,8 @@ export class SettingsComponent extends SubscriberComponent {
|
||||
this.appService.changeCardFontSize(evt.value);
|
||||
}
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Search Settings
|
||||
|
||||
toggleStrongsAsModal(toggle: MatSlideToggleChange) {
|
||||
|
||||
@ -14,12 +14,13 @@ export const CardIcons = {
|
||||
Strongs: 'article',
|
||||
};
|
||||
|
||||
export const CardFonts = [
|
||||
'Merriweather',
|
||||
'PT Sans',
|
||||
'PT Serif',
|
||||
'Open Sans',
|
||||
'Roboto',
|
||||
'Roboto Condensed',
|
||||
'Inconsolata',
|
||||
];
|
||||
export const CardFonts = ['Merriweather', 'PT Sans', 'PT Serif', 'Open Sans', 'Roboto', 'Roboto Condensed', 'Inconsolata'];
|
||||
|
||||
export const FirebaseConfig = {
|
||||
apiKey: 'AIzaSyA3UV4s56CV2EumgvZmyJBTyU-vhv0xhc8',
|
||||
authDomain: 'dynamicbible-7c6cf.firebaseapp.com',
|
||||
databaseURL: 'https://dynamicbible-7c6cf.firebaseio.com',
|
||||
projectId: 'dynamicbible-7c6cf',
|
||||
storageBucket: '',
|
||||
messagingSenderId: '200739882604',
|
||||
};
|
||||
|
||||
@ -8,17 +8,21 @@ export interface AppState {
|
||||
readonly error: Error;
|
||||
readonly displaySettings: DisplaySettings;
|
||||
readonly cardIcons: CardIcons;
|
||||
readonly user: User;
|
||||
}
|
||||
|
||||
export interface Error {
|
||||
readonly msg: string;
|
||||
}
|
||||
|
||||
export type Data =
|
||||
| BiblePassageResult
|
||||
| StrongsResult
|
||||
| WordLookupResult
|
||||
| NoteItem;
|
||||
export type Data = BiblePassageResult | StrongsResult | WordLookupResult | NoteItem;
|
||||
|
||||
export interface User {
|
||||
readonly uid: string;
|
||||
readonly displayName: string | null;
|
||||
readonly email: string | null;
|
||||
readonly providerId: string;
|
||||
}
|
||||
|
||||
export interface CardIcons {
|
||||
readonly words: string;
|
||||
|
||||
@ -21,15 +21,16 @@ import {
|
||||
IndexResult,
|
||||
NoteItem,
|
||||
DisplaySettings,
|
||||
User,
|
||||
} from '../models/app-state';
|
||||
import { Section, BibleReference } from '../common/bible-reference';
|
||||
import { PageTitles, PageIcons } from '../constants';
|
||||
import { createStateService } from '../common/state-service';
|
||||
import { UUID } from 'angular2-uuid';
|
||||
import { StorageMap } from '@ngx-pwa/local-storage';
|
||||
import { SearchPage } from '../search/components/search-page/search.page';
|
||||
|
||||
const initialState: AppState = {
|
||||
user: null,
|
||||
cards: [
|
||||
{
|
||||
qry: 'UUIDGOESHERE',
|
||||
@ -127,6 +128,10 @@ type AppAction =
|
||||
| {
|
||||
type: 'UPDATE_DISPLAY_SETTINGS';
|
||||
settings: DisplaySettings;
|
||||
}
|
||||
| {
|
||||
type: 'SET_USER';
|
||||
user: User;
|
||||
};
|
||||
|
||||
function reducer(state: AppState, action: AppAction): AppState {
|
||||
@ -188,9 +193,7 @@ function reducer(state: AppState, action: AppAction): AppState {
|
||||
};
|
||||
}
|
||||
case 'GET_SAVED_PAGE': {
|
||||
const page = state.savedPages.find(
|
||||
(o) => o.id.toString() === action.pageId
|
||||
);
|
||||
const page = state.savedPages.find((o) => o.id.toString() === action.pageId);
|
||||
|
||||
if (!page) {
|
||||
return;
|
||||
@ -286,6 +289,12 @@ function reducer(state: AppState, action: AppAction): AppState {
|
||||
},
|
||||
};
|
||||
}
|
||||
case 'SET_USER': {
|
||||
return {
|
||||
...state,
|
||||
user: action.user,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -300,10 +309,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
|
||||
private readonly dataPath = 'assets/data';
|
||||
|
||||
constructor(
|
||||
private http: HttpClient,
|
||||
private localStorageService: StorageMap
|
||||
) {
|
||||
constructor(private http: HttpClient, private localStorageService: StorageMap) {
|
||||
super();
|
||||
|
||||
this.searchIndexArray = this.buildIndexArray().sort();
|
||||
@ -326,17 +332,10 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
console.log(msg);
|
||||
}
|
||||
|
||||
changeCardFontFamily(cardFont: string) {
|
||||
setUser(user: User) {
|
||||
this.dispatch({
|
||||
type: 'UPDATE_FONT_FAMILY',
|
||||
cardFont,
|
||||
});
|
||||
}
|
||||
|
||||
changeCardFontSize(size: number) {
|
||||
this.dispatch({
|
||||
type: 'UPDATE_FONT_SIZE',
|
||||
size,
|
||||
type: 'SET_USER',
|
||||
user,
|
||||
});
|
||||
}
|
||||
|
||||
@ -346,9 +345,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
const exists = await this.localStorageService.has('savedPages').toPromise();
|
||||
|
||||
if (exists) {
|
||||
const savedPages = (await this.localStorageService
|
||||
.get('savedPages')
|
||||
.toPromise()) as SavedPage[];
|
||||
const savedPages = (await this.localStorageService.get('savedPages').toPromise()) as SavedPage[];
|
||||
|
||||
this.dispatch({
|
||||
type: 'UPDATE_SAVED_PAGES',
|
||||
@ -407,6 +404,20 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
|
||||
//#region Display Settings
|
||||
|
||||
changeCardFontFamily(cardFont: string) {
|
||||
this.dispatch({
|
||||
type: 'UPDATE_FONT_FAMILY',
|
||||
cardFont,
|
||||
});
|
||||
}
|
||||
|
||||
changeCardFontSize(size: number) {
|
||||
this.dispatch({
|
||||
type: 'UPDATE_FONT_SIZE',
|
||||
size,
|
||||
});
|
||||
}
|
||||
|
||||
updateDisplaySettings(settings: DisplaySettings) {
|
||||
this.dispatch({
|
||||
type: 'UPDATE_DISPLAY_SETTINGS',
|
||||
@ -415,9 +426,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
}
|
||||
|
||||
async initDisplaySettings() {
|
||||
const hasDisplaySettings = await this.localStorageService
|
||||
.has('displaySettings')
|
||||
.toPromise();
|
||||
const hasDisplaySettings = await this.localStorageService.has('displaySettings').toPromise();
|
||||
|
||||
if (hasDisplaySettings) {
|
||||
const settings = await this.getSettingsApi();
|
||||
@ -434,9 +443,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
}
|
||||
|
||||
private async getSettingsApi() {
|
||||
return (await this.localStorageService
|
||||
.get('displaySettings')
|
||||
.toPromise()) as DisplaySettings;
|
||||
return (await this.localStorageService.get('displaySettings').toPromise()) as DisplaySettings;
|
||||
}
|
||||
|
||||
//#endregion
|
||||
@ -444,9 +451,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
//#region Notes
|
||||
|
||||
async getNote(qry: string, nextToItem: CardItem = null) {
|
||||
const note = (await this.localStorageService
|
||||
.get('notes/' + qry)
|
||||
.toPromise()) as NoteItem;
|
||||
const note = (await this.localStorageService.get('notes/' + qry).toPromise()) as NoteItem;
|
||||
|
||||
const card = {
|
||||
qry,
|
||||
@ -539,11 +544,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
|
||||
//#region Strongs
|
||||
|
||||
async getStrongs(
|
||||
strongsNumber: string,
|
||||
dict: DictionaryType,
|
||||
nextToItem: CardItem = null
|
||||
) {
|
||||
async getStrongs(strongsNumber: string, dict: DictionaryType, nextToItem: CardItem = null) {
|
||||
const card = await this.getStrongsCard(strongsNumber, dict);
|
||||
|
||||
this.dispatch({
|
||||
@ -580,46 +581,32 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
if (dict === 'grk') {
|
||||
result.prefix = 'G';
|
||||
if (sn > 5624 || sn < 1) {
|
||||
this.dispatchError(
|
||||
`Strong's Number G${sn} is out of range. Strong's numbers range from 1 - 5624 in the New Testament.`
|
||||
);
|
||||
this.dispatchError(`Strong's Number G${sn} is out of range. Strong's numbers range from 1 - 5624 in the New Testament.`);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
result.prefix = 'H';
|
||||
if (sn > 8674 || sn < 1) {
|
||||
this.dispatchError(
|
||||
`Strong's Number H${sn} is out of range. Strong's numbers range from 1 - 8674 in the Old Testament.`
|
||||
);
|
||||
this.dispatchError(`Strong's Number H${sn} is out of range. Strong's numbers range from 1 - 8674 in the Old Testament.`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
let url = `${dict}${Math.ceil(sn / 100)}.json`;
|
||||
try {
|
||||
const d = await this.http
|
||||
.get<StrongsDefinition[]>(`${this.dataPath}/strongs/${url}`)
|
||||
.toPromise();
|
||||
const d = await this.http.get<StrongsDefinition[]>(`${this.dataPath}/strongs/${url}`).toPromise();
|
||||
result.def = d.find((el) => el.i === result.prefix + result.sn);
|
||||
} catch (err) {
|
||||
this.dispatchError(
|
||||
`Unable to retrieve Strong's Data for ${result.prefix}${result.sn}`
|
||||
);
|
||||
this.dispatchError(`Unable to retrieve Strong's Data for ${result.prefix}${result.sn}`);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const d = await this.http
|
||||
.get<StrongsCrossReference[]>(`${this.dataPath}/strongscr/cr${url}`)
|
||||
.toPromise();
|
||||
const d = await this.http.get<StrongsCrossReference[]>(`${this.dataPath}/strongscr/cr${url}`).toPromise();
|
||||
|
||||
result.crossrefs = d.find(
|
||||
(o) => o.id.toUpperCase() === result.prefix + result.sn
|
||||
);
|
||||
result.crossrefs = d.find((o) => o.id.toUpperCase() === result.prefix + result.sn);
|
||||
} catch (err) {
|
||||
this.dispatchError(
|
||||
`Unable to retrieve Strong\'s Cross References for ${result.prefix}${result.sn}`
|
||||
);
|
||||
this.dispatchError(`Unable to retrieve Strong\'s Cross References for ${result.prefix}${result.sn}`);
|
||||
|
||||
return;
|
||||
}
|
||||
@ -630,16 +617,12 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
// rmac is a two get process.
|
||||
// first, get the rmac code.
|
||||
try {
|
||||
const rmacCrossReferences = await this.http
|
||||
.get<RMACCrossReference[]>(url)
|
||||
.toPromise();
|
||||
const rmacCrossReferences = await this.http.get<RMACCrossReference[]>(url).toPromise();
|
||||
|
||||
// deal with RMAC
|
||||
const referencesForThisStrongsNumber = rmacCrossReferences.filter(
|
||||
(el, i) => {
|
||||
return el.i === sn.toString();
|
||||
}
|
||||
);
|
||||
const referencesForThisStrongsNumber = rmacCrossReferences.filter((el, i) => {
|
||||
return el.i === sn.toString();
|
||||
});
|
||||
|
||||
if (referencesForThisStrongsNumber.length === 0) {
|
||||
return result;
|
||||
@ -655,12 +638,8 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
url = `${this.dataPath}/rmac/r-${result.rmaccode.substring(0, 1)}.json`;
|
||||
|
||||
try {
|
||||
const rmacDefinitions = await this.http
|
||||
.get<RMACDefinition[]>(url)
|
||||
.toPromise();
|
||||
result.rmac = rmacDefinitions.find(
|
||||
(o) => o.id.toLowerCase() === result.rmaccode
|
||||
);
|
||||
const rmacDefinitions = await this.http.get<RMACDefinition[]>(url).toPromise();
|
||||
result.rmac = rmacDefinitions.find((o) => o.id.toLowerCase() === result.rmaccode);
|
||||
} catch (err) {
|
||||
this.dispatchError('Unable to retrieve RMAC');
|
||||
return;
|
||||
@ -724,16 +703,10 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (
|
||||
let i = Number(section.start.chapter);
|
||||
i <= Number(section.end.chapter);
|
||||
i++
|
||||
) {
|
||||
for (let i = Number(section.start.chapter); i <= Number(section.end.chapter); i++) {
|
||||
try {
|
||||
const d = await this.http
|
||||
.get<BiblePassage>(
|
||||
`${this.dataPath}/bibles/kjv_strongs/${section.book.bookNumber}-${i}.json`
|
||||
)
|
||||
.get<BiblePassage>(`${this.dataPath}/bibles/kjv_strongs/${section.book.bookNumber}-${i}.json`)
|
||||
.toPromise();
|
||||
chapters.push(d);
|
||||
} catch (err) {
|
||||
@ -796,15 +769,10 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
}
|
||||
}
|
||||
|
||||
private async convertToParagraphPassages(
|
||||
chapters: BiblePassage[],
|
||||
section: Section
|
||||
) {
|
||||
private async convertToParagraphPassages(chapters: BiblePassage[], section: Section) {
|
||||
// get the paragraphs the first time if you haven't already.
|
||||
if (!this.paragraphs) {
|
||||
this.paragraphs = await this.http
|
||||
.get<HashTable<Paragraph>>(`${this.dataPath}/bibles/paras.json`)
|
||||
.toPromise();
|
||||
this.paragraphs = await this.http.get<HashTable<Paragraph>>(`${this.dataPath}/bibles/paras.json`).toPromise();
|
||||
}
|
||||
|
||||
const passages: BibleParagraphPassage[] = [];
|
||||
@ -820,11 +788,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
return passages;
|
||||
}
|
||||
|
||||
private convertToParagraphs(
|
||||
ch: BiblePassage,
|
||||
section: Section,
|
||||
paragraphMarkers: HashTable<Paragraph>
|
||||
): BibleParagraph[] {
|
||||
private convertToParagraphs(ch: BiblePassage, section: Section, paragraphMarkers: HashTable<Paragraph>): BibleParagraph[] {
|
||||
// group the verses into paragraphs.
|
||||
|
||||
// create an initial paragraph to hold verses that might come before a paragraph.
|
||||
@ -858,11 +822,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
}
|
||||
|
||||
private getRefKey(vs: BibleVerse, section: Section) {
|
||||
return BibleReference.formatReferenceKey(
|
||||
section.book.bookNumber,
|
||||
section.start.chapter,
|
||||
vs.v
|
||||
);
|
||||
return BibleReference.formatReferenceKey(section.book.bookNumber, section.start.chapter, vs.v);
|
||||
}
|
||||
|
||||
//#endregion
|
||||
@ -915,28 +875,15 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
|
||||
// handle the first case.
|
||||
if (stem <= this.searchIndexArray[0]) {
|
||||
results.unshift(
|
||||
await this.getSearchReferences(
|
||||
`${this.dataPath}/index/${this.searchIndexArray[0]}idx.json`,
|
||||
stem
|
||||
)
|
||||
);
|
||||
results.unshift(await this.getSearchReferences(`${this.dataPath}/index/${this.searchIndexArray[0]}idx.json`, stem));
|
||||
break;
|
||||
}
|
||||
|
||||
// For each query term, figure out which file it is in, and get it.
|
||||
for (let w = 1; w < this.searchIndexArray.length; w++) {
|
||||
// If we are at the end of the array, we want to use a different test.
|
||||
if (
|
||||
stem <= this.searchIndexArray[w] &&
|
||||
stem > this.searchIndexArray[w - 1]
|
||||
) {
|
||||
results.unshift(
|
||||
await this.getSearchReferences(
|
||||
`${this.dataPath}/index/${this.searchIndexArray[w]}idx.json`,
|
||||
stem
|
||||
)
|
||||
);
|
||||
if (stem <= this.searchIndexArray[w] && stem > this.searchIndexArray[w - 1]) {
|
||||
results.unshift(await this.getSearchReferences(`${this.dataPath}/index/${this.searchIndexArray[w]}idx.json`, stem));
|
||||
}
|
||||
}
|
||||
} // End of loop through query terms
|
||||
@ -977,9 +924,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
private async getStemWordIndex() {
|
||||
this.wordToStem = new Map<string, string>();
|
||||
try {
|
||||
const r = await this.http
|
||||
.get<WordToStem[]>(`${this.dataPath}/index/word_to_stem_idx.json`)
|
||||
.toPromise();
|
||||
const r = await this.http.get<WordToStem[]>(`${this.dataPath}/index/word_to_stem_idx.json`).toPromise();
|
||||
|
||||
// find the right word
|
||||
for (const i of r) {
|
||||
@ -1324,9 +1269,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
async getAutoComplete(keyword: string) {
|
||||
if (!this.autocomplete) {
|
||||
// if you have't populated the word list yet, do so...
|
||||
const data = await this.http
|
||||
.get<WordToStem[]>(`${this.dataPath}/index/word_to_stem_idx.json`)
|
||||
.toPromise();
|
||||
const data = await this.http.get<WordToStem[]>(`${this.dataPath}/index/word_to_stem_idx.json`).toPromise();
|
||||
this.autocomplete = data.map((o) => o.w);
|
||||
}
|
||||
|
||||
@ -1347,8 +1290,7 @@ export class AppService extends createStateService(reducer, initialState) {
|
||||
for (const item of BibleReference.Books) {
|
||||
if (
|
||||
item.name !== 'Unknown' &&
|
||||
(item.name.toLowerCase().indexOf(qry.toLowerCase()) > -1 ||
|
||||
item.abbreviation.toLowerCase().indexOf(qry.toLowerCase()) > -1)
|
||||
(item.name.toLowerCase().indexOf(qry.toLowerCase()) > -1 || item.abbreviation.toLowerCase().indexOf(qry.toLowerCase()) > -1)
|
||||
) {
|
||||
words.push(prefix + item.name);
|
||||
if (words.length > 2) {
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
export const environment = {
|
||||
production: true
|
||||
production: true,
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user