Skip to content
Snippets Groups Projects

WIP: Minds Pro (stable branch)

Closed Emiliano Balbuena requested to merge minds-pro-stable into master
9 unresolved threads

Depends on !481 (closed)

Edited by Mark Harding

Merge request reports

Checking pipeline status.

Requires 1 approval from Deployers.

Closed by Emiliano BalbuenaEmiliano Balbuena 5 years ago (Aug 29, 2019 6:40pm UTC)

Merge details

  • The changes were not merged into master.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Emiliano Balbuena added ProductPro + 1 deleted label

    added ProductPro + 1 deleted label

  • Emiliano Balbuena added 11 commits

    added 11 commits

    • 0889ccd9 - (feat) set window title for pro settings and pro channel
    • 097f990a - (chore): In-call feedback
    • c4249f31 - (feat): Tag list
    • 7100b349 - (feat): click behaviour for list modal
    • 3d87b567 - (feat): style see more modal
    • a19b3758 - (feat): style media modal
    • b8b013ac - (fix): title
    • c3cc56c3 - (chore) Remove user avatar, login/signup and hamburger menu from pro top bar
    • 091acaf8 - (feat): Color scheme settings
    • 7be57ec0 - (feat): Apply dark or light color scheme, regardless of the global
    • 07925b33 - (fix): Search box styling

    Compare with previous version

  • Emiliano Balbuena added 121 commits

    added 121 commits

    • 07925b33...268165b1 - 45 commits from branch master
    • 38bbcd33 - (feat): added tags list
    • aa261cfe - (refactor): moved selectedHashtag to ProChannelService
    • 03f95182 - (fix): added scheme to typings
    • a0700d65 - (fix): send hashtag to endpoint
    • 42344414 - (fix): categories styling
    • cc328524 - (feat) Add ellipsis menu that contains common channel actions
    • 4e8253fb - (wip): Pro home
    • d51cd653 - (feat): added background overlay colour
    • e601de33 - (feat): only show categories underneath navbar if we're on a list view
    • 5b34538b - (prototype) Subscribe button with counter on nav bar
    • a46285be - (fix): tweaked styling for search results
    • 39305f72 - (fix): show categories check
    • 1aac4212 - (fix): tweaked spacing for categories
    • 7daa1778 - (fix): uppercase text for navbar and categories
    • 7165cacb - (feat): uppercase text for footer
    • d7276c2e - (proto): Pro home
    • 0fc6f00e - (fix) hide subscribe button when logged user is the same as pro channel
    • bee56996 - (fix): re-styled "showing results for: (...)"
    • a1a65be8 - (fix): Minor style tweaks
    • bda7eb6c - (feat) styling for subscribe button
    • 10a89a2e - (feat): rename 'groups' to 'communities'
    • 43fcf513 - (chore) change margin and text alignment for tags filter in mobile view
    • 9416818b - (chore) increase footer padding and margin on mobile view
    • c545917f - (chore) remove title and heading from Pro homepage
    • c809c2b3 - (feat): introduced "all" category
    • 754b5bf0 - (feat): hashtag filtering via url
    • 7faa4b3b - (fix): send null child params when on home
    • d533ef85 - (fix): run change detection after shouldShowCategories()
    • 1466efd3 - (feat): Pro homepage content
    • 01017e31 - (feat): Pro homepage mobile view
    • e12f59de - (chore): Pro homepage
    • 9e79064c - (feat) show modal to unsubscribe when clicking on subscribe button
    • 75c04dfa - (feat): revamped group tiles
    • 8bc3030a - (fix): project structure
    • 738fa536 - (feat): generic hashtags component
    • e1c35377 - (feat): generic hashtags comp
    • 653b8976 - (fix): a couple of fixes regarding categories component
    • 5a56e77c - (chore): Remove "Featured Content" title
    • 358613e7 - (fix): Feeds modal
    • be8ff599 - (chore): Anchor modals to Pro channel component
    • bd5332cc - (chore): Re-style subscribe button
    • f12a2fe6 - (feat): Global open() service for Pro channel entities/tiles
    • ed718d77 - (chore): Code style tweaks
    • a438de31 - (fix): 'all' hashtag shouldn't appear in the url
    • cf28722e - (refactor): moved categories to list component
    • 1d2fbf2b - (fix): removed setChildParams call
    • 16b4e3e2 - (fix): removed 2nd row
    • b0bf7542 - (fix): Remove unused property
    • a9b9db6c - (fix): hide categories in the communities section
    • 0d8d3dff - (feat): don't show hashtags in communities
    • d04327b2 - (fix): minor code style tweak
    • de16602a - (fix): minor code style tweak
    • c98824ab - (feat): open blogs in a modal
    • 0ef0cb96 - (feat): namespace pro CSS variables
    • bb33aef2 - (fix): keep spacing when hiding categories
    • 1d950b69 - (wip): Pro standalone mode prototype
    • 66e6f1f5 - (wip): Remove Minds bars on standalone mode
    • b69644b1 - (wip): Homepage categories
    • 1a8353f0 - (refactor): Homepage (Mk2)
    • 94aa955e - (chore): Always show View channel button; tweak spinner style
    • 9d6853cd - Merge remote-tracking branch 'origin/master' into epic/minds-pro
    • a95d6472 - (feat): generic draggable list
    • 9d9d04a5 - (fix): remove list of tags used for debugging
    • b3e268a5 - (chore): comment-out new draggable list in pro settings for now
    • ae8272cf - (feat): disable juryduty in pro
    • 486b3e25 - (feat): disable onboarding for pro standalone
    • 6800f609 - (feat): add X button to categories and footer items
    • c312a29b - (fix): forgot to commit package-lock.json
    • afcbb3b1 - (feat): List loader
    • f5791df9 - (chore): Center and stylize categories; fix all list modal
    • 07253475 - (chore): Ditch top tiles extra margin
    • abc2e709 - (feat): disable notifications on Pro standalone
    • edf9fb7f - (fix): disable messenger for pro standalone
    • 13406213 - (feat): ability to either signup or login in pro
    • 181879d1 - (feat): redirect to normal login if not on standalone
    • 0764c503 - (feat): moved subscription component to its own folder

    Compare with previous version

  • Mark Harding changed the description

    changed the description

  • Mark Harding mentioned in merge request engine!291 (closed)

    mentioned in merge request engine!291 (closed)

