Skip to content

Commit

Permalink
new url
Browse files Browse the repository at this point in the history
  • Loading branch information
johanvandegriff committed Nov 3, 2024
1 parent 64c5c93 commit 0d7201d
Show file tree
Hide file tree
Showing 31 changed files with 109 additions and 127 deletions.
15 changes: 8 additions & 7 deletions build-gallery.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#!/bin/bash
cd `dirname $0`
src=~/git/johanvandegriff/jjv.sh/
dst=confuzer:/brick/websites/docker/jjv.sh/hugo/

sed -i 's,ignoreFiles = \["gallery/.*"\],#ignoreFiles = ["gallery/.*"],g' config.toml
sed -i 's,cleanDestinationDir = false,cleanDestinationDir = true,g' config.toml
scp config.toml johanv.net:johanv.net/hugo/config.toml
sed -i 's,ignoreFiles = \["gallery/.*"\],#ignoreFiles = ["gallery/.*"],g' "$src/config.toml"
sed -i 's,cleanDestinationDir = false,cleanDestinationDir = true,g' "$src/config.toml"
scp "$src/config.toml" "$dst/config.toml"

sleep 2

sed -i 's,#ignoreFiles = \["gallery/.*"\],ignoreFiles = ["gallery/.*"],g' config.toml
sed -i 's,cleanDestinationDir = true,cleanDestinationDir = false,g' config.toml
scp config.toml johanv.net:johanv.net/hugo/config.toml
sed -i 's,#ignoreFiles = \["gallery/.*"\],ignoreFiles = ["gallery/.*"],g' "$src/config.toml"
sed -i 's,cleanDestinationDir = true,cleanDestinationDir = false,g' "$src/config.toml"
scp "$src/config.toml" "$dst/config.toml"
8 changes: 4 additions & 4 deletions config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
baseURL = "https://johanv.net/"
baseURL = "https://jjv.sh/"
languageCode = "en-us"
title = "johanv.net"
title = "jjv.sh"
theme = "hugowncast"
timeout = "5m"
disablePathToLower = true
Expand All @@ -16,7 +16,7 @@ ignoreFiles = ["gallery/.*"]
[params]
description = "Johan Vandegriff's website and livestream, including games, videos, blog, drawings, music, electronics projects, and more."
author = "Johan Vandegriff"
image = "https://johanv.net/logo"
image = "https://jjv.sh/logo"

[menu]
[[menu.main]]
Expand All @@ -25,7 +25,7 @@ ignoreFiles = ["gallery/.*"]
weight = 1
[[menu.main]]
name = "games"
url = "https://games.johanv.net/"
url = "https://games.jjv.sh/"
weight = 2
[[menu.main]]
name = "blog"
Expand Down
2 changes: 1 addition & 1 deletion content/ATinyGame/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ATinyGame: A Tiny Inexpensive Nugget for Your Gaming and All Manner of Entertainment"
description: "a $1 game console that fits in 1 hand, with a program smaller than 1kB"
image: "https://johanv.net/gallery/random/images/ATinyGame.jpg"
image: "https://jjv.sh/gallery/random/images/ATinyGame.jpg"
date: 2021-12-25T06:53:44-04:00
tags: []
viewport: '<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />'
Expand Down
2 changes: 1 addition & 1 deletion content/ArduinOLED/_index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ArduinOLED: Arduino with an OLED screen (and not enough RAM)"
description: "a platform for electronic games and other projects, including a screen, joystick, buttons, buzzer, and clip connections to add many other devices"
image: "https://johanv.net/ArduinOLED/images/StackerMenu.JPG"
image: "https://jjv.sh/ArduinOLED/images/StackerMenu.JPG"
date: 2019-09-07T15:00:00-04:00
tags: []
layout: "single"
Expand Down
2 changes: 1 addition & 1 deletion content/FoamStacker/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ tags: []

A mini replica of the arcade stacker game!

