From 368e44640009a20e56e014ce88c1222bf5259560 Mon Sep 17 00:00:00 2001 From: Julian Chandra <67612037+julianchandra@users.noreply.github.com> Date: Tue, 6 Apr 2021 11:09:10 -0700 Subject: [PATCH 1/4] update categories There are some categories we don't have any more e.g. rabbit hole, enlightenment etc. --- web/src/category-metadata.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/web/src/category-metadata.js b/web/src/category-metadata.js index 569911579..28f32edc0 100644 --- a/web/src/category-metadata.js +++ b/web/src/category-metadata.js @@ -4,13 +4,13 @@ module.exports.CATEGORY_METADATA = { // [PAGES.BIG_HITS]: { - // title: '', - // description: '', + // title: 'Big Hits', + // description: 'Animation, pop culture, comedy, and all the other weird on Odysee', // image: '', // }, // [PAGES.COMMUNITY]: { - // title: '', - // description: '', + // title: 'The Universe', + // description: 'Podcasts, life, learning, and everything else on Odysee', // image: '', // }, // [PAGES.ENLIGHTENMENT]: { @@ -19,13 +19,13 @@ module.exports.CATEGORY_METADATA = { // image: '', // }, // [PAGES.FINANCE]: { - // title: '', - // description: '', + // title: 'Finance 2.0', + // description: 'Crypto, Money, Economics, Markets on Odysee ', // image: '', // }, // [PAGES.GAMING]: { - // title: '', - // description: '', + // title: 'Gaming', + // description: 'Pew pew bzzz gaming on Odysee', // image: '', // }, // [PAGES.GENERAL]: { @@ -34,13 +34,13 @@ module.exports.CATEGORY_METADATA = { // image: '', // }, // [PAGES.LAB]: { - // title: '', - // description: '', + // title: 'Lab', + // description: 'Science - the real kind, on Odysee', // image: '', // }, // [PAGES.NEWS]: { - // title: '', - // description: '', + // title: 'News & Politics', + // description: 'Stay up to date with all that's happening around the world on Odysee', // image: '', // }, // [PAGES.RABBIT_HOLE]: { @@ -54,13 +54,13 @@ module.exports.CATEGORY_METADATA = { // image: '', // }, // [PAGES.TECHNOLOGY]: { - // title: '', - // description: '', + // title: 'Tech', + // description: 'Hardware, software, startups, photography on Odysee', // image: '', // }, // [PAGES.WILD_WEST]: { - // title: '', - // description: '', + // title: 'Wild West', + // description: 'Boosted by user credits, this is what the community promotes on Odysee', // image: '', // }, }; -- 2.45.3 From a23f0cb30ff199e80629b258f35fd242c828f79f Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Tue, 13 Apr 2021 00:30:39 -0400 Subject: [PATCH 2/4] add back tags search --- ui/component/wunderbarSuggestions/view.jsx | 23 +++++++++++++++----- ui/scss/component/_wunderbar.scss | 25 +++++++++++++++++++++- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/ui/component/wunderbarSuggestions/view.jsx b/ui/component/wunderbarSuggestions/view.jsx index c8e58189f..145d6ebe2 100644 --- a/ui/component/wunderbarSuggestions/view.jsx +++ b/ui/component/wunderbarSuggestions/view.jsx @@ -1,4 +1,5 @@ // @flow +import type { ElementRef } from 'react'; import { URL, URL_LOCAL, URL_DEV, KNOWN_APP_DOMAINS } from 'config'; import * as PAGES from 'constants/pages'; import * as ICONS from 'constants/icons'; @@ -17,7 +18,6 @@ import { useHistory } from 'react-router'; import { formatLbryUrlForWeb } from 'util/url'; import useThrottle from 'effects/use-throttle'; import Yrbl from 'component/yrbl'; -import type { ElementRef } from 'react'; const LBRY_PROTOCOL = 'lbry://'; const WEB_DEV_PREFIX = `${URL_DEV}/`; @@ -25,6 +25,7 @@ const WEB_LOCAL_PREFIX = `${URL_LOCAL}/`; const WEB_PROD_PREFIX = `${URL}/`; const SEARCH_PREFIX = `$/${PAGES.SEARCH}q=`; const INVALID_URL_ERROR = "Invalid LBRY URL entered. Only A-Z, a-z, 0-9, and '-' allowed."; +const TAG_SEARCH_PREFIX = 'tag:'; const L_KEY_CODE = 76; const ESC_KEY_CODE = 27; @@ -109,7 +110,10 @@ export default function WunderBarSuggestions(props: Props) { } } - if (!isLbryUrl) { + if (value.startsWith(TAG_SEARCH_PREFIX)) { + const tag = value.slice(TAG_SEARCH_PREFIX.length); + push(`/$/${PAGES.DISCOVER}?t=${tag}`); + } else if (!isLbryUrl) { navigateToSearchPage(value); } else { let query = 'lbry://' + value.slice(LBRY_PROTOCOL.length).replace(/:/g, '#'); @@ -268,9 +272,18 @@ export default function WunderBarSuggestions(props: Props) { {results.slice(0, isMobile ? 20 : 5).map((uri) => ( ))} - - + + )} diff --git a/ui/scss/component/_wunderbar.scss b/ui/scss/component/_wunderbar.scss index 3eabf08ca..fa2149a9a 100644 --- a/ui/scss/component/_wunderbar.scss +++ b/ui/scss/component/_wunderbar.scss @@ -192,7 +192,7 @@ } @media (min-width: $breakpoint-small) { - margin-bottom: var(--spacing-m); + margin-bottom: var(--spacing-xs); } } @@ -241,6 +241,29 @@ } } +.wunderbar__tag-search { + .tag { + display: flex; + align-items: center; + height: 1.2rem; + margin-left: var(--spacing-xxs); + + &:hover { + background-color: var(--color-tag-bg); + color: var(--color-tag); + } + } +} + +.wunderbar__bottom-links { + display: flex; + align-items: center; + + :first-child { + flex: 1; + } +} + [data-reach-combobox-option] { padding: 0; border-radius: var(--border-radius); -- 2.45.3 From fbff266b281662777b2054d5a9249e75c69b93a7 Mon Sep 17 00:00:00 2001 From: zeppi Date: Mon, 12 Apr 2021 23:52:50 -0400 Subject: [PATCH 3/4] add br mindblown icon --- ui/component/common/icon-custom.jsx | 30 +++++++++++++++++++++++++++++ ui/constants/icons.js | 1 + 2 files changed, 31 insertions(+) diff --git a/ui/component/common/icon-custom.jsx b/ui/component/common/icon-custom.jsx index 107bf9bf9..1aa31ffde 100644 --- a/ui/component/common/icon-custom.jsx +++ b/ui/component/common/icon-custom.jsx @@ -1660,6 +1660,36 @@ export const icons = { ), + [ICONS.MIND_BLOWN]: (props: CustomProps) => ( + + + + + + + + + + + + + + + + ), [ICONS.MOVIES]: (props: CustomProps) => ( Date: Tue, 13 Apr 2021 13:31:35 -0400 Subject: [PATCH 4/4] Julian's updates --- web/src/category-metadata.js | 92 ++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/web/src/category-metadata.js b/web/src/category-metadata.js index 28f32edc0..0bf1bb500 100644 --- a/web/src/category-metadata.js +++ b/web/src/category-metadata.js @@ -1,66 +1,66 @@ -// const PAGES = require('../../ui/constants/pages'); +const PAGES = require('../../ui/constants/pages'); // Uncomment as you add metadata module.exports.CATEGORY_METADATA = { - // [PAGES.BIG_HITS]: { - // title: 'Big Hits', - // description: 'Animation, pop culture, comedy, and all the other weird on Odysee', - // image: '', - // }, - // [PAGES.COMMUNITY]: { - // title: 'The Universe', - // description: 'Podcasts, life, learning, and everything else on Odysee', - // image: '', - // }, + [PAGES.BIG_HITS]: { + title: 'Big Hits', + description: 'Animation, pop culture, comedy, and all the other weird on Odysee', + image: '', + }, + [PAGES.COMMUNITY]: { + title: 'The Universe', + description: 'Podcasts, life, learning, and everything else on Odysee', + image: '', + }, // [PAGES.ENLIGHTENMENT]: { // title: '', // description: '', // image: '', // }, - // [PAGES.FINANCE]: { - // title: 'Finance 2.0', - // description: 'Crypto, Money, Economics, Markets on Odysee ', - // image: '', - // }, - // [PAGES.GAMING]: { - // title: 'Gaming', - // description: 'Pew pew bzzz gaming on Odysee', - // image: '', - // }, + [PAGES.FINANCE]: { + title: 'Finance 2.0', + description: 'Crypto, Money, Economics, Markets on Odysee ', + image: '', + }, + [PAGES.GAMING]: { + title: 'Gaming', + description: 'Pew pew bzzz gaming on Odysee', + image: '', + }, // [PAGES.GENERAL]: { // title: '', // description: '', // image: '', // }, - // [PAGES.LAB]: { - // title: 'Lab', - // description: 'Science - the real kind, on Odysee', - // image: '', - // }, - // [PAGES.NEWS]: { - // title: 'News & Politics', - // description: 'Stay up to date with all that's happening around the world on Odysee', - // image: '', - // }, - // [PAGES.RABBIT_HOLE]: { - // title: '', - // description: '', - // image: '', - // }, + [PAGES.LAB]: { + title: 'Lab', + description: 'Science - the real kind, on Odysee', + image: '', + }, + [PAGES.NEWS]: { + title: 'News & Politics', + description: `Stay up to date with all that's happening around the world on Odysee`, + image: '', + }, + [PAGES.RABBIT_HOLE]: { + title: '', + description: '', + image: '', + }, // [PAGES.SCIENCE]: { // title: '', // description: '', // image: '', // }, - // [PAGES.TECHNOLOGY]: { - // title: 'Tech', - // description: 'Hardware, software, startups, photography on Odysee', - // image: '', - // }, - // [PAGES.WILD_WEST]: { - // title: 'Wild West', - // description: 'Boosted by user credits, this is what the community promotes on Odysee', - // image: '', - // }, + [PAGES.TECHNOLOGY]: { + title: 'Tech', + description: 'Hardware, software, startups, photography on Odysee', + image: '', + }, + [PAGES.WILD_WEST]: { + title: 'Wild West', + description: 'Boosted by user credits, this is what the community promotes on Odysee', + image: '', + }, }; -- 2.45.3