geolba/tethys
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

- Upgrade to 7.x from 6.x #11

Browse Source
This commit is contained in:
Arno Kaimbacher 2021-05-25 14:15:02 +02:00
parent 4e44d9d996
commit bcbd05d7d8
29 changed files with 1289 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Console/Commands/DatasetState.php
View File

@ -63,5 +63,6 @@ class DatasetState extends Command
'server_date_modified' => DB::raw('now()')
]);
}
return 0;
}
}

1
app/Console/Commands/Inspire.php
View File

@ -29,5 +29,6 @@ class Inspire extends Command
public function handle()
{
$this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
return 0;
}
}

1
app/Console/Commands/SolrIndexBuilder.php
View File

@ -54,5 +54,6 @@ class SolrIndexBuilder extends Command
// Log::debug(__METHOD__ . ': ' . 'Indexing document ' . $datasetId . ' failed: ' . $e->getMessage());
// }
}
return 0;
}
}

1
app/Console/Commands/UpdateSolrDataset.php
View File

@ -51,5 +51,6 @@ class UpdateSolrDataset extends Command
} catch (Exception $e) {
$this->error(__METHOD__ . ': ' . 'Indexing document ' . $dataset->id . ' failed: ' . $e->getMessage());
}
return 0;
}
}

26
app/Exceptions/Handler.php
View File

@ -1,7 +1,10 @@
<?php namespace App\Exceptions;
<?php
use Exception;
namespace App\Exceptions;
// use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Throwable;
class Handler extends ExceptionHandler
{
@ -12,7 +15,8 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontReport = [
'Symfony\Component\HttpKernel\Exception\HttpException'
'password',
'password_confirmation',
];
/**
@ -20,22 +24,24 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @param \Throable $exception
* @return void
*/
public function report(Exception $e)
public function report(Throwable $exception)
{
return parent::report($e);
return parent::report($exception);
}
/**
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
* @return \Illuminate\Http\Response
* @param \Throwable $exception
* @return \Symfony\Component\HttpFoundation\Response
*
* @throws \Throwable
*/
public function render($request, Exception $ex)
public function render($request, Throwable $ex)
{
if ($ex instanceof \Illuminate\Auth\Access\AuthorizationException) {
// return $this->errorResponse($exception->getMessage(), 403);

40
app/Http/Controllers/Auth/ConfirmPasswordController.php Normal file
View File

@ -0,0 +1,40 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ConfirmsPasswords;
class ConfirmPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Confirm Password Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password confirmations and
| uses a simple trait to include the behavior. You're free to explore
| this trait and override any functions that require customization.
|
*/
use ConfirmsPasswords;
/**
* Where to redirect users when the intended url fails.
*
* @var string
*/
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
}
}

10
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@ -19,14 +19,4 @@ class ForgotPasswordController extends Controller
*/
use SendsPasswordResetEmails;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
}

16
app/Http/Controllers/Auth/LoginController.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
class LoginController extends Controller
@ -25,7 +26,7 @@ class LoginController extends Controller
*
* @var string
*/
protected $redirectTo = '/settings';
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
@ -34,17 +35,6 @@ class LoginController extends Controller
*/
public function __construct()
{
$this->middleware('guest', ['except' => 'logout']);
$this->middleware('guest')->except('logout');
}
// public function logout(Request $request)
// {
// $this->guard()->logout();
// $request->session()->flush();
// $request->session()->regenerate();
// return redirect('/');
// }
}

16
app/Http/Controllers/Auth/RegisterController.php
View File

@ -2,10 +2,12 @@
namespace App\Http\Controllers\Auth;
use App\Models\User;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Validator;
use App\Providers\RouteServiceProvider;
use App\User;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
class RegisterController extends Controller
{
@ -27,7 +29,7 @@ class RegisterController extends Controller
*
* @var string
*/
protected $redirectTo = '/';
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
@ -48,9 +50,9 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6|confirmed',
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed'],
]);
}
@ -65,7 +67,7 @@ class RegisterController extends Controller
return User::create([
'name' => $data['name'],
'email' => $data['email'],
'password' => bcrypt($data['password']),
'password' => Hash::make($data['password']),
]);
}
}

