Merge remote-tracking branch 'origin/main'

orbitmines.com/src/lib/paper/Paper.tsx

@@ -27,13 +27,14 @@ import JetBrainsMonoBold from "../fonts/JetBrainsMono/ttf/JetBrainsMono-Bold.ttf
 import {renderToStaticMarkup} from "react-dom/server";
 import {Document, Font, Image, Page, Path, PDFViewer, Svg, Text, View} from "@react-pdf/renderer";
 
-export const Profile = ({profile, children}: {profile: TProfile} & Children) => {
+export const Profile = ({profile, children, head}: {profile: TProfile} & Children & { head?: any }) => {
  const location = useLocation();
 
  const paper: Omit<PaperProps, 'children'> = {
  title: profile.title ?? profile.name,
  subtitle: profile.subtitle,
  date: profile.date,
+ head: head,
  pdf: {
  fonts: [JetBrainsMono, BlueprintIcons20, BlueprintIcons16],
  },
@@ -1169,19 +1170,24 @@ export const PaperContent = (props: PaperProps) => {
  const external_links = !!discord;
 
  const Content = <>
- <PaperHeader {...props} />
+ {props.head ? <>
+ {props.head}
+ {children}
+ </> : <>
+ <PaperHeader {...props} />
 
- {external_links ? <Row center="xs" middle="xs" className="child-px-10">
- {discord ? <Col>
- <Link name="Discussion Channel" link={discord.link()} icon={ORGANIZATIONS.discord.key} intent={Intent.PRIMARY} />
- </Col> : <></>}
- </Row> : <></>}
+  {external_links ? <Row center="xs" middle="xs" className="child-px-10">
+  {discord ? <Col>
+  <Link name="Discussion Channel" link={discord.link()} icon={ORGANIZATIONS.discord.key} intent={Intent.PRIMARY} />
+  </Col> : <></>}
+  </Row> : <></>}
 
- {header ? header : <HorizontalLine/>}
+  {header ? header : <HorizontalLine/>}
 
- {children}
+  {children}
 
- <HorizontalLine/>
+ <HorizontalLine/>
+ </>}
  </>
 
  const footnotes = getFootnotes(Content);
@@ -1343,6 +1349,7 @@ export const Author = (props: TProfile & { filter?: Predicate<ExternalProfile>})
 
 export type PaperProps = ReferenceProps & {
  header?: any //
+ head?: any
  pdf: PdfProps,
  exclude_footnotes?: boolean
 

orbitmines.com/src/routes/Error.tsx

@@ -1,5 +1,5 @@
-import Root from "./Root";
+import Minimap from "./Minimap";
 
-const Error = Root;
+const Error = Minimap;
 
 export default Error;

orbitmines.com/src/routes/profiles/Profiles.tsx

@@ -2,9 +2,11 @@ import React from 'react';
 import {useParams} from "react-router-dom";
 import Error from "../Error";
 import FadiShawki from "./fadi-shawki/FadiShawki";
+import FadiShawkiCV from "./fadi-shawki/FadiShawkiCV";
 
 const PROFILES: { [key: string]: any } = {
  'fadi-shawki': FadiShawki,
+ 'fadi-shawki-cv': FadiShawkiCV,
 }
 
 const Profile = () => {

orbitmines.com/src/routes/profiles/fadi-shawki/FadiShawkiCV.tsx

@@ -0,0 +1,26 @@
+import React from 'react';
+import {ARTICLES_2021, ARTICLES_2022, ARTICLES_2023, ARTICLES_2024, FAMILIAR_TOOLS} from "./fadi_shawki";
+import ORGANIZATIONS, {Viewed} from "../../../lib/organizations/ORGANIZATIONS";
+import {PROFILES} from "../profiles";
+import {ON_INTELLIGIBILITY} from "../../papers/2022.OnIntelligibility";
+import {CanvasContainer, ON_ORBITS} from "../../papers/2023.OnOrbits";
+import {_2024_02_ORBITMINES_AS_A_GAME_PROJECT} from "../../archive/2024.02.OrbitMines_as_a_Game_Project";
+import {Arc, Section, Reference, Category, Profile, Author} from "../../../lib/paper/Paper";
+
+const FadiShawkiCV = () => {
+ const profile = PROFILES.fadi_shawki;
+
+ return <Profile profile={profile} head={<></>}>
+ <Author {...profile} />
+
+ <Section head="Projects / Projecten">
+ <Category content={profile.content!.history}/>
+ <Category content={profile.content!.formal_education}/>
+ </Section>
+ <Arc head="Technology Exposure">
+ <Category content={FAMILIAR_TOOLS} inline simple />
+ </Arc>
+ </Profile>;
+}
+
+export default FadiShawkiCV;

orbitmines.com/src/routes/profiles/fadi-shawki/fadi_shawki.ts

@@ -3034,6 +3034,10 @@ PHYSICS_OF_LIFE_TIME_COMPLEXITY_AND_ALIENS_LEX_FRIDMAN_PODCAST: <Content>{
  reference: {title: "Three.js", link: "https://github.com/mrdoob/three.js/"},
  status: Viewed.IN_PROGRESS
  },
+ NEXTJS: <Content>{
+ reference: {title: "Next.js", link: "https://nextjs.org/"},
+ status: Viewed.IN_PROGRESS
+ },
  DREI: <Content>{reference: {title: "drei", link: "https://github.com/pmndrs/drei"}, status: Viewed.IN_PROGRESS},
  WASM: <Content>{
  reference: {title: "WebAssembly", link: "https://en.wikipedia.org/wiki/WebAssembly"},
@@ -3549,6 +3553,80 @@ export const ARTICLES_2022: Content[] = [
  REFERENCES.ROBUST_SPEECH_RECOGNITION_VIA_LARGE_SCALE_WEAK_SUPERVISION,
 ]
 
+export const FAMILIAR_TOOLS: Content[] = [
+
+ REFERENCES.PYTHON,
+ // REFERENCES.GO,
+ // REFERENCES.CHYP,
+ // REFERENCES.LLVM,
+ // REFERENCES.HASKELL,
+ REFERENCES.JAVA,
+ REFERENCES.RUBY_ON_RAILS,
+ REFERENCES.C_SHARP,
+ REFERENCES.DOT_NET,
+ REFERENCES.BLAZOR,
+ REFERENCES.JAVASCRIPT,
+ REFERENCES.KOTLIN,
+ REFERENCES.CSS,
+ REFERENCES.SASS,
+ REFERENCES.HTML,
+ REFERENCES.WASM,
+ REFERENCES.WEBGPU,
+ REFERENCES.RUST,
+ REFERENCES.CPP,
+ REFERENCES.WOLFRAM_LANGUAGE,
+
+ REFERENCES.WEBPACK,
+
+ REFERENCES.ASSEMBLY_SCRIPT,
+ REFERENCES.TYPESCRIPT,
+ REFERENCES.REACT,
+ // REFERENCES.BLUEPRINT_JS,
+ // REFERENCES.SLATE,
+ REFERENCES.THREEJS,
+ REFERENCES.DREI,
+ REFERENCES.NEXTJS,
+
+ REFERENCES.IPFS,
+ REFERENCES.IPVM,
+ REFERENCES.SQL,
+ REFERENCES.MYSQL,
+ REFERENCES.POSTGRESQL,
+ REFERENCES.MONGO_DB,
+ REFERENCES.REDIS,
+ REFERENCES.RABBIT_MQ,
+
+ REFERENCES.GIT,
+ REFERENCES.GITLAB,
+ REFERENCES.GITHUB,
+ REFERENCES.BITBUCKET,
+
+ REFERENCES.DOCKER,
+ REFERENCES.KUBERNETES,
+ REFERENCES.NGINX,
+ REFERENCES.NPM,
+ REFERENCES.MAVEN,
+
+ REFERENCES.LINUX,
+ REFERENCES.ANDROID,
+
+ REFERENCES.GCP,
+ REFERENCES.AZURE,
+ REFERENCES.AWS,
+
+ // REFERENCES.SPIGOT_MC,
+ // REFERENCES.BUNGEE_CORD,
+ // REFERENCES.BUKKIT,
+
+ // REFERENCES.FLATPAK,
+ // REFERENCES.OBS,
+ // REFERENCES.CLOUDFLARE,
+
+ // REFERENCES.INTELLI_J,
+ // REFERENCES.VS_CODE,
+ // REFERENCES.ECLIPSE,
+];
+
 export const fadi_shawki = <TProfile>{
  first_name: 'Fadi',
  last_name: 'Shawki',
@@ -3618,8 +3696,8 @@ export const fadi_shawki = <TProfile>{
  link: 'https://orcid.org/0009-0009-9288-992X'
  },
 
- {organization: ORGANIZATIONS.ipfs, link: 'https://discuss.ipfs.tech/u/fadishawki'},
- {organization: ORGANIZATIONS.nixos, link: 'https://discourse.nixos.org/u/fadishawki'},
- {organization: ORGANIZATIONS.fission, link: 'https://talk.fission.codes/u/fadishawki/'},
+ // {organization: ORGANIZATIONS.ipfs, link: 'https://discuss.ipfs.tech/u/fadishawki'},
+ // {organization: ORGANIZATIONS.nixos, link: 'https://discourse.nixos.org/u/fadishawki'},
+ // {organization: ORGANIZATIONS.fission, link: 'https://talk.fission.codes/u/fadishawki/'},
  ]
 }