Skip to content

Commit

Permalink
Merge branch 'plausible:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
MaybeThisIsRu committed Jul 23, 2021
2 parents 085f351 + d6662f1 commit beea6a0
Show file tree
Hide file tree
Showing 37 changed files with 911 additions and 758 deletions.
36 changes: 0 additions & 36 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

67 changes: 67 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions .gitlab/build-scripts/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"
Expand Down
8 changes: 4 additions & 4 deletions .gitlab/build-scripts/docker.gitlab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
\
"$@"

Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 5 additions & 2 deletions assets/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@
"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],
"react/prop-types": [0],
"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]
}
}
13 changes: 13 additions & 0 deletions assets/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

14 changes: 6 additions & 8 deletions assets/js/dashboard/components/search-select.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
Expand Down Expand Up @@ -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})
}
}
})
Expand All @@ -79,11 +77,11 @@ export default function SearchSelect(props) {
}

return (
<div className="mt-1 relative">
<div className="ml-2 relative w-full">
<div className="relative rounded-md shadow-sm" {...getToggleButtonProps()} {...getComboboxProps()}>
<input {...getInputProps({onKeyDown: keydown})} onFocus={selectInputText} placeholder={props.placeholder} type="text" className={classNames('w-full pr-10 border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-200 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:bg-gray-900 dark:text-gray-300 block', {'cursor-pointer': inputValue === '' && !isOpen})} />
<div className="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
{ !loading && <ChevronDown /> }
{ !loading && <ChevronDownIcon className="h-4 w-4 text-gray-500" /> }
{ loading && <Spinner /> }
</div>
</div>
Expand Down
Loading

0 comments on commit beea6a0

Please sign in to comment.