13
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ResetsPasswords;
class ResetPasswordController extends Controller
@ -25,15 +26,5 @@ class ResetPasswordController extends Controller
*
* @var string
*/
protected $redirectTo = '/';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
protected $redirectTo = RouteServiceProvider::HOME;
}

42
app/Http/Controllers/Auth/VerificationController.php Normal file
View File

@ -0,0 +1,42 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\VerifiesEmails;
class VerificationController extends Controller
{
/*
|--------------------------------------------------------------------------
| Email Verification Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling email verification for any
| user that recently registered with the application. Emails may also
| be re-sent if the user didn't receive the original email message.
|
*/
use VerifiesEmails;
/**
* Where to redirect users after verification.
*
* @var string
*/
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
$this->middleware('signed')->only('verify');
$this->middleware('throttle:6,1')->only('verify', 'resend');
}
}

11
app/Http/Controllers/Frontend/SitelinkController.php
View File

@ -31,7 +31,10 @@ class SitelinkController extends Controller
// }
// }, $years);
$this->ids = array();
return view('frontend.sitelink.index')->with(['years' => $this->years, 'documents' => $this->ids]);
return view(
'frontend.sitelink.index',
['years' => $this->years, 'documents' => $this->ids]
);
}
public function listDocs($year)
@ -63,8 +66,10 @@ class SitelinkController extends Controller
//$select->select('id');
//$this->ids = $select->pluck('id');
//return view('rdr.sitelink.index')->with(['years'=> $this->years,'ids'=> $this->ids]);
return view('frontend.sitelink.index')
->with(['years' => $this->years, 'documents' => $documents]);
return view(
'frontend.sitelink.index',
['years' => $this->years, 'documents' => $documents]
);
}
}
}

8
app/Http/Controllers/Publish/DoiController.php
View File

