Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/472 #566

Merged
merged 7 commits into from
Nov 6, 2023
Merged

Feature/472 #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7c3820
feat: update tweet node selected view
Nov 1, 2023
253ade9
feat: change button size
Nov 1, 2023
0405160
feat: change layer for selected node, fixed minor issues
Nov 3, 2023
968f59a
feat: fix conflicts
Nov 3, 2023
c5313a5
Merge branch 'master' into feature/472
kevkevinpal Nov 6, 2023
a4a6589
Merge remote-tracking branch 'origin/master' into feature/472
kevkevinpal Nov 6, 2023
b725807
Merge branch 'master' into feature/472
kevkevinpal Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Second Brain</title>
<script type="module" crossorigin src="/assets/index-8e2e39f2.js"></script>
<link rel="stylesheet" href="/assets/index-381991a0.css">
<script type="module" crossorigin src="/assets/index-a7fcec29.js"></script>
<link rel="stylesheet" href="/assets/index-381991a0.css" />
</head>
<body style="background: #000">
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!-- Add entry point 👇 -->



<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand Down
6 changes: 4 additions & 2 deletions src/components/App/SideBar/SidebarSubView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import styled from 'styled-components'
import ChevronLeftIcon from '~/components/Icons/ChevronLeftIcon'
import CloseIcon from '~/components/Icons/CloseIcon'
import { Flex } from '~/components/common/Flex'
import { useAppStore } from '~/stores/useAppStore'
import { useDataStore } from '~/stores/useDataStore'
import { colors } from '~/utils/colors'
import { SelectedNodeView } from '../SelectedNodeView'
Expand All @@ -16,6 +17,8 @@ export const SideBarSubView = ({ open }: Props) => {
s.showTeachMe,
])

const [setSidebarOpen] = useAppStore((s) => [s.setSidebarOpen])

return (
<Slide direction="right" in={open} mountOnEnter style={{ width: showTeachMe ? '700px' : '' }} unmountOnExit>
<Wrapper>
Expand All @@ -32,8 +35,7 @@ export const SideBarSubView = ({ open }: Props) => {
</CloseButton>
<CollapseButton
onClick={() => {
setSelectedNode(null)
setTeachMe(false)
setSidebarOpen(false)
}}
>
<ChevronLeftIcon />
Expand Down
11 changes: 9 additions & 2 deletions src/components/SourcesTableModal/SourcesView/Topics/Search/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ export const Search = () => {
const [filters, setFilters] = useTopicsStore((s) => [s.filters, s.setFilters])
const [inputValue, setInputValue] = useState('')

const handleSearch = () => setFilters({ search: inputValue })
const handleSearch = (e: { preventDefault: () => void }) => {
e.preventDefault()
setFilters({ search: inputValue })
}

const resetSearch = () => {
setInputValue('')
Expand All @@ -23,7 +26,11 @@ export const Search = () => {
}

return (
<Paper component="form" sx={{ p: '2px 4px', display: 'flex', alignItems: 'center', width: 300 }}>
<Paper
component="form"
onSubmit={handleSearch}
sx={{ p: '2px 4px', display: 'flex', alignItems: 'center', width: 300 }}
>
<InputBase
inputProps={{ 'aria-label': 'search topic' }}
onChange={(e) => setInputValue(e.target.value)}
Expand Down
6 changes: 3 additions & 3 deletions src/components/Universe/Graph/Cubes/RelevanceBadges/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ const NodeBadge = ({ position, userData, color }: BadgeProps) => {
const isHovered = useMemo(() => hoveredNode?.ref_id === userData?.ref_id, [hoveredNode?.ref_id, userData?.ref_id])
const isSelected = selectedNode?.ref_id === userData?.ref_id

return (isSelected && showSelectionGraph) || !isSelected ? (
return isTopic || (isSelected && showSelectionGraph) || !isSelected ? (
<group ref={ref} position={position}>
<Html center sprite>
<Html center sprite zIndexRange={[0, 0]}>
<Tag
className={clsx(userData?.node_type, { selected: isSelected })}
color={color}
fontColor={colors.white}
fontSize={isTopic ? 14 : 20}
fontSize={isTopic ? 64 : 20}
onClick={(e) => {
e.stopPropagation()

Expand Down
2 changes: 1 addition & 1 deletion src/components/Universe/Graph/Cubes/Text/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const TextNode = memo(({ node, hide }: Props) => {
position={[node.x, node.y, node.z]}
scale={textScale}
userData={node}
visible={!hide}
visible={!hide && !isSelected}
{...fontProps}
>
{node.label}
Expand Down
4 changes: 1 addition & 3 deletions src/components/Universe/Graph/Cubes/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const Cubes = memo(() => {
onPointerOver={onPointerIn}
>
<BlurryInstances hide={hideUniverse} />

<RelevanceBadges />
{data.nodes
.filter((f) => {
const isSelected = f?.ref_id === selectedNode?.ref_id
Expand All @@ -103,8 +103,6 @@ export const Cubes = memo(() => {
})}

{hideUniverse && <SelectionDataNodes />}

<RelevanceBadges />
</Select>
)
})
Expand Down
Loading