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

feat: Navbar from UI2 #717

Merged
merged 3 commits into from
Jan 3, 2025
Merged

feat: Navbar from UI2 #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97f9264
feat: Navbar from UI2
braianj Jan 2, 2025
4b309ce
feat: change node options in github workflow
braianj Jan 3, 2025
2e2441d
feat: update build size in dockerfile
braianj Jan 3, 2025
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ COPY ./gatsby-node.js /app/gatsby-node.js
COPY ./gatsby-ssr.js /app/gatsby-ssr.js
COPY ./tsconfig.json /app/tsconfig.json

RUN NODE_OPTIONS="--max-old-space-size=2048" npm run build:server
RUN NODE_OPTIONS="--max-old-space-size=2048" npm run build:front -- --prefix-paths
RUN NODE_OPTIONS="--max-old-space-size=4096" npm run build:server
RUN NODE_OPTIONS="--max-old-space-size=4096" npm run build:front -- --prefix-paths
RUN npm prune --production

FROM node:18.8-alpine
Expand Down
17 changes: 14 additions & 3 deletions gatsby-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,19 @@ import "./src/theme.css"

// import Helmet from 'react-helmet'
// import { RawIntlProvider, createIntl } from 'react-intl'
import Layout from "decentraland-gatsby/dist/components/Layout/Layout"
import Layout2 from "decentraland-gatsby/dist/components/Layout/Layout2"
import AuthProvider from "decentraland-gatsby/dist/context/Auth/AuthProvider"
import FeatureFlagProvider from "decentraland-gatsby/dist/context/FeatureFlag/FeatureFlagProvider"
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 {
CssBaseline,
Experimental_CssVarsProvider as CssVarsProvider,
lightTheme,
} from "decentraland-ui2"

import Categories from "./src/context/Category"
import Events from "./src/context/Event"
import ProfileSettings from "./src/context/ProfileSetting"
Expand All @@ -43,7 +49,12 @@ export const wrapRootElement = ({ element }) => (
<FeatureFlagProvider applicationName={["events", "dapps"]}>
<ProfileSettings>
<Events>
<Categories>{element}</Categories>
<Categories>
<CssVarsProvider theme={lightTheme}>
<CssBaseline />
{element}
</CssVarsProvider>
</Categories>
</Events>
</ProfileSettings>
</FeatureFlagProvider>
Expand All @@ -53,7 +64,7 @@ export const wrapRootElement = ({ element }) => (
export const wrapPageElement = ({ element, props }) => {
return (
<IntlProvider {...props.pageContext.intl}>
<Layout activePage="explore">{element}</Layout>
<Layout2 activePage="explore">{element}</Layout2>
</IntlProvider>
)
}
Expand Down
Loading