diff --git a/res/include/md/advertising.md b/res/include/md/advertising.md deleted file mode 100644 index e0f74f7..0000000 --- a/res/include/md/advertising.md +++ /dev/null @@ -1,23 +0,0 @@ -# Advertising on pixeldrain - -Pixeldrain uses A-ads for its primary ad space. This space is located at the -bottom of the file viewer where everyone goes to download files. The ad will not -show if either the downloading user or the owner of the file is a Patreon -supporter. The ad unit is a standard leaderboard format of 728x90 px. - -A-ads is an advertising network which respects the privacy advertisers, -publishers and even the viewers. A-ads only accepts cryptocurrencies for -advertising campaigns. The banners are static images with no javascript and do -not set any cookies in the broweser. You can use adnimated GIF or PNG images to -show animations in your banner ads. - -We also employ other ad formats based on the size of the file which is being -shared. If the file is larger than 10 MB we add a little floating pop-up ad in -the bottom-right corner of the screen, and if the file is larger than 250 MB we -add a popunder ad which is displayed when the user clicks anywhere on the page. -These formats are purely to cover the bandwidth costs assiciated with sharing -such large files. - - - -Here you see A-Ads advertsising its own services. diff --git a/res/include/md/brave.md b/res/include/md/brave.md deleted file mode 100644 index eb306ba..0000000 --- a/res/include/md/brave.md +++ /dev/null @@ -1,55 +0,0 @@ -# Brave and Pixeldrain - -## What is Brave? - -Brave is a web browser focused on privacy and speed. In some tests Brave is up -to 3 times faster than Chrome and Firefox. It does this by blocking -advertisements and tracking scripts before they even get a chance to load. -Beside the speed improvements this also saves a lot of power and data, very -useful for mobile phones. - -Websites look much cleaner without all those advertisements. I don't like -putting ads on pixeldrain either, but I need the money to keep the website -running. Brave tries to solve this by giving users the choice if they want to -see ads. If you opt in to seeing ads from Brave you will receive notifications -with promotional offers once in a while. Brave protects your privacy by putting -the logic for showing relevant ads directly in the browser itself. This way your -browser history never leaves your computer and the tech giants can't follow you -around the web. The earnings from these ads are distributed between the websites -which you love most, a small cut goes to Brave itself for developing the -browser, and some of it goes to you. That's right, you get paid for viewing ads! - -
- - - Get started with Brave - -
- -## Basic attention tokens - - - -The money that you get from viewing ads (and receiving free token grants) goes -into a cryptocurrency wallet which is built right into the browser. Once you -have earned some rewards you have a few options. You can choose to automatically -distribute them between websites which you spend the most time on, you can tip -your favourite websites by pressing the tip button in the address bar or you can -convert the money to your own currency and deposit it to your bank account. - -Of course I would really appreciate it if you tipped some coins to pixeldrain -once in a while ;-) - -
- - - Download Brave here - -
- -If you want to learn more about Brave and its goals I can recommend checking out -the [blog](https://brave.com/blog). If you want to get in touch there is also -the [community forum](https://community.brave.com) and a [reddit -forum](https://www.reddit.com/r/brave_browser). diff --git a/res/static/ads.txt b/res/static/ads.txt deleted file mode 100644 index aa9579a..0000000 --- a/res/static/ads.txt +++ /dev/null @@ -1 +0,0 @@ -# Pixeldrain does not run ads diff --git a/res/static/img/advertising/advert_example_1.png b/res/static/img/advertising/advert_example_1.png deleted file mode 100644 index 80f9f70..0000000 Binary files a/res/static/img/advertising/advert_example_1.png and /dev/null differ diff --git a/res/static/img/advertising/pixeldrain_socials.webp b/res/static/img/advertising/pixeldrain_socials.webp deleted file mode 100644 index 6134e6e..0000000 Binary files a/res/static/img/advertising/pixeldrain_socials.webp and /dev/null differ diff --git a/res/static/img/advertising/pixeldrain_socials.xcf b/res/static/img/advertising/pixeldrain_socials.xcf deleted file mode 100644 index d82efed..0000000 Binary files a/res/static/img/advertising/pixeldrain_socials.xcf and /dev/null differ diff --git a/res/static/img/brave_lion.svg b/res/static/img/brave_lion.svg deleted file mode 100644 index f80dbc3..0000000 --- a/res/static/img/brave_lion.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - build-icons/Stable Copy 3 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/static/img/brave_lion_alt.png b/res/static/img/brave_lion_alt.png deleted file mode 100644 index 49acd7a..0000000 Binary files a/res/static/img/brave_lion_alt.png and /dev/null differ diff --git a/res/static/img/misc/brave-728x90.png b/res/static/img/misc/brave-728x90.png deleted file mode 100644 index 3954c2c..0000000 Binary files a/res/static/img/misc/brave-728x90.png and /dev/null differ diff --git a/svelte/package-lock.json b/svelte/package-lock.json index 9c3f0b4..71f7f45 100644 --- a/svelte/package-lock.json +++ b/svelte/package-lock.json @@ -193,9 +193,9 @@ "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==" }, "node_modules/@types/jsmediatags": { - "version": "3.9.3", - "resolved": "https://registry.npmjs.org/@types/jsmediatags/-/jsmediatags-3.9.3.tgz", - "integrity": "sha512-oNEPG+SI5E/VWK0x9JTWwkU+LmmOgW4tisCE4IrxiyNfzIRyg9kspNjaoqknpN9HUIexDvbD2/wbViw6TGIFgw==", + "version": "3.9.4", + "resolved": "https://registry.npmjs.org/@types/jsmediatags/-/jsmediatags-3.9.4.tgz", + "integrity": "sha512-uWB29K/5Qh5tyeuRcl9dRnqvqJAP2Z4b4uCZtM50SkzCb9X50zEJbpqXmwHOF1fakV4pD1B2L1J/QxGnKNchVQ==", "dev": true }, "node_modules/@types/resolve": { @@ -737,9 +737,9 @@ } }, "node_modules/resolve": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", - "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "version": "1.22.6", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz", + "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==", "dev": true, "dependencies": { "is-core-module": "^2.13.0", @@ -763,9 +763,9 @@ } }, "node_modules/rollup": { - "version": "3.29.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.1.tgz", - "integrity": "sha512-c+ebvQz0VIH4KhhCpDsI+Bik0eT8ZFEVZEYw0cGMVqIP8zc+gnwl7iXCamTw7vzv2MeuZFZfdx5JJIq+ehzDlg==", + "version": "3.29.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.2.tgz", + "integrity": "sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A==", "dev": true, "bin": { "rollup": "dist/bin/rollup" diff --git a/svelte/rollup.config.js b/svelte/rollup.config.js index 76a5de6..39d795b 100644 --- a/svelte/rollup.config.js +++ b/svelte/rollup.config.js @@ -6,27 +6,6 @@ import terser from '@rollup/plugin-terser'; const production = !process.env.ROLLUP_WATCH; -function serve() { - let server; - - function toExit() { - if (server) server.kill(0); - } - - return { - writeBundle() { - if (server) return; - server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], { - stdio: ['ignore', 'inherit', 'inherit'], - shell: true - }); - - process.on('SIGTERM', toExit); - process.on('exit', toExit); - } - }; -} - const builddir = "../res/static/svelte" export default [ "file_viewer", @@ -84,7 +63,7 @@ export default [ // If we're building for production (npm run build // instead of npm run dev), minify - production && terser() + production && terser(), ], watch: { clearScreen: false diff --git a/svelte/src/file_viewer/AdHead.svelte b/svelte/src/file_viewer/AdHead.svelte deleted file mode 100644 index 8514b0a..0000000 --- a/svelte/src/file_viewer/AdHead.svelte +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - {#if adsplus} - - {/if} - {#if adaround} - - {/if} - {#if flyingsquare} - - {/if} - {#if valueimpression} - - - {/if} - diff --git a/svelte/src/file_viewer/AdLeaderboard.svelte b/svelte/src/file_viewer/AdLeaderboard.svelte deleted file mode 100644 index f8555e8..0000000 --- a/svelte/src/file_viewer/AdLeaderboard.svelte +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - {#if ad_type === "nextmillennium"} - - {/if} - - -
- {#if ad_type === "aads"} - - {:else if ad_type === "brave"} - - {:else if ad_type === "ads.plus"} - - - - {:else if ad_type === "pixfuture"} - - - - - - {:else if ad_type === "adaround"} - - {:else if ad_type === "flyingsquare"} - - {:else if ad_type === "valueimpression"} - - - {:else if ad_type === "nextmillennium"} - - - - {:else if ad_type === "pixeldrain_social"} - - - Pixeldrain on Reddit - Pixeldrain on Twitter - - - - {:else if ad_type === "patreon_support"} - - - - {:else if ad_type === "socials"} - - - {:else if ad_type === "reviews"} - - - - {/if} -
- - diff --git a/svelte/src/file_viewer/AdSkyscraper.svelte b/svelte/src/file_viewer/AdSkyscraper.svelte deleted file mode 100644 index 694b403..0000000 --- a/svelte/src/file_viewer/AdSkyscraper.svelte +++ /dev/null @@ -1,101 +0,0 @@ - - -{#if visible} -
-
- {#if ad_type === "aads"} - - {:else if ad_type === "ads.plus"} - -
- {:else if ad_type === "pixfuture"} - -
- - - {:else if ad_type === "adaround"} -
- {:else if ad_type === "flyingsquare"} -
- {:else if ad_type === "valueimpression"} -
- {/if} -
-
-{/if} - - diff --git a/svelte/src/file_viewer/BottomBanner.svelte b/svelte/src/file_viewer/BottomBanner.svelte new file mode 100644 index 0000000..633de76 --- /dev/null +++ b/svelte/src/file_viewer/BottomBanner.svelte @@ -0,0 +1,159 @@ + + +{#if ad_type === "patreon_support"} + + + +{:else if ad_type === "socials"} + + + +{:else if ad_type === "reviews"} + + + +{:else if ad_type === "slava_ukraini"} + + + +{/if} + + diff --git a/svelte/src/file_viewer/FileViewer.svelte b/svelte/src/file_viewer/FileViewer.svelte index f230d37..50bc2e0 100644 --- a/svelte/src/file_viewer/FileViewer.svelte +++ b/svelte/src/file_viewer/FileViewer.svelte @@ -12,8 +12,7 @@ import EditWindow from "./EditWindow.svelte"; import EmbedWindow from "./EmbedWindow.svelte"; import ReportWindow from "./ReportWindow.svelte"; import IntroPopup from "./IntroPopup.svelte"; -import AdHead from "./AdHead.svelte"; -import AdLeaderboard from "./AdLeaderboard.svelte"; +import BottomBanner from "./BottomBanner.svelte"; import Sharebar from "./Sharebar.svelte"; import GalleryView from "./GalleryView.svelte"; import Downloader from "./Downloader.svelte"; @@ -383,15 +382,11 @@ const keyboard_event = evt => { } } } -
- - -
@@ -612,7 +607,7 @@ const keyboard_event = evt => {
{#if ads_enabled} - + {:else if custom_footer} diff --git a/svelte/src/file_viewer/TransferLimit.svelte b/svelte/src/file_viewer/TransferLimit.svelte index 91d1dd2..39ea5fb 100644 --- a/svelte/src/file_viewer/TransferLimit.svelte +++ b/svelte/src/file_viewer/TransferLimit.svelte @@ -20,16 +20,17 @@ $: { } -{#if $download_limits.loaded} -
+ +
+ {#if $download_limits.loaded}
{title}
{title}
-
-{/if} + {/if} +