-
Notifications
You must be signed in to change notification settings - Fork 19
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
fix: Use the Community Bubble instead of the custom Discord bubble #453
Merged
Merged
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
48642f1
fix: Use the Community Bubble instead of the custom Discord bubble
LautaroPetaccio db47546
fix: Lockfile
LautaroPetaccio eed47eb
fix: Try fixing package-lock
LautaroPetaccio 9e25ef8
fix package-lock
aed05e0
fix: Use new navbar
LautaroPetaccio d68c4e5
feat: Add new Navbar
LautaroPetaccio 7af2442
fix: Update UI
LautaroPetaccio 96131c9
fix: Try to see if it fixes the package-lock
LautaroPetaccio 700f666
fix: Use cache and install
LautaroPetaccio 0b7a04f
fix: Removed dependencies
LautaroPetaccio 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
fix: Use new navbar
- Loading branch information
commit aed05e0b00c4414fd74b3c496846c6c3e895233c
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
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
---|---|---|
|
@@ -34,6 +34,8 @@ | |
] | ||
}, | ||
"dependencies": { | ||
"@0xsquid/sdk": "^2.8.9", | ||
"@0xsquid/squid-types": "^0.1.51", | ||
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. should this be on dev dependencies |
||
"@dcl/explorer": "^1.0.158859-20240110140315.commit-19935b0", | ||
"@dcl/feature-flags": "^1.2.0", | ||
"@dcl/kernel-interface": "^2.0.0-20230512115658.commit-b582e05", | ||
|
@@ -43,7 +45,7 @@ | |
"@sentry/browser": "^7.91.0", | ||
"@sentry/tracing": "^7.91.0", | ||
"decentraland-connect": "^5.5.0", | ||
"decentraland-dapps": "^16.31.3", | ||
"decentraland-dapps": "^17.0.0", | ||
"decentraland-ui": "^5.2.0", | ||
"detect-browser": "^5.2.0", | ||
"dotenv": "^16.3.1", | ||
|
@@ -77,4 +79,4 @@ | |
"typescript": "^4.5.5" | ||
}, | ||
"homepage": "" | ||
} | ||
} |
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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { connect } from 'react-redux' | ||
import { Dispatch } from 'redux' | ||
import { | ||
isConnected, | ||
isConnecting, | ||
getAddress, | ||
getManaBalances | ||
} from 'decentraland-dapps/dist/modules/wallet/selectors' | ||
import { disconnectWallet } from 'decentraland-dapps/dist/modules/wallet/actions' | ||
import { getData as getProfiles } from 'decentraland-dapps/dist/modules/profile/selectors' | ||
// import { MapStateProps, MapDispatchProps } from './Navbar.types' | ||
import { StoreType } from '../../../../state/redux' | ||
import Navbar from './Navbar' | ||
|
||
const mapState = (state: StoreType): any => { | ||
const address = getAddress(state) | ||
const profile = address ? getProfiles(state)[address] : undefined | ||
return { | ||
avatar: profile ? profile.avatars[0] : undefined, | ||
manaBalances: getManaBalances(state), | ||
address: getAddress(state), | ||
isSignedIn: isConnected(state), | ||
isSigningIn: isConnecting(state) | ||
} | ||
} | ||
|
||
const mapDispatch = (dispatch: Dispatch): any => ({ | ||
onSignOut: () => dispatch(disconnectWallet()) | ||
}) | ||
|
||
export default connect(mapState, mapDispatch)(Navbar) as any |
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 |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import { useCallback } from 'react' | ||
import { Navbar as Base } from 'decentraland-ui/dist/components/Navbar/Navbar' | ||
|
||
const Navbar = (props: any) => { | ||
const handleSignIn = useCallback(() => { | ||
const site = /^decentraland.(zone|org|today)$/.test(window.location.host) ? '/play' : '' | ||
window.location.replace(`/auth/login?redirectTo=${site}`) | ||
}, []) | ||
|
||
const handleSignOut = useCallback(() => { | ||
props.onSignOut() | ||
}, [props.onSignOut]) | ||
|
||
return ( | ||
<Base | ||
onClickSignIn={handleSignIn} | ||
onClickSignOut={handleSignOut} | ||
onClickSignOut={handleSignOut} | ||
activePage="play" | ||
{...props} | ||
/> | ||
) | ||
} | ||
|
||
export default Navbar |
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 |
---|---|---|
@@ -0,0 +1,2 @@ | ||
import Navbar from './Navbar.container' | ||
export default Navbar |
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
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.
where is this being used?