Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The PR #662

Merged
merged 96 commits into from
Nov 14, 2018
Merged
Show file tree
Hide file tree
Changes from 74 commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
ca03a85
init: almost starting fresh
hacdias Sep 25, 2018
bc98437
wip: cleanup and leave only interesting files
hacdias Sep 25, 2018
7bedd38
wip: add menubar flow
hacdias Sep 25, 2018
32a623b
wip: try out preload script
hacdias Sep 25, 2018
4547a18
wip: asyncify more windows
hacdias Sep 26, 2018
4bed121
wip: reuse some old hooks
hacdias Sep 26, 2018
7aa88cc
wip: more structure changes
hacdias Sep 26, 2018
88d1628
wip: dump electron-compile and just babel it
hacdias Sep 26, 2018
5d9703f
wip: fix package.json
hacdias Sep 26, 2018
018178e
wip: structure
hacdias Sep 26, 2018
7104aa2
wip: launch webui works
hacdias Sep 26, 2018
7aa0980
wip: add important comment
hacdias Sep 26, 2018
1487b8f
wip: add navbar
hacdias Sep 26, 2018
a218ceb
wip: some logic on configurations work
hacdias Sep 26, 2018
910804d
wip: some logic on configurations work
hacdias Sep 26, 2018
438fcea
wip: conn manager
hacdias Sep 26, 2018
b9180ad
wip: works on connection logic
hacdias Sep 27, 2018
9e5b189
wip: some more work on settings
hacdias Sep 27, 2018
6ba8a50
wip: some bug fixes and tested with js-ipfs, go-ipfs and remote api a…
hacdias Sep 27, 2018
0b96839
wip: dont require babel on packaged app
hacdias Sep 27, 2018
31f4d3b
wip: connections improvement
hacdias Sep 27, 2018
2c196a9
wip: screenshot hook working
hacdias Sep 27, 2018
a73c2ba
wip: download hash shortcut working
hacdias Sep 27, 2018
2790dce
feat: add icons
hacdias Sep 28, 2018
bc9887f
feat: fix node-gyp errors
hacdias Sep 28, 2018
3e2ae4b
wip: upd pkg lock
hacdias Sep 28, 2018
fce423f
feat: add logging and start/stop ipfs
hacdias Sep 29, 2018
9c9aeb3
wip: logging & action names
hacdias Sep 29, 2018
17f7bee
wip: jenkins
hacdias Sep 30, 2018
0ad1bcb
wip: license
hacdias Oct 1, 2018
7c76e3a
wip: readme
hacdias Oct 1, 2018
9369c44
chore: update deps
hacdias Oct 1, 2018
1e19193
wip: update scripts
hacdias Oct 2, 2018
b2242f2
wip: conn manager tweaks
hacdias Oct 3, 2018
62ee98f
wip: working with static info
hacdias Oct 3, 2018
5f15c76
wip: beating heart and more
hacdias Oct 3, 2018
74b90e4
wip: working without settings
hacdias Oct 3, 2018
7b3be0e
wip: use some components from Web UI
hacdias Oct 3, 2018
b70e701
checkbox options
hacdias Oct 3, 2018
adcd91f
wip: remove useless class
hacdias Oct 3, 2018
6e86f24
wip: peers count
hacdias Oct 3, 2018
107f952
wip: download and pack webui
hacdias Oct 3, 2018
2d04c4a
wip: organisation and settings
hacdias Oct 3, 2018
efec9b2
wip: getting much better
hacdias Oct 3, 2018
6a28409
wip: add TODOs and fix bug
hacdias Oct 3, 2018
9bfc722
wip: one more in-comment TODO
hacdias Oct 3, 2018
72dc499
fix: inject api addr into local storage
hacdias Oct 4, 2018
f5ee147
wip: open logs folder
hacdias Oct 4, 2018
b5fc85a
wip: add more info
hacdias Oct 4, 2018
bc9a16b
wip: better UI to add new connection
hacdias Oct 7, 2018
0656c50
wip: some new defaults and updates
hacdias Oct 8, 2018
eeb1ded
wip: move general settings to its own component
hacdias Oct 10, 2018
74726b2
wip: separate stuff
hacdias Oct 10, 2018
1386640
wip: just wip [DONT USE]
hacdias Oct 10, 2018
0ec6b1d
wip
hacdias Oct 10, 2018
5769061
wip: wip
hacdias Oct 10, 2018
c896e1b
wipy wip
hacdias Oct 12, 2018
7949139
prettier sentences
hacdias Oct 18, 2018
cac5dc8
small updates
hacdias Oct 19, 2018
9e812aa
feat: separate settings window from menubar
hacdias Oct 23, 2018
8eea74e
simplify window creation
hacdias Oct 24, 2018
859c0e6
make menubar similar to Oli's designs
hacdias Oct 25, 2018
4b76edd
add ipfs toggler
hacdias Oct 25, 2018
67cc116
chore: update dependencies
hacdias Oct 25, 2018
2b6758f
feat: remove settings and reuse web ui window
hacdias Nov 3, 2018
7bf4abe
refactor: match user experience during development
hacdias Nov 3, 2018
f8a3e4e
feat: open at 1440x900 or max screen size
hacdias Nov 3, 2018
19590ee
inject bundle on webui
hacdias Nov 9, 2018
13964ea
fix link
hacdias Nov 9, 2018
cd88316
feat: save window size
hacdias Nov 9, 2018
4170704
feat: bettertransition between running and stopped
hacdias Nov 9, 2018
e318911
fix: toggler
hacdias Nov 9, 2018
f40c3c3
fix: only one conn
hacdias Nov 10, 2018
4a66f3e
chore: update deps
hacdias Nov 10, 2018
8b79e51
fix: use same bundle name as in webui
hacdias Nov 12, 2018
9e425ea
fix: http fetch of webui
lidel Nov 12, 2018
f6428e3
Merge branch 'new' of https://github.com/ipfs-shipyard/ipfs-desktop i…
hacdias Nov 13, 2018
e610700
fix: dont recompile webui
hacdias Nov 13, 2018
077d9ba
fix: script for everyone
hacdias Nov 13, 2018
68070ec
fix: download webui to rihgt place
hacdias Nov 13, 2018
f083ffb
fix: correct name
hacdias Nov 14, 2018
d6bcaa5
feat: add to storybook
hacdias Nov 14, 2018
793845a
docs: fix license date
hacdias Nov 14, 2018
9c9713a
feat: show actual repo size
hacdias Nov 14, 2018
d53fbd0
fix: webui not loading
hacdias Nov 14, 2018
a2f84f1
chore: remove icons/*.js
hacdias Nov 14, 2018
25b70ff
fix: add icons/*.js to ignore
hacdias Nov 14, 2018
18f0329
chore: execute build:icons and bukld:webui after install deps
hacdias Nov 14, 2018
9ddd691
refactor: opts Ã--> cx, use ipfsd directly
hacdias Nov 14, 2018
1b0cb96
fix: update intervals and remove unused css
hacdias Nov 14, 2018
6f71b5f
fix: window.ipfsDesktop is not a bundle anymore
hacdias Nov 14, 2018
20d9ede
fix: object has been destroyed
hacdias Nov 14, 2018
346b55e
Update README.md
hacdias Nov 14, 2018
02a5b24
docs: simplify README until we get something better
hacdias Nov 14, 2018
66176e2
Update README.md
hacdias Nov 14, 2018
54c1f33
Merge branch 'master' into new
hacdias Nov 14, 2018
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
17 changes: 7 additions & 10 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{
"env": {
"test": {
"plugins": [ "istanbul" ]
}
},
{
"presets": [
"env",
"stage-2",
"react"
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-transform-runtime"
]
}
}
38 changes: 0 additions & 38 deletions .compilerc

This file was deleted.

1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

7 changes: 0 additions & 7 deletions .eslintrc.js

This file was deleted.

13 changes: 3 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
node_modules
build
release
out
*.log
*.lock
package-lock.json
dist
*.zip
coverage
.nyc_output
coverage.lcov
.cache
.cache
config.gypi
src/hooks/webui/app
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

43 changes: 0 additions & 43 deletions CONTRIBUTING.md

This file was deleted.

1 change: 0 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,4 @@ This repository falls under the IPFS [Code of Conduct](https://github.com/ipfs/c

## License

[MIT 2016 Protocol Labs, Inc.](./LICENSE)
[MIT 2016 Protocol Labs, Inc.](./LICENSE)
hacdias marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
File renamed without changes.
52 changes: 51 additions & 1 deletion ci/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1 +1,51 @@
electronForge()
import groovy.transform.Field

@Field final String nodeVersion = '10.4.1'
@Field final String yarnVersion = '1.10.1'
@Field final String yarnPath = './node_modules/.bin/yarn'

def windowsStep () {
node(label: 'windows') {
ansiColor('xterm') {
bat 'git config --global core.autocrlf input'
checkout scm
fileExists 'package.json'
nodejs(nodeVersion) {
bat 'del /s /q node_modules >nul 2>&1'
bat "npm install yarn@${yarnVersion}"
bat "${yarnPath} config set msvs_version 2015 --global"
bat "${yarnPath} --mutex network"
bat "${yarnPath} lint"
bat "${yarnPath} build"
archiveArtifacts 'dist\\*'
cleanWs()
}
}
}
}

def unixStep(nodeLabel) {
node(label: nodeLabel) {
ansiColor('xterm') {
checkout scm
fileExists 'package.json'
nodejs(nodeVersion) {
sh 'rm -rf node_modules/'
sh "npm install yarn@${yarnVersion}"
sh "${yarnPath} --mutex network"
sh "${yarnPath} lint"
sh "${yarnPath} build"
archiveArtifacts 'dist/*'
cleanWs()
}
}
}
}

stage('Builds') {
parallel(
"windows": { windowsStep() },
"macos": { unixStep("macos") },
"linux": { unixStep("linux") }
)
}
Loading