@ -164,9 +164,9 @@ class DoiController extends Controller
},
])->findOrFail($id);
return View::make('workflow.doi.edit', [
return View::make('workflow.doi.edit', [
'dataset' => $dataset,
]);
]);
}
/**
@ -192,7 +192,7 @@ class DoiController extends Controller
$datacite_environment = config('tethys.datacite_environment');
if ($datacite_environment == "debug") {
$prefix = config('tethys.datacite_test_prefix');
$base_domain = config('tethys.test_base_domain');
$base_domain = config('tethys.test_base_domain');
} elseif ($datacite_environment == "production") {
$prefix = config('tethys.datacite_prefix');
$base_domain = config('tethys.base_domain');
@ -227,7 +227,7 @@ class DoiController extends Controller
$response = $this->doiClient->updateMetadataForDoi($doiValue, $newXmlMeta);
// if operation successful, store dataste identifier
if ($response->getStatusCode() == 201) {
$doi = $dataset->identifier();
$doi = $dataset->identifier;
// $doi['value'] = $doiValue;
// $doi['type'] = "doi";
// $doi['status'] = "findable";

2
app/Http/Controllers/Publish/EditorController.php
View File

@ -671,7 +671,7 @@ class EditorController extends Controller
$datacite_environment = config('tethys.datacite_environment');
if ($datacite_environment == "debug") {
$prefix = config('tethys.datacite_test_prefix');
$base_domain = config('tethys.test_base_domain');
$base_domain = config('tethys.test_base_domain');
} elseif ($datacite_environment == "production") {
$prefix = config('tethys.datacite_prefix');
$base_domain = config('tethys.base_domain');

1
app/Providers/RouteServiceProvider.php
View File

@ -15,6 +15,7 @@ class RouteServiceProvider extends ServiceProvider
* @var string
*/
protected $namespace = 'App\Http\Controllers';
public const HOME = '/settings';
/**
* Define your route model bindings, pattern filters, etc.

7
app/Providers/SolariumServiceProvider.php
View File

@ -4,6 +4,8 @@ namespace App\Providers;
use Illuminate\Support\ServiceProvider;
use Solarium\Client;
use Solarium\Core\Client\Adapter\Curl;
use Symfony\Component\EventDispatcher\EventDispatcher;
class SolariumServiceProvider extends ServiceProvider
{
@ -18,6 +20,9 @@ class SolariumServiceProvider extends ServiceProvider
public function register()
{
$this->app->bind(Client::class, function ($app) {
$adapter = new Curl();
$dispatcher = new EventDispatcher();
// $config = config('solarium');
$config = array(
'endpoint' => array(
@ -30,7 +35,7 @@ class SolariumServiceProvider extends ServiceProvider
)
);
//return new Client($config);
return new Client($config);
return new Client($adapter, $dispatcher, $config);
//return new Client($app['config']['solarium']);
});
}

21
composer.json
View File

@ -8,25 +8,31 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^8.0",
"php": "^7.2.5||^8.0",
"arifhp86/laravel-clear-expired-cache-file": "^0.0.4",
"astrotomic/laravel-translatable": "^11.1",
"diglactic/laravel-breadcrumbs": "^6.1",
"doctrine/dbal": "2.*",
"felixkiss/uniquewith-validator": "^3.1",
"fideloper/proxy": "^4.0",
"fideloper/proxy": "^4.4",
"gghughunishvili/entrust": "4.0",
"guzzlehttp/guzzle": "^7.2",
"laravel/framework": "^6.20",
"laravel/tinker": "^2.0",
"laravel/framework": "^7.29",
"laravel/tinker": "^2.5",
"laravel/ui": "2.0",
"laravelcollective/html": "^6.1",
"mcamara/laravel-localization": "^1.3",
"solarium/solarium": "^3.8",
"solarium/solarium": "^6.1",
"yajra/laravel-datatables-oracle": "^9.0"
},
"require-dev": {
"phpunit/phpunit": "^9.3"
"phpunit/phpunit": "^8.5.8|^9.3.3"
},
"extra": {
"laravel": {
"dont-discover": []
}
},
"autoload": {
"files": [
"app/Helpers/utils.php",
@ -60,6 +66,9 @@
"test": "php vendor/phpunit/phpunit/phpunit --testsuite Feature"
},
"config": {
"platform": {
"php": "7.3"
},
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true

1218
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

36
config/session.php
View File

@ -71,7 +71,7 @@ return [
|
*/
'connection' => null,
'connection' => env('SESSION_CONNECTION', null),
/*
|--------------------------------------------------------------------------
@ -86,6 +86,21 @@ return [
'table' => 'sessions',
/*
|--------------------------------------------------------------------------
| Session Cache Store
|--------------------------------------------------------------------------
|
| While using one of the framework's cache driven session backends you may
| list a cache store that should be used for these sessions. This value
| must match with one of the application's configured cache "stores".
|
| Affects: "apc", "dynamodb", "memcached", "redis"
|
*/
'store' => env('SESSION_STORE', null),
/*
|--------------------------------------------------------------------------
| Session Sweeping Lottery
@ -147,8 +162,23 @@ return [
| to the server if the browser has a HTTPS connection. This will keep
| the cookie from being sent to you if it can not be done securely.
|
*/
*/
'secure' => false,
'secure' => env('SESSION_SECURE_COOKIE', false),
/*
|--------------------------------------------------------------------------
| Same-Site Cookies
|--------------------------------------------------------------------------
|
| This option determines how your cookies behave when cross-site requests
| take place, and can be used to mitigate CSRF attacks. By default, we
| will set this value to "lax" since this is a secure default value.
|
| Supported: "lax", "strict", "none", null
|
*/
'same_site' => 'lax',
];

32
database/migrations/2014_10_12_100000_create_password_resets_table.php Normal file
View File

@ -0,0 +1,32 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreatePasswordResetsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('password_resets', function (Blueprint $table) {
$table->string('email')->index();
$table->string('token');
$table->timestamp('created_at')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('password_resets');
}
}

109
package.json
View File

