Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 889
    • Issues 889
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 43
    • Merge Requests 43
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • Packages
    • Packages
    • List
    • Container Registry
  • 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
  • !578

Closed
Opened 1 week ago by Emiliano Balbuena@edgebal9 of 12 tasks completed9/12 tasks
  • Report abuse
Report abuse

WIP: Marketing pages

  • Build layout and styling according to desktop designs
  • Adjust to mobile layout below certain screen width
  • Foundations for all marketing pages
  • Upgrades Page
  • Pro page
  • Ability to subscribe to Plus and Pro
  • Ability to buy tokens
  • Customized Wire dialog for both Plus and Pro

Closes #2007 (closed).

Feedback:

  • Default to tokens
  • Confirm that the pricing matrix is set via the backend
  • Are we missing the placeholder bg from the mockups?
  • Can we use angulars new ? query string pattern vs ;? Eg. moving from https://epic-upgrades-page.minds.io/pro;i=yearly;c=tokens to https://epic-upgrades-page.minds.io/pro?i=yearly&c=tokens
Edited 4 days ago by Emiliano Balbuena

Check out, review, and merge locally

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

git fetch origin
git checkout -b "epic/upgrades-page" "origin/epic/upgrades-page"

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 "epic/upgrades-page"

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 epic/upgrades-page into master
  • Email patches
  • Plain diff
