text, errors, new loading, new theme, add slogans

app/Http/Controllers/SettingController.php

@@ -130,7 +130,7 @@ class SettingController extends Controller
     public function change_theme(Request $request)
     {
         $request->validateWithBag('theme', [
-            'theme_change' => ['required', 'string', 'in:1,2,3,4,5'],
+            'theme_change' => ['required', 'string', 'in:1,2,3,4,5,6'],
         ]);
 
         $userSetting = Auth::user()->settings;

public/js/403.js

@@ -4,6 +4,11 @@ function redirect() {
 	window.location.replace("https://archblox.com");
 }
 
+function remove(el) {
+  var element = el;
+  element.remove();
+}
+
 function countdown() {
 	if (time > 0) {
     time--;

public/js/darkmode.js

@@ -0,0 +1,32 @@
+function getDarkMode() {
+    var currentTime = new Date().getHours();
+    if (6 >= currentTime || currentTime > 18) {
+        var li = document.createElement('link');
+        var href = "{{ asset('css/appdark.css?id='.Str::random(8)) }}";
+        var rel = 'stylesheet';
+        li.setAttribute('href', href);
+        li.setAttribute('rel', rel);
+        var s = document.getElementsByTagName('head')[0];
+        s.appendChild(li, s);
+
+        var li = document.createElement('meta');
+        var content = "#1952A6";
+        var datareacthelmet = 'true';
+        var name = "theme-color"
+        li.setAttribute('content', content);
+        li.setAttribute('data-react-helmet', datareacthelmet);
+        li.setAttribute('name',name)
+        var s = document.getElementsByTagName('head')[0];
+        s.appendChild(li, s);
+    } else {
+        var li = document.createElement('meta');
+        var content = "#1952A6";
+        var datareacthelmet = 'true';
+        var name = "theme-color"
+        li.setAttribute('content', content);
+        li.setAttribute('data-react-helmet', datareacthelmet);
+        li.setAttribute('name',name)
+        var s = document.getElementsByTagName('head')[0];
+        s.appendChild(li, s);
+     }
+}

public/js/detect_iphone.js

@@ -1,7 +1,7 @@
 // warning
 console.log("Stop, admin!");
 console.log(" ");
-console.log("Be cautious of what you entering/pasting in here, as it can be an account token stealer, which can get that person access to your account and the entire admin paanel.");
+console.log("Be cautious of what you entering/pasting in here, as it can be an account token stealer, which can get that person access to your account and the entire admin panel.");
 console.log("Be safe, and be smart.");
 console.log(" ");
 console.log("If you know what you're doing, go ahead!");

resources/views/errors/403.blade.php

@@ -12,9 +12,8 @@
 <script src="{{ asset('js/403.js') }}"></script>
 @endsection
 @section('contentloggedout')
-<h2>403 | Forbidden</h2>
+<h2>403 | Forbidden <button style="width: fit-content;"  class="redbutton" onclick="alert('You will face the consuquences for your actions.'); remove(this);">FUCK GO BACK</button></h2>
-<p><button style="width: fit-content;"  class="redbutton" onclick="window.history.back();">Back</button></p>
 <p>OH SHIT WHAT HAVE YOU DONE GO BACK NOW BEFORE LUIGI KILLS US ALL!!!!!!</p>
 <p>Luigi: I AM GOING TO KILL EVERYONE IN <span id="timeElement">5</span></p>
-<img alt="Angry Luigi" src="{{ asset('img/error.png') }}" width="100%" height="max-content">
+<img alt="Angry Luigi" src="{{ asset('img/error.png') }}" width="100%" height="300px">
 @endsection

resources/views/errors/404.blade.php

@@ -9,9 +9,8 @@
 <meta content="ARCHBLOX is a work in progress 2012 ROBLOX revival with a heavy emphasis on Skeuomorphic UI." property="og:description" />
 @endsection
 @section('contentloggedout')
-<h2>404 | Page Not Found</h2>
+<h2>404 | Page Not Found <button style="width: fit-content;"  class="greybutton" onclick="window.history.back();">Back</button> </h2>
-<p><button style="width: fit-content;"  class="greybutton" onclick="window.history.back();">Back</button></p>
 <p>Aw man, look at what you have done. You've made Luigi mad!</p>
 <p>Why don't you go back a page for us before Luigi destroys us all.</p>
-<img alt="Angry Luigi" src="{{ asset('img/error.png') }}" width="100%" height="max-content">
+<img alt="Angry Luigi" src="{{ asset('img/error.png') }}" width="100%" height="300px">
 @endsection

resources/views/errors/405.blade.php

@@ -12,9 +12,8 @@
 <script src="{{ asset('js/403.js') }}"></script>
 @endsection
 @section('contentloggedout')
-<h2>405 | Method Not Allowed</h2>
+<h2>405 | Method Not Allowed <button style="width: fit-content;"  class="redbutton" onclick="alert('Do not attempt to leave.'); remove(this);">FUCK GO BACK</button></h2>
-<p><button style="width: fit-content;" disabled class="redbutton">Back</button></p>
 <p>What have you done.</p>
 <p>Luigi: YOU CANNOT ESCAPE. YOU WILL BE DESTROYED IN <span id="timeElement">5</span></p>
-<img alt="Angry Luigi" src="{{ asset('img/error.png') }}" width="100%" height="max-content">
+<img alt="Angry Luigi" src="{{ asset('img/error.png') }}" width="100%" height="300px">
 @endsection

resources/views/errors/419.blade.php

@@ -9,8 +9,7 @@
 <meta content="ARCHBLOX is a work in progress 2012 ROBLOX revival with a heavy emphasis on Skeuomorphic UI." property="og:description" />
 @endsection
 @section('content')
-<h2>419 | Page Expired</h2>
+<h2>419 | Page Expired <button style="width: fit-content;"  class="greybutton" onclick="window.history.back();">Back</button></h2>
-<p><button style="width: fit-content;"  class="greybutton" onclick="window.history.back();">Back</button></p>
 <p>This means that you took too long to enter in information or there is an issue with a form.</p>
 <p>If you keep on getting this error, please contact the Developers via Discord or Messages.</p>
 @endsection

resources/views/errors/429.blade.php

@@ -9,7 +9,6 @@
 <meta content="ARCHBLOX is a work in progress 2012 ROBLOX revival with a heavy emphasis on Skeuomorphic UI." property="og:description" />
 @endsection
 @section('contentloggedout')
-<h2>429 | Too Many Requests</h2>
+<h2>429 | Too Many Requests <button style="width: fit-content;"  class="greybutton" onclick="window.history.back();">Back</button></h2>
-<p><button style="width: fit-content;"  class="greybutton" onclick="window.history.back();">Back</button></p>
 <p>You've tried to do something too many times. Please try again in a few minutes.</p>
 @endsection

resources/views/errors/500.blade.php

@@ -9,7 +9,6 @@
 <meta content="ARCHBLOX is a work in progress 2012 ROBLOX revival with a heavy emphasis on Skeuomorphic UI." property="og:description" />
 @endsection
 @section('contentloggedout')
-<h2>500 | Internal Server Error</h2>
+<h2>500 | Internal Server Error <button style="width: fit-content;"  class="greybutton" onclick="window.history.back();">Back</button></h2>
-<p><button style="width: fit-content;"  class="greybutton" onclick="window.history.back();">Back</button></p>
 <p>Please go back and try again. If it still does not work, contact one of the developers.</p>
 @endsection

resources/views/layouts/app.blade.php

@@ -16,84 +16,38 @@
     <meta name="viewport" content="width=device-width, viewport-fit=cover, initial-scale=1">
     <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
     <script src="{{ asset('js/main.js?id=' . Str::random(8)) }}"></script>
+    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
+    <script src="{{ asset('js/darkmode.js?id=' . Str::random(8)) }}"></script>
     @auth
     @switch (Auth::user()->settings->theme)
+    @case(6)
+    <script>
+            getDarkMode();
+    </script>
+    @break
     @case(5)
     <meta content="#3690df" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/appdark.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/classicappdark.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @break
     @case(4)
     <meta content="#5082ed" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/classicapp.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @break
     @case(3)
     <meta content="#1952A6" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/appdark.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @break
     @case(2)
     <meta content="#0074bd" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/2018.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @break
     @default
     <meta content="#1952A6" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @endswitch
     @else
-    <script>        
+    <script>
-    function getDarkMode() {
+            getDarkMode();
-        var currentTime = new Date().getHours();
-        if (6 >= currentTime || currentTime > 18) {
-            var li = document.createElement('link');
-            var href = "{{ asset('css/app.css?id='.Str::random(8)) }}";
-            var rel = 'stylesheet';
-            li.setAttribute('href', href);
-            li.setAttribute('rel', rel);
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-
-            var li = document.createElement('link');
-            var href = "{{ asset('css/appdark.css?id='.Str::random(8)) }}";
-            var rel = 'stylesheet';
-            li.setAttribute('href', href);
-            li.setAttribute('rel', rel);
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-
-            var li = document.createElement('meta');
-            var content = "#1952A6";
-            var datareacthelmet = 'true';
-            var name = "theme-color"
-            li.setAttribute('content', content);
-            li.setAttribute('data-react-helmet', datareacthelmet);
-            li.setAttribute('name',name)
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-        } else {
-            var li = document.createElement('link');
-            var href = "{{ asset('css/app.css?id='.Str::random(8)) }}";
-            var rel = 'stylesheet';
-            li.setAttribute('href', href);
-            li.setAttribute('rel', rel);
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-            
-            var li = document.createElement('meta');
-            var content = "#1952A6";
-            var datareacthelmet = 'true';
-            var name = "theme-color"
-            li.setAttribute('content', content);
-            li.setAttribute('data-react-helmet', datareacthelmet);
-            li.setAttribute('name',name)
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-        }
-    }
-    getDarkMode()
     </script>
     @endauth
     <script src="{{ asset('js/detect.js?id=' . Str::random(8)) }}" defer></script>
@@ -207,7 +161,23 @@
         <div class="popup" style="width: 390px">
             <h2 id="heading">Launching ARCHBLOX Studio...</h2>
             <br>
-            <img style="height: 7%;width: 62px;"  src="{{ asset('img/iosload.gif') }}" >
+            <img style="height: 7%;width: 62px;"     
+            @auth
+            @switch (Auth::user()->settings->theme)
+            @case(4)
+            src="{{ asset('img/iosload.gif') }}"
+            @break
+            @case(5)
+            src="{{ asset('img/iosload.gif') }}"
+            @break
+            @default
+            src="{{ asset('img/archbloxload.gif') }}"
+            @break
+            @endswitch
+            @else
+            src="{{ asset('img/archbloxload.gif') }}"
+            @endauth
+            >
             <br>
             <br>
             <p>Don't have ARCHBLOX Studio installed?</p>
@@ -222,7 +192,23 @@
         <div class="popup" style="width: 390px">
             <h2 id="heading">Launching ARCHBLOX...</h2>
             <br>
-            <img style="height: 7%;width: 62px;"  src="{{ asset('img/iosload.gif') }}" >
+            <img style="height: 7%;width: 62px;"  
+            @auth
+            @switch (Auth::user()->settings->theme)
+            @case(4)
+            src="{{ asset('img/iosload.gif') }}"
+            @break
+            @case(5)
+            src="{{ asset('img/iosload.gif') }}"
+            @break
+            @default
+            src="{{ asset('img/archbloxload.gif') }}"
+            @break
+            @endswitch
+            @else
+            src="{{ asset('img/archbloxload.gif') }}"
+            @endauth
+            >
             <br>
             <br>
             <p>Don't have ARCHBLOX installed?</p>

resources/views/layouts/loggedout.blade.php

@@ -55,7 +55,24 @@ $splash = array(
 'conkley is EPIC',
 'skeuomorphism is awesome',
 'It\'s free!',
-'It\'s archtastic!'
+'It\'s archtastic!',
+'The plural of horse is heese',
+'SUPER MARIO SUPER MARIO WORLD',
+'We died for like 5 months lol',
+'This shit was dead',
+'I\'m Glenn Quagmire.',
+'JESSE LOOK, IM SANS!',
+'I ain\'t reading allat :joy:',
+'i can\'t take it much longer',
+'wtf',
+'Obey the iPhone 5.',
+'This slogan has been sponsored by Buy-n-Large!',
+'Now with IP leaks!',
+'This slogan has been sponsored by RAID: SHADOW LEGENDS.',
+'This slogan has been sponsored by Super Mario 8.',
+'wawsdawsdwasdwasdwawds',
+'Hello Mario.',
+'Luigi is ALWAYS watching.'
 );
 @endphp
 
@@ -76,32 +93,34 @@ $splash = array(
     <link rel="apple-touch-startup-image" href="{{ asset('img/MORBLOXsplash.png') }}" />
     <meta name="viewport" content="width=device-width, viewport-fit=cover, initial-scale=1">
     <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
+    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
+    <script src="{{ asset('js/darkmode.js?id=' . Str::random(8)) }}"></script>
     @auth
     @switch (Auth::user()->settings->theme)
+    @case(6)
+    <script>
+            getDarkMode();
+    </script>
+    @break
     @case(5)
     <meta content="#011130" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/appdark.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/classicappdark.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @break
     @case(4)
     <meta content="#316bdf" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/classicapp.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @break
     @case(3)
     <meta content="#00004a" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/appdark.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @break
     @case(2)
     <meta content="#ffffff" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     <link href="{{ asset('css/2018.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @break
     @default
     <meta content="#0057d1" data-react-helmet="true" name="theme-color" />
-    <link href="{{ asset('css/app.css?id=' . Str::random(8)) }}" rel="stylesheet">
     @endswitch
     @else
     <style>
@@ -114,54 +133,6 @@ $splash = array(
     }
     </style>
     <script>
-    function getDarkMode() {
-        var currentTime = new Date().getHours();
-        if (6 >= currentTime || currentTime > 18) {
-            var li = document.createElement('link');
-            var href = "{{ asset('css/app.css?id='.Str::random(8)) }}";
-            var rel = 'stylesheet';
-            li.setAttribute('href', href);
-            li.setAttribute('rel', rel);
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-
-            var li = document.createElement('link');
-            var href = "{{ asset('css/appdark.css?id='.Str::random(8)) }}";
-            var rel = 'stylesheet';
-            li.setAttribute('href', href);
-            li.setAttribute('rel', rel);
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-
-            var li = document.createElement('meta');
-            var content = "#00004a";
-            var datareacthelmet = 'true';
-            var name = "theme-color"
-            li.setAttribute('content', content);
-            li.setAttribute('data-react-helmet', datareacthelmet);
-            li.setAttribute('name',name)
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-        } else {
-            var li = document.createElement('link');
-            var href = "{{ asset('css/app.css?id='.Str::random(8)) }}";
-            var rel = 'stylesheet';
-            li.setAttribute('href', href);
-            li.setAttribute('rel', rel);
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-
-            var li = document.createElement('meta');
-            var content = "#0057d1";
-            var datareacthelmet = 'true';
-            var name = "theme-color"
-            li.setAttribute('content', content);
-            li.setAttribute('data-react-helmet', datareacthelmet);
-            li.setAttribute('name',name)
-            var s = document.getElementsByTagName('head')[0];
-            s.appendChild(li, s);
-        }
-    }
     getDarkMode()
     </script>
     <style>

resources/views/misc/settings.blade.php

@@ -30,35 +30,32 @@
                 <p id="desc"></p>
                 <span class="username_change" id="invisible">
                     <br>
-                    <h4>New Username</h4>
                     <input type="text" placeholder="New Username..." id="name" name="name">
                     <br>
                     <br>
                     <input type="checkbox" id="username_change_confirm" name="username_change_confirm" value="true">
-                    <label for="username_change_confirm"> I understand that changing my username is permanent<br> and can
+                    <label for="username_change_confirm"> I understand that I can't change my username after this.</label>
-                        only
-                        be done once.</label>
                 </span>
                 <span class="email_change" id="invisible">
+                    <br>    
+                    <input type="email" name="email" placeholder="New Email">
                     <br>
-                    <h4>New Email</h4>
+                    <br>
-                    <input type="email" name="email" placeholder="New Email Field"><br>
+                    <input type="email" name="email_confirmation" placeholder="Confirm New Email">
-                    <h4>Confirm New Email</h4>
-                    <input type="email" name="email_confirmation" placeholder="Confirm New Email Field">
                 </span>
                 <span class="dob_change" id="invisible">
                     <br>
-                    <h4>New Date of Birth</h4>
                     <input type="date" name="dob">
                 </span>
                 <span class="password_change" id="invisible">
                     <br>
-                    <h4>Old Password</h4>
+                    <input type="password" name="old_password" placeholder="Old Password">
-                    <input type="password" name="old_password" placeholder=""><br>
+                    <br>
-                    <h4>New Password</h4>
+                    <br>
-                    <input type="password" name="password" placeholder=""><br>
+                    <input type="password" name="password" placeholder="New Password">
-                    <h4>Confirm New Password</h4>
+                    <br>
-                    <input type="password" name="password_confirmation" placeholder="">
+                    <br>
+                    <input type="password" name="password_confirmation" placeholder="Confirm New Password">
                 </span>
                 <span class="date_change" id="invisible">
                     <br>
@@ -79,13 +76,13 @@
                     <br>
                     <select name="message_preference">
                         <option value="2">Everyone</option>
-                        <option value="1">Friends Only</option>
+                        <option value="1">Friends</option>
-                        <option value="0">No one</option>
+                        <option value="0">Nobody</option>
                     </select>
                 </span>
                 <br>
                 <br>
-                <button class="bluebutton" type="submit">Confirm</button>
+                <button class="bluebutton" type="submit">Save</button>
                 <button class="redbutton" type="reset" onclick="closePopup()">Cancel</button>
             </form>
         </div>
@@ -146,10 +143,10 @@
                     echo 'Everyone';
                     break;
                 case 1:
-                    echo 'Friends Only';
+                    echo 'Friends';
                     break;
                 default:
-                    echo 'No one';
+                    echo 'Nobody';
             }
         @endphp <button class="bluebutton"
                 onclick="openPopup(7)">Edit</button>
@@ -171,6 +168,9 @@
             <h3>Theme</h3>
             <p>Selected Theme: @php
                 switch (Auth::user()->settings->theme) {
+                    case 6:
+                        echo 'Automatic';
+                        break;
                     case 5:
                         echo 'Classic Dark';
                         break;
@@ -197,6 +197,7 @@
                             <option value="3" @php switch (Auth::user()->settings->theme) { case 3: echo 'selected'; break; }@endphp>Dark</option>
                             <option value="4" @php switch (Auth::user()->settings->theme) { case 4: echo 'selected'; break; }@endphp>Classic Light</option>
                             <option value="5" @php switch (Auth::user()->settings->theme) { case 5: echo 'selected'; break; }@endphp>Classic Dark</option>
+                            <option value="6" @php switch (Auth::user()->settings->theme) { case 6: echo 'selected'; break; }@endphp>Automatic</option>
                         </select>
                     </div>
                     <button style="width: max-content;" class="greenbutton" type="submit">Save</button>