a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add assets folder

This commit is contained in:
ArtemBaskal 2020-05-14 14:45:16 +03:00
parent 26ac9e4224
commit 5f13d4ab4a
8 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
client/public/apple-touch-icon-180x180.png → client/public/assets/apple-touch-icon-180x180.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
client/public/favicon.png → client/public/assets/favicon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
client/public/safari-pinned-tab.svg → client/public/assets/safari-pinned-tab.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 743 B

After

Width:  |  Height:  |  Size: 743 B

6
client/public/index.html
View File

@ -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>

6
client/public/install.html
View File

@ -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>

6
client/public/login.html
View File

@ -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>

5
client/webpack.common.js vendored
View File

@ -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 },
]),
],
};

4
home/auth.go
View File

@ -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