.gitlab-ci.yml

@@ -229,7 +229,7 @@ review:start:
   image: minds/helm-eks:latest
   script:
     - aws eks update-kubeconfig --name=sandbox
-    - git clone --branch=sandbox-wip https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/minds/helm-charts.git
+    - git clone --branch=master https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/minds/helm-charts.git
     - "helm upgrade \
       --install \
       --reuse-values \

cypress/integration/discovery.spec.js

@@ -116,18 +116,47 @@ context('Discovery', () => {
     cy.get("m-topbar--navigation--options ul > m-nsfw-selector ul > li:contains('Other')").click();
   });  
 
-  it('should allow the user to filter by a single hashtag', () => {
+  it('should allow the user to turn off single hashtag filter and view all posts', () => {
     cy.visit('/newsfeed/global/top');
     cy.get('m-hashtagssidebarselector__item')
       .first()
       .click();
   });
-
-  it('should allow the user to turn off single hashtag filter and view all posts', () => {
+  
+  it.skip('should allow the user to toggle a single hashtag and then toggle back to the initial feed', () => {
     cy.visit('/newsfeed/global/top');
-    cy.get('m-hashtagssidebarselector__item')
-      .first()
-      .find('.m-hashtagsSidebarSelectorList__visibility > i')
-      .click();
-  })
+
+    // get first label value
+    cy.get('.m-hashtagsSidebarSelectorList__label').first().invoke('text').then((text) => {
+      // repeat twice to capture full cycle.
+      Cypress._.times(2, (i) => {
+
+        // split hashtag off of label text
+        let label = text.split('#')[1];
+
+        // click switch 
+        toggleFirstVisibilitySwitch();
+        
+        // check location name has updated
+        cy.location('pathname')
+          .should('eq', `/newsfeed/global/top;period=12h;hashtag=${label}`);
+
+        // click switch 
+        toggleFirstVisibilitySwitch();
+        
+        // check location name has updated
+        cy.location('pathname')
+          .should('eq', `/newsfeed/global/top;period=12h`);
+      });
+    });
+  });
+
+  // click first visibility switch 
+  const toggleFirstVisibilitySwitch = () => {
+      cy.get('m-hashtagssidebarselector__item')
+        .first()
+        .find('.m-hashtagsSidebarSelectorList__visibility > i')
+        .click();
+  }
+
 })

cypress/integration/newsfeed.spec.js

@@ -661,4 +661,56 @@ context('Newsfeed', () => {
       });
   });
 
+  // enable once failing tests are fixed
+  it.skip('should post an nsfw activity when value is held by the selector (is blue) but it has not been clicked yet', () => {
+
+    // click on nsfw dropdown
+    cy.get(
+      'minds-newsfeed-poster m-nsfw-selector .m-dropdown--label-container'
+    ).click();
+
+    // select Nudity
+    cy.get('minds-newsfeed-poster m-nsfw-selector .m-dropdownList__item')
+      .contains('Nudity')
+      .click();
+
+    // click away
+    cy.get('minds-newsfeed-poster m-nsfw-selector .minds-bg-overlay').click();
+
+    // navigate away from newsfeed and back.
+    cy.get('[data-cy=data-minds-nav-wallet-button]').first().click(); // bottom bar exists, so take first child 
+    cy.get('[data-cy=data-minds-nav-newsfeed-button]').first().click(); 
+
+    newActivityContent('This is a nsfw post');
+
+    postActivityAndAwaitResponse(200);
+
+    // should have the mature text toggle
+    cy.get(
+      '.minds-list > minds-activity:first-child .message .m-mature-text-toggle'
+    ).should('not.have.class', 'mdl-color-text--red-500');
+    cy.get(
+      '.minds-list > minds-activity:first-child .message .m-mature-message-content'
+    ).should('have.class', 'm-mature-text');
+
+    // click the toggle
+    cy.get(
+      '.minds-list > minds-activity:first-child .message .m-mature-text-toggle'
+    ).click();
+
+    // text should be visible now
+    cy.get(
+      '.minds-list > minds-activity:first-child .message .m-mature-text-toggle'
+    ).should('have.class', 'mdl-color-text--red-500');
+    cy.get(
+      '.minds-list > minds-activity:first-child .message .m-mature-message-content'
+    ).should('not.have.class', 'm-mature-text');
+
+    cy.get(
+      '.minds-list > minds-activity:first-child .message .m-mature-message-content'
+    ).contains('This is a nsfw post');
+
+    deleteActivityFromNewsfeed();
+  });
+
 });