Pipeline #88940564 running for ecf84cd8 on epic/upgrades-page
              Requires 3 more approvals from Devs, Deployers, and QA.
              Mark Harding
              Mark Harding
              Brian Hatchet
              Brian Hatchet
              Xander Miller
              Xander Miller
              Depends on 1 merge request being merged
              • Opened 4 days ago
                Oct 10, 2019 8:25pm GMT+0000
                WIP: Marketing pages and Wire payments
                Opened 4 days ago
                Oct 10, 2019 8:25pm GMT+0000
                engine !361
                Avatar for Emiliano Balbuena
                Assignee Emiliano Balbuena @edgebal
                Avatar for Emiliano Balbuena
                Assignee Emiliano Balbuena @edgebal

              Closed by Mark Harding 2 hours ago

              The changes were not merged into master

              Did not close #2007 (closed)

              Deletes source branch

              • Discussion 2
              • Commits 28
              • Pipelines 19
              • Changes 68
              • Loading...
              • Emiliano Balbuena @edgebal added Product::Platform Squad::Yellow scoped labels 1 week ago

                added Product::Platform Squad::Yellow scoped labels

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • d3608192 - (wip): Upgrades page (II)

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • 0b01a4d2 - (wip): Upgrades page layout

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • a5bbaa70 - (wip): Foundation and footer

                Compare with previous version

              • Emiliano Balbuena @edgebal added 2 commits 1 week ago

                added 2 commits

                • d0a42721 - (chore): Add known footer link hrefs
                • 20a4a855 - (feat): Value toggle component

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • ea18b76d - (refactor): Upgrade options (w/mobile); button foundations

                Compare with previous version

              • Mark Harding @markeharding mentioned in epic &74 1 week ago

                mentioned in epic &74

              • Emiliano Balbuena @edgebal added 2 commits 1 week ago

                added 2 commits

                • 9a19e2ea - (refactor): buy tokens; mobile; foundation
                • 789b70d3 - (refactor): Top prototype

                Compare with previous version

              • Emiliano Balbuena @edgebal marked the task Adjust to mobile layout below certain screen width as completed 1 week ago

                marked the task Adjust to mobile layout below certain screen width as completed

              • Emiliano Balbuena @edgebal marked the task Build layout and styling according to desktop designs as completed 1 week ago

                marked the task Build layout and styling according to desktop designs as completed

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • c6163a42 - (fix): Main section styles

                Compare with previous version

              • Emiliano Balbuena @edgebal changed title from WIP: Upgrades page to WIP: Marketing pages 1 week ago

                changed title from WIP: Upgrades page to WIP: Marketing pages

              • Emiliano Balbuena @edgebal changed the description 1 week ago

                changed the description

              • Emiliano Balbuena @edgebal added 11 commits 1 week ago

                added 11 commits

                • c6163a42...ddbcd6cf - 7 commits from branch master
                • 44e5359c - (proto): Allow currency/interval toggle to affect prices
                • ca84ef4b - Merge remote-tracking branch 'origin/master' into epic/upgrades-page
                • 40c29164 - (feat): Add scrolling effect to Upgrade now button
                • 646530fb - (feat): as featured in component; add assets; replace buy tokens bg

                Compare with previous version

                Toggle commit list
              • Emiliano Balbuena @edgebal marked the task Upgrades Page as completed 1 week ago

                marked the task Upgrades Page as completed

              • Emiliano Balbuena @edgebal added 2 commits 1 week ago

                added 2 commits

                • bcb03674 - (chore): Fix /node and /token links
                • 3ec2c6d9 - (feat): Add deco to upgrade options box

                Compare with previous version

              • Emiliano Balbuena @edgebal added 2 commits 1 week ago

                added 2 commits

                • 331dfa19 - (refactor): Use columns on as-featured-in component
                • cebd9a88 - (chore): Use grid for main upgrades section

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • cbc26576 - (wip): /pro page

                Compare with previous version

              • Emiliano Balbuena @edgebal added 2 commits 1 week ago

                added 2 commits

                • 9dbd54e7 - (chore): Style 2 mobile version
                • bebbb25a - (fix): Make style 2 description centered

                Compare with previous version

              • Emiliano Balbuena @edgebal marked the task Pro page as completed 1 week ago

                marked the task Pro page as completed

              • Emiliano Balbuena @edgebal added 1 commit 6 days ago

                added 1 commit

                • 03fa7147 - (fix): Allow highlighting several words in a row

                Compare with previous version

              • Emiliano Balbuena @edgebal added 2 commits 5 days ago

                added 2 commits

                • 32fe4509 - (wip): Pro payments
                • 829204c8 - (refactor): Support for theme-specific rules; (chore): /pro dark

                Compare with previous version

              • Mark Harding
                Mark Harding @markeharding · 5 days ago
                Owner

                Looking great!

                Feedback

                • Default to tokens
                • Confirm that the pricing matrix is set via the backend
                • Are we missing the placeholder bg from the mockups? Screen_Shot_2019-10-10_at_7.38.19_AM
                • Can we use angulars new ? query string pattern vs ;? Eg. moving from https://epic-upgrades-page.minds.io/pro;i=yearly;c=tokens to https://epic-upgrades-page.minds.io/pro?i=yearly&c=tokens
              • Mark Harding @markeharding changed milestone to %/Upgrades #mvp 5 days ago

                changed milestone to %/Upgrades #mvp

              • Emiliano Balbuena @edgebal changed the description 4 days ago

                changed the description

              • Emiliano Balbuena @edgebal added 1 commit 4 days ago

                added 1 commit

                • a178c768 - (wip): Wire Payment component redux; Pro subscription component

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 4 days ago

                added 1 commit

                • 14be398f - (chore): Remove deprecated Plus subscription test

                Compare with previous version

              • Emiliano Balbuena @edgebal marked the task Customized Wire dialog for both Plus and Pro as completed 4 days ago

                marked the task Customized Wire dialog for both Plus and Pro as completed

              • Emiliano Balbuena @edgebal marked the task Foundations for all marketing pages as completed 4 days ago

                marked the task Foundations for all marketing pages as completed

              • Emiliano Balbuena @edgebal added 1 commit 4 days ago

                added 1 commit

                • 7f7e1490 - (chore): Use pricing matrix on subscription components

                Compare with previous version

              • Mark Harding @markeharding added 1 commit 2 hours ago

                added 1 commit

                • ecf84cd8 - (chore): various changes to upgrades page

                Compare with previous version

              • Mark Harding
                Mark Harding @markeharding · 2 hours ago
                Owner

                merged into epic/pro-affiliate-launch

              • Mark Harding @markeharding closed 2 hours 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
              Emiliano Balbuena's avatar
              Emiliano Balbuena @edgebal
              Assign to
              /Upgrades #mvp
              Milestone
              /Upgrades #mvp
              Assign milestone
              None
              Time tracking
              No estimate or time spent
              2
              Labels
              Product::Platform Squad::Yellow
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              10
              10 participants
              user avatar
              Juan Manuel Solaro
              user avatar
              Olivia Madrid
              user avatar
              Mark Harding
              user avatar
              Martin Santangelo
              user avatar
              Ben Hayward
              user avatar
              Marcelo Rivera
              user avatar
              Guy Thouret
              Reference: minds/front!578