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.

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 #572

Merged
merged 5 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 2 deletions .github/workflows/deploy_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ on:
- master

jobs:

build-push:
runs-on: ubuntu-20.04

env:
NODE_OPTIONS: "--max_old_space_size=4096"

outputs:
registry-path: ${{ steps.push-to-quay.outputs.registry-path }}
registry-paths: ${{ steps.push-to-quay.outputs.registry-paths }}
Expand All @@ -25,7 +28,7 @@ jobs:
with:
node-version: 18.x
registry-url: https://registry.npmjs.org/
cache: 'npm'
cache: "npm"

- name: installing
run: npm install
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
- synchronize

jobs:

release:
runs-on: ubuntu-20.04

Expand All @@ -25,7 +24,7 @@ jobs:
with:
node-version: 18.x
registry-url: https://registry.npmjs.org/
cache: 'npm'
cache: "npm"

- name: installing
run: npm install
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ 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:sw
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:sw
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
19 changes: 15 additions & 4 deletions gatsby-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,20 @@ 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 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 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 {
CssBaseline,
Experimental_CssVarsProvider as CssVarsProvider,
lightTheme,
} from "decentraland-ui2"

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

export const registerServiceWorker = () => true
Expand All @@ -40,7 +46,12 @@ export const wrapRootElement = ({ element }) => (
<AuthProvider sso={ssoUrl}>
<TrackingPlacesSearchProvider>
<FeatureFlagProvider applicationName={["places", "dapps"]}>
<ShareProvider>{element}</ShareProvider>
<ShareProvider>
<CssVarsProvider theme={lightTheme}>
<CssBaseline />
{element}
</CssVarsProvider>
</ShareProvider>
</FeatureFlagProvider>
</TrackingPlacesSearchProvider>
</AuthProvider>
Expand All @@ -49,9 +60,9 @@ export const wrapRootElement = ({ element }) => (
export const wrapPageElement = ({ element, props }) => {
return (
<IntlProvider {...props.pageContext.intl}>
<Layout {...props} activePage="explorer">
<Layout2 {...props} activePage="explorer">
{element}
</Layout>
</Layout2>
</IntlProvider>
)
}
Expand Down
Loading