src/app/app.component.html

@@ -33,6 +33,7 @@
     [class.has-v2-navbar]="featuresService.has('top-feeds')"
     [class.is-pro-domain]="isProDomain"
   >
+    <m-emailConfirmation></m-emailConfirmation>
     <m-announcement [id]="'blockchain:sale'" *ngIf="false">
       <span
         class="m-blockchain--wallet-address-notice--action"

src/app/common/common.module.ts

 import { NgModule } from '@angular/core';
 import { CommonModule as NgCommonModule } from '@angular/common';
-import { RouterModule, Router } from '@angular/router';
+import { RouterModule, Router, Routes } from '@angular/router';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { MINDS_PIPES } from './pipes/pipes';
@@ -129,9 +129,17 @@ import { SsoService } from './services/sso.service';
 import { V2TopbarService } from './layout/v2-topbar/v2-topbar.service';
 import { DateDropdownsComponent } from './components/date-dropdowns/date-dropdowns.component';
 import { SidebarMarkersService } from './layout/sidebar/markers.service';
+import { EmailConfirmationComponent } from './components/email-confirmation/email-confirmation.component';
 
 PlotlyModule.plotlyjs = PlotlyJS;
 
+const routes: Routes = [
+  {
+    path: 'email-confirmation',
+    redirectTo: '/',
+  },
+];
+
 @NgModule({
   imports: [
     NgCommonModule,
@@ -140,6 +148,7 @@ PlotlyModule.plotlyjs = PlotlyJS;
     FormsModule,
     ReactiveFormsModule,
     PlotlyModule,
+    RouterModule.forChild(routes),
   ],
   declarations: [
     MINDS_PIPES,
@@ -244,6 +253,7 @@ PlotlyModule.plotlyjs = PlotlyJS;
     FormDescriptorComponent,
     FormToastComponent,
     ShadowboxSubmitButtonComponent,
+    EmailConfirmationComponent,
     DateDropdownsComponent,
   ],
   exports: [
@@ -344,6 +354,7 @@ PlotlyModule.plotlyjs = PlotlyJS;
     FormDescriptorComponent,
     FormToastComponent,
     ShadowboxSubmitButtonComponent,
+    EmailConfirmationComponent,
     DateDropdownsComponent,
   ],
   providers: [

src/app/common/components/announcements/announcement.component.scss

@@ -67,4 +67,9 @@ m-announcement {
       }
     }
   }
+
+  .m-announcement__clickable {
+    cursor: pointer;
+    font-weight: bold;
+  }
 }

src/app/common/components/announcements/announcement.component.ts

@@ -14,7 +14,7 @@ import { Client } from '../../../services/api';
         <ng-content></ng-content>
       </div>
 
-      <div class="m-announcement--close" (click)="close()">
+      <div class="m-announcement--close" *ngIf="canClose" (click)="close()">
         <i class="material-icons">close</i>
       </div>
     </div>
@@ -24,6 +24,8 @@ export class AnnouncementComponent {
   minds: Minds = window.Minds;
   hidden: boolean = false;
   @Input() id: string = 'default';
+  @Input() canClose: boolean = true;
+  @Input() remember: boolean = true;
 
   constructor(private storage: Storage) {}
 
@@ -32,7 +34,10 @@ export class AnnouncementComponent {
   }
 
   close() {
-    this.storage.set('hide-announcement:' + this.id, true);
+    if (this.remember) {
+      this.storage.set('hide-announcement:' + this.id, true);
+    }
+
     this.hidden = true;
   }
 }

