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.

Sign up for GitHub

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

Jump to bottom

Project zemn.me: continue work on site. #3298

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Project zemn.me: continue work on site. #3298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
"@pulumi/command": "4.5.0",
"@react-spring/rafz": "^9.7.3",
"@types/bcryptjs": "2.4.2",
"clsx": "^1.2.1",
"csstype": "^3.1.1",
"devtools-protocol": "^0.0.1179426",
"eslint-mdx": "^2.1.0",
Expand Down
8 changes: 8 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions project/zemn.me/next/components/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ ts_project(
deps = [
"//:base_defs",
"//:node_modules/@types/react",
"//:node_modules/clsx",
"//:node_modules/immutable",
"//:node_modules/react",
"//project/zemn.me/bio",
"//project/zemn.me/elements/TimeEye",
"//ts/react/lang",
],
)
52 changes: 52 additions & 0 deletions project/zemn.me/next/components/header/header.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
.header {
display: grid;
grid:
" .... name ....."
" .... .... ....." 1em
" .... logo ....." 4em
" .... .... ....." 1em
" .... links ...."
" .... ..... ...." 1em
" .... text ...."
/ 2em 1fr 2em;
}

.header > * {
/* ensure the elements fill the grid we give them */
margin: auto;
width: 100%;
height: 100%;
}

.name {
grid-area: name;
text-align: center;
/* this is because it's currently in an h1 and i dont want it to be big. */
font-size: initial;
/* this would be a subgrid one day! but alas!! the time has not yet come!!!! */
display: grid;
grid:
"real-name"
"........." 1em
"handle ";
}

.realName { grid-area: real-name }
.handle { grid-area:handle }


.links {
grid-area: links;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
}


.desc {
grid-area: text;
}

.logo {
grid-area: logo;
}
63 changes: 63 additions & 0 deletions project/zemn.me/next/components/header/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/**
* @fileoverview on zemn.me this is the top part in 'content' with the eye logo, some links
* my name etc.
*/

import clsx from 'clsx';
import * as bio from 'project/zemn.me/bio';
import { TimeEye } from 'project/zemn.me/elements/TimeEye';
import style from 'project/zemn.me/next/components/header/header.module.css';
import * as lang from 'ts/react/lang';

export interface HeaderProps {
className?: string;
}

export default function Header(props: HeaderProps) {
return (
<header className={clsx(style.header, props.className)}>
<TimeEye className={style.logo} />
<h2 className={style.name}>
<div
className={style.realName}
lang={lang.get(bio.Bio.who.fullName)}
>
{lang.text(bio.Bio.who.fullName)}
</div>
<div
className={style.handle}
lang={lang.get(bio.Bio.who.handle)}
>
{lang.text(bio.Bio.who.handle)}
</div>
</h2>

<section className={style.desc}>
<p>
I am an internationally recognised international expert on
computer security, with specialisms in web security,
security program construction, and automated security
analysis.
</p>
<p>
I am interested in consulting on legal cases. For business,
email me at{' '}
<a href="mailto:thomas@shadwell.im">thomas@shadwell.im</a>.
</p>
</section>
{bio.Bio.links !== undefined ? (
<nav className={style.links}>
{bio.Bio.links.map(([text, url]) => (
<a
href={url.toString()}
key={url.toString()}
lang={lang.get(text)}
>
{lang.text(text)}
</a>
))}
</nav>
) : null}
</header>
);
}
2 changes: 2 additions & 0 deletions project/zemn.me/next/components/header/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from 'project/zemn.me/next/components/header/header';
export { default } from 'project/zemn.me/next/components/header/header';
1 change: 1 addition & 0 deletions project/zemn.me/next/components/timeline/timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import style from 'project/zemn.me/next/components/timeline/timeline.module.css'
import React from 'react';
import * as lang from 'ts/react/lang';


const numerals = [
[3000, 'MMM'],
[2000, 'MM'],
Expand Down
12 changes: 12 additions & 0 deletions project/zemn.me/next/pages/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
:root {
hyphens: auto;
}

html, body, :root {
margin: 0;
padding: 0;
Expand All @@ -10,4 +14,12 @@ body {
a {
font-style: italic;
color: currentColor;
}

h1, h2, h3, h4, h5 {
font-weight: normal;
}

p {
text-align: justify
}
20 changes: 20 additions & 0 deletions project/zemn.me/next/pages/index.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
}

.headerBgv {
width: 100%;
height: 100%;
z-index: -1;
object-fit: cover;
grid-area: banner;
Expand Down Expand Up @@ -39,3 +41,21 @@
/1fr ;
}
}


/*
css styles for laying out the content panel
*/

.content {
display: grid;
grid:
" .... ...... ...." 2em
" .... header ...."
" .... timeline ...."
" .... ........ ...." 2em
/ 2em 1fr 2em ;
}

.header{ grid-area: header }
.timeline{ grid-area: timeline }
48 changes: 7 additions & 41 deletions project/zemn.me/next/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Head from 'next/head';
import Header from 'project/zemn.me/next/components/header';
import * as bio from 'project/zemn.me/bio';
import { TimeEye } from 'project/zemn.me/elements/TimeEye';
import * as kenwood from 'project/zemn.me/next/assets/kenwood';
import Timeline from 'project/zemn.me/next/components/timeline';
import style from 'project/zemn.me/next/pages/index.module.css';
Expand Down Expand Up @@ -30,48 +30,14 @@ export default function Main() {
<kenwood.VideoSources />
</video>
<header className={style.banner}>
<h1 lang={lang.get(bio.Bio.who.handle)}>
{lang.text(bio.Bio.who.handle)}
</h1>
</header>
<section className={style.content}>
<header>
<h2 lang={lang.get(bio.Bio.who.fullName)}>
{lang.text(bio.Bio.who.fullName)}
</h2>
<TimeEye />
<p>
I am an internationally recognised international expert
on computer security, with specialisms in web security,
security program construction, and automated security
analysis.
</p>
<p>
I am interested in consulting on legal cases. For
business, email me at{' '}
<a href="mailto:thomas@shadwell.im">
thomas@shadwell.im
</a>
.
</p>
</header>
{bio.Bio.links !== undefined ? (
<nav>
{bio.Bio.links.map(([text, url]) => (
<a
href={url.toString()}
key={url.toString()}
lang={lang.get(text)}
>
{lang.text(text)}
</a>
))}
</nav>
) : null}
<section>
<Timeline />
<section className={style.content}>
<Header className={style.header}/>
<section className={style.timeline}>
<Timeline />
</section>
</section>
</section>
</main>
);
}
}
Loading