Skip to content

Commit

Permalink
Merge branch 'master' into laravel
Browse files Browse the repository at this point in the history
  • Loading branch information
edersoares committed Nov 30, 2018
2 parents eca6160 + 4bad199 commit 5127c3e
Show file tree
Hide file tree
Showing 14 changed files with 1,237 additions and 173 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -5,6 +5,8 @@
/public/module
/public/modules
/vendor
/ieducar-*
ieducar-*.tar.gz
.env
.env.host
.env.testing
Expand Down
35 changes: 35 additions & 0 deletions app/Console/Commands/AdminPasswordCommand.php
@@ -0,0 +1,35 @@
<?php

namespace App\Console\Commands;

use Illuminate\Console\Command;
use Illuminate\Support\Facades\DB;

class AdminPasswordCommand extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'admin:password {password}';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Updates admin\'s user password';

/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
$password = md5($this->argument('password'));
DB::connection('pgsql')->update('UPDATE portal.funcionario SET senha = ? WHERE matricula = ?', [$password, 'admin']);
$this->info('Password updated.');
}
}
3 changes: 2 additions & 1 deletion app/Console/Commands/LegacyDatabaseCommand.php
Expand Up @@ -30,7 +30,8 @@ public function handle()
$this->info('Seeding database..');

$this->call('db:seed', [
'--class' => 'InitialDatabaseSeeder'
'--class' => 'InitialDatabaseSeeder',
'--force' => true
]);
}
}
5 changes: 4 additions & 1 deletion composer.json
Expand Up @@ -3,14 +3,17 @@
"description": "Software livre de gestão escolar",
"type": "project",
"license": "GPL-2.0-or-later",
"version": "2.1.0",
"keywords": [
"Portabilis",
"i-Educar"
],
"homepage": "https://github.com/portabilis/i-educar",
"require": {
"php": "^7.1.3",
"php": "^7.2.10",
"ext-pgsql": "*",
"cocur/slugify": "^3.1",
"composer/semver": "^1.4",
"cossou/jasperphp": "^2.7",
"fideloper/proxy": "^4.0",
"google/recaptcha": "^1.2",
Expand Down
129 changes: 65 additions & 64 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5127c3e

Please sign in to comment.