From ad9f5bbe21063f9c3524e4133016448ec691b546 Mon Sep 17 00:00:00 2001 From: Charan167 Date: Thu, 19 Sep 2024 21:50:21 +0530 Subject: [PATCH 1/5] feat(dev): add github icon --- .../astro/src/default/components/Github.tsx | 20 +++++++++++++++++++ .../astro/src/default/components/TopBar.astro | 3 +++ .../default/components/TopBarWrapper.astro | 3 +++ 3 files changed, 26 insertions(+) create mode 100644 packages/astro/src/default/components/Github.tsx diff --git a/packages/astro/src/default/components/Github.tsx b/packages/astro/src/default/components/Github.tsx new file mode 100644 index 000000000..85892a540 --- /dev/null +++ b/packages/astro/src/default/components/Github.tsx @@ -0,0 +1,20 @@ +export function Github() { + return ( + + + + + + + + + ); +} diff --git a/packages/astro/src/default/components/TopBar.astro b/packages/astro/src/default/components/TopBar.astro index 861441723..dc05a3924 100644 --- a/packages/astro/src/default/components/TopBar.astro +++ b/packages/astro/src/default/components/TopBar.astro @@ -7,6 +7,9 @@
+
+ +
diff --git a/packages/astro/src/default/components/TopBarWrapper.astro b/packages/astro/src/default/components/TopBarWrapper.astro index 1d3b89101..513505c38 100644 --- a/packages/astro/src/default/components/TopBarWrapper.astro +++ b/packages/astro/src/default/components/TopBarWrapper.astro @@ -6,6 +6,7 @@ import { LoginButton } from './LoginButton'; import { OpenInStackblitzLink } from './OpenInStackblitzLink'; import Logo from './Logo.astro'; import { useAuth } from './setup'; +import { Github } from './Github'; interface Props { logoLink: string; @@ -22,5 +23,7 @@ const { logoLink, openInStackBlitz } = Astro.props; + + {useAuth && } From eecd7c0e49e3a7b82134ea6235759a9af5d090b6 Mon Sep 17 00:00:00 2001 From: Charan167 Date: Fri, 20 Sep 2024 14:20:57 +0530 Subject: [PATCH 2/5] feat(dev): add github icon (changes) --- docs/demo/astro.config.ts | 8 ++++++- docs/demo/package.json | 1 + .../demo/src}/components/Github.tsx | 0 docs/demo/src/components/Topbar.astro | 23 +++++++++++++++++++ .../default/components/TopBarWrapper.astro | 3 --- pnpm-lock.yaml | 12 +++++----- 6 files changed, 37 insertions(+), 10 deletions(-) rename {packages/astro/src/default => docs/demo/src}/components/Github.tsx (100%) create mode 100644 docs/demo/src/components/Topbar.astro diff --git a/docs/demo/astro.config.ts b/docs/demo/astro.config.ts index 9468b8f53..f55b08026 100644 --- a/docs/demo/astro.config.ts +++ b/docs/demo/astro.config.ts @@ -5,5 +5,11 @@ export default defineConfig({ devToolbar: { enabled: false, }, - integrations: [tutorialkit()], + integrations: [ + tutorialkit({ + components: { + TopBar: './src/components/TopBar.astro', + }, + }), + ], }); diff --git a/docs/demo/package.json b/docs/demo/package.json index 671e15bb9..ceddb4eb4 100644 --- a/docs/demo/package.json +++ b/docs/demo/package.json @@ -21,6 +21,7 @@ "@tutorialkit/astro": "workspace:*", "@tutorialkit/theme": "workspace:*", "@tutorialkit/types": "workspace:*", + "@types/react": "^18.3.3", "astro": "^4.15.0", "prettier-plugin-astro": "^0.14.1", "typescript": "^5.4.5" diff --git a/packages/astro/src/default/components/Github.tsx b/docs/demo/src/components/Github.tsx similarity index 100% rename from packages/astro/src/default/components/Github.tsx rename to docs/demo/src/components/Github.tsx diff --git a/docs/demo/src/components/Topbar.astro b/docs/demo/src/components/Topbar.astro new file mode 100644 index 000000000..8b570c105 --- /dev/null +++ b/docs/demo/src/components/Topbar.astro @@ -0,0 +1,23 @@ +--- +import { Github } from './Github'; +--- + + diff --git a/packages/astro/src/default/components/TopBarWrapper.astro b/packages/astro/src/default/components/TopBarWrapper.astro index 513505c38..1d3b89101 100644 --- a/packages/astro/src/default/components/TopBarWrapper.astro +++ b/packages/astro/src/default/components/TopBarWrapper.astro @@ -6,7 +6,6 @@ import { LoginButton } from './LoginButton'; import { OpenInStackblitzLink } from './OpenInStackblitzLink'; import Logo from './Logo.astro'; import { useAuth } from './setup'; -import { Github } from './Github'; interface Props { logoLink: string; @@ -23,7 +22,5 @@ const { logoLink, openInStackBlitz } = Astro.props; - - {useAuth && } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6eb84128d..0ef15b05c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -75,6 +75,9 @@ importers: '@tutorialkit/types': specifier: workspace:* version: link:../../packages/types + '@types/react': + specifier: ^18.3.3 + version: 18.3.3 astro: specifier: ^4.15.0 version: 4.15.0(@types/node@22.4.2)(typescript@5.5.3) @@ -4000,7 +4003,7 @@ packages: '@unocss/core': 0.59.4 '@unocss/reset': 0.59.4 '@unocss/vite': 0.59.4(vite@5.4.2) - vite: 5.4.2(@types/node@22.4.2) + vite: 5.4.2(@types/node@22.4.2)(sass@1.77.6) transitivePeerDependencies: - rollup @@ -4199,7 +4202,7 @@ packages: chokidar: 3.6.0 fast-glob: 3.3.2 magic-string: 0.30.11 - vite: 5.4.2(@types/node@22.4.2) + vite: 5.4.2(@types/node@22.4.2)(sass@1.77.6) transitivePeerDependencies: - rollup @@ -6730,7 +6733,6 @@ packages: /immutable@4.3.6: resolution: {integrity: sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==} - dev: true /import-fresh@3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} @@ -8823,7 +8825,6 @@ packages: chokidar: 3.6.0 immutable: 4.3.6 source-map-js: 1.2.0 - dev: true /sax@1.4.1: resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==} @@ -9632,7 +9633,7 @@ packages: '@unocss/transformer-directives': 0.59.4 '@unocss/transformer-variant-group': 0.59.4 '@unocss/vite': 0.59.4(vite@5.4.2) - vite: 5.4.2(@types/node@22.4.2) + vite: 5.4.2(@types/node@22.4.2)(sass@1.77.6) transitivePeerDependencies: - postcss - rollup @@ -9978,7 +9979,6 @@ packages: sass: 1.77.6 optionalDependencies: fsevents: 2.3.3 - dev: true /vitefu@0.2.5(vite@5.4.2): resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==} From b24d3822730ad86e15283becdc003cfdae0f1f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ari=20Perkki=C3=B6?= Date: Fri, 20 Sep 2024 13:42:29 +0300 Subject: [PATCH 3/5] fix: add theme transition --- docs/demo/src/components/Github.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/demo/src/components/Github.tsx b/docs/demo/src/components/Github.tsx index 85892a540..0a2c08299 100644 --- a/docs/demo/src/components/Github.tsx +++ b/docs/demo/src/components/Github.tsx @@ -2,7 +2,7 @@ export function Github() { return ( Date: Fri, 20 Sep 2024 13:42:43 +0300 Subject: [PATCH 4/5] fix: revert changes in astro package --- packages/astro/src/default/components/TopBar.astro | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/astro/src/default/components/TopBar.astro b/packages/astro/src/default/components/TopBar.astro index dc05a3924..861441723 100644 --- a/packages/astro/src/default/components/TopBar.astro +++ b/packages/astro/src/default/components/TopBar.astro @@ -7,9 +7,6 @@
-
- -
From 90185a1ef48127563807f24c3e18fbe4e959a266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ari=20Perkki=C3=B6?= Date: Fri, 20 Sep 2024 13:49:32 +0300 Subject: [PATCH 5/5] fix: case sensitive filename --- docs/demo/src/components/{Topbar.astro => TopBar.astro} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/demo/src/components/{Topbar.astro => TopBar.astro} (100%) diff --git a/docs/demo/src/components/Topbar.astro b/docs/demo/src/components/TopBar.astro similarity index 100% rename from docs/demo/src/components/Topbar.astro rename to docs/demo/src/components/TopBar.astro