content/_index.md

@@ -1,10 +1,8 @@
-# basedData.io
+# Bitlab21
 
-My name is Sam Chance, and this is my personal site.
+Welcome to Bitlab21! My name is Sam Chance, and this is my personal site.
 
-I am an professional Analytics Engineer with a passion for working with data.
-
-I build data pipelines for analytical projects, some of which I host on this site.
+I host various content here that interests me.
 
 Feel free to look around. If you have any questions, then you can email me on *contact@sjplab.com*.
 
@@ -14,30 +12,32 @@ This site is still very much under construction.
 
 ### Shortcuts to some of my work:
 
-- [basedData Data Lab](/data-lab) A selection of charts and metrics obtained from public data
+[Bitcoin metrics](/bitcoin) A selection of charts and metrics obtained from public data
 
-- [Map Printing Service](https://semitamaps.com) A free map printing service based on Openstreetmaps
+[Semita Maps](https://semitamaps.com) A free map printing service based on Openstreetmaps
 
-- [Code base](https://git.bitlab21.com) My personal self-hosted git repo using Gitea
+[Code base](https://git.bitlab21.com) My personal self-hosted git repo using Gitea
 
-- [Nixos config](https://git.bitlab21.com/sam/nixos) My Nixos configuration
+[Nixos config](https://git.bitlab21.com/sam/nixos) My Nixos configuration
+
+[Recipes](/recipes) My personal recipe book
 
 ### Software I use:
 
-- [**Neovim**](https://neovim.io/) for text editing (my neovim config is part of my [nixos](https://git.bitlab21.com/sam/nixos) configuration)
+[**Neovim**](https://neovim.io/) for text editing (my neovim config is part of my [nixos](https://git.bitlab21.com/sam/nixos) configuration)
 
-- I use **Linux** on all my machines
+I use **Linux** on all my machines
 
-- **Nixos** and **Arch Linux** are my Linux distros of choice
+**Nixos** and **Arch Linux** are my Linux distros of choice
 
-- [**dwm**](https://dwm.suckless.org) is my window manager (my dwm [config](https://git.bitlab21.com/sam/dwm))
+[**dwm**](https://dwm.suckless.org) is my window manager (my dwm [config](https://git.bitlab21.com/sam/dwm))
 
-- [**st**](https://st.suckless.org) is my terminal emulator (my st [config](https://git.bitlab21.com/sam/st))
+[**st**](https://st.suckless.org) is my terminal emulator (my st [config](https://git.bitlab21.com/sam/st))
 
-- I use [**QGIS**](https://www.qgis.org/) and [**Postgis**](https://postgis.net/) for geospatial work
+I use [**QGIS**](https://www.qgis.org/) and [**Postgis**](https://postgis.net/) for geospatial work
 
-- [**DBT**](https://github.com/dbt-labs/dbt-core) for data modelling
+[**DBT**](https://github.com/dbt-labs/dbt-core) for data modelling
 
-- [**Postgres**](https://www.postgresql.org/) is my relational database of choice to power my backends
+[**Postgres**](https://www.postgresql.org/) is my relational database of choice to power my backends
 
-- [**Hugo**](https://gohugo.io/) to build this [**website**](https://git.bitlab21.com/sam/bitlab21.com)
+[**Hugo**](https://gohugo.io/) to build this [**website**](https://git.bitlab21.com/sam/bitlab21.com)

content/data-analysis/_index.md

@@ -0,0 +1,5 @@
+---
+title: "Data Lab"
+---
+
+Welcome to the __Data Lab__. Here I present a collection of different data-driven projects I've worked on.

content/data-lab/_index.md

@@ -1,5 +0,0 @@
----
-title: "basedData Data Lab"
----
-
-Welcome to the basedData __Data Lab__. Here I present a collection of different data-driven projects I've worked on.

hugo.toml

@@ -1,5 +1,5 @@
-baseURL = 'https://baseddate.io/'
+baseURL = 'https://bitlab21.com/'
 languageCode = 'en-gb'
-title = 'baseddata.io'
+title = 'Bitlab21'
 
 markup.highlight.noClasses=false

layouts/partials/chart.html

@@ -1,4 +1,3 @@
-<script src="https://cdn.jsdelivr.net/npm/echarts@5.5.1/dist/echarts.min.js"></script>
 <div id="chart">
   <canvas id="{{ .id }}"></canvas>
   <script src="{{ .src }}"></script>

layouts/partials/header.html

@@ -1,7 +1,7 @@
 <header>
   <nav class="navbar" role="navigation">
     <div class="navbar__left">
-      <a href="/"><strong>basedData.io</strong></a>
+      <a href="/"><strong>Bitlab21.com</strong></a>
     </div>
     <div class="navbar__right">
       <div class="navbar-links">{{ partial "navbarlinks.html" . }}</div>

layouts/partials/navbarlinks.html

@@ -3,7 +3,7 @@
   <li class="navbar_link_dropdown">
     <a href="#" class="dropbtn">Projects</a>
     <div class="navbar-link-dropdown-content">
-      <a href="/data-lab">Data Lab</a>
+      <a href="/data-analysis">Data Analysis</a>
       <a href="https://semitamaps.com">Map Printing</a>
     </div>
   </li>

static/css/style.css

@@ -112,11 +112,6 @@ a:hover {
   align-items: flex-start;
 }
 
-.home-page li {
-  left: 25px;
-  position: relative;
-}
-
 .profile-img {
   margin-right: 20px;
   margin-left: 20px;

static/js/bitcoin-price.js

@@ -1,21 +1,13 @@
 let dataArr = [];
 const myChart = echarts.init(document.getElementById("chart"));
 
-async function fetchDataForChart() {
-  try {
-    const apiEndpoint = "https://api.bitlab21.com/price";
-    const response = await fetch(apiEndpoint);
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-    const dataArr = await response.json();
-    initEchart(dataArr);
-  } catch (error) {
-    console.error("Fetching data failed:", error);
-  }
-}
+$.get("https://api.bitlab21.com/price", {}, (response) => {
+  dataArr = response;
+  console.log(dataArr);
+  initEchart();
+});
 
-function initEchart(dataArr) {
+function initEchart() {
   const option = {
     backgroundColor: backgroundColor,
     tooltip: {
@@ -64,5 +56,3 @@ function initEchart(dataArr) {
 
   myChart.setOption(option);
 }
-
-fetchDataForChart();

static/js/chart-params.js

@@ -97,7 +97,7 @@ function nFormatter(value, digits) {
     : "0";
 }
 
-window.addEventListener("resize", function () {
+$(window).on("resize", function () {
   if (myChart != null && myChart != undefined) {
     myChart.resize();
   }

static/js/feerate-percentile.js

@@ -1,21 +1,13 @@
 let dataArr = [];
 const myChart = echarts.init(document.getElementById("chart"));
 
-async function fetchDataForChart() {
-  try {
-    const apiEndpoint = "https://api.bitlab21.com/feerates";
-    const response = await fetch(apiEndpoint);
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-    const dataArr = await response.json();
-    initEchart(dataArr);
-  } catch (error) {
-    console.error("Fetching data failed:", error);
-  }
-}
+$.get("https://api.bitlab21.com/feerates", {}, (response) => {
+  dataArr = response;
+  console.log(dataArr);
+  initEchart();
+});
 
-function initEchart(dataArr) {
+function initEchart() {
   const option = {
     backgroundColor: backgroundColor,
     tooltip: {
@@ -107,4 +99,3 @@ function initEchart(dataArr) {
 
   myChart.setOption(option);
 }
-fetchDataForChart();

static/js/hashrate.js

@@ -1,21 +1,13 @@
 let dataArr = [];
 const myChart = echarts.init(document.getElementById("chart"));
 
-async function fetchDataForChart() {
-  try {
-    const apiEndpoint = "https://api.bitlab21.com/hashrate";
-    const response = await fetch(apiEndpoint);
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-    const dataArr = await response.json();
-    initEchart(dataArr);
-  } catch (error) {
-    console.error("Fetching data failed:", error);
-  }
-}
+$.get("https://api.bitlab21.com/hashrate", {}, (response) => {
+  dataArr = response;
+  console.log(dataArr);
+  initEchart();
+});
 
-function initEchart(dataArr) {
+function initEchart() {
   const option = {
     backgroundColor: backgroundColor,
     tooltip: {
@@ -114,4 +106,3 @@ function initEchart(dataArr) {
 
   myChart.setOption(option);
 }
-fetchDataForChart();

static/js/miner-rewards.js

@@ -1,21 +1,13 @@
 let dataArr = [];
 const myChart = echarts.init(document.getElementById("chart"));
 
-async function fetchDataForChart() {
-  try {
-    const apiEndpoint = "https://api.bitlab21.com/miner_rewards";
-    const response = await fetch(apiEndpoint);
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-    const dataArr = await response.json();
-    initEchart(dataArr);
-  } catch (error) {
-    console.error("Fetching data failed:", error);
-  }
-}
+$.get("https://api.bitlab21.com/miner_rewards", {}, (response) => {
+  dataArr = response;
+  console.log(dataArr);
+  initEchart();
+});
 
-function initEchart(dataArr) {
+function initEchart() {
   const option = {
     backgroundColor: backgroundColor,
     tooltip: {
@@ -146,4 +138,3 @@ checkboxLog.addEventListener("change", (e) => {
     dataZoom: dataZoom((start = isChecked ? 0 : 90)),
   });
 });
-fetchDataForChart();