diff --git a/package.json b/package.json index f5cd440..609b777 100644 --- a/package.json +++ b/package.json @@ -1,54 +1,54 @@ { - "name": "example-basic", - "license": "MIT", - "type": "module", - "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start", - "version": "vinxi version" - }, - "dependencies": { - "@babel/plugin-transform-export-namespace-from": "7.24.1", - "@babel/preset-typescript": "7.24.1", - "@kobalte/core": "0.12.6", - "@linaria/core": "6.1.0", - "@mdx-js/mdx": "3.0.1", - "@solidjs/meta": "^0.29.2", - "@solidjs/router": "^0.13.1", - "@solidjs/start": "^1.0.0-rc.0", - "@vinxi/plugin-mdx": "3.7.1", - "@wyw-in-js/vite": "0.5.0", - "babel-plugin-transform-remove-imports": "1.7.1", - "classnames": "2.5.1", - "cssnano": "6.1.2", - "postcss-preset-env": "9.5.3", - "postcss-pxtorem": "6.1.0", - "rehype-raw": "7.0.0", - "remark-shiki-twoslash": "^3.1.3", - "sass": "1.72.0", - "solid-js": "^1.8.16", - "solid-labels": "0.16.0", - "solid-mdx": "0.0.7", - "tailwindcss": "3.4.3", - "typescript": "5.4.3", - "vinxi": "^0.3.11", - "vite-plugin-compile-time": "0.2.1" - }, - "engines": { - "node": ">=18" - }, - "devDependencies": { - "@types/imagemagick": "0.0.35", - "gray-matter": "4.0.3", - "imagemagick": "0.1.3", - "prettier": "3.2.5", - "prettier-plugin-organize-imports": "3.2.4", - "prettier-plugin-tailwindcss": "0.5.13", - "remark-frontmatter": "5.0.0", - "remark-gfm": "4.0.0", - "solid-devtools": "0.30.0", - "ts-node": "10.9.2", - "vite-plugin-solid-svg": "0.8.1" - } + "name": "example-basic", + "license": "MIT", + "type": "module", + "scripts": { + "dev": "vinxi dev", + "build": "vinxi build", + "start": "vinxi start", + "version": "vinxi version" + }, + "dependencies": { + "@babel/plugin-transform-export-namespace-from": "7.24.1", + "@babel/preset-typescript": "7.24.1", + "@kobalte/core": "0.12.6", + "@linaria/core": "6.1.0", + "@mdx-js/mdx": "3.0.1", + "@solidjs/meta": "^0.29.2", + "@solidjs/router": "^0.13.1", + "@solidjs/start": "^1.0.0-rc.0", + "@vinxi/plugin-mdx": "3.7.1", + "@wyw-in-js/vite": "0.5.0", + "babel-plugin-transform-remove-imports": "1.7.1", + "classnames": "2.5.1", + "cssnano": "6.1.2", + "postcss-preset-env": "9.5.3", + "postcss-pxtorem": "6.1.0", + "rehype-raw": "7.0.0", + "remark-shiki-twoslash": "^3.1.3", + "sass": "1.72.0", + "solid-js": "^1.8.16", + "solid-labels": "0.16.0", + "solid-mdx": "0.0.7", + "tailwindcss": "3.4.3", + "typescript": "5.4.3", + "vinxi": "^0.3.11", + "vite-plugin-compile-time": "0.2.1" + }, + "engines": { + "node": ">=18" + }, + "devDependencies": { + "@types/imagemagick": "0.0.35", + "gray-matter": "4.0.3", + "imagemagick": "0.1.3", + "prettier": "3.2.5", + "prettier-plugin-organize-imports": "3.2.4", + "prettier-plugin-tailwindcss": "0.5.13", + "remark-frontmatter": "5.0.0", + "remark-gfm": "4.0.0", + "solid-devtools": "0.30.0", + "ts-node": "10.9.2", + "vite-plugin-solid-svg": "0.8.1" + } } diff --git a/public/profile-picture.jpg b/public/profile-picture.jpg new file mode 100644 index 0000000..4374a6e Binary files /dev/null and b/public/profile-picture.jpg differ diff --git a/src/about/AboutSite.tsx b/src/about/AboutSite.tsx index df79637..3d6e82f 100644 --- a/src/about/AboutSite.tsx +++ b/src/about/AboutSite.tsx @@ -7,7 +7,6 @@ import SkillsSection from "~/about/SkillsSection"; import SnakeGame from "~/about/SnakeGame"; import StatsBar from "~/about/StatsBar"; import StatusButton from "~/about/StatusButton"; -import Icon from "~/components/Icon"; import IconText from "~/components/IconText"; import { breakpointUntil } from "~/style/commonStyle"; @@ -17,20 +16,20 @@ interface Props { const AboutSite: Component = (props) => { return ( -
+
-
- +
+ {/* */} + Profile picture
- + 12/85 @@ -38,7 +37,9 @@ const AboutSite: Component = (props) => { Send message
-
+
Matic Utsumi Gačar
@@ -49,7 +50,7 @@ const AboutSite: Component = (props) => { style={{ "grid-area": "title" }}>
Level 21
- Legendary Software Engineer + Enthusiastic Software Engineer
@@ -81,7 +82,7 @@ const AboutSite: Component = (props) => { My passion is building full-stack applications that have a lasting impact on the world and{" "} - leveling up + gaining experience {" "} along the way.

@@ -91,7 +92,7 @@ const AboutSite: Component = (props) => { class="justify-self-stretch" />
@@ -104,11 +105,11 @@ const _AboutSite = css` justify-items: start; grid-template: "picture name name emtpy" auto - "picture title title emtpy" auto - "picture general about about" auto - "stats general about about" auto - "snake snake snake snake" auto - "rest rest rest rest" auto + "picture title title emtpy " auto + "picture general about about " auto + "stats general about about " auto + "rest rest rest rest " auto + "snake snake snake snake " auto / auto auto auto auto; ${breakpointUntil("m")} { grid-template: @@ -128,8 +129,8 @@ const _AboutSite = css` "picture general" auto "stats general" auto "about about " auto - "snake snake " auto "rest rest " auto + "snake snake " auto / auto 1fr; } `; diff --git a/src/about/StatusButton.tsx b/src/about/StatusButton.tsx index 25a164d..493922d 100644 --- a/src/about/StatusButton.tsx +++ b/src/about/StatusButton.tsx @@ -2,6 +2,7 @@ import { JSX, Component } from "solid-js"; import { css } from "@linaria/core"; import cn from "classnames"; import IconText from "~/components/IconText"; +import { Link } from "@kobalte/core"; interface Props { children: string; @@ -12,14 +13,15 @@ const StatusButton: Component = (props) => { const { children, icon } = $destructure(props); return ( -
{children} -
+ ); }; diff --git a/src/style/fontFaces.tsx b/src/style/fontFaces.tsx index fa9d39a..9516ffc 100644 --- a/src/style/fontFaces.tsx +++ b/src/style/fontFaces.tsx @@ -4,7 +4,7 @@ const japaneseCodeRange = (show: boolean) => show ? `unicode-range: U+3000-30FF , U+FF00-FFEF , U+4E00-9FAF ;` : ""; const nameSuffix = (isFull: boolean) => (isFull ? "" : " JP Only"); -const interPath = `fonts/inter-3.19-roman/Inter`; +const interPath = `/fonts/inter-3.19-roman/Inter`; // language=SCSS const notoFragments = (isFull: boolean, fontLoader?: FontLoader) => ` @@ -26,7 +26,7 @@ const notoFragments = (isFull: boolean, fontLoader?: FontLoader) => ` fontLoader != null ? `src: ${fontLoader( `${interPath}/noto-sans-jp-v40-japanese-regular.woff2`, - "woff2", + "woff2" )};` : `` } @@ -50,7 +50,7 @@ const notoFragments = (isFull: boolean, fontLoader?: FontLoader) => ` fontLoader != null ? `src: ${fontLoader( `${interPath}/noto-sans-jp-v40-japanese-700.woff2`, - "woff2", + "woff2" )};` : `` } @@ -127,7 +127,7 @@ export const fontFaceFragment = (fontLoader?: FontLoader) => ` fontLoader != null ? `src: ${fontLoader( `${interPath}-SemiBoldItalic-Roman.woff2`, - "woff2", + "woff2" )};` : `` }