Front-end improvements to take it on live

master
Uğur Arıcı 4 years ago
parent 67cc77ddf6
commit 708764ab95
  1. 2
      public/js/app.js
  2. 2
      public/mix-manifest.json
  3. 13
      resources/js/components/DonationCard.vue
  4. 18
      resources/views/emails/successfulpayment.blade.php
  5. 9
      resources/views/emails/user/created.blade.php
  6. 58
      resources/views/layouts/app.blade.php
  7. 2
      routes/web.php

2
public/js/app.js vendored

File diff suppressed because one or more lines are too long

@ -1,4 +1,4 @@
{
"/js/app.js": "/js/app.js?id=98f1c6e677e72c69fbc4",
"/js/app.js": "/js/app.js?id=7ae1ff303438afdbd8bb",
"/css/app.css": "/css/app.css?id=36412c9f34a08f26af3c"
}

@ -125,7 +125,6 @@
class="form-control"
:class="{'is-invalid':1==0}"
name="first_name"
value="John"
required
/>
<span class="invalid-feedback" role="alert" v-if="1==0">
@ -143,7 +142,6 @@
class="form-control"
:class="{'is-invalid':1==0}"
name="last_name"
value="Doe"
required
/>
<span class="invalid-feedback" role="alert" v-if="1==0">
@ -176,7 +174,6 @@
name="email"
required
autocomplete="email"
value="john@doe.comi"
/>
</div>
</div>
@ -199,7 +196,6 @@
class="form-control"
:class="{'is-invalid':1==0}"
name="card_holder_name"
value="John Doe"
required
/>
<span class="invalid-feedback" role="alert" v-if="1==0">
@ -222,7 +218,6 @@
maxlength="16"
autocomplete="off"
placeholder="################"
value="5400010000000004"
v-cardformat:restrictNumeric
/>
<span class="invalid-feedback" role="alert" v-if="1==0">
@ -248,7 +243,6 @@
placeholder="MM"
minlength="2"
maxlength="2"
value="12"
v-cardformat:restrictNumeric
/>
</div>
@ -264,7 +258,6 @@
placeholder="YY"
minlength="2"
maxlength="2"
value="30"
v-cardformat:restrictNumeric
/>
</div>
@ -284,7 +277,6 @@
placeholder="***"
minlength="3"
maxlength="4"
value="123"
v-cardformat:restrictNumeric
/>
</div>
@ -308,7 +300,6 @@
class="form-control"
:class="{'is-invalid':1==0}"
name="billing_contact_name"
value="John Doe"
required
/>
<span class="invalid-feedback" role="alert" v-if="1==0">
@ -326,7 +317,6 @@
class="form-control"
:class="{'is-invalid':1==0}"
name="billing_address"
value="Freedom St. 18/7"
required
/>
<span class="invalid-feedback" role="alert" v-if="1==0">
@ -344,7 +334,6 @@
class="form-control"
:class="{'is-invalid':1==0}"
name="billing_city"
value="Istanbul"
required
/>
<span class="invalid-feedback" role="alert" v-if="1==0">
@ -362,7 +351,6 @@
class="form-control"
:class="{'is-invalid':1==0}"
name="billing_country"
value="Turkey"
required
/>
<span class="invalid-feedback" role="alert" v-if="1==0">
@ -383,7 +371,6 @@
class="form-control"
:class="{'is-invalid':1==0}"
name="billing_zipcode"
value
/>
<span class="invalid-feedback" role="alert" v-if="1==0">
<strong>Sample error</strong>

@ -1,15 +1,17 @@
@component('mail::message')
# Thank you for your donation!
We received your {{$donation->amount}} {{$donation->currency}} USD donation.
We received your {{$donation->amount}} {{$donation->currency}} donation.
Name: {{$donation->first_name}} {{$donation->last_name}}
Amount: {{$donation->amount}} {{$donation->currency}}
Transaction Date: {{$donation->created_at}}
Next Payment Date: {{$donation->next_payment_at}}
- Name: {{$donation->first_name}} {{$donation->last_name}}
- Amount: {{$donation->amount}} {{$donation->currency}}
- Transaction Date: {{$donation->created_at}}
- Frequency: {{$donation->frequency}}
@if($donation->next_payment_at)
- Next Payment Date: {{$donation->next_payment_at}}
@endif
Your donations is tax deductible only in Republic of Turkey
Özgür Yazılım Derneği is a registered association in İstanbul, Turkey with the number 34-242-113
@endcomponent

@ -1,14 +1,13 @@
@component('mail::message')
# Information
# Your account created
Your account created for OYD Donation System
Here are your credentials.
E-Mail: {{$user->email}}
Here are your credentials:
Password: {{$password}}
- E-Mail: {{$user->email}}
- Password: {{$password}}
You can view your past and active donations by logging into the system.
@endcomponent

@ -1,5 +1,6 @@
<!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
@ -17,6 +18,7 @@
<!-- Styles -->
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
</head>
<body>
<div id="app">
<nav class="navbar navbar-expand-md navbar-dark bg-primary shadow-sm">
@ -41,37 +43,34 @@
<a class="nav-link" href="https://oyd.org.tr" target="_blank">oyd.org.tr</a>
</li>
<!-- Authentication Links -->
<?php /**
@guest
<li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li>
@if (Route::has('register'))
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
</li>
@endif
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
@guest
<li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li>
@if (Route::has('register'))
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
</li>
@endif
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('logout') }}" onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</li>
@endguest
*/
?>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</li>
@endguest
</ul>
</div>
</div>
@ -87,4 +86,5 @@ document.getElementById('logout-form').submit();">
</div>
</div>
</body>
</html>

@ -13,7 +13,7 @@ use Illuminate\Support\Facades\Route;
|
*/
Auth::routes();
Auth::routes(['register' => false]);
Route::get('/', 'DonationController@index')->name('donation.form');
Route::post('/make-donation', 'DonationController@donate')->name('donation.make');

Loading…
Cancel
Save