Navigation superstructure
18/21
threads resolved
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
Request to merge
feat/navigation-superstructure
into
epic/navigation-93
The source branch is 2 commits behind the target branch
![Olivia Madrid](data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><rect fill-opacity="0"/></svg>)
DeveloperNote to future reviewers: feature flag for this is
navigation-2020Edited by Olivia Madridadded 2 commits
- Developer
review app not working?
- DeveloperResolved by Marcelo Rivera
- Last reply by Marcelo Rivera
![Marcelo Rivera](data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80"><rect fill-opacity="0"/></svg>)
changed the description
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
Toggle commit listadded 2 commits
changed the description
resolved all threads
approved this merge request
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Last updated by Marcelo Rivera
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"> - Owner
These labels need to be more contextual ie. not
useNewNavigationandlegacyTopbar. Why has legacyTopbar returned as well? - Developer
I just added the new topbar without removing any of the old code. Should I also remove legacyTopbar?
- Owner
This is not used on master from what I can see
changed this line in version 13 of the diff
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Resolved by Marcelo Rivera
- Last updated by Marcelo Rivera
1 <div class="m-channelSidebar__buttons"> 2 <button class="m-channelSidebar__message" i18n> - Owner
css should focus on this being a button
changed this line in version 13 of the diff
- Resolved by Marcelo Rivera
- Last updated by Marcelo Rivera
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--flex': !editing}"--> 63 <!-- City / Location --> 64 <div 65 class="m-channelSidebar__bioField m-channelSidebar__city" - Owner
__cityis a modifier? changed this line in version 13 of the diff
added scoped label
added 17 commits
-
7204c73e...5398250e - 16 commits from branch
epic/navigation-93 - 688f97c9 - Merge branch 'epic/navigation-93' into feat/navigation-superstructure
-
7204c73e...5398250e - 16 commits from branch
added 1 commit
- b9ae639d - Merge branch 'epic/navigation-93' into feat/navigation-superstructure
added 6 commits
- 12e2eb20 - (fix): rename 'navigation-2020' to 'navigation'
- 31fae764 - (feat): split sidebar-v2 into sub-components
- f5e12722 - (feat): only show groups sidebar if the user is logged in
- 0fb13929 - (fix): display older views correctly
- 7309f3a7 - (fix): layout grid should have one row
- 0a65c4cd - (fix): split main component into sub-components
Toggle commit listadded 52 commits
- 5018ca31 - (chore): disable groups and channels onboarding screens
- 14445689 - (fix): experiments service sould be injected with cookieService not storage
- 14293472 - (fix): do not cache for different domains
- 0b7160e2 - (chore): set max memory of nodejs
- 37f6a355 - (chore): reduce caching size and output stats
- 5a0f0093 - (chore): remove caching middleware to test OOM error
- adc84259 - (chore): implement pm2 runtime
- cf9d6e6e - Merge branch 'chore/pm2-runtime' into 'master'
- a3bb24b4 - (chore): reduce max memory per process to 1GB
- 902e149b - (chore): reduce memory to 300M to test SIGKILL failover #2545 (closed)
- eff963de - (chore): increase to 512M - #2545 (closed)
- c849b404 - Local infrastructure provisioner (front)
- 745769a5 - Merge branch 'goal/local-infra' into 'master'
- f9ccbf4b - Merge branch 'chore/disable-screens-2542' into 'master'
- 4273d327 - (fix): group and channel names overflow issue
- 28b1e2b3 - Merge branch 'fix/onboarding-issues' into 'master'
- 9283a783 - (fix): record channel view if passed through via this.user
- 03646b9f - (chore): hashtags should default as trending, not suggested
- d0d71f4d - Posting before rich-embed completed shows unwanted attachment in new comment underneath #2418 (closed)
- 4d90e094 - Merge branch 'fix/premature-posting-2418' into 'master'
- 24173b95 - (chore): temporarily disable cookie prompt for seo experiment
- 308cb3ab - (chore): disable autofocus for seo experiment
- 666f2b75 - (chore): preload material icons for seo experiment and ssr visuals
- 8abaffef - Remove duplicate bnjs
- e293cdcd - Merge branch 'chore/remove-duplicate-bnjs' into 'master'
- 90d72243 - (chore): update docker image to latest when pushing to master
- 3434db17 - (chore): add ugc to links
- 7531c85c - (fix): if not a valid domain then redirect to root
- 13d96fd6 - (fix): revert sloppy change to topbar
- 6822f8c9 - Merge branch 'fix/redirect-non-pro-to-root' into 'master'
- de34bd78 - (chore): robot rules for low interaction posts
- 266c3f0d - (fix): channel no index should be less than <
- 1fa4019c - Replaced dead link
- c546247b - (chore): more seo tweaks
- 60151651 - (chore): improve homepage title SEO
- 25be8190 - (chore): add nosnippet to bagdes
- d04cf65a - (chore): set cache headers on s3 bucket when deploying
- d82eaf2e - (chore): preload material font css
- 4a673ef2 - (fix): spacing on topbar login for new reg pages
- 98577295 - (fix): double right margin due to duplicate css block
- 9c33d87f - (fix): description container trim in SSR throwing error
- 815d7e8a - (chore): remove buggy media page desciption
- 1a0dc356 - (chore): start sidebar markers in loading state, server side
- fd093f43 - (chore): improve load speed of wallet page on SSR
- d3223fbc - Merge branch 'fix/minds-irl-footer' into 'master'
- 68ee7319 - Merge remote-tracking branch 'upstream/master' into feat/navigation-superstructure
- 084b656d - (fix): remove margins
- 91cfefce - (fix): update all pages to the new layout
- 7e59c4ef - (feat): logged out topbar
- c9438828 - (fix): remove console.warn
- 0daf0d43 - (fix): group sidebar issues when logging in
- 661ace02 - (fix): rollback new channel as the design was a WIP
Toggle commit list
DeveloperI tried to fix up the merge conflicts @eiennohi but there's too many ambiguous ones for me to safely update.
