Compare commits
1 Commits
master
...
dependabot
Author | SHA1 | Date | |
---|---|---|---|
|
8ea724779d |
@ -45,7 +45,7 @@
|
|||||||
"babel-plugin-module-resolver": "^4.0.0",
|
"babel-plugin-module-resolver": "^4.0.0",
|
||||||
"clean-webpack-plugin": "^3.0.0",
|
"clean-webpack-plugin": "^3.0.0",
|
||||||
"copy-webpack-plugin": "^6.0.2",
|
"copy-webpack-plugin": "^6.0.2",
|
||||||
"copyfiles": "^2.3.0",
|
"copyfiles": "^2.4.0",
|
||||||
"css-loader": "^4.2.0",
|
"css-loader": "^4.2.0",
|
||||||
"eslint": "7.6.0",
|
"eslint": "7.6.0",
|
||||||
"eslint-config-prettier": "^6.11.0",
|
"eslint-config-prettier": "^6.11.0",
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
import axios from "axios"
|
import axios from "axios"
|
||||||
import { formatDate } from "utils"
|
import { formatDate } from "utils"
|
||||||
|
|
||||||
const baseURL = (subdomain) => {
|
const baseURL = subdomain => {
|
||||||
if (process.env.NODE_ENV === "production") {
|
if (process.env.NODE_ENV === "production") {
|
||||||
return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions`
|
return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions`
|
||||||
} else {
|
} 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", {
|
this.#client.post("session", {
|
||||||
api_key: this.#apiKey,
|
api_key: this.#apiKey,
|
||||||
remote_service: service?.name,
|
remote_service: service?.name,
|
||||||
@ -46,7 +46,7 @@ export default class Client {
|
|||||||
params: { date: `${formatDate(fromDate)}:${formatDate(toDate)}` },
|
params: { date: `${formatDate(fromDate)}:${formatDate(toDate)}` },
|
||||||
})
|
})
|
||||||
|
|
||||||
activitiesStatus = (service) => {
|
activitiesStatus = service => {
|
||||||
if (!service) {
|
if (!service) {
|
||||||
return Promise.resolve({ data: { hours: 0 } })
|
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`)
|
||||||
}
|
}
|
||||||
|
@ -122,31 +122,18 @@ export default {
|
|||||||
allowHostOverride: false,
|
allowHostOverride: false,
|
||||||
},
|
},
|
||||||
|
|
||||||
mstodo: {
|
wunderlist: {
|
||||||
name: "wunderlist",
|
name: "wunderlist",
|
||||||
host: "https://to-do.office.com",
|
host: "https://www.wunderlist.com",
|
||||||
urlPatterns: [":host:/tasks/id/:id(*)"],
|
urlPatterns: [":host:/(webapp)#/tasks/:id(/*)"],
|
||||||
description: (document) =>
|
description: (document) =>
|
||||||
document
|
document
|
||||||
.querySelector(".detailHeader")
|
.querySelector(".taskItem.selected .taskItem-titleWrapper-title")
|
||||||
?.textContent?.replace(/^[^[]+\[/, "[")
|
?.textContent?.trim(),
|
||||||
.replace(projectRegex, "")
|
projectId: projectIdentifierBySelector(".taskItem.selected .taskItem-titleWrapper-title"),
|
||||||
.trim(),
|
|
||||||
projectId: projectIdentifierBySelector(".detailHeader"),
|
|
||||||
allowHostOverride: false,
|
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": {
|
"gitlab-mr": {
|
||||||
name: "gitlab",
|
name: "gitlab",
|
||||||
host: "https://gitlab.com",
|
host: "https://gitlab.com",
|
||||||
@ -174,7 +161,6 @@ export default {
|
|||||||
},
|
},
|
||||||
allowHostOverride: true,
|
allowHostOverride: true,
|
||||||
},
|
},
|
||||||
*/
|
|
||||||
|
|
||||||
monday: {
|
monday: {
|
||||||
name: "monday",
|
name: "monday",
|
||||||
|
@ -28,8 +28,6 @@ export function tabUpdated(tab, { messenger, settings }) {
|
|||||||
const service = matcher(tab.url)
|
const service = matcher(tab.url)
|
||||||
const apiClient = new ApiClient(settings)
|
const apiClient = new ApiClient(settings)
|
||||||
|
|
||||||
// console.log(service)
|
|
||||||
|
|
||||||
if (service?.match?.id) {
|
if (service?.match?.id) {
|
||||||
messenger.postMessage(tab, { type: "requestService" })
|
messenger.postMessage(tab, { type: "requestService" })
|
||||||
|
|
||||||
@ -69,7 +67,7 @@ export function settingsChanged(settings, { messenger }) {
|
|||||||
queryTabs({ currentWindow: true })
|
queryTabs({ currentWindow: true })
|
||||||
.then(reject(isBrowserTab))
|
.then(reject(isBrowserTab))
|
||||||
.then(
|
.then(
|
||||||
forEach((tab) => {
|
forEach(tab => {
|
||||||
messenger.postMessage(tab, { type: "closePopup" })
|
messenger.postMessage(tab, { type: "closePopup" })
|
||||||
tabUpdated(tab, { settings, messenger })
|
tabUpdated(tab, { settings, messenger })
|
||||||
}),
|
}),
|
||||||
@ -77,7 +75,7 @@ export function settingsChanged(settings, { messenger }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function togglePopup(tab, { messenger }) {
|
export function togglePopup(tab, { messenger }) {
|
||||||
return function ({ isOpen, service } = {}) {
|
return function({ isOpen, service } = {}) {
|
||||||
if (isNil(isOpen)) {
|
if (isNil(isOpen)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ module.exports = (env) => {
|
|||||||
...manifest,
|
...manifest,
|
||||||
permissions: compact([
|
permissions: compact([
|
||||||
...manifest.permissions,
|
...manifest.permissions,
|
||||||
env.NODE_ENV === "development" ? "https://*.mocoapp.com/*" : null,
|
env.NODE_ENV === "development" ? "http://*.mocoapp.localhost/*" : null,
|
||||||
]),
|
]),
|
||||||
options_ui: {
|
options_ui: {
|
||||||
...manifest.options_ui,
|
...manifest.options_ui,
|
||||||
|
@ -21,7 +21,7 @@ module.exports = (env) => {
|
|||||||
...manifest,
|
...manifest,
|
||||||
permissions: compact([
|
permissions: compact([
|
||||||
...manifest.permissions,
|
...manifest.permissions,
|
||||||
env.NODE_ENV === "development" ? "https://*.mocoapp.com/*" : null,
|
env.NODE_ENV === "development" ? "http://*.mocoapp.localhost/*" : null,
|
||||||
]),
|
]),
|
||||||
options_ui: {
|
options_ui: {
|
||||||
...manifest.options_ui,
|
...manifest.options_ui,
|
||||||
|
14
yarn.lock
14
yarn.lock
@ -2678,16 +2678,17 @@ copy-webpack-plugin@^6.0.2:
|
|||||||
serialize-javascript "^4.0.0"
|
serialize-javascript "^4.0.0"
|
||||||
webpack-sources "^1.4.3"
|
webpack-sources "^1.4.3"
|
||||||
|
|
||||||
copyfiles@^2.3.0:
|
copyfiles@^2.4.0:
|
||||||
version "2.3.0"
|
version "2.4.0"
|
||||||
resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.3.0.tgz#1c26ebbe3d46bba2d309a3fd8e3aaccf53af8c76"
|
resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.0.tgz#fcac72a4f2b882f021dd156b4bcf6d71315487bd"
|
||||||
integrity sha512-73v7KFuDFJ/ofkQjZBMjMBFWGgkS76DzXvBMUh7djsMOE5EELWtAO/hRB6Wr5Vj5Zg+YozvoHemv0vnXpqxmOQ==
|
integrity sha512-yGjpR3yjQdxccW8EcJ4a7ZCA6wGER6/Q2Y+b7bXbVxGeSHBf93i9d7MzTsx+VV1CpMKQa3v4ThZfXBcltMzl0w==
|
||||||
dependencies:
|
dependencies:
|
||||||
glob "^7.0.5"
|
glob "^7.0.5"
|
||||||
minimatch "^3.0.3"
|
minimatch "^3.0.3"
|
||||||
mkdirp "^1.0.4"
|
mkdirp "^1.0.4"
|
||||||
noms "0.0.0"
|
noms "0.0.0"
|
||||||
through2 "^2.0.1"
|
through2 "^2.0.1"
|
||||||
|
untildify "^4.0.0"
|
||||||
yargs "^15.3.1"
|
yargs "^15.3.1"
|
||||||
|
|
||||||
core-js-compat@^3.6.2:
|
core-js-compat@^3.6.2:
|
||||||
@ -7982,6 +7983,11 @@ unset-value@^1.0.0:
|
|||||||
has-value "^0.3.1"
|
has-value "^0.3.1"
|
||||||
isobject "^3.0.0"
|
isobject "^3.0.0"
|
||||||
|
|
||||||
|
untildify@^4.0.0:
|
||||||
|
version "4.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
|
||||||
|
integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
|
||||||
|
|
||||||
upath@^1.1.1:
|
upath@^1.1.1:
|
||||||
version "1.2.0"
|
version "1.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
|
resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
|
||||||
|
Loading…
Reference in New Issue
Block a user