diff --git a/client/public/apple-touch-icon-180x180.png b/client/public/assets/apple-touch-icon-180x180.png
similarity index 100%
rename from client/public/apple-touch-icon-180x180.png
rename to client/public/assets/apple-touch-icon-180x180.png
diff --git a/client/public/favicon.png b/client/public/assets/favicon.png
similarity index 100%
rename from client/public/favicon.png
rename to client/public/assets/favicon.png
diff --git a/client/public/safari-pinned-tab.svg b/client/public/assets/safari-pinned-tab.svg
similarity index 100%
rename from client/public/safari-pinned-tab.svg
rename to client/public/assets/safari-pinned-tab.svg
diff --git a/client/public/index.html b/client/public/index.html
index 8bd0eaf6..ecf811ec 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -6,9 +6,9 @@
<meta name="theme-color" content="#000000">
<meta name="google" content="notranslate">
<meta http-equiv="x-dns-prefetch-control" content="off">
- <link rel="apple-touch-icon" sizes="180x180" href="./apple-touch-icon-180x180.png" />
- <link rel="mask-icon" href="./safari-pinned-tab.svg" color="#5bbad5">
- <link rel="icon" type="image/png" href="favicon.png" sizes="48x48">
+ <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
+ <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#5bbad5">
+ <link rel="icon" type="image/png" href="assets/favicon.png" sizes="48x48">
<title>AdGuard Home</title>
</head>
<body>
diff --git a/client/public/install.html b/client/public/install.html
index 51858294..3a09704c 100644
--- a/client/public/install.html
+++ b/client/public/install.html
@@ -5,9 +5,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<meta name="google" content="notranslate">
- <link rel="apple-touch-icon" sizes="180x180" href="./apple-touch-icon-180x180.png" />
- <link rel="mask-icon" href="./safari-pinned-tab.svg" color="#5bbad5">
- <link rel="icon" type="image/png" href="favicon.png" sizes="48x48">
+ <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
+ <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#5bbad5">
+ <link rel="icon" type="image/png" href="assets/favicon.png" sizes="48x48">
<title>Setup AdGuard Home</title>
</head>
<body>
diff --git a/client/public/login.html b/client/public/login.html
index 7e45e484..9f06fc03 100644
--- a/client/public/login.html
+++ b/client/public/login.html
@@ -5,9 +5,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<meta name="google" content="notranslate">
- <link rel="apple-touch-icon" sizes="180x180" href="./apple-touch-icon-180x180.png" />
- <link rel="mask-icon" href="./safari-pinned-tab.svg" color="#5bbad5">
- <link rel="icon" type="image/png" href="favicon.png" sizes="48x48">
+ <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
+ <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#5bbad5">
+ <link rel="icon" type="image/png" href="assets/favicon.png" sizes="48x48">
<title>Login</title>
</head>
<body>
diff --git a/client/webpack.common.js b/client/webpack.common.js
index 99b6dbae..f4f0bae4 100644
--- a/client/webpack.common.js
+++ b/client/webpack.common.js
@@ -14,9 +14,10 @@ const ENTRY_LOGIN = path.resolve(RESOURCES_PATH, 'src/login/index.js');
const HTML_PATH = path.resolve(RESOURCES_PATH, 'public/index.html');
const HTML_INSTALL_PATH = path.resolve(RESOURCES_PATH, 'public/install.html');
const HTML_LOGIN_PATH = path.resolve(RESOURCES_PATH, 'public/login.html');
-const FAVICON_PATH = path.resolve(RESOURCES_PATH, 'public/favicon.png');
+const ASSETS_PATH = path.resolve(RESOURCES_PATH, 'public/assets');
const PUBLIC_PATH = path.resolve(__dirname, '../build/static');
+const PUBLIC_ASSETS_PATH = path.resolve(PUBLIC_PATH, 'assets');
const config = {
target: 'web',
@@ -134,7 +135,7 @@ const config = {
filename: '[name].[contenthash].css',
}),
new CopyPlugin([
- { from: FAVICON_PATH, to: PUBLIC_PATH },
+ { from: ASSETS_PATH, to: PUBLIC_ASSETS_PATH },
]),
],
};
diff --git a/home/auth.go b/home/auth.go
index 5e6c59f6..36aa53fe 100644
--- a/home/auth.go
+++ b/home/auth.go
@@ -380,9 +380,7 @@ func optionalAuth(handler func(http.ResponseWriter, *http.Request)) func(http.Re
}
}
- } else if r.URL.Path == "/favicon.png" ||
- r.URL.Path == "/safari-pinned-tab.svg" ||
- strings.HasPrefix(r.URL.Path, "/apple-touch-icon") ||
+ } else if strings.HasPrefix(r.URL.Path,"/assets/") ||
strings.HasPrefix(r.URL.Path, "/login.") ||
strings.HasPrefix(r.URL.Path, "/__locales/") {
// process as usual