-
Notifications
You must be signed in to change notification settings - Fork 49
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.
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
feat: Instagraph added changes to open the side bar view #478
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
5e9552c
feat: added changes to open the side bar view
invalid-email-address 4d18962
feat: frontend major changes done need to connect to boltwall webhook
invalid-email-address 7b57fab
feat: got instagraph working properly
invalid-email-address cd16456
fix: build issues and lint issues
invalid-email-address e472519
build: added new yarn.lock
invalid-email-address 5a712bd
fix: prettier
invalid-email-address 440e091
Merge branch 'master' into instagraph
kevkevinpal 93a2225
fix: prettier
invalid-email-address 08dd022
fix: fix
invalid-email-address f1c8667
fix: fix
invalid-email-address 37fea83
fix: addressing comments for smaller changes like logs
invalid-email-address 0153597
test: lower min coverage amount
invalid-email-address ba6e1f4
fix: made styled component
invalid-email-address 6d9b873
fix: made boolean and teachme loader component
invalid-email-address 178b648
fix: fix
kevkevinpal c1d1e84
fix: minor cleanups
kevkevinpal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import { memo } from 'react' | ||
import { useSelectedNode } from '~/stores/useDataStore' | ||
import { useSelectedNode, useDataStore } from '~/stores/useDataStore' | ||
import { TextType } from '../../Helper/AskQuestion/Text' | ||
import { AudioClip } from '../AudioClip' | ||
import { Creator } from '../Creator' | ||
|
@@ -11,10 +11,16 @@ import { Topic } from '../Topic' | |
import { TwitData } from '../TwitData' | ||
import { Twitter } from '../Twitter' | ||
import { YouTube } from '../YouTube' | ||
import { TeachMeText } from '../../Helper/TeachMe' | ||
|
||
// eslint-disable-next-line no-underscore-dangle | ||
const _View = () => { | ||
const selectedNode = useSelectedNode() | ||
const [showTeachMe] = useDataStore((s) => [s.showTeachMe]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Again I can put this in the teachMe store |
||
|
||
if (showTeachMe) { | ||
return <TeachMeText /> | ||
} | ||
|
||
switch (selectedNode?.node_type) { | ||
case 'twitter': | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,37 +3,43 @@ 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' | ||
|
||
type Props = { open: boolean } | ||
|
||
export const SideBarSubView = ({ open }: Props) => { | ||
const [setSidebarOpen] = useAppStore((s) => [s.setSidebarOpen]) | ||
const setSelectedNode = useDataStore((s) => s.setSelectedNode) | ||
const [setSelectedNode, setTeachMe, showTeachMe] = useDataStore((s) => [ | ||
s.setSelectedNode, | ||
s.setTeachMe, | ||
s.showTeachMe, | ||
]) | ||
|
||
return ( | ||
<> | ||
<Slide direction="right" in={open} mountOnEnter unmountOnExit> | ||
<Wrapper> | ||
<ScrollWrapper> | ||
<SelectedNodeView /> | ||
</ScrollWrapper> | ||
<CloseButton onClick={() => setSelectedNode(null)}> | ||
<CloseIcon /> | ||
</CloseButton> | ||
<CollapseButton | ||
onClick={() => { | ||
setSidebarOpen(false) | ||
}} | ||
> | ||
<ChevronLeftIcon /> | ||
</CollapseButton> | ||
</Wrapper> | ||
</Slide> | ||
</> | ||
<Slide direction="right" in={open} mountOnEnter style={{ width: showTeachMe ? '700px' : '' }} unmountOnExit> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. might want to consider mobile view since this is |
||
<Wrapper> | ||
<ScrollWrapper> | ||
<SelectedNodeView /> | ||
</ScrollWrapper> | ||
<CloseButton | ||
onClick={() => { | ||
setSelectedNode(null) | ||
setTeachMe(false) | ||
}} | ||
> | ||
<CloseIcon /> | ||
</CloseButton> | ||
<CollapseButton | ||
onClick={() => { | ||
setSelectedNode(null) | ||
setTeachMe(false) | ||
}} | ||
> | ||
<ChevronLeftIcon /> | ||
</CollapseButton> | ||
</Wrapper> | ||
</Slide> | ||
) | ||
} | ||
|
||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can move setTeachMe into the teachMe Store