wbuezas
/
hedera-web-mindshore
forked from verdnatura/hedera-web
0
1
Fork 0
Code Pull Requests Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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. * Initial Release.

BIN
image/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

6
rest/core/recover-password.php
View File

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

21
webpack.config.js
View File

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