Skip to content

Commit

Permalink
added words to the cookie policy page and links
Browse files Browse the repository at this point in the history
  • Loading branch information
tmushayahama committed Mar 12, 2022
1 parent f1ea93d commit 3bcec74
Show file tree
Hide file tree
Showing 7 changed files with 137 additions and 101 deletions.
51 changes: 2 additions & 49 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -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({
Expand All @@ -23,18 +22,8 @@ export class AppComponent implements OnInit, OnDestroy {

private _unsubscribeAll: Subject<any>;

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,
Expand Down Expand Up @@ -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();
}


Expand Down
2 changes: 1 addition & 1 deletion src/app/layout/components/footer/footer.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<li><a [routerLink]="['/about']">About</a></li>
<li><a [routerLink]="['/contact']">Contact Us</a></li>
<li><a href="https://uscbiostats.github.io/annoq-site/" target="_blank">Annotation Documentation</a></li>
<li><a [routerLink]="['/contact']">Cookie Policy</a></li>
<li><a [routerLink]="['/cookie-policy']">Cookie Policy</a></li>
</ul>
</div>
</div>
Expand Down
25 changes: 0 additions & 25 deletions src/app/main/pages/contact/contact.component.spec.ts

This file was deleted.

89 changes: 88 additions & 1 deletion src/app/main/pages/cookie-policy/cookie-policy.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,88 @@
<p>cookie-policy works!</p>
<div class="w-100-p" noctuaPerfectScrollbar>

<div class="annoq-section section-1">
<div class="annoq-container annoq-sm-container" fxLayout="column" fxLayoutAlign="start stretch">
<h1>Cookie Policy for AnnoQ Site</h1>

<p>This is the Cookie Policy for AnnoQ Site</p>

<p><strong>What Are Cookies</strong></p>

<p>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.</p>

<p><strong>How We Use Cookies</strong></p>

<p>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.</p>

<p><strong>Disabling Cookies</strong></p>

<p>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.</p>
<p><strong>The Cookies We Set</strong></p>

<ul>
<li>
<p>Site preferences cookies</p>
<p>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.</p>
</li>
</ul>
<p><strong>Third Party Cookies</strong></p>

<p>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.</p>

<ul>
<li>
<p>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.</p>
<p>For more information on Google Analytics cookies, see the official Google Analytics page.</p>
</li>
</ul>

<p><strong>More Information</strong></p>

<p>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.</p>

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

<ul>
<li>Email: <a href="mailto:[email protected]" target="_blank">Email US: [email protected]</a></li>

</ul>
</div>
</div>
<annoq-footer></annoq-footer>
</div>
42 changes: 42 additions & 0 deletions src/app/main/pages/cookie-policy/cookie-policy.component.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
25 changes: 0 additions & 25 deletions src/app/main/pages/cookie-policy/cookie-policy.component.spec.ts

This file was deleted.

4 changes: 4 additions & 0 deletions src/app/main/pages/pages.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,6 +24,8 @@ const routes = [{
path: 'detail', component: DetailComponent
}, {
path: 'about', component: AboutComponent
}, {
path: 'cookie-policy', component: CookiePolicyComponent
}];

@NgModule({
Expand All @@ -33,6 +36,7 @@ const routes = [{
DetailComponent,
PublicationComponent,
ContactComponent,
CookiePolicyComponent,
],
imports: [
RouterModule.forChild(routes),
Expand Down

0 comments on commit 3bcec74

Please sign in to comment.