@ -1,54 +1,59 @@
{
"private": true,
"scripts": {
"test": "echo \"Error\"",
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-decorators": "^7.10.5",
"bootstrap-sass": "^3.4.1",
"cross-env": "^7.0.2",
"laravel-mix": "^6.0.19",
"npm-font-open-sans": "^1.1.0",
"postcss-loader": "^5.2.0",
"purecss-sass": "^2.0.3",
"resolve-url-loader": "^4.0.0",
"sass": "^1.26.10",
"sass-loader": "^11.1.0",
"ts-loader": "^9.1.2",
"typescript": "^4.0.2",
"vue-loader": "^15.9.5",
"webpack": "^5.37.0",
"webpack-cli": "^4.7.0"
},
"dependencies": {
"@ckeditor/ckeditor5-build-classic": "^12.4.0",
"@fortawesome/fontawesome-free": "^5.14.0",
"axios": "^0.21.1",
"datatables.net": "^1.10.21",
"datatables.net-buttons": "^1.6.3",
"easytimer": "^1.1.1",
"jquery": "^3.5.1",
"leaflet": "^1.7.1",
"leaflet-draw": "^1.0.4",
"lodash": "^4.17.20",
"single-page-nav": "^1.0.0",
"vee-validate": "^2.2.15",
"vue": "^2.6.12",
"vue-class-component": "^7.2.5",
"vue-datetime-picker": "^0.2.1",
"vue-directive-tooltip": "^1.6.3",
"vue-events": "^3.1.0",
"vue-property-decorator": "^9.1.2",
"vue-template-compiler": "^2.6.12",
"vue-toast-notification": "^0.6.1",
"vuedraggable": "^2.24.0",
"vuejs-datetimepicker": "^1.1.12",
"vuetable-2": "^1.3.1"
},
"name": "lms"
"private": true,
"scripts": {
"test": "echo \"Error\"",
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-decorators": "^7.10.5",
"bootstrap": "^4.0.0",
"bootstrap-sass": "^3.4.1",
"cross-env": "^7.0.2",
"jquery": "^3.2",
"laravel-mix": "^6.0.19",
"npm-font-open-sans": "^1.1.0",
"popper.js": "^1.12",
"postcss-loader": "^5.2.0",
"purecss-sass": "^2.0.3",
"resolve-url-loader": "^2.3.1",
"sass": "^1.20.1",
"sass-loader": "^8.0.0",
"ts-loader": "^9.1.2",
"typescript": "^4.0.2",
"vue": "^2.5.17",
"vue-loader": "^15.9.5",
"vue-template-compiler": "^2.6.10",
"webpack": "^5.37.0",
"webpack-cli": "^4.7.0"
},
"dependencies": {
"@ckeditor/ckeditor5-build-classic": "^12.4.0",
"@fortawesome/fontawesome-free": "^5.14.0",
"axios": "^0.21.1",
"datatables.net": "^1.10.21",
"datatables.net-buttons": "^1.6.3",
"easytimer": "^1.1.1",
"jquery": "^3.5.1",
"leaflet": "^1.7.1",
"leaflet-draw": "^1.0.4",
"lodash": "^4.17.20",
"single-page-nav": "^1.0.0",
"vee-validate": "^2.2.15",
"vue": "^2.6.12",
"vue-class-component": "^7.2.5",
"vue-datetime-picker": "^0.2.1",
"vue-directive-tooltip": "^1.6.3",
"vue-events": "^3.1.0",
"vue-property-decorator": "^9.1.2",
"vue-template-compiler": "^2.6.12",
"vue-toast-notification": "^0.6.1",
"vuedraggable": "^2.24.0",
"vuejs-datetimepicker": "^1.1.12",
"vuetable-2": "^1.3.1"
},
"name": "lms"
}

4
resources/sass/_variables.scss
View File

@ -2,7 +2,7 @@
$body-bg: #f8fafc;
// Typography
$font-family-sans-serif: "Nunito", sans-serif;
$font-family-sans-serif: 'Nunito', sans-serif;
$font-size-base: 0.9rem;
$line-height-base: 1.6;
@ -10,7 +10,7 @@ $line-height-base: 1.6;
$blue: #3490dc;
$indigo: #6574cd;
$purple: #9561e2;
$pink: #f66D9b;
$pink: #f66d9b;
$red: #e3342f;
$orange: #f6993f;
$yellow: #ffed4a;

49
resources/views/auth/passwords/confirm.blade.php Normal file
View File

