Merge pull request #13 from InScrompT/master

app/Http/Controllers/FormController.php

@@ -17,7 +17,7 @@ public function __construct()
 
     public function handleSubmission($email)
     {
-        $url = request()->header('origin');
+        $url = request()->headers->get('referer');
         $account = Account::firstWhere('email', $email);
         $website = $account->websites->firstWhere('url', $url);
 

app/Http/Middleware/CheckIfEmail.php

@@ -16,7 +16,7 @@ class CheckIfEmail
      */
     public function handle($request, Closure $next)
     {
-        $host = $request->header('origin');
+        $host = $request->header('referer');
         $validator = Validator::make(['email' => $request->route('email')], [
             'email' => 'required|email'
         ]);

app/Http/Middleware/CheckIfVerified.php

@@ -18,7 +18,7 @@ class CheckIfVerified
      */
     public function handle($request, Closure $next)
     {
-        $host = $request->header('origin');
+        $host = $request->header('referer');
         $email = $request->route('email');
 
         $account = Account::firstOrCreate(['email' => $email]);

resources/views/contact.blade.php

@@ -13,7 +13,7 @@
                         <h2>Contact me</h2>
 
                         <p>
-                            I'm <a href="https://twitter.com/xXAlphaManXx">Karan Sanjeev</a>, a Indie Maker. FormZend is
+                            I'm <a href="https://twitter.com/xXAlphaManXx">Karan Sanjeev</a>, a Indie Maker. {{ config('app.name') }} is
                             made completely on my own time without any funding or investment. I respect privacy and believe it's a right.
                         </p>
 
@@ -23,7 +23,7 @@
                             contact forms, then here's one &mdash; <span class="is-italic has-text-primary">just for you</span>
                         </p>
 
-                        <form action="{{ config('app.url') }}/formzend@alphaman.me" method="POST">
+                        <form action="{{ route('form', ['formzend@alphaman.me']) }}" method="POST">
                             <div class="field">
                                 <label for="name" class="label">Name</label>
                                 <div class="control">

resources/views/dashboard/show.blade.php

@@ -75,7 +75,7 @@
                                 </p>
                             </div>
                             <a href="{{ route('home') }}" class="panel-block has-text-info">
-                                Click here to integrate FormZend
+                                Click here to integrate {{ config('app.name') }}
                             </a>
                         @endforelse
                     </div>

resources/views/layouts/app.blade.php

@@ -8,19 +8,19 @@
     <meta name=”robots” content="index, follow">
     <meta name="description" content="Have a simple website with a form in it? Submit the form to us, we'll email it to you. No server, no signup, no database."/>
 
-    <meta property="og:site_name" content="FormZend">
+    <meta property="og:site_name" content="{{ config('app.name') }}">
     <meta property="og:type" content="website">
-    <meta property="og:title" content="FormZend - Form submissions directly to your email">
+    <meta property="og:title" content="{{ config('app.name') }} - Form submissions directly to your email">
     <meta property="og:description" content="Have a simple website with a form in it? Submit the form to us, we'll email it to you. No server, no signup, no database.">
     <meta property="og:image" content="{{ asset('assets/images/formzend-desc.gif') }}">
     <meta property="og:url" content="{{ config('app.url') }}">
 
-    <meta name="twitter:image:alt" content="FormZend Selling Points. A banner">
+    <meta name="twitter:image:alt" content="{{ config('app.name') }} Selling Points. A banner">
     <meta name="twitter:site" content="@xXAlphaManXx">
 
     @yield('head')
 
-    <title>@yield('title') - FormZend</title>
+    <title>@yield('title') - {{ config('app.name') }}</title>
     <link rel="stylesheet" href="{{ asset('css/app.css') }}">
 </head>
 

resources/views/plans/redirect.blade.php

@@ -21,7 +21,7 @@
     <form method="POST" action="https://api.razorpay.com/v1/checkout/embedded" id="payment-form">
         <input type="hidden" name="key_id" value="{{ config('razorpay.api.key') }}">
         <input type="hidden" name="order_id" value="{{ $order }}">
-        <input type="hidden" name="name" value="FormZend">
+        <input type="hidden" name="name" value="{{ config('app.name') }}">
         <input type="hidden" name="description" value="Form submissions, made easy!">
         <input type="hidden" name="image" value="{{ asset('assets/images/razorpay_image.png') }}">
         <input type="hidden" name="prefill[email]" value="{{ auth()->user()->email }}">

resources/views/privacy.blade.php

@@ -13,9 +13,9 @@
                         <h2>Privacy Policy</h2>
 
                         <p>
-                            Your privacy is important to us. It is FormZend's policy to respect your privacy regarding
+                            Your privacy is important to us. It is {{ config('app.name') }}'s policy to respect your privacy regarding
                             any information we may collect from you across our website,
-                            <a href="https://formzend.com">https://formzend.com</a>, and other sites we own and operate.
+                            <a href="{{ config('app.url') }}">{{ config('app.url') }}</a>, and other sites we own and operate.
                         </p>
 
                         <p>

resources/views/refund.blade.php

@@ -10,10 +10,10 @@
             <div class="columns">
                 <div class="column is-half is-offset-3">
                     <div class="content">
-                        <h2>FormZend Refund & Cancellation Policy</h2>
+                        <h2>{{ config('app.name') }} Refund & Cancellation Policy</h2>
 
-                        Since FormZend sells digital service, we cannot either refund nor cancel your purchase. But if
-                        in case you are not happy with your purchase and did not like what FormZend delivers, you can
+                        Since {{ config('app.name') }} sells digital service, we cannot either refund nor cancel your purchase. But if
+                        in case you are not happy with your purchase and did not like what {{ config('app.name') }} delivers, you can
                         contact me directly at <a href="mailto:formzend@alphaman.me">formzend@alphaman.me</a> and a refund
                         will be processed if the reason is agree-able.
                     </div>

resources/views/terms.blade.php

@@ -10,12 +10,12 @@
             <div class="columns">
                 <div class="column is-half is-offset-3">
                     <div class="content">
-                        <h2>FormZend Terms of Service</h2>
+                        <h2>{{ config('app.name') }} Terms of Service</h2>
 
                         <h3>1. Terms</h3>
 
                         <p>
-                            By accessing the website at <a href="https://formzend.com">https://formzend.com</a>,
+                            By accessing the website at <a href="{{ config('app.url') }}">{{ config('app.url') }}</a>,
                             you are agreeing to be bound by these terms of service, all applicable laws and regulations,
                             and agree that you are responsible for compliance with any applicable local laws. If you do
                             not agree with any of these terms, you are prohibited from using or accessing this site.
@@ -27,7 +27,7 @@
                         <ol type="a">
                             <li>
                                 Permission is granted to temporarily download one copy of the materials
-                                (information or software) on FormZend's website for personal, non-commercial transitory
+                                (information or software) on {{ config('app.name') }}'s website for personal, non-commercial transitory
                                 viewing only. This is the grant of a license, not a transfer of title, and under this
                                 license you may not:
 
@@ -39,7 +39,7 @@
                                     </li>
                                     <li>
                                         attempt to decompile or reverse engineer any software contained on
-                                        FormZend's website;
+                                        {{ config('app.name') }}'s website;
                                     </li>
                                     <li>remove any copyright or other proprietary notations from the materials; or</li>
                                     <li>
@@ -50,7 +50,7 @@
                             </li>
                             <li>
                                 This license shall automatically terminate if you violate any of these restrictions and
-                                may be terminated by FormZend at any time. Upon terminating your viewing of these
+                                may be terminated by {{ config('app.name') }} at any time. Upon terminating your viewing of these
                                 materials or upon the termination of this license, you must destroy any downloaded
                                 materials in your possession whether in electronic or printed format.
                             </li>
@@ -60,14 +60,14 @@
 
                         <ol type="a">
                             <li>
-                                The materials on FormZend's website are provided on an 'as is' basis. FormZend makes no
+                                The materials on {{ config('app.name') }}'s website are provided on an 'as is' basis. {{ config('app.name') }} makes no
                                 warranties, expressed or implied, and hereby disclaims and negates all other warranties
                                 including, without limitation, implied warranties or conditions of merchantability,
                                 fitness for a particular purpose, or non-infringement of intellectual property or other
                                 violation of rights.
                             </li>
                             <li>
-                                Further, FormZend does not warrant or make any representations concerning the accuracy,
+                                Further, {{ config('app.name') }} does not warrant or make any representations concerning the accuracy,
                                 likely results, or reliability of the use of the materials on its website or otherwise
                                 relating to such materials or on any sites linked to this site.
                             </li>
@@ -76,10 +76,10 @@
                         <h3>4. Limitations</h3>
 
                         <p>
-                            In no event shall FormZend or its suppliers be liable for any damages (including, without
+                            In no event shall {{ config('app.name') }} or its suppliers be liable for any damages (including, without
                             limitation, damages for loss of data or profit, or due to business interruption) arising
-                            out of the use or inability to use the materials on FormZend's website, even if FormZend
-                            or a FormZend authorized representative has been notified orally or in writing of the
+                            out of the use or inability to use the materials on {{ config('app.name') }}'s website, even if {{ config('app.name') }}
+                            or a {{ config('app.name') }} authorized representative has been notified orally or in writing of the
                             possibility of such damage. Because some jurisdictions do not allow limitations on implied
                             warranties, or limitations of liability for consequential or incidental damages, these
                             limitations may not apply to you.
@@ -88,25 +88,25 @@
                         <h3>5. Accuracy of materials</h3>
 
                         <p>
-                            The materials appearing on FormZend's website could include technical, typographical, or
-                            photographic errors. FormZend does not warrant that any of the materials on its website are
-                            accurate, complete or current. FormZend may make changes to the materials contained on its
-                            website at any time without notice. However FormZend does not make any commitment to update
+                            The materials appearing on {{ config('app.name') }}'s website could include technical, typographical, or
+                            photographic errors. {{ config('app.name') }} does not warrant that any of the materials on its website are
+                            accurate, complete or current. {{ config('app.name') }} may make changes to the materials contained on its
+                            website at any time without notice. However {{ config('app.name') }} does not make any commitment to update
                             the materials.
                         </p>
 
                         <h3>6. Links</h3>
 
                         <p>
-                            FormZend has not reviewed all of the sites linked to its website and is not responsible for
+                            {{ config('app.name') }} has not reviewed all of the sites linked to its website and is not responsible for
                             the contents of any such linked site. The inclusion of any link does not imply endorsement
-                            by FormZend of the site. Use of any such linked website is at the user's own risk.
+                            by {{ config('app.name') }} of the site. Use of any such linked website is at the user's own risk.
                         </p>
 
                         <h3>7. Modifications</h3>
 
                         <p>
-                            FormZend may revise these terms of service for its website at any time without notice.
+                            {{ config('app.name') }} may revise these terms of service for its website at any time without notice.
                             By using this website you are agreeing to be bound by the then current version of these
                             terms of service.
                         </p>

resources/views/welcome.blade.php

@@ -15,7 +15,7 @@
                 <div class="column is-6 level-item">
                     <div class="card">
                         <div class="card-content">
-                            <pre><code>&lt;form action=&quot;<span class="has-text-primary">{{ config('app.url') }}/your@email.com</span>&quot; method=&quot;POST&quot;&gt;
+                            <pre><code>&lt;form action=&quot;<span class="has-text-primary">{{ route('form', ['your@email.com']) }}</span>&quot; method=&quot;POST&quot;&gt;
   &lt;input type=&quot;email&quot; name=&quot;email&quot;&gt;
   &lt;input type=&quot;text&quot; name=&quot;name&quot;&gt;
   &lt;input type=&quot;submit&quot; name=&quot;Send!&quot;&gt;
@@ -37,7 +37,7 @@
                         <p>Change your form's <code>action</code> attribute to this and replace <b>your@email.com</b> with your own email.</p>
                         <div class="field">
                             <div class="control">
-                                <input type="text" class="input is-primary" value="{{ config('app.url') }}/your@email.com" readonly>
+                                <input type="text" class="input is-primary" value="{{ route('form', ['your@email.com']) }}" readonly>
                             </div>
                         </div>
 
@@ -82,7 +82,7 @@
                             <a href="https://developer.mozilla.org/en-US/docs/Web/API/FormData" target="_blank">
                                 <code>FormData</code>
                             </a>
-                            and FormZend will handle everything else.
+                            and {{ config('app.name') }} will handle everything else.
                         </p>
                     </div>
                 </div>
@@ -105,8 +105,9 @@
                                     </div>
                                 </div>
                                 <div class="card-content has-text-justified">
-                                    Your data, stays yours. I never alter or sell your data and it's against my ethics.
-                                    We use Mailgun to send you email, so their privacy policy also applies.
+                                    Absolutely. Your data belongs to you. If you aren’t paying for a product,
+                                    you are the product. I charge a small fee for
+                                    {{ config('app.name') }}, because I sell service, not data.
                                 </div>
                             </div>
 
@@ -128,7 +129,7 @@
                             <div class="card">
                                 <div class="card-header">
                                     <div class="card-header-title">
-                                        Is FormZend free?
+                                        Is {{ config('app.name') }} free?
                                     </div>
                                 </div>
                                 <div class="card-content has-text-justified">
@@ -175,13 +176,13 @@
         <div class="container">
             <hr>
             <div class="column is-half is-offset-3">
-                <a class="is-size-3 has-text-grey-dark pb-4" id="about">About FormZend</a>
+                <a class="is-size-3 has-text-grey-dark pb-4" id="about">About {{ config('app.name') }}</a>
                 <p class="is-size-5 pt-5">
-                    I'm <a href="https://twitter.com/xXAlphaManXx">Karan Sanjeev</a>, a Indie Maker. FormZend is
+                    I'm <a href="https://twitter.com/xXAlphaManXx">Karan Sanjeev</a>, a Indie Maker. {{ config('app.name') }} is
                     made completely on my own time without any funding or investment. I respect privacy and believe it's a right.
                 </p>
                 <p class="is-size-5 mt-3">
-                    If you aren’t paying for a product, you are the product. I charge a small fee for FormZend,
+                    If you aren’t paying for a product, you are the product. I charge a small fee for {{ config('app.name') }},
                     because I sell service, not data.
                 </p>
             </div>
@@ -200,7 +201,7 @@
 
                     <br>
 
-                    <form action="{{ config('app.url') }}/formzend@alphaman.me" method="POST">
+                    <form action="{{ route('form', ['formzend@alphaman.me']) }}" method="POST">
                         <div class="field">
                             <label for="name" class="label">Name</label>
                             <div class="control">

routes/web.php

@@ -26,7 +26,7 @@
     ->middleware('auth')
     ->name('logout');
 Route::get('auth/login/account/{account:id}', 'AuthController@loginUser')
-    ->middleware('signed', 'guest')
+    ->middleware('guest', 'signed')
     ->name('login.verify');
 
 Route::get('verify/website/{website:id}', 'WebsiteController@verify')