From 6ae2930d28e863683f345ef5a31beefa5ecab3a3 Mon Sep 17 00:00:00 2001 From: Sebastian Wendel Date: Tue, 23 Apr 2024 18:46:19 +0200 Subject: [PATCH] updated components --- .envrc | 2 +- .vscode/extensions.json | 1 - .vscode/settings.json | 11 +- astro.config.mjs | 3 +- flake.lock | 59 +-- nix/devshell.nix | 51 +- package.json | 29 +- src/components/Footer.astro | 21 +- src/content/config.ts | 16 + src/content/social/github.json | 5 + src/content/social/linkedin.json | 5 + src/content/social/mastodon.json | 6 + src/content/social/xing.json | 5 + src/layouts/BaseLayout.astro | 159 +++--- yarn.lock | 816 +++++++++++++++++++++++-------- 15 files changed, 826 insertions(+), 363 deletions(-) create mode 100644 src/content/config.ts create mode 100644 src/content/social/github.json create mode 100644 src/content/social/linkedin.json create mode 100644 src/content/social/mastodon.json create mode 100644 src/content/social/xing.json diff --git a/.envrc b/.envrc index 0ac4d5a..b688997 100644 --- a/.envrc +++ b/.envrc @@ -1,6 +1,6 @@ use flake -watch_file **/*.nix *.lock package.json +watch_file **/*.nix *.lock package.json src/content/* yarn install yarn astro sync diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 9ad1ae1..17479b4 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -7,7 +7,6 @@ "ecmel.vscode-html-css", "formulahendry.auto-complete-tag", "jnoortheen.nix-ide", - "kamadorueda.alejandra", "mikestead.dotenv", "stylelint.vscode-stylelint", ], diff --git a/.vscode/settings.json b/.vscode/settings.json index d114414..17bc8d6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,8 +6,11 @@ "*.css": "tailwindcss", "flake.lock": "json" }, + "nix.serverPath": "nil", + "nix.enableLanguageServer": true, + "typescript.tsdk": "node_modules/typescript/lib", "[nix]": { - "editor.defaultFormatter": "kamadorueda.alejandra" + "editor.defaultFormatter": "brettm12345.nixfmt-vscode" }, "[html]": { "editor.defaultFormatter": "vscode.html-language-features" @@ -35,9 +38,5 @@ }, "[astro]": { "editor.defaultFormatter": "astro-build.astro-vscode" - }, - "nix.serverPath": "nil", - "nix.enableLanguageServer": true, - "alejandra.program": "alejandra", - "typescript.tsdk": "node_modules/typescript/lib" + } } \ No newline at end of file diff --git a/astro.config.mjs b/astro.config.mjs index 20811b5..2056a85 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -4,7 +4,7 @@ import tailwind from "@astrojs/tailwind"; import svgr from 'vite-plugin-svgr' export default defineConfig({ - // https://astro.build/config + devToolbar: { enabled: false }, site: "https://srx.digital", server: { port: 3001 }, integrations: [ @@ -16,5 +16,4 @@ export default defineConfig({ svgr() ], }, - devToolbar: { enabled: false }, }); diff --git a/flake.lock b/flake.lock index 3440ed8..7a45821 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -54,14 +54,17 @@ }, "gitignore": { "inputs": { - "nixpkgs": ["pre-commit", "nixpkgs"] + "nixpkgs": [ + "pre-commit", + "nixpkgs" + ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -72,11 +75,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -87,11 +90,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709230475, - "narHash": "sha256-QI/0GiTvWxhBJ/bpredarfAUARnP6zE1vCOifsZ220A=", + "lastModified": 1713805509, + "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b5f6e3881acf8ca8a35b8cdb8d4021e5bd469a4e", + "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", "type": "github" }, "original": { @@ -104,11 +107,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -121,11 +124,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -137,11 +140,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1710765496, + "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", "type": "github" }, "original": { @@ -160,11 +163,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1713775815, + "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", "type": "github" }, "original": { diff --git a/nix/devshell.nix b/nix/devshell.nix index 8b9e34a..4d984d5 100644 --- a/nix/devshell.nix +++ b/nix/devshell.nix @@ -1,23 +1,40 @@ { - perSystem = { - pkgs, - config, - ... - }: { + perSystem = { pkgs, config, ... }: { devShells.default = pkgs.mkShell { - packages = with pkgs; [ - cocogitto - yarn - yarn2nix - alejandra + nativeBuildInputs = with pkgs; [ + # ide + (vscode-with-extensions.override { + vscode = vscodium; + vscodeExtensions = with vscode-extensions; [ + arrterian.nix-env-selector + astro-build.astro-vscode + bradlc.vscode-tailwindcss + bbenoist.nix + jnoortheen.nix-ide + mkhl.direnv + ritwickdey.liveserver + ]; + }) + + # formater + nixfmt + nodePackages_latest.prettier + + # lsp nil - nodejs - nodePackages.typescript - nodePackages.typescript-language-server - vscodium - vscode-extensions.jnoortheen.nix-ide - vscode-extensions.kamadorueda.alejandra - vscode-extensions.astro-build.astro-vscode + nodePackages_latest.typescript-language-server + nodePackages_latest.vscode-css-languageserver-bin + nodePackages_latest.vscode-html-languageserver-bin + tailwindcss-language-server + + # node + nodePackages_latest.nodejs + nodePackages_latest.typescript + nodePackages_latest.yarn + yarn2nix + + # html + html5validator ]; shellHook = config.pre-commit.installationScript; }; diff --git a/package.json b/package.json index 858059f..4981a0e 100644 --- a/package.json +++ b/package.json @@ -26,23 +26,24 @@ "astro": "astro" }, "dependencies": { - "@astrojs/check": "^0.5.6", - "@astrojs/react": "^3.0.10", + "@astrojs/check": "^0.5.10", + "@astrojs/react": "^3.3.0", "@astrojs/tailwind": "^5.1.0", - "@fontsource-variable/literata": "^5.0.20", - "@fontsource-variable/manrope": "^5.0.19", - "@fontsource-variable/martian-mono": "^5.0.12", + "@fontsource-variable/literata": "^5.0.21", + "@fontsource-variable/manrope": "^5.0.20", + "@fontsource-variable/martian-mono": "^5.0.13", "@tailwindcss/forms": "^0.5.7", - "@tailwindcss/typography": "^0.5.10", - "@types/react": "^18.2.64", - "@types/react-dom": "^18.2.21", - "astro": "^4.4.15", - "lucide-react": "^0.354.0", + "@tailwindcss/typography": "^0.5.12", + "@types/react": "^18.2.79", + "@types/react-dom": "^18.2.25", + "astro": "^4.6.3", + "lucide-react": "^0.372.0", + "lucide-static": "^0.372.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "tailwindcss": "^3.4.1", - "typescript": "^5.4.2", - "vite": "^5.1.5", + "tailwindcss": "^3.4.3", + "typescript": "^5.4.5", + "vite": "^5.2.10", "vite-plugin-svgr": "^4.2.0" } -} \ No newline at end of file +} diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 59e5eb2..db64413 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -1,7 +1,12 @@ --- import Config from "@srx/config/page.json"; import Logo from "@srx/components/Logo.astro"; -import { AtSign, GitFork, Linkedin, MessagesSquare } from "lucide-react"; +import { AtSign } from "lucide-react"; +import { getCollection } from "astro:content"; + +const allSocial = (await getCollection("social")) + .map((s) => s.data) + .sort((a, b) => (a.order || 0) - (b.order || 0)); ---