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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reactify #92

Merged
merged 132 commits into from Nov 8, 2016
Commits
Jump to file or symbol
Failed to load files and symbols.
+73 鈭9
Diff settings

Always

Just for now

Next

First step towards webpack. Compile works now

  • Loading branch information...
sallar committed Mar 28, 2016
commit 839345b5c71e8d213535e56ced6775037654543f
Copy path View file
@@ -77,9 +77,24 @@
}
},
"dependencies": {
"babel-loader": "^6.2.4",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-1": "^6.5.0",
"backbone": "^1.3.2",
"backbone-nested": "^2.0.4",
"buttercup": "~0.15.1",
"css-loader": "^0.23.1",
"foundation-apps": "^1.2.0",
"fuzzysearch": "^1.0.3",
"jquery": "^2.2.2",
"password-generator": "^2.0.2",
"sass-loader": "^3.2.0",
"style-loader": "^0.13.1",
"sweetalert": "^1.1.3",
"text-loader": "0.0.1",
"underscore": "^1.8.3",
"webpack": "^1.12.14",
"zxcvbn": "^4.2.0"
}
}
@@ -2,7 +2,7 @@
import Backbone from 'backbone';
import _ from 'underscore';
import Tpl from 'tpl/empty-state.html!text';
import Tpl from 'tpl/empty-state.html';
export default Backbone.View.extend({
@@ -3,8 +3,8 @@
// Import Deps
import _ from 'underscore';
import Backbone from 'backbone';
import Tpl from 'tpl/entries.html!text';
import EntryItemTpl from 'tpl/entry-list-item.html!text';
import Tpl from 'tpl/entries.html';
import EntryItemTpl from 'tpl/entry-list-item.html';
import Entries from 'app/collections/entries';
import EmptyStateView from 'app/views/empty-state';
@@ -3,8 +3,8 @@
// Import Deps
import _ from 'underscore';
import Backbone from 'backbone';
import Tpl from 'tpl/entry.html!text';
import Metatpl from 'tpl/entry-new-meta.html!text';
import Tpl from 'tpl/entry.html';
import Metatpl from 'tpl/entry-new-meta.html';
import {confirmDialog} from 'app/tools/dialog';
import {generatePassword} from 'app/tools/generate';
import {strengthCheck} from 'app/tools/strength';
@@ -3,7 +3,7 @@
// Import Deps
import _ from 'underscore';
import Backbone from 'backbone';
import Tpl from 'tpl/intro.html!text';
import Tpl from 'tpl/intro.html';
import Archives from 'app/collections/archives';
import Archive from 'app/models/archive';
import swal from 'sweetalert';
@@ -3,7 +3,7 @@
// Import Deps
import _ from 'underscore';
import Backbone from 'backbone';
import Tpl from 'tpl/layout.html!text';
import Tpl from 'tpl/layout.html';
import SidebarView from 'app/views/sidebar';
import EntriesView from 'app/views/entries';
import EntryView from 'app/views/entry';
@@ -3,8 +3,8 @@
// Import Deps
import _ from 'underscore';
import Backbone from 'backbone';
import Tpl from 'tpl/sidebar.html!text';
import GroupItemTpl from 'tpl/sidebar-group-item.html!text';
import Tpl from 'tpl/sidebar.html';
import GroupItemTpl from 'tpl/sidebar-group-item.html';
import Groups from 'app/collections/groups';
import Group from 'app/models/group';
import EmptyStateView from 'app/views/empty-state';
Copy path View file
@@ -0,0 +1,49 @@
var path = require('path'),
webpack = require('webpack');
module.exports = {
entry: path.resolve(__dirname, 'source/resources/js/main.js'),
output: {
path: path.resolve(__dirname, 'source/public'),
filename: 'sallar.js'
},
module: {
loaders: [
{
test: /\.js[x]?$/,
include: path.resolve(__dirname, 'source/resources/js'),
loader: 'babel',
query: {
presets: ['es2015', 'stage-1', 'react']
}
},
{
test: /\.scss?$/,
include: path.resolve(__dirname, 'source/resources/css'),
loaders: ['style', 'css', 'sass']
},
{
test: /\.html$/,
//include: path.resolve(__dirname, 'source/resource/js/tpl'),
loader: 'text-loader'
}
],
},
resolve: {
alias: {
app: path.resolve(__dirname, 'source/resources/js/app'),
tpl: path.resolve(__dirname, 'source/resources/js/tpl')
}
},
target: "electron",
plugins: [
new webpack.ProvidePlugin({
$: "jquery"
})
]
}
ProTip! Use n and p to navigate between commits in a pull request.