Bump

Fix lint issue
Update dependency eslint to v9
2025-08-14 03:30:19 +00:00 · 2024-08-16 15:05:45 -04:00 · 2024-08-16 15:01:35 -04:00 · 2024-08-16 15:01:35 -04:00 · 2024-08-16 14:43:27 -04:00 · 2024-08-16 14:38:58 -04:00
17 changed files with 6050 additions and 18619 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,18 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: daily
-    reviewers:
-      - davegallant
-    assignees:
-      - davegallant
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: weekly
-    reviewers:
-      - davegallant
-    assignees:
-      - davegallant
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -17,4 +17,4 @@ jobs:
      - name: 'Checkout Repository'
        uses: actions/checkout@v4
      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
--- a/.github/workflows/publish-containers.yml
+++ b/.github/workflows/publish-containers.yml
@@ -39,7 +39,7 @@ jobs:
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build / push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
        with:
          context: backend
          file: ./backend/Dockerfile
@@ -79,7 +79,7 @@ jobs:
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build / push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
        with:
          context: .
          file: ./Dockerfile
--- a/8
+++ b/8
@@ -1,16 +1,16 @@
-FROM node:20.2.0-alpine3.16 as builder
+FROM node:20.2.0-alpine3.16 AS builder

 WORKDIR /app

 COPY package*.json ./

-RUN yarn install
+RUN npm install

 COPY . .

-RUN yarn build
+RUN npm run build

-FROM caddy:2.7.6-alpine as runtime
+FROM caddy:2.8.4-alpine AS runtime

 WORKDIR /my-site

--- a/6
+++ b/6
@@ -22,12 +22,12 @@ backend:
 frontend:
 	@npm install @vue/cli-service
 	@npx vue-cli-service serve
-.PHONY: server
+.PHONY: frontend

 ## dev: Build and run in docker compose
 dev:
 	docker compose up --build -d
-.PHONY: up
+.PHONY: dev

 ## prod: Run the latest images in docker compose
 prod:
@@ -35,7 +35,7 @@ prod:
 	@docker pull ghcr.io/davegallant/rfd-fyi-backend
 	@docker pull ghcr.io/davegallant/rfd-fyi-frontend
 	@docker compose -f docker-compose.prod.yml up -d
-.PHONY: up
+.PHONY: prod

 ## teardown: Teardown docker
 teardown:
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# rfd-fyi
+# rfd.fyi

 This repository provides a simple, less-distracting overlay for hot deals posted on https://forums.redflagdeals.com.

--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.9
 FROM cgr.dev/chainguard/go:latest as build

 WORKDIR /src
--- a/backend/app.go
+++ b/backend/app.go
@@ -6,15 +6,15 @@ import (
 	"io/ioutil"
 	"math/rand"
 	"net/http"
-	"os"
+	"net/url"
 	"strings"
 	"time"

+	"github.com/dlclark/regexp2"
 	_ "github.com/joho/godotenv/autoload"
 	"github.com/rs/zerolog/log"

 	"github.com/gorilla/mux"
-	"go.opentelemetry.io/otel"
 )

 // @title           RFD FYI API
