Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot-preview[bot]
ffd32afdd8
Bump axios from 0.19.2 to 0.20.0
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.20.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.20.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-02 01:32:18 +00:00
14 changed files with 647 additions and 695 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
node_modules/
build/
.env
/.idea

View File

@ -5,12 +5,6 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.5.2] - 2020-09-10
### Fixed
- Remember last tracked project and task on card
## [1.5.1] - 2020-08-04
### Added

View File

@ -6,8 +6,8 @@
- run `yarn start:chrome` or `yarn start:firefox` (`yarn start` is an alias for `yarn start:chrome`)
- load extension into browser:
- Chrome: visit `chrome://extensions` and load unpacked extension from `build/chrome`
- Firefox: visit `about:debugging` and load temporary Add-on from `build/firefox/manifest.json`
- the browser should automatically pick up your changes but from time to time it may be useful to reload the extension
- Firefox: visit `about:debugging` and load temporary Add-on from `build/firefox`
- reload browser extension after change
## Production Build

View File

@ -1,7 +1,7 @@
{
"name": "moco-browser-extensions",
"description": "Browser plugin for MOCO",
"version": "1.5.2",
"version": "1.5.1",
"license": "MIT",
"scripts": {
"start": "yarn start:chrome",
@ -17,7 +17,7 @@
},
"dependencies": {
"@babel/polyfill": "^7.10.1",
"axios": "^0.19.2",
"axios": "^0.20.0",
"classnames": "^2.2.6",
"date-fns": "^2.15.0",
"dotenv": "^8.2.0",

View File

@ -1,11 +1,11 @@
import axios from "axios"
import { formatDate } from "utils"
const baseURL = (subdomain) => {
const baseURL = subdomain => {
if (process.env.NODE_ENV === "production") {
return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions`
} else {
return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions`
return `http://${encodeURIComponent(subdomain)}.mocoapp.localhost:3000/api/browser_extensions`
}
}
@ -27,7 +27,7 @@ export default class Client {
})
}
login = (service) =>
login = service =>
this.#client.post("session", {
api_key: this.#apiKey,
remote_service: service?.name,
@ -46,7 +46,7 @@ export default class Client {
params: { date: `${formatDate(fromDate)}:${formatDate(toDate)}` },
})
activitiesStatus = (service) => {
activitiesStatus = service => {
if (!service) {
return Promise.resolve({ data: { hours: 0 } })
}
@ -55,7 +55,7 @@ export default class Client {
})
}
createActivity = (activity) => this.#client.post("activities", { activity })
createActivity = activity => this.#client.post("activities", { activity })
stopTimer = (timedActivity) => this.#client.get(`activities/${timedActivity.id}/stop_timer`)
stopTimer = timedActivity => this.#client.get(`activities/${timedActivity.id}/stop_timer`)
}

View File

@ -25,7 +25,6 @@ import UnknownError from "components/Errors/UnknownError"
import Header from "./shared/Header"
import { head } from "lodash"
import TimeInputParser from "utils/TimeInputParser"
import {get} from "lodash/fp";
@observer
class App extends Component {
@ -69,12 +68,11 @@ class App extends Component {
@computed get project() {
const { service, projects, lastProjectId } = this.props
return (
findProjectByValue(this.changeset.assignment_id)(projects) ||
findProjectByValue(Number(lastProjectId))(projects) ||
findProjectByIdentifier(service?.projectId)(projects) ||
head(projects.flatMap(get("options")))
findProjectByValue(Number(lastProjectId))(projects) ||
head(projects)
)
}

View File

@ -1,3 +1,4 @@
import "mobx-react-lite/batchingForReactDom"
import React, { createRef } from "react"
import ReactDOM from "react-dom"
import { Transition, animated, config } from "react-spring/renderprops"

View File

@ -1,3 +1,4 @@
import "mobx-react-lite/batchingForReactDom"
import React from "react"
import ReactDOM from "react-dom"
import Options from "./components/Options"

View File

@ -1,3 +1,4 @@
import "mobx-react-lite/batchingForReactDom"
import React from "react"
import ReactDOM from "react-dom"
import App from "./components/App"

View File

@ -122,31 +122,18 @@ export default {
allowHostOverride: false,
},
mstodo: {
wunderlist: {
name: "wunderlist",
host: "https://to-do.office.com",
urlPatterns: [":host:/tasks/id/:id(*)"],
host: "https://www.wunderlist.com",
urlPatterns: [":host:/(webapp)#/tasks/:id(/*)"],
description: (document) =>
document
.querySelector(".detailHeader")
?.textContent?.replace(/^[^[]+\[/, "[")
.replace(projectRegex, "")
.trim(),
projectId: projectIdentifierBySelector(".detailHeader"),
.querySelector(".taskItem.selected .taskItem-titleWrapper-title")
?.textContent?.trim(),
projectId: projectIdentifierBySelector(".taskItem.selected .taskItem-titleWrapper-title"),
allowHostOverride: false,
},
gitbase: {
name: "gitlab",
host: "https://gitbase.de",
urlPatterns: [":host:/:owner/:repo/issues/:id"],
description: (document) =>
document.querySelector("#issue-title")?.textContent?.replace(projectRegex, "").trim(),
projectId: projectIdentifierBySelector(".select-project.list a"),
allowHostOverride: false,
},
/*
"gitlab-mr": {
name: "gitlab",
host: "https://gitlab.com",
@ -174,7 +161,6 @@ export default {
},
allowHostOverride: true,
},
*/
monday: {
name: "monday",

View File

@ -28,8 +28,6 @@ export function tabUpdated(tab, { messenger, settings }) {
const service = matcher(tab.url)
const apiClient = new ApiClient(settings)
// console.log(service)
if (service?.match?.id) {
messenger.postMessage(tab, { type: "requestService" })
@ -69,7 +67,7 @@ export function settingsChanged(settings, { messenger }) {
queryTabs({ currentWindow: true })
.then(reject(isBrowserTab))
.then(
forEach((tab) => {
forEach(tab => {
messenger.postMessage(tab, { type: "closePopup" })
tabUpdated(tab, { settings, messenger })
}),
@ -77,7 +75,7 @@ export function settingsChanged(settings, { messenger }) {
}
export function togglePopup(tab, { messenger }) {
return function ({ isOpen, service } = {}) {
return function({ isOpen, service } = {}) {
if (isNil(isOpen)) {
return
}

View File

@ -20,7 +20,7 @@ module.exports = (env) => {
...manifest,
permissions: compact([
...manifest.permissions,
env.NODE_ENV === "development" ? "https://*.mocoapp.com/*" : null,
env.NODE_ENV === "development" ? "http://*.mocoapp.localhost/*" : null,
]),
options_ui: {
...manifest.options_ui,

View File

@ -21,7 +21,7 @@ module.exports = (env) => {
...manifest,
permissions: compact([
...manifest.permissions,
env.NODE_ENV === "development" ? "https://*.mocoapp.com/*" : null,
env.NODE_ENV === "development" ? "http://*.mocoapp.localhost/*" : null,
]),
options_ui: {
...manifest.options_ui,

1270
yarn.lock

File diff suppressed because it is too large Load Diff