Skip to content

Commit

Permalink
Merge branch 'main' of github.com:redwoodjs/redwood into feat/locatio…
Browse files Browse the repository at this point in the history
…n-serverStore

* 'main' of github.com:redwoodjs/redwood:
  RSC: kitchen-sink: Fix css pixels unit (redwoodjs#10696)
  RSC: kitchen-sink: Use `<Link>` from @redwoodjs/router (redwoodjs#10695)
  • Loading branch information
dac09 committed May 29, 2024
2 parents 703a9b4 + d0fb53e commit 91bc859
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

import type { FindEmptyUsers, FindEmptyUsersVariables } from 'types/graphql'

// TODO (RSC): Use Link from '@redwoodjs/router'
// import { Link, routes } from '@redwoodjs/router'
import { routes } from '@redwoodjs/router'
import { Link, routes } from '@redwoodjs/router'
import type {
CellSuccessProps,
CellFailureProps,
Expand All @@ -13,10 +11,6 @@ import type {

import EmptyUsers from 'src/components/EmptyUser/EmptyUsers'

const Link = (props: any) => {
return <a href={props.to}>{props.children}</a>
}

export const QUERY: TypedDocumentNode<FindEmptyUsers, FindEmptyUsersVariables> =
gql`
query FindEmptyUsers {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const Success = ({ file }: SuccessProps) => {
border: '1px solid gray',
margin: '1em',
background: '#ddd',
height: '260xp',
height: '260px',
overflowY: 'scroll',
}}
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Link } from '@redwoodjs/router/dist/link'
import { namedRoutes as routes } from '@redwoodjs/router/dist/namedRoutes'

import ReadFileServerCell from 'src/components/ReadFileServerCell'
Expand All @@ -9,10 +10,6 @@ type NavigationLayoutProps = {
rnd?: number
}

const Link = (props: any) => {
return <a href={props.to}>{props.children}</a>
}

const NavigationLayout = ({ children, rnd }: NavigationLayoutProps) => {
return (
<div className="navigation-layout">
Expand Down

0 comments on commit 91bc859

Please sign in to comment.