From e8f1167ec23546c5f159123a2b8c099bc435669a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 14 Dec 2017 23:46:17 -0700 Subject: [PATCH] Organize the shared folder a bit --- web/app/app.module.ts | 12 ++++------ web/app/configs/irc/irc-config.component.ts | 4 ++-- web/app/configs/rss/rss-config.component.ts | 2 +- .../travisci/travisci-config.component.ts | 2 +- .../custom_widget-config.component.ts | 2 +- .../etherpad/etherpad-config.component.ts | 2 +- .../googlecalendar-config.component.ts | 2 +- .../googledocs/googledocs-config.component.ts | 2 +- .../widget/jitsi/jitsi-config.component.ts | 2 +- .../widget/twitch/twitch-config.component.ts | 2 +- web/app/configs/widget/widget.component.ts | 2 +- .../youtube/youtube-config.component.ts | 2 +- web/app/integration/integration.component.ts | 2 +- web/app/riot/riot-home/home.component.ts | 6 ++--- .../scalar-close/scalar-close.component.ts | 2 +- .../toggle-fullscreen.directive.ts | 0 web/app/shared/my-filter.pipe.ts | 13 ---------- web/app/shared/{ => services}/api.service.ts | 2 +- .../{ => services}/integration.service.ts | 24 +++++++++---------- .../shared/{ => services}/irc-api.service.ts | 0 .../shared/{ => services}/scalar.service.ts | 4 ++-- .../generic/generic.component.ts | 2 +- .../widget_wrappers/jitsi/jitsi.component.ts | 2 +- 23 files changed, 39 insertions(+), 54 deletions(-) rename web/app/shared/{ => directives}/toggle-fullscreen.directive.ts (100%) delete mode 100644 web/app/shared/my-filter.pipe.ts rename web/app/shared/{ => services}/api.service.ts (97%) rename web/app/shared/{ => services}/integration.service.ts (76%) rename web/app/shared/{ => services}/irc-api.service.ts (100%) rename web/app/shared/{ => services}/scalar.service.ts (97%) diff --git a/web/app/app.module.ts b/web/app/app.module.ts index bb8bff0..8b5a035 100644 --- a/web/app/app.module.ts +++ b/web/app/app.module.ts @@ -8,20 +8,19 @@ import { routing } from "./app.routing"; import { createNewHosts, removeNgStyles } from "@angularclass/hmr"; import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; import { RiotComponent } from "./riot/riot.component"; -import { ApiService } from "./shared/api.service"; +import { ApiService } from "./shared/services/api.service"; import { UiSwitchModule } from "angular2-ui-switch"; -import { ScalarService } from "./shared/scalar.service"; +import { ScalarService } from "./shared/services/scalar.service"; import { ToasterModule } from "angular2-toaster"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { IntegrationComponent } from "./integration/integration.component"; import { ScalarCloseComponent } from "./riot/scalar-close/scalar-close.component"; -import { IntegrationService } from "./shared/integration.service"; +import { IntegrationService } from "./shared/services/integration.service"; import { BootstrapModalModule } from "ngx-modialog/plugins/bootstrap"; import { ModalModule } from "ngx-modialog"; -import { IrcApiService } from "./shared/irc-api.service"; -import { MyFilterPipe } from "./shared/my-filter.pipe"; +import { IrcApiService } from "./shared/services/irc-api.service"; import { GenericWidgetWrapperComponent } from "./widget_wrappers/generic/generic.component"; -import { ToggleFullscreenDirective } from "./shared/toggle-fullscreen.directive"; +import { ToggleFullscreenDirective } from "./shared/directives/toggle-fullscreen.directive"; import { FullscreenButtonComponent } from "./fullscreen-button/fullscreen-button.component"; import { VideoWidgetWrapperComponent } from "./widget_wrappers/video/video.component"; import { JitsiWidgetWrapperComponent } from "./widget_wrappers/jitsi/jitsi.component"; @@ -56,7 +55,6 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigCo PageHeaderComponent, SpinnerComponent, ScalarCloseComponent, - MyFilterPipe, GenericWidgetWrapperComponent, ToggleFullscreenDirective, FullscreenButtonComponent, diff --git a/web/app/configs/irc/irc-config.component.ts b/web/app/configs/irc/irc-config.component.ts index c6e1e05..4bf0d67 100644 --- a/web/app/configs/irc/irc-config.component.ts +++ b/web/app/configs/irc/irc-config.component.ts @@ -2,10 +2,10 @@ import { Component, OnDestroy } from "@angular/core"; import { IRCIntegration } from "../../shared/models/integration"; import { ModalComponent, DialogRef } from "ngx-modialog"; import { ConfigModalContext } from "../../integration/integration.component"; -import { IrcApiService } from "../../shared/irc-api.service"; +import { IrcApiService } from "../../shared/services/irc-api.service"; import { ToasterService } from "angular2-toaster"; import { IntervalObservable } from "rxjs/observable/IntervalObservable"; -import { ApiService } from "../../shared/api.service"; +import { ApiService } from "../../shared/services/api.service"; import { Subscription } from "rxjs"; @Component({ diff --git a/web/app/configs/rss/rss-config.component.ts b/web/app/configs/rss/rss-config.component.ts index 5a4f642..fdc342b 100644 --- a/web/app/configs/rss/rss-config.component.ts +++ b/web/app/configs/rss/rss-config.component.ts @@ -3,7 +3,7 @@ import { RSSIntegration } from "../../shared/models/integration"; import { ModalComponent, DialogRef } from "ngx-modialog"; import { ConfigModalContext } from "../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; -import { ApiService } from "../../shared/api.service"; +import { ApiService } from "../../shared/services/api.service"; @Component({ selector: "my-rss-config", diff --git a/web/app/configs/travisci/travisci-config.component.ts b/web/app/configs/travisci/travisci-config.component.ts index 6433f59..f755946 100644 --- a/web/app/configs/travisci/travisci-config.component.ts +++ b/web/app/configs/travisci/travisci-config.component.ts @@ -3,7 +3,7 @@ import { TravisCiIntegration } from "../../shared/models/integration"; import { ModalComponent, DialogRef } from "ngx-modialog"; import { ConfigModalContext } from "../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; -import { ApiService } from "../../shared/api.service"; +import { ApiService } from "../../shared/services/api.service"; @Component({ selector: "my-travisci-config", diff --git a/web/app/configs/widget/custom_widget/custom_widget-config.component.ts b/web/app/configs/widget/custom_widget/custom_widget-config.component.ts index 98dc0dd..27c15e6 100644 --- a/web/app/configs/widget/custom_widget/custom_widget-config.component.ts +++ b/web/app/configs/widget/custom_widget/custom_widget-config.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { DialogRef, ModalComponent } from "ngx-modialog"; import { WidgetComponent } from "../widget.component"; -import { ScalarService } from "../../../shared/scalar.service"; +import { ScalarService } from "../../../shared/services/scalar.service"; import { ConfigModalContext } from "../../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; import { WIDGET_CUSTOM } from "../../../shared/models/widget"; diff --git a/web/app/configs/widget/etherpad/etherpad-config.component.ts b/web/app/configs/widget/etherpad/etherpad-config.component.ts index 691c3c1..1afc303 100644 --- a/web/app/configs/widget/etherpad/etherpad-config.component.ts +++ b/web/app/configs/widget/etherpad/etherpad-config.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { DialogRef, ModalComponent } from "ngx-modialog"; import { WidgetComponent } from "../widget.component"; -import { ScalarService } from "../../../shared/scalar.service"; +import { ScalarService } from "../../../shared/services/scalar.service"; import { ConfigModalContext } from "../../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; import { WIDGET_ETHERPAD } from "../../../shared/models/widget"; diff --git a/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts b/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts index 9eae321..6fefa91 100644 --- a/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts +++ b/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { DialogRef, ModalComponent } from "ngx-modialog"; import { WidgetComponent } from "../widget.component"; -import { ScalarService } from "../../../shared/scalar.service"; +import { ScalarService } from "../../../shared/services/scalar.service"; import { ConfigModalContext } from "../../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; import { EditableWidget, WIDGET_GOOGLE_CALENDAR } from "../../../shared/models/widget"; diff --git a/web/app/configs/widget/googledocs/googledocs-config.component.ts b/web/app/configs/widget/googledocs/googledocs-config.component.ts index 6f69e73..74f25e4 100644 --- a/web/app/configs/widget/googledocs/googledocs-config.component.ts +++ b/web/app/configs/widget/googledocs/googledocs-config.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { DialogRef, ModalComponent } from "ngx-modialog"; import { WidgetComponent } from "../widget.component"; -import { ScalarService } from "../../../shared/scalar.service"; +import { ScalarService } from "../../../shared/services/scalar.service"; import { ConfigModalContext } from "../../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; import { WIDGET_GOOGLE_DOCS } from "../../../shared/models/widget"; diff --git a/web/app/configs/widget/jitsi/jitsi-config.component.ts b/web/app/configs/widget/jitsi/jitsi-config.component.ts index 85296c6..fc5a3f1 100644 --- a/web/app/configs/widget/jitsi/jitsi-config.component.ts +++ b/web/app/configs/widget/jitsi/jitsi-config.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { DialogRef, ModalComponent } from "ngx-modialog"; import { WidgetComponent } from "../widget.component"; -import { ScalarService } from "../../../shared/scalar.service"; +import { ScalarService } from "../../../shared/services/scalar.service"; import { ConfigModalContext } from "../../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; import { EditableWidget, WIDGET_JITSI } from "../../../shared/models/widget"; diff --git a/web/app/configs/widget/twitch/twitch-config.component.ts b/web/app/configs/widget/twitch/twitch-config.component.ts index fd94740..e15e2b5 100644 --- a/web/app/configs/widget/twitch/twitch-config.component.ts +++ b/web/app/configs/widget/twitch/twitch-config.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { DialogRef, ModalComponent } from "ngx-modialog"; import { WidgetComponent } from "../widget.component"; -import { ScalarService } from "../../../shared/scalar.service"; +import { ScalarService } from "../../../shared/services/scalar.service"; import { ConfigModalContext } from "../../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; import { EditableWidget, WIDGET_TWITCH } from "../../../shared/models/widget"; diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts index fb19d5a..1821178 100644 --- a/web/app/configs/widget/widget.component.ts +++ b/web/app/configs/widget/widget.component.ts @@ -1,4 +1,4 @@ -import { ScalarService } from "../../shared/scalar.service"; +import { ScalarService } from "../../shared/services/scalar.service"; import { convertScalarWidgetsToDtos, EditableWidget } from "../../shared/models/widget"; import { ToasterService } from "angular2-toaster"; import { Integration } from "../../shared/models/integration"; diff --git a/web/app/configs/widget/youtube/youtube-config.component.ts b/web/app/configs/widget/youtube/youtube-config.component.ts index 6c46820..938f667 100644 --- a/web/app/configs/widget/youtube/youtube-config.component.ts +++ b/web/app/configs/widget/youtube/youtube-config.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { DialogRef, ModalComponent } from "ngx-modialog"; import { WidgetComponent } from "../widget.component"; -import { ScalarService } from "../../../shared/scalar.service"; +import { ScalarService } from "../../../shared/services/scalar.service"; import { ConfigModalContext } from "../../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; import { EditableWidget, WIDGET_YOUTUBE } from "../../../shared/models/widget"; diff --git a/web/app/integration/integration.component.ts b/web/app/integration/integration.component.ts index 60de92c..ba4467a 100644 --- a/web/app/integration/integration.component.ts +++ b/web/app/integration/integration.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { Integration } from "../shared/models/integration"; import { overlayConfigFactory } from "ngx-modialog"; import { BSModalContext, Modal } from "ngx-modialog/plugins/bootstrap"; -import { IntegrationService } from "../shared/integration.service"; +import { IntegrationService } from "../shared/services/integration.service"; export class ConfigModalContext extends BSModalContext { public integration: Integration; diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts index 8f7bfee..3b89dca 100644 --- a/web/app/riot/riot-home/home.component.ts +++ b/web/app/riot/riot-home/home.component.ts @@ -1,11 +1,11 @@ import { Component, ViewChildren } from "@angular/core"; -import { IntegrationService } from "../../shared/integration.service"; +import { IntegrationService } from "../../shared/services/integration.service"; import { IntegrationComponent } from "../../integration/integration.component"; import { ToasterService } from "angular2-toaster"; import { Integration } from "../../shared/models/integration"; import { ActivatedRoute } from "@angular/router"; -import { ApiService } from "../../shared/api.service"; -import { ScalarService } from "../../shared/scalar.service"; +import { ApiService } from "../../shared/services/api.service"; +import { ScalarService } from "../../shared/services/scalar.service"; import * as _ from "lodash"; import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser"; diff --git a/web/app/riot/scalar-close/scalar-close.component.ts b/web/app/riot/scalar-close/scalar-close.component.ts index 707e01d..2c073bc 100644 --- a/web/app/riot/scalar-close/scalar-close.component.ts +++ b/web/app/riot/scalar-close/scalar-close.component.ts @@ -1,5 +1,5 @@ import { Component } from "@angular/core"; -import { ScalarService } from "../../shared/scalar.service"; +import { ScalarService } from "../../shared/services/scalar.service"; @Component({ selector: "my-scalar-close", diff --git a/web/app/shared/toggle-fullscreen.directive.ts b/web/app/shared/directives/toggle-fullscreen.directive.ts similarity index 100% rename from web/app/shared/toggle-fullscreen.directive.ts rename to web/app/shared/directives/toggle-fullscreen.directive.ts diff --git a/web/app/shared/my-filter.pipe.ts b/web/app/shared/my-filter.pipe.ts deleted file mode 100644 index 01dfc4d..0000000 --- a/web/app/shared/my-filter.pipe.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Pipe, PipeTransform } from "@angular/core"; - -@Pipe({ - name: "myFilter", - pure: false -}) -export class MyFilterPipe implements PipeTransform { - transform(items: any[], field: string, value: string): any[] { - if (!items) return []; - if (!value || value.length === 0) return items; - return items.filter(it => it[field].toLowerCase() === value.toLowerCase()); - } -} diff --git a/web/app/shared/api.service.ts b/web/app/shared/services/api.service.ts similarity index 97% rename from web/app/shared/api.service.ts rename to web/app/shared/services/api.service.ts index f080545..b5d3b16 100644 --- a/web/app/shared/api.service.ts +++ b/web/app/shared/services/api.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; import { Http } from "@angular/http"; -import { Integration } from "./models/integration"; +import { Integration } from "../models/integration"; @Injectable() export class ApiService { diff --git a/web/app/shared/integration.service.ts b/web/app/shared/services/integration.service.ts similarity index 76% rename from web/app/shared/integration.service.ts rename to web/app/shared/services/integration.service.ts index c4fe7d2..158a1c6 100644 --- a/web/app/shared/integration.service.ts +++ b/web/app/shared/services/integration.service.ts @@ -1,20 +1,20 @@ import { Injectable } from "@angular/core"; -import { Integration } from "./models/integration"; -import { RssConfigComponent } from "../configs/rss/rss-config.component"; +import { Integration } from "../models/integration"; +import { RssConfigComponent } from "../../configs/rss/rss-config.component"; import { ContainerContent } from "ngx-modialog"; -import { IrcConfigComponent } from "../configs/irc/irc-config.component"; -import { TravisCiConfigComponent } from "../configs/travisci/travisci-config.component"; -import { CustomWidgetConfigComponent } from "../configs/widget/custom_widget/custom_widget-config.component"; -import { YoutubeWidgetConfigComponent } from "../configs/widget/youtube/youtube-config.component"; -import { TwitchWidgetConfigComponent } from "../configs/widget/twitch/twitch-config.component"; -import { EtherpadWidgetConfigComponent } from "../configs/widget/etherpad/etherpad-config.component"; -import { JitsiWidgetConfigComponent } from "../configs/widget/jitsi/jitsi-config.component"; +import { IrcConfigComponent } from "../../configs/irc/irc-config.component"; +import { TravisCiConfigComponent } from "../../configs/travisci/travisci-config.component"; +import { CustomWidgetConfigComponent } from "../../configs/widget/custom_widget/custom_widget-config.component"; +import { YoutubeWidgetConfigComponent } from "../../configs/widget/youtube/youtube-config.component"; +import { TwitchWidgetConfigComponent } from "../../configs/widget/twitch/twitch-config.component"; +import { EtherpadWidgetConfigComponent } from "../../configs/widget/etherpad/etherpad-config.component"; +import { JitsiWidgetConfigComponent } from "../../configs/widget/jitsi/jitsi-config.component"; import { WIDGET_CUSTOM, WIDGET_ETHERPAD, WIDGET_GOOGLE_CALENDAR, WIDGET_GOOGLE_DOCS, WIDGET_JITSI, WIDGET_TWITCH, WIDGET_YOUTUBE -} from "./models/widget"; -import { GoogleDocsWidgetConfigComponent } from "../configs/widget/googledocs/googledocs-config.component"; -import { GoogleCalendarWidgetConfigComponent } from "../configs/widget/googlecalendar/googlecalendar-config.component"; +} from "../models/widget"; +import { GoogleDocsWidgetConfigComponent } from "../../configs/widget/googledocs/googledocs-config.component"; +import { GoogleCalendarWidgetConfigComponent } from "../../configs/widget/googlecalendar/googlecalendar-config.component"; @Injectable() export class IntegrationService { diff --git a/web/app/shared/irc-api.service.ts b/web/app/shared/services/irc-api.service.ts similarity index 100% rename from web/app/shared/irc-api.service.ts rename to web/app/shared/services/irc-api.service.ts diff --git a/web/app/shared/scalar.service.ts b/web/app/shared/services/scalar.service.ts similarity index 97% rename from web/app/shared/scalar.service.ts rename to web/app/shared/services/scalar.service.ts index fd0dd69..0a86582 100644 --- a/web/app/shared/scalar.service.ts +++ b/web/app/shared/services/scalar.service.ts @@ -6,8 +6,8 @@ import { MembershipStateResponse, RoomEncryptionStatusResponse, ScalarSuccessResponse, WidgetsResponse -} from "./models/scalar_responses"; -import { EditableWidget } from "./models/widget"; +} from "../models/scalar_responses"; +import { EditableWidget } from "../models/widget"; @Injectable() export class ScalarService { diff --git a/web/app/widget_wrappers/generic/generic.component.ts b/web/app/widget_wrappers/generic/generic.component.ts index 1239ed1..3957941 100644 --- a/web/app/widget_wrappers/generic/generic.component.ts +++ b/web/app/widget_wrappers/generic/generic.component.ts @@ -1,5 +1,5 @@ import { Component } from "@angular/core"; -import { ApiService } from "../../shared/api.service"; +import { ApiService } from "../../shared/services/api.service"; import { ActivatedRoute } from "@angular/router"; import { DomSanitizer, SafeUrl } from "@angular/platform-browser"; diff --git a/web/app/widget_wrappers/jitsi/jitsi.component.ts b/web/app/widget_wrappers/jitsi/jitsi.component.ts index 9ed696b..b1500e2 100644 --- a/web/app/widget_wrappers/jitsi/jitsi.component.ts +++ b/web/app/widget_wrappers/jitsi/jitsi.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import * as $ from "jquery"; -import { ApiService } from "../../shared/api.service"; +import { ApiService } from "../../shared/services/api.service"; import { JitsiWidgetIntegration } from "../../shared/models/integration"; declare var JitsiMeetExternalAPI: any;