@@ -37,6 +37,12 @@ type App struct {
 	BasePath      string
 	CurrentTopics []Topic
 	LastRefresh   time.Time
+	Redirects     []Redirect
+}
+
+type Redirect struct {
+	Name    string `json:"name"`
+	Pattern string `json:"pattern"`
 }

 func (a *App) Initialize() {
@@ -78,23 +84,23 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 // @Router       /topics [get]
 // @Success 200 {array} Topic
 func (a *App) listTopics(w http.ResponseWriter, r *http.Request) {
-	tracer := otel.Tracer(os.Getenv("OTEL_SERVICE_NAME"))
-	ctx := r.Context()
-	ctx, span := tracer.Start(ctx, "list-topics")
-	defer span.End()
-
 	respondWithJSON(w, http.StatusOK, a.CurrentTopics)
 }

 func (a *App) refreshTopics() {
 	for {
+		log.Info().Msg("Refreshing topics")
 		latestTopics := a.getDeals(9, 1, 6)
 		latestTopics = a.updateScores(latestTopics)
-		log.Debug().Msg("Refreshing topics")
-		a.CurrentTopics = latestTopics
+
+		log.Info().Msg("Refreshing redirects")
+		latestRedirects := a.getRedirects()
+		a.Redirects = latestRedirects
+		a.CurrentTopics = a.stripRedirects(latestTopics)
+
 		a.LastRefresh = time.Now()
 		rand.Seed(time.Now().UnixNano())
-		time.Sleep(time.Duration(rand.Intn(90 - 60 + 1) + 60) * time.Second)
+		time.Sleep(time.Duration(rand.Intn(90-60+1)+60) * time.Second)
 	}
 }

@@ -105,6 +111,38 @@ func (a *App) updateScores(t []Topic) []Topic {
 	return t
 }

+func (a *App) stripRedirects(t []Topic) []Topic {
+	for i := range t {
+		if t[i].Offer.Url == "" {
+			continue
+		}
+
+		var offerUrl = t[i].Offer.Url
+		log.Debug().Msgf("Offer url is : %s", offerUrl)
+		for _, r := range a.Redirects {
+			re := regexp2.MustCompile(r.Pattern, 0)
+			if m, _ := re.FindStringMatch(offerUrl); m != nil {
+				g := m.GroupByName("baseUrl")
+
+				if g.Name != "baseUrl" {
+					continue
+				}
+				decodedValue, err := url.QueryUnescape(g.String())
+				if err != nil {
+					log.Error().Msgf("%s", err)
+					break
+				}
+				t[i].Offer.Url = decodedValue
+				log.Debug().Msgf("Setting offer url to: %s", t[i].Offer.Url)
+
+				break
+			}
+		}
+
+	}
+	return t
+}
+
 func (a *App) isSponsor(t Topic) bool {
 	return strings.HasPrefix(t.Title, "[Sponsored]")
 }
@@ -129,7 +167,7 @@ func (a *App) getDeals(id int, firstPage int, lastPage int) []Topic {
 		err = json.Unmarshal([]byte(body), &response)

 		if err != nil {
-			log.Warn().Msgf("could not unmarshal response body: %s\n %s", err)
+			log.Warn().Msgf("could not unmarshal response body: %s", err)
 		}

 		for _, topic := range response.Topics {
@@ -141,3 +179,26 @@ func (a *App) getDeals(id int, firstPage int, lastPage int) []Topic {
 	}
 	return t
 }
+
+func (a *App) getRedirects() []Redirect {
+
+	requestURL := fmt.Sprintf("https://raw.githubusercontent.com/davegallant/rfd-redirect-stripper/main/redirects.json")
+	res, err := http.Get(requestURL)
+	if err != nil {
+		log.Warn().Msgf("error fetching redirects: %s\n", err)
+	}
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		log.Warn().Msgf("could not read response body: %s\n", err)
+	}
+
+	var r []Redirect
+
+	err = json.Unmarshal([]byte(body), &r)
+
+	if err != nil {
+		log.Warn().Msgf("could not unmarshal response body: %s", err)
+	}
+
+	return r
+}
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -3,17 +3,14 @@ module github.com/davegallant/rfd-fyi
 go 1.18

 require (
-	github.com/gorilla/mux v1.8.0
-	github.com/joho/godotenv v1.4.0
-	github.com/rs/zerolog v1.27.0
-	go.opentelemetry.io/otel v1.11.1
+	github.com/dlclark/regexp2 v1.11.4
+	github.com/gorilla/mux v1.8.1
+	github.com/joho/godotenv v1.5.1
+	github.com/rs/zerolog v1.33.0
 )

 require (
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	go.opentelemetry.io/otel/trace v1.11.1 // indirect
-	golang.org/x/sys v0.5.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	golang.org/x/sys v0.12.0 // indirect
 )
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -1,32 +1,33 @@
-github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
+github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
+github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.1 h1:CJs78ewKXO9PuNf6Xwlw6eibMadBkXTRpOeUdv+IcWM=
+github.com/dlclark/regexp2 v1.11.1/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.2 h1:/u628IuisSTwri5/UKloiIsH8+qF2Pu7xEQX+yIKg68=
+github.com/dlclark/regexp2 v1.11.2/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
+github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
-github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs=
-github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4=
-go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE=
-go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ=
-go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
+github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
+github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -8,19 +8,20 @@
    "lint": "vue-cli-service lint"
  },
  "dependencies": {
-    "@github/hotkey": "^2.0.1",
+    "@github/hotkey": "^3.0.0",
    "@popperjs/core": "^2.11.8",
    "axios": "^1.6.0",
    "bootstrap": "^5.3.1",
    "bootstrap-vue": "^2.22.0",
    "core-js": "^3.32.1",
+    "cssnano": "^7.0.0",
    "jquery": "^3.7.0",
    "moment": "^2.29.4",
    "vue": "^3.3.4",
    "vue-github-button": "^3.0.3",
    "vue-gtag": "^2.0.1",
    "vue-loading-overlay": "^6.0.3",
-    "vue-router": "4.2.4"
+    "vue-router": "4.4.3"
  },
  "devDependencies": {
    "@babel/core": "^7.22.10",
@@ -29,9 +30,10 @@
    "@types/mousetrap": "^1.6.11",
    "@vue/cli-plugin-babel": "~5.0.0",
    "@vue/cli-plugin-eslint": "~5.0.0",
-    "@vue/cli-service": "~5.0.0",
-    "eslint": "^8.47.0",
-    "eslint-plugin-vue": "^9.17.0"
+    "@vue/cli-service": "^5.0.8",
+    "eslint": "^9.0.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "postcss-cli": "^11.0.0"
  },
  "eslintConfig": {
    "root": true,
--- a/public/index.html
+++ b/public/index.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
-<html lang="">
+<html lang="" data-bs-theme="dark">
  <head>
    <meta charset="utf-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+    <meta name="description" content="An overlay of rfd deals" />
    <link rel="icon" href="<%= BASE_URL %>favicon.png" />
    <link
      rel="stylesheet"
--- a/renovate.json
+++ b/renovate.json
@@ -0,0 +1,9 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "schedule": [
+    "every weekend"
+  ],
+  "extends": [
+    "config:recommended"
+  ]
+}
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@ import Loading from "vue-loading-overlay";
 import GithubButton from "vue-github-button";
 import { install } from "@github/hotkey";