src/app/common/components/chart-v2/chart-v2.component.html

@@ -32,25 +32,31 @@
         {{ hoverInfo.date | utcDate | date: datePipe }}
       </div>
       <div
-        [ngSwitch]="rawData?.unit"
+        *ngFor="let value of hoverInfo.values"
         class="m-chartV2__hoverInfo__row--primary"
       >
-        <ng-template ngSwitchCase="number">
-          {{ hoverInfo.value | number: '1.0-0' | abbr }}
-          {{ rawData.label | lowercase }}
-        </ng-template>
-        <ng-template ngSwitchCase="usd">
-          {{ hoverInfo.value | currency }} USD
-        </ng-template>
-        <ng-template ngSwitchCase="eth">
-          {{ hoverInfo.value | number: '1.3-3' }} ETH
-        </ng-template>
-        <ng-template ngSwitchCase="tokens">
-          {{ hoverInfo.value | number: '1.1-3' }} Tokens
-        </ng-template>
-        <ng-template ngSwitchDefault>
-          {{ hoverInfo.value | number: '1.0-3' }} {{ rawData?.unit }}
-        </ng-template>
+        <span
+          class="m-chartV2__hoverInfoRow__hex"
+          [style.background-color]="value.color"
+        ></span>
+        <ng-container [ngSwitch]="rawData?.unit">
+          <ng-template ngSwitchCase="number">
+            {{ value.value | number: '1.0-0' | abbr }}
+            {{ value.label | lowercase }}
+          </ng-template>
+          <ng-template ngSwitchCase="usd">
+            {{ value.value | currency }} USD
+          </ng-template>
+          <ng-template ngSwitchCase="eth">
+            {{ value.value | number: '1.3-3' }} ETH
+          </ng-template>
+          <ng-template ngSwitchCase="tokens">
+            {{ value.value | number: '1.1-3' }} Tokens
+          </ng-template>
+          <ng-template ngSwitchDefault>
+            {{ value.value | number: '1.0-3' }} {{ rawData?.unit }}
+          </ng-template>
+        </ng-container>
       </div>
       <div class="m-chartV2__hoverInfo__row" *ngIf="isComparison">
         vs

src/app/common/components/chart-v2/chart-v2.component.scss

@@ -58,6 +58,14 @@ m-chartV2 {
     }
   }
 
