Skip to content

Commit

Permalink
feat: Navbar2 integration (#431)
Browse files Browse the repository at this point in the history
* feat: Navbar2 integration

* fix: back onclick

* fix: build gatsby

* feat: add layout active page
  • Loading branch information
braianj authored Jan 5, 2024
1 parent 8d72d24 commit a445535
Show file tree
Hide file tree
Showing 7 changed files with 484 additions and 142 deletions.
8 changes: 2 additions & 6 deletions gatsby-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,14 @@ import "decentraland-ui/dist/themes/alternative/light-theme.css"
import "decentraland-gatsby/dist/variables.css"
// eslint-disable-next-line css-import-order/css-import-order
import "./src/theme.css"

import Layout from "decentraland-gatsby/dist/components/Layout/Layout"
import UserInformation from "decentraland-gatsby/dist/components/User/UserInformation"
import AuthProvider from "decentraland-gatsby/dist/context/Auth/AuthProvider"
import FeatureFlagProvider from "decentraland-gatsby/dist/context/FeatureFlag/FeatureFlagProvider"
import ShareProvider from "decentraland-gatsby/dist/context/Share/ShareProvider"
import { IntlProvider } from "decentraland-gatsby/dist/plugins/intl"
import segment from "decentraland-gatsby/dist/utils/development/segment"
import env from "decentraland-gatsby/dist/utils/env"

import Layout from "./src/components/Layout/Layout"
import { TrackingPlacesSearchProvider } from "./src/context/TrackingContext"

export const registerServiceWorker = () => true
Expand All @@ -51,9 +49,7 @@ export const wrapRootElement = ({ element }) => (
export const wrapPageElement = ({ element, props }) => {
return (
<IntlProvider {...props.pageContext.intl}>
<Layout {...props} rightMenu={<UserInformation />} activePage="places">
{element}
</Layout>
<Layout {...props}>{element}</Layout>
</IntlProvider>
)
}
Expand Down
7 changes: 7 additions & 0 deletions gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,19 @@

// eslint-disable-next-line @typescript-eslint/no-var-requires
const sharp = require("sharp")
// eslint-disable-next-line @typescript-eslint/no-var-requires
const webpack = require("webpack")
sharp.cache(false)
sharp.simd(false)

// You can delete this file if you're not using it
exports.onCreateWebpackConfig = ({ actions }) => {
actions.setWebpackConfig({
plugins: [
new webpack.NormalModuleReplacementPlugin(/node:/, (resource) => {
resource.request = resource.request.replace(/^node:/, "")
}),
],
resolve: {
fallback: {
assert: false,
Expand Down
Loading

0 comments on commit a445535

Please sign in to comment.