Skip to content

Commit

Permalink
root layout #4312
Browse files Browse the repository at this point in the history
  • Loading branch information
Zemnmez committed Dec 23, 2023
1 parent c266d9f commit 9a4aefd
Show file tree
Hide file tree
Showing 19 changed files with 514 additions and 472 deletions.
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"typescript.tsdk": "node_modules\\typescript\\lib",
"html.autoClosingTags": false,
"editor.wordWrapColumn": 80,
"editor.wordBasedSuggestions": false,
"editor.wordBasedSuggestions": "off",
"[mdx]": {
"editor.wordWrap": "bounded",
"editor.wordWrapColumn": 80
Expand All @@ -22,7 +22,7 @@
"eslint.format.enable": true,
"eslint.onIgnoredFiles": "warn",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"go.goroot": "${workspaceFolder}/bazel-${workspaceFolderBasename}/external/go_sdk",
"go.toolsEnvVars": {
Expand Down
2 changes: 1 addition & 1 deletion project/zemn.me/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ ts_project(
"//:node_modules/react",
"//:node_modules/seedrandom",
"//project/zemn.me/bio",
"//project/zemn.me/assets/kenwood",
"//project/zemn.me/components",
"//project/zemn.me/components/TimeEye",
"//project/zemn.me/components/ZemnmezLogo",
"//project/zemn.me/components/HeroLayout",
"//ts/next.js",
"//ts/react/lang",
"//ts/iter",
Expand Down
36 changes: 0 additions & 36 deletions project/zemn.me/app/ClientLayout.tsx

This file was deleted.

10 changes: 8 additions & 2 deletions project/zemn.me/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import ClientLayout from 'project/zemn.me/app/ClientLayout';
import 'project/zemn.me/app/base.css';

import { HeroLayout } from 'project/zemn.me/components/HeroLayout/HeroLayout';
import { ReactNode } from 'react';

export interface Props {
Expand All @@ -9,6 +11,10 @@ export function RootLayout({ children }: Props) {
return (
<html>
<head>
<meta
content="width=device-width,initial-scale=1,shrink-to-fit=no,viewport-fit=cover"
name="viewport"
/>
<meta
content="Personal website and profile of Thomas Neil James Shadwell, also known as Zemnmez."
name="description"
Expand All @@ -25,7 +31,7 @@ export function RootLayout({ children }: Props) {
/>
</head>
<body>
<ClientLayout>{children}</ClientLayout>
<HeroLayout>{children}</HeroLayout>
</body>
</html>
);
Expand Down
Loading

0 comments on commit 9a4aefd

Please sign in to comment.