From 7bc465f6dc03186accb2aff7cfad5e0f920ff881 Mon Sep 17 00:00:00 2001
From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com>
Date: Thu, 6 Oct 2022 14:55:33 +1100
Subject: [PATCH] Fixed grammatical errors

---
 public/js/settings.js                   |  4 ++--
 resources/views/admin/users.blade.php   |  4 ++--
 resources/views/auth/login.blade.php    |  4 ++--
 resources/views/auth/register.blade.php | 20 ++++++++++----------
 resources/views/invite/index.blade.php  |  8 ++++----
 resources/views/misc/settings.blade.php | 10 +++++-----
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/public/js/settings.js b/public/js/settings.js
index 3f57644..67d43d0 100644
--- a/public/js/settings.js
+++ b/public/js/settings.js
@@ -16,9 +16,9 @@ function openPopup(id) {
             active = 2;
             setActiveSetting(2);
             document.querySelector('.popup .email_change').removeAttribute('id');
-            document.querySelector('.popup #heading').innerHTML = "Change E-Mail";
+            document.querySelector('.popup #heading').innerHTML = "Change Email";
             document.querySelector('.popup .warningtext').innerHTML = null;
-            document.querySelector('.popup #desc').innerHTML = "Enter your new E-Mail below as well as confirming it.<br>E-Mails are primarily used to reset passwords.";
+            document.querySelector('.popup #desc').innerHTML = "Enter your new Email below as well as confirming it.<br>Emails are primarily used to reset passwords.";
             break;
         case 3:
             active = 3;
diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
index a9f73fa..6a75881 100644
--- a/resources/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -294,9 +294,9 @@
                     <div id="ProfileContainerBox1TextContainer" style="color:black">
                         <p><strong>Username:</strong> {{ $user->name }}</p>
                         @if ($user->admin)
-                            <p><strong>E-Mail:</strong> <i>Admin E-Mail Hidden</i></p>
+                            <p><strong>Email:</strong> <i>Admin Email Hidden</i></p>
                         @else
-                            <p><strong>E-Mail:</strong> {{ $user->email }}</p>
+                            <p><strong>Email:</strong> {{ $user->email }}</p>
                         @endif
                         <p><strong>ID:</strong> {{ $user->id }}</p>
                         <p><strong>DOB:</strong> {{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }}</p>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 3f58b4c..981ef71 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -14,7 +14,7 @@
 <br>
 <form method="POST" action="{{ route('login') }}">
     @csrf
-    <h3>Username/E-Mail Address</h3>
+    <h3>Username or Email Address</h3>
     <input id="login" type="text" name="login" value="{{ old('login') }}" required autofocus>
     @if ($errors->has('name') || $errors->has('email'))
     <span style="color:red" role="alert">
@@ -39,7 +39,7 @@
     @if (Route::has('password.request'))
     <br><br>
     <span class="hyperlink"><a class="btn btn-link" href="{{ route('password.request') }}">
-        Forgot Your Password?
+        Forgot your password?
     </a>
     </span>
     @endif
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 3a527f5..cda4687 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -12,7 +12,7 @@
 <h1>Welcome to ARCHBLOX!</h1>
 <p>Have an account already? <a href="{{ route('login') }}">Click here</a> to log in.</p>
 <br>
-<p>Before entering anything, please read the <a href="{{ route('privacy') }}">Privacy Policy</a> and the <a
+<p>Before signing up, please read the <a href="{{ route('privacy') }}">Privacy Policy</a> and the <a
         href="{{ route('tos') }}">Terms of Service</a>.</p>
 <br>
 <form method="POST" action="{{ route('register') }}">
@@ -20,21 +20,21 @@
     <h3>Username</h3>
     <input id="name" type="text" placeholder="Enter a username!" name="name" value="{{ old('name') }}" required
         autocomplete="name" autofocus>
-    <p>Usernames must be 3-20 characters, and must not break the rules.</p>
+    <p>Usernames must be 3-20 alphanumeric characters and can include underscores, dashes, points, and spaces.</p>
     @error('name')
     <div class="invalid-feedback" style="color:red">
         <strong>{{ $message }}</strong>
     </div>
     @enderror
     <br>
-    <h3>E-Mail Address</h3>
+    <h3>Email Address</h3>
     <input id="email" type="email" name="email" value="{{ old('email') }}" required autocomplete="email">
     @error('email')
     <div class="invalid-feedback" style="color:red">
         <strong>{{ $message }}</strong>
     </div>
     @enderror
-    <h3>Confirm E-Mail Address</h3>
+    <h3>Confirm Email Address</h3>
     <input id="email-confirm" type="email" name="email_confirmation" value="{{ old('email_confirmation') }}" required
         autocomplete="email">
     @error('email_confirmation')
@@ -53,8 +53,8 @@
     <br>
     <h3>Password</h3>
     <input id="password" type="password" name="password" required autocomplete="password">
-    <p class="helpfultip">Don't reuse or use weak passwords!</p>
-    <p>Recommend to be 8 or more characters, with atleast 1 capital letter, 1 symbol and 1 number.</p>
+    <p class="helpfultip">Don't reuse passwords, or use weak passwords!</p>
+    <p>Passwords must be 8 or more characters with at least 1 capital letter, 1 symbol, and 1 number.</p>
     @error('password')
     <div class="invalid-feedback" style="color:red">
         <strong>{{ $message }}</strong>
@@ -65,12 +65,12 @@
     <input id="key" type="text" name="key" placeholder="Invite Key" value="{{ old('key') }}" required>
     @error('key')
     <div class="invalid-feedback" style="color:red">
-        <strong>Incorrect invite key.</strong>
+        <strong>Invalid invite key! The invite key may be inactive or it no longer exists.</strong>
     </div>
     @enderror
-    <p>An Invite Key is required to sign up. You can obtain one from a person that has played ARCHBLOX.</p>
-    <p>Don't beg for keys.</p>
+    <p>An Invite Key is required to sign up. You can obtain one from a person that has an ARCHBLOX Account.</p>
+    <p>Don't bother random people for keys, or beg for one.</p>
     <br>
-    <button class="greenbutton" onClick="this.form.submit();this.disabled=true">Signup</button>
+    <button class="greenbutton" onClick="this.form.submit();this.disabled=true">Sign Up</button>
 
     @endsection
\ No newline at end of file
diff --git a/resources/views/invite/index.blade.php b/resources/views/invite/index.blade.php
index a0bc897..7609623 100644
--- a/resources/views/invite/index.blade.php
+++ b/resources/views/invite/index.blade.php
@@ -25,15 +25,15 @@
         @foreach ($data['fetchKeys'] as $fKey)
             <div class="FeedContainerBox" id="FeedContainerBox1">
                 <div id="ProfileContainerBox1TextContainer">
-                    <h3>Invite Key - @if (!$fKey->active)
+                    <h3>Invite Key | @if (!$fKey->active)
                             You Invited: <a href="{{ route('profile', App\Models\User::find($fKey->user_invited)->id) }}"
                                 style="font-weight:normal;color:blue">{{ App\Models\User::find($fKey->user_invited)->name }}</a>
-                            -
+                            |
                         @endif Created {{ $fKey->created_at->format('d/m/Y') }}</h3>
                     @if ($fKey->active)
-                        <h5 style="color:green">Status: Active</h5>
+                        <h5 style="color:green">Active</h5>
                     @else
-                        <h5 style="color:red">Status: Inactive</h5>
+                        <h5 style="color:red">Inactive</h5>
                     @endif
                     <address>{{ $fKey->key }}</address>
                 </div>
diff --git a/resources/views/misc/settings.blade.php b/resources/views/misc/settings.blade.php
index 3330e7a..1ea3df0 100644
--- a/resources/views/misc/settings.blade.php
+++ b/resources/views/misc/settings.blade.php
@@ -41,10 +41,10 @@
                 </span>
                 <span class="email_change" id="invisible">
                     <br>
-                    <h4>New E-Mail</h4>
-                    <input type="email" name="email" placeholder="New E-Mail Field"><br>
-                    <h4>Confirm New E-Mail</h4>
-                    <input type="email" name="email_confirmation" placeholder="Confirm New E-Mail Field">
+                    <h4>New Email</h4>
+                    <input type="email" name="email" placeholder="New Email Field"><br>
+                    <h4>Confirm New Email</h4>
+                    <input type="email" name="email_confirmation" placeholder="Confirm New Email Field">
                 </span>
                 <span class="dob_change" id="invisible">
                     <br>
@@ -127,7 +127,7 @@
         style="flex-wrap: wrap; flex-direction: row-reverse; width: 50%; text-align: end; align-content: flex-end;">
         <p style="width: 100%;">Username: {{ Auth::user()->name }} <button class="bluebutton"
                 onclick="openPopup(1)">Edit</button></p>
-        <p style="width: 100%;">E-Mail: {{ Auth::user()->email }} <button class="bluebutton"
+        <p style="width: 100%;">Email: {{ Auth::user()->email }} <button class="bluebutton"
                 onclick="openPopup(2)">Edit</button></p>
         <p style="width: 100%;">Date of Birth: {{ Auth::user()->dob }} <button class="bluebutton"
                 onclick="openPopup(3)">Edit</button>