Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project overview
  • Repository
  • Issues 402
  • Merge Requests 63
  • CI / CD
  • Security & Compliance
  • Packages
  • Analytics
  • Wiki
  • Snippets
  • Members
  • Collapse sidebar
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !747

Open
Opened 1 week ago by Marcelo Rivera@eiennohi
Report abuse

Navigation superstructure

  • Overview 26
  • Commits 14
  • Pipelines 11
  • Changes 43
15/21 threads resolved

closes #2324 closes #2325

This is for the channel only. We need to add grid-area: content to our views throughout the site. I'll do that later in a cleanup MR

It's missing some icons in the navigation sidebar until I talk to Michael about that, but you can review the rest @omadrid

** Testing **

  • layout should be responsive. Left column should be thinner on tablet resolutions and it should be replaced by a hamburger menu and sliding menu on mobile resolutions
Edited 4 days ago by Marcelo Rivera
Request to merge feat/navigation-superstructure into epic/navigation-93
Open in Web IDE
Pipeline #116570453 failed for b9ae639d on feat/navigation-superstructure
              Requires 3 more approvals from Devs, Deployers, and QA.
              Emiliano Balbuena Olivia Madrid Xander Miller Rami Albatal Martin Santangelo
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Deletes source branch

              • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                added 1 commit

                • a4fbe9de - (feat): navigation superstructure

                Compare with previous version

              • Olivia Madrid
                Olivia Madrid @omadrid · 1 week ago
                Developer

                Note to future reviewers: feature flag for this is navigation-2020

                Edited by Olivia Madrid 1 week ago
              • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                added 1 commit

                • 76f5838b - (fix): responsive issues

                Compare with previous version

              • Marcelo Rivera @eiennohi added 2 commits 1 week ago

                added 2 commits

                • a892bdb8 - (fix): responsive issues
                • 2ad4d48f - (feat): correctly detect routes for routerLinkActive

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                added 1 commit

                • 3e8842cb - (fix): logo should be centered

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                added 1 commit

                • de70cc8d - (fix): logo should be centered

                Compare with previous version

              • Olivia Madrid
                Olivia Madrid @omadrid · 1 week ago
                Developer

                review app not working?

                • Olivia Madrid
                  Olivia Madrid @omadrid · 6 days ago
                  Developer
                  Resolved by Marcelo Rivera 3 days ago

                  image

                • Marcelo Rivera
                  Last reply by Marcelo Rivera 6 days ago
              • Marcelo Rivera @eiennohi changed the description 6 days ago

                changed the description

              • Marcelo Rivera @eiennohi added 75 commits 6 days ago

                added 75 commits

                • 5263c95a - (wip): Server Side Rendering - work in progress
                • 0efe142e - (chore): update with master - closes #2414 (closed)
                • ca77f94f - (feat): working mvp of ssr
                • 8dfc9b3a - (chore): performance bumps and browser specific delays
                • 4399c6bc - (fix): failing spec tests
                • 6a3dac72 - (fix): plotly fix, preparation for full server bundle and xsrf token re-introduced
                • 14ab8c6e - (chore): ci configs
                • 46f380ca - (fix): do not cache mobile incorrectly
                • cfe0cb4a - (chore): some minor fixes for mobile improvements
                • 361ef20c - (fix): do not show permissions if logged out
                • 7cb62c62 - (chore): introduce build optimizer
                • e9eee3a7 - (chore): preload material icons to improve first paint
                • cd9272cd - (feat): meta service for SEO
                • 2a206794 - (refactor): SEO from backend to frontend
                • 09374b66 - (refactor): remove all uses of window.Minds
                • c53c0aaa - (refactor): storage to cookies where applicable
                • 4fda5f24 - (chore): allow for epic branches to push docker containers to aws
                • 17b9abb5 - (fix): do not return null for nsfw reasons
                • 7652c43d - (fix): remind asset links
                • ff284a94 - (chore): do not stretch checkboxes
                • 8d424529 - (fix): css should be loaded with correct asset path
                • befad6c1 - (chore): remove icon preload
                • eaf8a773 - (chore): cookie notice for all
                • fc1185d7 - (chore): reduce plotly bundle
                • af02de4b - (fix): nsfw cookie fix and notices.json credential error
                • 3c5dae2d - (fix): wallet not loading when loaded server side
                • 2118f305 - (fix): groups not loading server side
                • b5b38399 - (fix): do not applu 100% width to checkboxes on homepage
                • 26795138 - (fix): bad url for avatars
                • b73ee1b0 - (chore): fix seo for blogs
                • 98fd4fbe - (chore): temporary favicons
                • eeb4b9e1 - (fix): groups create page not loading
                • 9c600c2c - Merge branch 'master' of https://gitlab.com/Minds/front into epic/SSR
                • 1363cae7 - (fix): canary assets path
                • 96c066b0 - (fix): sockets issue
                • 03a80ca3 - (fix): wrong path for canary bg
                • a0ab3d48 - (fix): try not to render css for checkboxes
                • b876854f - (fix): only show more groups if we have groups
                • c3b33785 - Merge branch 'master' of https://gitlab.com/Minds/front into epic/SSR
                • 5a27ec5f - (feat): checkboxes on homepage
                • a4d3e5e9 - (chore): update local build and serve scripts
                • 95c2bfe7 - (fix): pro sites should wait for configs to be resolved
                • 3a90b3dc - (fix): date dropdown should be in common posdt master merge
                • adb6015c - (fix): reset router if pro
                • f15627e1 - (fix): pro fixes
                • 176a3c8f - (chore): move sentry to diagnostics service
                • fc6a8b2e - (chore): sentry capture exception for pro
                • 386ca4f8 - (fix): only render css bindings if in browser
                • 2b3b74b3 - (chore): add Object type top platformId
                • 75639885 - (fix): wrap session storage in try catch
                • 7c5d306b - (fix): og tags incorrect
                • da3ed520 - Merge branch 'master' of https://gitlab.com/Minds/front into epic/SSR
                • 13422e7a - [Sprint/HipsterHedgehog] (feat): ability to copy and paste images into posts and comments
                • 2cb1c987 - Merge branch 'feat/copy-and-paste-images-in-posts' into 'master'
                • 4f327c86 - Plyr play error
                • 184c0f46 - Merge branch 'fix/autoplay-bug-2377' into 'master'
                • 2809d08f - (chore): adds in production branch to be able to deploy to production
                • 5fede3a6 - Merge branch 'master' of https://gitlab.com/Minds/front into epic/SSR
                • 145a730f - (chore): some small ci changes to test production pipeline works with SSR
                • 225dc6f3 - (chore): allow for master to hit preprod
                • 6b1b3271 - Modal pager fixes
                • c6474453 - Merge branch 'fix/modal-pager-sync' into 'production'
                • ff63f69d - Merge branch 'fix/modal-pager-sync' into 'production'
                • fae30718 - Search period defaults and sort bar tweaks
                • 410e752c - Merge branch 'chore/default-search-period' into 'master'
                • 2261e73f - (chore): remove review dependency
                • 5ffd58f5 - Merge branch 'production' of https://gitlab.com/Minds/front
                • 44667f0d - (chore): bring sandbox helm chart branch to master
                • fd261feb - (fix): remind preview cdn url - fixes #2531 (closed)
                • 6fc73b99 - New Channel Registration, Signup button remains disabled
                • 759cb8aa - Merge branch 'fix/register-issue-2527' into 'master'
                • 6d761b80 - Merge remote-tracking branch 'upstream/master' into feat/navigation-superstructure
                • 3890c40a - (fix): remove references to window.Minds
                • 707b5089 - (fix): remove unused imports
                • 380ea055 - (fix): only set .has-markers-sidebar if the new nav isn't enabled

                Compare with previous version

                Toggle commit list
              • Marcelo Rivera @eiennohi added 2 commits 4 days ago

                added 2 commits

                • dcb2c350 - (feat): design for tablets
                • 62bbcb33 - (feat): sidebar menu for mobile resolutions

                Compare with previous version

              • Marcelo Rivera @eiennohi changed the description 4 days ago

                changed the description

              • Marcelo Rivera @eiennohi resolved all threads 3 days ago

                resolved all threads

              • Olivia Madrid @omadrid approved this merge request 3 days ago

                approved this merge request

              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 3 hours ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 3 days ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 3 days ago
              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 3 days ago
                Resolved by Marcelo Rivera 3 days ago
              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 3 days ago
                Last updated by Marcelo Rivera 1 hour ago
                src/app/app.component.html
                1 1 <ng-container *ngIf="ready">
                2 2 <ng-container *ngIf="!isProDomain">
                3 <m-v2-topbar>
                4 <ng-container search>
                5 <m-search--bar [defaultSizes]="false"></m-search--bar>
                6 </ng-container>
                3 <ng-container *ngIf="useNewNavigation; else v2Topbar">
                • Mark Harding
                  Mark Harding @markeharding · 3 days ago
                  Owner

                  These labels need to be more contextual ie. not useNewNavigation and legacyTopbar. Why has legacyTopbar returned as well?

                • Marcelo Rivera
                  Marcelo Rivera @eiennohi · 1 hour ago
                  Developer

                  I just added the new topbar without removing any of the old code. Should I also remove legacyTopbar?

                • Please register or sign in to reply
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 2 hours ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 3 days ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 2 hours ago
              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 3 days ago
                Resolved by Marcelo Rivera 2 hours ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Last updated by Marcelo Rivera 1 hour ago
                src/app/common/layout/sidebar/navigation.component.scss
                101 ul {
                102 list-style: none;
                103 padding: 0;
                104 }
                105
                106 h5 {
                107 font-size: 11px;
                108 line-height: 30px;
                109 letter-spacing: 1.83px;
                110 text-transform: uppercase;
                111 @include m-theme() {
                112 color: rgba(themed($m-black), 0.3);
                113 }
                114 }
                115
                116 m-group--sidebar-markers {
                • Mark Harding
                  Mark Harding @markeharding · 3 days ago
                  Owner

                  group logic outside of groups?

                • Marcelo Rivera @eiennohi changed this line in version 10 of the diff 1 hour ago

                  changed this line in version 10 of the diff

                • Please register or sign in to reply
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 2 hours ago
              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 3 days ago
                Resolved by Marcelo Rivera 3 hours ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 3 hours ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 3 hours ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Last updated by Marcelo Rivera 1 hour ago
                src/app/common/layout/sidebar/navigation.component.html
                157 >
                158 Settings
                159 </m-tooltip>
                160
                161 <span
                162 class="m-sidebar--navigation--text"
                163 *ngIf="isDesktop || isMobile"
                164 i18n
                165 >
                166 Settings
                167 </span>
                168 </a>
                169 </li>
                170 </ul>
                171 </nav>
                172 <h5 i18n *ngIf="isDesktop || isMobile">
                • Mark Harding
                  Mark Harding @markeharding · 3 days ago
                  Owner

                  ideally this would be in its own isolated component.

                • Marcelo Rivera @eiennohi changed this line in version 10 of the diff 1 hour ago

                  changed this line in version 10 of the diff

                • Please register or sign in to reply
              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 3 days ago
                Resolved by Marcelo Rivera 1 hour ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 3 days ago
                Resolved by Marcelo Rivera 2 hours ago
              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 3 days ago
                src/app/modules/channels/sidebar-v2/sidebar-v2.component.html
                1 <div class="m-channelSidebar__buttons">
                2 <button class="m-channelSidebar__message" i18n>
                • Mark Harding
                  Mark Harding @markeharding · 3 days ago
                  Owner

                  css should focus on this being a button

                • Please register or sign in to reply
              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 3 days ago
                src/app/modules/channels/sidebar-v2/sidebar-v2.component.html
                1 <div class="m-channelSidebar__buttons">
                2 <button class="m-channelSidebar__message" i18n>
                3 <i class="material-icons">sentiment_satisfied_alt</i>
                4 <span>Message</span>
                5 </button>
                6
                7 <button class="m-channelSidebar__pay" i18n>
                8 <i class="material-icons">sentiment_satisfied_alt</i>
                9 <span>Pay</span>
                10 </button>
                11 </div>
                12
                13 <div class="m-channelSidebar__stats">
                • Mark Harding
                  Mark Harding @markeharding · 3 days ago
                  Owner

                  Recommend splitting this out into smaller components. This is getting a very large component.

                • Please register or sign in to reply
              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 3 days ago
                src/app/modules/channels/sidebar-v2/sidebar-v2.component.html
                50 </a>
                51 <a>
                52 <span class="m-channelSidebarStats__title" i18n>
                53 Views
                54 </span>
                55 <span class="m-channelSidebarStats__count">{{
                56 user.impressions | abbr
                57 }}</span>
                58 </a>
                59 </div>
                60
                61 <div class="m-channelSidebar__bioFields">
                62 <!-- [ngClass]="{'m-channelSidebar__bioFields&#45;&#45;flex': !editing}"-->
                63 <!-- City / Location -->
                64 <div
                65 class="m-channelSidebar__bioField m-channelSidebar__city"
                • Mark Harding
                  Mark Harding @markeharding · 3 days ago
                  Owner

                  __city is a modifier?

                • Please register or sign in to reply
              • Mark Harding @markeharding added Status::Requires Changes scoped label 3 days ago

                added scoped label

              • Marcelo Rivera @eiennohi added 3 commits 1 hour ago

                added 3 commits

                • faac2082 - (fix): add consistency to class names
                • 5713c65b - (fix): return type and factory removal
                • 7204c73e - (fix): names

                Compare with previous version

              • Marcelo Rivera @eiennohi added 17 commits 1 hour ago

                added 17 commits

                • 7204c73e...5398250e - 16 commits from branch epic/navigation-93
                • 688f97c9 - Merge branch 'epic/navigation-93' into feat/navigation-superstructure

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 1 hour ago

                added 1 commit

                • b9ae639d - Merge branch 'epic/navigation-93' into feat/navigation-superstructure

                Compare with previous version

              Please register or sign in to reply
              0 Assignees
              None
              None
              Milestone
              None
              Time tracking
              No estimate or time spent
              1
              Labels
              Status::Requires Changes
              Lock merge request
              Unlocked
              10
              10 participants
              user avatar
              user avatar
              user avatar
              user avatar
              user avatar
              user avatar
              user avatar
              Reference: minds/front!747