Compare revisions

Ben · Ben · Mark Harding · Mark Harding · Mark Harding · Mark Harding
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,8 @@ stages:
 cache:
  key: "$CI_COMMIT_REF_SLUG"
  paths:
-    - dist
+    - dist/en
+    - dist/vi
  policy: pull

 test:
@@ -22,7 +23,7 @@ test:
    - npm install # Should be cached...
    - npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI

-build:staging:
+build:review:
  stage: build
  script:
    - npm install # TODO: Why is this needed?
@@ -35,9 +36,6 @@ build:staging:
    paths:
      - dist
    policy: push
-  only:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /-subdomain/
  except:
    refs:
      - master
@@ -55,7 +53,7 @@ build:production:en:
  cache:
    key: "$CI_COMMIT_REF_SLUG"
    paths:
-      - dist
+      - dist/en
    policy: push
  only:
    refs:
@@ -73,7 +71,7 @@ build:production:i18n:
  cache:
    key: "$CI_COMMIT_REF_SLUG"
    paths:
-      - dist
+      - dist/vi
    policy: push
  only:
    refs:
@@ -87,41 +85,55 @@ prepare:
    - docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY} 
    - docker build -t $CI_REGISTRY_IMAGE/front-init:$CI_BUILD_REF -f containers/front-init/Dockerfile dist/.
    - docker push $CI_REGISTRY_IMAGE/front-init:$CI_BUILD_REF
-  environment:
-    name: staging
  except:
    refs:
      - master
      - test/gitlab-ci

-deploy:staging:
+deploy:review:
  stage: deploy
  image: minds/helm-eks:latest
  script:
    - aws eks update-kubeconfig --name=sandbox
-    - STAGING_SUBDOMAIN=$(echo $CI_COMMIT_MESSAGE | sed -n 's/.* -subdomain=\([^ ]*\).*/\1/p')
-    - echo "Subdomain will be setup at $STAGING_SUBDOMAIN"
    - git clone --branch=sandbox-wip https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/minds/helm-charts.git
    - "helm upgrade \
        --install \
        --reuse-values \
        --set frontInit.image.repository=$CI_REGISTRY_IMAGE/front-init \
        --set frontInit.image.tag=$CI_BUILD_REF \
-        --set domain=$STAGING_SUBDOMAIN.$STAGING_DOMAIN \
-        --set elasticsearch.clusterName=$STAGING_SUBDOMAIN-elasticsearch \
+        --set domain=$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN \
+        --set elasticsearch.clusterName=$CI_BUILD_REF_SLUG--elasticsearch \
        --wait \
-        $STAGING_SUBDOMAIN \
+        $CI_BUILD_REF_SLUG \
        ./helm-charts/minds"
  environment:
-    name: staging
-  only:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /-subdomain/
+    name: review/$CI_COMMIT_REF_NAME
+    url: https://$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+    on_stop: deploy:review:stop
+  except: 
+    refs:
+      - master
+      - test/gitlab-ci
+
+deploy:review:stop:
+  stage: deploy
+  image: minds/helm-eks:latest
+  script:
+    - aws eks update-kubeconfig --name=sandbox
+    - helm del --purge $CI_BUILD_REF_SLUG
+  environment:
+    name: review/$CI_COMMIT_REF_NAME
+    url: https://$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+    action: stop
+  variables:
+    GIT_STRATEGY: none
+  when: manual
  except: 
    refs:
      - master
      - test/gitlab-ci

+
 deploy:production:
  stage: deploy
  image: minds/ci:latest

--- a/src/app/common/pipes/tags.spec.ts
+++ b/src/app/common/pipes/tags.spec.ts
@@ -79,6 +79,14 @@ describe('TagPipe', () => {
    expect(transformedString).toContain('<a class="tag"');
  });

