diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 63be6723d..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,36 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve Plausible Analytics -title: '' -labels: '' -assignees: '' - ---- - -### Precheck - -Please note that this tracker is only for bugs. Do not use the issue tracker for help, support or feature requests. - -[Our docs](https://plausible.io/docs) are a great place for most answers, but if you can’t find your answer there, you can [contact us](https://plausible.io/contact). - -Have a feature request? Please search the ideas [on our forum](https://github.com/plausible/analytics/discussions/categories/feature-requests) to make sure that the feature has not yet been requested. If you cannot find what you had in mind, please [submit your feature request here](https://github.com/plausible/analytics/discussions/new). - -Have an issue with your self-hosted install? You can ask in [our self-hosted forum](https://github.com/plausible/analytics/discussions/categories/self-hosted-support). Thanks! - -## Prerequisites -- [ ] I have searched open and closed issues to make sure that the bug has not yet been reported. - -## Bug report -**Describe the bug** -A clear and concise description of what the bug is. - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots (If applicable)** -If applicable, add screenshots to help explain your problem. - -**Environment (If applicable):** - - OS: [e.g. macos] - - Browser [e.g. safari, firefox] - - Version [e.g. 78] diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml new file mode 100644 index 000000000..20aa25101 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -0,0 +1,67 @@ +name: "🐛 Bug Report" +description: Create a report to help us improve Plausible Analytics +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this bug report! + + Please note that this tracker is only for bugs. Do not use the issue tracker for help, support or feature requests. + + [Our docs](https://plausible.io/docs) are a great place for most answers, but if you can’t find your answer there, you can [contact us](https://plausible.io/contact). + + Have a feature request? Please search the ideas [on our forum](https://github.com/plausible/analytics/discussions/categories/feature-requests) to make sure that the feature has not yet been requested. If you cannot find what you had in mind, please [submit your feature request here](https://github.com/plausible/analytics/discussions/new). + + Have an issue with your self-hosted install? You can ask in [our self-hosted forum](https://github.com/plausible/analytics/discussions/categories/self-hosted-support). + + **Thanks!** + - type: checkboxes + attributes: + label: Past Issues Searched + options: + - label: >- + I have searched open and closed issues to make sure that the bug has + not yet been reported + required: true + - type: checkboxes + attributes: + label: Issue is a Bug Report + options: + - label: >- + This is a bug report and not a feature request, nor asking for self-hosted support + required: true + - type: textarea + id: bug-description + attributes: + label: Describe the bug + description: A clear and concise description of what the bug is + placeholder: Tell us what happened! + validations: + required: true + - type: textarea + id: bug-expectation + attributes: + label: Expected behavior + description: A clear and concise description of what you expected to happen + placeholder: Tell us what you expected + validations: + required: true + - type: textarea + id: bug-screenshots + attributes: + label: Screenshots + description: 'If applicable, add screenshots to help explain your problem' + placeholder: Insert screenshots here + - type: textarea + attributes: + label: Environment + description: | + examples: + - **OS**: MacOS + - **Browser**: Firefox + - **Browser Version**: 88 + value: | + - OS: + - Browser: + - Browser Version: + render: markdown diff --git a/.gitlab/build-scripts/docker-entrypoint.sh b/.gitlab/build-scripts/docker-entrypoint.sh index 0ab3e8ff2..b693040f9 100755 --- a/.gitlab/build-scripts/docker-entrypoint.sh +++ b/.gitlab/build-scripts/docker-entrypoint.sh @@ -1,10 +1,10 @@ #!/bin/sh set -e -if [[ "$1" = 'run' ]]; then +if [ "$1" = 'run' ]; then exec /app/bin/plausible start -elif [[ "$1" = 'db' ]]; then +elif [ "$1" = 'db' ]; then exec /app/"$2".sh else exec "$@" diff --git a/.gitlab/build-scripts/docker.gitlab.sh b/.gitlab/build-scripts/docker.gitlab.sh index 4cc663ca0..51395c8b1 100644 --- a/.gitlab/build-scripts/docker.gitlab.sh +++ b/.gitlab/build-scripts/docker.gitlab.sh @@ -23,10 +23,10 @@ function docker_build_image() { /kaniko/executor \ --cache=true \ - --context ${CI_PROJECT_DIR} \ - --dockerfile ${CI_PROJECT_DIR}/Dockerfile \ - --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} \ - --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-latest \ + --context "${CI_PROJECT_DIR}" \ + --dockerfile "${CI_PROJECT_DIR}"/Dockerfile \ + --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" \ + --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-latest" \ \ "$@" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 47a5baffc..d894db377 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,3 +26,8 @@ repos: - eslint-plugin-jsx-a11y@6.4.1 - eslint-plugin-react@7.21.5 - eslint-plugin-react-hooks@4.2.0 + + - repo: https://gitlab.com/jvenom/elixir-pre-commit-hooks + rev: v1.0.0 + hooks: + - id: mix-format diff --git a/CHANGELOG.md b/CHANGELOG.md index 297b56373..2eb5dd0f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file. - UI fix for details button overlapping content on mobile plausible/analytics#1114 - UI fix for the main graph on mobile overlapping its tick items on both axis - UI fixes for text not showing properly in bars across multiple lines. This hides the totals on <768px and only shows the uniques and % to accommodate the goals text too. +- Turn off autocomplete for name and password inputs in the _New shared link_ form. ### Removed - Removes AppSignal monitoring package diff --git a/README.md b/README.md index 3063db09f..83bc423bf 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ We are dedicated to making web analytics more privacy-friendly. Our mission is t ### Why Plausible? -Here's what makes Plausible a great Google Analytics alternative and why we're trusted by 3,000+ paying subscribers to deliver their website and business insights: +Here's what makes Plausible a great Google Analytics alternative and why we're trusted by 4,000+ paying subscribers to deliver their website and business insights: - **Clutter Free**: Plausible Analytics provides [simple web analytics](https://plausible.io/simple-web-analytics) and it cuts through the noise. No layers of menus, no need for custom reports. Get all the important insights on one single page. No training necessary. - **GDPR/CCPA/PECR compliant**: Measure traffic, not individuals. No personal data or IP addresses are ever stored in our database. We don't use cookies or any other persistent idenfitiers. [Read more about our data policy](https://plausible.io/data-policy) diff --git a/assets/.eslintrc.json b/assets/.eslintrc.json index 7ee18d54e..e25d18b46 100644 --- a/assets/.eslintrc.json +++ b/assets/.eslintrc.json @@ -5,7 +5,7 @@ "extends": ["airbnb", "prettier"], "plugins": ["prettier"], "rules": { - "max-len": [2, {"code": 100}], + "max-len": [0, {"code": 120}], "prettier/prettier": [2], "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }], "react/destructuring-assignment": [0], @@ -13,6 +13,9 @@ "max-classes-per-file": [0], "react/jsx-one-expression-per-line": [0], "react/self-closing-comp": [0], - "no-unused-expressions": [1, { "allowShortCircuit": true }] + "no-unused-expressions": [1, { "allowShortCircuit": true }], + "no-unused-vars": [2, { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }], + "jsx-a11y/click-events-have-key-events": [0], + "jsx-a11y/no-static-element-interactions": [0] } } diff --git a/assets/css/app.css b/assets/css/app.css index e3e0d7660..e1af8c8d8 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -315,3 +315,16 @@ iframe[hidden] { .pagination-link[disabled] { @apply cursor-default bg-gray-100 dark:bg-gray-300 pointer-events-none; } + +.flatpickr-calendar.static.open { + top: 12px; +} + +@media (max-width: 768px) { + .flatpickr-wrapper { + position: absolute!important; + right: 0!important; + left: 0!important; + } +} + diff --git a/assets/js/dashboard/components/search-select.js b/assets/js/dashboard/components/search-select.js index 24ec5e2b3..766140af8 100644 --- a/assets/js/dashboard/components/search-select.js +++ b/assets/js/dashboard/components/search-select.js @@ -2,6 +2,7 @@ import React, {useState, useCallback} from 'react' import {useCombobox} from 'downshift' import classNames from 'classnames' import debounce from 'debounce-promise' +import { ChevronDownIcon } from '@heroicons/react/solid' function selectInputText(e) { e.target.select() @@ -27,7 +28,6 @@ function Spinner() { export default function SearchSelect(props) { const [items, setItems] = useState([]) const [loading, setLoading] = useState(false) - const [initialLoadComplete, setInitialLoadComplete] = useState(false) function fetchOptions({inputValue, isOpen}) { setLoading(isOpen) @@ -60,11 +60,9 @@ export default function SearchSelect(props) { props.onInput(changes.inputValue) }, initialSelectedItem: props.initialSelectedItem, - onIsOpenChange: ({inputValue}) => { - if (!initialLoadComplete) { - fetchOptions({inputValue: inputValue, isOpen: true}).then(() => { - setInitialLoadComplete(true) - }) + onIsOpenChange: ({isOpen, inputValue}) => { + if (isOpen) { + fetchOptions({inputValue, isOpen}) } } }) @@ -79,11 +77,11 @@ export default function SearchSelect(props) { } return ( -