33 33
34 34 paramsSubscription;
35 35
36 standalone: boolean = false;
  • 1 import { ChangeDetectorRef, Component, ContentChild, Input, TemplateRef } from '@angular/core';
    2 import { DndDropEvent, DropEffect, EffectAllowed } from 'ngx-drag-drop';
    3
    4 @Component({
    5 selector: 'm-draggable-list',
    6 template: `
  • 133 133 }
    134 134 }
    135 135
    136 .minds-body {
    137 a {
    138 color: #607d8b;
  • 1 <div
    2 *ngIf="channel"
    3 class="m-pro--channel"
  • 1 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core';
    2 import { ProChannelService } from "../channel.service";
    3 import { Router } from "@angular/router";
    4 import { MindsUser, Tag } from "../../../../interfaces/entities";
    5
    6 @Component({
    7 selector: 'm-pro--channel--categories',
  • 71 (click)="toggleSubscription($event)"
    72 [hidden]="currentUser?.guid === channel.guid"
    73 >
    74 <span class="m-proChannelTopbar__subscribe--label">
    75 <ng-container *ngIf="!channel.subscribed; else subscribedActionButton" i18n>Subscribe</ng-container>
    76 <ng-template #subscribedActionButton><ng-container i18n>Subscribed</ng-container></ng-template>
    77 </span>
    78
    79 <span class="m-proChannelTopbar__subscribe--counter">
    80 {{ subscribers_count | abbr:0 }}
    81 </span>
    82 </button>
    83 </ng-container>
    84
    85 <div class="m-proChannelTopbar_menu m-dropdown">
    86 <a class="m-proChannelTopbarMenu__Anchor" (click)="toggleMenu()"><i class="material-icons">menu</i></a>
  • 15
    16 @Component({
    17 selector: 'm-pro--channel-footer',
    18 templateUrl: 'footer.component.html'
    19 })
    20
    21 export class ProChannelFooterComponent {
    22
    23 constructor(
    24 private channelService: ProChannelService,
    25 protected _session: Session
    26 ) {
    27
    28 }
    29
    30 private socialProfileMeta: SocialProfileMeta[] = [
  • Mark Harding
  • 1 <div class="m-pro--channel-home">
  • 43
    44 @media screen and (max-width: 480px) {
    45 height: 32px;
    46 }
    47 }
    48 }
    49
    50 @media screen and (max-width: 480px) {
    51 .m-androidApp__download {
    52 zoom: 0.65;
    53 }
    54 }
    55 }
    56 }
    57
    58 .m-ProChannelLogin--hero--video {
  • Looks good, but there are a lot of inconsistencies with our component and class names. Please follow https://developers.minds.com/docs/guides/frontend/#component-names.

    Also, I think the wire creator should still load in a modal.

  • Please register or sign in to reply
    Loading