diff --git a/src/app/app.component.ts b/src/app/app.component.ts index f3c7130..0b7c04c 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,14 +1,13 @@ -import { Component, ElementRef, HostBinding, Inject, OnInit, OnDestroy, Renderer2, ViewEncapsulation } from '@angular/core'; +import { Component, ElementRef, Inject, OnInit, OnDestroy, Renderer2, ViewEncapsulation } from '@angular/core'; import { DOCUMENT } from '@angular/common'; import { Platform } from '@angular/cdk/platform'; -import { Subject, Subscription } from 'rxjs'; +import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { NoctuaConfigService } from '@noctua/services/config.service'; import { TranslateService } from '@ngx-translate/core'; import { NoctuaSplashScreenService } from '@noctua/services/splash-screen.service'; import { NoctuaTranslationLoaderService } from '@noctua/services/translation-loader.service'; -import { NgcCookieConsentService, NgcNoCookieLawEvent, NgcStatusChangeEvent } from 'ngx-cookieconsent'; @Component({ @@ -23,18 +22,8 @@ export class AppComponent implements OnInit, OnDestroy { private _unsubscribeAll: Subject; - private popupOpenSubscription!: Subscription; - private popupCloseSubscription!: Subscription; - private initializingSubscription!: Subscription; - private initializedSubscription!: Subscription; - private initializationErrorSubscription!: Subscription; - private statusChangeSubscription!: Subscription; - private revokeChoiceSubscription!: Subscription; - private noCookieLawSubscription!: Subscription; - constructor( - private ccService: NgcCookieConsentService, private translate: TranslateService, private noctuaSplashScreen: NoctuaSplashScreenService, private noctuaTranslationLoader: NoctuaTranslationLoaderService, @@ -63,47 +52,11 @@ export class AppComponent implements OnInit, OnDestroy { .subscribe((config) => { this.noctuaConfig = config; }); - /* - this.popupOpenSubscription = this.ccService.popupOpen$.subscribe( - () => { - // you can use this.ccService.getConfig() to do stuff... - }); - - this.popupCloseSubscription = this.ccService.popupClose$.subscribe( - () => { - // you can use this.ccService.getConfig() to do stuff... - }); - - - this.statusChangeSubscription = this.ccService.statusChange$.subscribe( - (event: NgcStatusChangeEvent) => { - // you can use this.ccService.getConfig() to do stuff... - }); - - this.revokeChoiceSubscription = this.ccService.revokeChoice$.subscribe( - () => { - // you can use this.ccService.getConfig() to do stuff... - }); - - this.noCookieLawSubscription = this.ccService.noCookieLaw$.subscribe( - (event: NgcNoCookieLawEvent) => { - // you can use this.ccService.getConfig() to do stuff... - }); */ } ngOnDestroy() { this._unsubscribeAll.next(); this._unsubscribeAll.complete(); - - // unsubscribe to cookieconsent observables to prevent memory leaks - this.popupOpenSubscription.unsubscribe(); - this.popupCloseSubscription.unsubscribe(); - this.initializingSubscription.unsubscribe(); - this.initializedSubscription.unsubscribe(); - this.initializationErrorSubscription.unsubscribe(); - this.statusChangeSubscription.unsubscribe(); - this.revokeChoiceSubscription.unsubscribe(); - this.noCookieLawSubscription.unsubscribe(); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 64207e7..ad7c810 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -67,9 +67,10 @@ const cookieConfig: NgcCookieConsentConfig = { "theme": "classic", "palette": { "popup": { - "background": "#000000", - "text": "#ffffff", - "link": "#ffffff" + "background": "#ffffff", + "border": "#000000", + "text": "#000000", + // "link": "#ffffff" }, "button": { "background": "#f1d600", diff --git a/src/app/layout/components/footer/footer.component.html b/src/app/layout/components/footer/footer.component.html index 80a8059..358bf80 100644 --- a/src/app/layout/components/footer/footer.component.html +++ b/src/app/layout/components/footer/footer.component.html @@ -11,6 +11,7 @@
  • About
  • Contact Us
  • Annotation Documentation
    • +
  • Cookie Policy
    • diff --git a/src/app/main/apps/annotation/services/annotation.service.ts b/src/app/main/apps/annotation/services/annotation.service.ts index ddb1d01..db17bb4 100644 --- a/src/app/main/apps/annotation/services/annotation.service.ts +++ b/src/app/main/apps/annotation/services/annotation.service.ts @@ -57,8 +57,6 @@ export class AnnotationService { this.annotationNodes = this._buildAnnotationTree(this.annotations); this.dataSource.data = this.annotationNodes; this.onAnnotationTreeChanged.next(this.annotationNodes); - - console.log(this.annotationNodes) }); } diff --git a/src/app/main/apps/snp/snp-detail/snp-detail.component.ts b/src/app/main/apps/snp/snp-detail/snp-detail.component.ts index aee78f1..46fc2e6 100644 --- a/src/app/main/apps/snp/snp-detail/snp-detail.component.ts +++ b/src/app/main/apps/snp/snp-detail/snp-detail.component.ts @@ -35,7 +35,7 @@ export class SnpDetailComponent implements OnInit, OnDestroy { if (!snpRow) { return } - this.rows = this.columnsToRows(snpRow); + this.rows = snpRow; }); } @@ -45,19 +45,6 @@ export class SnpDetailComponent implements OnInit, OnDestroy { this._unsubscribeAll.complete(); } - columnsToRows(snpRow) { - const rows = [...Object.keys(snpRow)].map((name) => { - const detail = this.annotationService.findDetailByName(name); - return { - name: name, - label: detail.label ? detail.label : name, - valueType: detail.value_type, - value: snpRow[name] - } - }); - - return rows; - } mapGOids(valueType, value) { if (!value) { diff --git a/src/app/main/apps/snp/snp-table/snp-table.component.ts b/src/app/main/apps/snp/snp-table/snp-table.component.ts index 87fd109..f6d15ea 100644 --- a/src/app/main/apps/snp/snp-table/snp-table.component.ts +++ b/src/app/main/apps/snp/snp-table/snp-table.component.ts @@ -130,8 +130,16 @@ export class SnpTableComponent implements OnInit { } selectSnp(row) { - this.snpService.onSnpChanged.next(row); - + const details = this.snpPage.source.map((key) => { + const detail = this.annotationService.findDetailByName(key); + return { + name: key, + label: detail.label ? detail.label : key, + valueType: detail.value_type, + value: row[key] + } + }); + this.snpService.onSnpChanged.next(details); this.noctuaMenuService.openRightDrawer(); } diff --git a/src/app/main/pages/contact/contact.component.spec.ts b/src/app/main/pages/contact/contact.component.spec.ts deleted file mode 100644 index 427633e..0000000 --- a/src/app/main/pages/contact/contact.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ContactComponent } from './contact.component'; - -describe('ContactComponent', () => { - let component: ContactComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ContactComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ContactComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/main/pages/cookie-policy/cookie-policy.component.html b/src/app/main/pages/cookie-policy/cookie-policy.component.html new file mode 100644 index 0000000..abe5b83 --- /dev/null +++ b/src/app/main/pages/cookie-policy/cookie-policy.component.html @@ -0,0 +1,88 @@ +
    + +
    +
    +

    Cookie Policy for AnnoQ Site

    + +

    This is the Cookie Policy for AnnoQ Site

    + +

    What Are Cookies

    + +

    As is common practice with almost all professional websites this site uses cookies, which are tiny files that + are + downloaded to your computer, to improve your experience. This page describes what information they gather, how + we use + it and why we sometimes need to store these cookies. We will also share how you can prevent these cookies from + being + stored however this may downgrade or 'break' certain elements of the sites functionality.

    + +

    How We Use Cookies

    + +

    We use cookies for a variety of reasons detailed below. Unfortunately in most cases there are no industry + standard + options for disabling cookies without completely disabling the functionality and features they add to this site. + It is + recommended that you leave on all cookies if you are not sure whether you need them or not in case they are used + to + provide a service that you use.

    + +

    Disabling Cookies

    + +

    You can prevent the setting of cookies by adjusting the settings on your browser (see your browser Help for how + to do + this). Be aware that disabling cookies will affect the functionality of this and many other websites that you + visit. + Disabling cookies will usually result in also disabling certain functionality and features of the this site. + Therefore + it is recommended that you do not disable cookies.

    +

    The Cookies We Set

    + +
      +
    • +

      Site preferences cookies

      +

      In order to provide you with a great experience on this site we provide the functionality to set your + preferences + for how this site runs when you use it. In order to remember your preferences we need to set cookies so that + this + information can be called whenever you interact with a page is affected by your preferences.

      +
      • +
    +

    Third Party Cookies

    + +

    In some special cases we also use cookies provided by trusted third parties. The following section details + which + third party cookies you might encounter through this site.

    + +
      +
    • +

      This site uses Google Analytics which is one of the most widespread and trusted analytics solution on the + web for + helping us to understand how you use the site and ways that we can improve your experience. These cookies + may + track things such as how long you spend on the site and the pages that you visit so we can continue to + produce + engaging content.

      +

      For more information on Google Analytics cookies, see the official Google Analytics page.

      +
      • +
    + +

    More Information

    + +

    Hopefully that has clarified things for you and as was previously mentioned if there is something that you + aren't + sure whether you need or not it's usually safer to leave cookies enabled in case it does interact with one of + the + features you use on our site.

    + +

    However if you are still looking for more information then you can contact us through one of our preferred + contact + methods:

    + + +
    +
    + +
    \ No newline at end of file diff --git a/src/app/main/pages/cookie-policy/cookie-policy.component.scss b/src/app/main/pages/cookie-policy/cookie-policy.component.scss new file mode 100644 index 0000000..9cec150 --- /dev/null +++ b/src/app/main/pages/cookie-policy/cookie-policy.component.scss @@ -0,0 +1,42 @@ +@import "src/@noctua/scss/noctua"; +@import "src/@noctua.common/scss/noctua.common"; + +:host { + .annoq-sm-container { + width: 800px; + } + + .annoq-section { + padding: 40px 10px; + + .annoq-heading { + margin: 0 auto; + width: 800px; + + h3 { + font-size: 28px; + } + } + + h1 { + font-size: 40px; + } + + h2 { + font-size: 30px; + } + + &.section-1 { + background-color: #fff; + } + + &.section-2 { + background-color: rgba($annoq-primary-color, 0.1); + } + } + + p { + font-size: 18px; + line-height: 24px; + } +} diff --git a/src/app/main/pages/cookie-policy/cookie-policy.component.ts b/src/app/main/pages/cookie-policy/cookie-policy.component.ts new file mode 100644 index 0000000..97a6eb0 --- /dev/null +++ b/src/app/main/pages/cookie-policy/cookie-policy.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-cookie-policy', + templateUrl: './cookie-policy.component.html', + styleUrls: ['./cookie-policy.component.scss'] +}) +export class CookiePolicyComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/main/pages/home/home.component.html b/src/app/main/pages/home/home.component.html index 40782e0..bc73940 100644 --- a/src/app/main/pages/home/home.component.html +++ b/src/app/main/pages/home/home.component.html @@ -32,8 +32,13 @@

    -
    - +
    + + +
    @@ -55,7 +60,7 @@

    - 400+ + 600+
    Supported Annotation Types More Details @@ -66,18 +71,6 @@

    - -

    Interactive Query Access

    @@ -327,7 +320,7 @@

    We recommend the services of our trusted resources

    Browser Compatibility Summary

    - For more details on AnnoQ’s browser support and future work, please check out + For more details on AnnoQ's browser support and future work, please check out more details diff --git a/src/app/main/pages/home/home.component.scss b/src/app/main/pages/home/home.component.scss index fdffd88..5ed3bc4 100644 --- a/src/app/main/pages/home/home.component.scss +++ b/src/app/main/pages/home/home.component.scss @@ -19,14 +19,14 @@ background-position: top; position: relative; flex: 1 0 auto; - height: 500px; + height: 450px; min-width: 800px; text-align: center; overflow: hidden; @include media-breakpoint("lt-md") { - height: 200px; - min-width: 600px; + // height: 200px; + // min-width: 600px; } .annoq-container { @@ -74,13 +74,19 @@ color: rgba(#ffffff, 0.8); } - .annoq-image { - height: 500px; + .annoq-video { + padding-top: 30px; + height: 450px; overflow: hidden; img { height: 100%; } + + iframe { + width: 600px; + height: calc(600px / 1.77); + } } } diff --git a/src/app/main/pages/pages.module.ts b/src/app/main/pages/pages.module.ts index f99710e..4ac4efd 100644 --- a/src/app/main/pages/pages.module.ts +++ b/src/app/main/pages/pages.module.ts @@ -12,6 +12,7 @@ import { NoctuaFooterModule } from 'app/layout/components/footer/footer.module'; import { PublicationComponent } from './publication/publication.component'; import { ContactComponent } from './contact/contact.component'; import { NoctuaConfirmDialogModule } from '@noctua/components/confirm-dialog/confirm-dialog.module'; +import { CookiePolicyComponent } from './cookie-policy/cookie-policy.component'; const routes = [{ path: '', component: HomeComponent @@ -23,6 +24,8 @@ const routes = [{ path: 'detail', component: DetailComponent }, { path: 'about', component: AboutComponent +}, { + path: 'cookie-policy', component: CookiePolicyComponent }]; @NgModule({ @@ -33,6 +36,7 @@ const routes = [{ DetailComponent, PublicationComponent, ContactComponent, + CookiePolicyComponent, ], imports: [ RouterModule.forChild(routes),