Uses a knockoff arduino nano (which actually turned out to be a pro mini with USB duct taped on), a 128x64 OLED display, a lighted pushbutton switch, and of course a foam stress toy. Since this arduino can operate from 3-6V, I ran it at 6V by connecting two CR2032 coin cell batteries, of which I have lots of extras [for some reason...](https://johanv.net/ATinyGame)
Uses a knockoff arduino nano (which actually turned out to be a pro mini with USB duct taped on), a 128x64 OLED display, a lighted pushbutton switch, and of course a foam stress toy. Since this arduino can operate from 3-6V, I ran it at 6V by connecting two CR2032 coin cell batteries, of which I have lots of extras [for some reason...](/ATinyGame)

<div style="text-align: center">
<iframe title="Foam Stacker - handheld arduino game!" width="1120" height="630" src="https://makertube.net/videos/embed/b06bbbde-5826-4853-b6d7-4860670b0c1a" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"></iframe>
Expand Down
10 changes: 5 additions & 5 deletions content/answermator/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@

<meta property="og:type" content="website">
<meta property="og:title" content="Answermator: More Than Just an Answering Machine">
<meta property="og:site_name" content="johanv.net">
<meta property="og:url" content="https://johanv.net/answermator/">
<meta property="og:site_name" content="jjv.sh">
<meta property="og:url" content="https://jjv.sh/answermator/">
<meta property="og:description" content="Enabling phone call management and home automation while preserving user privacy.">
<meta property="og:image" content="https://johanv.net/answermator/images/phonepi2.jpg">
<meta property="og:image" content="https://jjv.sh/answermator/images/phonepi2.jpg">

<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="https://johanv.net/answermator/">
<meta name="twitter:site" content="https://jjv.sh/answermator/">
<meta name="twitter:title" content="Answermator: More Than Just an Answering Machine">
<meta name="twitter:description" content="Enabling phone call management and home automation while preserving user privacy.">
<meta name="twitter:image" content="https://johanv.net/answermator/images/phonepi2.jpg">
<meta name="twitter:image" content="https://jjv.sh/answermator/images/phonepi2.jpg">
</head>
<body data-home-page="Answermator.html" data-home-page-title="Answermator" class="u-body">
<section class="u-clearfix u-white u-section-1" id="sec-52bd">
Expand Down
4 changes: 2 additions & 2 deletions content/asocialsafety.net/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h2>Triggered Actions</h2>
<p>Once the signal reaches the app, a variety of actions can be taken. A simple sound file can be played to simulate a phone call to the wearer. A secret text can be sent to a pre-assigned recipient. A speech to text engine can be launched to initiate communication with a custom chatbot. Some future plans include broadcasting your location, calling 911, or even ordering a pizza!</p>

<h2>CARL</h2>
<p><a href="https://games.johanv.net/carl">CARL</a> (Chatbot with Automatic and Rapid Learning) was developed alongside the device and app to simulate someone talking to you with speech-to-text and text-to-speech.</p>
<p><a href="https://games.jjv.sh/carl">CARL</a> (Chatbot with Automatic and Rapid Learning) was developed alongside the device and app to simulate someone talking to you with speech-to-text and text-to-speech.</p>

<h2>Meet the Team</h2>
<h3>Jonathan</h3>
Expand Down Expand Up @@ -79,7 +79,7 @@ <h2>Backup Cheerios</h2>
<img alt="Backup Cheerios" src="BackupCheerios.jpg">

<h2>Chatbot Phrase of the Day</h2>
<a href="https://games.johanv.net/carl">CARL says:</a><br/><object height="60" width="315" data="https://games.johanv.net/carl_api"></object>
<a href="https://games.jjv.sh/carl">CARL says:</a><br/><object height="60" width="315" data="https://games.jjv.sh/carl_api"></object>

<p style="font-weight: bold; font-size: x-small">No hacks, hackers, or hackathons were hacked in the hacking of this hackalicious hack. Happy hacking, hackerary hacketeers!</p>

Expand Down
2 changes: 1 addition & 1 deletion content/blog/framework16-slot-compatibility-labels.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ Note: when attaching the labels, make sure to account for the fact that the refe

![extra labels from prototyping and proto... typoing](/blog/images/framework16-slot-compatibility/result5.jpg)

Thanks for reading, if you do this yourself let me know [on mastodon](https://fosstodon.org/@johanv) or by [email](https://johanv.net/contact/)!
Thanks for reading, if you do this yourself let me know [on mastodon](https://fosstodon.org/@johanv) or by [email](/contact)!
19 changes: 19 additions & 0 deletions content/blog/how-i-created-jjv-sh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
title: "How I Created jjv.sh"
date: 2024-11-03T02:31:00-05:00
tags: ["featured", "how i created"]
---

## Here We Go Again...
Time for the biennial (which I just learned is a word meaning every two years) migrating my website to a new domain name!

I haven't done distro hopped in several years. I haven't browser hopped in twice that time (yes, I copied my browser files over to the next distro). But I HAVE server hopped my website every few months, mostly keeping the same domain name, but every two years now I have changed the domain name the same time I change the server.

## Towing the Mobile Home
This most recent one was more of a lift-and-shift, where I zipped up the files on the old server, copied them over to the new server, unzipped them, and ran `docker compose up -d` to download and run all the docker containers with the various subdomains. Ok, the zip file WAS 12 gigabytes and took more than an hour to copy, but it was a simple process. I did tweak the caddy setup so now caddy runs outside of docker so it can proxy services that run outside of docker, and this comes with the limitation that it has to reference docker containers by port instead of hostname.

## We're Visiting, Might as Well Renovate
Also, I had some services already running on jjv.sh, on a different old server, so I lifted-and-shifted those to the new server as well. Then I figured I might as well move johanv.net to jjv.sh, since they were now hosted on the same server. So it was just a matter of going thru each subdomain and updating the caddy config to serve on jjv.sh and redirect any old requests from johanv.net to jjv.sh.

## The Aftermath
Then I had to update all the links in files wherever I could find them, and rename a few repos. I still need to change links to my site on external sites, but the redirects will handle that for now.
5 changes: 4 additions & 1 deletion content/blog/how-i-created-johanv-net.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
---
title: "How I Created johanv.net: Personal Website with Seamless Livestream"
date: 2022-08-20T19:39:55-04:00
tags: ["featured"]
tags: ["how i created"]
---

## Update 2024-11-03
I have since moved to [jjv.sh](https://jjv.sh), read about it [here](/blog/how-i-created-jjv-sh). Keep reading if you want, but most of the links in this article are old.

## The Backstory
Ever since I [moved my site to johanv.xyz](/blog/how-i-created-johanv-xyz), some things have been slightly off. When I texted someone a link, they didn't get it. When I visited it at work, it was blocked (and so I couldn't link to it on my "about me" page). It turns out, `.xyz` domains, due to their low price, are heavily involved in scam texts and such. So, I made a short-term solution: pointing `johan.vandegriff.net` (my old site's domain which I still owned) to the same content as `johanv.xyz`.

Expand Down
5 changes: 4 additions & 1 deletion content/blog/how-i-created-johanv-xyz.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
---
title: "How I Created johanv.xyz (and subsequently destroyed it)"
date: 2019-06-08T04:18:50-04:00
tags: []
tags: ["how i created"]
---

## Update 2024-11-03
I have since moved to [jjv.sh](https://jjv.sh), read about it [here](/blog/how-i-created-jjv-sh). Keep reading if you want, but most of the links in this article are old.

## Update 2022-08-05
I have since moved to [johanv.net](https://johanv.net), read about it [here](/blog/how-i-created-johanv-net). Keep reading if you want, but most of the links in this article are old.

Expand Down
2 changes: 1 addition & 1 deletion content/blog/how-to-win-a-hackathon.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ I just got back from Hoya Hacks, a hackathon a Georgetown this past weekend. Som
Make sure hardware works before the event. If you are going to use a Raspberry Pi, for example, make sure it boots up, you remember the password, install updates, etc.
* Go for the challenges, for example we used MongoDB to store our data even though we could have just put it in a file. We didn't win the MongoDB prize, but I did learn a lot. Also we spent some time brainstorming a domain name, which is how we won the award for best domain.
* Make something fun: at bitcamp last year, we made a trash can that insults you when you put recycling in, and won most entertaining! (it actually couldn't tell between trash and recycling, so it would always insult you :)
* Or make something you need/want, that way even if you don't win, you can still use it! One time we made a chatbot, and we didn't win but I still enjoy talking to it sometimes: https://games.johanv.net/carl
* Or make something you need/want, that way even if you don't win, you can still use it! One time we made a chatbot, and we didn't win but I still enjoy talking to it sometimes: https://games.jjv.sh/carl
* Add this stuff to your resume, and you can even include a link to the project. Employers will be impressed that not only do you know flask, but you also have a public flask app on the internet to prove it! And if you ask me, getting an internship means you were the real hackathon winner. :)

Here's some upcoming hackathons at umd:
Expand Down
2 changes: 1 addition & 1 deletion content/games-system/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ title: "GAMES: Glamorous Automatic Multi-game Emulator System"
date: 2019-09-03T16:34:13-04:00
tags: []
---
GAMES is a tiny Arduino game system with a 3x3 LED screen and 4 buttons. Version 1 uses an Arduino Pro Mini, which is shown below. Version 2 uses an ATTiny microcontroller, which you can find here [here](https://johanv.net/ATinyGame/).
GAMES is a tiny Arduino game system with a 3x3 LED screen and 4 buttons. Version 1 uses an Arduino Pro Mini, which is shown below. Version 2 uses an ATTiny microcontroller, which you can find here [here](/ATinyGame).

![GAMES](/gallery/random/images/games-1.JPG)
4 changes: 0 additions & 4 deletions content/games/index.md

This file was deleted.

2 changes: 1 addition & 1 deletion content/hexagame/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "HexaGame: Ever played snake, but with 6 directions?"
description: "HexaGame is a handheld multi-game system that consists of a hexagon of LEDs with buttons surrounding it, as well as a hex-shaped dpad"
image: "https://johanv.net/hexagame/images/WhackAMole.JPG"
image: "https://jjv.sh/hexagame/images/WhackAMole.JPG"
date: 2019-09-03T16:34:13-04:00
tags: []
---
Expand Down
39 changes: 0 additions & 39 deletions content/jjv.sh/index.md

This file was deleted.

2 changes: 1 addition & 1 deletion content/now/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ date: 2023-11-23T08:00:00-05:00
Lately I've been up to:
- Editing some goofy videos
- Trying to finish making a few more songs before the end of the year
- Livestreaming on this very site, johanv.net, which forwards to twitch, youtube, etc. I play games, make [music](https://jjv.sh/music), write code, and have recently been trying out makeup. More info on the [home page](/)
- Livestreaming on this very site, jjv.sh, which forwards to twitch, youtube, etc. I play games, make [music](https://jjv.sh/music), write code, and have recently been trying out makeup. More info on the [home page](/)
- Working on a [bot](https://codeberg.org/johanvandegriff/multistream-bot) that aggregates live chat from twitch, youtube, etc. into one place, forwards commands for other bots between chats as needed, and even gives people nicknames and chats with them
- Exploring the new Raspberry Pi Pico W, a $6 computer with wifi. I'm writing code for it to connect to OBS (live streaming software) to control actions by pushing buttons on a [macropad](https://shop.pimoroni.com/products/pico-rgb-keypad-base?variant=32369517166675). I have a [previous version](https://codeberg.org/johanvandegriff/StreamPico/) working, but that was before the Pico W came out, so it uses the Pico and a bluetooth module
- Prototyping a handheld game for under $10, the [last one](https://jjv.sh/atinygame) was under $1 but was very limited. I have decided on the RP2040 for the processor, and for the display I am considering two options: a [Monochrome Nokia 5110](https://makertube.net/w/5DxLirHs9eaooD1pWh3rFy) and a [Color TFT](https://makertube.net/w/audk1EdKhM35AP83qrmwqf)
Expand Down
8 changes: 4 additions & 4 deletions content/owncast-chat/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html class=" zgduqrkyjb idc0_350"><head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<!-- base href="https://johanv.net/embed/chat/readonly?111" -->
<!-- base href="https://jjv.sh/embed/chat/readonly?111" -->
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<style type="text/css">svg:not(:root).svg-inline--fa {
Expand Down Expand Up @@ -959,16 +959,16 @@

<script type="module">

const OWNCAST_URL = "https://johanv.net";
const OWNCAST_WS = "wss://johanv.net";
const OWNCAST_URL = "https://jjv.sh";
const OWNCAST_WS = "wss://jjv.sh";

//show_message({user: {displayName: "user", displayColor: 266}, body: "test"})

function show_message(message) {
/*
{"body":"test11","id":"dYj8uMdSR","timestamp":"2023-12-19T22:35:32.906683883Z","type":"CHAT","user":{"id":"4OWBUMdSg","displayName":"wizardly-shockley","displayColor":266,"createdAt":"2023-12-19T21:40:29.127078135Z","previousNames":["wizardly-shockley"],"nameChangedAt":"0001-01-01T00:00:00Z","isBot":false,"authenticated":false},"visible":true}
{"body":"<p>welcome! feel free to say hi in chat (change your nickname in the top right) or check out the rest of the website</p>","id":"XI5MrMOSR","timestamp":"2023-12-19T22:41:48.283140884Z","type":"SYSTEM","user":{"displayName":"johanv.net"}}
{"body":"<p>welcome! feel free to say hi in chat (change your nickname in the top right) or check out the rest of the website</p>","id":"XI5MrMOSR","timestamp":"2023-12-19T22:41:48.283140884Z","type":"SYSTEM","user":{"displayName":"jjv.sh"}}
*/
//TODO timestamp

Expand Down
Loading

0 comments on commit 0d7201d

Please sign in to comment.