From 11c9a798d4eaa5391da46c9c716df1d68193d751 Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Sat, 9 Mar 2024 14:34:17 -0500 Subject: [PATCH] Sort the imports :) --- src/.eslintrc.json | 11 ++- src/package-lock.json | 10 ++ src/package.json | 1 + src/src/app/app-routing.module.ts | 7 +- src/src/app/app.component.ts | 21 ++-- src/src/app/app.module.ts | 98 +++++++++---------- src/src/app/common/array-operations.spec.ts | 2 +- src/src/app/common/array-operations.ts | 3 +- .../app/common/card-cache-operations.spec.ts | 4 +- src/src/app/common/card-operations.spec.ts | 4 +- src/src/app/common/card-operations.ts | 2 +- src/src/app/common/subscriber-base.ts | 2 +- .../add-to-page-modal.component.ts | 7 +- src/src/app/components/card.component.ts | 9 +- .../help-modal/help-modal.component.ts | 1 + .../edit-modal/note-edit-modal.component.ts | 11 +-- .../components/note/note-card.component.ts | 7 +- .../page-edit-modal.component.ts | 4 +- .../passage/passage-card.component.ts | 13 +-- .../saved-page-card.component.ts | 15 +-- .../components/settings/settings.component.ts | 27 +++-- .../strongs/card/strongs-card.component.ts | 11 ++- .../strongs/modal/strongs-modal.component.ts | 4 +- .../components/strongs/strongs.component.ts | 3 +- .../verse-picker-modal.component.ts | 2 +- .../components/words/words-card.component.ts | 4 +- src/src/app/models/app-state.ts | 8 +- src/src/app/models/card-state.ts | 2 +- .../app/pages/notes-admin/notes-admin.page.ts | 4 +- src/src/app/pages/search/search.page.ts | 15 +-- .../app/services/app-state-reducer.spec.ts | 9 +- src/src/app/services/app.service.ts | 34 +++---- src/src/app/services/migration0to1.service.ts | 9 +- src/src/app/services/storage.service.ts | 17 ++-- src/src/test.ts | 1 + 35 files changed, 195 insertions(+), 187 deletions(-) diff --git a/src/.eslintrc.json b/src/.eslintrc.json index e150ef55..7ad78bbe 100644 --- a/src/.eslintrc.json +++ b/src/.eslintrc.json @@ -3,12 +3,11 @@ "ignorePatterns": ["projects/**/*"], "parser": "@typescript-eslint/parser", "parserOptions": { + "project": "./tsconfig.json", // <-- Point to your project's "tsconfig.json" or create a new one. "ecmaVersion": 2020, - "sourceType": "module", - "project": "./tsconfig.json" // <-- Point to your project's "tsconfig.json" or create a new one. + "sourceType": "module" }, - - "plugins": ["unused-imports", "optimize-regex"], + "plugins": ["unused-imports", "optimize-regex", "simple-import-sort"], "overrides": [ { "files": ["*.ts"], @@ -49,7 +48,9 @@ "argsIgnorePattern": "^_" } ], - "optimize-regex/optimize-regex": "warn" + "optimize-regex/optimize-regex": "warn", + "simple-import-sort/imports": "error", + "simple-import-sort/exports": "error" } }, { diff --git a/src/package-lock.json b/src/package-lock.json index fb386a0e..7be6ee7f 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -55,6 +55,7 @@ "eslint": "^8.57.0", "eslint-plugin-deprecation": "^2.0.0", "eslint-plugin-optimize-regex": "^1.2.1", + "eslint-plugin-simple-import-sort": "^12.0.0", "eslint-plugin-unused-imports": "^3.1.0", "firebase-tools": "^13.4.0", "fuzzy": "^0.1.3", @@ -11993,6 +11994,15 @@ "node": ">=10" } }, + "node_modules/eslint-plugin-simple-import-sort": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.0.0.tgz", + "integrity": "sha512-8o0dVEdAkYap0Cn5kNeklaKcT1nUsa3LITWEuFk3nJifOoD+5JQGoyDUW2W/iPWwBsNBJpyJS9y4je/BgxLcyQ==", + "dev": true, + "peerDependencies": { + "eslint": ">=5.0.0" + } + }, "node_modules/eslint-plugin-unused-imports": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.1.0.tgz", diff --git a/src/package.json b/src/package.json index 760bdf08..e4200d6c 100644 --- a/src/package.json +++ b/src/package.json @@ -63,6 +63,7 @@ "eslint": "^8.57.0", "eslint-plugin-deprecation": "^2.0.0", "eslint-plugin-optimize-regex": "^1.2.1", + "eslint-plugin-simple-import-sort": "^12.0.0", "eslint-plugin-unused-imports": "^3.1.0", "firebase-tools": "^13.4.0", "fuzzy": "^0.1.3", diff --git a/src/src/app/app-routing.module.ts b/src/src/app/app-routing.module.ts index 43244d31..0e60bdb0 100644 --- a/src/src/app/app-routing.module.ts +++ b/src/src/app/app-routing.module.ts @@ -1,8 +1,9 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { SearchPageComponent } from './pages/search/search.page'; -import { SavedPagesAdminPageComponent } from './pages/saved-pages-admin/saved-pages-admin.page'; +import { RouterModule,Routes } from '@angular/router'; + import { NotesAdminPageComponent } from './pages/notes-admin/notes-admin.page'; +import { SavedPagesAdminPageComponent } from './pages/saved-pages-admin/saved-pages-admin.page'; +import { SearchPageComponent } from './pages/search/search.page'; const routes: Routes = [ { diff --git a/src/src/app/app.component.ts b/src/src/app/app.component.ts index 85151632..c6695a86 100644 --- a/src/src/app/app.component.ts +++ b/src/src/app/app.component.ts @@ -1,15 +1,16 @@ -import { Component, ViewChild, AfterViewInit, ChangeDetectorRef } from '@angular/core'; +import { BreakpointObserver,Breakpoints } from '@angular/cdk/layout'; +import { AfterViewInit, ChangeDetectorRef,Component, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSidenav } from '@angular/material/sidenav'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { Observable } from 'rxjs'; +import { map, shareReplay } from 'rxjs/operators'; + +import { SubscriberBase } from './common/subscriber-base'; +import { HelpModalComponent } from './components/help-modal/help-modal.component'; +import { AppService } from './services/app.service'; import { NavService } from './services/nav.service'; import { StorageService } from './services/storage.service'; -import { Observable } from 'rxjs'; -import { Breakpoints, BreakpointObserver } from '@angular/cdk/layout'; -import { map, shareReplay } from 'rxjs/operators'; -import { MatSidenav } from '@angular/material/sidenav'; -import { SubscriberBase } from './common/subscriber-base'; -import { MatSnackBar } from '@angular/material/snack-bar'; -import { HelpModalComponent } from './components/help-modal/help-modal.component'; -import { MatDialog } from '@angular/material/dialog'; -import { AppService } from './services/app.service'; @Component({ selector: 'app-root', diff --git a/src/src/app/app.module.ts b/src/src/app/app.module.ts index 46f682d2..b449bd10 100644 --- a/src/src/app/app.module.ts +++ b/src/src/app/app.module.ts @@ -1,73 +1,63 @@ -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { HttpClientModule } from '@angular/common/http'; -import { BrowserModule } from '@angular/platform-browser'; -import { APP_ID, NgModule } from '@angular/core'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { MARKED_OPTIONS, MarkdownModule } from 'ngx-markdown'; - -import { AngularFireModule } from '@angular/fire/compat'; -import { FirebaseConfig } from './constants'; +import { ClipboardModule } from '@angular/cdk/clipboard'; import { DragDropModule } from '@angular/cdk/drag-drop'; +import { HttpClientModule } from '@angular/common/http'; +import { APP_ID, NgModule } from '@angular/core'; +import { AngularFireModule } from '@angular/fire/compat'; import { AngularFireAuthModule } from '@angular/fire/compat/auth'; import { AngularFireDatabaseModule } from '@angular/fire/compat/database'; - -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatButtonModule } from '@angular/material/button'; -import { MatInputModule } from '@angular/material/input'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatRadioModule } from '@angular/material/radio'; -import { MatSelectModule } from '@angular/material/select'; -import { MatSliderModule } from '@angular/material/slider'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatSidenavModule } from '@angular/material/sidenav'; -import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatListModule } from '@angular/material/list'; -import { MatCardModule } from '@angular/material/card'; -import { MatStepperModule } from '@angular/material/stepper'; -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatIconModule } from '@angular/material/icon'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatTooltipModule } from '@angular/material/tooltip'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatBadgeModule } from '@angular/material/badge'; import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; -import { MatDividerModule } from '@angular/material/divider'; +import { MatButtonModule } from '@angular/material/button'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatChipsModule } from '@angular/material/chips'; -import { MatTabsModule } from '@angular/material/tabs'; import { MatNativeDateModule, MatRippleModule } from '@angular/material/core'; -import { ClipboardModule } from '@angular/cdk/clipboard'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatExpansionModule } from '@angular/material/expansion'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSidenavModule } from '@angular/material/sidenav'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatSliderModule } from '@angular/material/slider'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatStepperModule } from '@angular/material/stepper'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatToolbarModule } from '@angular/material/toolbar'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { BrowserModule } from '@angular/platform-browser'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { MarkdownModule,MARKED_OPTIONS } from 'ngx-markdown'; +import { MarkedOptions, MarkedRenderer } from 'ngx-markdown'; -import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; - -import { NotesAdminPageComponent } from './pages/notes-admin/notes-admin.page'; - -import { SavedPagesAdminPageComponent } from './pages/saved-pages-admin/saved-pages-admin.page'; -import { SavedPageCardComponent } from './components/saved-page-card/saved-page-card.component'; - +import { AppRoutingModule } from './app-routing.module'; +import { AddToPageModalComponent } from './components/add-to-page-modal/add-to-page-modal.component'; import { HelpModalComponent } from './components/help-modal/help-modal.component'; - -import { SearchPageComponent } from './pages/search/search.page'; - +import { NoteEditModalComponent } from './components/note/edit-modal/note-edit-modal.component'; +import { NoteCardComponent } from './components/note/note-card.component'; import { OkCancelModalComponent } from './components/ok-cancel-modal/ok-cancel-modal.component'; -import { SettingsComponent } from './components/settings/settings.component'; - +import { PageEditModalComponent } from './components/page-edit-modal/page-edit-modal.component'; import { PassageCardComponent } from './components/passage/passage-card.component'; -import { StrongsComponent } from './components/strongs/strongs.component'; +import { SavedPageCardComponent } from './components/saved-page-card/saved-page-card.component'; +import { SettingsComponent } from './components/settings/settings.component'; import { StrongsCardComponent } from './components/strongs/card/strongs-card.component'; import { StrongsModalComponent } from './components/strongs/modal/strongs-modal.component'; -import { WordsCardComponent } from './components/words/words-card.component'; -import { NoteCardComponent } from './components/note/note-card.component'; -import { PageEditModalComponent } from './components/page-edit-modal/page-edit-modal.component'; -import { NoteEditModalComponent } from './components/note/edit-modal/note-edit-modal.component'; +import { StrongsComponent } from './components/strongs/strongs.component'; import { VersePickerModalComponent } from './components/verse-picker-modal/verse-picker-modal.component'; -import { AddToPageModalComponent } from './components/add-to-page-modal/add-to-page-modal.component'; - -import { MarkedOptions, MarkedRenderer } from 'ngx-markdown'; +import { WordsCardComponent } from './components/words/words-card.component'; +import { FirebaseConfig } from './constants'; +import { NotesAdminPageComponent } from './pages/notes-admin/notes-admin.page'; +import { SavedPagesAdminPageComponent } from './pages/saved-pages-admin/saved-pages-admin.page'; +import { SearchPageComponent } from './pages/search/search.page'; // function that returns `MarkedOptions` with renderer override export function markedOptionsFactory(): MarkedOptions { diff --git a/src/src/app/common/array-operations.spec.ts b/src/src/app/common/array-operations.spec.ts index 1bf52679..b2c8bf19 100644 --- a/src/src/app/common/array-operations.spec.ts +++ b/src/src/app/common/array-operations.spec.ts @@ -1,4 +1,4 @@ -import { moveItemUpOrDown, moveItem } from './array-operations'; +import { moveItem,moveItemUpOrDown } from './array-operations'; import { MoveDirection } from './move-direction'; describe('Array Movement', () => { diff --git a/src/src/app/common/array-operations.ts b/src/src/app/common/array-operations.ts index 0d56a007..babf1df8 100644 --- a/src/src/app/common/array-operations.ts +++ b/src/src/app/common/array-operations.ts @@ -1,6 +1,7 @@ -import { MoveDirection } from './move-direction'; import { moveItemInArray } from '@angular/cdk/drag-drop'; +import { MoveDirection } from './move-direction'; + /** * Moves an item up (1 index towards 0) or down (1 index away from 0) immutably, returning a new array as the value. * @param items Array in which to move the item. diff --git a/src/src/app/common/card-cache-operations.spec.ts b/src/src/app/common/card-cache-operations.spec.ts index ac2b0a67..967bed18 100644 --- a/src/src/app/common/card-cache-operations.spec.ts +++ b/src/src/app/common/card-cache-operations.spec.ts @@ -1,7 +1,7 @@ -import { CardType, CardItem } from '../models/card-state'; +import { CardItem,CardType } from '../models/card-state'; import { NoteItem } from '../models/note-state'; +import { getCardCacheKey, removeFromCardCache,updateInCardCache } from './card-cache-operations'; import { HashTable } from './hashtable'; -import { updateInCardCache, getCardCacheKey, removeFromCardCache } from './card-cache-operations'; describe('Card Cache', () => { it('updateCache', () => { diff --git a/src/src/app/common/card-operations.spec.ts b/src/src/app/common/card-operations.spec.ts index 19a20ebd..1c91edc1 100644 --- a/src/src/app/common/card-operations.spec.ts +++ b/src/src/app/common/card-operations.spec.ts @@ -1,6 +1,6 @@ -import { mergeCardList } from './card-operations'; +import { CardItem,CardType } from '../models/card-state'; import { BibleReference, Overlap } from './bible-reference'; -import { CardType, CardItem } from '../models/card-state'; +import { mergeCardList } from './card-operations'; describe('Card Merging', () => { it('Should merge two equal reference cards', () => { diff --git a/src/src/app/common/card-operations.ts b/src/src/app/common/card-operations.ts index 64e8c17c..c820dfe7 100644 --- a/src/src/app/common/card-operations.ts +++ b/src/src/app/common/card-operations.ts @@ -1,5 +1,5 @@ -import { BibleReference, Overlap } from './bible-reference'; import { CardType, DataReference } from '../models/card-state'; +import { BibleReference, Overlap } from './bible-reference'; export function maybeMergeCards( leftCard: DataReference, diff --git a/src/src/app/common/subscriber-base.ts b/src/src/app/common/subscriber-base.ts index cd5e14b7..d3f98b4b 100644 --- a/src/src/app/common/subscriber-base.ts +++ b/src/src/app/common/subscriber-base.ts @@ -1,4 +1,4 @@ -import { OnDestroy, Injectable } from '@angular/core'; +import { Injectable,OnDestroy } from '@angular/core'; import { Subscription } from 'rxjs'; @Injectable({ diff --git a/src/src/app/components/add-to-page-modal/add-to-page-modal.component.ts b/src/src/app/components/add-to-page-modal/add-to-page-modal.component.ts index 8f9e5337..aed6415d 100644 --- a/src/src/app/components/add-to-page-modal/add-to-page-modal.component.ts +++ b/src/src/app/components/add-to-page-modal/add-to-page-modal.component.ts @@ -1,10 +1,11 @@ import { Component, Inject, ViewChild } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatSelectionList } from '@angular/material/list'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; -import { CardItem } from '../../models/card-state'; +import { MAT_DIALOG_DATA,MatDialogRef } from '@angular/material/dialog'; +import { MatSelectionList } from '@angular/material/list'; import { AppService } from 'src/app/services/app.service'; +import { CardItem } from '../../models/card-state'; + @Component({ selector: 'app-add-to-page-modal-modal', templateUrl: 'add-to-page-modal.component.html', diff --git a/src/src/app/components/card.component.ts b/src/src/app/components/card.component.ts index d70cb669..087e42fb 100644 --- a/src/src/app/components/card.component.ts +++ b/src/src/app/components/card.component.ts @@ -1,12 +1,13 @@ -import { EventEmitter, Output, Input, ElementRef, Component } from '@angular/core'; -import { Observable } from 'rxjs'; +import { Clipboard } from '@angular/cdk/clipboard'; +import { Component,ElementRef, EventEmitter, Input, Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { SubscriberBase } from '../common/subscriber-base'; +import { Observable } from 'rxjs'; + import { MoveDirection } from '../common/move-direction'; +import { SubscriberBase } from '../common/subscriber-base'; import { AddToPageModalComponent } from '../components/add-to-page-modal/add-to-page-modal.component'; import { CardItem } from '../models/card-state'; import { AppService } from '../services/app.service'; -import { Clipboard } from '@angular/cdk/clipboard'; @Component({ template: '', diff --git a/src/src/app/components/help-modal/help-modal.component.ts b/src/src/app/components/help-modal/help-modal.component.ts index 1c0435e7..569ba8a7 100644 --- a/src/src/app/components/help-modal/help-modal.component.ts +++ b/src/src/app/components/help-modal/help-modal.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + import { NavService } from '../../services/nav.service'; @Component({ diff --git a/src/src/app/components/note/edit-modal/note-edit-modal.component.ts b/src/src/app/components/note/edit-modal/note-edit-modal.component.ts index c71317d5..ce0febbe 100644 --- a/src/src/app/components/note/edit-modal/note-edit-modal.component.ts +++ b/src/src/app/components/note/edit-modal/note-edit-modal.component.ts @@ -1,14 +1,11 @@ -import { Component, Inject } from '@angular/core'; -import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; - import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes'; +import { Component, Inject } from '@angular/core'; +import { UntypedFormBuilder,UntypedFormGroup } from '@angular/forms'; import { MatChipInputEvent } from '@angular/material/chips'; - +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { UUID } from 'angular2-uuid'; - -import { NoteItem } from 'src/app/models/note-state'; import { CardItem } from 'src/app/models/card-state'; +import { NoteItem } from 'src/app/models/note-state'; import { AppService } from 'src/app/services/app.service'; @Component({ diff --git a/src/src/app/components/note/note-card.component.ts b/src/src/app/components/note/note-card.component.ts index 2789ca5b..5ade0530 100644 --- a/src/src/app/components/note/note-card.component.ts +++ b/src/src/app/components/note/note-card.component.ts @@ -1,10 +1,11 @@ -import { Component, ViewChild, ElementRef, Input } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; import { Clipboard } from '@angular/cdk/clipboard'; -import { CardComponent } from '../card.component'; +import { Component, ElementRef, Input,ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { BibleReference } from 'src/app/common/bible-reference'; import { NoteItem } from 'src/app/models/note-state'; import { AppService } from 'src/app/services/app.service'; + +import { CardComponent } from '../card.component'; import { OkCancelModalComponent, OkCancelResult } from '../ok-cancel-modal/ok-cancel-modal.component'; import { NoteEditModalComponent } from './edit-modal/note-edit-modal.component'; diff --git a/src/src/app/components/page-edit-modal/page-edit-modal.component.ts b/src/src/app/components/page-edit-modal/page-edit-modal.component.ts index 57b63766..620520ca 100644 --- a/src/src/app/components/page-edit-modal/page-edit-modal.component.ts +++ b/src/src/app/components/page-edit-modal/page-edit-modal.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; -import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { UntypedFormBuilder,UntypedFormGroup } from '@angular/forms'; +import { MAT_DIALOG_DATA,MatDialogRef } from '@angular/material/dialog'; import { SavedPage } from 'src/app/models/page-state'; import { AppService } from 'src/app/services/app.service'; diff --git a/src/src/app/components/passage/passage-card.component.ts b/src/src/app/components/passage/passage-card.component.ts index 5822babc..e3c4a82d 100644 --- a/src/src/app/components/passage/passage-card.component.ts +++ b/src/src/app/components/passage/passage-card.component.ts @@ -1,13 +1,14 @@ -import { Component, OnInit, ElementRef, ViewChild, ChangeDetectionStrategy } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; import { Clipboard } from '@angular/cdk/clipboard'; -import { NoteItem } from 'src/app/models/note-state'; -import { CardComponent } from 'src/app/components/card.component'; +import { ChangeDetectionStrategy,Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { BibleReference, Overlap } from 'src/app/common/bible-reference'; -import { Paragraph, BiblePassageResult } from 'src/app/models/passage-state'; -import { CardItem } from 'src/app/models/card-state'; import { isNullOrUndefined } from 'src/app/common/helpers'; +import { CardComponent } from 'src/app/components/card.component'; +import { CardItem } from 'src/app/models/card-state'; +import { NoteItem } from 'src/app/models/note-state'; +import { BiblePassageResult,Paragraph } from 'src/app/models/passage-state'; import { AppService } from 'src/app/services/app.service'; + import { StrongsModalComponent } from '../strongs/modal/strongs-modal.component'; @Component({ diff --git a/src/src/app/components/saved-page-card/saved-page-card.component.ts b/src/src/app/components/saved-page-card/saved-page-card.component.ts index 3c8b9e2a..dd53a983 100644 --- a/src/src/app/components/saved-page-card/saved-page-card.component.ts +++ b/src/src/app/components/saved-page-card/saved-page-card.component.ts @@ -1,18 +1,19 @@ -import { Component, Input } from '@angular/core'; import { CdkDragDrop } from '@angular/cdk/drag-drop'; +import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { Observable } from 'rxjs'; -import { SavedPage } from 'src/app/models/page-state'; -import { CardIcons, CardItem, CardType, DataReference } from 'src/app/models/card-state'; -import { OkCancelModalComponent, OkCancelResult } from '../ok-cancel-modal/ok-cancel-modal.component'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { PageEditModalComponent } from '../page-edit-modal/page-edit-modal.component'; +import { Observable } from 'rxjs'; +import { getFromCardCache } from 'src/app/common/card-cache-operations'; import { HashTable } from 'src/app/common/hashtable'; import { SubscriberBase } from 'src/app/common/subscriber-base'; -import { getFromCardCache } from 'src/app/common/card-cache-operations'; +import { CardIcons, CardItem, CardType, DataReference } from 'src/app/models/card-state'; import { NoteItem } from 'src/app/models/note-state'; +import { SavedPage } from 'src/app/models/page-state'; import { AppService } from 'src/app/services/app.service'; +import { OkCancelModalComponent, OkCancelResult } from '../ok-cancel-modal/ok-cancel-modal.component'; +import { PageEditModalComponent } from '../page-edit-modal/page-edit-modal.component'; + @Component({ selector: 'app-saved-page-card', templateUrl: 'saved-page-card.component.html', diff --git a/src/src/app/components/settings/settings.component.ts b/src/src/app/components/settings/settings.component.ts index 7e1954a8..463850c9 100644 --- a/src/src/app/components/settings/settings.component.ts +++ b/src/src/app/components/settings/settings.component.ts @@ -1,26 +1,23 @@ import { Component } from '@angular/core'; -import { MatSlideToggleChange } from '@angular/material/slide-toggle'; -import { MatSelectChange } from '@angular/material/select'; -import { MatSnackBar } from '@angular/material/snack-bar'; -import { MatDialog } from '@angular/material/dialog'; - import { AngularFireAuth } from '@angular/fire/compat/auth'; -import firebase from '@firebase/app-compat'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSelectChange } from '@angular/material/select'; +import { MatSlideToggleChange } from '@angular/material/slide-toggle'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Capacitor } from '@capacitor/core'; import { GoogleAuth } from '@codetrix-studio/capacitor-google-auth' - -import { SubscriberBase } from '../../common/subscriber-base'; -import { DisplaySettings } from 'src/app/models/app-state'; +import firebase from '@firebase/app-compat'; +import { Overlap } from 'src/app/common/bible-reference'; +import { NoteEditModalComponent } from 'src/app/components/note/edit-modal/note-edit-modal.component'; +import { PageEditModalComponent } from 'src/app/components/page-edit-modal/page-edit-modal.component'; import { CardFonts } from 'src/app/constants'; - +import { DisplaySettings } from 'src/app/models/app-state'; +import { SavedPage } from 'src/app/models/page-state'; +import { AppService } from 'src/app/services/app.service'; import { NavService } from 'src/app/services/nav.service'; +import { SubscriberBase } from '../../common/subscriber-base'; import { OkCancelModalComponent, OkCancelResult } from '../ok-cancel-modal/ok-cancel-modal.component'; -import { PageEditModalComponent } from 'src/app/components/page-edit-modal/page-edit-modal.component'; -import { NoteEditModalComponent } from 'src/app/components/note/edit-modal/note-edit-modal.component'; -import { SavedPage } from 'src/app/models/page-state'; -import { Overlap } from 'src/app/common/bible-reference'; -import { AppService } from 'src/app/services/app.service'; @Component({ selector: 'app-settings', diff --git a/src/src/app/components/strongs/card/strongs-card.component.ts b/src/src/app/components/strongs/card/strongs-card.component.ts index 9a1e0689..442cb027 100644 --- a/src/src/app/components/strongs/card/strongs-card.component.ts +++ b/src/src/app/components/strongs/card/strongs-card.component.ts @@ -1,11 +1,12 @@ -import { Component, ElementRef, ViewChild, ChangeDetectionStrategy, Input } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; import { Clipboard } from '@angular/cdk/clipboard'; -import { StrongsModalComponent } from '../modal/strongs-modal.component'; -import { CardComponent } from 'src/app/components/card.component'; +import { ChangeDetectionStrategy, Component, ElementRef, Input,ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { BibleReference } from 'src/app/common/bible-reference'; -import { AppService } from 'src/app/services/app.service'; +import { CardComponent } from 'src/app/components/card.component'; import { StrongsResult } from 'src/app/models/strongs-state'; +import { AppService } from 'src/app/services/app.service'; + +import { StrongsModalComponent } from '../modal/strongs-modal.component'; @Component({ selector: 'app-strongs-card', diff --git a/src/src/app/components/strongs/modal/strongs-modal.component.ts b/src/src/app/components/strongs/modal/strongs-modal.component.ts index 878f1b25..cd8009cf 100644 --- a/src/src/app/components/strongs/modal/strongs-modal.component.ts +++ b/src/src/app/components/strongs/modal/strongs-modal.component.ts @@ -1,5 +1,5 @@ -import { Component, Inject, ChangeDetectionStrategy } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { ChangeDetectionStrategy,Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA,MatDialogRef } from '@angular/material/dialog'; import { Observable } from 'rxjs'; import { BibleReference } from 'src/app/common/bible-reference'; import { CardItem } from 'src/app/models/card-state'; diff --git a/src/src/app/components/strongs/strongs.component.ts b/src/src/app/components/strongs/strongs.component.ts index ab4c2f84..e4290e62 100644 --- a/src/src/app/components/strongs/strongs.component.ts +++ b/src/src/app/components/strongs/strongs.component.ts @@ -1,5 +1,6 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter,Input, Output } from '@angular/core'; import { BibleReference } from 'src/app/common/bible-reference'; + import { StrongsResult } from '../../models/strongs-state'; @Component({ diff --git a/src/src/app/components/verse-picker-modal/verse-picker-modal.component.ts b/src/src/app/components/verse-picker-modal/verse-picker-modal.component.ts index 0a25f739..59346a64 100644 --- a/src/src/app/components/verse-picker-modal/verse-picker-modal.component.ts +++ b/src/src/app/components/verse-picker-modal/verse-picker-modal.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { Book, BibleReference } from 'src/app/common/bible-reference'; +import { BibleReference,Book } from 'src/app/common/bible-reference'; import { AppService } from 'src/app/services/app.service'; @Component({ diff --git a/src/src/app/components/words/words-card.component.ts b/src/src/app/components/words/words-card.component.ts index aa3e21b6..2bc9c1f0 100644 --- a/src/src/app/components/words/words-card.component.ts +++ b/src/src/app/components/words/words-card.component.ts @@ -1,6 +1,6 @@ -import { Component, ElementRef, ViewChild, ChangeDetectionStrategy } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; import { Clipboard } from '@angular/cdk/clipboard'; +import { ChangeDetectionStrategy,Component, ElementRef, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { BibleReference } from 'src/app/common/bible-reference'; import { CardComponent } from 'src/app/components/card.component'; import { WordLookupResult } from 'src/app/models/words-state'; diff --git a/src/src/app/models/app-state.ts b/src/src/app/models/app-state.ts index 4054710c..ee6ef3eb 100644 --- a/src/src/app/models/app-state.ts +++ b/src/src/app/models/app-state.ts @@ -1,9 +1,9 @@ -import { IStorable } from '../common/storable'; -import { NoteItem } from './note-state'; import { Overlap } from '../common/bible-reference'; -import { CardItem, CardIcons, DataReference } from './card-state'; -import { SavedPage } from './page-state'; import { HashTable } from '../common/hashtable'; +import { IStorable } from '../common/storable'; +import { CardIcons, CardItem, DataReference } from './card-state'; +import { NoteItem } from './note-state'; +import { SavedPage } from './page-state'; export interface AppState { readonly currentSavedPage: SavedPage; diff --git a/src/src/app/models/card-state.ts b/src/src/app/models/card-state.ts index 9fe420de..2804be7e 100644 --- a/src/src/app/models/card-state.ts +++ b/src/src/app/models/card-state.ts @@ -1,7 +1,7 @@ +import { NoteItem } from './note-state'; import { BiblePassageResult } from './passage-state'; import { StrongsResult } from './strongs-state'; import { WordLookupResult } from './words-state'; -import { NoteItem } from './note-state'; export type CardData = BiblePassageResult | StrongsResult | WordLookupResult | NoteItem; diff --git a/src/src/app/pages/notes-admin/notes-admin.page.ts b/src/src/app/pages/notes-admin/notes-admin.page.ts index a30ce40b..1dfaa483 100644 --- a/src/src/app/pages/notes-admin/notes-admin.page.ts +++ b/src/src/app/pages/notes-admin/notes-admin.page.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; -import { CardItem, CardType } from 'src/app/models/card-state'; -import { NoteEditModalComponent } from 'src/app/components/note/edit-modal/note-edit-modal.component'; import { MatDialog } from '@angular/material/dialog'; import { SubscriberBase } from 'src/app/common/subscriber-base'; +import { NoteEditModalComponent } from 'src/app/components/note/edit-modal/note-edit-modal.component'; +import { CardItem, CardType } from 'src/app/models/card-state'; import { AppService } from 'src/app/services/app.service'; import { NavService } from 'src/app/services/nav.service'; diff --git a/src/src/app/pages/search/search.page.ts b/src/src/app/pages/search/search.page.ts index 97e22a66..9583a4d7 100644 --- a/src/src/app/pages/search/search.page.ts +++ b/src/src/app/pages/search/search.page.ts @@ -1,14 +1,15 @@ -import { Component, OnInit, ViewChild, ChangeDetectionStrategy, ElementRef } from '@angular/core'; -import { ActivatedRoute, Router, NavigationEnd } from '@angular/router'; +import { ChangeDetectionStrategy, Component, ElementRef,OnInit, ViewChild } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; +import { MatAutocomplete,MatAutocompleteTrigger } from '@angular/material/autocomplete'; import { MatDialog } from '@angular/material/dialog'; -import { MatAutocompleteTrigger, MatAutocomplete } from '@angular/material/autocomplete'; -import { NavService } from '../../services/nav.service'; +import { ActivatedRoute, NavigationEnd,Router } from '@angular/router'; +import { getFromCardCache } from 'src/app/common/card-cache-operations'; +import { CardItem, CardType } from 'src/app/models/card-state'; +import { AppService } from 'src/app/services/app.service'; + import { SubscriberBase } from '../../common/subscriber-base'; import { VersePickerModalComponent } from '../../components/verse-picker-modal/verse-picker-modal.component'; -import { CardItem, CardType } from 'src/app/models/card-state'; -import { getFromCardCache } from 'src/app/common/card-cache-operations'; -import { AppService } from 'src/app/services/app.service'; +import { NavService } from '../../services/nav.service'; @Component({ selector: 'app-search-page', diff --git a/src/src/app/services/app-state-reducer.spec.ts b/src/src/app/services/app-state-reducer.spec.ts index adcb4087..0aebc312 100644 --- a/src/src/app/services/app-state-reducer.spec.ts +++ b/src/src/app/services/app-state-reducer.spec.ts @@ -1,12 +1,13 @@ import { TestBed } from '@angular/core/testing'; + import { Overlap } from '../common/bible-reference'; -import { Storable, StorableType } from '../common/storable'; -import { CardType, CardItem } from '../models/card-state'; -import { SavedPage } from '../models/page-state'; -import { AppState, User } from '../models/app-state'; import { getCardCacheKey } from '../common/card-cache-operations'; import { MoveDirection } from '../common/move-direction'; +import { Storable, StorableType } from '../common/storable'; +import { AppState, User } from '../models/app-state'; +import { CardItem,CardType } from '../models/card-state'; import { NoteItem } from '../models/note-state'; +import { SavedPage } from '../models/page-state'; import { addCardsAction, addCardToSavedPageAction, diff --git a/src/src/app/services/app.service.ts b/src/src/app/services/app.service.ts index cd8bd8d3..43e8a3de 100644 --- a/src/src/app/services/app.service.ts +++ b/src/src/app/services/app.service.ts @@ -1,39 +1,37 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; - import { UUID } from 'angular2-uuid'; +import { lastValueFrom } from 'rxjs'; +import { moveItem, moveItemUpOrDown } from '../common/array-operations'; +import { BibleReference, Overlap,Section } from '../common/bible-reference'; +import { getFromCardCache,removeFromCardCache, updateInCardCache } from '../common/card-cache-operations'; +import { mergeCardList } from '../common/card-operations'; import { HashTable } from '../common/hashtable'; import { MoveDirection } from '../common/move-direction'; -import { IReducingAction, createReducingService } from '../common/state-service'; +import { createReducingService,IReducingAction } from '../common/state-service'; import { IStorable, Storable, StorableType } from '../common/storable'; -import { mergeCardList } from '../common/card-operations'; -import { updateInCardCache, removeFromCardCache, getFromCardCache } from '../common/card-cache-operations'; -import { moveItem, moveItemUpOrDown } from '../common/array-operations'; -import { Section, BibleReference, Overlap } from '../common/bible-reference'; - -import { SavedPage } from '../models/page-state'; -import { CardType, CardItem, DataReference } from '../models/card-state'; -import { AppState, User, Settings, DisplaySettings, PageSettings, Error } from '../models/app-state'; +import { AppState, DisplaySettings, Error,PageSettings, Settings, User } from '../models/app-state'; +import { CardItem, CardType, DataReference } from '../models/card-state'; import { NoteItem } from '../models/note-state'; +import { SavedPage } from '../models/page-state'; import { - Paragraph, - BiblePassage, - BibleVerse, - BibleParagraphPassage, BibleParagraph, + BibleParagraphPassage, + BiblePassage, BiblePassageResult, + BibleVerse, + Paragraph, } from '../models/passage-state'; import { - StrongsDefinition, - StrongsCrossReference, RMACCrossReference, RMACDefinition, + StrongsCrossReference, + StrongsDefinition, StrongsDictionary, StrongsResult, } from '../models/strongs-state'; -import { WordToStem, IndexResult, WordLookupResult } from '../models/words-state'; -import { lastValueFrom } from 'rxjs'; +import { IndexResult, WordLookupResult,WordToStem } from '../models/words-state'; const initialState: AppState = { user: null, diff --git a/src/src/app/services/migration0to1.service.ts b/src/src/app/services/migration0to1.service.ts index b09df020..cf081137 100644 --- a/src/src/app/services/migration0to1.service.ts +++ b/src/src/app/services/migration0to1.service.ts @@ -2,13 +2,14 @@ import { Injectable } from '@angular/core'; import { AngularFireDatabase, AngularFireObject } from '@angular/fire/compat/database'; import { DataSnapshot } from '@angular/fire/compat/database/interfaces'; import { UUID } from 'angular2-uuid'; + import { Overlap } from '../common/bible-reference'; -import { Settings, User } from '../models/app-state'; -import { SavedPage } from '../models/page-state'; -import { CardType, DataReference } from '../models/card-state'; -import { StorageService } from './storage.service'; import { Storable, StorableType } from '../common/storable'; +import { Settings, User } from '../models/app-state'; +import { CardType, DataReference } from '../models/card-state'; +import { SavedPage } from '../models/page-state'; import { AppService } from './app.service'; +import { StorageService } from './storage.service'; @Injectable({ providedIn: 'root', diff --git a/src/src/app/services/storage.service.ts b/src/src/app/services/storage.service.ts index d5178aea..cb5fb5de 100644 --- a/src/src/app/services/storage.service.ts +++ b/src/src/app/services/storage.service.ts @@ -1,20 +1,19 @@ import { Injectable } from '@angular/core'; -import { StorageMap } from '@ngx-pwa/local-storage'; import { AngularFireDatabase, AngularFireObject } from '@angular/fire/compat/database'; import { DataSnapshot } from '@angular/fire/compat/database/interfaces'; +import { StorageMap } from '@ngx-pwa/local-storage'; +import { createSelector } from 'reselect'; +import { lastValueFrom } from 'rxjs'; -import { SubscriberBase } from '../common/subscriber-base'; +import { isNullOrUndefined } from '../common/helpers'; import { IStorable, StorableType, UserVersion } from '../common/storable'; -import { MigrationVersion0to1 } from './migration0to1.service'; - -import { User, Settings, AppState } from '../models/app-state'; +import { SubscriberBase } from '../common/subscriber-base'; +import { AppState,Settings, User } from '../models/app-state'; +import { DataReference } from '../models/card-state'; import { NoteItem } from '../models/note-state'; import { SavedPage } from '../models/page-state'; -import { isNullOrUndefined } from '../common/helpers'; -import { DataReference } from '../models/card-state'; -import { createSelector } from 'reselect'; import { AppService } from './app.service'; -import { lastValueFrom } from 'rxjs'; +import { MigrationVersion0to1 } from './migration0to1.service'; /** * This class handles all the storage needs of the application. It handles both diff --git a/src/src/test.ts b/src/src/test.ts index caf71351..bb0c8856 100644 --- a/src/src/test.ts +++ b/src/src/test.ts @@ -1,4 +1,5 @@ import 'zone.js/testing'; + import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule,