Use relative links instead of absolute (#139)

* Use relative links instead of absolute This allows for hosting under a subpath. For example if you want to host whoogle at example.com/whoogle, it should work better with a reverse proxy. * Use relative link for opensearch.xml
4 years ago · 1148a7fb8d
parent 933ce7e068
commit 1148a7fb8d
6 changed files with 43 additions and 43 deletions
--- a/app/filter.py
+++ b/app/filter.py
@ -107,14 +107,14 @@ class Filter:
            element_src = 'https:' + element_src
        elif element_src.startswith(LOGO_URL):
            # Re-brand with Whoogle logo
-            element['src'] = '/static/img/logo.png'
+            element['src'] = 'static/img/logo.png'
            element['style'] = 'height:40px;width:162px'
            return
        elif element_src.startswith(GOOG_IMG):
            element['src'] = BLANK_B64
            return

-        element['src'] = '/element?url=' + self.encrypt_path(element_src, is_element=True) + \
+        element['src'] = 'element?url=' + self.encrypt_path(element_src, is_element=True) + \
                         '&type=' + urlparse.quote(mime)
        # TODO: Non-mobile image results link to website instead of image
        # if not self.mobile:
@ -145,7 +145,7 @@ class Filter:
    def update_link(self, link):
        # Replace href with only the intended destination (no "utm" type tags)
        href = link['href'].replace('https://www.google.com', '')
-        if '/advanced_search' in href or 'tbm=shop' in href:
+        if 'advanced_search' in href or 'tbm=shop' in href:
            # TODO: The "Shopping" tab requires further filtering (see #136)
            # Temporarily removing all links to that tab for now.
            link.decompose()
@ -163,7 +163,7 @@ class Filter:
            # "li:1" implies the query should be interpreted verbatim, so we wrap it in double quotes
            if 'li:1' in href:
                query_link = '"' + query_link + '"'
-            new_search = '/search?q=' + self.encrypt_path(query_link)
+            new_search = 'search?q=' + self.encrypt_path(query_link)

            query_params = parse_qs(urlparse.urlparse(href).query)
            for param in VALID_PARAMS:
--- a/app/static/js/autocomplete.js
+++ b/app/static/js/autocomplete.js
@ -1,6 +1,6 @@
 const handleUserInput = searchBar => {
    let xhrRequest = new XMLHttpRequest();
-    xhrRequest.open("POST", "/autocomplete");
+    xhrRequest.open("POST", "autocomplete");
    xhrRequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
    xhrRequest.onload = function () {
        if (xhrRequest.readyState === 4 && xhrRequest.status !== 200) {
@ -123,4 +123,4 @@ const autocomplete = (searchInput, autocompleteResults) => {
    document.addEventListener("click", function (e) {
        closeAllLists(e.target);
    });
-};
+};
--- a/app/static/js/controller.js
+++ b/app/static/js/controller.js
@ -31,7 +31,7 @@ const setupSearchLayout = () => {
 const fillConfigValues = () => {
    // Request existing config info
    let xhrGET = new XMLHttpRequest();
-    xhrGET.open("GET", "/config");
+    xhrGET.open("GET", "config");
    xhrGET.onload = function() {
        if (xhrGET.readyState === 4 && xhrGET.status !== 200) {
            alert("Error loading Whoogle config");
@ -82,7 +82,7 @@ const loadConfig = event => {
    }

    let xhrPUT = new XMLHttpRequest();
-    xhrPUT.open("PUT", "/config?name=" + config + ".conf");
+    xhrPUT.open("PUT", "config?name=" + config + ".conf");
    xhrPUT.onload = function() {
        if (xhrPUT.readyState === 4 && xhrPUT.status !== 200) {
            alert("Error loading Whoogle config");
@ -104,7 +104,7 @@ const saveConfig = event => {
    }

    let configForm = document.getElementById("config-form");
-    configForm.action = '/config?name=' + config + ".conf";
+    configForm.action = 'config?name=' + config + ".conf";
    configForm.submit();
 };

--- a/app/templates/display.html
+++ b/app/templates/display.html
@ -1,15 +1,15 @@
 <html>
    <head>
-        <link rel="shortcut icon" href="/static/img/favicon.ico" type="image/x-icon">
-        <link rel="icon" href="/static/img/favicon.ico" type="image/x-icon">
-        <link rel="search" href="/opensearch.xml" type="application/opensearchdescription+xml" title="Whoogle Search">
+        <link rel="shortcut icon" href="static/img/favicon.ico" type="image/x-icon">
+        <link rel="icon" href="static/img/favicon.ico" type="image/x-icon">
+        <link rel="search" href="opensearch.xml" type="application/opensearchdescription+xml" title="Whoogle Search">
        <meta name="viewport" content="width=device-width, initial-scale=1.0">
        <meta name="referrer" content="no-referrer">
-        <script type="text/javascript" src="/static/js/autocomplete.js"></script>
-        <link rel="stylesheet" href="/static/css/{{ 'search-dark' if dark_mode else 'search' }}.css">
-        <link rel="stylesheet" href="/static/css/header.css">
+        <script type="text/javascript" src="static/js/autocomplete.js"></script>
+        <link rel="stylesheet" href="static/css/{{ 'search-dark' if dark_mode else 'search' }}.css">
+        <link rel="stylesheet" href="static/css/header.css">
        {% if dark_mode %}
-            <link rel="stylesheet" href="/static/css/dark-theme.css"/>
+            <link rel="stylesheet" href="static/css/dark-theme.css"/>
        {% endif %}
        <title>{{ query }} - Whoogle Search</title>
    </head>
--- a/app/templates/header.html
+++ b/app/templates/header.html
@ -3,7 +3,7 @@
        <div class="bz1lBb">
            <form class="Pg70bf" id="search-form" method="POST">
                <a class="logo-link mobile-logo"
-                   href="/"
+                   href=""
                   style="display:flex; justify-content:center; align-items:center; color:#685e79; font-size:18px; ">
                    <span style="color: #685e79">Whoogle</span>
                </a>
@ -24,7 +24,7 @@
 {% else %}
    <header>
        <div class="logo-div">
-            <a class="logo-link" href="/">
+            <a class="logo-link" href="">
                <span style="color: #685e79">Whoogle</span>
            </a>
        </div>
@ -56,4 +56,4 @@
            document.getElementById("search-form").submit();
        }
    });
-</script>
+</script>
--- a/app/templates/index.html
+++ b/app/templates/index.html
@ -1,30 +1,30 @@
 <html>
    <head>
-        <link rel="apple-touch-icon" sizes="57x57" href="/static/img/favicon/apple-icon-57x57.png">
-        <link rel="apple-touch-icon" sizes="60x60" href="/static/img/favicon/apple-icon-60x60.png">
-        <link rel="apple-touch-icon" sizes="72x72" href="/static/img/favicon/apple-icon-72x72.png">
-        <link rel="apple-touch-icon" sizes="76x76" href="/static/img/favicon/apple-icon-76x76.png">
-        <link rel="apple-touch-icon" sizes="114x114" href="/static/img/favicon/apple-icon-114x114.png">
-        <link rel="apple-touch-icon" sizes="120x120" href="/static/img/favicon/apple-icon-120x120.png">
-        <link rel="apple-touch-icon" sizes="144x144" href="/static/img/favicon/apple-icon-144x144.png">
-        <link rel="apple-touch-icon" sizes="152x152" href="/static/img/favicon/apple-icon-152x152.png">
-        <link rel="apple-touch-icon" sizes="180x180" href="/static/img/favicon/apple-icon-180x180.png">
-        <link rel="icon" type="image/png" sizes="192x192"  href="/static/img/favicon/android-icon-192x192.png">
-        <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon/favicon-32x32.png">
-        <link rel="icon" type="image/png" sizes="96x96" href="/static/img/favicon/favicon-96x96.png">
-        <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon/favicon-16x16.png">
-        <link rel="manifest" href="/static/img/favicon/manifest.json">
+        <link rel="apple-touch-icon" sizes="57x57" href="static/img/favicon/apple-icon-57x57.png">
+        <link rel="apple-touch-icon" sizes="60x60" href="static/img/favicon/apple-icon-60x60.png">
+        <link rel="apple-touch-icon" sizes="72x72" href="static/img/favicon/apple-icon-72x72.png">
+        <link rel="apple-touch-icon" sizes="76x76" href="static/img/favicon/apple-icon-76x76.png">
+        <link rel="apple-touch-icon" sizes="114x114" href="static/img/favicon/apple-icon-114x114.png">
+        <link rel="apple-touch-icon" sizes="120x120" href="static/img/favicon/apple-icon-120x120.png">
+        <link rel="apple-touch-icon" sizes="144x144" href="static/img/favicon/apple-icon-144x144.png">
+        <link rel="apple-touch-icon" sizes="152x152" href="static/img/favicon/apple-icon-152x152.png">
+        <link rel="apple-touch-icon" sizes="180x180" href="static/img/favicon/apple-icon-180x180.png">
+        <link rel="icon" type="image/png" sizes="192x192"  href="static/img/favicon/android-icon-192x192.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="96x96" href="static/img/favicon/favicon-96x96.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon/favicon-16x16.png">
+        <link rel="manifest" href="static/img/favicon/manifest.json">
        <meta name="referrer" content="no-referrer">
        <meta name="msapplication-TileColor" content="#ffffff">
-        <meta name="msapplication-TileImage" content="/static/img/favicon/ms-icon-144x144.png">
-        <script type="text/javascript" src="/static/js/autocomplete.js"></script>
-        <script type="text/javascript" src="/static/js/controller.js"></script>
-        <link rel="search" href="/opensearch.xml" type="application/opensearchdescription+xml" title="Whoogle Search">
+        <meta name="msapplication-TileImage" content="static/img/favicon/ms-icon-144x144.png">
+        <script type="text/javascript" src="static/js/autocomplete.js"></script>
+        <script type="text/javascript" src="static/js/controller.js"></script>
+        <link rel="search" href="opensearch.xml" type="application/opensearchdescription+xml" title="Whoogle Search">
        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <link rel="stylesheet" href="/static/css/{{ 'search-dark' if config.dark else 'search' }}.css">
-        <link rel="stylesheet" href="/static/css/main.css">
+        <link rel="stylesheet" href="static/css/{{ 'search-dark' if config.dark else 'search' }}.css">
+        <link rel="stylesheet" href="static/css/main.css">
        {% if config.dark %}
-            <link rel="stylesheet" href="/static/css/dark-theme.css"/>
+            <link rel="stylesheet" href="static/css/dark-theme.css"/>
        {% endif %}
 	<title>Whoogle Search</title>
    </head>
@ -36,8 +36,8 @@
        {% endif %}
    </script>
        <div class="search-container">
-            <img class="logo" src="/static/img/logo.png">
-            <form id="search-form" action="/search" method="{{ 'get' if config.get_only else 'post' }}">
+            <img class="logo" src="static/img/logo.png">
+            <form id="search-form" action="search" method="{{ 'get' if config.get_only else 'post' }}">
                <div class="search-fields">
                    <div class="autocomplete">
                        <input type="text" name="q" id="search-bar" autofocus="autofocus" autocomplete="off">
@ -49,7 +49,7 @@
            <button id="config-collapsible" class="collapsible">Configuration</button>
            <div class="content">
                <div class="config-fields">
-                    <form id="config-form" action="/config" method="post">
+                    <form id="config-form" action="config" method="post">
                        <div class="config-div">
                            <label for="config-ctry">Filter Results by Country: </label>
                            <select name="ctry" id="config-ctry">