diff --git a/assets/css/app.css b/assets/css/app.css index 028dde4c4..0c2879606 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -59,26 +59,30 @@ blockquote { @tailwind utilities; + .main-graph { - height: 440px; + position: relative; + height: 0; + /* Formula is: (top row height + (graph height / graph width * 100%)) */ + padding-top: calc(148px + (451 / 1088 * 100%)); } @screen md { - .main-graph { - height: 480px; - } + padding-top: calc(128px + (451 / 1088 * 100%)); } @screen lg { .main-graph { - height: 440px; + padding-top: calc(451 / 1088 * 100%); } } -@screen xl { - .main-graph { - height: 460px; - } +.graph-inner { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: auto; } .light-text { @@ -273,7 +277,7 @@ blockquote { } .fullwidth-shadow::before { - @apply absolute top-0 w-screen h-full; + @apply absolute top-0 w-screen h-full bg-gray-50 dark:bg-gray-850; box-shadow: 0 4px 2px -2px rgba(0, 0, 0, 0.06); content: ""; z-index: -1; diff --git a/assets/js/app.js b/assets/js/app.js index 585607628..bbec05061 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -95,6 +95,7 @@ const embedButton = document.getElementById('generate-embed') if (embedButton) { embedButton.addEventListener('click', function(e) { + const baseUrl = document.getElementById('base-url').value const embedCode = document.getElementById('embed-code') const theme = document.getElementById('theme').value.toLowerCase() const background = document.getElementById('background').value @@ -103,11 +104,14 @@ if (embedButton) { const embedLink = new URL(document.getElementById('embed-link').value) embedLink.searchParams.set('embed', 'true') embedLink.searchParams.set('theme', theme) + let backgroundAttr = '' if (background) { - embedLink.searchParams.set('background', background) + backgroundAttr = `background="${background}"` } - embedCode.value = `` + embedCode.value = ` +
Stats powered by Plausible Analytics
+` } catch (e) { embedCode.value = 'ERROR: Please enter a valid URL in the shared link field' } diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.js index 9650a848e..bbd9f1d63 100644 --- a/assets/js/dashboard/historical.js +++ b/assets/js/dashboard/historical.js @@ -24,11 +24,10 @@ class Historical extends React.Component { } render() { - const extraStyle = this.props.site.background ? {backgroundColor: this.props.site.background} : {} return (
-
+
diff --git a/assets/js/dashboard/mount.js b/assets/js/dashboard/mount.js index 188d560c3..d50aa7fd1 100644 --- a/assets/js/dashboard/mount.js +++ b/assets/js/dashboard/mount.js @@ -14,7 +14,7 @@ if (container) { offset: container.dataset.offset, hasGoals: container.dataset.hasGoals === 'true', insertedAt: container.dataset.insertedAt, - background: container.dataset.background + embedded: container.dataset.embedded } const loggedIn = container.dataset.loggedIn === 'true' diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js index b61d78d33..85c75b5e6 100644 --- a/assets/js/dashboard/stats/visitor-graph.js +++ b/assets/js/dashboard/stats/visitor-graph.js @@ -264,9 +264,9 @@ class LineGraph extends React.Component { return (
-
{stat.name}
-
- { this.renderTopStatNumber(stat) } +
{stat.name}
+
+ { this.renderTopStatNumber(stat) } {this.renderComparison(stat.name, stat.change)}
@@ -285,7 +285,7 @@ class LineGraph extends React.Component { return ( - + ) } @@ -294,15 +294,15 @@ class LineGraph extends React.Component { const extraClass = this.props.graphData.interval === 'hour' ? '' : 'cursor-pointer' return ( - +
{ this.renderTopStats() }
-
+
{ this.downloadLink() }
- +
) } } @@ -349,8 +349,8 @@ export default class VisitorGraph extends React.Component { render() { return ( -
- { this.state.loading &&
} +
+ { this.state.loading &&
} { this.renderInner() }
) diff --git a/assets/js/embed.content.js b/assets/js/embed.content.js new file mode 100644 index 000000000..7f22b3e89 --- /dev/null +++ b/assets/js/embed.content.js @@ -0,0 +1 @@ +import 'iframe-resizer/js/iframeResizer.contentWindow' diff --git a/assets/js/embed.host.js b/assets/js/embed.host.js new file mode 100644 index 000000000..ff945789b --- /dev/null +++ b/assets/js/embed.host.js @@ -0,0 +1,11 @@ +import iframeResize from 'iframe-resizer/js/iframeResizer' + +const iframe = document.querySelector('[plausible-embed]') +const options = { + heightCalculationMethod: 'taggedElement' +} +if (iframe.getAttribute('background')) { + options.bodyBackground = iframe.getAttribute('background') +} + +iframeResize(options, '[plausible-embed]') diff --git a/assets/package-lock.json b/assets/package-lock.json index db86031d9..f0bb3d310 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -20,6 +20,7 @@ "copy-webpack-plugin": "^6.0.3", "css-loader": "^3.6.0", "datamaps": "^0.5.9", + "iframe-resizer": "^4.3.1", "mini-css-extract-plugin": "^0.8.2", "optimize-css-assets-webpack-plugin": "^5.0.3", "phoenix": "file:../deps/phoenix", @@ -53,11 +54,11 @@ } }, "../deps/phoenix": { - "version": "1.4.17", + "version": "1.5.7", "license": "MIT" }, "../deps/phoenix_html": { - "version": "2.14.2" + "version": "2.14.3" }, "node_modules/@babel/code-frame": { "version": "7.10.4", @@ -2370,9 +2371,9 @@ "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" }, "node_modules/bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" }, "node_modules/boolbase": { "version": "1.0.0", @@ -4475,19 +4476,24 @@ "integrity": "sha512-YqAL+NXOzjBnpY+dcOKDlZybJDCOzgsq4koW3fvyty/ldTmsb4QazZpOWmVvZ2m0t5jbBf7L0lIGU3BUipwG+A==" }, "node_modules/elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", "dependencies": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", + "bn.js": "^4.11.9", + "brorand": "^1.1.0", "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" } }, + "node_modules/elliptic/node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, "node_modules/emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", @@ -6541,6 +6547,18 @@ "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, + "node_modules/iframe-resizer": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/iframe-resizer/-/iframe-resizer-4.3.1.tgz", + "integrity": "sha512-PkoTPNF6EYhTbDjogdKu7JVgKqRwwNBXMeywZaQyzEYM3BNltA8O9fIIrtUkmj+8VZGckXpwtXsWsaQ5lrhd0w==", + "engines": { + "node": ">=0.8.0" + }, + "funding": { + "type": "individual", + "url": "https://github.com/davidjbradshaw/iframe-resizer/blob/master/FUNDING.md" + } + }, "node_modules/ignore": { "version": "5.1.8", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", @@ -17158,9 +17176,9 @@ "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" }, "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" }, "boolbase": { "version": "1.0.0", @@ -18895,17 +18913,24 @@ "integrity": "sha512-YqAL+NXOzjBnpY+dcOKDlZybJDCOzgsq4koW3fvyty/ldTmsb4QazZpOWmVvZ2m0t5jbBf7L0lIGU3BUipwG+A==" }, "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", + "bn.js": "^4.11.9", + "brorand": "^1.1.0", "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + } } }, "emoji-regex": { @@ -20521,6 +20546,11 @@ "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, + "iframe-resizer": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/iframe-resizer/-/iframe-resizer-4.3.1.tgz", + "integrity": "sha512-PkoTPNF6EYhTbDjogdKu7JVgKqRwwNBXMeywZaQyzEYM3BNltA8O9fIIrtUkmj+8VZGckXpwtXsWsaQ5lrhd0w==" + }, "ignore": { "version": "5.1.8", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", diff --git a/assets/package.json b/assets/package.json index f85a694e8..b0f7e7624 100644 --- a/assets/package.json +++ b/assets/package.json @@ -20,6 +20,7 @@ "copy-webpack-plugin": "^6.0.3", "css-loader": "^3.6.0", "datamaps": "^0.5.9", + "iframe-resizer": "^4.3.1", "mini-css-extract-plugin": "^0.8.2", "optimize-css-assets-webpack-plugin": "^5.0.3", "phoenix": "file:../deps/phoenix", @@ -50,5 +51,6 @@ "stylelint": "^13.8.0", "stylelint-config-prettier": "^8.0.2", "stylelint-config-standard": "^20.0.0" - } + }, + "name": "assets" } diff --git a/assets/webpack.config.js b/assets/webpack.config.js index 4b8ceb508..861f2534a 100644 --- a/assets/webpack.config.js +++ b/assets/webpack.config.js @@ -4,7 +4,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const TerserPlugin = require('terser-webpack-plugin'); const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); -const DefinePlugin = require('webpack').DefinePlugin; module.exports = (env, options) => ({ optimization: { @@ -15,7 +14,9 @@ module.exports = (env, options) => ({ }, entry: { 'app': ['./js/app.js'], - 'dashboard': ['./js/dashboard/mount.js'] + 'dashboard': ['./js/dashboard/mount.js'], + 'embed.host': ['./js/embed.host.js'], + 'embed.content': ['./js/embed.content.js'] }, output: { filename: '[name].js', @@ -40,8 +41,5 @@ module.exports = (env, options) => ({ plugins: [ new MiniCssExtractPlugin({filename: '../css/[name].css'}), new CopyWebpackPlugin({patterns: [{from: 'static/', to: '../' }]}), - new DefinePlugin({ - "BASE_URL": JSON.stringify(process.env.BASE_URL || "http://localtest.me:8000") - }) ] }); diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index 53753b5b8..f4d9412d9 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -136,10 +136,10 @@ defmodule PlausibleWeb.StatsController do title: "Plausible ยท " <> shared_link.site.domain, offer_email_report: false, demo: false, + skip_plausible_tracking: true, shared_link_auth: shared_link.slug, embedded: conn.params["embed"] == "true", - theme: conn.params["theme"], - background: conn.params["background"] + theme: conn.params["theme"] ) end diff --git a/lib/plausible_web/templates/layout/_embedded_footer.html.eex b/lib/plausible_web/templates/layout/_embedded_footer.html.eex deleted file mode 100644 index a0e15f76e..000000000 --- a/lib/plausible_web/templates/layout/_embedded_footer.html.eex +++ /dev/null @@ -1,13 +0,0 @@ - diff --git a/lib/plausible_web/templates/layout/app.html.eex b/lib/plausible_web/templates/layout/app.html.eex index b346ea6d7..3da7688cf 100644 --- a/lib/plausible_web/templates/layout/app.html.eex +++ b/lib/plausible_web/templates/layout/app.html.eex @@ -12,18 +12,19 @@ <%= render("_tracking.html", assigns) %> - @conn.assigns[:background] %>"> + "> <%= if !@conn.assigns[:embedded] do %> <%= render("_header.html", assigns) %> <%= render("_notice.html", assigns) %> <% end %>
- <%= Map.get(assigns, :inner_layout) || @inner_content %> + <%= Map.get(assigns, :inner_layout) || @inner_content %>
<%= if @conn.assigns[:embedded] do %> - <%= render("_embedded_footer.html", assigns) %> +
+ <% else %> <%= render("_footer.html", assigns) %> <% end %> diff --git a/lib/plausible_web/templates/site/settings_visibility.html.eex b/lib/plausible_web/templates/site/settings_visibility.html.eex index d3f6e9f96..2c111810d 100644 --- a/lib/plausible_web/templates/site/settings_visibility.html.eex +++ b/lib/plausible_web/templates/site/settings_visibility.html.eex @@ -54,7 +54,7 @@

Embed dashboard

You can use shared links to embed your stats in any other webpage using an iframe. Copy & paste a shared link into the form below to generate the embed code.

- <%= link(to: "https://docs.plausible.io/visibility", target: "_blank") do %> + <%= link(to: "https://plausible.io/docs/embed-dashboard", target: "_blank") do %> <% end %>
@@ -81,9 +81,11 @@
+

Hint: try using `transparent` background to blend the dashboard with your site background

+
@@ -95,8 +97,6 @@ - -

If you're using custom goals, you need to increase the height of the window to match the height of your dashboard.

diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eex index 8f0c497ca..a4ce36154 100644 --- a/lib/plausible_web/templates/stats/stats.html.eex +++ b/lib/plausible_web/templates/stats/stats.html.eex @@ -1,11 +1,11 @@ -
+
" data-site-domain="<%= @site.domain %>"> <%= if @offer_email_report do %> <% end %>
-
+
<%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %>