Skip to content

DO NOT MERGE - Adding React (part 1) #82

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

Open
obsidianart wants to merge 15 commits into
base: master
Choose a base branch
from
Open

DO NOT MERGE - Adding React (part 1) #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
64b8e34
Adding React,
obsidianart Jan 22, 2017
02e0c9b
my first try to move a page.
blackforestboi Jan 23, 2017
6d2589a
about page
obsidianart Jan 23, 2017
780fb1d
update routing system
obsidianart Jan 23, 2017
198a64a
Add search page. Add a link to it in the sidebar
aquibm Jan 28, 2017
c6b6cea
Add functional search bar component.
aquibm Jan 28, 2017
7152eed
Fix bug where searching without a query was possible :bug:
aquibm Jan 28, 2017
d1c1c57
Add a searchResults component. Hook it up in search view with dummy r…
aquibm Jan 29, 2017
998dc40
Stop bluring search when hitting enter it's annoying
aquibm Jan 29, 2017
207730c
Fix search result margins
aquibm Jan 30, 2017
e56427b
Implement search module. Switch router to use PlainRoute objects
aquibm Jan 30, 2017
429a2a8
Add keys to search result items
aquibm Jan 30, 2017
b736aa4
Add a loader and use it for the search isLoading state
aquibm Jan 30, 2017
9ea41d4
Add newlines at end of files
aquibm Jan 30, 2017
31c67d1
Merge pull request #91 from aquibm/refactor-react
blackforestboi Feb 7, 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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*zip
build
node_modules
node_modules
.DS_Store
131 changes: 127 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,82 @@
"description": "Worldbrain.io research engine",
"main": "index.js",
"dependencies": {
"babel-core": "^6.17.0",
"babel-loader": "^6.2.5",
"babel-plugin-transform-runtime": "^6.15.0",
"babel-preset-es2015": "^6.14.0",
"babel-preset-react": "^6.11.1",
"babel-preset-stage-0": "^6.3.13",
"babel-runtime": "^6.11.6",
"better-npm-run": "0.0.13",
"bootstrap": "^3.3.7",
"bootstrap-sass": "^3.3.7",
"cheerio": "^0.22.0",
"compression": "^1.6.2",
"css-loader": "^0.26.0",
"cssnano": "^3.7.4",
"debug": "^2.2.0",
"extract-text-webpack-plugin": "^1.0.0",
"file-loader": "^0.9.0",
"fs": "0.0.1-security",
"fs-extra": "^1.0.0",
"html-webpack-plugin": "^2.22.0",
"imports-loader": "^0.7.0",
"ip": "^1.1.2",
"json-loader": "^0.5.4",
"lodash": "^4.17.4",
"npm-run-all": "^4.0.0"
"node-sass": "^4.0.0",
"normalize.css": "^5.0.0",
"npm-run-all": "^4.0.0",
"postcss-loader": "^1.1.0",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"react-redux": "^5.0.1",
"react-router": "^3.0.0",
"redux": "^3.6.0",
"redux-thunk": "^2.0.0",
"rimraf": "^2.5.4",
"sass-loader": "^4.0.0",
"style-loader": "^0.13.1",
"url-loader": "^0.5.6",
"webpack": "^1.12.14",
"yargs": "^6.3.0"
},
"devDependencies": {
"cpx": "^1.5.0",
"watchify": "^3.8.0"
"browserify": "^13.1.1",
"watchify": "^3.8.0",
"babel-eslint": "^7.1.0",
"babel-plugin-istanbul": "^3.0.0",
"chai": "^3.4.1",
"chai-as-promised": "^6.0.0",
"chai-enzyme": "^0.6.1",
"cheerio": "^0.22.0",
"codecov": "^1.0.1",
"enzyme": "^2.0.0",
"eslint": "^3.0.1",
"eslint-config-standard": "^6.0.0",
"eslint-config-standard-react": "^4.0.0",
"eslint-plugin-babel": "^4.0.0",
"eslint-plugin-promise": "^3.0.0",
"eslint-plugin-react": "^6.0.0",
"eslint-plugin-standard": "^2.0.0",
"express": "^4.14.0",
"karma": "^1.0.0",
"karma-coverage": "^1.0.0",
"karma-mocha": "^1.0.1",
"karma-mocha-reporter": "^2.0.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-webpack-with-fast-source-maps": "^1.9.2",
"mocha": "^3.0.1",
"nodemon": "^1.10.2",
"phantomjs-prebuilt": "^2.1.12",
"react-addons-test-utils": "^15.0.0",
"redbox-react": "^1.2.10",
"sinon": "^1.17.5",
"sinon-chai": "^2.8.0",
"webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.12.2"
},
"scripts": {
"build": "npm-run-all build:*",
Expand All @@ -24,7 +92,13 @@
"watch:copy-assets": "cpx 'src/assets/**/*.*' build/assets --watch",
"build:browserify": "mkdir -p ./build/js && browserify src/js-browserify/download_urls.js -o build/js/bundle.js",
"watch:browserify": "mkdir -p ./build/js && watchify src/js-browserify/download_urls.js -o build/js/bundle.js",
"test": "echo \"Error: no test specified\" && exit 1"
"test": "echo \"Error: no test specified\" && exit 1",
"watch:react": "better-npm-run start",
"build:react": "better-npm-run deploy:prod",
"copy:react": "cpx 'src/client/dist/**/*.*' build/client",
"react-build:clean": "rimraf dist/client",
"react-build:react": "better-npm-run deploy",
"react-build:react-compile": "better-npm-run compile"
},
"repository": {
"type": "git",
Expand All @@ -35,5 +109,54 @@
"bugs": {
"url": "https://github.com/WorldBrain/Research-Engine/issues"
},
"homepage": "https://github.com/WorldBrain/Research-Engine#readme"
"homepage": "https://github.com/WorldBrain/Research-Engine#readme",
"betterScripts": {
"compile": {
"command": "node src/client/bin/compile && npm run copy:react",
"env": {
"DEBUG": "app:*"
}
},
"dev": {
"command": "nodemon bin/dev-server --ignore dist --ignore coverage --ignore tests --ignore src",
"env": {
"NODE_ENV": "development",
"DEBUG": "app:*"
}
},
"deploy": {
"command": "npm run react-build:clean && npm run react-build:react-compile",
"env": {
"DEBUG": "app:*"
}
},
"deploy:dev": {
"command": "npm run react-build:react",
"env": {
"NODE_ENV": "development",
"DEBUG": "app:*"
}
},
"deploy:prod": {
"command": "npm run react-build:react",
"env": {
"NODE_ENV": "production",
"BASENAME": "/client/",
"DEBUG": "app:*"
}
},
"start": {
"command": "node src/client/bin/dev-server",
"env": {
"DEBUG": "app:*"
}
},
"test": {
"command": "node ./node_modules/karma/bin/karma start config/karma.config",
"env": {
"NODE_ENV": "test",
"DEBUG": "app:*"
}
}
}
}
1 change: 1 addition & 0 deletions src/assets/popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<a href="http://worldbrain.io/faq">FAQs</a>
<a href="howto.html">How to use the tool</a>
<a href="feedback.html">Feedback</a>
<a href="../client/index.html">Feedback</a>
<a href="analyse_urls.html" style="background: limegreen">Import History & Bookmarks</a>

</body>
Expand Down
Loading