Skip to content

[WIP] Update Dependencies and Small Improvements #605

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 22, 2017
Merged

[WIP] Update Dependencies and Small Improvements #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e46508d
Update Dependencies
hacdias Nov 11, 2017
d24e747
Make some loops more javascripty
hacdias Nov 21, 2017
f42933b
update dep
hacdias Nov 21, 2017
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
7 changes: 3 additions & 4 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"presets": ["es2015", "stage-0", "react"],
"presets": ["@babel/env", "@babel/stage-0", "@babel/react"],
"plugins": [
"transform-runtime"
"@babel/transform-runtime"
],
"env": {
"development": {
"presets": ["react-hmre"],
"plugins": [
"transform-react-display-name"
"@babel/transform-react-display-name"
]
}
}
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package-lock.json
yarn.lock.json
node_modules/
.module-cache
cache/
npm-debug.log
dist/*.*
dist/*.*
18 changes: 6 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,15 @@
[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
[![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
[![Dependency Status](https://david-dm.org/ipfs/webui.svg?style=flat-square)](https://david-dm.org/ipfs/webui)
[![Circle CI](https://img.shields.io/circleci/project/ipfs/webui/master.svg?style=flat-square)](https://circleci.com/gh/ipfs/webui)
[![Travis CI](https://img.shields.io/travis/ipfs/webui/master.svg?style=flat-square)](https://travis-ci.org/ipfs/webui)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fipfs%2Fwebui.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fipfs%2Fwebui?ref=badge_shield)
[![](https://david-dm.org/ipfs/webui.svg?style=flat-square)](https://david-dm.org/ipfs/webui)
[![](https://img.shields.io/circleci/project/ipfs/webui/master.svg?style=flat-square)](https://circleci.com/gh/ipfs/webui)
[![](https://img.shields.io/travis/ipfs/webui/master.svg?style=flat-square)](https://travis-ci.org/ipfs/webui)
[![](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fipfs%2Fwebui.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fipfs%2Fwebui?ref=badge_shield)

> The web interface for [IPFS](https://ipfs.io/)

IPFS Webui is a web interface for IPFS, the Interplanetary File System. With the interface, you can check on your node info, network addresses, see connections on a globe visually, see your files, look at your config and logs without needing to touch the CLI, and more. This interface uses the [js-ipfs-api](//github.com/ipfs/js-ipfs-api) for all of its heavy lifting.

# Status
> IPFS Webui is a web interface for [IPFS](https://ipfs.io), the Interplanetary File System. With the interface, you can check on your node info, network addresses, see connections on a globe visually, see your files, look at your config and logs without needing to touch the CLI, and more. This interface uses the [js-ipfs-api](//github.com/ipfs/js-ipfs-api) for all of its heavy lifting.

The webui is a **work-in-progress**. Follow the [development](#development) processes below to check it out.

Otherwise, if you're curious about IPFS, head over to [ipfs/ipfs](//github.com/ipfs/ipfs), or to the [golang](//github.com/ipfs/go-ipfs) or [nodejs](//github.com/ipfs/js-ipfs) implementations. The [website](https://ipfs.io) also has a host of resources on how to get started.

# Usage

## Config your IPFS Daemon
Expand Down Expand Up @@ -65,7 +59,7 @@ It might be a good idea to copy the `.ipfs/config` file somewhere with a useful

# Development

Make sure [node.js](https://nodejs.org/) version 4+ and [npm](https://docs.npmjs.com/) version 3+ are installed and in your path.
Make sure [node.js](https://nodejs.org/) version 6 and [npm](https://docs.npmjs.com/) version 3+ are installed and in your path.

# Contribute

Expand Down
6 changes: 0 additions & 6 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ machine:
node:
version: stable

dependencies:
override:
# Ensure latest npm to avoid https://github.com/npm/npm/issues/10026
- npm install -g npm
- npm install

test:
override:
- npm run lint
Expand Down
136 changes: 68 additions & 68 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,95 +14,95 @@
"dependencies": {
"bl": "^1.2.1",
"bootstrap": "^3.3.7",
"create-react-class": "^15.6.0",
"d3": "^4.9.1",
"fbjs": "^0.8.12",
"create-react-class": "^15.6.2",
"d3": "^4.11.0",
"fbjs": "^0.8.16",
"font-awesome": "^4.7.0",
"i18next": "^8.4.2",
"i18next-browser-languagedetector": "^2.0.0",
"i18next": "^10.0.7",
"i18next-browser-languagedetector": "^2.1.0",
"i18next-localstorage-cache": "^1.1.1",
"i18next-sprintf-postprocessor": "^0.2.2",
"i18next-xhr-backend": "^1.4.2",
"ipfs-api": "^14.0.4",
"ipfs-geoip": "^2.2.0",
"i18next-xhr-backend": "^1.5.0",
"ipfs-api": "^17.0.1",
"ipfs-geoip": "^2.3.0",
"is-binary": "^0.1.0",
"lodash-es": "^4.17.4",
"multiaddr": "^2.3.0",
"prettysize": "^0.1.0",
"prop-types": "^15.5.10",
"react": "^15.6.1",
"react-bootstrap": "^0.31.0",
"react-contextmenu": "^2.6.3",
"react-dnd": "^2.4.0",
"react-dnd-html5-backend": "^2.4.1",
"react-dom": "^15.6.1",
"react-html5video": "^2.2.0",
"react-redux": "^5.0.5",
"react-redux-toastr": "^6.2.4",
"react-router": "3.0.2",
"react-router-bootstrap": "0.23.1",
"react-router-redux": "^4.0.8",
"react-syntax-highlighter": "^5.6.2",
"readable-stream": "1.1.14",
"redux": "^3.7.0",
"redux-saga": "^0.15.4",
"safe-buffer": "^5.1.1",
"three": "^0.86.0"
"multiaddr": "^3.0.1",
"prettysize": "^1.1.0",
"prop-types": "^15.6.0",
"react": "^16.1.1",
"react-bootstrap": "^0.31.5",
"react-contextmenu": "^2.8.0",
"react-dnd": "^2.5.4",
"react-dnd-html5-backend": "^2.5.4",
"react-dom": "^16.1.1",
"react-html5video": "^2.5.1",
"react-redux": "^5.0.6",
"react-redux-toastr": "^7.1.6",
"react-router": "^4.2.0",
"react-router-bootstrap": "^0.24.4r",
"react-router-dom": "^4.2.2",
"react-router-redux": "^5.0.0-alpha.8",
"react-syntax-highlighter": "^6.0.3",
"readable-stream": "^2.3.3",
"redux": "^3.7.2",
"redux-saga": "^0.16.0",
"three": "^0.88.0"
},
"devDependencies": {
"autoprefixer": "^7.1.1",
"babel": "^6.23.0",
"babel-core": "^6.25.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.0",
"babel-plugin-transform-react-display-name": "^6.25.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.23.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-react-hmre": "^1.1.1",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.23.0",
"chai": "^4.0.2",
"chai-enzyme": "^0.7.1",
"cheerio": "^1.0.0-rc.1",
"@babel/cli": "^7.0.0-beta.32",
"@babel/core": "^7.0.0-beta.32",
"@babel/plugin-transform-react-display-name": "^7.0.0-beta.32",
"@babel/plugin-transform-runtime": "^7.0.0-beta.32",
"@babel/polyfill": "^7.0.0-beta.32",
"@babel/preset-env": "^7.0.0-beta.32",
"@babel/preset-react": "^7.0.0-beta.32",
"@babel/preset-stage-0": "^7.0.0-beta.32",
"@babel/runtime": "^7.0.0-beta.32",
"autoprefixer": "^7.1.6",
"babel-eslint": "^8.0.2",
"babel-loader": "^8.0.0-beta.0",
"chai": "^4.1.2",
"chai-enzyme": "^1.0.0-beta.0",
"cheerio": "^1.0.0-rc.2",
"classnames": "^2.2.5",
"css-loader": "^0.28.4",
"debug": "^2.6.8",
"enzyme": "^2.9.1",
"eslint": "^4.1.0",
"css-loader": "^0.28.7",
"debug": "^3.1.0",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "^1.1.0",
"eslint": "^4.11.0",
"eslint-config-standard": "^10.2.1",
"eslint-config-standard-react": "^5.0.0",
"eslint-plugin-import": "^2.6.0",
"eslint-plugin-node": "^5.1.0",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-react": "^7.1.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-promise": "^3.6.0",
"eslint-plugin-react": "^7.5.1",
"eslint-plugin-standard": "^3.0.1",
"exports-loader": "^0.6.4",
"file-loader": "^0.11.2",
"hjs-webpack": "^9.1.0",
"file-loader": "^1.1.5",
"hjs-webpack": "^9.2.0",
"https-browserify": "^1.0.0",
"imports-loader": "^0.7.1",
"json-loader": "^0.5.4",
"karma": "^1.7.0",
"json-loader": "^0.5.7",
"karma": "^1.7.1",
"karma-chrome-launcher": "^2.2.0",
"karma-firefox-launcher": "^1.0.1",
"karma-mocha": "^1.3.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.3",
"less": "^2.7.2",
"less-loader": "^4.0.4",
"mocha": "^3.4.2",
"postcss-loader": "^2.0.6",
"karma-webpack": "^2.0.6",
"less": "^2.7.3",
"less-loader": "^4.0.5",
"mocha": "^4.0.1",
"postcss-loader": "^2.0.8",
"pre-commit": "^1.2.2",
"react-addons-test-utils": "^15.6.0",
"react-test-renderer": "^15.6.1",
"react-addons-test-utils": "^15.6.2",
"react-test-renderer": "^16.1.1",
"redux-logger": "^3.0.6",
"standard": "^10.0.2",
"standard": "^10.0.3",
"stream-http": "^2.7.2",
"style-loader": "^0.18.2",
"url-loader": "^0.5.9",
"webpack": "^3.0.0"
"style-loader": "^0.19.0",
"url-loader": "^0.6.2",
"webpack": "^3.8.1"
},
"pre-commit": [
"lint"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sooo greeeen! :D

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Am I supposed to change anything in here? 😮

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just happy :)

Expand Down
1 change: 0 additions & 1 deletion src/app/css/app.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
@import "./typography";

@import './files';
@import './files-preview';
@import './context-menu';
@import './preview';
38 changes: 0 additions & 38 deletions src/app/css/files-preview.less
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion src/app/css/files.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.files-explorer {
.files {
user-select: none;

.files-drop {
Expand All @@ -19,6 +19,13 @@
}
}

.files-preview-area {
img {
width: 100%;
overflow: auto;
}
}

.files-tree {
display: flex;
flex: 1 0 auto;
Expand Down
11 changes: 10 additions & 1 deletion src/app/js/actions/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {createRequestTypes, action} from './utils'
export const FILES_LIST = createRequestTypes('FILES_LIST')
export const FILES_MKDIR = createRequestTypes('FILES_MKDIR')
export const FILES_RMDIR = createRequestTypes('FILES_RMDIR')
export const FILES_MVDIR = createRequestTypes('FILES_MVDIR')
export const FILES_CREATE_FILES = createRequestTypes('FILES_CREATE_FILES')

export const FILES = {
Expand All @@ -16,7 +17,8 @@ export const FILES = {
SELECT_FILE: 'SELECT_FILE',
DESELECT_FILE: 'DESELECT_FILE',
DESELECT_ALL_FILE: 'DESELECT_ALL_FILE',
CREATE_FILES: 'CREATE_FILES'
CREATE_FILES: 'CREATE_FILES',
MV_DIR: 'FILES_MV_DIR'
}

export const filesList = {
Expand All @@ -37,6 +39,12 @@ export const filesRmDir = {
failure: (error) => action(FILES_RMDIR.FAILURE, {error})
}

export const filesMvDir = {
request: () => action(FILES_MVDIR.REQUEST),
success: () => action(FILES_MVDIR.SUCCESS),
failure: (error) => action(FILES_MVDIR.FAILURE, {error})
}

export const createFiles = {
request: () => action(FILES_CREATE_FILES.REQUEST),
success: () => action(FILES_CREATE_FILES.SUCCESS),
Expand All @@ -53,6 +61,7 @@ export const filesRmTmpDir = () => action(FILES.RM_TMP_DIR)
export const filesSetTmpDirName = (name) => action(FILES.SET_TMP_DIR_NAME, {name})
export const filesCreateDir = () => action(FILES.CREATE_DIR)
export const filesRemoveDir = () => action(FILES.REMOVE_DIR)
export const filesMoveDir = (from, to) => action(FILES.MV_DIR, {from, to})

export const filesSelect = (file) => action(FILES.SELECT_FILE, {file})
export const filesDeselect = (file) => action(FILES.DESELECT_FILE, {file})
Expand Down
Loading