diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml index c8d49897e9..e37636c981 100644 --- a/.github/workflows/hugo.yml +++ b/.github/workflows/hugo.yml @@ -11,6 +11,8 @@ on: jobs: deploy: runs-on: ubuntu-latest + env: + HUGO_CACHEDIR: /tmp/hugo_cache steps: - uses: actions/checkout@v4 with: @@ -20,7 +22,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v3 with: - hugo-version: '0.123.7' + hugo-version: '0.134.3' extended: true - name: Setup Node @@ -28,10 +30,16 @@ jobs: with: node-version: 'lts/*' + - uses: actions/cache@v4 + with: + path: ${{ env.HUGO_CACHEDIR }} + key: ${{ runner.os }}-hugomod-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-hugomod- + - name: Build run: | git rm -rf ./docs - cd ./website/themes/docsy && npm install cd "$GITHUB_WORKSPACE"/website npm i -D --save autoprefixer postcss-cli postcss hugo --minify diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 4a9058b790..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "website/themes/docsy"] - path = website/themes/docsy - url = https://github.com/google/docsy.git diff --git a/website/assets/scss/dark-theme.scss b/website/assets/scss/dark-theme.scss index 0604716759..9e2229c991 100644 --- a/website/assets/scss/dark-theme.scss +++ b/website/assets/scss/dark-theme.scss @@ -1,7 +1,5 @@ // @media (prefers-color-scheme: dark) { html[data-bs-theme="dark"] body { - background-color: #010101 !important; - .vscomp-dropbox, .popover-body { color: #fff !important; background-color: #222 !important; @@ -19,10 +17,6 @@ // background-color: rgba(255, 255, 255, 0.05) !important; // } - .pageinfo { - background: rgba(255, 255, 255, 0.05) !important; - } - .vscomp-option.focused { background: #333333; } @@ -31,18 +25,6 @@ background: #111111; } - .td-sidebar-nav__section-title a { - color: #dddddd; - } - - .td-sidebar-nav .td-sidebar-link__page { - color: #b6afa8; - } - - .alert { - background: black !important; - } - .bootstrap-select .notify, .bootstrap-select .no-results { background: black !important; border-color: black !important; @@ -66,19 +48,6 @@ filter: invert(1); } - .taxonomy-term:not(:hover):not(:focus) { - color: #e9ecef; - background: #403f4c; - } - - .taxonomy-count { - background-color: #000; - } - - .taxonomy-term:hover .taxonomy-count { - color: #bfc0b3 !important; - } - .vscomp-wrapper.multiple .vscomp-option.selected .checkbox-icon::after, .vscomp-wrapper .checkbox-icon.checked::after { border-color: deepskyblue; border-left-color: rgba(0, 0, 0, 0); @@ -92,23 +61,6 @@ .vscomp-dropbox-close-button { background-color: #333; } - - pre { - background-color: rgba(255, 255, 255, 0.1) !important; - color: inherit !important; - } - - .td-sidebar__toggle { - color: var(--bs-body-color); - } - - .td-sidebar-nav .dropdown a { - color: #b6afa8; - } - - nav.foldable-nav .ul-1 .with-child > label:before { - color: #b6afa8; - } } // } \ No newline at end of file diff --git a/website/data/FilterLists.toml b/website/data/FilterLists.toml index 2b6dec78dd..1249b5dd07 100644 --- a/website/data/FilterLists.toml +++ b/website/data/FilterLists.toml @@ -106,11 +106,9 @@ lang = "pl" [[items]] title = "AlleBlock" desc = "Zbędne, uciążliwe i potencjalnie niebezpieczne elementy - reklamy, artykuły sponsorowane, czy skrypty śledzące działania użytkowników na Allegro." -subscribe = "https://alleblock.pl/alleblock/alleblock.txt" -issues = "https://github.com/maciejtarmas/AlleBlock/issues" -mail = "blablabla@alleblock.pl" -home = "https://alleblock.pl/" -donate = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=RN7R64TJLWQW6" +subscribe = "https://raw.githubusercontent.com/CrusheerPL/AlleBlockV2/master/AlleBlockV2.txt" +issues = "hhttps://github.com/CrusheerPL/AlleBlockV2/issues" +home = "https://github.com/CrusheerPL/AlleBlockV2/" adblocker = "ABP" category = "bezpieczeństwo, sponsorowane, e-handel" lang = "pl" @@ -198,11 +196,10 @@ category = "prywatność" [[items]] title = "Web Annoyances Ultralist " desc = "Ikony społecznościowe, paski udostępniania, banery z aplikacjami mobilnymi, prośby o pobranie aplikacji, komunikaty dot. ciasteczek/polityki prywatności/RODO, strzałki, wyskakujące okienka, ponaglania o subskrypcję/rejestrację i inne rozpraszające elementy. Pływające nagłówki i inne ruchome elementy będą przypinane." -subscribe = "https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/ultralist.txt" -issues = "https://github.com/yourduskquibbles/webannoyances/issues" -chat = "https://discord.me/yourduskquibbles" -home = "https://github.com/yourduskquibbles/webannoyances" -modules = "https://github.com/yourduskquibbles/webannoyances/tree/master/filters" +subscribe = "https://raw.githubusercontent.com/LanikSJ/webannoyances/master/ultralist.txt" +issues = "https://github.com/LanikSJ/webannoyances/issues" +home = "https://github.com/LanikSJ/webannoyances" +modules = "https://github.com/LanikSJ/webannoyances/tree/master/filters" adblocker = "uBO, AG" category = "irytujące, ciasteczka, społecznościowe" @@ -259,8 +256,8 @@ form = "https://urlhaus.abuse.ch/api/#submit" home = "https://gitlab.com/malware-filter/urlhaus-filter" category = "bezpieczeństwo" adblocker = "uBO" -mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2, Gitloaf" -mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/urlhaus-filter@gh-pages/urlhaus-filter-online.txt, https://curbengh.github.io/malware-filter/urlhaus-filter-online.txt, https://malware-filter.pages.dev/urlhaus-filter-online.txt, https://urlhaus-filter.pages.dev/urlhaus-filter-online.txt, https://gitloaf.com/cdn/curbengh/urlhaus-filter/gh-pages/urlhaus-filter-online.txt" +mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2" +mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/urlhaus-filter@gh-pages/urlhaus-filter-online.txt, https://curbengh.github.io/malware-filter/urlhaus-filter-online.txt, https://malware-filter.pages.dev/urlhaus-filter-online.txt, https://urlhaus-filter.pages.dev/urlhaus-filter-online.txt" [[items]] title = "KADhosts" @@ -359,8 +356,8 @@ form = "https://urlhaus.abuse.ch/api/#submit" home = "https://gitlab.com/malware-filter/urlhaus-filter" category = "bezpieczeństwo" adblocker = "hosts" -mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2, Gitloaf" -mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/urlhaus-filter@gh-pages/urlhaus-filter-hosts-online.txt, https://curbengh.github.io/malware-filter/urlhaus-filter-hosts-online.txt, https://malware-filter.pages.dev/urlhaus-filter-hosts-online.txt, https://urlhaus-filter.pages.dev/urlhaus-filter-hosts-online.txt, https://gitloaf.com/cdn/curbengh/urlhaus-filter/gh-pages/urlhaus-filter-hosts-online.txt" +mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2" +mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/urlhaus-filter@gh-pages/urlhaus-filter-hosts-online.txt, https://curbengh.github.io/malware-filter/urlhaus-filter-hosts-online.txt, https://malware-filter.pages.dev/urlhaus-filter-hosts-online.txt, https://urlhaus-filter.pages.dev/urlhaus-filter-hosts-online.txt" [[items]] title = "NoCoin Hosts" @@ -410,8 +407,8 @@ issues = "https://gitlab.com/malware-filter/phishing-filter/-/issues" home = "https://gitlab.com/malware-filter/phishing-filter" adblocker = "hosts" category = "bezpieczeństwo" -mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2, Gitloaf" -mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/phishing-filter@gh-pages/phishing-filter-hosts.txt, https://curbengh.github.io/phishing-filter/phishing-filter-hosts.txt, https://phishing-filter.pages.dev/phishing-filter-hosts.txt, https://malware-filter.pages.dev/phishing-filter-hosts.txt, https://gitloaf.com/cdn/curbengh/phishing-filter/gh-pages/phishing-filter-hosts.txt" +mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2" +mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/phishing-filter@gh-pages/phishing-filter-hosts.txt, https://curbengh.github.io/phishing-filter/phishing-filter-hosts.txt, https://phishing-filter.pages.dev/phishing-filter-hosts.txt, https://malware-filter.pages.dev/phishing-filter-hosts.txt" [[items]] title = "Dandelion Sprout's Anti-Malware Hosts" diff --git a/website/go.mod b/website/go.mod new file mode 100644 index 0000000000..1ba111353b --- /dev/null +++ b/website/go.mod @@ -0,0 +1,9 @@ +module github.com/MajkiIT/polish-ads-filter + +go 1.23.1 + +require ( + github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 // indirect + github.com/google/docsy v0.10.0 // indirect + github.com/twbs/bootstrap v5.3.3+incompatible // indirect +) diff --git a/website/go.sum b/website/go.sum new file mode 100644 index 0000000000..6971937642 --- /dev/null +++ b/website/go.sum @@ -0,0 +1,6 @@ +github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 h1:2aWEKCRLqQ9nPyXaz4/IYtRrDr3PzEiX0DUSUr2/EDs= +github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= +github.com/google/docsy v0.10.0 h1:6tMDacPwAyRWNCfvsn/9qGOZDQ8b0aRzjRZvnZPY5dg= +github.com/google/docsy v0.10.0/go.mod h1:c0nIAqmRTOuJ01F85U/wJPQtc3Zj9N58Kea9bOT2AJc= +github.com/twbs/bootstrap v5.3.3+incompatible h1:goFoqinzdHfkeegpFP7pvhbd0g+A3O2hbU3XCjuNrEQ= +github.com/twbs/bootstrap v5.3.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= diff --git a/website/hugo.toml b/website/hugo.toml index b70484d5a6..888516fe90 100644 --- a/website/hugo.toml +++ b/website/hugo.toml @@ -3,8 +3,6 @@ title = "Polish filters for AdBlock, uBlock Origin & AdGuard" ignoreFiles = [ "table_notes.md" ] enableRobotsTXT = true publishDir = "../docs" -# Hugo allows theme composition (and inheritance). The precedence is from left to right. -theme = ["docsy"] # Will give values to .Lastmod etc. enableGitInfo = true @@ -135,6 +133,7 @@ sidebar_search_disable = false navbar_logo = false # Set to true to enablethe About link in the site footer footer_about_enable = true +showLightDarkModeMenu = true # Adds a H2 section titled "Feedback" to the bottom of each doc. The responses are sent to Google Analytics as events. # This feature depends on [services.googleAnalytics] and will be disabled if "services.googleAnalytics.id" is not set. @@ -196,6 +195,9 @@ no = 'Sorry to hear that. Please {{ T "saveSettings" Statically - - Gitloaf - {{ end }} {{ if .mirror }} {{ range $index, $mirrorURL := split $filterlist.mirrorURL ", " }} @@ -171,9 +168,6 @@

