Webpack 2, logo png, errores solucionados

This commit is contained in:
Juan Ferrer Toribio 2017-04-24 10:06:50 +02:00
parent a6f7c1f140
commit 55f1af040e
4 changed files with 15 additions and 14 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.391-deb8) stable; urgency=low
hedera-web (1.392-deb8) stable; urgency=low
* Initial Release.

BIN
image/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -4,7 +4,7 @@ use Vn\Web;
class RecoverPassword extends Vn\Web\JsonRequest
{
const PARAMS = ['user'];
const PARAMS = ['recoverUser'];
function run ($db)
{
@ -13,14 +13,14 @@ class RecoverPassword extends Vn\Web\JsonRequest
FROM vn2008.Clientes c
JOIN account.user u ON u.id = c.Id_Cliente
WHERE u.name = #',
[$_REQUEST['user']]
[$_REQUEST['recoverUser']]
);
if (!($user['active'] && $user['mail']))
return TRUE;
$service = $this->service;
$token = $service->createToken ($_REQUEST['user'], FALSE, TRUE);
$token = $service->createToken ($_REQUEST['recoverUser'], FALSE, TRUE);
$url = $service->getUrl () ."#!form=account/conf&token=$token";
$report = new Vn\Web\Report ($db, 'recover-password', ['url' => $url]);

View File

@ -13,19 +13,20 @@ var config = {
publicPath: 'build/'
},
module: {
loaders: [
{ test: /\.css$/, loader: 'style!css' },
{ test: /\.json$/, loader: 'json' },
{ test: /\.xml$/, loader: 'raw' },
{ test: /\.ttf$/, loader: 'file' }
rules: [
{ test: /\.css$/, loader: 'style-loader!css-loader' },
{ test: /\.json$/, loader: 'json-loader' },
{ test: /\.xml$/, loader: 'raw-loader' },
{ test: /\.ttf$/, loader: 'file-loader' }
]
},
resolve: {
modulesDirectories: [__dirname +'/js', __dirname, 'node_modules'],
fallback: process.env.NODE_PATH,
},
resolveLoader: {
fallback: process.env.NODE_PATH
modules: [
__dirname +'/js',
__dirname,
'node_modules',
'/usr/lib/node_modules'
]
},
plugins: [
new webpack.DefinePlugin ({ _DEV_MODE: devMode })