Merge branch 'main' into renovate/npm-axios-vulnerability

Update dependency core-js to v3.45.0 (#244 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-08-13 19:20:20 +00:00 · 2025-08-13 14:29:18 -04:00 · 2025-08-09 18:15:50 -04:00 · 2025-07-26 07:54:19 -04:00 · 2025-07-23 20:03:51 -04:00 · 2025-07-23 20:03:36 -04:00
21 changed files with 4551 additions and 12454 deletions
--- 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/11
+++ b/11
@@ -1,5 +1,8 @@
-rfd.fyi
+rfd.davegallant.ca {
+    file_server
+    reverse_proxy /api/* backend:8080
+}

-file_server
-
-reverse_proxy /api/* backend:8080
+rfd.fyi {
+    redir https://rfd.davegallant.ca{uri} 301
+}
--- a/2
+++ b/2
@@ -10,7 +10,7 @@ COPY . .

 RUN npm run build

-FROM caddy:2.7.6-alpine as runtime
+FROM caddy:2.10.0-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
@@ -4,8 +4,6 @@ This repository provides a simple, less-distracting overlay for hot deals posted

 The frontend is made with Vue 3 and the backend is written in Go. The backend exists for caching purposes; to prevent excessive requests to RedFlagDeals itself.

-It is hosted at [rfd.fyi](https://rfd.fyi).
-
 ## Local Development

 To get up and running locally: in one pane/tab, run:
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.6
+# syntax=docker/dockerfile:1.17
 FROM cgr.dev/chainguard/go:latest as build

 WORKDIR /src
--- a/backend/app.go
+++ b/backend/app.go
@@ -91,12 +91,15 @@ func (a *App) refreshTopics() {
 	for {
 		log.Info().Msg("Refreshing topics")
 		latestTopics := a.getDeals(9, 1, 6)
-		latestTopics = a.updateScores(latestTopics)

-		log.Info().Msg("Refreshing redirects")
-		latestRedirects := a.getRedirects()
-		a.Redirects = latestRedirects
-		a.CurrentTopics = a.stripRedirects(latestTopics)
+		if len(latestTopics) > 0 {
+			latestTopics = a.updateScores(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())
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -3,13 +3,13 @@ module github.com/davegallant/rfd-fyi
 go 1.18

 require (
+	github.com/dlclark/regexp2 v1.11.5
 	github.com/gorilla/mux v1.8.1
 	github.com/joho/godotenv v1.5.1
-	github.com/rs/zerolog v1.31.0
+	github.com/rs/zerolog v1.34.0
 )

 require (
-	github.com/dlclark/regexp2 v1.10.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,6 +1,16 @@
 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/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
+github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
@@ -13,8 +23,15 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP
 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/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 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=
+github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
+github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
 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=
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,4 +1,3 @@
-version: "3.9"
 services:
  frontend:
    image: ghcr.io/davegallant/rfd-fyi-frontend
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.9"
 services:
  frontend:
    build:
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -10,19 +10,17 @@
  "dependencies": {
    "@github/hotkey": "^3.0.0",
    "@popperjs/core": "^2.11.8",
-    "axios": "^1.6.0",
+    "axios": "^1.11.0",
    "bootstrap": "^5.3.1",
    "bootstrap-vue": "^2.22.0",
    "core-js": "^3.32.1",
-    "cssnano": "^6.0.3",
+    "cssnano": "^7.0.0",
    "jquery": "^3.7.0",
    "moment": "^2.29.4",
-    "postcss": "^8.4.33",
    "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.5"
+    "vue-router": "4.5.1"
  },
  "devDependencies": {
    "@babel/core": "^7.22.10",
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,7 +0,0 @@
-module.exports = {
-    plugins: [
-        require('cssnano')({
-            preset: 'default',
-        }),
-    ],
-};
--- a/public/favicon.png
+++ b/public/favicon.png
--- a/public/index.html
+++ b/public/index.html
@@ -4,12 +4,14 @@
    <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"
      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200"
    />
-    <title>rfd.fyi - An overlay of hot deals</title>
+    <title>rfd-fyi - An overlay of hot deals</title>
+    <script defer src="https://umami.snake-cloud.ts.net/script.js" data-website-id="59ffe8be-509a-471e-8cd6-a63c5b35b7aa"></script>
  </head>
  <body>
    <noscript>
--- a/renovate.json
+++ b/renovate.json
@@ -1,5 +1,8 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "schedule": [
+    "every weekend"
+  ],
  "extends": [
    "config:recommended"
  ]
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,10 +2,9 @@
 import axios from "axios";
 import moment from "moment";
 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() {
@@ -118,10 +117,14 @@ export default {
        return v.replace(re, (matchedText) => `<mark>${matchedText}</mark>`);
      };
    },
+    showBeforeTargetDate() {
+      const now = new Date();
+      const target = new Date('2025-08-20T00:00:00');
+      return now < target;
+    }
  },
  components: {
    Loading,
-    GithubButton,
  },
 };
 </script>
@@ -130,10 +133,11 @@ export default {
  <link rel="shortcut icon" type="image/png" href="/favicon.png" />
  <body>
    <input
-      class="form-control" 
+      class="form-control"
      type="text"
      id="filter"
      placeholder="Filter"
+
      data-hotkey="/"
      v-model="filter"
      v-on:keyup.enter="createFilterRoute(this.filter.toString())"
@@ -161,7 +165,7 @@ export default {
        <loading
          v-model:active="isLoading"
          color="#ccc"
-          opacity=0
+          opacity="0"
          loader="bars"
          :is-full-page="false"
        >
@@ -205,21 +209,9 @@ export default {
        </tr>
      </tbody>
    </table>
-    <div v-if="!isMobile()">
+    <div v-if="showBeforeTargetDate">
      <footer class="fixed-bottom">
-        <small
-          >Tip: Press '/' to filter and create filter links (i.e.
-          <a
-            href="/#/filter=pizza"
-            onclick="setTimeout(location.reload.bind(location), 1)"
-            >https://rfd.fyi/#/filter=pizza</a
-          >)</small
-        >
-        <div class="footer-right">
-          <github-button href="https://github.com/davegallant/rfd-fyi"
-            >Star</github-button
-          >
-        </div>
+        PSA: <a href="https://rfd.fyi">rfd.fyi</a> will not be renewed after 2025-08-20. Please use <a href="https://rfd.davegallant.ca">rfd.davegallant.ca</a>.
      </footer>
    </div>
  </body>
@@ -233,4 +225,10 @@ export default {
  text-align: center;
  color: #2c3e50;
 }
+
+.fixed-bottom {
+  background: #ffc;
+  color: black;
+}
+
 </style>
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,5 @@
 import { createApp } from "vue";
 import App from "./App.vue";
-import VueGtag from "vue-gtag";
 import { createRouter, createWebHashHistory } from "vue-router";

 import "bootstrap/dist/css/bootstrap.min.css";
@@ -15,9 +14,7 @@ const router = createRouter({
  routes,
 });

-const app = createApp(App).use(VueGtag, {
-  config: { id: "G-YF11ZH9SYD" },
-});
+const app = createApp(App);

 app.use(router);
 app.mount("#app");
--- a/src/theme.css
+++ b/src/theme.css
@@ -15,7 +15,7 @@ html {
 }

 a {
-  color: #83a598; /**/
+  color: #96ada5; /**/
 }
 a:visited {
  color: #53514f; /**/
@@ -62,3 +62,7 @@ footer {
  background-size: contain;
  background-position-y: bottom;
 }
+
+.material-symbols-outlined {
+ font-size: medium;
+}