+  it('should transform when @ followed by `.com`', () => {
+    const pipe = new TagsPipe(featuresServiceMock);
+    const string = 'textstring @name.com';
+    const transformedString = pipe.transform(<any>string);
+    expect(transformedString).toContain('<a class="tag"');
+    expect(transformedString).toContain('@name.com');
+  });
+
  it('should transform to an email', () => {
    const pipe = new TagsPipe(featuresServiceMock);
    const string = 'textstring@name.com';
@@ -90,7 +98,6 @@ describe('TagPipe', () => {
    const pipe = new TagsPipe(featuresServiceMock);
    const string = 'textstring name';
    const transformedString = pipe.transform(<any>string);
-
    expect(transformedString).toEqual(string);
    expect(transformedString).not.toContain('<a class="tag"');
  });

--- a/src/app/common/pipes/tags.ts
+++ b/src/app/common/pipes/tags.ts
@@ -39,9 +39,9 @@ export class TagsPipe implements PipeTransform  {
      }
    },
    at: {
-      rule: /(^|\s|\W)@(\w*[a-zA-Z_-]+\w*)/gim,
+      rule: /(^|\W)@([a-z0-9_\-\.]+[a-z0-9_])(\W|$)/gmi,
      replace: (m) => {
-        return `${m.match[1]}<a class="tag" href="/${m.match[2]}" target="_blank">@${m.match[2]}</a>`;
+        return `${m.match[1]}<a class="tag" href="/${m.match[2]}" target="_blank">@${m.match[2]}</a>${m.match[3]}`;
      }
    }
  };

--- a/src/app/modules/groups/profile/profile.html
+++ b/src/app/modules/groups/profile/profile.html
@@ -68,7 +68,7 @@
              *ngIf="(!group['is:creator'] || (session.isAdmin()) && !group['is:invited'])"
            >
            </minds-groups-join-button>
-            <button class="m-btn m-btn--slim m-btn--with-icon" [class.m-pulsating--small]="group.hasGathering" style="margin-left: 8;" (click)="videochat.activate(group)" *ngIf="!group.videoChatDisabled">
+            <button class="m-btn m-btn--slim m-btn--with-icon" [class.m-pulsating--small]="group.hasGathering$ | async" style="margin-left: 8;" (click)="videochat.activate(group)" *ngIf="!group.videoChatDisabled">
              <span class="m-gatheringIcon">Gathering</span>
              <i class="material-icons">video_call</i>
            </button>

--- a/src/app/modules/groups/profile/profile.ts
+++ b/src/app/modules/groups/profile/profile.ts
-import { Component, ViewChild, ChangeDetectorRef, HostListener, Input } from '@angular/core';
-import { ActivatedRoute, ChildActivationEnd, NavigationEnd, Router } from '@angular/router';
+import { ChangeDetectorRef, Component, HostListener, ViewChild } from '@angular/core';
+import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';

-import { Subscription } from 'rxjs';
+import { interval, Subscription } from 'rxjs';

 import { GroupsService } from '../groups-service';

@@ -16,7 +16,7 @@ import { Client } from '../../../services/api';
 import { HashtagsSelectorComponent } from '../../hashtags/selector/selector.component';
 import { VideoChatService } from '../../videochat/videochat.service';
 import { UpdateMarkersService } from '../../../common/services/update-markers.service';
