From 880358fa57ea89fa5399d44afa3d620ccbc8ba49 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Fri, 23 Jun 2023 13:30:51 -0700 Subject: [PATCH 01/30] feat: updates card design for kits and homepage --- .../src/components/KitActionLinks.astro | 4 +- packages/website/src/components/KitHero.astro | 8 +- packages/website/src/components/KitItem.astro | 16 +- packages/website/src/components/KitList.astro | 2 +- .../website/src/components/KitShowcases.astro | 57 +++++ .../website/src/components/StickyHero.astro | 7 +- packages/website/src/config.tsx | 211 ++++++++++++++++++ packages/website/src/icons/AWSSQSIcon.tsx | 43 ++++ packages/website/src/icons/AxiosIcon.tsx | 32 +++ packages/website/src/icons/BriefcaseIcon.tsx | 32 +++ packages/website/src/icons/BullmqIcon.tsx | 49 ++++ packages/website/src/icons/EmotionIcon.tsx | 130 +++++++++++ packages/website/src/icons/JestIcon.tsx | 26 +++ .../src/icons/MockServiceWorkerIcon.tsx | 27 +++ packages/website/src/icons/PlaywrightIcon.tsx | 46 ++++ .../website/src/icons/ReactNavigationIcon.tsx | 88 ++++++++ packages/website/src/icons/RedisIcon.tsx | 58 +++++ packages/website/src/icons/StorybookIcon.tsx | 34 +++ packages/website/src/icons/SwaggerIcon.tsx | 30 +++ packages/website/src/icons/TypescriptIcon.tsx | 20 ++ packages/website/src/icons/VitestIcon.tsx | 27 +++ packages/website/src/icons/index.ts | 14 ++ packages/website/src/layouts/KitLayout.astro | 3 + packages/website/src/lib/parseKits.ts | 15 +- starters/angular-apollo-tailwind/package.json | 6 +- starters/angular-ngrx-scss/package.json | 5 +- .../cra-rxjs-styled-components/package.json | 6 +- starters/deno-oak-denodb/deno.json | 31 +-- .../package.json | 5 +- starters/express-apollo-prisma/package.json | 5 +- .../express-typeorm-postgres/package.json | 7 +- starters/next-chakra-ui/package.json | 6 +- .../next12-react-query-tailwind/package.json | 70 ++++++ starters/nuxt2-pinia-tailwind/package.json | 8 +- starters/nuxt3-pinia-vuetify/package.json | 4 +- starters/qwik-graphql-tailwind/package.json | 7 +- starters/remix-gql-tailwind/package.json | 6 +- .../package.json | 6 +- starters/solidjs-tailwind/package.json | 8 +- .../package.json | 9 +- starters/svelte-kit-scss/package.json | 8 +- starters/vue3-apollo-quasar/package.json | 6 +- starters/vue3-xstate-css/package.json | 6 +- 43 files changed, 1118 insertions(+), 70 deletions(-) create mode 100644 packages/website/src/components/KitShowcases.astro create mode 100644 packages/website/src/icons/AWSSQSIcon.tsx create mode 100644 packages/website/src/icons/AxiosIcon.tsx create mode 100644 packages/website/src/icons/BriefcaseIcon.tsx create mode 100644 packages/website/src/icons/BullmqIcon.tsx create mode 100644 packages/website/src/icons/EmotionIcon.tsx create mode 100644 packages/website/src/icons/JestIcon.tsx create mode 100644 packages/website/src/icons/MockServiceWorkerIcon.tsx create mode 100644 packages/website/src/icons/PlaywrightIcon.tsx create mode 100644 packages/website/src/icons/ReactNavigationIcon.tsx create mode 100644 packages/website/src/icons/RedisIcon.tsx create mode 100644 packages/website/src/icons/StorybookIcon.tsx create mode 100644 packages/website/src/icons/SwaggerIcon.tsx create mode 100644 packages/website/src/icons/TypescriptIcon.tsx create mode 100644 packages/website/src/icons/VitestIcon.tsx create mode 100644 starters/next12-react-query-tailwind/package.json diff --git a/packages/website/src/components/KitActionLinks.astro b/packages/website/src/components/KitActionLinks.astro index 07174fd57..da2f56290 100644 --- a/packages/website/src/components/KitActionLinks.astro +++ b/packages/website/src/components/KitActionLinks.astro @@ -22,9 +22,7 @@ const { name, hasShowcase, inline } = Astro.props; hasShowcase && ( <> diff --git a/packages/website/src/components/KitHero.astro b/packages/website/src/components/KitHero.astro index bbce3dead..015d7ef93 100644 --- a/packages/website/src/components/KitHero.astro +++ b/packages/website/src/components/KitHero.astro @@ -2,10 +2,9 @@ import cn from 'clsx'; import Breadcrumbs from './Breadcrumbs.astro'; import KitActionLinks from './KitActionLinks.astro'; -import TechItem from './TechItem.astro'; - +import TechIcon from './TechIcon.astro'; const { technologies, name, hasShowcase } = Astro.props; - +console.log('tech', technologies) const crumbs = [ { href: '/', @@ -35,13 +34,12 @@ const crumbs = [ i > 0 && 'lg:inline' )} > - / - + )) diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 1d42dad89..256f575b8 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -9,19 +9,11 @@ const technologyStubsCount = kit.technologies.length < 3 ? (3 - kit.technologies
-
- {kit.technologies.map(({ name, Icon, tags }) => ( -
+

{kit.name}

+
+ {kit.technologies.map(({ Icon }) => ( +
{ Icon && } -
-
{name}
-
{tags.join(', ')}
-
-
- ))} - {Array(technologyStubsCount).fill().map(() => ( -
-
))}
diff --git a/packages/website/src/components/KitList.astro b/packages/website/src/components/KitList.astro index fcb1b16f1..6f193a13a 100644 --- a/packages/website/src/components/KitList.astro +++ b/packages/website/src/components/KitList.astro @@ -7,7 +7,7 @@ const { kits } = Astro.props; { kits.map((kit) => (
- +
diff --git a/packages/website/src/components/KitShowcases.astro b/packages/website/src/components/KitShowcases.astro new file mode 100644 index 000000000..a6c9038af --- /dev/null +++ b/packages/website/src/components/KitShowcases.astro @@ -0,0 +1,57 @@ +--- +import { ArrowRightIcon } from '../icons/heroicons'; +const { showcases, hasShowcase } = Astro.props; +console.log('showcases', showcases); +--- + +{hasShowcase ? +
+

+ See kits in action via our showcases +

+
+ { + showcases.map(({ name, repo, app, Icon }) => ( +
+
+
+ +
+
+

+ {name} +

+
+
+
+
+ + Repository + + +
+ {app !== '' ? +
+ + Live Application + + +
: ''} +
+ )) + } +
+
+: ''} diff --git a/packages/website/src/components/StickyHero.astro b/packages/website/src/components/StickyHero.astro index 526bd72dd..cd3c689cd 100644 --- a/packages/website/src/components/StickyHero.astro +++ b/packages/website/src/components/StickyHero.astro @@ -1,8 +1,7 @@ --- import { BriefcaseIcon } from '../icons/heroicons'; -import { ShareIcon } from '../icons/ShareIcon.tsx'; import { GitHubIcon } from '../icons/GitHubIcon.tsx'; -import { REPO_URL, SHOWCASE_REPO_URL } from '../config.tsx'; +import { REPO_URL } from '../config.tsx'; import { ShareDropdown } from './ShareDropdown'; const { name, hasShowcase } = Astro.props; --- @@ -25,9 +24,7 @@ const { name, hasShowcase } = Astro.props; hasShowcase && ( <> diff --git a/packages/website/src/config.tsx b/packages/website/src/config.tsx index e40933cb5..c97c9fcd4 100644 --- a/packages/website/src/config.tsx +++ b/packages/website/src/config.tsx @@ -52,6 +52,21 @@ import { Nuxt3Icon, XstateIcon, CssIcon, + StorybookIcon, + TypescriptIcon, + MockServiceWorkerIcon, + RedisIcon, + JestIcon, + ReactNavigationIcon, + SwaggerIcon, + BullmqIcon, + EmotionIcon, + AxiosIcon, + VitestIcon, + AWSSQSIcon, + PlaywrightIcon, + GitHubIcon, + BriefcaseIcon, } from './icons'; export interface NavItem { @@ -415,6 +430,202 @@ export const TECHNOLOGIES = [ tags: ['Styling'], Icon: (props) => , }, + { + key: 'storybook', + name: 'Storybook', + tags: ['Tooling'], + Icon: (props) => , + }, + { + key: 'typescript', + name: 'Typescript', + tags: ['Tooling'], + Icon: (props) => , + }, + { + key: 'create-react-app', + name: 'Create React App', + tags: ['Core UI'], + Icon: (props) => , + }, + { + key: 'mock-service-worker', + name: 'Mock Service Worker', + tags: ['Tooling'], + Icon: (props) => , + }, + { + key: 'redis', + name: 'Redis', + tags: ['Data Management'], + Icon: (props) => , + }, + { + key: 'jest', + name: 'Jest', + tags: ['Framework'], + Icon: (props) => , + }, + { + key: 'react-navigation', + name: 'React Navigation', + tags: ['Library'], + Icon: (props) => , + }, + { + key: 'swagger', + name: 'Swagger', + tags: ['Tooling'], + Icon: (props) => , + }, + { + key: 'bullmq', + name: 'BullMQ', + tags: ['Data Management'], + Icon: (props) => , + }, + { + key: 'emotion', + name: 'Emotion', + tags: ['Styling'], + Icon: (props) => , + }, + { + key: 'axios', + name: 'Axios', + tags: ['Library'], + Icon: (props) => , + }, + { + key: 'qwik-city', + name: 'Qwik City', + tags: ['Middleware'], + Icon: (props) => , + }, + { + key: 'vitest', + name: 'Vitest', + tags: ['Tooling'], + Icon: (props) => , + }, + { + key: 'aws-sqs', + name: 'AWS SQS', + tags: ['Middleware'], + Icon: (props) => , + }, + { + key: 'svelte', + name: 'Svelte', + tags: ['Framework'], + Icon: (props) => , + }, + { + key: 'playwright', + name: 'Playwright', + tags: ['Tooling'], + Icon: (props) => , + }, + { + key: 'vue-router', + name: 'Vue Router', + tags: ['Library'], + Icon: (props) => , + }, +]; + +export const SHOWCASES = [ + { + id: 'angular-apollo-tailwind', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/angular-apollo-tailwind', + app: '', + Icon: (props) => , + }, + { + id: 'angular-ngrx-scss', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/angular-ngrx-scss', + app: '', + Icon: (props) => , + }, + { + id: 'cra-rxjs-styled-components', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/cra-rxjs-styled-components', + app: '', + Icon: (props) => , + }, + { + id: 'expo-zustand-styled-components', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/expo-zustand-styled-components', + app: '', + Icon: (props) => , + }, + { + id: 'next-react-query-tailwind', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/next-react-query-tailwind', + app: '', + Icon: (props) => , + }, + { + id: 'nuxt-pinia-tailwind', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/nuxt-pinia-tailwind', + app: '', + Icon: (props) => , + }, + { + id: 'qwik-graphql-tailwind', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/qwik-graphql-tailwind', + app: '', + Icon: (props) => , + }, + { + id: 'remix-gql-tailwind', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/remix-gql-tailwind', + app: '', + Icon: (props) => , + }, + { + id: 'solidjs-tailwind', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/solidjs-tailwind', + app: '', + Icon: (props) => , + }, + { + id: 'solidstart-tanstackquery-tailwind-modules', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/solidstart-tanstackquery-tailwind-modules', + app: '', + Icon: (props) => , + }, + { + id: 'svelte-kit-scss', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/svelte-kit-scss', + app: '', + Icon: (props) => , + }, + { + id: 'svelte-kit-scss', + name: '7 GUIs Showcase', + repo: 'https://github.com/thisdot/starter.dev-7guis-showcases', + app: '', + Icon: (props) => , + }, + { + id: 'vue3-apollo-quasar', + name: 'Github Showcase', + repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/vue3-apollo-quasar', + app: '', + Icon: (props) => , + }, ]; export const SPONSORS_ICON = [ diff --git a/packages/website/src/icons/AWSSQSIcon.tsx b/packages/website/src/icons/AWSSQSIcon.tsx new file mode 100644 index 000000000..fa9c60e0a --- /dev/null +++ b/packages/website/src/icons/AWSSQSIcon.tsx @@ -0,0 +1,43 @@ +import { Props } from './types'; + +export function AWSSQSIcon({ size = 800, className }: Props) { + return ( + + + + + + + + + + ); +} diff --git a/packages/website/src/icons/AxiosIcon.tsx b/packages/website/src/icons/AxiosIcon.tsx new file mode 100644 index 000000000..77560cc1d --- /dev/null +++ b/packages/website/src/icons/AxiosIcon.tsx @@ -0,0 +1,32 @@ +import { Props } from './types'; + +export function AxiosIcon({ size = 800, className }: Props) { + return ( + + + + + + + ); +} diff --git a/packages/website/src/icons/BriefcaseIcon.tsx b/packages/website/src/icons/BriefcaseIcon.tsx new file mode 100644 index 000000000..d01d5cb2f --- /dev/null +++ b/packages/website/src/icons/BriefcaseIcon.tsx @@ -0,0 +1,32 @@ +import { Props } from './types'; + +export function BriefcaseIcon({ size = 800, className }: Props) { + return ( + + + + + + + + + + + + ); +} diff --git a/packages/website/src/icons/BullmqIcon.tsx b/packages/website/src/icons/BullmqIcon.tsx new file mode 100644 index 000000000..fd197ffa2 --- /dev/null +++ b/packages/website/src/icons/BullmqIcon.tsx @@ -0,0 +1,49 @@ +import { Props } from './types'; + +export function BullmqIcon({ size = 800, className }: Props) { + return ( + + + + + + + + ); +} diff --git a/packages/website/src/icons/EmotionIcon.tsx b/packages/website/src/icons/EmotionIcon.tsx new file mode 100644 index 000000000..a21ebec63 --- /dev/null +++ b/packages/website/src/icons/EmotionIcon.tsx @@ -0,0 +1,130 @@ +import { Props } from './types'; + +export function EmotionIcon({ size = 800, className }: Props) { + return ( + + + + + + + + + ); +} diff --git a/packages/website/src/icons/JestIcon.tsx b/packages/website/src/icons/JestIcon.tsx new file mode 100644 index 000000000..fe3c9a068 --- /dev/null +++ b/packages/website/src/icons/JestIcon.tsx @@ -0,0 +1,26 @@ +import { Props } from './types'; + +export function JestIcon({ size = 800, className }: Props) { + return ( + + + + + + + ); +} diff --git a/packages/website/src/icons/MockServiceWorkerIcon.tsx b/packages/website/src/icons/MockServiceWorkerIcon.tsx new file mode 100644 index 000000000..a340f97ce --- /dev/null +++ b/packages/website/src/icons/MockServiceWorkerIcon.tsx @@ -0,0 +1,27 @@ +import { Props } from './types'; + +export function MockServiceWorkerIcon({ size = 800, className }: Props) { + return ( + + MSW + + + + + + ); +} diff --git a/packages/website/src/icons/PlaywrightIcon.tsx b/packages/website/src/icons/PlaywrightIcon.tsx new file mode 100644 index 000000000..2ad40ea76 --- /dev/null +++ b/packages/website/src/icons/PlaywrightIcon.tsx @@ -0,0 +1,46 @@ +import { Props } from './types'; + +export function PlaywrightIcon({ size = 800, className }: Props) { + return ( + + + + + + + + + + + + ); +} diff --git a/packages/website/src/icons/ReactNavigationIcon.tsx b/packages/website/src/icons/ReactNavigationIcon.tsx new file mode 100644 index 000000000..8e0801d01 --- /dev/null +++ b/packages/website/src/icons/ReactNavigationIcon.tsx @@ -0,0 +1,88 @@ +import { Props } from './types'; + +export function ReactNavigationIcon({ size = 800, className }: Props) { + return ( + + + + + + ); +} diff --git a/packages/website/src/icons/RedisIcon.tsx b/packages/website/src/icons/RedisIcon.tsx new file mode 100644 index 000000000..a8a61ec58 --- /dev/null +++ b/packages/website/src/icons/RedisIcon.tsx @@ -0,0 +1,58 @@ +import { Props } from './types'; + +export function RedisIcon({ size = 800, className }: Props) { + return ( + + + + + + + + + + + + + + ); +} diff --git a/packages/website/src/icons/StorybookIcon.tsx b/packages/website/src/icons/StorybookIcon.tsx new file mode 100644 index 000000000..e6c04022e --- /dev/null +++ b/packages/website/src/icons/StorybookIcon.tsx @@ -0,0 +1,34 @@ +import { Props } from './types'; + +export function StorybookIcon({ size = 800, className }: Props) { + return ( + + + + + + + + + + + + + ); +} diff --git a/packages/website/src/icons/SwaggerIcon.tsx b/packages/website/src/icons/SwaggerIcon.tsx new file mode 100644 index 000000000..8a24c06c2 --- /dev/null +++ b/packages/website/src/icons/SwaggerIcon.tsx @@ -0,0 +1,30 @@ +import { Props } from './types'; + +export function SwaggerIcon({ size = 800, className }: Props) { + return ( + + + + + + + + ); +} diff --git a/packages/website/src/icons/TypescriptIcon.tsx b/packages/website/src/icons/TypescriptIcon.tsx new file mode 100644 index 000000000..9f2212fbb --- /dev/null +++ b/packages/website/src/icons/TypescriptIcon.tsx @@ -0,0 +1,20 @@ +import { Props } from './types'; + +export function TypescriptIcon({ size = 800, className }: Props) { + return ( + + + + + ); +} diff --git a/packages/website/src/icons/VitestIcon.tsx b/packages/website/src/icons/VitestIcon.tsx new file mode 100644 index 000000000..6bbfce3b0 --- /dev/null +++ b/packages/website/src/icons/VitestIcon.tsx @@ -0,0 +1,27 @@ +import { Props } from './types'; + +export function VitestIcon({ size = 800, className }: Props) { + return ( + + + + + + ); +} diff --git a/packages/website/src/icons/index.ts b/packages/website/src/icons/index.ts index 8f2c82b47..a602d03e3 100644 --- a/packages/website/src/icons/index.ts +++ b/packages/website/src/icons/index.ts @@ -54,3 +54,17 @@ export { VuetifyIcon } from './VuetifyIcon'; export { Nuxt3Icon } from './Nuxt3Icon'; export { XstateIcon } from './XstateIcon'; export { CssIcon } from './CssIcon'; +export { StorybookIcon } from './StorybookIcon'; +export { TypescriptIcon } from './TypescriptIcon'; +export { MockServiceWorkerIcon } from './MockServiceWorkerIcon'; +export { RedisIcon } from './RedisIcon'; +export { JestIcon } from './JestIcon'; +export { ReactNavigationIcon } from './ReactNavigationIcon'; +export { SwaggerIcon } from './SwaggerIcon'; +export { BullmqIcon } from './BullmqIcon'; +export { EmotionIcon } from './EmotionIcon'; +export { AxiosIcon } from './AxiosIcon'; +export { VitestIcon } from './VitestIcon'; +export { AWSSQSIcon } from './AWSSQSIcon'; +export { PlaywrightIcon } from './PlaywrightIcon'; +export { BriefcaseIcon } from './BriefcaseIcon'; diff --git a/packages/website/src/layouts/KitLayout.astro b/packages/website/src/layouts/KitLayout.astro index f25916b32..560ba6f6a 100644 --- a/packages/website/src/layouts/KitLayout.astro +++ b/packages/website/src/layouts/KitLayout.astro @@ -7,9 +7,11 @@ import { TableOfContents } from '../components/TableOfContents.tsx'; import MobileNavigation from '../components/MobileNavigation.tsx'; import KitDemoHero from '../components/KitDemoHero.astro'; import KitTechnologies from '../components/KitTechnologies.astro'; +import KitShowcases from '../components/KitShowcases.astro'; import Footer from '../components/Footer.astro'; import { parseKit } from '../lib/parseKits'; const { content, headings } = Astro.props; +console.log('content', content) const path = Astro.url.pathname; const kit = parseKit(content); --- @@ -43,6 +45,7 @@ const kit = parseKit(content); +
diff --git a/packages/website/src/lib/parseKits.ts b/packages/website/src/lib/parseKits.ts index 605b06f7e..e25455448 100644 --- a/packages/website/src/lib/parseKits.ts +++ b/packages/website/src/lib/parseKits.ts @@ -1,6 +1,6 @@ import type { MarkdownContent } from '../types'; import pick from 'just-pick'; -import { TECHNOLOGIES } from '../config'; +import { TECHNOLOGIES, SHOWCASES } from '../config'; export function parseKits(kits: MarkdownContent[]) { return kits.map(parseKit); @@ -14,6 +14,18 @@ export function parseKit(kit: MarkdownContent) { const technologies = TECHNOLOGIES.filter((tech) => { return keywords.includes(tech.key); }); + const kitObject = pick(kitData, [ + 'name', + 'version', + 'description', + 'readmePath', + 'starterPath', + 'hasShowcase', + ]); + const showcases = SHOWCASES.filter((showcase) => { + return showcase.id === kitObject.name; + }); + return { ...pick(kitData, [ 'name', @@ -24,5 +36,6 @@ export function parseKit(kit: MarkdownContent) { 'hasShowcase', ]), technologies, + showcases, }; } diff --git a/starters/angular-apollo-tailwind/package.json b/starters/angular-apollo-tailwind/package.json index 5ad814234..a55e7d6ba 100644 --- a/starters/angular-apollo-tailwind/package.json +++ b/starters/angular-apollo-tailwind/package.json @@ -5,7 +5,11 @@ "keywords": [ "angular", "apollo", - "tailwind" + "tailwind", + "rxjs", + "storybook", + "typescript", + "graphql" ], "hasShowcase": true, "private": true, diff --git a/starters/angular-ngrx-scss/package.json b/starters/angular-ngrx-scss/package.json index 4d2317134..d3c5b75c3 100644 --- a/starters/angular-ngrx-scss/package.json +++ b/starters/angular-ngrx-scss/package.json @@ -5,7 +5,10 @@ "keywords": [ "angular", "ngrx", - "sass" + "sass", + "rxjs", + "storybook", + "typescript" ], "hasShowcase": false, "private": true, diff --git a/starters/cra-rxjs-styled-components/package.json b/starters/cra-rxjs-styled-components/package.json index 963adb5b6..1b62c4273 100644 --- a/starters/cra-rxjs-styled-components/package.json +++ b/starters/cra-rxjs-styled-components/package.json @@ -5,7 +5,11 @@ "keywords": [ "react", "rxjs", - "styled-components" + "styled-components", + "mock-service-worker", + "storybook", + "typescript", + "create-react-app" ], "hasShowcase": true, "private": true, diff --git a/starters/deno-oak-denodb/deno.json b/starters/deno-oak-denodb/deno.json index 00384ac27..f9caa7697 100644 --- a/starters/deno-oak-denodb/deno.json +++ b/starters/deno-oak-denodb/deno.json @@ -2,11 +2,7 @@ "name": "deno-oak-denodb", "version": "0.0.1", "description": "Deno, Oak, and DenoDB", - "keywords": [ - "deno", - "oak", - "denodb" - ], + "keywords": ["deno", "oak", "denodb", "graphql", "redis", "postgres"], "hasShowcase": false, "tasks": { "start-db": "docker compose up -d", @@ -21,32 +17,17 @@ }, "lint": { "files": { - "include": [ - "./src" - ] + "include": ["./src"] }, "rules": { - "tags": [ - "recommended" - ], - "include": [ - "no-external-import", - "no-const-assign", - "explicit-function-return-type", - "camelcase", - "explicit-module-boundary-types", - "default-param-last" - ], - "exclude": [ - "no-explicit-any" - ] + "tags": ["recommended"], + "include": ["no-external-import", "no-const-assign", "explicit-function-return-type", "camelcase", "explicit-module-boundary-types", "default-param-last"], + "exclude": ["no-explicit-any"] } }, "fmt": { "files": { - "include": [ - "./src" - ] + "include": ["./src"] }, "options": { "useTabs": true, diff --git a/starters/expo-zustand-styled-components/package.json b/starters/expo-zustand-styled-components/package.json index b40879203..fce04f460 100644 --- a/starters/expo-zustand-styled-components/package.json +++ b/starters/expo-zustand-styled-components/package.json @@ -6,7 +6,10 @@ "keywords": [ "expo", "zustand", - "styled-components" + "styled-components", + "jest", + "typescript", + "react-navigation" ], "hasShowcase": true, "scripts": { diff --git a/starters/express-apollo-prisma/package.json b/starters/express-apollo-prisma/package.json index ff410a821..597048c29 100644 --- a/starters/express-apollo-prisma/package.json +++ b/starters/express-apollo-prisma/package.json @@ -5,7 +5,10 @@ "keywords": [ "express", "apollo-server", - "prisma" + "prisma", + "typescript", + "redis", + "graphql" ], "hasShowcase": false, "license": "MIT", diff --git a/starters/express-typeorm-postgres/package.json b/starters/express-typeorm-postgres/package.json index 86ef5fa27..f68bfa426 100644 --- a/starters/express-typeorm-postgres/package.json +++ b/starters/express-typeorm-postgres/package.json @@ -5,7 +5,12 @@ "keywords": [ "express", "typeorm", - "postgres" + "postgres", + "redis", + "jest", + "typescript", + "swagger", + "bullmq" ], "hasShowcase": false, "license": "MIT", diff --git a/starters/next-chakra-ui/package.json b/starters/next-chakra-ui/package.json index 04a58b513..717624b72 100644 --- a/starters/next-chakra-ui/package.json +++ b/starters/next-chakra-ui/package.json @@ -6,7 +6,11 @@ "hasShowcase": false, "keywords": [ "next", - "chakra-ui" + "chakra-ui", + "storybook", + "typescript", + "jest", + "emotion" ], "scripts": { "dev": "NODE_OPTIONS='--inspect' next dev", diff --git a/starters/next12-react-query-tailwind/package.json b/starters/next12-react-query-tailwind/package.json new file mode 100644 index 000000000..f4d48825e --- /dev/null +++ b/starters/next12-react-query-tailwind/package.json @@ -0,0 +1,70 @@ +{ + "name": "next12-react-query-tailwind", + "description": "NextJS 12, React Query, and TailwindCSS", + "keywords": [ + "next", + "react-query", + "tailwind", + "storybook", + "jest", + "typescript", + "mock-service-worker" + ], + "version": "0.1.1", + "private": true, + "hasShowcase": true, + "engines": { + "node": ">=16.0 <18.0.0" + }, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint", + "test": "jest", + "format": "prettier --write ./src", + "storybook": "start-storybook -p 6006 -s public", + "build-storybook": "build-storybook" + }, + "dependencies": { + "@tanstack/react-query": "^4.14.1", + "clsx": "^1.2.1", + "next": "12.3.4", + "react": "^18.2.0", + "react-dom": "^18.2.0" + }, + "devDependencies": { + "@storybook/addon-actions": "^6.5.13", + "@storybook/addon-essentials": "^6.5.13", + "@storybook/addon-links": "^6.5.13", + "@storybook/addon-postcss": "^2.0.0", + "@storybook/react": "^6.5.13", + "@testing-library/jest-dom": "^5.16.5", + "@testing-library/react": "^13.4.0", + "@testing-library/user-event": "^14.4.3", + "@types/jest": "^29.2.1", + "@types/node": "18.13.0", + "@types/react": "^18.0.24", + "autoprefixer": "^10.4.13", + "eslint": "^8.26.0", + "eslint-config-next": "^13.0.1", + "eslint-plugin-storybook": "^0.6.7", + "eslint-plugin-testing-library": "^5.9.1", + "identity-obj-proxy": "3.0.0", + "isomorphic-unfetch": "3.1.0", + "jest": "^29.2.2", + "jest-environment-jsdom": "^29.2.2", + "jest-mock": "^29.2.2", + "msw": "^0.49.3", + "msw-storybook-addon": "^1.6.3", + "postcss": "^8.4.18", + "prettier": "^2.7.1", + "storybook-addon-next-router": "^4.0.1", + "storybook-css-modules-preset": "^1.1.1", + "tailwindcss": "^3.2.1", + "typescript": "^4.8.4" + }, + "msw": { + "workerDirectory": "public" + } +} diff --git a/starters/nuxt2-pinia-tailwind/package.json b/starters/nuxt2-pinia-tailwind/package.json index ccb662fa3..5a8afec73 100644 --- a/starters/nuxt2-pinia-tailwind/package.json +++ b/starters/nuxt2-pinia-tailwind/package.json @@ -5,7 +5,11 @@ "keywords": [ "nuxt 2", "pinia", - "tailwind" + "tailwind", + "vue", + "jest", + "axios", + "mock-service-worker" ], "hasShowcase": false, "private": true, @@ -83,4 +87,4 @@ "ts-jest": "27.1.1", "vue-jest": "3.0.4" } -} \ No newline at end of file +} diff --git a/starters/nuxt3-pinia-vuetify/package.json b/starters/nuxt3-pinia-vuetify/package.json index c217400b9..4f66c486b 100644 --- a/starters/nuxt3-pinia-vuetify/package.json +++ b/starters/nuxt3-pinia-vuetify/package.json @@ -5,7 +5,9 @@ "keywords": [ "nuxt 3", "pinia", - "vuetify" + "vuetify", + "typescript", + "sass" ], "hasShowcase": false, "private": true, diff --git a/starters/qwik-graphql-tailwind/package.json b/starters/qwik-graphql-tailwind/package.json index 9d69a9066..8d4372abb 100644 --- a/starters/qwik-graphql-tailwind/package.json +++ b/starters/qwik-graphql-tailwind/package.json @@ -4,7 +4,12 @@ "keywords": [ "qwik", "graphql", - "tailwind" + "tailwind", + "storybook", + "typescript", + "vite", + "qwik-city", + "vitest" ], "version": "0.0.1", "hasShowcase": true, diff --git a/starters/remix-gql-tailwind/package.json b/starters/remix-gql-tailwind/package.json index 062c58d63..b6e21becb 100644 --- a/starters/remix-gql-tailwind/package.json +++ b/starters/remix-gql-tailwind/package.json @@ -5,7 +5,11 @@ "keywords": [ "remix", "graphql", - "tailwind" + "tailwind", + "storybook", + "jest", + "typescript", + "vite" ], "hasShowcase": false, "private": true, diff --git a/starters/serverless-framework-apollo-contentful/package.json b/starters/serverless-framework-apollo-contentful/package.json index d3fd2140e..e1fd030a2 100644 --- a/starters/serverless-framework-apollo-contentful/package.json +++ b/starters/serverless-framework-apollo-contentful/package.json @@ -19,7 +19,11 @@ "keywords": [ "serverless", "apollo-server", - "contentful" + "contentful", + "jest", + "typescript", + "redis", + "aws-sqs" ], "hasShowcase": false, "author": "This Dot Labs", diff --git a/starters/solidjs-tailwind/package.json b/starters/solidjs-tailwind/package.json index e18840b12..1f5d6f3b6 100644 --- a/starters/solidjs-tailwind/package.json +++ b/starters/solidjs-tailwind/package.json @@ -75,7 +75,13 @@ }, "keywords": [ "solidjs", - "tailwind" + "tailwind", + "typescript", + "vite", + "storybook", + "mock-service-worker", + "react", + "vitest" ], "pnpm": { "peerDependencyRules": { diff --git a/starters/solidstart-tanstackquery-tailwind-modules/package.json b/starters/solidstart-tanstackquery-tailwind-modules/package.json index c3954ebbe..46728c12a 100644 --- a/starters/solidstart-tanstackquery-tailwind-modules/package.json +++ b/starters/solidstart-tanstackquery-tailwind-modules/package.json @@ -6,7 +6,14 @@ "keywords": [ "solidstart", "tanstack-query", - "tailwind" + "tailwind", + "storybook", + "typescript", + "vite", + "mock-service-worker", + "solidjs", + "vitest", + "css module" ], "hasShowcase": true, "contributors": [ diff --git a/starters/svelte-kit-scss/package.json b/starters/svelte-kit-scss/package.json index 1ccee878f..55d7696b8 100644 --- a/starters/svelte-kit-scss/package.json +++ b/starters/svelte-kit-scss/package.json @@ -3,7 +3,13 @@ "description": "SvelteKit and SCSS", "keywords": [ "svelte-kit", - "sass" + "sass", + "playwright", + "storybook", + "vite", + "typescript", + "vitest", + "svelte" ], "private": true, "version": "0.1.0", diff --git a/starters/vue3-apollo-quasar/package.json b/starters/vue3-apollo-quasar/package.json index 44f400950..f78c5a7bd 100644 --- a/starters/vue3-apollo-quasar/package.json +++ b/starters/vue3-apollo-quasar/package.json @@ -5,7 +5,11 @@ "keywords": [ "vue", "apollo", - "quasar" + "quasar", + "storybook", + "typescript", + "jest", + "sass" ], "hasShowcase": true, "private": true, diff --git a/starters/vue3-xstate-css/package.json b/starters/vue3-xstate-css/package.json index e83e33b67..da77a874e 100644 --- a/starters/vue3-xstate-css/package.json +++ b/starters/vue3-xstate-css/package.json @@ -5,7 +5,11 @@ "keywords": [ "vue", "xstate", - "css" + "css", + "storybook", + "typescript", + "vite", + "vue-router" ], "hasShowcase": false, "engines": { From e0043bce32c89f647df22079ecd70ee90b90ee3a Mon Sep 17 00:00:00 2001 From: WillHutt Date: Fri, 23 Jun 2023 13:38:26 -0700 Subject: [PATCH 02/30] refactor: remove consoles --- packages/website/src/components/KitHero.astro | 1 - packages/website/src/components/KitShowcases.astro | 1 - packages/website/src/layouts/KitLayout.astro | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/website/src/components/KitHero.astro b/packages/website/src/components/KitHero.astro index 015d7ef93..a3d823a2d 100644 --- a/packages/website/src/components/KitHero.astro +++ b/packages/website/src/components/KitHero.astro @@ -4,7 +4,6 @@ import Breadcrumbs from './Breadcrumbs.astro'; import KitActionLinks from './KitActionLinks.astro'; import TechIcon from './TechIcon.astro'; const { technologies, name, hasShowcase } = Astro.props; -console.log('tech', technologies) const crumbs = [ { href: '/', diff --git a/packages/website/src/components/KitShowcases.astro b/packages/website/src/components/KitShowcases.astro index a6c9038af..7c96f0424 100644 --- a/packages/website/src/components/KitShowcases.astro +++ b/packages/website/src/components/KitShowcases.astro @@ -1,7 +1,6 @@ --- import { ArrowRightIcon } from '../icons/heroicons'; const { showcases, hasShowcase } = Astro.props; -console.log('showcases', showcases); --- {hasShowcase ? diff --git a/packages/website/src/layouts/KitLayout.astro b/packages/website/src/layouts/KitLayout.astro index 560ba6f6a..4d587dabd 100644 --- a/packages/website/src/layouts/KitLayout.astro +++ b/packages/website/src/layouts/KitLayout.astro @@ -11,7 +11,6 @@ import KitShowcases from '../components/KitShowcases.astro'; import Footer from '../components/Footer.astro'; import { parseKit } from '../lib/parseKits'; const { content, headings } = Astro.props; -console.log('content', content) const path = Astro.url.pathname; const kit = parseKit(content); --- From 40f3868bfd939b1c14c309b8472077aa72b56ee1 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Fri, 23 Jun 2023 13:40:59 -0700 Subject: [PATCH 03/30] chore: format --- .../src/components/KitActionLinks.astro | 5 +- packages/website/src/components/KitHero.astro | 5 +- .../website/src/components/KitShowcases.astro | 99 ++++++++++--------- .../website/src/components/StickyHero.astro | 5 +- packages/website/src/icons/PrismaIcon.tsx | 3 +- 5 files changed, 57 insertions(+), 60 deletions(-) diff --git a/packages/website/src/components/KitActionLinks.astro b/packages/website/src/components/KitActionLinks.astro index da2f56290..794619d72 100644 --- a/packages/website/src/components/KitActionLinks.astro +++ b/packages/website/src/components/KitActionLinks.astro @@ -20,10 +20,7 @@ const { name, hasShowcase, inline } = Astro.props;
{ hasShowcase && ( - + <> View Showcase diff --git a/packages/website/src/components/KitHero.astro b/packages/website/src/components/KitHero.astro index a3d823a2d..0da81b234 100644 --- a/packages/website/src/components/KitHero.astro +++ b/packages/website/src/components/KitHero.astro @@ -32,13 +32,12 @@ const crumbs = [ 'hidden text-3xl text-gray-300 font-light', i > 0 && 'lg:inline' )} - > - + > - + )) diff --git a/packages/website/src/components/KitShowcases.astro b/packages/website/src/components/KitShowcases.astro index 7c96f0424..424bdb940 100644 --- a/packages/website/src/components/KitShowcases.astro +++ b/packages/website/src/components/KitShowcases.astro @@ -3,54 +3,57 @@ import { ArrowRightIcon } from '../icons/heroicons'; const { showcases, hasShowcase } = Astro.props; --- -{hasShowcase ? -
-

- See kits in action via our showcases -

-
- { - showcases.map(({ name, repo, app, Icon }) => ( -
-
-
- +{ + hasShowcase ? ( +
+

+ See kits in action via our showcases +

+
+ {showcases.map(({ name, repo, app, Icon }) => ( +
+
+
+ +
+
+

+ {name} +

+
-
-

- {name} -

+
+
+ + Repository + +
+ {app !== '' ? ( +
+ + Live Application + + +
+ ) : ( + '' + )}
-
-
- - Repository - - -
- {app !== '' ? -
- - Live Application - - -
: ''} -
- )) - } -
-
-: ''} + ))} +
+
+ ) : ( + '' + ) +} diff --git a/packages/website/src/components/StickyHero.astro b/packages/website/src/components/StickyHero.astro index cd3c689cd..df5d20fa9 100644 --- a/packages/website/src/components/StickyHero.astro +++ b/packages/website/src/components/StickyHero.astro @@ -22,10 +22,7 @@ const { name, hasShowcase } = Astro.props;
{ hasShowcase && ( - + <> View Showcase diff --git a/packages/website/src/icons/PrismaIcon.tsx b/packages/website/src/icons/PrismaIcon.tsx index 2a8ed1924..6efa521f5 100644 --- a/packages/website/src/icons/PrismaIcon.tsx +++ b/packages/website/src/icons/PrismaIcon.tsx @@ -7,7 +7,8 @@ export function PrismaIcon({ className, size = 48 }: Props) { viewBox="0 0 32 32" width={size} height={size} - className={className}> + className={className} + > Date: Mon, 26 Jun 2023 15:22:37 -0700 Subject: [PATCH 04/30] refactor: brakes out showcase links into components, adjusts package.jsons, and changes homepage avail kit styles --- packages/website/src/components/KitItem.astro | 33 ++------- .../website/src/components/KitShowcases.astro | 33 ++------- .../website/src/components/ShowcaseLink.astro | 21 ++++++ .../src/components/ShowcaseLinks.astro | 16 +++++ packages/website/src/config.tsx | 2 +- starters/angular-ngrx-scss/package.json | 2 +- .../next-react-query-tailwind/package.json | 6 +- .../next12-react-query-tailwind/package.json | 70 ------------------- starters/nuxt2-pinia-tailwind/package.json | 3 +- starters/remix-gql-tailwind/package.json | 2 +- 10 files changed, 57 insertions(+), 131 deletions(-) create mode 100644 packages/website/src/components/ShowcaseLink.astro create mode 100644 packages/website/src/components/ShowcaseLinks.astro delete mode 100644 starters/next12-react-query-tailwind/package.json diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 256f575b8..77e7a1265 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -1,40 +1,19 @@ --- -import { ArrowRightIcon } from '../icons/heroicons'; import TechIcon from './TechIcon.astro'; -import { GitHubIcon } from '../icons/GitHubIcon.tsx'; const { kit } = Astro.props; -const technologyStubsCount = kit.technologies.length < 3 ? (3 - kit.technologies.length) : 0; +// grid align-center +// grid-rows-4 ---
-

{kit.name}

-
+

{kit.name}

+
{kit.technologies.map(({ Icon }) => ( -
+
{ Icon && }
))}
-
- - View Kit - - -
diff --git a/packages/website/src/components/KitShowcases.astro b/packages/website/src/components/KitShowcases.astro index 424bdb940..acb2462fd 100644 --- a/packages/website/src/components/KitShowcases.astro +++ b/packages/website/src/components/KitShowcases.astro @@ -1,11 +1,11 @@ --- -import { ArrowRightIcon } from '../icons/heroicons'; +import ShowcaseLinks from './ShowcaseLinks.astro' const { showcases, hasShowcase } = Astro.props; --- { hasShowcase ? ( -
+

See kits in action via our showcases

@@ -23,37 +23,12 @@ const { showcases, hasShowcase } = Astro.props;
-
- - Repository - - -
- {app !== '' ? ( -
- - Live Application - - -
- ) : ( - '' - )} +
))}
) : ( - '' + null ) } diff --git a/packages/website/src/components/ShowcaseLink.astro b/packages/website/src/components/ShowcaseLink.astro new file mode 100644 index 000000000..db06158c8 --- /dev/null +++ b/packages/website/src/components/ShowcaseLink.astro @@ -0,0 +1,21 @@ +--- +import { ArrowRightIcon } from '../icons/heroicons'; +const { app, repo, name } = Astro.props; +let showcase; +console.log('showcaseLink app', app) +if (app !== undefined) { + showcase = app +} else { + showcase = repo +} +--- + + +{name} + + diff --git a/packages/website/src/components/ShowcaseLinks.astro b/packages/website/src/components/ShowcaseLinks.astro new file mode 100644 index 000000000..64e23b80e --- /dev/null +++ b/packages/website/src/components/ShowcaseLinks.astro @@ -0,0 +1,16 @@ +--- +import ShowcaseLink from './ShowcaseLink.astro'; +const { app, repo } = Astro.props; +console.log('app', app) +--- + +
+ +
+{app !== '' ? ( +
+ +
+) : ( + null +)} diff --git a/packages/website/src/config.tsx b/packages/website/src/config.tsx index c97c9fcd4..72e682cc5 100644 --- a/packages/website/src/config.tsx +++ b/packages/website/src/config.tsx @@ -571,7 +571,7 @@ export const SHOWCASES = [ Icon: (props) => , }, { - id: 'nuxt-pinia-tailwind', + id: 'nuxt2-pinia-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/nuxt-pinia-tailwind', app: '', diff --git a/starters/angular-ngrx-scss/package.json b/starters/angular-ngrx-scss/package.json index d3c5b75c3..6984cc098 100644 --- a/starters/angular-ngrx-scss/package.json +++ b/starters/angular-ngrx-scss/package.json @@ -10,7 +10,7 @@ "storybook", "typescript" ], - "hasShowcase": false, + "hasShowcase": true, "private": true, "engines": { "node": ">= 16.0" diff --git a/starters/next-react-query-tailwind/package.json b/starters/next-react-query-tailwind/package.json index 0518f6ac9..378b19b19 100644 --- a/starters/next-react-query-tailwind/package.json +++ b/starters/next-react-query-tailwind/package.json @@ -4,7 +4,11 @@ "keywords": [ "next", "react-query", - "tailwind" + "tailwind", + "storybook", + "jest", + "typescript", + "mock-service-worker" ], "version": "0.1.1", "private": true, diff --git a/starters/next12-react-query-tailwind/package.json b/starters/next12-react-query-tailwind/package.json deleted file mode 100644 index f4d48825e..000000000 --- a/starters/next12-react-query-tailwind/package.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "name": "next12-react-query-tailwind", - "description": "NextJS 12, React Query, and TailwindCSS", - "keywords": [ - "next", - "react-query", - "tailwind", - "storybook", - "jest", - "typescript", - "mock-service-worker" - ], - "version": "0.1.1", - "private": true, - "hasShowcase": true, - "engines": { - "node": ">=16.0 <18.0.0" - }, - "scripts": { - "dev": "next dev", - "build": "next build", - "start": "next start", - "lint": "next lint", - "test": "jest", - "format": "prettier --write ./src", - "storybook": "start-storybook -p 6006 -s public", - "build-storybook": "build-storybook" - }, - "dependencies": { - "@tanstack/react-query": "^4.14.1", - "clsx": "^1.2.1", - "next": "12.3.4", - "react": "^18.2.0", - "react-dom": "^18.2.0" - }, - "devDependencies": { - "@storybook/addon-actions": "^6.5.13", - "@storybook/addon-essentials": "^6.5.13", - "@storybook/addon-links": "^6.5.13", - "@storybook/addon-postcss": "^2.0.0", - "@storybook/react": "^6.5.13", - "@testing-library/jest-dom": "^5.16.5", - "@testing-library/react": "^13.4.0", - "@testing-library/user-event": "^14.4.3", - "@types/jest": "^29.2.1", - "@types/node": "18.13.0", - "@types/react": "^18.0.24", - "autoprefixer": "^10.4.13", - "eslint": "^8.26.0", - "eslint-config-next": "^13.0.1", - "eslint-plugin-storybook": "^0.6.7", - "eslint-plugin-testing-library": "^5.9.1", - "identity-obj-proxy": "3.0.0", - "isomorphic-unfetch": "3.1.0", - "jest": "^29.2.2", - "jest-environment-jsdom": "^29.2.2", - "jest-mock": "^29.2.2", - "msw": "^0.49.3", - "msw-storybook-addon": "^1.6.3", - "postcss": "^8.4.18", - "prettier": "^2.7.1", - "storybook-addon-next-router": "^4.0.1", - "storybook-css-modules-preset": "^1.1.1", - "tailwindcss": "^3.2.1", - "typescript": "^4.8.4" - }, - "msw": { - "workerDirectory": "public" - } -} diff --git a/starters/nuxt2-pinia-tailwind/package.json b/starters/nuxt2-pinia-tailwind/package.json index 5a8afec73..745f8559d 100644 --- a/starters/nuxt2-pinia-tailwind/package.json +++ b/starters/nuxt2-pinia-tailwind/package.json @@ -11,7 +11,7 @@ "axios", "mock-service-worker" ], - "hasShowcase": false, + "hasShowcase": true, "private": true, "engines": { "node": ">= 16.0 <18.0" @@ -51,6 +51,7 @@ }, "devDependencies": { "@babel/eslint-parser": "7.19.1", + "@babel/plugin-proposal-private-property-in-object": "^7.19.1", "@commitlint/cli": "15.0.0", "@commitlint/config-conventional": "15.0.0", "@nuxt/postcss8": "1.1.3", diff --git a/starters/remix-gql-tailwind/package.json b/starters/remix-gql-tailwind/package.json index b6e21becb..2e2cb78e5 100644 --- a/starters/remix-gql-tailwind/package.json +++ b/starters/remix-gql-tailwind/package.json @@ -11,7 +11,7 @@ "typescript", "vite" ], - "hasShowcase": false, + "hasShowcase": true, "private": true, "sideEffects": false, "engines": { From 4b8fbaf9327d7f207402572f2517b3c8f7c9e3c8 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Mon, 26 Jun 2023 15:33:11 -0700 Subject: [PATCH 05/30] refactor: cleanup --- packages/website/src/components/KitItem.astro | 2 -- packages/website/src/components/ShowcaseLink.astro | 2 +- packages/website/src/components/ShowcaseLinks.astro | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 77e7a1265..0ec499746 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -1,8 +1,6 @@ --- import TechIcon from './TechIcon.astro'; const { kit } = Astro.props; -// grid align-center -// grid-rows-4 ---
From ea85eace62c23e84c38a483a3a7201154d7a59b8 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Mon, 26 Jun 2023 15:33:49 -0700 Subject: [PATCH 06/30] chore: format --- packages/website/src/components/KitHero.astro | 2 +- .../website/src/components/KitShowcases.astro | 8 +++----- .../website/src/components/ShowcaseLink.astro | 16 ++++++++-------- .../website/src/components/ShowcaseLinks.astro | 16 ++++++++-------- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/packages/website/src/components/KitHero.astro b/packages/website/src/components/KitHero.astro index 0da81b234..dd19fbcf9 100644 --- a/packages/website/src/components/KitHero.astro +++ b/packages/website/src/components/KitHero.astro @@ -32,7 +32,7 @@ const crumbs = [ 'hidden text-3xl text-gray-300 font-light', i > 0 && 'lg:inline' )} - > + />
- +
))}
- ) : ( - null - ) + ) : null } diff --git a/packages/website/src/components/ShowcaseLink.astro b/packages/website/src/components/ShowcaseLink.astro index 45491e58d..16fd04b68 100644 --- a/packages/website/src/components/ShowcaseLink.astro +++ b/packages/website/src/components/ShowcaseLink.astro @@ -4,18 +4,18 @@ const { app, repo, name } = Astro.props; let showcase; if (app !== undefined) { - showcase = app + showcase = app; } else { - showcase = repo + showcase = repo; } --- -{name} - + {name} + diff --git a/packages/website/src/components/ShowcaseLinks.astro b/packages/website/src/components/ShowcaseLinks.astro index baf7b6d7b..a04cdd55c 100644 --- a/packages/website/src/components/ShowcaseLinks.astro +++ b/packages/website/src/components/ShowcaseLinks.astro @@ -4,12 +4,12 @@ const { app, repo } = Astro.props; ---
- +
-{app !== '' ? ( -
- -
-) : ( - null -)} +{ + app !== '' ? ( +
+ +
+ ) : null +} From 07daddd97e31c5a1bb66b20e86e603c7962d48dd Mon Sep 17 00:00:00 2001 From: WillHutt Date: Tue, 27 Jun 2023 08:00:14 -0700 Subject: [PATCH 07/30] fix: address feedback --- packages/website/src/components/TechIcon.astro | 6 +++--- packages/website/src/config.tsx | 2 ++ starters/angular-ngrx-scss/package.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/website/src/components/TechIcon.astro b/packages/website/src/components/TechIcon.astro index 56d93b383..c7fb3af3b 100644 --- a/packages/website/src/components/TechIcon.astro +++ b/packages/website/src/components/TechIcon.astro @@ -5,11 +5,11 @@ const { Icon, variant = 'base' } = Astro.props; const sizeMap = { base: { size: 48, - container: 'w-20 h-20 bg-white dark:bg-gray-900', + container: 'w-20 h-20 bg-gray-100 dark:bg-gray-900', }, lg: { size: 64, - container: 'w-28 h-28 bg-white dark:bg-gray-800', + container: 'w-28 h-28 bg-gray-100 dark:bg-gray-800', }, }; @@ -18,7 +18,7 @@ const size = sizeMap[variant]; diff --git a/packages/website/src/config.tsx b/packages/website/src/config.tsx index 72e682cc5..7ccd687cc 100644 --- a/packages/website/src/config.tsx +++ b/packages/website/src/config.tsx @@ -542,6 +542,8 @@ export const SHOWCASES = [ app: '', Icon: (props) => , }, + // The angular-ngrx-scss showcase is currently not finished + // so this is set as false in that starters package.json { id: 'angular-ngrx-scss', name: 'Github Showcase', diff --git a/starters/angular-ngrx-scss/package.json b/starters/angular-ngrx-scss/package.json index 6984cc098..d3c5b75c3 100644 --- a/starters/angular-ngrx-scss/package.json +++ b/starters/angular-ngrx-scss/package.json @@ -10,7 +10,7 @@ "storybook", "typescript" ], - "hasShowcase": true, + "hasShowcase": false, "private": true, "engines": { "node": ">= 16.0" From 8684a28b26e0fac7eb4cc190077ee53236429187 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Tue, 27 Jun 2023 14:10:11 -0700 Subject: [PATCH 08/30] refactor: wip homepage layout, swap kits to individual kits, rename id to kitname, swap back showcase to false for nuxt and remix --- packages/website/src/components/KitHero.astro | 2 +- packages/website/src/components/KitItem.astro | 7 +++-- packages/website/src/components/KitList.astro | 3 +- packages/website/src/config.tsx | 30 +++++++++++-------- packages/website/src/lib/parseKits.ts | 2 +- packages/website/tailwind.config.cjs | 4 +++ starters/nuxt2-pinia-tailwind/package.json | 2 +- starters/remix-gql-tailwind/package.json | 2 +- 8 files changed, 31 insertions(+), 21 deletions(-) diff --git a/packages/website/src/components/KitHero.astro b/packages/website/src/components/KitHero.astro index dd19fbcf9..610f1323f 100644 --- a/packages/website/src/components/KitHero.astro +++ b/packages/website/src/components/KitHero.astro @@ -10,7 +10,7 @@ const crumbs = [ title: 'Home', }, { - title: 'Kits', + title: name, }, ]; --- diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 0ec499746..8c242cc8f 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -1,13 +1,14 @@ --- import TechIcon from './TechIcon.astro'; const { kit } = Astro.props; +// m-auto ---
-

{kit.name}

-
+

{kit.name}

+
{kit.technologies.map(({ Icon }) => (
{ Icon && } diff --git a/packages/website/src/components/KitList.astro b/packages/website/src/components/KitList.astro index 6f193a13a..fceaebdfb 100644 --- a/packages/website/src/components/KitList.astro +++ b/packages/website/src/components/KitList.astro @@ -1,9 +1,10 @@ --- import KitItem from './KitItem.astro'; const { kits } = Astro.props; +// [&:nth-child(1n)]:m-auto odd:m-auto --- -
+
{ kits.map((kit) => (
diff --git a/packages/website/src/config.tsx b/packages/website/src/config.tsx index 7ccd687cc..a92830ea9 100644 --- a/packages/website/src/config.tsx +++ b/packages/website/src/config.tsx @@ -536,7 +536,7 @@ export const TECHNOLOGIES = [ export const SHOWCASES = [ { - id: 'angular-apollo-tailwind', + kit: 'angular-apollo-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/angular-apollo-tailwind', app: '', @@ -545,84 +545,88 @@ export const SHOWCASES = [ // The angular-ngrx-scss showcase is currently not finished // so this is set as false in that starters package.json { - id: 'angular-ngrx-scss', + kit: 'angular-ngrx-scss', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/angular-ngrx-scss', app: '', Icon: (props) => , }, { - id: 'cra-rxjs-styled-components', + kit: 'cra-rxjs-styled-components', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/cra-rxjs-styled-components', app: '', Icon: (props) => , }, { - id: 'expo-zustand-styled-components', + kit: 'expo-zustand-styled-components', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/expo-zustand-styled-components', app: '', Icon: (props) => , }, { - id: 'next-react-query-tailwind', + kit: 'next-react-query-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/next-react-query-tailwind', app: '', Icon: (props) => , }, + // The nuxt2-pinia-tailwind showcase is currently not finished + // so this is set as false in that starters package.json { - id: 'nuxt2-pinia-tailwind', + kit: 'nuxt2-pinia-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/nuxt-pinia-tailwind', app: '', Icon: (props) => , }, { - id: 'qwik-graphql-tailwind', + kit: 'qwik-graphql-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/qwik-graphql-tailwind', app: '', Icon: (props) => , }, + // The remix-gql-tailwind showcase is currently broken + // so this is set as false in that starters package.json { - id: 'remix-gql-tailwind', + kit: 'remix-gql-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/remix-gql-tailwind', app: '', Icon: (props) => , }, { - id: 'solidjs-tailwind', + kit: 'solidjs-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/solidjs-tailwind', app: '', Icon: (props) => , }, { - id: 'solidstart-tanstackquery-tailwind-modules', + kit: 'solidstart-tanstackquery-tailwind-modules', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/solidstart-tanstackquery-tailwind-modules', app: '', Icon: (props) => , }, { - id: 'svelte-kit-scss', + kit: 'svelte-kit-scss', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/svelte-kit-scss', app: '', Icon: (props) => , }, { - id: 'svelte-kit-scss', + kit: 'svelte-kit-scss', name: '7 GUIs Showcase', repo: 'https://github.com/thisdot/starter.dev-7guis-showcases', app: '', Icon: (props) => , }, { - id: 'vue3-apollo-quasar', + kit: 'vue3-apollo-quasar', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/vue3-apollo-quasar', app: '', diff --git a/packages/website/src/lib/parseKits.ts b/packages/website/src/lib/parseKits.ts index e25455448..a6bf3076c 100644 --- a/packages/website/src/lib/parseKits.ts +++ b/packages/website/src/lib/parseKits.ts @@ -23,7 +23,7 @@ export function parseKit(kit: MarkdownContent) { 'hasShowcase', ]); const showcases = SHOWCASES.filter((showcase) => { - return showcase.id === kitObject.name; + return showcase.kit === kitObject.name; }); return { diff --git a/packages/website/tailwind.config.cjs b/packages/website/tailwind.config.cjs index 5d91e7a46..2b0c9a4ee 100644 --- a/packages/website/tailwind.config.cjs +++ b/packages/website/tailwind.config.cjs @@ -52,7 +52,11 @@ module.exports = { sm: ['16px', '1.28'], base: ['18px', '1.32'], lg: ['20px', '1.22'], + xl: ['1.375rem', '2'] }, + gridTemplateColumns: { + 'avail-kits': 'repeat(3, 100px)', + } }, }, plugins: [require('@tailwindcss/typography')], diff --git a/starters/nuxt2-pinia-tailwind/package.json b/starters/nuxt2-pinia-tailwind/package.json index 745f8559d..ce7e03d81 100644 --- a/starters/nuxt2-pinia-tailwind/package.json +++ b/starters/nuxt2-pinia-tailwind/package.json @@ -11,7 +11,7 @@ "axios", "mock-service-worker" ], - "hasShowcase": true, + "hasShowcase": false, "private": true, "engines": { "node": ">= 16.0 <18.0" diff --git a/starters/remix-gql-tailwind/package.json b/starters/remix-gql-tailwind/package.json index 2e2cb78e5..b6e21becb 100644 --- a/starters/remix-gql-tailwind/package.json +++ b/starters/remix-gql-tailwind/package.json @@ -11,7 +11,7 @@ "typescript", "vite" ], - "hasShowcase": true, + "hasShowcase": false, "private": true, "sideEffects": false, "engines": { From e86d5542eafea3067a407773ac6b4aa34ff99a0b Mon Sep 17 00:00:00 2001 From: WillHutt Date: Tue, 27 Jun 2023 14:47:04 -0700 Subject: [PATCH 09/30] refactor: wip homepage kit layout --- packages/website/src/components/KitItem.astro | 5 +++-- packages/website/src/components/KitList.astro | 4 +++- packages/website/src/components/TechStacksSection.astro | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 8c242cc8f..455fc8e93 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -2,13 +2,14 @@ import TechIcon from './TechIcon.astro'; const { kit } = Astro.props; // m-auto +// lg:grid-cols-avail-kits ---

{kit.name}

-
+
{kit.technologies.map(({ Icon }) => (
{ Icon && } diff --git a/packages/website/src/components/KitList.astro b/packages/website/src/components/KitList.astro index fceaebdfb..748dfe229 100644 --- a/packages/website/src/components/KitList.astro +++ b/packages/website/src/components/KitList.astro @@ -2,9 +2,11 @@ import KitItem from './KitItem.astro'; const { kits } = Astro.props; // [&:nth-child(1n)]:m-auto odd:m-auto +// lg:px-16 +// md:px-20 --- -
+
{ kits.map((kit) => (
diff --git a/packages/website/src/components/TechStacksSection.astro b/packages/website/src/components/TechStacksSection.astro index 7c2bfbdca..816100b58 100644 --- a/packages/website/src/components/TechStacksSection.astro +++ b/packages/website/src/components/TechStacksSection.astro @@ -3,11 +3,12 @@ import KitList from './KitList.astro'; import { parseKits } from '../lib/parseKits'; const items = await Astro.glob('../pages/kits/*.mdx'); const kits = parseKits(items); +// max-w-screen-2xl ---

Available Kits

-
+
From 21ea122df2515b0b969e7f3af7056e2d43e053e6 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Tue, 27 Jun 2023 16:11:31 -0700 Subject: [PATCH 10/30] refactor: wip homepage alignment --- packages/website/src/components/KitItem.astro | 2 +- packages/website/tailwind.config.cjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 455fc8e93..f7bd02078 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -8,7 +8,7 @@ const { kit } = Astro.props;
-

{kit.name}

+

{kit.name}

{kit.technologies.map(({ Icon }) => (
diff --git a/packages/website/tailwind.config.cjs b/packages/website/tailwind.config.cjs index 2b0c9a4ee..dc8608525 100644 --- a/packages/website/tailwind.config.cjs +++ b/packages/website/tailwind.config.cjs @@ -52,7 +52,7 @@ module.exports = { sm: ['16px', '1.28'], base: ['18px', '1.32'], lg: ['20px', '1.22'], - xl: ['1.375rem', '2'] + // xl: ['1.375rem', '2'] }, gridTemplateColumns: { 'avail-kits': 'repeat(3, 100px)', From 84c5da89d7263113f1a265096e24be5e39d2bbeb Mon Sep 17 00:00:00 2001 From: WillHutt Date: Wed, 28 Jun 2023 07:41:16 -0700 Subject: [PATCH 11/30] feat: adds live apps where available --- packages/website/src/config.tsx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/website/src/config.tsx b/packages/website/src/config.tsx index a92830ea9..885ec9654 100644 --- a/packages/website/src/config.tsx +++ b/packages/website/src/config.tsx @@ -539,7 +539,7 @@ export const SHOWCASES = [ kit: 'angular-apollo-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/angular-apollo-tailwind', - app: '', + app: 'https://angular-apollo-tailwind.starter.dev/', Icon: (props) => , }, // The angular-ngrx-scss showcase is currently not finished @@ -548,14 +548,14 @@ export const SHOWCASES = [ kit: 'angular-ngrx-scss', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/angular-ngrx-scss', - app: '', + app: 'https://angular-ngrx-scss.starter.dev', Icon: (props) => , }, { kit: 'cra-rxjs-styled-components', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/cra-rxjs-styled-components', - app: '', + app: 'https://cra-rxjs-styled-components.starter.dev', Icon: (props) => , }, { @@ -569,7 +569,7 @@ export const SHOWCASES = [ kit: 'next-react-query-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/next-react-query-tailwind', - app: '', + app: 'https://next-react-query-tailwind.starter.dev', Icon: (props) => , }, // The nuxt2-pinia-tailwind showcase is currently not finished @@ -578,14 +578,14 @@ export const SHOWCASES = [ kit: 'nuxt2-pinia-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/nuxt-pinia-tailwind', - app: '', + app: 'https://nuxt-pinia-tailwind.starter.dev', Icon: (props) => , }, { kit: 'qwik-graphql-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/qwik-graphql-tailwind', - app: '', + app: 'https://qwik-graphql-tailwind.starter.dev', Icon: (props) => , }, // The remix-gql-tailwind showcase is currently broken @@ -601,35 +601,35 @@ export const SHOWCASES = [ kit: 'solidjs-tailwind', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/solidjs-tailwind', - app: '', + app: 'https://solidjs-tailwind.starter.dev', Icon: (props) => , }, { kit: 'solidstart-tanstackquery-tailwind-modules', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/solidstart-tanstackquery-tailwind-modules', - app: '', + app: 'https://solidstart-tanstackquery-tailwind-modules.starter.dev', Icon: (props) => , }, { kit: 'svelte-kit-scss', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/svelte-kit-scss', - app: '', + app: 'https://svelte-kit-scss.starter.dev', Icon: (props) => , }, { kit: 'svelte-kit-scss', name: '7 GUIs Showcase', repo: 'https://github.com/thisdot/starter.dev-7guis-showcases', - app: '', + app: 'https://svelte-kit-scss-7guis.starter.dev/', Icon: (props) => , }, { kit: 'vue3-apollo-quasar', name: 'Github Showcase', repo: 'https://github.com/thisdot/starter.dev-github-showcases/tree/main/vue3-apollo-quasar', - app: '', + app: 'https://vue3-apollo-quasar.starter.dev', Icon: (props) => , }, ]; From 37b70e27ac663f338bde86ef62b865d2da4dbe20 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Wed, 28 Jun 2023 08:17:39 -0700 Subject: [PATCH 12/30] refactor: addresses homepage feedback --- packages/website/src/components/KitItem.astro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index f7bd02078..50d5c2502 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -6,9 +6,9 @@ const { kit } = Astro.props; ---
-

{kit.name}

+

{kit.name}

{kit.technologies.map(({ Icon }) => (
From 1bc13e3996d8561582b4ac74dd10592872043f16 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Wed, 28 Jun 2023 08:21:06 -0700 Subject: [PATCH 13/30] refactor: cleanup --- packages/website/src/components/KitItem.astro | 2 -- packages/website/src/components/KitList.astro | 3 --- packages/website/src/components/TechStacksSection.astro | 1 - packages/website/tailwind.config.cjs | 1 - 4 files changed, 7 deletions(-) diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 50d5c2502..6444f53bd 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -1,8 +1,6 @@ --- import TechIcon from './TechIcon.astro'; const { kit } = Astro.props; -// m-auto -// lg:grid-cols-avail-kits ---
diff --git a/packages/website/src/components/TechStacksSection.astro b/packages/website/src/components/TechStacksSection.astro index 816100b58..0cd6d780b 100644 --- a/packages/website/src/components/TechStacksSection.astro +++ b/packages/website/src/components/TechStacksSection.astro @@ -3,7 +3,6 @@ import KitList from './KitList.astro'; import { parseKits } from '../lib/parseKits'; const items = await Astro.glob('../pages/kits/*.mdx'); const kits = parseKits(items); -// max-w-screen-2xl ---
diff --git a/packages/website/tailwind.config.cjs b/packages/website/tailwind.config.cjs index dc8608525..3b119e2c3 100644 --- a/packages/website/tailwind.config.cjs +++ b/packages/website/tailwind.config.cjs @@ -52,7 +52,6 @@ module.exports = { sm: ['16px', '1.28'], base: ['18px', '1.32'], lg: ['20px', '1.22'], - // xl: ['1.375rem', '2'] }, gridTemplateColumns: { 'avail-kits': 'repeat(3, 100px)', From cc1fe09b65b0746ccd6e55fb83b8107f731fb44b Mon Sep 17 00:00:00 2001 From: WillHutt Date: Wed, 28 Jun 2023 08:21:42 -0700 Subject: [PATCH 14/30] chore: format --- packages/website/src/components/KitList.astro | 4 +++- packages/website/tailwind.config.cjs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/KitList.astro b/packages/website/src/components/KitList.astro index d5f1de90e..c1fb1d364 100644 --- a/packages/website/src/components/KitList.astro +++ b/packages/website/src/components/KitList.astro @@ -3,7 +3,9 @@ import KitItem from './KitItem.astro'; const { kits } = Astro.props; --- -
+
{ kits.map((kit) => (
diff --git a/packages/website/tailwind.config.cjs b/packages/website/tailwind.config.cjs index 3b119e2c3..40896f99b 100644 --- a/packages/website/tailwind.config.cjs +++ b/packages/website/tailwind.config.cjs @@ -55,7 +55,7 @@ module.exports = { }, gridTemplateColumns: { 'avail-kits': 'repeat(3, 100px)', - } + }, }, }, plugins: [require('@tailwindcss/typography')], From ff1897be6a5b021684c40ad0acb19a7653651cfa Mon Sep 17 00:00:00 2001 From: WillHutt Date: Wed, 28 Jun 2023 08:22:39 -0700 Subject: [PATCH 15/30] refactor: remove unused tw grid --- packages/website/tailwind.config.cjs | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/website/tailwind.config.cjs b/packages/website/tailwind.config.cjs index 40896f99b..5d91e7a46 100644 --- a/packages/website/tailwind.config.cjs +++ b/packages/website/tailwind.config.cjs @@ -53,9 +53,6 @@ module.exports = { base: ['18px', '1.32'], lg: ['20px', '1.22'], }, - gridTemplateColumns: { - 'avail-kits': 'repeat(3, 100px)', - }, }, }, plugins: [require('@tailwindcss/typography')], From ec35e9a7f28f72e006bd181aef2306ae63065bc5 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Wed, 28 Jun 2023 10:08:52 -0700 Subject: [PATCH 16/30] refactor: removes old showcase graphic --- .../website/src/components/KitDemoHero.astro | 29 ------------------- packages/website/src/layouts/KitLayout.astro | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 packages/website/src/components/KitDemoHero.astro diff --git a/packages/website/src/components/KitDemoHero.astro b/packages/website/src/components/KitDemoHero.astro deleted file mode 100644 index dd5395087..000000000 --- a/packages/website/src/components/KitDemoHero.astro +++ /dev/null @@ -1,29 +0,0 @@ ---- -import { GitHubIcon } from '../icons/GitHubIcon.tsx'; ---- - -
-
-
-

See kits in action via our showcases

- View Showcases -
- -
-
diff --git a/packages/website/src/layouts/KitLayout.astro b/packages/website/src/layouts/KitLayout.astro index 4d587dabd..d02bad726 100644 --- a/packages/website/src/layouts/KitLayout.astro +++ b/packages/website/src/layouts/KitLayout.astro @@ -5,7 +5,6 @@ import StickyHero from '../components/StickyHero.astro'; import { NavBar } from '../components/NavBar.tsx'; import { TableOfContents } from '../components/TableOfContents.tsx'; import MobileNavigation from '../components/MobileNavigation.tsx'; -import KitDemoHero from '../components/KitDemoHero.astro'; import KitTechnologies from '../components/KitTechnologies.astro'; import KitShowcases from '../components/KitShowcases.astro'; import Footer from '../components/Footer.astro'; @@ -43,7 +42,6 @@ const kit = parseKit(content);
-
From 3799deed76dea3e953e11941eae28a31a124fb66 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Fri, 30 Jun 2023 08:22:30 -0700 Subject: [PATCH 17/30] refactor: c/rs, skinny cntrs, lm title, plural shwcses, l/d cramped pd, no lf align, mb f-width, and mb hd styles in ctas --- packages/website/src/components/KitActionLinks.astro | 4 ++-- packages/website/src/components/KitItem.astro | 4 ++-- packages/website/src/components/KitList.astro | 2 +- packages/website/src/components/KitShowcases.astro | 5 +++-- packages/website/src/components/StickyHero.astro | 2 +- packages/website/src/components/TechStacksSection.astro | 2 +- packages/website/src/icons/BriefcaseIcon.tsx | 6 +++--- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/website/src/components/KitActionLinks.astro b/packages/website/src/components/KitActionLinks.astro index 794619d72..99333b6ab 100644 --- a/packages/website/src/components/KitActionLinks.astro +++ b/packages/website/src/components/KitActionLinks.astro @@ -20,10 +20,10 @@ const { name, hasShowcase, inline } = Astro.props;
{ hasShowcase && ( - + <> - View Showcase + View Showcases ) diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 6444f53bd..8e2475dcd 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -6,8 +6,8 @@ const { kit } = Astro.props;
-

{kit.name}

-
+

{kit.name}

+
{kit.technologies.map(({ Icon }) => (
{ Icon && } diff --git a/packages/website/src/components/KitList.astro b/packages/website/src/components/KitList.astro index c1fb1d364..8812016cb 100644 --- a/packages/website/src/components/KitList.astro +++ b/packages/website/src/components/KitList.astro @@ -4,7 +4,7 @@ const { kits } = Astro.props; ---
{ kits.map((kit) => ( diff --git a/packages/website/src/components/KitShowcases.astro b/packages/website/src/components/KitShowcases.astro index 860f2421a..4c601d799 100644 --- a/packages/website/src/components/KitShowcases.astro +++ b/packages/website/src/components/KitShowcases.astro @@ -1,6 +1,7 @@ --- import ShowcaseLinks from './ShowcaseLinks.astro'; const { showcases, hasShowcase } = Astro.props; +// max-w-[198px] max-h-[177px] --- { @@ -9,9 +10,9 @@ const { showcases, hasShowcase } = Astro.props;

See kits in action via our showcases

-
+
{showcases.map(({ name, repo, app, Icon }) => ( -
+
diff --git a/packages/website/src/components/StickyHero.astro b/packages/website/src/components/StickyHero.astro index df5d20fa9..dd3d94085 100644 --- a/packages/website/src/components/StickyHero.astro +++ b/packages/website/src/components/StickyHero.astro @@ -25,7 +25,7 @@ const { name, hasShowcase } = Astro.props; <> - View Showcase + View Showcases ) diff --git a/packages/website/src/components/TechStacksSection.astro b/packages/website/src/components/TechStacksSection.astro index 0cd6d780b..7c2bfbdca 100644 --- a/packages/website/src/components/TechStacksSection.astro +++ b/packages/website/src/components/TechStacksSection.astro @@ -7,7 +7,7 @@ const kits = parseKits(items);

Available Kits

-
+
diff --git a/packages/website/src/icons/BriefcaseIcon.tsx b/packages/website/src/icons/BriefcaseIcon.tsx index d01d5cb2f..50b27af3f 100644 --- a/packages/website/src/icons/BriefcaseIcon.tsx +++ b/packages/website/src/icons/BriefcaseIcon.tsx @@ -14,17 +14,17 @@ export function BriefcaseIcon({ size = 800, className }: Props) { - + From cb6d7dcae48d4c6ad6ffa2cc6a0dc5fa8c517544 Mon Sep 17 00:00:00 2001 From: WillHutt Date: Fri, 30 Jun 2023 09:22:48 -0700 Subject: [PATCH 18/30] chore: format --- packages/website/src/components/KitActionLinks.astro | 5 ++++- packages/website/src/components/KitList.astro | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/website/src/components/KitActionLinks.astro b/packages/website/src/components/KitActionLinks.astro index 99333b6ab..5c3fadba2 100644 --- a/packages/website/src/components/KitActionLinks.astro +++ b/packages/website/src/components/KitActionLinks.astro @@ -20,7 +20,10 @@ const { name, hasShowcase, inline } = Astro.props;
{ hasShowcase && ( - + <> View Showcases diff --git a/packages/website/src/components/KitList.astro b/packages/website/src/components/KitList.astro index 8812016cb..6f193a13a 100644 --- a/packages/website/src/components/KitList.astro +++ b/packages/website/src/components/KitList.astro @@ -3,9 +3,7 @@ import KitItem from './KitItem.astro'; const { kits } = Astro.props; --- -
+
{ kits.map((kit) => (
From 841c88073e1dc238731ae1426a62ced8f3923962 Mon Sep 17 00:00:00 2001 From: LindaKat Date: Mon, 3 Jul 2023 16:15:28 -0500 Subject: [PATCH 19/30] fix: update icons --- packages/website/src/components/KitItem.astro | 2 +- packages/website/src/config.tsx | 9 +- packages/website/src/icons/BullmqIcon.tsx | 51 +++------- packages/website/src/icons/DenoDBIcon.tsx | 35 +++++++ packages/website/src/icons/SolidJsIcon.tsx | 99 +++++++++---------- packages/website/src/icons/SolidStartIcon.tsx | 99 +++++++++---------- packages/website/src/icons/TanstackIcon.tsx | 6 +- packages/website/src/icons/index.ts | 1 + packages/website/tsconfig.json | 1 + 9 files changed, 156 insertions(+), 147 deletions(-) create mode 100644 packages/website/src/icons/DenoDBIcon.tsx diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 8e2475dcd..4d7ff75d2 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -8,7 +8,7 @@ const { kit } = Astro.props; >

{kit.name}

- {kit.technologies.map(({ Icon }) => ( + {kit.technologies.map(({ Icon }) => (
{ Icon && }
diff --git a/packages/website/src/config.tsx b/packages/website/src/config.tsx index 885ec9654..01c878398 100644 --- a/packages/website/src/config.tsx +++ b/packages/website/src/config.tsx @@ -39,6 +39,7 @@ import { ChakraIcon, ServerlessIcon, DenoIcon, + DenoDBIcon, ExpressIcon, PostgresIcon, TypeOrmIcon, @@ -370,17 +371,11 @@ export const TECHNOLOGIES = [ tags: ['Framework'], Icon: (props) => , }, - { - key: 'oak', - name: 'Oak', - tags: ['Framework'], - Icon: (props) => , - }, { key: 'denodb', name: 'DenoDB', tags: ['Data Management'], - Icon: (props) => , + Icon: (props) => , }, { key: 'typeorm', diff --git a/packages/website/src/icons/BullmqIcon.tsx b/packages/website/src/icons/BullmqIcon.tsx index fd197ffa2..2d49dbc1a 100644 --- a/packages/website/src/icons/BullmqIcon.tsx +++ b/packages/website/src/icons/BullmqIcon.tsx @@ -1,49 +1,28 @@ import { Props } from './types'; -export function BullmqIcon({ size = 800, className }: Props) { +export function BullmqIcon({ className }: Props) { return ( - - - - - + fill="#000" + fill-rule="evenodd" + /> + ); } diff --git a/packages/website/src/icons/DenoDBIcon.tsx b/packages/website/src/icons/DenoDBIcon.tsx new file mode 100644 index 000000000..0e728a494 --- /dev/null +++ b/packages/website/src/icons/DenoDBIcon.tsx @@ -0,0 +1,35 @@ +import { Props } from './types'; + +export function DenoDBIcon({ size = 650, className }: Props) { + return ( + + + + + + + + + + ); +} diff --git a/packages/website/src/icons/SolidJsIcon.tsx b/packages/website/src/icons/SolidJsIcon.tsx index dfbf03486..f1dd104f5 100644 --- a/packages/website/src/icons/SolidJsIcon.tsx +++ b/packages/website/src/icons/SolidJsIcon.tsx @@ -5,62 +5,25 @@ export function SolidJsIcon({ className }: Props) { - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Date: Mon, 3 Jul 2023 16:58:53 -0500 Subject: [PATCH 20/30] fix: adjust card styles for home page --- packages/website/src/components/KitItem.astro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/website/src/components/KitItem.astro b/packages/website/src/components/KitItem.astro index 4d7ff75d2..a9f661f39 100644 --- a/packages/website/src/components/KitItem.astro +++ b/packages/website/src/components/KitItem.astro @@ -4,10 +4,10 @@ const { kit } = Astro.props; ---
-

{kit.name}

-
+

{kit.name}

+
{kit.technologies.map(({ Icon }) => (
{ Icon && } From 599b3d75cfd7d42e4383a82f341e759181c59c6f Mon Sep 17 00:00:00 2001 From: LindaKat Date: Mon, 3 Jul 2023 17:41:11 -0500 Subject: [PATCH 21/30] fix: kit page header mobile fix; view showcases scroll margin --- .../src/components/KitActionLinks.astro | 4 ++-- .../website/src/components/KitShowcases.astro | 2 +- packages/website/src/config.tsx | 24 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/website/src/components/KitActionLinks.astro b/packages/website/src/components/KitActionLinks.astro index 5c3fadba2..a541de957 100644 --- a/packages/website/src/components/KitActionLinks.astro +++ b/packages/website/src/components/KitActionLinks.astro @@ -9,7 +9,7 @@ const { name, hasShowcase, inline } = Astro.props; ---
-