Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ default: &default
password: root
encoding: utf8mb4
variables:
transaction_isolation: "READ-COMMITTED"
transaction_isolation: 'READ-COMMITTED'

production:
<<: *default
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/assets
18 changes: 9 additions & 9 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Layout/LineLength:

Metrics/ClassLength:
Exclude:
- 'test/**/*.rb'
- 'test/**/*.rb'

Style/Documentation:
Enabled: false
Expand All @@ -13,8 +13,8 @@ Style/HashSyntax:

Style/MixinUsage:
Exclude:
- 'bin/setup'
- 'bin/update'
- 'bin/setup'
- 'bin/update'

Style/NonNilCheck:
IncludeSemanticChanges: true
Expand All @@ -33,15 +33,15 @@ Style/HashAsLastArrayItem:

Metrics/BlockLength:
Exclude:
- 'config/environments/**/*.rb'
- 'config/routes.rb'
- 'init.rb'
- 'config/environments/**/*.rb'
- 'config/routes.rb'
- 'init.rb'

Metrics/MethodLength:
CountAsOne:
- array
- hash
- heredoc
- array
- hash
- heredoc

AllCops:
NewCops: enable
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 0.1.1

* Add feedback for overlapping time entries.
- Add feedback for overlapping time entries.

# 0.1.0

* Initial release.
- Initial release.
22 changes: 11 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
- Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
- The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities
Expand Down Expand Up @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,43 +45,43 @@ Administration => Roles & Permissions
```mermaid
stateDiagram-v2
[*] --> CheckingSession : Start Request

CheckingSession --> Conflict : Session Exists
Conflict --> [*] : Return Conflict

CheckingSession --> SessionCreation : No Active Session
SessionCreation --> ValidatingSession : Create Session

ValidatingSession --> IssueAssociation : Valid Session
ValidatingSession --> Error : Invalid Session
Error --> [*] : Return Unprocessable

IssueAssociation --> ConnectorValidation : Issue Connector Init
ConnectorValidation --> Error : Connector Invalid
Error --> [*] : Return Unprocessable

ConnectorValidation --> CheckingFinished : Connector Valid
CheckingFinished --> Finalize : Session Finished
CheckingFinished --> UpdateTimer : Session Active

Finalize --> TimeEntryCreation : Mark Finished
TimeEntryCreation --> Success : Create Time Entries
Success --> [*] : Return Success

UpdateTimer --> TimerUpdated : Update Session
TimerUpdated --> Success : Valid Update
TimerUpdated --> Error : Invalid Update
Error --> [*] : Return Unprocessable

destroy : Destroy Session
destroy --> Cancel : Cancel Timer
Cancel --> [*] : Return Cancel
```

## Contributing

Bug reports and pull requests are welcome on GitHub at https://github.com/renuo/redmine_tracky.
This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to
Bug reports and pull requests are welcome on GitHub at https://github.com/renuo/redmine_tracky.
This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to
the [code of conduct](https://github.com/renuo/redmine_tracky/blob/main/CODE_OF_CONDUCT.md).

## Copyright
Expand Down
8 changes: 4 additions & 4 deletions assets.src/src/redmine-tracky.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "flatpickr/dist/flatpickr.css";
@import "./styles/time_sessions_table.scss";
@import "./styles/utils.scss";
@import "./styles/timer_container.scss";
@import 'flatpickr/dist/flatpickr.css';
@import './styles/time_sessions_table.scss';
@import './styles/utils.scss';
@import './styles/timer_container.scss';
10 changes: 5 additions & 5 deletions assets.src/src/redmine-tracky.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "flatpickr/dist/flatpickr.css";
@import "./styles/time_sessions_table.scss";
@import "./styles/utils.scss";
@import "./styles/timer_container.scss";
@import 'flatpickr/dist/flatpickr.css';
@import './styles/time_sessions_table.scss';
@import './styles/utils.scss';
@import './styles/timer_container.scss';

@import "./styles/variables.scss";
@import './styles/variables.scss';
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default class extends Controller {
const urlParams = new URLSearchParams(window.location.search)
const issueIds = urlParams.getAll('issue_ids[]')

issueIds.forEach(id => {
issueIds.forEach((id) => {
const url = window.RedmineTracky.issueCompletionPath
const data = { term: id, scope: 'all' }

Expand Down