diff --git a/.env.example b/.env.example index 1125324..a72ef64 100644 --- a/.env.example +++ b/.env.example @@ -23,6 +23,9 @@ REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 +MAIL_CONTACT_TO=email@example.com +MAIL_CONTACT_BCC=email1@example.com,email2@example.com + MAIL_DRIVER=smtp MAIL_HOST=smtp.mailtrap.io MAIL_PORT=2525 diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 4491bc0..41c4179 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -24,7 +24,7 @@ class Kernel extends ConsoleKernel */ protected function schedule(Schedule $schedule) { - $schedule->command('pascal:cmc')->twiceDaily(); + $schedule->command('pascal:cmc')->hourly(); $schedule->command('pascal:rpc')->daily(); $schedule->command('pascal:exchange')->daily(); $schedule->command('pascal:pip')->hourly(); diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 0093776..37f0db3 100644 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -12,6 +12,7 @@ use App\Http\Requests\ContactRequest; use App\Page; use App\Press; +use App\TeamMember; use App\Projects; use App\WhitePaperContent; use Illuminate\Http\Request; @@ -196,7 +197,10 @@ public function contactSubmit(Request $request) 'message' => $request->get('message'), ]); - \Mail::to(config('pascal.mail.to'))->send(new \App\Mail\Contact($contact)); + $transport = \Mail::to(config('pascal.mail.to')); + $bcc_addresses = explode(',', config('pascal.mail.bcc')); + $transport->bcc($bcc_addresses); + $transport->send(new \App\Mail\Contact($contact)); return response()->json([ 'success' => true @@ -333,6 +337,25 @@ public function press(Request $request) return view('press', ['news' => $pressNews]); } + /** + * Displays the team members + * + * @param Request $request + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function teamMembers(Request $request) + { + $team_lg = TeamMember::where('published', true) + ->where('large_format', true) + ->orderBy('display_order', 'ASC') + ->get(); + $team_sm = TeamMember::where('published', true) + ->where('large_format', false) + ->orderBy('display_order', 'ASC') + ->get(); + return view('team_members', ['team_lg' => $team_lg, 'team_sm' => $team_sm]); + } + /** * Displays a dynamic content page. * diff --git a/app/TeamMember.php b/app/TeamMember.php new file mode 100644 index 0000000..3938d73 --- /dev/null +++ b/app/TeamMember.php @@ -0,0 +1,11 @@ + ['USD', 'EUR', 'BTC'] ], 'mail' => [ - 'to' => env('MAIL_CONTACT_TO') + 'to' => env('MAIL_CONTACT_TO'), + 'bcc' => env('MAIL_CONTACT_BCC') ] ]; diff --git a/public/error_log b/public/error_log new file mode 100644 index 0000000..76340ab --- /dev/null +++ b/public/error_log @@ -0,0 +1,2 @@ +[17-Sep-2019 12:07:23 UTC] PHP Fatal error: Cannot redeclare App\Http\Controllers\IndexController::press() in /home1/pascalcoin/webapp/app/Http/Controllers/IndexController.php on line 346 +[17-Sep-2019 12:07:40 UTC] PHP Fatal error: Cannot redeclare App\Http\Controllers\IndexController::press() in /home1/pascalcoin/webapp/app/Http/Controllers/IndexController.php on line 346 diff --git a/public/images/brands/github-brands.svg b/public/images/brands/github-brands.svg new file mode 100644 index 0000000..7870c06 --- /dev/null +++ b/public/images/brands/github-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/brands/linkedin-brands.svg b/public/images/brands/linkedin-brands.svg new file mode 100644 index 0000000..437b807 --- /dev/null +++ b/public/images/brands/linkedin-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/brands/stack-overflow-brands.svg b/public/images/brands/stack-overflow-brands.svg new file mode 100644 index 0000000..dc7e4b5 --- /dev/null +++ b/public/images/brands/stack-overflow-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/brands/twitter-brands.svg b/public/images/brands/twitter-brands.svg new file mode 100644 index 0000000..9ac9e0b --- /dev/null +++ b/public/images/brands/twitter-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/brands/xing-square-brands.svg b/public/images/brands/xing-square-brands.svg new file mode 100644 index 0000000..a2078b9 --- /dev/null +++ b/public/images/brands/xing-square-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/logo2019.svg b/public/images/logo2019.svg new file mode 100644 index 0000000..c0fcd6e --- /dev/null +++ b/public/images/logo2019.svg @@ -0,0 +1 @@ +logo2019 \ No newline at end of file diff --git a/resources/assets/img/brands/github-brands.svg b/resources/assets/img/brands/github-brands.svg new file mode 100644 index 0000000..7870c06 --- /dev/null +++ b/resources/assets/img/brands/github-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/assets/img/brands/linkedin-brands.svg b/resources/assets/img/brands/linkedin-brands.svg new file mode 100644 index 0000000..437b807 --- /dev/null +++ b/resources/assets/img/brands/linkedin-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/assets/img/brands/stack-overflow-brands.svg b/resources/assets/img/brands/stack-overflow-brands.svg new file mode 100644 index 0000000..dc7e4b5 --- /dev/null +++ b/resources/assets/img/brands/stack-overflow-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/assets/img/brands/twitter-brands.svg b/resources/assets/img/brands/twitter-brands.svg new file mode 100644 index 0000000..9ac9e0b --- /dev/null +++ b/resources/assets/img/brands/twitter-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/assets/img/brands/xing-square-brands.svg b/resources/assets/img/brands/xing-square-brands.svg new file mode 100644 index 0000000..a2078b9 --- /dev/null +++ b/resources/assets/img/brands/xing-square-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 9812968..89511ae 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -232,10 +232,16 @@ class="fa fa-apple">@dt($dtGroup, 'download_wallet', 'Download Wallet')
-

+

+ Download Blaise wallet:
+ +
+ » ..or learn more about Blaise Wallet. +

+

Download mobile wallet:

- » ..or visit github.com releases. + » ..or visit github.com releases.

diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index ef50235..6a22895 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -82,7 +82,7 @@ function gtag(){dataLayer.push(arguments);} - +
{{menu('web', 'menu')}} @@ -162,10 +162,10 @@ function gtag(){dataLayer.push(arguments);} Community Projects -
  • +
  • Download Wallet diff --git a/resources/views/team_members.blade.php b/resources/views/team_members.blade.php new file mode 100644 index 0000000..68eb1cc --- /dev/null +++ b/resources/views/team_members.blade.php @@ -0,0 +1,133 @@ +@extends('layouts.main') + +@section('body-id') + team_members +@endsection + + +@section('content') + +
    +
    + +
    +
    +
    +
    +

    Team Members

    +
      +
    1. Home
      2. +
    2. Team Members
      3. +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +

    Meet the Pascal Team

    +
    +
    +
    +
    +
    +
    • + + + +
    +
    + @foreach(array('team_lg', 'team_sm') as $type) +
    + @foreach($$type as $item) + @if($item->large_format) +
    + @else +
    + @endif + @if($item->picture) + + @else + + + + + + @endif +
    +

    {{$item->name}}

    +

    {{$item->title}}

    +

    +
    + @if($item->github) + + @endif + @if($item->linkedin) + + @endif + @if($item->twitter) + + @endif + @if($item->stackoverflow) + + @endif + @if($item->xing) + + @endif +
    +
    + @endforeach +
    + @endforeach +
    +
    +@endsection \ No newline at end of file diff --git a/resources/views/whitepapers.blade.php b/resources/views/whitepapers.blade.php index 9d6bba3..4dd2c90 100644 --- a/resources/views/whitepapers.blade.php +++ b/resources/views/whitepapers.blade.php @@ -48,11 +48,15 @@
    +

    - @dt($dtGroup, 'whitepaper_v4_btn_w1', 'Download Whitepaper V4')@dt($dtGroup, 'whitepaper_v4_btn_w2', 'version 4.0, Jan 2019') + @dt($dtGroup, 'whitepaper_v5_btn_w1', 'Download Whitepaper V5')@dt($dtGroup, 'whitepaper_v5_btn_w2', 'version 5.0, Sept 2019') + @dt($dtGroup, 'whitepaper_cn_v5_btn_w1', 'Download Whitepaper V5 (Chinese)')@dt($dtGroup, 'whitepaper_cn_v5_btn_w2', 'version 5.0, Sept 2019')

    +
    diff --git a/routes/web.php b/routes/web.php index c24295b..53f34ff 100644 --- a/routes/web.php +++ b/routes/web.php @@ -19,6 +19,7 @@ Route::get('/contact', 'IndexController@contact')->name('contact'); Route::get('/get_started', 'IndexController@getStarted')->name('get_started'); Route::get('/press', 'IndexController@press')->name('press'); +Route::get('/team', 'IndexController@teamMembers')->name('team_members'); Route::get('/funding-transparency', 'IndexController@fundingTransparency')->name('funding_transparency'); Route::post('/contact', 'IndexController@contactSubmit')->name('contact-submit');