+  .m-chartV2__hoverInfoRow__hex {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    margin-right: 2px;
+    border-radius: 50%;
+  }
+
   .m-chartV2__hoverInfo__closeBtn {
     display: none;
     font-size: 15px;

src/app/common/components/chart-v2/chart-v2.component.ts

@@ -76,11 +76,11 @@ export class ChartV2Component implements OnInit, OnDestroy {
       ? this.rawData.visualisation.segments.slice(0, 1)
       : this.rawData.visualisation.segments;
     if (this.segments.length === 2) {
-      this.isComparison = true;
+      // this.isComparison = true;
       // Reverse the segments so comparison line is layered behind current line
-      this.segments.reverse();
+      // this.segments.reverse();
       // Current line should be blue, not grey
-      this.swapSegmentColors();
+      // this.swapSegmentColors();
       this.detectChanges();
     }
     this.themeSubscription = this.themeService.isDark$.subscribe(isDark => {
@@ -172,12 +172,12 @@ export class ChartV2Component implements OnInit, OnDestroy {
         y: this.unpack(this.segments[i].buckets, 'value'),
       };
 
+      if (this.segments[i].comparison) {
+        segment.line.dash = 'dot';
+      }
+
       this.data[i] = segment;
     });
-
-    if (this.isComparison) {
-      this.data[0].line.dash = 'dot';
-    }
   }
 
   setLayout() {
@@ -309,24 +309,37 @@ export class ChartV2Component implements OnInit, OnDestroy {
   }
 
   populateHoverInfo() {
-    const pt = this.isComparison ? 1 : 0;
     // TODO: format value strings here and remove ngSwitch from template?
-    this.hoverInfo['date'] = this.segments[pt].buckets[this.hoverPoint].date;
+    this.hoverInfo['date'] = this.segments[0].buckets[this.hoverPoint].date;
     this.hoverInfo['value'] =
       this.rawData.unit !== 'usd'
-        ? this.segments[pt].buckets[this.hoverPoint].value
-        : this.segments[pt].buckets[this.hoverPoint].value / 100;
-
-    if (this.isComparison && this.segments[1]) {
-      this.hoverInfo['comparisonValue'] =
-        this.rawData.unit !== 'usd'
-          ? this.segments[0].buckets[this.hoverPoint].value
-          : this.segments[0].buckets[this.hoverPoint].value / 100;
-
-      this.hoverInfo['comparisonDate'] = this.segments[0].buckets[
-        this.hoverPoint
-      ].date;
+        ? this.segments[0].buckets[this.hoverPoint].value
+        : this.segments[0].buckets[this.hoverPoint].value / 100;
+
+    this.hoverInfo['values'] = [];
+
+    for (const pt in this.segments) {
+      const segment = this.segments[pt];
+      this.hoverInfo['values'][pt] = {
+        value:
+          this.rawData.unit !== 'usd'
+            ? segment.buckets[this.hoverPoint].value
+            : segment.buckets[this.hoverPoint].value / 100,
+        label: segment.label || this.rawData.label,
+        color: this.getColor(chartPalette.segmentColorIds[pt]),
+      };
     }
+
+    // if (this.isComparison && this.segments[1]) {
+    //   this.hoverInfo['comparisonValue'] =
+    //     this.rawData.unit !== 'usd'
+    //       ? this.segments[0].buckets[this.hoverPoint].value
+    //       : this.segments[0].buckets[this.hoverPoint].value / 100;
+    //
+    //   this.hoverInfo['comparisonDate'] = this.segments[0].buckets[
+    //     this.hoverPoint
+    //   ].date;
+    // }
   }
 
   positionHoverInfo($event) {

src/app/common/components/email-confirmation/email-confirmation.component.html

+<ng-container *ngIf="shouldShow">
+  <m-announcement
+    id="email-confirmation"
+    [canClose]="canClose"
+    [remember]="false"
+  >
+    Please confirm your email address.
+    <ng-container *ngIf="!sent"
+      >Didn't get it?
+      <span class="m-announcement__clickable" (click)="send()"
+        >Click here to send again.</span
+      ></ng-container
+    >
+  </m-announcement>
+</ng-container>

src/app/common/components/email-confirmation/email-confirmation.component.ts

+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { EmailConfirmationService } from './email-confirmation.service';
+import { Session } from '../../../services/session';
+import { Subscription } from 'rxjs';
+
+/**
+ * Component that displays an announcement-like banner
+ * asking the user to confirm their email address and a link
+ * to re-send the confirmation email.
+ * @see AnnouncementComponent
+ */
+@Component({
+  providers: [EmailConfirmationService],
+  selector: 'm-emailConfirmation',
+  templateUrl: 'email-confirmation.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class EmailConfirmationComponent implements OnInit, OnDestroy {
+  sent: boolean = false;
+  shouldShow: boolean = false;
+  canClose: boolean = false;
+
+  protected userEmitter$: Subscription;
+  protected canCloseTimer: number;
+  protected minds = window.Minds;
+
+  constructor(
+    protected service: EmailConfirmationService,
+    protected session: Session,
+    protected cd: ChangeDetectorRef
+  ) {}
+
+  ngOnInit(): void {
+    this.setShouldShow(this.session.getLoggedInUser());
+
+    this.userEmitter$ = this.session.userEmitter.subscribe(user => {
+      this.sent = false;
+      this.setShouldShow(user);
+
+      this.detectChanges();
+    });
+
+    this.canCloseTimer = window.setTimeout(() => {
+      this.canClose = true;
+      this.detectChanges();
+    }, 3000);
+  }
+
+  ngOnDestroy(): void {
+    window.clearTimeout(this.canCloseTimer);
+
+    if (this.userEmitter$) {
+      this.userEmitter$.unsubscribe();
+    }
+  }
+
+  /**
+   * Re-calculates the visibility of the banner
+   * @param {Object} user
+   */
+  setShouldShow(user): void {
+    this.shouldShow =
+      !this.minds.from_email_confirmation &&
+      user &&
+      user.email_confirmed === false;
+  }
+
+  /**
+   * Uses the service to re-send the confirmation email
+   */
+  async send(): Promise<void> {
+    this.sent = true;
+    this.detectChanges();
+
+    try {
+      const sent = await this.service.send();
+
+      if (!sent) {
+        this.sent = false;
+      }
+    } catch (e) {}
+
+    this.detectChanges();
+  }
+
+  detectChanges(): void {
+    this.cd.markForCheck();
+    this.cd.detectChanges();
+  }
+}

src/app/common/components/email-confirmation/email-confirmation.service.ts

+import { Injectable } from '@angular/core';
+import { Client } from '../../../services/api/client';
+
+/**
+ * API implementation service for Email Confirmation component
+ * @see EmailConfirmationComponent
+ */
+@Injectable()
+export class EmailConfirmationService {
+  constructor(protected client: Client) {}
+
+  /**
+   * Attempts to re-send the confirmation email to the current logged in user
+   */
+  async send(): Promise<boolean> {
+    const response = (await this.client.post(
+      'api/v2/email/confirmation/resend',
+      {}
+    )) as any;
+
+    return Boolean(response && response.sent);
+  }
+}

src/app/common/layout/v2-topbar/user-menu.component.html

@@ -43,7 +43,6 @@
     <li
       class="m-dropdownList__item m-user-menuDropdown__Item"
       (click)="closeMenu()"
-      *ngIf="getCurrentUser()?.pro"
     >
       <a routerLink="/analytics/dashboard/traffic">
         <i class="material-icons">timeline</i>

src/app/common/layout/v2-topbar/v2-topbar.component.html

@@ -5,6 +5,7 @@
     routerLinkActive="m-v2-topbarNav__Item--active"
     title="Newsfeed"
     i18n-title
+    data-cy="data-minds-nav-newsfeed-button"
   >
     <i class="material-icons">home</i>
     <span class="m-v2-topbarNavItem__Text" i18n>Newsfeed</span>
@@ -16,6 +17,7 @@
     routerLinkActive="m-v2-topbarNav__Item--active"
     title="Discovery"
     i18n-title
+    data-cy="data-minds-nav-discovery-button"
   >
     <i class="material-icons">search</i>
     <span class="m-v2-topbarNavItem__Text" i18n>Discovery</span>
@@ -27,6 +29,7 @@
     routerLinkActive="m-v2-topbarNav__Item--active"
     title="Wallet"
     i18n-title
+    data-cy="data-minds-nav-wallet-button"
   >
     <i class="material-icons">account_balance</i>
     <span class="m-v2-topbarNavItem__Text" i18n>Wallet</span>

src/app/modules/analytics/v2/dashboard.component.html

@@ -32,10 +32,10 @@
         class="m-analyticsDashboard__description"
         *ngIf="description$ | async as description"
       >
-        {{ description }}
         <ng-container *ngIf="(category$ | async) === 'earnings'">
-          <a *ngIf="!session.getLoggedInUser().pro" routerLink="/pro"
-            >Upgrade to Pro</a
+          <span *ngIf="!session.getLoggedInUser().pro">
+            In order to start earning,
+            <a routerLink="/pro">upgrade to Pro</a>.</span
           >
           <a
             *ngIf="
@@ -49,6 +49,7 @@
             >Enable payouts</a
           >
         </ng-container>
+        {{ description }}
       </p>
       <m-analytics__layout--chart
         m-dashboardLayout__body

src/app/modules/channels/explicit-overlay/overlay.component.html

-<div class="m-channel--explicit-overlay--content">
-  <h3>
-    This channel contains mature content
-  </h3>
-  <div
-    class="m-btn m-btn--slim m-btn--action m-channel--explicit-overlay--action"
-    (click)="disableFilter()"
-  >
-    View
+<div class="m-channel--explicit-overlay--container" *ngIf="!hidden">
+  <div class="m-channel--explicit-overlay--content">
+    <h3>
+      This channel contains content that is NSFW
+    </h3>
+    <div
+      class="m-btn m-btn--slim m-btn--action m-channel--explicit-overlay--action"
+      (click)="disableFilter()"
+    >
+      View
+    </div>
   </div>
 </div>

src/app/modules/channels/explicit-overlay/overlay.component.scss

-m-channel--explicit-overlay {
+.m-channel--explicit-overlay--container {
   display: flex;
   justify-content: center;
   align-items: center;

src/app/modules/channels/explicit-overlay/overlay.component.spec.ts

+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ExplicitOverlayComponent } from './overlay.component';
+import { Session } from '../../../services/session';
+import { sessionMock } from '../../../../tests/session-mock.spec';
+import { Storage } from '../../../services/storage';
+import { Router } from '@angular/router';
+import { storageMock } from '../../../../tests/storage-mock.spec';
+
+let routerMock = new (function() {
+  this.navigate = jasmine.createSpy('navigate');
+})();
+
+describe('OverlayComponent', () => {
+  let comp: ExplicitOverlayComponent;
+  let fixture: ComponentFixture<ExplicitOverlayComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ExplicitOverlayComponent],
+      imports: [],
+      providers: [
+        { provide: Storage, useValue: storageMock },
+        { provide: Session, useValue: sessionMock },
+        { provide: Router, useValue: routerMock },
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(done => {
+    jasmine.MAX_PRETTY_PRINT_DEPTH = 10;
+    jasmine.clock().uninstall();
+    jasmine.clock().install();
+
+    fixture = TestBed.createComponent(ExplicitOverlayComponent);
+    comp = fixture.componentInstance;
+
+    comp.hidden = true;
+
+    fixture.detectChanges();
+
+    if (fixture.isStable()) {
+      done();
+    } else {
+      fixture.whenStable().then(() => {
+        done();
+      });
+    }
+  });
+
+  afterEach(() => {
+    jasmine.clock().uninstall();
+  });
+
+  it('should not show overlay when mature visibility is set', () => {
+    comp.channel = {
+      mature_visibility: true,
+    };
+    comp.showOverlay();
+    fixture.detectChanges();
+    expect(comp.hidden).toBeTruthy();
+  });
+
+  it('should overlay when channel is mature', () => {
+    comp._channel = {
+      is_mature: true,
+    };
+    comp.showOverlay();
+    fixture.detectChanges();
+    expect(comp.hidden).toBeFalsy();
+  });
+
+  it('should overlay when channel is nsfw for one reason', () => {
+    comp._channel = {
+      nsfw: [1],
+    };
+    comp.showOverlay();
+    fixture.detectChanges();
+    expect(comp.hidden).toBeFalsy();
+  });
+
+  it('should overlay when channel is nsfw for multiple reason', () => {
+    comp._channel = {
+      nsfw: [1, 2, 3],
+    };
+    comp.showOverlay();
+    fixture.detectChanges();
+    expect(comp.hidden).toBeFalsy();
+  });
+
+  it('should overlay not show overlay if channel is not nsfw, mature and no mature_visibility', () => {
+    comp._channel = {
+      mature_visibility: false,
+      is_mature: false,
+      nsfw: [],
+    };
+    comp.showOverlay();
+    fixture.detectChanges();
+    expect(comp.hidden).toBeTruthy();
+  });
+
+  it('should not register undefined values as a false positive, and show the overlay', () => {
+    comp._channel = {
+      mature_visibility: undefined,
+      is_mature: undefined,
+      nsfw: undefined,
+    };
+    comp.showOverlay();
+    fixture.detectChanges();
+    expect(comp.hidden).toBeTruthy();
+  });
+});