Skip to content

Commit

Permalink
RSC chore(tests): Add links to scaffolds in test fixture (#10028)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobbe authored Feb 18, 2024
1 parent ad9bef8 commit e9261ce
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@redwoodjs/api": "7.0.0-canary.993",
"@redwoodjs/graphql-server": "7.0.0-canary.993"
"@redwoodjs/api": "7.0.0-canary.1011",
"@redwoodjs/graphql-server": "7.0.0-canary.1011"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
]
},
"devDependencies": {
"@redwoodjs/core": "7.0.0-canary.993",
"@redwoodjs/project-config": "7.0.0-canary.993"
"@redwoodjs/core": "7.0.0-canary.1011",
"@redwoodjs/project-config": "7.0.0-canary.1011"
},
"eslintConfig": {
"extends": "@redwoodjs/eslint-config",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
},
"dependencies": {
"@apollo/experimental-nextjs-app-support": "0.0.0-commit-b8a73fe",
"@redwoodjs/forms": "7.0.0-canary.993",
"@redwoodjs/router": "7.0.0-canary.993",
"@redwoodjs/web": "7.0.0-canary.993",
"@redwoodjs/forms": "7.0.0-canary.1011",
"@redwoodjs/router": "7.0.0-canary.1011",
"@redwoodjs/web": "7.0.0-canary.1011",
"@tobbe.dev/rsc-test": "0.0.3",
"client-only": "0.0.1",
"react": "0.0.0-experimental-e5205658f-20230913",
"react-dom": "0.0.0-experimental-e5205658f-20230913",
"server-only": "0.0.1"
},
"devDependencies": {
"@redwoodjs/vite": "7.0.0-canary.993",
"@redwoodjs/vite": "7.0.0-canary.1011",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,23 @@ const EmptyUserNewEmptyUserPage = serve('EmptyUserNewEmptyUserPage')
const Routes = () => {
return (
<Router>
<Set wrap={ScaffoldLayout} title="EmptyUsers" titleTo="emptyUsers" buttonLabel="New EmptyUser" buttonTo="newEmptyUser">
<Route path="/empty-users/new" page={EmptyUserNewEmptyUserPage} name="newEmptyUser" />
{/* <Route path="/empty-users/{id:Int}/edit" page={EmptyUserEditEmptyUserPage} name="editEmptyUser" />
<Route path="/empty-users/{id:Int}" page={EmptyUserEmptyUserPage} name="emptyUser" /> */}
<Route path="/empty-users" page={EmptyUserEmptyUsersPage} name="emptyUsers" />
</Set>
<Set wrap={ScaffoldLayout} title="UserExamples" titleTo="userExamples" buttonLabel="New UserExample" buttonTo="newUserExample">
<Route path="/user-examples/new" page={UserExampleNewUserExamplePage} name="newUserExample" />
{/* <Route path="/user-examples/{id:Int}/edit" page={UserExampleEditUserExamplePage} name="editUserExample" /> */}
<Route path="/user-examples/{id:Int}" page={UserExampleUserExamplePage} name="userExample" />
<Route path="/user-examples" page={UserExampleUserExamplesPage} name="userExamples" />
</Set>
<Set wrap={NavigationLayout}>
<Route path="/" page={HomePage} name="home" />
<Route path="/about" page={AboutPage} name="about" />

<Set wrap={ScaffoldLayout} title="EmptyUsers" titleTo="emptyUsers" buttonLabel="New EmptyUser" buttonTo="newEmptyUser">
<Route path="/empty-users/new" page={EmptyUserNewEmptyUserPage} name="newEmptyUser" />
{/* <Route path="/empty-users/{id:Int}/edit" page={EmptyUserEditEmptyUserPage} name="editEmptyUser" />
<Route path="/empty-users/{id:Int}" page={EmptyUserEmptyUserPage} name="emptyUser" /> */}
<Route path="/empty-users" page={EmptyUserEmptyUsersPage} name="emptyUsers" />
</Set>

<Set wrap={ScaffoldLayout} title="UserExamples" titleTo="userExamples" buttonLabel="New UserExample" buttonTo="newUserExample">
<Route path="/user-examples/new" page={UserExampleNewUserExamplePage} name="newUserExample" />
{/* <Route path="/user-examples/{id:Int}/edit" page={UserExampleEditUserExamplePage} name="editUserExample" /> */}
<Route path="/user-examples/{id:Int}" page={UserExampleUserExamplePage} name="userExample" />
<Route path="/user-examples" page={UserExampleUserExamplesPage} name="userExamples" />
</Set>
</Set>
<Route notfound page={NotFoundPage} />
</Router>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
.navigation-layout {
& nav {
& > nav {
display: flex;
justify-content: space-between;
align-items: center;
padding: 10px;
background-color: color-mix(in srgb, yellow 50%, transparent);
border-bottom: 2px dashed color-mix(in srgb, yellow 90%, black);
}

& ul {
list-style: none;
display: flex;
margin: 0;
padding: 0;
}
& ul {
list-style: none;
display: flex;
margin: 0;
padding: 0;
}

& li {
margin-right: 10px;
}
& li {
margin-right: 10px;
}

& a {
text-decoration: none;
color: #333;
padding: 5px;
border-bottom: 2px solid transparent;
}
& a {
text-decoration: none;
color: #333;
padding: 5px;
border-bottom: 2px solid transparent;
}

& a:hover {
border-bottom: 2px solid #333;
& a:hover {
border-bottom: 2px solid #333;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ const NavigationLayout = ({ children }: NavigationLayoutProps) => {
<li>
<Link to={routes.about()}>About</Link>
</li>
<li>
<Link to={routes.userExamples()}>User Examples</Link>
</li>
<li>
<Link to={routes.emptyUsers()}>Empty Users</Link>
</li>
</ul>
</nav>
<main>{children}</main>
Expand Down

0 comments on commit e9261ce

Please sign in to comment.