@ -0,0 +1,49 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">{{ __('Confirm Password') }}</div>
<div class="card-body">
{{ __('Please confirm your password before continuing.') }}
<form method="POST" action="{{ route('password.confirm') }}">
@csrf
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
<div class="col-md-6">
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
@error('password')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>
<div class="form-group row mb-0">
<div class="col-md-8 offset-md-4">
<button type="submit" class="btn btn-primary">
{{ __('Confirm Password') }}
</button>
@if (Route::has('password.request'))
<a class="btn btn-link" href="{{ route('password.request') }}">
{{ __('Forgot Your Password?') }}
</a>
@endif
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
@endsection

36
resources/views/auth/passwords/email.blade.php
View File

@ -2,39 +2,39 @@
@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Reset Password</div>
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">{{ __('Reset Password') }}</div>
<div class="panel-body">
<div class="card-body">
@if (session('status'))
<div class="alert alert-success">
<div class="alert alert-success" role="alert">
{{ session('status') }}
</div>
@endif
<form class="form-horizontal" method="POST" action="{{ route('password.email') }}">
{{ csrf_field() }}
<form method="POST" action="{{ route('password.email') }}">
@csrf
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
<div class="form-group row">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
<div class="col-md-6">
<input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
@if ($errors->has('email'))
<span class="help-block">
<strong>{{ $errors->first('email') }}</strong>
@error('email')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@endif
@enderror
</div>
</div>
<div class="form-group">
<div class="col-md-6 col-md-offset-4">
<div class="form-group row mb-0">
<div class="col-md-6 offset-md-4">
<button type="submit" class="btn btn-primary">
Send Password Reset Link
{{ __('Send Password Reset Link') }}
</button>
</div>
</div>

61
resources/views/auth/passwords/reset.blade.php
View File

@ -2,62 +2,57 @@
@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Reset Password</div>
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">{{ __('Reset Password') }}</div>
<div class="panel-body">
<form class="form-horizontal" method="POST" action="{{ route('password.request') }}">
{{ csrf_field() }}
<div class="card-body">
<form method="POST" action="{{ route('password.update') }}">
@csrf
<input type="hidden" name="token" value="{{ $token }}">
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
<div class="form-group row">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
<div class="col-md-6">
<input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus>
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ $email ?? old('email') }}" required autocomplete="email" autofocus>
@if ($errors->has('email'))
<span class="help-block">
<strong>{{ $errors->first('email') }}</strong>
@error('email')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@endif
@enderror
</div>
</div>
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
<label for="password" class="col-md-4 control-label">Password</label>
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
<div class="col-md-6">
<input id="password" type="password" class="form-control" name="password" required>
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password">
@if ($errors->has('password'))
<span class="help-block">
<strong>{{ $errors->first('password') }}</strong>
@error('password')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@endif
@enderror
</div>
</div>
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
<label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
<div class="col-md-6">
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
<div class="form-group row">
<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
@if ($errors->has('password_confirmation'))
<span class="help-block">
<strong>{{ $errors->first('password_confirmation') }}</strong>
</span>
@endif
<div class="col-md-6">
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
</div>
</div>
<div class="form-group">
<div class="col-md-6 col-md-offset-4">
<div class="form-group row mb-0">
<div class="col-md-6 offset-md-4">
<button type="submit" class="btn btn-primary">
Reset Password
{{ __('Reset Password') }}
</button>
</div>
</div>

78
resources/views/auth/register.blade.php
View File

@ -1,58 +1,70 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Register</div>
<div class="panel-body">
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>Whoops!</strong> There were some problems with your input.<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">{{ __('Register') }}</div>
<form class="form-horizontal" role="form" method="POST" action="{{ url('/register') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="card-body">
<form method="POST" action="{{ route('register') }}">
@csrf
<div class="form-group row">
<label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label>
<div class="form-group">
<label class="col-md-4 control-label">Name</label>
<div class="col-md-6">
<input type="text" class="form-control" name="name" value="{{ old('name') }}">
<input id="name" type="text" class="form-control @error('name') is-invalid @enderror" name="name" value="{{ old('name') }}" required autocomplete="name" autofocus>
@error('name')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label">E-Mail Address</label>
<div class="form-group row">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
<div class="col-md-6">
<input type="email" class="form-control" name="email" value="{{ old('email') }}">
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email">
@error('email')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label">Password</label>
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
<div class="col-md-6">
<input type="password" class="form-control" name="password">
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password">
@error('password')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label">Confirm Password</label>
<div class="form-group row">
<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
<div class="col-md-6">
<input type="password" class="form-control" name="password_confirmation">
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
</div>
</div>
<div class="form-group">
<div class="col-md-6 col-md-offset-4">
<div class="form-group row mb-0">
<div class="col-md-6 offset-md-4">
<button type="submit" class="btn btn-primary">
Register
{{ __('Register') }}
</button>
</div>
</div>

