From 81f435002811db98d9757e15c4176cc699d99b04 Mon Sep 17 00:00:00 2001 From: Jess Date: Sat, 2 Mar 2019 09:44:24 -0800 Subject: [PATCH 1/5] Added call to donate after npm install (optional) --- package.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 136bf87..fc01950 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,15 @@ "diff": "^4.0.1", "js-base64": "^2.5.1", "netlify-auth-providers": "^1.0.0-alpha5", + "opencollective-postinstall": "^2.0.2", "prismjs": "^1.15.0", "react": "^16.8.1", "react-dom": "^16.8.1", "react-scripts": "2.1.3", "react-swipeable": "^4.3.2", "react-use": "^5.2.2", - "workerize-loader": "^1.0.4" + "workerize-loader": "^1.0.4", + "opencollective": "^1.0.3" }, "scripts": { "start": "craco start", @@ -23,7 +25,8 @@ "test-prettier": "prettier --check \"**/*.{js,jsx,md,json,html,css,yml}\" --ignore-path .gitignore", "test-cra": "react-scripts test", "test": "run-s test-prettier test-cra", - "eject": "react-scripts eject" + "eject": "react-scripts eject", + "postinstall": "opencollective-postinstall" }, "eslintConfig": { "extends": "react-app" @@ -37,5 +40,9 @@ "devDependencies": { "npm-run-all": "^4.1.5", "prettier": "^1.16.4" + }, + "collective": { + "type": "opencollective", + "url": "https://opencollective.com/git-history" } -} +} \ No newline at end of file From 5057637c3250b9bdc16bd88ebc3121f281a3c12f Mon Sep 17 00:00:00 2001 From: jess Date: Sat, 2 Mar 2019 10:00:47 -0800 Subject: [PATCH 2/5] Update readme.md added badges and credits --- readme.md | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/readme.md b/readme.md index 8ca2082..72fe38f 100755 --- a/readme.md +++ b/readme.md @@ -5,6 +5,8 @@ # [Git History](https://githistory.xyz) +[![Backers on Open Collective](https://opencollective.com/git-history/backers/badge.svg)](#backers) +[![Sponsors on Open Collective](https://opencollective.com/git-history/sponsors/badge.svg)](#sponsors) Quickly browse the history of any GitHub ([GitLab and Bitbucket coming soon](https://github.com/pomber/git-history/issues/14)) file: @@ -53,19 +55,6 @@ $ npm install -g git-file-history $ git-file-history path/to/file.ext ``` -## Sponsors - -[Become a Sponsor](https://opencollective.com/git-history) to help us ship more features! - -
- - - -
- ## Credits Based on these amazing projects: @@ -74,6 +63,25 @@ Based on these amazing projects: - [jsdiff](https://github.com/kpdecker/jsdiff) by [Kevin Decker](https://twitter.com/kpdecker) - [Night Owl](https://github.com/sdras/night-owl-vscode-theme) by [Sarah Drasner](https://twitter.com/sarah_edo) +### Contributors + +This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. + + +### Backers + +Thank you to all our backers! ๐Ÿ™ [[Become a backer](https://opencollective.com/git-history#backer)] + + + +### Sponsors + +Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/git-history#sponsor)] + + + + + ## License MIT From f92092a6dc6d0a23fd8033bfda8ca7b90939bf66 Mon Sep 17 00:00:00 2001 From: Rodrigo Pombo Date: Sun, 17 Mar 2019 02:19:19 -0300 Subject: [PATCH 3/5] Change readme order --- cli/package.json | 8 +++++++- cli/yarn.lock | 5 +++++ package.json | 4 +--- readme.md | 34 +++++++++++++++------------------- yarn.lock | 5 +++++ 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/cli/package.json b/cli/package.json index 58f77c1..8f9f6b8 100644 --- a/cli/package.json +++ b/cli/package.json @@ -31,14 +31,20 @@ "koa-router": "^7.4.0", "koa-static": "^5.0.0", "open": "^0.0.5", + "opencollective-postinstall": "^2.0.2", "serve-handler": "^5.0.8" }, "scripts": { "build-site": "cd .. && cross-env REACT_APP_GIT_PROVIDER=cli yarn build && rm -fr cli/site/ && cp -r build/ cli/site/", "build": "yarn build-site", - "ls-package": "npm pack && tar -xvzf *.tgz && rm -rf package *.tgz" + "ls-package": "npm pack && tar -xvzf *.tgz && rm -rf package *.tgz", + "postinstall": "opencollective-postinstall" }, "devDependencies": { "cross-env": "^5.2.0" + }, + "collective": { + "type": "opencollective", + "url": "https://opencollective.com/git-history" } } diff --git a/cli/yarn.lock b/cli/yarn.lock index ba3ce01..0c3d9e2 100644 --- a/cli/yarn.lock +++ b/cli/yarn.lock @@ -427,6 +427,11 @@ open@^0.0.5: resolved "https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc" integrity sha1-QsPhjslUZra/DcQvOilFw/DK2Pw= +opencollective-postinstall@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" + integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" diff --git a/package.json b/package.json index 34d2653..943efba 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,6 @@ "react-scripts": "2.1.3", "react-swipeable": "^4.3.2", "react-use": "^5.2.2", - "workerize-loader": "^1.0.4", - "opencollective": "^1.0.3", "rebound": "^0.1.0", "workerize-loader": "^1.0.4" }, @@ -55,4 +53,4 @@ "type": "opencollective", "url": "https://opencollective.com/git-history" } -} \ No newline at end of file +} diff --git a/readme.md b/readme.md index 72fe38f..fb0340c 100755 --- a/readme.md +++ b/readme.md @@ -5,8 +5,6 @@ # [Git History](https://githistory.xyz) -[![Backers on Open Collective](https://opencollective.com/git-history/backers/badge.svg)](#backers) -[![Sponsors on Open Collective](https://opencollective.com/git-history/sponsors/badge.svg)](#sponsors) Quickly browse the history of any GitHub ([GitLab and Bitbucket coming soon](https://github.com/pomber/git-history/issues/14)) file: @@ -21,9 +19,9 @@ coming soon](https://github.com/pomber/git-history/issues/14)) file: ## Browser Extensions -You can also add an `Open in Git History` button to GitHub with the [Chrome](https://chrome.google.com/webstore/detail/github-history-browser-ex/laghnmifffncfonaoffcndocllegejnf) and [Firefox](https://addons.mozilla.org/firefox/addon/github-history/) extensions. +You can also add an `Open in Git History` button to GitHub, GitLab and Bitbucket with the [Chrome](https://chrome.google.com/webstore/detail/github-history-browser-ex/laghnmifffncfonaoffcndocllegejnf) and [Firefox](https://addons.mozilla.org/firefox/addon/github-history/) extensions. -Or you can use this bookmarklet([?](https://en.wikipedia.org/wiki/Bookmarklet)): +
Or you can use a bookmarklet. ```javascript javascript: (function() { @@ -38,6 +36,8 @@ javascript: (function() { })(); ``` +
+ ## [CLI](https://github.com/pomber/git-history/tree/master/cli) There's also a command line version of Git History that works with any local git repo: @@ -55,18 +55,11 @@ $ npm install -g git-file-history $ git-file-history path/to/file.ext ``` -## Credits +### Sponsors -Based on these amazing projects: +Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/git-history#sponsor)] -- [Prism](https://github.com/PrismJS/prism) by [Lea Verou](https://twitter.com/leaverou) -- [jsdiff](https://github.com/kpdecker/jsdiff) by [Kevin Decker](https://twitter.com/kpdecker) -- [Night Owl](https://github.com/sdras/night-owl-vscode-theme) by [Sarah Drasner](https://twitter.com/sarah_edo) - -### Contributors - -This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. - + ### Backers @@ -74,16 +67,19 @@ Thank you to all our backers! ๐Ÿ™ [[Become a backer](https://opencollective.com -### Sponsors +### Contributors -Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/git-history#sponsor)] +This project exists thanks to all the people who contribute. + - +### Credits +Based on these amazing projects: +- [Prism](https://github.com/PrismJS/prism) by [Lea Verou](https://twitter.com/leaverou) +- [jsdiff](https://github.com/kpdecker/jsdiff) by [Kevin Decker](https://twitter.com/kpdecker) +- [Night Owl](https://github.com/sdras/night-owl-vscode-theme) by [Sarah Drasner](https://twitter.com/sarah_edo) ## License MIT - -This project is not affiliated, associated, authorized, endorsed by, or in any way officially connected with GitHub, or any of its subsidiaries or its affiliates. diff --git a/yarn.lock b/yarn.lock index b92b449..ed3215b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8461,6 +8461,11 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" +opencollective-postinstall@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" + integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + opn@5.4.0, opn@^5.1.0, opn@^5.4.0: version "5.4.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035" From ddecb87456678aba224c2f474d09182056f4f417 Mon Sep 17 00:00:00 2001 From: Rodrigo Pombo Date: Sun, 17 Mar 2019 02:30:31 -0300 Subject: [PATCH 4/5] Add sponsors and backers to other readmes --- cli/readme.md | 12 ++++++++++++ vscode-ext/readme.md | 19 +++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/cli/readme.md b/cli/readme.md index dffd23f..1051691 100644 --- a/cli/readme.md +++ b/cli/readme.md @@ -18,3 +18,15 @@ or $ npm install -g git-file-history $ git-file-history path/to/file.ext ``` + +### Sponsors + +Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/git-history#sponsor)] + + + +### Backers + +Thank you to all our backers! ๐Ÿ™ [[Become a backer](https://opencollective.com/git-history#backer)] + + diff --git a/vscode-ext/readme.md b/vscode-ext/readme.md index d74332a..d8a66fe 100644 --- a/vscode-ext/readme.md +++ b/vscode-ext/readme.md @@ -4,15 +4,14 @@ Quickly browse the history of a file from any git repository ![feature X](https://user-images.githubusercontent.com/1911623/52807635-d5043480-306a-11e9-9b03-351b7cda4936.gif) -## Sponsors +### Sponsors -[Become a Sponsor](https://opencollective.com/git-history) to help us ship more features! +Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/git-history#sponsor)] -
- - - -
+ + +### Backers + +Thank you to all our backers! ๐Ÿ™ [[Become a backer](https://opencollective.com/git-history#backer)] + + From eb6e304260d5a97f50b43d28f6c5b8dff90f38c7 Mon Sep 17 00:00:00 2001 From: Rodrigo Pombo Date: Sun, 17 Mar 2019 03:09:25 -0300 Subject: [PATCH 5/5] Add open collective widgets to landing --- public/index.html | 4 ++++ src/landing.js | 51 +++++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/public/index.html b/public/index.html index 57445cf..e1647d8 100755 --- a/public/index.html +++ b/public/index.html @@ -14,6 +14,10 @@ homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/ --> +