From a0055bd985a6afe503e2ad2cb4f14b550b480a0a Mon Sep 17 00:00:00 2001 From: Drew Powers <1369770+drwpow@users.noreply.github.com> Date: Fri, 28 May 2021 10:06:22 -0600 Subject: [PATCH] Create astro fixes (#267) * Remove create-astro from workspace * Improve contrast ratio * Swap blank template for blog template * Remove counter components from blog template * Use `latest` astro version --- .changeset/cold-kiwis-arrive.md | 5 - .changeset/config.json | 2 +- examples/blog/src/components/Counter.jsx | 15 - examples/blog/src/components/Nav.astro | 19 +- package.json | 4 +- packages/create-astro/.gitignore | 1 + packages/create-astro/CHANGELOG.md | 13 + packages/create-astro/package.json | 8 +- .../create-astro/src/components/Install.tsx | 4 +- .../src/templates/blank/README.md | 24 - .../src/templates/blank/meta.json | 4 - .../src/templates/blank/src/pages/index.astro | 15 - .../create-astro/src/templates/blog/README.md | 47 ++ .../src/templates/{blank => blog}/_gitignore | 0 .../src/templates/blog/astro.config.mjs | 17 + .../create-astro/src/templates/blog/meta.json | 5 + .../templates/{blank => blog}/package.json | 0 .../src/templates/blog/public/authors/don.jpg | Bin 0 -> 27833 bytes .../templates/blog/public/authors/sancho.jpg | Bin 0 -> 28204 bytes .../{blank => blog}/public/favicon.svg | 0 .../src/templates/blog/public/global.scss | 25 ++ .../blog/public/images/chapter-01.jpg | Bin 0 -> 153734 bytes .../blog/public/images/chapter-02.jpg | Bin 0 -> 99769 bytes .../blog/public/images/chapter-03.jpg | Bin 0 -> 168485 bytes .../blog/src/components/MainHead.astro | 39 ++ .../templates/blog/src/components/Nav.astro | 59 +++ .../blog/src/components/Pagination.astro | 40 ++ .../blog/src/components/PostPreview.astro | 63 +++ .../src/templates/blog/src/data/authors.json | 10 + .../src/templates/blog/src/layouts/post.astro | 79 ++++ .../templates/blog/src/pages/$author.astro | 108 +++++ .../src/templates/blog/src/pages/$posts.astro | 83 ++++ .../src/templates/blog/src/pages/about.astro | 61 +++ .../src/templates/blog/src/pages/index.astro | 43 ++ .../blog/src/pages/post/chapter-i.md | 13 + .../blog/src/pages/post/chapter-ii.md | 15 + .../blog/src/pages/post/chapter-iii.md | 13 + .../src/templates/starter/README.md | 10 + .../src/templates/starter/astro.config.mjs | 37 +- .../templates/starter/public/style/global.css | 34 +- .../create-astro/test/create-astro.test.js | 14 +- packages/renderers/react/package.json | 4 +- yarn.lock | 415 +----------------- 43 files changed, 815 insertions(+), 533 deletions(-) delete mode 100644 .changeset/cold-kiwis-arrive.md delete mode 100644 examples/blog/src/components/Counter.jsx create mode 100644 packages/create-astro/.gitignore delete mode 100644 packages/create-astro/src/templates/blank/README.md delete mode 100644 packages/create-astro/src/templates/blank/meta.json delete mode 100644 packages/create-astro/src/templates/blank/src/pages/index.astro create mode 100644 packages/create-astro/src/templates/blog/README.md rename packages/create-astro/src/templates/{blank => blog}/_gitignore (100%) create mode 100644 packages/create-astro/src/templates/blog/astro.config.mjs create mode 100644 packages/create-astro/src/templates/blog/meta.json rename packages/create-astro/src/templates/{blank => blog}/package.json (100%) create mode 100644 packages/create-astro/src/templates/blog/public/authors/don.jpg create mode 100644 packages/create-astro/src/templates/blog/public/authors/sancho.jpg rename packages/create-astro/src/templates/{blank => blog}/public/favicon.svg (100%) create mode 100644 packages/create-astro/src/templates/blog/public/global.scss create mode 100644 packages/create-astro/src/templates/blog/public/images/chapter-01.jpg create mode 100644 packages/create-astro/src/templates/blog/public/images/chapter-02.jpg create mode 100644 packages/create-astro/src/templates/blog/public/images/chapter-03.jpg create mode 100644 packages/create-astro/src/templates/blog/src/components/MainHead.astro create mode 100644 packages/create-astro/src/templates/blog/src/components/Nav.astro create mode 100644 packages/create-astro/src/templates/blog/src/components/Pagination.astro create mode 100644 packages/create-astro/src/templates/blog/src/components/PostPreview.astro create mode 100644 packages/create-astro/src/templates/blog/src/data/authors.json create mode 100644 packages/create-astro/src/templates/blog/src/layouts/post.astro create mode 100644 packages/create-astro/src/templates/blog/src/pages/$author.astro create mode 100644 packages/create-astro/src/templates/blog/src/pages/$posts.astro create mode 100644 packages/create-astro/src/templates/blog/src/pages/about.astro create mode 100644 packages/create-astro/src/templates/blog/src/pages/index.astro create mode 100644 packages/create-astro/src/templates/blog/src/pages/post/chapter-i.md create mode 100644 packages/create-astro/src/templates/blog/src/pages/post/chapter-ii.md create mode 100644 packages/create-astro/src/templates/blog/src/pages/post/chapter-iii.md diff --git a/.changeset/cold-kiwis-arrive.md b/.changeset/cold-kiwis-arrive.md deleted file mode 100644 index af1da9a2c3..0000000000 --- a/.changeset/cold-kiwis-arrive.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'create-astro': patch ---- - -Bugfix: select component missing space diff --git a/.changeset/config.json b/.changeset/config.json index 7a974074c7..51e0c0af53 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -2,7 +2,7 @@ "$schema": "https://unpkg.com/@changesets/config@1.6.0/schema.json", "changelog": "@changesets/cli/changelog", "commit": false, - "linked": [["astro", "astro-parser", "create-astro"]], + "linked": [["astro", "astro-parser"]], "access": "public", "baseBranch": "main", "updateInternalDependencies": "patch", diff --git a/examples/blog/src/components/Counter.jsx b/examples/blog/src/components/Counter.jsx deleted file mode 100644 index c9b27e1a7d..0000000000 --- a/examples/blog/src/components/Counter.jsx +++ /dev/null @@ -1,15 +0,0 @@ -import React, { useState } from 'react'; -// import confetti from 'canvas-confetti'; - -export default function Counter() { - // Declare a new state variable, which we'll call "count" - const [count, setCount] = useState(0); - // console.log(confetti()); - - return ( -
-

You clicked {count} times

- -
- ); -} diff --git a/examples/blog/src/components/Nav.astro b/examples/blog/src/components/Nav.astro index 86919ac4dd..5949adb0df 100644 --- a/examples/blog/src/components/Nav.astro +++ b/examples/blog/src/components/Nav.astro @@ -4,9 +4,13 @@ export let title; + + diff --git a/packages/create-astro/src/templates/blog/src/components/Pagination.astro b/packages/create-astro/src/templates/blog/src/components/Pagination.astro new file mode 100644 index 0000000000..7b01e59b54 --- /dev/null +++ b/packages/create-astro/src/templates/blog/src/components/Pagination.astro @@ -0,0 +1,40 @@ +--- +export let prevUrl: string; +export let nextUrl: string; +--- + + + +
+ +
diff --git a/packages/create-astro/src/templates/blog/src/components/PostPreview.astro b/packages/create-astro/src/templates/blog/src/components/PostPreview.astro new file mode 100644 index 0000000000..59c54e8fa9 --- /dev/null +++ b/packages/create-astro/src/templates/blog/src/components/PostPreview.astro @@ -0,0 +1,63 @@ +--- +export let post; +export let author; + +function formatDate(date) { + return new Date(date).toUTCString().replace(/(\d\d\d\d) .*/, '$1'); // remove everything after YYYY +} +--- + + + +
+ +
+

{post.title}

+ {author.name} + +

+ {post.description} + Read +

+
+
diff --git a/packages/create-astro/src/templates/blog/src/data/authors.json b/packages/create-astro/src/templates/blog/src/data/authors.json new file mode 100644 index 0000000000..e958e7cd1f --- /dev/null +++ b/packages/create-astro/src/templates/blog/src/data/authors.json @@ -0,0 +1,10 @@ +{ + "don": { + "name": "Don Quixote", + "image": "/authors/don.jpg" + }, + "sancho": { + "name": "Sancho Panza", + "image": "/authors/sancho.jpg" + } +} diff --git a/packages/create-astro/src/templates/blog/src/layouts/post.astro b/packages/create-astro/src/templates/blog/src/layouts/post.astro new file mode 100644 index 0000000000..5149528a05 --- /dev/null +++ b/packages/create-astro/src/templates/blog/src/layouts/post.astro @@ -0,0 +1,79 @@ +--- +import MainHead from '../components/MainHead.astro'; +import Nav from '../components/Nav.astro'; + +export let content; + +import authorData from '../data/authors.json'; +--- + + + + {content.title} + + + + + +