28
resources/views/auth/verify.blade.php Normal file
View File

@ -0,0 +1,28 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">{{ __('Verify Your Email Address') }}</div>
<div class="card-body">
@if (session('resent'))
<div class="alert alert-success" role="alert">
{{ __('A fresh verification link has been sent to your email address.') }}
</div>
@endif
{{ __('Before proceeding, please check your email for a verification link.') }}
{{ __('If you did not receive the email') }},
<form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
@csrf
<button type="submit" class="btn btn-link p-0 m-0 align-baseline">{{ __('click here to request another') }}</button>.
</form>
</div>
</div>
</div>
</div>
</div>
@endsection

56
webpack.mix.js
View File

@ -1,8 +1,8 @@
let mix = require('laravel-mix');
const mix = require('laravel-mix');
/*
|--------------------------------------------------------------------------
| Mix Asset Management siehe https://laravel.com/docs/5.5/mix
| Mix Asset Management
|--------------------------------------------------------------------------
|
| Mix provides a clean, fluent API for defining some Webpack build steps
@ -10,54 +10,6 @@ let mix = require('laravel-mix');
| file for the application as well as bundling up all the JS files.
|
*/
// mix.setPublicPath('../');
// .sass('resources/assets/sass/app1.scss', 'public/css')
mix.js('resources/js/datasetPublish.js', 'public/backend/publish').vue()
.js('resources/js/search/main.ts', 'public/js/search').vue()
.js('resources/js/landingpage/main.ts', 'public/js/landingpage').vue()
.js('resources/js/app.js', 'public/js').vue()
.js('resources/js/lib.js', 'public/js')
.js('resources/js/releaseDataset.js', 'public/backend/publish').vue()
.js('resources/js/mainEditDataset.js', 'public/backend/publish').vue()
.js('resources/js/approveDataset.js', 'public/backend/publish').vue()
.js('resources/js/ckeditor.js', 'public/backend/')
.sass('resources/sass/app1.scss', 'public/css') //, { implementation: require('node-sass')})
//.sass('node_modules/purecss/build/pure.css', 'public/css', { implementation: require('node-sass') })
.sass('resources/sass/font-awesome.scss', 'public/css') //, { implementation: require('node-sass') })
.js('resources/js/scripts.js', 'public/js')
.scripts([
'node_modules/datatables.net/js/jquery.dataTables.js',
'node_modules/datatables.net-buttons/js/dataTables.buttons.js',
'node_modules/datatables.net-buttons/js/buttons.flash.js',
'node_modules/datatables.net-buttons/js/buttons.html5.js',
'node_modules/datatables.net-buttons/js/buttons.print.js',
], 'public/js/dataTable.js')
// .sourceMaps()
.webpackConfig({
module: {
rules: [
// We're registering the TypeScript loader here. It should only
// apply when we're dealing with a `.ts` or `.tsx` file.
{
test: /\.tsx?$/,
loader: 'ts-loader',
options: { appendTsSuffixTo: [/\.vue$/] },
exclude: /node_modules/,
},
],
},
resolve: {
// We need to register the `.ts` extension so Webpack can resolve
// TypeScript modules without explicitly providing an extension.
// The other extensions in this list are identical to the Mix
// defaults.
extensions: ['*', '.js', '.jsx', '.vue', '.ts', '.tsx'],
},
});
// .options({
// //publicPath: '../'
// processCssUrls: false
// });
// mix.copy('node_modules/bootstrap-sass/assets/fonts/bootstrap', 'public/fonts/bootstrap');
mix.js('resources/js/app.js', 'public/js')
.sass('resources/sass/app.scss', 'public/css');