Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 803
    • Issues 803
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 66
    • Merge Requests 66
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !251

Closed
Opened 2 months ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/AspiringAlbatros](feat): Split off badges into a separate component

Closing #1086 (closed)

The idea here was to build a container class around the existing badges component, so that additional badges can be appended without having side-effects on the original badges component's usage next to a users name in a comment.

This is intended to provide a clearer scaffolding for the addition of future badges.

  • All badges - hardcoded at the end of the load fn for testing (this also shows them in the newsfeed): image

  • Actual badges on that test account: image

  • Narrowest phone ever created:

image

Note, the badges show as black. This has always been the case for myself locally, but this should not be the case live. From my tests, I also do not believe that this has an effect on the use of badges next to a username in the newsfeed or comments, as in those instances the badge names applicable are passed in through "badges".

Edited 2 months ago by Ben Hayward

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.com/benhayward.ben/front.git badges-split-component-sidebar
git checkout -b benhayward.ben/front-badges-split-component-sidebar FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff benhayward.ben/front-badges-split-component-sidebar

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge benhayward.ben:badges-split-component-sidebar into master
  • Email patches
  • Plain diff
Pipeline #57332042 passed for bf76ee50 on benhayward.ben:badges-split-component-sidebar
    Requires approval.

    Closed by Mark Harding 29 minutes ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Did not close #1086 (closed)

    Deletes source branch

    • Discussion 2
    • Commits 9
    • Pipelines 7
    • Changes 11
    0/1 discussion resolved
    • Loading...
    • Ben Hayward
      Ben Hayward @benhayward.ben started a discussion on an old version of the diff 2 months ago
      Last updated by Ben Hayward 2 months ago
      src/app/common/components/badges/badges.component.html
      1 1 <ul class="m-channel--badges">
      2 <li *ngIf="user.plus && badges.indexOf('plus') > -1" routerLink="/plus">
      2 <li *ngIf="user.plus && badges.indexOf('plus') > -1" routerLink="/plus">
      • Ben Hayward
        Ben Hayward @benhayward.ben · 2 months ago
        Developer

        Formatting was out

      • Ben Hayward @benhayward.ben changed this line in version 5 of the diff 2 months ago

        changed this line in version 5 of the diff

      Please register or sign in to reply
    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • eafda036 - spec test update

      Compare with previous version

    • Ben Hayward @benhayward.ben changed the description 2 months ago

      changed the description

    • Ben Hayward @benhayward.ben unmarked as a Work In Progress 2 months ago

      unmarked as a Work In Progress

    • Ben Hayward @benhayward.ben changed the description 2 months ago

      changed the description

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • 609f819e - Update spec test

      Compare with previous version

    • Ben Hayward @benhayward.ben changed the description 2 months ago

      changed the description

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • ec77c1d4 - Fixed and added more tests

      Compare with previous version

    • Ben Hayward
      Ben Hayward @benhayward.ben · 2 months ago
      Developer

      Needs a drop-shadow. Moving to WIP.

    • Ben Hayward @benhayward.ben marked as a Work In Progress 2 months ago

      marked as a Work In Progress

    • Ben Hayward @benhayward.ben added 3 commits 2 months ago

      added 3 commits

      • 22bd9d0c - Refactor - pending cleaning
      • 976f8ca2 - Beginning to tidy
      • fb1bcc1a - Further refactoring and tidying

      Compare with previous version

    • Ben Hayward @benhayward.ben changed the description 2 months ago

      changed the description

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • cbf8abe8 - Fixed tests

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • bf76ee50 - fdescribe left on

      Compare with previous version

    • Ben Hayward @benhayward.ben unmarked as a Work In Progress 2 months ago

      unmarked as a Work In Progress

    • Ben Hayward @benhayward.ben changed the description 2 months ago

      changed the description

    • Ben Hayward @benhayward.ben changed the description 2 months ago

      changed the description

    • Ben Hayward @benhayward.ben mentioned in issue minds#532 (closed) 4 weeks ago

      mentioned in issue minds#532 (closed)

    • Mark Harding @markeharding added MR::Awaiting Review label 1 day ago

      added MR::Awaiting Review label

    • Mark Harding @markeharding closed 29 minutes ago

      closed

    • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
    Please register or sign in to reply
    Assignee
    None
    Assign to
    None
    Milestone
    None
    Assign milestone
    None
    Time tracking
    No estimate or time spent
    1
    Labels
    MR::Awaiting Review
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    2
    2 participants
    user avatar
    Mark Harding
    user avatar
    Ben Hayward
    Reference: minds/front!251