remove elements if new tab

Reviewed-on: #2

README.md

@@ -13,7 +13,7 @@ go install gitea.elara.ws/Hazel/transfem-startpage
 Then you can run the program `transfem-startpage`
 
 ```sh
-transfem-startpage
+transfem-startpage help
 ```
 
 To configure this new tab page as website, you can install the firefox extension [New Tab Override](https://addons.mozilla.org/en-US/firefox/addon/new-tab-override/). Then just configure the url as `http://127.0.0.1:{port}/`. The default port should be `5500` but it will also print it out when starting the server. Make sure to check the box `Set focus to the web page instead of the address bar` in the extension settings, because the new tab page auto focuses the search bar.
@@ -55,10 +55,9 @@ air dev
 
 ## TODO
 
-- implementing proper command line args
+- implement templating for every one of the frontend files
-    - clear cache
+- implement functionality to clear and clean cache
-- implement fetching in intervals
+- host this website on a demo page
-    - host this website on a demo page
 - implement ctl
 - implement autocomplete with a nice go backend and fast communication. Since it all runs locally nobody should have privacy concerns NEEDS TO BE ABLE TO TOGGLED OFF FOR DEMO PAGE
 

demo.toml

@@ -0,0 +1,17 @@
+[Server]
+Port = 1312
+
+[DiyHrt]
+FetchIntervals = 60
+
+[Template]
+ActiveCard = "listings"
+PageTitle = "TransfemStartpage demo"
+HeaderPhrases = [
+    "GirlJuice.Inject();",
+    "You.Cute = true;",
+    "You.Gay = true;",
+    "Nazi.Punch();",
+    "Dolls.GiveGuns();",
+    "Firefox > Chrome"
+]

frontend/assets/style.css

@@ -49,16 +49,6 @@ body {
     color: black;
 }
 
-@media (max-height: 300px) {
-    .search-grid {
-        grid-template-rows: 4em;
-    }
-
-    .search-logo {
-        display: none;
-    }
-}
-
 .cards {
     height: 100%;
     width: 100%;
@@ -70,6 +60,20 @@ body {
     overflow: auto;
 }
 
+@media (max-height: 500px) {
+    .search-grid {
+        grid-template-rows: 4em;
+    }
+
+    .search-logo {
+        display: none;
+    }
+
+    .cards {
+        display: none;
+    }
+}
+
 .card {
     background-color: rgba(255, 255, 255, 0.5);
     width: 10em;
@@ -97,7 +101,6 @@ body {
     margin: 0;
 }
 
-
 .card-image {
     height: 100%;
     aspect-ratio: 1/1;

frontend/scripts/search.js

@@ -4,90 +4,94 @@ const form = document.getElementById("search-form");
 const input = document.getElementById("search-input");
 
 // https://stackoverflow.com/a/3809435/16804841
-const expression = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/gi;
+const expression =
+  /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/gi;
 const urlRegex = new RegExp(expression);
 
 const searchEngines = {
-    "g": {
+  g: {
-        action: "https://www.google.com/search",
+    action: "https://www.google.com/search",
-        name: "q",
+    name: "q",
-    },
+  },
-    "d": {
+  d: {
-        action: "https://duckduckgo.com/",
+    action: "https://duckduckgo.com/",
-        name: "q",
+    name: "q",
-    },
+  },
-    "y": {
+  y: {
-        action: "https://yandex.com/search/",
+    action: "https://www.youtube.com/results",
-        name: "text",
+    name: "search_query",
-    },
+  },
-    "lure": {
+  ya: {
-        action: "https://lure.sh/pkgs",
+    action: "https://yandex.com/search/",
-        name: "q",
+    name: "text",
-    },
+  },
+  lure: {
+    action: "https://lure.sh/pkgs",
+    name: "q",
+  },
 };
 
-const translationPrefixes = [
+const translationPrefixes = ["t", "translation"];
-    "t",
-    "translation",
-]
-
 
 function getDeepLUrl(s) {
-    const parts = s.split("-")
+  const parts = s.split("-");
-    if (parts.length != 3) {
+  if (parts.length != 3) {
-        return undefined
+    return undefined;
-    }
+  }
 
-    return `https://www.deepl.com/en/translator?/#${encodeURIComponent(parts[0].trim())}/${encodeURIComponent(parts[1].trim())}/${encodeURIComponent(parts[2].trim())}`;
+  return `https://www.deepl.com/en/translator?/#${encodeURIComponent(
+    parts[0].trim()
+  )}/${encodeURIComponent(parts[1].trim())}/${encodeURIComponent(
+    parts[2].trim()
+  )}`;
 }
 
+form.addEventListener("submit", (event) => {
+  event.preventDefault();
 
-form.addEventListener("submit", event => {
+  s = input.value;
-    event.preventDefault();
 
-    s = input.value;
+  // check if url
+  if (s.match(urlRegex)) {
+    window.open(s, "_self");
+    return;
+  }
 
-    // check if url
+  // deepl translations
-    if (s.match(urlRegex)) {
+  let doTranslation = false;
-        window.open(s, "_self");
+  for (const value of translationPrefixes) {
-        return
+    const prefix = `!${value} `;
+    if (s.startsWith(prefix)) {
+      doTranslation = true;
+      s = s.slice(prefix.length); // Remove the !{key} prefix
+      break;
     }
+  }
 
-    // deepl translations
+  if (doTranslation) {
-    let doTranslation = false;
+    const url = getDeepLUrl(s);
-    for (const value of translationPrefixes) {
+    if (url) {
-        const prefix = `!${value} `;
+      window.open(url.toString(), "_self");
-        if (s.startsWith(prefix)) {
+      return;
-            doTranslation = true;
-            s = s.slice(prefix.length); // Remove the !{key} prefix
-            break;
-        }
     }
+  }
 
-    if (doTranslation) {
+  // Check if the string starts with ! followed by a key from searchEngines
-        const url = getDeepLUrl(s);
+  let selectedEngine = {
-        if (url) {
+    action: form.getAttribute("action"),
-            window.open(url.toString(), "_self");
+    name: input.getAttribute("name"),
-            return;
+  };
-        }
+
+  for (const [key, value] of Object.entries(searchEngines)) {
+    const prefix = `!${key} `;
+    if (s.startsWith(prefix)) {
+      selectedEngine = value;
+      s = s.slice(prefix.length); // Remove the !{key} prefix
+      break;
     }
+  }
 
-    // Check if the string starts with ! followed by a key from searchEngines
+  const url = new URL(selectedEngine.action);
-    let selectedEngine = {
+  url.searchParams.set(selectedEngine.name, s.trim());
-        action: form.getAttribute("action"),
+  window.open(url.toString(), "_self");
-        name: input.getAttribute("name"),
-    };
-
-    for (const [key, value] of Object.entries(searchEngines)) {
-        const prefix = `!${key} `;
-        if (s.startsWith(prefix)) {
-            selectedEngine = value;
-            s = s.slice(prefix.length); // Remove the !{key} prefix
-            break;
-        }
-    }
-
-    const url = new URL(selectedEngine.action);
-    url.searchParams.set(selectedEngine.name, s.trim());
-    window.open(url.toString(), "_self");
 });

internal/cache/cache.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"gitea.elara.ws/Hazel/transfem-startpage/internal/utils"
 	"github.com/labstack/echo/v4"
 )
 
@@ -23,7 +24,7 @@ func getCacheDir() (string, error) {
 	if err != nil {
 		baseDir = "/tmp"
 	}
-	cacheDir := filepath.Join(baseDir, "startpage")
+	cacheDir := filepath.Join(baseDir, utils.Name)
 	err = os.MkdirAll(cacheDir, 0o755)
 	if err != nil {
 		return "", err

internal/cli/cli.go

@@ -4,6 +4,7 @@ import (
 	"log"
 	"os"
 
+	"gitea.elara.ws/Hazel/transfem-startpage/internal/utils"
 	"github.com/TwiN/go-color"
 )
 
@@ -22,8 +23,8 @@ type Argument struct {
 	Description string
 }
 
-var HelpHeader = `This is the help page of transfem-startpage.
+var HelpHeader = `This is the help page of ` + utils.Name + `.
-` + color.Purple + `transfem-startpage {program} {...args}` + color.Reset + `
+` + color.Purple + utils.BinaryName + ` {program} {...args}` + color.Reset + `
 The following Programs are available:`
 var Programs = []Program{
 	{

internal/cli/help.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"strings"
 
+	"gitea.elara.ws/Hazel/transfem-startpage/internal/utils"
 	"github.com/TwiN/go-color"
 )
 
@@ -55,7 +56,7 @@ func specificHelp(programName string) error {
 	fmt.Println(color.Bold + "MAN PAGE FOR " + strings.ToUpper(programName) + color.Reset)
 	fmt.Println()
 
-	fmt.Println(color.Purple + "transfem-startpage " + programName + color.Reset + getArgumentString(program.Arguments))
+	fmt.Println(color.Purple + utils.BinaryName + " " + programName + color.Reset + getArgumentString(program.Arguments))
 	fmt.Println()
 
 	fmt.Println(color.Bold + "arguments" + color.Reset)

internal/diyhrt/diy_config.go

@@ -1,7 +1,9 @@
 package diyhrt
 
 type DiyHrtConfig struct {
-	ApiKey        string
+	ApiKey         string
+	FetchIntervals int
+
 	StoreFilter   StoreFilter
 	ListingFilter ListingFilter
 }

internal/diyhrt/fetch.go

@@ -11,7 +11,7 @@ const endpoint = "https://diyhrt.market/api/listings"
 
 func GetListings(apiKey string) ([]Listing, error) {
 	if apiKey == "" {
-		return nil, errors.New("API_KEY key not set. Set it as env or in DiyHrt.ApiKey")
+		return nil, errors.New("diyhrt API_KEY key not set. Set it as env or in DiyHrt.ApiKey")
 	}
 
 	// Create HTTP client

internal/rendering/config.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 
 	"gitea.elara.ws/Hazel/transfem-startpage/internal/diyhrt"
+	"gitea.elara.ws/Hazel/transfem-startpage/internal/utils"
 	"github.com/pelletier/go-toml"
 )
 
@@ -62,7 +63,8 @@ func NewConfig() Config {
 			Port: 5500,
 		},
 		DiyHrt: diyhrt.DiyHrtConfig{
-			ApiKey: os.Getenv("API_KEY"),
+			ApiKey:         os.Getenv("API_KEY"),
+			FetchIntervals: 60, // fetch every hour
 			StoreFilter: diyhrt.StoreFilter{
 				Limit:      0,
 				IncludeIds: []int{7},
@@ -105,7 +107,7 @@ func (rc *Config) ScanForConfigFile(profile string) error {
 
 	baseDir, cacheDirErr := os.UserConfigDir()
 	if cacheDirErr == nil {
-		configFile := filepath.Join(baseDir, "startpage", profileFile)
+		configFile := filepath.Join(baseDir, utils.Name, profileFile)
 
 		if err := rc.LoadConfigFile(configFile); !errors.Is(err, os.ErrNotExist) {
 			return err

internal/server/server.go

@@ -4,6 +4,7 @@ import (
 	"log"
 	"net/http"
 	"strconv"
+	"time"
 
 	"gitea.elara.ws/Hazel/transfem-startpage/internal/cache"
 	"gitea.elara.ws/Hazel/transfem-startpage/internal/rendering"
@@ -12,12 +13,26 @@ import (
 
 var Config = rendering.NewConfig()
 
+func StartFetching() {
+	for {
+		log.Println("Fetch DiyHrt data...")
+		Config.FetchDiyHrt()
+		time.Sleep(time.Duration(Config.DiyHrt.FetchIntervals) * time.Second)
+
+		if Config.DiyHrt.FetchIntervals == 0 {
+			break
+		}
+	}
+}
+
 func Start(profile string) error {
 	err := Config.ScanForConfigFile(profile)
 	if err != nil {
 		return err
 	}
 
+	go StartFetching()
+
 	err = Config.FetchDiyHrt()
 	if err != nil {
 		log.Println(err)

internal/utils/meta.go

@@ -0,0 +1,6 @@
+package utils
+
+import "os"
+
+var Name = "transfem-startpage"
+var BinaryName = os.Args[0]

tmp/build-errors.log

@@ -1 +1 @@
-exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1
+exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1