Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into emoji
Browse files Browse the repository at this point in the history
  • Loading branch information
icco committed Mar 21, 2024
2 parents e2f1e15 + ebfac82 commit 34257d8
Show file tree
Hide file tree
Showing 15 changed files with 496 additions and 1,193 deletions.
2 changes: 1 addition & 1 deletion contentlayer.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineDocumentType, makeSource } from "contentlayer/source-files"
import { defineDocumentType, makeSource } from "contentlayer-temp/source-files"
import { format, parseISO } from "date-fns"
import readingTime from "reading-time"
import rehypeSlug from "rehype-slug"
Expand Down
2 changes: 1 addition & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/* eslint-disable @typescript-eslint/no-var-requires */
const { createSecureHeaders } = require("next-secure-headers")
const { withContentlayer } = require("next-contentlayer")
const { withContentlayer } = require("next-contentlayer-temp")

const port = process.env.PORT || "8080"
const hostname = process.env.HOSTNAME || `localhost`
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"@imgix/js-core": "^3.8.0",
"@mdx-js/loader": "^3.0.0",
"@mdx-js/react": "^3.0.0",
"contentlayer": "^0.3.4",
"contentlayer-temp": "^0.4.4",
"date-fns": "^3.2.0",
"feed": "^4.2.2",
"mdast-util-find-and-replace": "^3.0.0",
"next": "^14.0.0",
"next-contentlayer": "^0.3.4",
"next-contentlayer-temp": "^0.4.4",
"next-secure-headers": "^2.2.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion posts/133.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ We rested back at the hotel, and then in the evening went to the new Whitney in
![travisnat](http://natwelch.com/2015/mom/animated.gif)
</center>

On the subway home after dinner, I listened to [Debbie Millman's Interview with Elle Luna](http://designobserver.com/feature/elle-luna/38875/) which was a really interesting story of how Elle found her passion and changed her career. Made me want to get into dream journaling or something, as this is a topic I've been thinking a lot about the last few years.
On the subway home after dinner, I listened to [Debbie Millman's Interview with Elle Luna](https://designobserver.com/feature/elle-luna/38875/) which was a really interesting story of how Elle found her passion and changed her career. Made me want to get into dream journaling or something, as this is a topic I've been thinking a lot about the last few years.

<a href="https://www.flickr.com/photos/icco/16866669353" title="Whitney 8th Floor Pano by Nat Welch, on Flickr"><img src="https://c1.staticflickr.com/9/8872/16866669353_0d218f2fdb_k.jpg" alt="Whitney 8th Floor Pano"></img></a>

Expand Down
6 changes: 3 additions & 3 deletions posts/134.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Once I had a rough sketch of the front page, I decided to start prototyping. Som

Thankfully, some of the problems I had with Go on App Engine have been fixed, so getting a "hello world" up and running was easier than the last time.

The downside, I didn't really know where to start in terms of building "the new shiny". Both @mrmrs_ and @jxnblk seem to big on [npm](https://www.npmjs.com/) and [Grunt](http://gruntjs.com/) for preprocessing their CSS, which was neat. But I quickly found myself down a deep hole, just from their side projects.
The downside, I didn't really know where to start in terms of building "the new shiny". Both @mrmrs_ and @jxnblk seem to big on [npm](https://www.npmjs.com/) and [Grunt](https://gruntjs.com/) for preprocessing their CSS, which was neat. But I quickly found myself down a deep hole, just from their side projects.

Do I use [BassCSS](http://www.basscss.com/) or [Tachyons](http://tachyons.io/)? Are they even competitors? What are the pros and cons? Should I use a getting started template like [MNML](https://github.com/mrmrs/mnml), [nkd](http://nkd.cc/), [trim](https://github.com/mrmrs/trim) or [monobass](https://github.com/basscss/monobass)?
Do I use [BassCSS](https://web.archive.org/web/20240210170839/https://basscss.com/) or [Tachyons](https://tachyons.io/)? Are they even competitors? What are the pros and cons? Should I use a getting started template like [MNML](https://github.com/mrmrs/mnml), [nkd](http://nkd.cc/), [trim](https://github.com/mrmrs/trim) or [monobass](https://github.com/basscss/monobass)?

With so many choices, I was gonna just write raw CSS, but then I saw this tweet:

Expand All @@ -50,7 +50,7 @@ And was shamed back into looking through all of the side projects and reading th

I ended up taking a combo of MNML and Tachyons, but I have no idea if that's the route I'm going to stick with. Now I think I need to actually get some working features.

Totally unrelated, I came across [this post](http://jxnblk.tumblr.com/post/210090110/nnn-mono-iphone-synth-love-this-minimalist), which caused me to do a few more sketches for my drum machine I was working on last week.
Totally unrelated, I came across [this post](https://jxnblk.tumblr.com/post/210090110/nnn-mono-iphone-synth-love-this-minimalist), which caused me to do a few more sketches for my drum machine I was working on last week.

Tomorrow I'll hopefully spend all day at RC and meet some alumni, instead of just clicking around looking at pretty boxes.

Expand Down
6 changes: 3 additions & 3 deletions posts/135.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ permalink: "/post/135"

Day 50. Damn. Literally the halfway point already. I need to sit down and do a real evaluation of my time spent so far.

Yesterday I spent most of the time chatting, both online and inperson. In the afternoon, I think I finally got a handle on [Tachyons](http://tachyons.io/). The trick was finding the [docs](http://tachyons.io/docs/) \(Which are very much a work in progress\) and then just reading through [the source](https://github.com/mrmrs/tachyons/tree/master/src). When talking to the author @mrmrs\_ later, it sounds like this is how he suggests people learn CSS anyways, so that's good.
Yesterday I spent most of the time chatting, both online and inperson. In the afternoon, I think I finally got a handle on [Tachyons](https://tachyons.io/). The trick was finding the [docs](https://tachyons.io/docs/) \(Which are very much a work in progress\) and then just reading through [the source](https://github.com/mrmrs/tachyons/tree/master/src). When talking to the author @mrmrs\_ later, it sounds like this is how he suggests people learn CSS anyways, so that's good.

![loggedin](https://s3.amazonaws.com/f.cl.ly/items/1x3P1g14323N2i3W2j2Z/Screen%!S%28MISSING)![loggedout](https://s3.amazonaws.com/f.cl.ly/items/3r2H3B0J3S00140w3k2R/Screen%!S%28MISSING)

Most of what I sussed out of Tachyons was actually published the next morning in a post called "[What are Classes for?](http://xn--h4hg.ws/2015/05/14/what-are-classes-for/)". This makes a ton of sense to me, and is definitely something I wasn't doing before. CSS is usually such a last thought for me, so frontend reuse isn't important, so I wasn't thinking about it like I think of most other things. Gonna need to change my habits. I'm trying to write as few lines of CSS as possible with my current project, so we'll see how it goes.

I also saw [LED Notification Cube is a Good First Project](http://hackaday.com/2015/05/10/led-notification-cube-is-a-good-first-project/) on [Hackaday](http://hackaday.com), which reminded me I want to do some Pi hacking while I'm still at RC.
I also saw [LED Notification Cube is a Good First Project](https://hackaday.com/2015/05/10/led-notification-cube-is-a-good-first-project/) on [Hackaday](https://hackaday.com/), which reminded me I want to do some Pi hacking while I'm still at RC.

Finally, I loved the writing in [Studio Ghibli’s Spaces of Escape and Longing](http://killscreendaily.com/articles/studio-ghiblis-spaces-escape-and-longing/). I wish I could create experiences like Ghibli does with my code.
Finally, I loved the writing in [Studio Ghibli’s Spaces of Escape and Longing](https://killscreendaily.com/articles/studio-ghiblis-spaces-escape-and-longing/). I wish I could create experiences like Ghibli does with my code.

/Nat

Expand Down
2 changes: 1 addition & 1 deletion posts/153.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permalink: "/post/153"

Slow day today. I went to [The Ulitimate Science Street Fair](http://www.worldsciencefestival.com/programs/ultimate-science-street-fair/?promo=WSFWSF) in Washington Square Park with a few people from RC. We walked around for about an hour before the heat started to get to me and I ran back and hid in a room with AC.

In the afternoon, I built http://traviscwelch.com/ for my brother as part of his graduation photo board thingy (he graduates from Highschool this upcoming weekend). More practice with [tachyons](http://tachyons.io/) was nice.
In the afternoon, I built http://traviscwelch.com/ for my brother as part of his graduation photo board thingy (he graduates from Highschool this upcoming weekend). More practice with [tachyons](https://tachyons.io/) was nice.

I also watched episodes from [Gargantia on the Verdurous Planet](https://en.wikipedia.org/wiki/Gargantia_on_the_Verdurous_Planet). An interesting mecha anime, although is very reminiscent of [Full Metal Panic!](https://en.wikipedia.org/wiki/Full_Metal_Panic!).

Expand Down
2 changes: 1 addition & 1 deletion posts/160.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ I thought about how I've wanted to do some hardware projects but haven't gotten
- https://www.adafruit.com/products/1530
- https://www.adafruit.com/products/1929

I went through and upgraded [tachyons](http://tachyons.io/) in some places.
I went through and upgraded [tachyons](https://tachyons.io/) in some places.

I spent a decent amount of time researching Clinton and the previous Obama campaigns. One of my friends joined up with the Clinton campaign, and so the idea of joining them is kind of tempting. I had one short HR type phone call, and now I'm trying to figure out the pros and cons. Sounds like a pretty cool gig.

Expand Down
2 changes: 1 addition & 1 deletion posts/164.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ In the morning, I went through a bunch of recent photos and cleaned them up and

<a href="https://www.flickr.com/photos/icco/18892627285" title="Mall corridor by Nat Welch, on Flickr"><img src="https://c2.staticflickr.com/6/5330/18892627285_74eeb3a633_z.jpg" alt="Mall corridor"></img></a>

During the day, when I wasn't reading, I slowly moved my blog over to [tachyons](http://tachyons.io/). I'm not sure if I'm happy with the new layout (it's very close to the same), but at the very least it's simpler from a code standpoint.
During the day, when I wasn't reading, I slowly moved my blog over to [tachyons](https://tachyons.io/). I'm not sure if I'm happy with the new layout (it's very close to the same), but at the very least it's simpler from a code standpoint.

My blog used to look like:

Expand Down
2 changes: 1 addition & 1 deletion posts/421.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ In fact if you inspect my site now, there are only really three assets that down
`bundle.js` contains everything my site needs to run:

- [hand-written CSS](https://github.com/icco/natnatnat/blob/master/src/scss/style.scss)
- [tachyons CSS](http://tachyons.io/)
- [tachyons CSS](https://tachyons.io/)
- [jQuery](https://jquery.com/)
- [moment.js](http://momentjs.com/)
- [highlight.js](https://highlightjs.org/)
Expand Down
2 changes: 1 addition & 1 deletion posts/608.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permalink: "/post/608"

---

My personal site, [natwelch.com](https://natwelch.com), was running a really old version of [tachyons](http://tachyons.io/). So today I decided to fix it up. I haven't done the blog yet, since that'll take longer, but one step at a time.
My personal site, [natwelch.com](https://natwelch.com), was running a really old version of [tachyons](https://tachyons.io/). So today I decided to fix it up. I haven't done the blog yet, since that'll take longer, but one step at a time.

[Pull Request 11](https://github.com/icco/natwelch.com/pull/11) has the diff of what changed, but here it is in pictures.

Expand Down
2 changes: 1 addition & 1 deletion posts/662.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ In the world of Bitcoin and cryptocurrency news, two things:

[Dribbble Overtime with Jared Erondu](https://dribbble.com/overtime/2017/07/25/episode-18-jared-erondu) was a great listen. His [Playbook](https://askplaybook.com/) site is super neat about working in the design world.

I love everything @jxnblk does, I love [Tachyons](http://tachyons.io/), and I'm slowly learning React, so his [tachyons-components](https://github.com/jxnblk/tachyons-components) excites me.
I love everything @jxnblk does, I love [Tachyons](https://tachyons.io/), and I'm slowly learning React, so his [tachyons-components](https://github.com/jxnblk/tachyons-components) excites me.

[GoogleChrome/puppeteer: Headless Chrome Node API](https://github.com/GoogleChrome/puppeteer) is cool looking, and I can probably use for a few side projects I've got cooking.

Expand Down
2 changes: 1 addition & 1 deletion src/components/MDXContent.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type MDXComponents } from "mdx/types"
import Link from "next/link"
import { useMDXComponent } from "next-contentlayer/hooks"
import { useMDXComponent } from "next-contentlayer-temp/hooks"

export const components: MDXComponents = {
a: ({ href, children }) => <Link href={href as string}>{children}</Link>,
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"./.contentlayer/generated"
]
},
"baseUrl": ".",
"baseUrl": "."
},
"include": [
"next-env.d.ts",
Expand All @@ -43,4 +43,4 @@
"exclude": [
"node_modules"
]
}
}
Loading

0 comments on commit 34257d8

Please sign in to comment.