-import { filter } from "rxjs/operators";
+import { filter, map, startWith, throttle } from "rxjs/operators";

 @Component({
  selector: 'm-groups--profile',
@@ -181,12 +181,18 @@ export class GroupsProfile {
      this.updateMarkersSubscription.unsubscribe();

    this.updateMarkersSubscription = this.updateMarkers.getByEntityGuid(this.guid).subscribe((marker => {
+    // this.updateMarkersSubscription = this.updateMarkers.markers.subscribe(markers => {
      if (!marker)
        return;

-      this.group.hasGathering = marker && marker.entity_guid == this.group.guid
-        && marker.marker == 'gathering-heartbeat'
-        && marker.updated_timestamp > (Date.now() / 1000) - 60;
+      this.group.hasGathering$ = interval(1000).pipe(
+        throttle(() => interval(2000)), //only allow once per 2 seconds
+        startWith(0),
+        map(() => [marker].filter(marker => marker.entity_guid == this.group.guid
+          && marker.marker == 'gathering-heartbeat'
+          && marker.updated_timestamp > (Date.now() / 1000) - 60 //1 minute tollerance
+        ).length > 0)
+      );

      let hasMarker =
        (marker.read_timestamp < marker.updated_timestamp)

--- a/src/app/modules/homepage/homepage.component.html
+++ b/src/app/modules/homepage/homepage.component.html
@@ -42,73 +42,6 @@

 </section>

-<ng-container *mExperiment="'Homepage200619';bucket:'base'">
-<section class="m-homepage--section m-homepage" style="padding-top:0; padding-bottom: 0;">
-
-  <div class="m-homepage--section--grid">
-    <h2 style="text-align: center; width: 100%" i18n="@@MINDS__HOME__HOMEPAGE__OUT_CORE_PRINCIPLES">Our core principles</h2>
-  </div>
-
-  <div class="m-homepage--section--grid">
-    <div class="m-homepage--section--grid-col">
-      <i class="material-icons">language</i>
-      <h4 class="" i18n="@@HOMEPAGE__NONPARTISAN_SUBTITLE">
-        Nonpartisan (r)evolution of ideas and <b>global consciousness</b>
-      </h4>
-    </div>
-    <div class="m-homepage--section--grid-col">
-      <i class="material-icons">record_voice_over</i>
-      <h4 class="" i18n="@@HOMEPAGE__REAL_WORLD_SOLUTIONS_SUBTITLE">
-        <b>Real world solutions</b> with free speech,
-          co-ownership and open discourse
-      </h4>
-    </div>
-    <div class="m-homepage--section--grid-col">
-      <i class="material-icons">favorite</i>
-      <h4 class="" i18n="@@HOMEPAGE__PRIVACY_AND_TRANSPARENCY_SUBTITLE">
-        Privacy and transparency with encryption and
-        <b>open source software</b>
-      </h4>
-    </div>
-  </div>
-
-</section>
-
-<section class="m-marketing--section" style="padding-top: 8px; padding-bottom: 16px;">
-     <div class="m-blockchain--marketing--links">
-      <a class="m-btn m-btn--slim m-btn--action" target="_blank" href="https://cdn-assets.minds.com/front/dist/assets/documents/Whitepaper-v0.3.pdf">Whitepaper (PDF)</a>
-      <a class="m-btn m-btn--slim m-btn--action" target="_blank" routerLink="/tokens">Get Tokens</a>
-    </div>
-</section>
-
-<span class="mdl-color--grey-100" style="width: 100%; height: 1px; display: block;"></span>
-
-<div class="mdl-grid mdl-grid--no-spacing m-homepage--stream">
-
-    <h4 class="mdl-color-text--blue-grey-200 mdl-cell--12-col" i18n="@@HOMEPAGE__FEATURED_POSTS_TITLE">Featured Posts</h4>
-    <section class="mdl-cell mdl-cell--4-col">
-      <minds-activity [object]="activity"  *ngFor="let activity of stream[1]"></minds-activity>
-    </section>
-
-    <section class="mdl-cell mdl-cell--4-col">
-      <minds-activity [object]="activity"  *ngFor="let activity of stream[2]"></minds-activity>
-    </section>
-
-    <section class="mdl-cell mdl-cell--4-col">
-      <minds-activity [object]="activity"  *ngFor="let activity of stream[3]"></minds-activity>
-    </section>
-
-    <div [hidden]="!inProgress" style="width:100%; text-align:center; ">
-      <div class="mdl-spinner mdl-js-spinner is-active" [mdl] style="margin: 16px auto;"></div>
-    </div>
-
-    <div class="m-homepage--fader" [hidden]="inProgress" *ngIf="false">
-      <div class="m-homepage--fader--load-more" (click)="loadStream()" i18n="@@MINDS__HOME__HOMEPAGE__SEE_MORE_ACTION">Click To See more</div>
-    </div>
-</div>
-
-</ng-container>
-
 <div class="mdl-grid mdl-grid--no-spacing m-homepage--footer">

    <section class="mdl-cell mdl-cell--12-col m-footer">

--- a/src/app/modules/mobile/marketing/marketing.component.html
+++ b/src/app/modules/mobile/marketing/marketing.component.html
 <div class="m-marketing m-mobile--marketing">

  <div class="m-marketing--hero">
+
    <div class="m-marketing--hero--video">
      <img [src]="minds.cdn_assets_url + 'assets/photos/circles.png'">
    </div>
-
+    
    <div class="m-marketing--hero--inner">
-
      <div class="m-marketing--hero--slogans">
-
        <h2>
-          Minds Android App
+          Minds Mobile App
        </h2>
-
      </div>
-
      <div class="m-marketing--hero--actions">
-        <i class="material-icons m-mobile__giantDroid">android</i>
+        <div class="m-marketing--hero--logos">
+            <img [src]="minds.cdn_assets_url + 'assets/logos/bulb.svg'">
+        </div>
+        <div class="mdl-card__supporting-text m-marketing--section--downloadContainer">
+          <a href="https://geo.itunes.apple.com/us/app/minds-com/id961771928?mt=8&amp;uo=6" target="_blank">
+            <img class="m-marketing--section--downloadButton m-marketing--section--downloadButton--ios"  
+                  src="https://devimages-cdn.apple.com/app-store/marketing/guidelines/images/badge-download-on-the-app-store.svg"/>
+          </a>
+          <a [href]="latestUrl">
+            <img alt='Get it for Android' 
+              [src]="minds.cdn_assets_url + 'assets/photos/android-download.png'"
+              class="m-marketing--section--downloadButton m-marketing--section--downloadButton--android"/>
+          </a>
+        </div>
      </div>
-
    </div>
-
  </div>

  <section class="m-marketing--section mdl-color--white" style="padding-bottom: 0; padding-top: 0">
@@ -32,7 +40,12 @@
            <div class="mdl-cell mdl-cell--12-col m-mobile--marketing--spinner" *ngIf="inProgress">
              <div class="mdl-spinner mdl-js-spinner is-active"></div>
            </div>
-
+            <span class="m-mobile--marketing--play-store">
+              A limited version is also available via
+              <a href="https://play.google.com/store/apps/details?id=com.minds.mobile&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1"
+                target="_blank">
+                Google Play.</a>
+            </span>
            <div class="mdl-cell mdl-cell--12-col" *ngIf="error">
              <p class="m-mobile--marketing--error">Oops! There was an issue retrieving mobile releases: <i>{{error}}</i></p>
            </div>

--- a/src/app/modules/mobile/marketing/marketing.component.scss
+++ b/src/app/modules/mobile/marketing/marketing.component.scss
@@ -27,8 +27,14 @@
    padding-top: 32px !important;
  }

-  .m-marketing--hero--actions img {
-    max-height: 250px;
+  .m-marketing--hero--actions {
+    text-align: center;
+
+    img {
+      max-width: 180px;
+      max-height: 160px;
+      margin: 0 4px;
+    }
  }

  @media screen and (max-width: 662px) {
@@ -41,6 +47,7 @@
      margin-top: 16px;
      margin-left: 0;
      text-align: center;
+
    }
    .m-marketing--section {
      padding: 16px;
@@ -93,6 +100,16 @@
    }
  }

+  .m-mobile--marketing--play-store {
+    color: #444;
+    margin: 16px 0;
+    font-size: 56px;
+    line-height: 1;
+    font-weight: 600;
+    letter-spacing: 1.25px;
+    font-size: 12pt;
+    margin-left: 12px;
+  }
 }

 .m-mobile__giantDroid {
@@ -101,3 +118,18 @@
    color: themed($m-white);
  }
 }
+
+.m-marketing--section--downloadContainer {
+
+  .m-marketing--section--downloadButton--ios {
+    width: 165px;
+  }
+  .m-marketing--section--downloadButton--android {
+    width: 165px;
+  }
+  a .m-marketing--section--downloadButton {
+    max-width: 200px;
+    max-height: 55px;
+    min-width: unset !important;
+  }
+}
--- a/src/app/modules/mobile/marketing/marketing.component.ts
+++ b/src/app/modules/mobile/marketing/marketing.component.ts
@@ -15,7 +15,8 @@ export class MobileMarketingComponent {
  releases: any[] = [];
  inProgress: boolean = false;
  error: string;
-
+  latestUrl: string;
+  
  constructor(
    protected title: MindsTitle,
    protected session: Session,
@@ -38,6 +39,7 @@ export class MobileMarketingComponent {
      this.detectChanges();

      this.releases = await this.service.getReleases();
+      this.latestUrl = this.releases[0].href;
    } catch (e) {
      console.error(e);
      this.error = e.message || 'Unknown error';

--- a/src/app/modules/notifications/notifications.component.ts
+++ b/src/app/modules/notifications/notifications.component.ts
@@ -94,7 +94,7 @@ export class NotificationsComponent {

    this.inProgress = true;

-    this.client.get(`api/v1/notifications/${this._filter}`, { limit: 24, offset: this.offset })
+    this.client.get(`api/v1/notifications/${this._filter}`, { limit: 12, offset: this.offset })
      .then((data: any) => {

        if (!data.notifications) {

--- a/src/assets/photos/android-download.png
+++ b/src/assets/photos/android-download.png
No results found