Skip to content

Commit

Permalink
Merge branch 'new_lookbook_url' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
camertron committed May 10, 2024
2 parents 144a369 + 1848c17 commit 42554fd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
deploy:
name: Build and deploy
uses: primer/.github/.github/workflows/deploy_preview.yml@main
uses: primer/.github/.github/workflows/deploy_preview.yml@v1.0.0
secrets:
gh_token: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
13 changes: 4 additions & 9 deletions redirects.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@
"match": "primitives/spacing",
"destination": "/primitives/storybook/?path=/story/size-base--base"
},
{
"name": "Redirect /primitives/typography",
"match": "primitives/typography",
"destination": "/primitives/storybook/?path=/story/typography-base--base"
},
{
"name": "Redirect /primitives",
"match": "^primitives/?$",
Expand Down Expand Up @@ -857,22 +852,22 @@
{
"name": "ViewComponents Preview assets proxy",
"match": "^assets/(.*)",
"destination": "https://view-components-storybook.eastus.cloudapp.azure.com/assets/{R:1}"
"destination": "https://primer-lookbook.github.com/assets/{R:1}"
},
{
"name": "ViewComponents Lookbook assets proxy",
"match": "^lookbook-assets/(.*)",
"destination": "https://view-components-storybook.eastus.cloudapp.azure.com/lookbook-assets/{R:1}"
"destination": "https://primer-lookbook.github.com/lookbook-assets/{R:1}"
},
{
"name": "ViewComponents Lookbook proxy",
"match": "^view-components/lookbook/(.*)",
"destination": "https://view-components-storybook.eastus.cloudapp.azure.com/view-components/lookbook/{R:1}"
"destination": "https://primer-lookbook.github.com/view-components/lookbook/{R:1}"
},
{
"name": "ViewComponents Rails App proxy",
"match": "^view-components/rails-app/(.*)",
"destination": "https://view-components-storybook.eastus.cloudapp.azure.com/view-components/rails-app/{R:1}"
"destination": "https://primer-lookbook.github.com/view-components/rails-app/{R:1}"
},
{
"name": "Presentations proxy",
Expand Down
11 changes: 11 additions & 0 deletions src/components/CustomHead.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from 'react'
import Helmet from 'react-helmet'

export default function CustomHead() {
return (
<Helmet>
<meta name="ha-url" content="https://collector.githubapp.com/primer/collect" />
<script src="https://analytics.githubassets.com/hydro-marketing.min.js"></script>
</Helmet>
)
}
2 changes: 2 additions & 0 deletions src/components/Layout.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import {Box, ThemeProvider} from '@primer/react'
import {Head, Header} from '@primer/gatsby-theme-doctocat'
import CustomHead from './CustomHead'
import '@primer/css/layout/index.scss'
import React from 'react'

export default function Layout({pageContext, children, colorMode}) {
return (
<ThemeProvider colorMode={colorMode || 'night'} nightScheme="dark_dimmed">
<Head title={pageContext.frontmatter.title} description={pageContext.frontmatter.description} />
<CustomHead />
<Header isSearchEnabled={false} />
<Box as={'main'} sx={{backgroundColor: 'canvas.default', color: 'fg.default'}}>
{children}
Expand Down

0 comments on commit 42554fd

Please sign in to comment.