Skip to content

web search done right

Integrate Alpine.js (#64)

Oliver Bøving1d26bb2ec08e
diff --git a/frontend/astro.config.mjs b/frontend/astro.config.mjs
index 13bdcb42..67ba3efc 100644
--- a/frontend/astro.config.mjs
+++ b/frontend/astro.config.mjs
@@ -1,9 +1,16 @@
+import path from "path";
import { defineConfig } from "astro/config";
import tailwind from "@astrojs/tailwind";
-
import mdx from "@astrojs/mdx";
// https://astro.build/config
export default defineConfig({
- integrations: [tailwind(), mdx()]
-});
\ No newline at end of file
+ vite: {
+ resolve: {
+ alias: {
+ $: path.resolve("./src"),
+ },
+ },
+ },
+ integrations: [tailwind(), mdx()],
+});
diff --git a/frontend/package.json b/frontend/package.json
index 0798d275..c9a3ac51 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,6 +10,9 @@
"astro": "astro"
},
"dependencies": {
+ "@alpinejs/persist": "^3.10.4",
+ "@types/alpinejs": "^3.7.0",
+ "alpinejs": "^3.10.4",
"astro": "^1.1.6",
"astro-icon": "^0.7.3"
},
@@ -20,7 +23,7 @@
"@fontsource/montserrat": "^4.5.12",
"@tailwindcss/typography": "^0.5.7",
"prettier": "^2.7.1",
- "prettier-plugin-astro": "^0.5.4",
+ "prettier-plugin-astro": "^0.5.5",
"prettier-plugin-tailwindcss": "^0.1.13"
}
}
diff --git a/frontend/public/assets/favicon.ico b/frontend/public/favicon.ico
similarity index 100%
rename from frontend/public/assets/favicon.ico
rename to frontend/public/favicon.ico
diff --git a/frontend/public/assets/images/arrow.svg b/frontend/public/images/arrow.svg
similarity index 100%
rename from frontend/public/assets/images/arrow.svg
rename to frontend/public/images/arrow.svg
diff --git a/frontend/public/assets/images/delete.svg b/frontend/public/images/delete.svg
similarity index 100%
rename from frontend/public/assets/images/delete.svg
rename to frontend/public/images/delete.svg
diff --git a/frontend/public/assets/images/disabled-delete.svg b/frontend/public/images/disabled-delete.svg
similarity index 100%
rename from frontend/public/assets/images/disabled-delete.svg
rename to frontend/public/images/disabled-delete.svg
diff --git a/frontend/public/assets/images/discord.svg b/frontend/public/images/discord.svg
similarity index 100%
rename from frontend/public/assets/images/discord.svg
rename to frontend/public/images/discord.svg
diff --git a/frontend/public/assets/images/github.svg b/frontend/public/images/github.svg
similarity index 100%
rename from frontend/public/assets/images/github.svg
rename to frontend/public/images/github.svg
diff --git a/frontend/public/assets/images/globe.png b/frontend/public/images/globe.png
similarity index 100%
rename from frontend/public/assets/images/globe.png
rename to frontend/public/images/globe.png
diff --git a/frontend/public/assets/images/logo.svg b/frontend/public/images/logo.svg
similarity index 100%
rename from frontend/public/assets/images/logo.svg
rename to frontend/public/images/logo.svg
diff --git a/frontend/public/assets/images/logo16.png b/frontend/public/images/logo16.png
similarity index 100%
rename from frontend/public/assets/images/logo16.png
rename to frontend/public/images/logo16.png
diff --git a/frontend/public/assets/images/logo180.png b/frontend/public/images/logo180.png
similarity index 100%
rename from frontend/public/assets/images/logo180.png
rename to frontend/public/images/logo180.png
diff --git a/frontend/public/assets/images/logo32.png b/frontend/public/images/logo32.png
similarity index 100%
rename from frontend/public/assets/images/logo32.png
rename to frontend/public/images/logo32.png
diff --git a/frontend/public/assets/images/logo58.png b/frontend/public/images/logo58.png
similarity index 100%
rename from frontend/public/assets/images/logo58.png
rename to frontend/public/images/logo58.png
diff --git a/frontend/public/assets/images/search.svg b/frontend/public/images/search.svg
similarity index 100%
rename from frontend/public/assets/images/search.svg
rename to frontend/public/images/search.svg
diff --git a/frontend/public/opensearch.xml b/frontend/public/opensearch.xml
index a57a1435..87188067 100644
--- a/frontend/public/opensearch.xml
+++ b/frontend/public/opensearch.xml
@@ -2,8 +2,8 @@
<ShortName>Cuely</ShortName>
<Description>Open source search engine.</Description>
<InputEncoding>UTF-8</InputEncoding>
- <Image width="32" height="32" type="image/x-icon">https://cuely.io/assets/favicon.ico</Image>
+ <Image width="32" height="32" type="image/x-icon">https://cuely.io/favicon.ico</Image>
<Url rel="results" type="text/html" template="https://cuely.io/search?q={searchTerms}"/>
<Url rel="suggestions" type="application/x-suggestions+json" template="https://cuely.io/autosuggest/browser?q={searchTerms}"/>
<moz:SearchForm>https://cuely.io/</moz:SearchForm>
-</OpenSearchDescription>
\ No newline at end of file
+</OpenSearchDescription>
diff --git a/frontend/src/alpine.ts b/frontend/src/alpine.ts
new file mode 100644
index 00000000..1a2ccbf1
--- /dev/null
+++ b/frontend/src/alpine.ts
@@ -0,0 +1,9 @@
+import Alpine from "alpinejs";
+// @ts-ignore
+import persist from "@alpinejs/persist";
+
+Alpine.plugin(persist);
+
+// @ts-ignore
+window.Alpine = Alpine;
+Alpine.start();
diff --git a/frontend/src/components/GoggleSelector.astro b/frontend/src/components/GoggleSelector.astro
index 41e618df..fa57ea83 100644
--- a/frontend/src/components/GoggleSelector.astro
+++ b/frontend/src/components/GoggleSelector.astro
@@ -4,7 +4,7 @@ export interface Props {
default_goggles: string;
}
-import { askama } from "../askama";
+import { askama } from "$/askama";
---
<div class="h-full flex flex-col justify-center p-0 m-0">
@@ -14,6 +14,7 @@ import { askama } from "../askama";
name="goggle"
onchange="document.getElementById('searchbar-form').submit()"
class="p-0 m-0 hover:cursor-pointer bg-transparent text-sm border-0 max-w-[100px]"
+ x-data="{ items: $persist([]).as('goggles') }"
>
<option value="">Goggle</option>
{
@@ -35,27 +36,12 @@ import { askama } from "../askama";
})
)
}
+ <template x-for="item in items">
+ <option x-value="item.url" x-text="item.name"></option>
+ </template>
</select>
</div>
-<script is:inline>
- const gogglesSelector = document.querySelector("#goggles-selector");
- let goggles = JSON.parse(window.localStorage.getItem("goggles") || "[]");
-
- const params = new Proxy(new URLSearchParams(window.location.search), {
- get: (searchParams, prop) => searchParams.get(prop),
- });
-
- goggles.forEach((goggle) => {
- let node = document.createElement("option");
-
- if (goggle.url == params.goggle) {
- node.setAttribute("selected", "");
- }
-
- node.value = goggle.url;
- node.text = goggle.name;
-
- gogglesSelector.appendChild(node);
- });
+<script>
+ import "$/alpine";
</script>
diff --git a/frontend/src/components/Header.astro b/frontend/src/components/Header.astro
index f277400d..b3110d49 100644
--- a/frontend/src/components/Header.astro
+++ b/frontend/src/components/Header.astro
@@ -17,7 +17,7 @@ const { icon = true, searchbar } = Astro.props;
icon && (
<div class="col-start-1 mr-4 sm:mr-0">
<a href="/">
- <img src="/assets/images/logo.svg" class="h-full w-full" />
+ <img src="/images/logo.svg" class="h-full w-full" />
</a>
</div>
)
diff --git a/frontend/src/components/RankingModal.astro b/frontend/src/components/RankingModal.astro
index 2067a6c6..06b39866 100644
--- a/frontend/src/components/RankingModal.astro
+++ b/frontend/src/components/RankingModal.astro
@@ -1,106 +1,137 @@
-<div class="flex text-sm flex-col py-5 px-2 items-center h-fit w-52 overflow-hidden absolute border rounded-lg drop-shadow-md bg-white origin-left modal-closed" id="ranking-modal">
- <h2 class="w-fit text-center">
- Do you like results from <span id="ranking-modal-site-label">EXAMPLE.com</span>?
- </h2>
- <div class="flex flex-col w-fit pt-4 space-y-3">
- <button class="bg-white border rounded-full px-4 py-1 hover:bg-slate-600 hover:text-white" onclick="preferMore()" id="prefer-more">Prefer more</button>
- <button class="bg-white border rounded-full px-4 py-1 hover:bg-slate-600 hover:text-white" onclick="preferLess()" id="prefer-less">Prefer less</button>
- <button class="bg-white border rounded-full px-4 py-1 hover:bg-slate-600 hover:text-white" onclick="block()" id="prefer-block">Block</button>
- </div>
+<div
+ class="flex text-sm flex-col py-5 px-2 items-center h-fit w-52 overflow-hidden absolute border rounded-lg drop-shadow-md bg-white origin-left modal-closed"
+ id="ranking-modal"
+>
+ <h2 class="w-fit text-center">
+ Do you like results from <span id="ranking-modal-site-label">
+ EXAMPLE.com
+ </span>?
+ </h2>
+ <div class="flex flex-col w-fit pt-4 space-y-3">
+ <button
+ class="bg-white border rounded-full px-4 py-1 hover:bg-slate-600 hover:text-white"
+ onclick="preferMore()"
+ id="prefer-more"
+ >
+ Prefer more
+ </button>
+ <button
+ class="bg-white border rounded-full px-4 py-1 hover:bg-slate-600 hover:text-white"
+ onclick="preferLess()"
+ id="prefer-less"
+ >
+ Prefer less
+ </button>
+ <button
+ class="bg-white border rounded-full px-4 py-1 hover:bg-slate-600 hover:text-white"
+ onclick="block()"
+ id="prefer-block"
+ >
+ Block
+ </button>
+ </div>
</div>
<noscript>
- <style>
- #ranking-modal {
- visibility: hidden;
- }
- </style>
+ <style>
+ #ranking-modal {
+ visibility: hidden;
+ }
+ </style>
</noscript>
<style>
- #ranking-modal.modal-open {
- transition: transform .15s ease-in-out,left .15s ease-in-out,top .15s ease-in-out;
- transform: scale(1);
- }
-
- .selected {
- @apply bg-slate-600 text-white;
- }
-
- #ranking-modal.modal-closed{
- transition: none !important;
- transform: scale(0);
- }
+ #ranking-modal.modal-open {
+ transition: transform 0.15s ease-in-out, left 0.15s ease-in-out,
+ top 0.15s ease-in-out;
+ transform: scale(1);
+ }
+
+ .selected {
+ @apply bg-slate-600 text-white;
+ }
+
+ #ranking-modal.modal-closed {
+ transition: none !important;
+ transform: scale(0);
+ }
</style>
<script is:inline>
- var rankingModal = document.getElementById("ranking-modal");
- var siteLabel = document.getElementById("ranking-modal-site-label");
- var btnPreferMore = document.getElementById("prefer-more");
- var btnPreferLess = document.getElementById("prefer-less");
- var btnPreferBlock = document.getElementById("prefer-block");
-
- var currentSite = "";
-
- const BLOCKED = 0;
- const LESS = 1;
- const MORE = 2;
-
- let rankings = JSON.parse(window.localStorage.getItem("sites-ranking-adjustment") || "{}");
-
- rankingModal.addEventListener("click", (event) => {
- event.stopPropagation();
- });
-
- function updateModal(site) {
- siteLabel.innerHTML = site;
- currentSite = site;
-
- updateSelection();
+ var rankingModal = document.getElementById("ranking-modal");
+ var siteLabel = document.getElementById("ranking-modal-site-label");
+ var btnPreferMore = document.getElementById("prefer-more");
+ var btnPreferLess = document.getElementById("prefer-less");
+ var btnPreferBlock = document.getElementById("prefer-block");
+
+ var currentSite = "";
+
+ const BLOCKED = 0;
+ const LESS = 1;
+ const MORE = 2;
+
+ let rankings = JSON.parse(
+ window.localStorage.getItem("sites-ranking-adjustment") || "{}"
+ );
+
+ rankingModal.addEventListener("click", (event) => {
+ event.stopPropagation();
+ });
+
+ function updateModal(site) {
+ siteLabel.innerHTML = site;
+ currentSite = site;
+
+ updateSelection();
+ }
+
+ function updateSelection() {
+ let rankings = JSON.parse(
+ window.localStorage.getItem("sites-ranking-adjustment") || "{}"
+ );
+
+ btnPreferMore.classList.remove("selected");
+ btnPreferLess.classList.remove("selected");
+ btnPreferBlock.classList.remove("selected");
+
+ if (rankings[currentSite] != undefined) {
+ let pref = rankings[currentSite];
+
+ if (pref == MORE) {
+ btnPreferMore.classList.add("selected");
+ } else if (pref == LESS) {
+ btnPreferLess.classList.add("selected");
+ } else if (pref == BLOCKED) {
+ btnPreferBlock.classList.add("selected");
+ }
}
+ }
- function updateSelection() {
- let rankings = JSON.parse(window.localStorage.getItem("sites-ranking-adjustment") || "{}");
-
- btnPreferMore.classList.remove("selected");
- btnPreferLess.classList.remove("selected");
- btnPreferBlock.classList.remove("selected");
-
- if (rankings[currentSite] != undefined) {
- let pref = rankings[currentSite];
-
- if (pref == MORE) {
- btnPreferMore.classList.add("selected");
- } else if (pref == LESS) {
- btnPreferLess.classList.add("selected");
- } else if (pref == BLOCKED) {
- btnPreferBlock.classList.add("selected");
- }
- }
+ function setSitePreference(pref) {
+ if (rankings[currentSite] == pref) {
+ delete rankings[currentSite];
+ } else {
+ rankings[currentSite] = pref;
}
- function setSitePreference(pref) {
- if (rankings[currentSite] == pref) {
- delete rankings[currentSite];
- } else {
- rankings[currentSite] = pref;
- }
+ window.localStorage.setItem(
+ "sites-ranking-adjustment",
+ JSON.stringify(rankings)
+ );
- window.localStorage.setItem("sites-ranking-adjustment", JSON.stringify(rankings));
+ updateSelection();
+ document.getElementById("searchbar-form").submit();
+ }
- updateSelection();
- document.getElementById('searchbar-form').submit();
- }
+ function preferMore() {
+ setSitePreference(MORE);
+ }
- function preferMore() {
- setSitePreference(MORE);
- }
-
- function preferLess() {
- setSitePreference(LESS);
- }
+ function preferLess() {
+ setSitePreference(LESS);
+ }
- function block() {
- setSitePreference(BLOCKED);
- }
-</script>
\ No newline at end of file
+ function block() {
+ setSitePreference(BLOCKED);
+ }
+</script>
diff --git a/frontend/src/components/Searchbar.astro b/frontend/src/components/Searchbar.astro
index 1e7632d5..c2c0f291 100644
--- a/frontend/src/components/Searchbar.astro
+++ b/frontend/src/components/Searchbar.astro
@@ -74,21 +74,18 @@ const { autofocus, query } = Astro.props;
</div>
</div>
- <input
- type="hidden"
- value=""
- name="sr"
- id="siteRankingsUuid"
- />
+ <input type="hidden" value="" name="sr" id="siteRankingsUuid" />
</form>
<script>
const searchbar = document.querySelector("#searchbar")!;
- const searchbarForm: HTMLFormElement = document.querySelector("#searchbar-form")!;
- const siteRankingsUuid: HTMLInputElement = document.querySelector("#siteRankingsUuid")!;
+ const searchbarForm: HTMLFormElement =
+ document.querySelector("#searchbar-form")!;
+ const siteRankingsUuid: HTMLInputElement =
+ document.querySelector("#siteRankingsUuid")!;
const searchbarInput: HTMLInputElement =
document.querySelector(".searchbar-input")!;
-
+
let suggestionItems = () =>
Array.from(document.querySelectorAll(".suggestion-item")) as HTMLElement[];
@@ -113,7 +110,7 @@ const { autofocus, query } = Astro.props;
node.innerHTML = `
<div class="flex w-4 mr-3 items-center">
- <img class="h-5" loading="lazy" src="/assets/images/search.svg" />
+ <img class="h-5" loading="lazy" src="/images/search.svg" />
</div>
<div>
${item.highlighted}
@@ -264,34 +261,42 @@ const { autofocus, query } = Astro.props;
HTMLFormElement.prototype._submit = HTMLFormElement.prototype.submit;
- HTMLFormElement.prototype.submit = function (){
- this.dispatchEvent(new SubmitEvent('submit', {
- 'bubbles': true,
- 'cancelable': true
- }));
-
+ HTMLFormElement.prototype.submit = function () {
+ this.dispatchEvent(
+ new SubmitEvent("submit", {
+ bubbles: true,
+ cancelable: true,
+ })
+ );
+
this._submit();
};
- searchbarForm.addEventListener("submit", (event: Event) => {encodeSiteRankings()}, false);
+ searchbarForm.addEventListener("submit", () => encodeSiteRankings(), false);
function encodeSiteRankings() {
const BLOCKED = 0;
const LESS = 1;
const MORE = 2;
- let sites = JSON.parse(window.localStorage.getItem("sites-ranking-adjustment") || "{}");
+ let sites = JSON.parse(
+ window.localStorage.getItem("sites-ranking-adjustment") || "{}"
+ ) as Record<string, number>;
- let rankings = {"preferred": [], "disliked": [], "blocked": []};
+ let rankings = {
+ preferred: [] as string[],
+ disliked: [] as string[],
+ blocked: [] as string[],
+ };
for (const [site, ranking] of Object.entries(sites)) {
- if (ranking == MORE) {
- rankings.preferred.push(site);
- } else if (ranking == LESS) {
- rankings.disliked.push(site);
- } else if (ranking == BLOCKED) {
- rankings.blocked.push(site);
- }
+ if (ranking == MORE) {
+ rankings.preferred.push(site);
+ } else if (ranking == LESS) {
+ rankings.disliked.push(site);
+ } else if (ranking == BLOCKED) {
+ rankings.blocked.push(site);
+ }
}
let encoded = btoa(JSON.stringify(rankings));
diff --git a/frontend/src/layouts/Layout.astro b/frontend/src/layouts/Layout.astro
index de2229bc..360fca54 100644
--- a/frontend/src/layouts/Layout.astro
+++ b/frontend/src/layouts/Layout.astro
@@ -15,8 +15,13 @@ const { title } = Astro.props;
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- <link rel="icon" type="image/svg+xml" href="/favicon.svg" /> -->
- <link rel="icon" type="image/x-icon" href="/assets/favicon.ico" />
- <link rel="search" type="application/opensearchdescription+xml" title="Cuely Search" href="/opensearch.xml">
+ <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+ <link
+ rel="search"
+ type="application/opensearchdescription+xml"
+ title="Cuely Search"
+ href="/opensearch.xml"
+ />
<title>{title}</title>
</head>
<body class="font-light">
diff --git a/frontend/src/pages/goggles.astro b/frontend/src/pages/goggles.astro
deleted file mode 100644
index 8d478a69..00000000
--- a/frontend/src/pages/goggles.astro
+++ /dev/null
@@ -1,158 +0,0 @@
----
-import Footer from "../components/Footer.astro";
-import Layout from "../layouts/Layout.astro";
-import Header from "../components/Header.astro";
-import SettingsMenu from "../components/SettingsMenu.astro";
-import { askama } from "../askama";
----
-
-<Layout title="Cuely">
- <div class="flex flex-col h-full w-full">
- <Header/>
-
- <div class="flex w-full h-fit justify-center pt-10">
- <SettingsMenu />
- <div class="flex flex-col max-w-2xl">
- <h1 class="font-medium text-2xl">Manage Goggles</h1>
- <div class="text-sm mt-5">
- Goggles lets you control almost everything about which
- search results that gets returned to you. You can discard
- results from specific sites, boost results from other sites
- and much more.
- </div>
- <div class="text-sm mt-3">
- See our <a
- href="https://github.com/Cuely/sample-goggles/blob/main/quickstart.goggle"
- >quickstart</a
- > for how to get started. Once you have developed your goggle,
- you can add it here to be used during your search.
- </div>
- <div class="text-sm mt-3">
- Simply host the goggle on a url that returns a plain-text
- HTTP response with the goggle. We use
- raw.githubusercontent.com, but you are free to host them
- elsewhere.
- </div>
- <div class="mt-16">
- <div class="w-full flex justify-between pl-5 pr-5">
- <input id="name" type="text" placeholder="Name" />
- <input id="url" type="text" placeholder="Url" />
- <button
- id="add-btn"
- class="bg-brand text-white rounded-full w-20 h-10 border-0 text-sm"
- >Add</button
- >
- </div>
- <div class="mt-5">
- <div
- class="grid grid-cols-[auto_1fr_1fr] w-full space-y-5"
- id="goggles-list"
- >
- <div class="w-10"></div>
- <div class="font-medium">Name</div>
- <div class="font-medium">Url</div>
- {
- askama.for_("goggle in default_goggles", () => (
- <>
- <div class="w-5">
- <img
- src="/assets/images/disabled-delete.svg"
- class="h-5 w-5"
- />
- </div>
- <div class="text-sm">{askama`goggle.name $ {{random.words}}`}</div>
- <div class="text-sm">{askama`goggle.url $ {{internet.url}}`}</div>
- </>
- ))
- }
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="flex flex-grow"></div>
- <Footer />
- </div>
-</Layout>
-
-<script is:inline>
- const addBtn = document.querySelector("#add-btn");
- const nameInput = document.querySelector("#name");
- const gogglesList = document.querySelector("#goggles-list");
- const urlInput = document.querySelector("#url");
-
- nameInput.addEventListener("keypress", function (event) {
- if (event.key === "Enter") {
- event.preventDefault();
- addBtn.click();
- }
- });
-
- urlInput.addEventListener("keypress", function (event) {
- if (event.key === "Enter") {
- event.preventDefault();
- addBtn.click();
- }
- });
-
- let goggles = JSON.parse(window.localStorage.getItem("goggles") || "[]");
-
- function updateList() {
- goggles = JSON.parse(window.localStorage.getItem("goggles") || "[]");
-
- document
- .querySelectorAll(".user-goggle")
- .forEach((goggle) => goggle.remove());
-
- goggles.forEach((goggle, i) => {
- let img = document.createElement("div");
- img.classList.add("user-goggle");
-
- img.innerHTML =
- '<img src="/assets/images/delete.svg" class="w-5 h-5 hover:cursor-pointer" id="' +
- i +
- '" onclick="deleteRow(this)"/>';
-
- let name = document.createElement("div");
- name.innerHTML = goggle.name;
- name.classList.add("user-goggle");
- name.classList.add("text-sm");
-
- let url = document.createElement("div");
- url.innerHTML = goggle.url;
- url.classList.add("user-goggle");
- url.classList.add("text-sm");
-
- gogglesList.appendChild(img);
- gogglesList.appendChild(name);
- gogglesList.appendChild(url);
- });
- }
-
- function deleteRow(deleteBtn) {
- let row = deleteBtn.id;
-
- goggles = JSON.parse(window.localStorage.getItem("goggles") || "[]");
- goggles.splice(row, 1);
- window.localStorage.setItem("goggles", JSON.stringify(goggles));
-
- updateList();
- }
-
- updateList();
-
- function add() {
- if (nameInput.value == "" || urlInput.value == "") {
- return; // TODO: give some kind of feedback to the user
- }
-
- goggles.push({ name: nameInput.value, url: urlInput.value });
- window.localStorage.setItem("goggles", JSON.stringify(goggles));
- updateList();
-
- nameInput.value = "";
- urlInput.value = "";
- }
-
- addBtn.addEventListener("click", add);
-</script>
diff --git a/frontend/src/pages/settings/index.astro b/frontend/src/pages/settings/index.astro
new file mode 100644
index 00000000..289bb8ef
--- /dev/null
+++ b/frontend/src/pages/settings/index.astro
@@ -0,0 +1,92 @@
+---
+import Footer from "../../components/Footer.astro";
+import Layout from "../../layouts/Layout.astro";
+import Header from "../../components/Header.astro";
+import SettingsMenu from "../../components/SettingsMenu.astro";
+import { askama } from "../../askama";
+---
+
+<Layout title="Cuely">
+ <div class="flex flex-col h-full w-full">
+ <Header />
+
+ <div class="flex w-full h-fit justify-center pt-10">
+ <SettingsMenu />
+ <div class="flex flex-col max-w-2xl">
+ <h1 class="font-medium text-2xl">Manage Goggles</h1>
+ <div class="text-sm mt-5">
+ Goggles lets you control almost everything about which search results
+ that gets returned to you. You can discard results from specific
+ sites, boost results from other sites and much more.
+ </div>
+ <div class="text-sm mt-3">
+ See our <a
+ href="https://github.com/Cuely/sample-goggles/blob/main/quickstart.goggle"
+ >quickstart</a
+ > for how to get started. Once you have developed your goggle, you can
+ add it here to be used during your search.
+ </div>
+ <div class="text-sm mt-3">
+ Simply host the goggle on a url that returns a plain-text HTTP
+ response with the goggle. We use raw.githubusercontent.com, but you
+ are free to host them elsewhere.
+ </div>
+ <div
+ class="mt-16"
+ x-data="{ items: $persist([]).as('goggles'), name: '', url: '' }"
+ >
+ <div class="w-full flex justify-between pl-5 pr-5">
+ <input id="name" type="text" placeholder="Name" x-model="name" />
+ <input id="url" type="text" placeholder="Url" x-model="url" />
+ <button
+ x-on:click="items.push({ name, url }); name = url = ''"
+ class="bg-brand text-white rounded-full w-20 h-10 border-0 text-sm"
+ >Add</button
+ >
+ </div>
+ <div class="mt-5">
+ <div class="grid w-full space-y-5" id="goggles-list">
+ <div class="flex">
+ <div class="w-10"></div>
+ <div class="font-medium flex-1">Name</div>
+ <div class="font-medium flex-1">Url</div>
+ </div>
+ {
+ askama.for_("goggle in default_goggles", () => (
+ <div class="flex">
+ <div class="mr-5 w-5">
+ <img src="/images/disabled-delete.svg" class="h-5 w-5" />
+ </div>
+ <div class="flex-1 text-sm">{askama`goggle.name $ {{random.words}}`}</div>
+ <div class="flex-1 text-sm">{askama`goggle.url $ {{internet.url}}`}</div>
+ </div>
+ ))
+ }
+ <template x-for="(item, index) in items">
+ <div class="flex">
+ <div class="w-10">
+ <img
+ src="/images/delete.svg"
+ class="w-5 h-5 hover:cursor-pointer"
+ x-on:click="items.splice(index, 1)"
+ />
+ </div>
+ <div class="user-goggle flex-1 text-sm" x-text="item.name">
+ </div>
+ <div class="user-goggle flex-1 text-sm" x-text="item.url">
+ </div>
+ </div>
+ </template>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="flex flex-grow"></div>
+ <Footer />
+ </div>
+</Layout>
+
+<script>
+ import "$/alpine";
+</script>
diff --git a/frontend/src/pages/settings/sites.astro b/frontend/src/pages/settings/sites.astro
new file mode 100644
index 00000000..c9b6dadf
--- /dev/null
+++ b/frontend/src/pages/settings/sites.astro
@@ -0,0 +1,155 @@
+---
+import Footer from "../../components/Footer.astro";
+import Layout from "../../layouts/Layout.astro";
+import Header from "../../components/Header.astro";
+import SettingsMenu from "../../components/SettingsMenu.astro";
+---
+
+<Layout title="Cuely">
+ <div class="flex flex-col h-full w-full">
+ <Header />
+
+ <div class="flex w-full h-fit justify-center pt-10">
+ <SettingsMenu />
+ <div class="flex w-full flex-col max-w-2xl space-y-10">
+ <div>
+ <h1 class="font-medium text-2xl mb-2">Preffered Sites</h1>
+ <div class="text-sm">
+ These sites receive a boost during search. Results from these sites
+ are more likely to appear in your search results.
+ </div>
+ <div class="mt-5">
+ <div
+ class="grid grid-cols-[auto_1fr] w-full space-y-5"
+ id="preffered-list"
+ >
+ <div class="w-10"></div>
+ <div class="font-medium">Site Name</div>
+ </div>
+ </div>
+ </div>
+
+ <div>
+ <h1 class="font-medium text-2xl mb-2">Junk Sites</h1>
+ <div class="text-sm">
+ These sites get de-prioritized during search. Results from these
+ sites are less likely to appear in your search results.
+ </div>
+ <div class="mt-5">
+ <div
+ class="grid grid-cols-[auto_1fr] w-full space-y-5"
+ id="junk-list"
+ >
+ <div class="w-10"></div>
+ <div class="font-medium">Site Name</div>
+ </div>
+ </div>
+ </div>
+
+ <div>
+ <h1 class="font-medium text-2xl mb-2">Blocked Sites</h1>
+ <div class="text-sm">
+ These are the sites you have blocked. They won't appear in any of
+ your searches.
+ </div>
+ <div class="mt-5">
+ <div
+ class="grid grid-cols-[auto_1fr] w-full space-y-5"
+ id="blocked-list"
+ >
+ <div class="w-10"></div>
+ <div class="font-medium">Site Name</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="flex flex-grow"></div>
+ <Footer />
+ </div>
+</Layout>
+
+<script is:inline>
+ let sites = JSON.parse(
+ window.localStorage.getItem("sites-ranking-adjustment") || "{}"
+ );
+
+ const prefferedList = document.getElementById("preffered-list");
+ const junkList = document.getElementById("junk-list");
+ const blockedList = document.getElementById("blocked-list");
+
+ const BLOCKED = 0;
+ const LESS = 1;
+ const MORE = 2;
+
+ function addMoreRow(site) {
+ addRow(site, prefferedList);
+ }
+
+ function addLessRow(site) {
+ addRow(site, junkList);
+ }
+
+ function addBlockedRow(site) {
+ addRow(site, blockedList);
+ }
+
+ function addRow(site, list) {
+ let img = document.createElement("div");
+ img.classList.add("site");
+
+ img.innerHTML =
+ '<img src="/images/delete.svg" class="w-5 h-5 hover:cursor-pointer" onclick="deleteRow(this)" id="' +
+ site +
+ '"/>';
+
+ let name = document.createElement("div");
+ name.innerHTML = site;
+ name.classList.add("site");
+ name.classList.add("text-sm");
+
+ list.appendChild(img);
+ list.appendChild(name);
+ }
+
+ function updateList() {
+ sites = JSON.parse(
+ window.localStorage.getItem("sites-ranking-adjustment") || "{}"
+ );
+
+ clearList();
+
+ for (const [site, ranking] of Object.entries(sites)) {
+ if (ranking == MORE) {
+ addMoreRow(site);
+ } else if (ranking == LESS) {
+ addLessRow(site);
+ } else if (ranking == BLOCKED) {
+ addBlockedRow(site);
+ }
+ }
+ }
+
+ function clearList() {
+ document.querySelectorAll(".site").forEach((site) => site.remove());
+ }
+
+ function deleteRow(deleteBtn) {
+ let site = deleteBtn.id;
+ sites = JSON.parse(
+ window.localStorage.getItem("sites-ranking-adjustment") || "{}"
+ );
+
+ if (sites[site] != undefined) {
+ delete sites[site];
+ window.localStorage.setItem(
+ "sites-ranking-adjustment",
+ JSON.stringify(sites)
+ );
+ }
+
+ updateList();
+ }
+
+ updateList();
+</script>
diff --git a/frontend/src/pages/sites.astro b/frontend/src/pages/sites.astro
deleted file mode 100644
index 3aceecfa..00000000
--- a/frontend/src/pages/sites.astro
+++ /dev/null
@@ -1,144 +0,0 @@
----
-import Footer from "../components/Footer.astro";
-import Layout from "../layouts/Layout.astro";
-import Header from "../components/Header.astro";
-import SettingsMenu from "../components/SettingsMenu.astro";
----
-
-<Layout title="Cuely">
- <div class="flex flex-col h-full w-full">
- <Header />
-
- <div class="flex w-full h-fit justify-center pt-10">
- <SettingsMenu />
- <div class="flex w-full flex-col max-w-2xl space-y-10">
- <div>
- <h1 class="font-medium text-2xl mb-2">Preffered Sites</h1>
- <div class="text-sm">
- These sites receive a boost during search.
- Results from these sites are more likely to appear in your search results.
- </div>
- <div class="mt-5">
- <div
- class="grid grid-cols-[auto_1fr] w-full space-y-5"
- id="preffered-list"
- >
- <div class="w-10"></div>
- <div class="font-medium">Site Name</div>
- </div>
- </div>
- </div>
-
- <div>
- <h1 class="font-medium text-2xl mb-2">Junk Sites</h1>
- <div class="text-sm">
- These sites get de-prioritized during search.
- Results from these sites are less likely to appear in your search results.
- </div>
- <div class="mt-5">
- <div
- class="grid grid-cols-[auto_1fr] w-full space-y-5"
- id="junk-list"
- >
- <div class="w-10"></div>
- <div class="font-medium">Site Name</div>
- </div>
- </div>
- </div>
-
- <div>
- <h1 class="font-medium text-2xl mb-2">Blocked Sites</h1>
- <div class="text-sm">These are the sites you have blocked. They won't appear in any of your searches.</div>
- <div class="mt-5">
- <div
- class="grid grid-cols-[auto_1fr] w-full space-y-5"
- id="blocked-list"
- >
- <div class="w-10"></div>
- <div class="font-medium">Site Name</div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="flex flex-grow"></div>
- <Footer />
- </div>
-</Layout>
-
-<script is:inline>
- let sites = JSON.parse(window.localStorage.getItem("sites-ranking-adjustment") || "{}");
-
- const prefferedList = document.getElementById("preffered-list");
- const junkList = document.getElementById("junk-list");
- const blockedList = document.getElementById("blocked-list");
-
- const BLOCKED = 0;
- const LESS = 1;
- const MORE = 2;
-
- function addMoreRow(site) {
- addRow(site, prefferedList);
- }
-
- function addLessRow(site) {
- addRow(site,junkList);
- }
-
- function addBlockedRow(site) {
- addRow(site,blockedList);
- }
-
- function addRow(site, list) {
- let img = document.createElement("div");
- img.classList.add("site");
-
- img.innerHTML =
- '<img src="/assets/images/delete.svg" class="w-5 h-5 hover:cursor-pointer" onclick="deleteRow(this)" id="' + site + '"/>';
-
- let name = document.createElement("div");
- name.innerHTML = site;
- name.classList.add("site");
- name.classList.add("text-sm");
-
- list.appendChild(img);
- list.appendChild(name);
- }
-
-
- function updateList() {
- sites = JSON.parse(window.localStorage.getItem("sites-ranking-adjustment") || "{}");
-
- clearList();
-
- for (const [site, ranking] of Object.entries(sites)) {
- if (ranking == MORE) {
- addMoreRow(site);
- } else if (ranking == LESS) {
- addLessRow(site);
- } else if (ranking == BLOCKED) {
- addBlockedRow(site);
- }
- }
- }
-
- function clearList() {
- document
- .querySelectorAll(".site")
- .forEach((site) => site.remove());
- }
-
- function deleteRow(deleteBtn) {
- let site = deleteBtn.id;
- sites = JSON.parse(window.localStorage.getItem("sites-ranking-adjustment") || "{}");
-
- if (sites[site] != undefined) {
- delete sites[site];
- window.localStorage.setItem("sites-ranking-adjustment", JSON.stringify(sites));
- }
-
- updateList();
- }
-
- updateList();
-</script>
\ No newline at end of file
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 77da9dd0..58652a61 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -1,3 +1,8 @@
{
- "extends": "astro/tsconfigs/strict"
-}
\ No newline at end of file
+ "extends": "astro/tsconfigs/strict",
+ "compilerOptions": {
+ "paths": {
+ "$/*": ["./src/*"]
+ }
+ }
+}
diff --git a/src/frontend/goggles.rs b/src/frontend/goggles.rs
index 0cbb50b2..c72a3c02 100644
--- a/src/frontend/goggles.rs
+++ b/src/frontend/goggles.rs
@@ -44,7 +44,7 @@ pub async fn route() -> impl IntoResponse {
}
#[derive(Template)]
-#[template(path = "goggles/index.html")]
+#[template(path = "settings/index.html")]
struct GogglesTemplate {
default_goggles: Vec<GoggleLink>,
}
diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index e788e457..8f46b690 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
-use axum::{body::Body, Extension, Router};
-use tower_http::compression::CompressionLayer;
+use axum::{body::Body, routing::get_service, Extension, Router};
+use tower_http::{compression::CompressionLayer, services::ServeDir};
use crate::{
autosuggest::Autosuggest,
@@ -30,7 +30,6 @@ use axum::{
response::{Html, IntoResponse, Response},
routing::get,
};
-use axum_extra::routing::SpaRouter;
mod about;
mod api;
@@ -70,7 +69,7 @@ pub async fn favicon() -> impl IntoResponse {
Response::builder()
.status(StatusCode::OK)
.body(Body::from(
- include_bytes!("../../frontend/dist/assets/favicon.ico").to_vec(),
+ include_bytes!("../../frontend/dist/favicon.ico").to_vec(),
))
.unwrap()
}
@@ -103,7 +102,14 @@ pub fn router(queries_csv_path: &str, shards: Vec<Vec<String>>) -> Result<Router
.route("/privacy-and-happy-lawyers", get(privacy::route))
.route("/api/beta/search", get(api::search))
.route("/opensearch.xml", get(opensearch::route))
- .merge(SpaRouter::new("/assets", "frontend/dist/assets"))
+ .fallback(get_service(ServeDir::new("frontend/dist/")).handle_error(
+ |error: std::io::Error| async move {
+ (
+ StatusCode::INTERNAL_SERVER_ERROR,
+ format!("Unhandled internal error: {}", error),
+ )
+ },
+ ))
.layer(Extension(state))
.layer(CompressionLayer::new()))
}
diff --git a/src/frontend/sites.rs b/src/frontend/sites.rs
index 5cfc3351..7b3fa5c5 100644
--- a/src/frontend/sites.rs
+++ b/src/frontend/sites.rs
@@ -26,5 +26,5 @@ pub async fn route() -> impl IntoResponse {
}
#[derive(Template)]
-#[template(path = "sites/index.html")]
+#[template(path = "settings/sites/index.html")]
struct SitesTemplate {}
diff --git a/src/search_prettifier.rs b/src/search_prettifier.rs
index 67b0654d..af287bc3 100644
--- a/src/search_prettifier.rs
+++ b/src/search_prettifier.rs
@@ -147,7 +147,7 @@ impl From<RetrievedWebpage> for DisplayedWebpage {
let favicon_bytes = webpage
.favicon
.map(|favicon| favicon.as_raw_bytes())
- .unwrap_or_else(|| include_bytes!("../frontend/dist/assets/images/globe.png").to_vec());
+ .unwrap_or_else(|| include_bytes!("../frontend/dist/images/globe.png").to_vec());
Self {
title,