-import 'vue-loading-overlay/dist/css/index.css';
+import "vue-loading-overlay/dist/css/index.css";

 export default {
  data() {
@@ -130,18 +130,19 @@ export default {
  <link rel="shortcut icon" type="image/png" href="/favicon.png" />
  <body>
    <input
-      class="form-control bg-dark text-light"
+      class="form-control"
      type="text"
      id="filter"
      placeholder="Filter"
+
      data-hotkey="/"
      v-model="filter"
      v-on:keyup.enter="createFilterRoute(this.filter.toString())"
      v-on:keyup.escape="this.$refs.filter.blur()"
      ref="filter"
    />
-    <table class="table table-dark table-hover">
-      <thead class="thead thead-light text-muted">
+    <table class="table table-hover">
+      <thead class="thead text-muted">
        <tr>
          <th
            v-for="(col, key) in columns"
@@ -161,7 +162,7 @@ export default {
        <loading
          v-model:active="isLoading"
          color="#ccc"
-          opacity=0
+          opacity="0"
          loader="bars"
          :is-full-page="false"
        >
@@ -208,11 +209,11 @@ export default {
    <div v-if="!isMobile()">
      <footer class="fixed-bottom">
        <small
-          >Tip: Press '/' to filter and create filter links (i.e.
+          >Press '/' to begin filtering (i.e.
          <a
-            href="/#/filter=pizza"
+            href="/#/filter=costco"
            onclick="setTimeout(location.reload.bind(location), 1)"
-            >https://rfd.fyi/#/filter=pizza</a
+            >https://rfd.fyi/#/filter=costco</a
          >)</small
        >
        <div class="footer-right">
--- a/src/theme.css
+++ b/src/theme.css
@@ -1,178 +1,21 @@
-@import url(https://fonts.googleapis.com/css?family=Inconsolata);
-@import url(https://fonts.googleapis.com/css?family=PT+Sans);
-@import url(https://fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700);
-
 body {
-  background-color: black;
  max-width: 100%;
 }

-html {
-  background-color: #282828; /**/
-  min-width: 100%;
-}
-
 .thead {
  position: sticky;
  top: 0;
 }

-.form-control {
-  border-color: #404142;
-}
-
-.form-control:focus {
-  color: #ccc !important;
-  background-color: #404142 !important;
-}
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section,
-summary {
-  display: block;
-}
-audio,
-canvas,
-video {
-  display: inline-block;
-}
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-[hidden] {
-  display: none;
-}
 html {
  font-family: sans-serif;
+  min-width: 100%;
  -webkit-text-size-adjust: 100%;
  -ms-text-size-adjust: 100%;
 }
-body {
-  margin: 0;
-}
-a:focus {
-  outline: thin dotted;
-}
-a:active,
-a:hover {
-  outline: 0;
-}
-h1 {
-  font-size: 2em;
-}
-b,
-strong {
-  font-weight: bold;
-}
-dfn {
-  font-style: italic;
-}
-mark {
-  background: #ff0;
-  color: #000;
-}
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-pre {
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-q {
-  quotes: "\201C""\201D""\2018""\2019";
-}
-sub,
-svg:not(:root) {
-  overflow: hidden;
-}
-legend {
-  border: 0;
-  padding: 0;
-}
-button,
-input,
-select,
-textarea {
-  font-family: inherit;
-  font-size: 100%;
-  margin: 0;
-}
-button,
-input {
-  line-height: normal;
-}
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-}
-button[disabled],
-input[disabled] {
-  cursor: default;
-}
-input[type="checkbox"],
-input[type="radio"] {
-  box-sizing: border-box;
-  padding: 0;
-}
-input[type="search"] {
-  -moz-box-sizing: content-box;
-  -webkit-box-sizing: content-box;
-  box-sizing: content-box;
-}
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  border: 0;
-  padding: 0;
-}
-textarea {
-  overflow: auto;
-  vertical-align: top;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-html {
-  font-family: "PT Sans", sans-serif;
-}
-pre,
-code {
-  font-family: "Inconsolata", sans-serif;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-family: "PT Sans Narrow", sans-serif;
-  font-weight: 700;
-}
-body {
-  background-color: #3c3836; /**/
-  margin: 0 auto;
-}
+
 a {
-  color: #83a598; /**/
+  color: #96ada5; /**/
 }
 a:visited {
  color: #53514f; /**/
@@ -221,5 +64,5 @@ footer {
 }

 .material-symbols-outlined {
-  font-variation-settings: "FILL" 0, "wght" 400, "GRAD" 0, "opsz" 48;
+ font-size: medium;
 }
--- a/yarn.lock
+++ b/yarn.lock