{{ T "saveSettings" Statically - - Gitloaf - {{ end }} {{ if .mirror }} {{ range $index, $mirrorURL := split $filterlist.mirrorURL ", " }} @@ -205,9 +199,6 @@

{{ T "saveSettings" Statically - - Gitloaf - @@ -229,9 +220,6 @@

{{ T "saveSettings" Statically - - Gitloaf - @@ -253,9 +241,6 @@

{{ T "saveSettings" Statically - - Gitloaf - diff --git a/website/layouts/partials/head.html b/website/layouts/partials/head.html index 676b682bf2..bc5fa10be0 100644 --- a/website/layouts/partials/head.html +++ b/website/layouts/partials/head.html @@ -24,6 +24,6 @@ {{ template "_internal/opengraph.html" . -}} {{ template "_internal/schema.html" . -}} {{ template "_internal/twitter_cards.html" . -}} -{{ partialCached "head-css.html" . "asdf" -}} +{{ partialCached "head-css.html" . "head-css-cache-key" -}} {{ partial "hooks/head-end.html" . -}} diff --git a/website/layouts/partials/navbar.html b/website/layouts/partials/navbar.html index 67576b5e1c..43c4b7e013 100644 --- a/website/layouts/partials/navbar.html +++ b/website/layouts/partials/navbar.html @@ -7,8 +7,8 @@ -}} {{ $baseURL := urls.Parse $.Site.Params.Baseurl -}} -