More stuff

web/app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -21,7 +21,7 @@ class PreventRequestsDuringMaintenance
      *
      * @var array
      */
-    protected $except = [];
+    protected $except = ['banners/data'];
 
     /**
      * Create a new middleware instance.

web/app/Models/FastGroup.php

@@ -5,7 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-class FastGroup extends Model
+class Fastgroup extends Model
 {
     use HasFactory;
 }

web/database/migrations/2021_12_15_224204_create_fflags_table.php

@@ -17,8 +17,8 @@ class CreateFflagsTable extends Migration
             $table->id();
 			$table->string('name');
 			$table->string('value');
-			$table->enum('dataType', ['Log', 'Int', 'String']);
+			$table->enum('dataType', ['Log', 'Int', 'String', 'Boolean']);
-			$table->enum('type', ['Raw', 'Fast', 'Dynamic', 'Shared']);
+			$table->enum('type', ['Unscoped', 'Fast', 'Dynamic', 'Synchronised']);
 			$table->bigInteger('groupId');
             $table->timestamps();
         });

web/database/migrations/2021_12_16_011850_create_fastgroups_table.php

@@ -17,6 +17,7 @@ class CreateFastgroupsTable extends Migration
             $table->id();
 			$table->string('name');
 			$table->boolean('protected')->default(false);
+			$table->json('inheritedGroupIds')->default('[]');
             $table->timestamps();
         });
     }

web/database/seeders/DatabaseSeeder.php

@@ -16,7 +16,8 @@ class DatabaseSeeder extends Seeder
     public function run()
     {
 		$this->call([
-			WebStatusSeeder::class
+			WebStatusSeeder::class,
+			FFlagSeeder::class
 		]);
     }
 }

web/database/seeders/FFlagSeeder.php

@@ -5,7 +5,7 @@ namespace Database\Seeders;
 use Illuminate\Database\Seeder;
 
 use App\Models\FFlag;
-use App\Models\FastGroup;
+use App\Models\Fastgroup;
 
 class FFlagSeeder extends Seeder
 {
@@ -16,28 +16,43 @@ class FFlagSeeder extends Seeder
      */
     public function run()
     {
-        $clientAppSettings = FastGroup::create([
+		$appSettingsCommon = Fastgroup::create([
-			'name' => 'ClientAppSettings'
+			'name' => 'AppSettingsCommon',
+			'protected' => true
 		]);
 		
-		$cloudAppSettings = FastGroup::create([
+        $clientAppSettings = Fastgroup::create([
-			'name' => 'CloudCompute'
+			'name' => 'ClientAppSettings',
+			'inheritedGroupIds' => json_encode([ $appSettingsCommon->id ])
 		]);
 		
-		$clientSharedSettings = FastGroup::create([
+		$cloudAppSettings = Fastgroup::create([
+			'name' => 'CloudCompute',
+			'protected' => true,
+			'inheritedGroupIds' => json_encode([ $appSettingsCommon->id ])
+		]);
+		
+		$clientSharedSettings = Fastgroup::create([
 			'name' => 'ClientSharedSettings'
 		]);
 		
-		$arbiterAppSettings = FastGroup::create([
+		$arbiterAppSettings = Fastgroup::create([
 			'name' => 'Arbiter'
 		]);
 		
-		$windowsBootstrapperSettings = FastGroup::create([
+		$bootstrapperCommon = Fastgroup::create([
-			'name' => 'WindowsBootstrapperSettings'
+			'name' => 'BootstrapperCommon',
+			'protected' => true
 		]);
 		
-		$windowsStudioBootstrapperSettings = FastGroup::create([
+		$windowsBootstrapperSettings = Fastgroup::create([
-			'name' => 'WindowsStudioBootstrapperSettings'
+			'name' => 'WindowsBootstrapperSettings',
+			'inheritedGroupIds' => json_encode([ $bootstrapperCommon->id ])
+		]);
+		
+		$windowsStudioBootstrapperSettings = Fastgroup::create([
+			'name' => 'WindowsStudioBootstrapperSettings',
+			'inheritedGroupIds' => json_encode([ $bootstrapperCommon->id ])
 		]);
     }
 }

web/resources/js/layouts/App.js

@@ -53,7 +53,8 @@ class App extends React.Component {
 		{
 			axios.get(protocol + 'apis.' + url + '/')
 				.then((response) => {
-					app.setState({maintenance: false});
+					if(app.state.maintenance == true)
+						window.location.reload();
 				})
 				.catch((error) => {
 					if (error.response)

web/resources/views/javascript.blade.php

@@ -0,0 +1,15 @@
+@extends('layouts.app', ['title' => 'JavaScript', 'jsPage' => true])
+
+@section('content')
+	<div class="text-center m-auto container">
+		<h2>Uh oh!</h2>
+		<h5>Your browser doesn't seem to support JavaScript! Please upgrade your browser to use Graphictoria.</h5>
+		<hr class="mx-auto" width="20%"/>
+		<h4>JS Compatible Browsers:</h4>
+		<ul class="list-unstyled">
+			<li><a href="https://www.google.com/chrome/">Google Chrome</a></li>
+			<li><a href="https://www.mozilla.org/en-US/firefox/new/">Mozilla Firefox</a></li>
+			<li><a href="https://www.microsoft.com/en-us/edge">Microsoft Edge</a></li>
+		</ul>
+	</div>
+@endsection

web/resources/views/layouts/app.blade.php

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
-<html class="gtoria-light" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<html class="{{ isset($jsPage) ? 'gtoria-dark' : 'gtoria-light' }}" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
     <head>
-		<title>Graphictoria</title>
+		<title>Graphictoria{{ isset($title) ? ' | ' . $title : '' }}</title>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1"/>
 		<meta name="theme-color" content="#348AFF"/>
 		<meta name="author" content="Graphictoria"/>
 		<meta name="description" content="Graphictoria is an online social platform for those looking to relive the classic Roblox experience. So what are you waiting for? Join 1.7k+ other users in reliving the good ol' days! Graphictoria is not affiliated with or sponsored by Roblox Corporation, all Roblox related indica and slogans belong to Roblox Corporation."/>
 		<meta name="keywords" content="Graphictoria, XDiscuss, nostalgia, roblox, gtoria, private server"/>
-		<meta property="og:title" content="Graphictoria"/>
+		<meta property="og:title" content="Graphictoria{{ isset($title) ? ' | ' . $title : '' }}"/>
 		<meta property="og:site_name" content="Graphictoria"/>
 		<meta property="og:description" content="Graphictoria is an online social platform for those looking to relive the classic Roblox experience. So what are you waiting for? Join 1.7k+ other users in reliving the good ol' days! Graphictoria is not affiliated with or sponsored by Roblox Corporation, all Roblox related indica and slogans belong to Roblox Corporation."/>
 		<meta property="og:type" content="website"/>
@@ -21,14 +21,11 @@
 			<link href="{{ asset('manifest.json') }}" rel="manifest" integrity="{{ Sri::hash('manifest.json') }}" crossorigin="anonymous" />
 			<link href="{{ asset('css/graphictoria.css') }}" rel="stylesheet" integrity="{{ Sri::hash('css/graphictoria.css') }}" crossorigin="anonymous" />
 		@endonce
+		@yield('extra-headers')
 	</head>
 	<body>
-		<noscript>
-			Javascript is required to use Graphictoria.
-		</noscript>
 		<div id="gtoria-root">
 			@yield('content')
 		</div>
-		<script src="{{ asset('js/app.js') }}" integrity="{{ Sri::hash('js/app.js') }}" crossorigin="anonymous"></script>
     </body>
 </html>

web/resources/views/main.blade.php

@@ -1,4 +1,9 @@
 @extends('layouts.app')
 
-@section('content')
+@section('extra-headers')
+<noscript><meta http-equiv="refresh" content="0; url=javascript"/></noscript>
+@endsection
+
+@section('content')
+<script src="{{ asset('js/app.js') }}" integrity="{{ Sri::hash('js/app.js') }}" crossorigin="anonymous"></script>
 @endsection

web/routes/web.php

@@ -13,6 +13,10 @@ use Illuminate\Support\Facades\Route;
 |
 */
 
+Route::get('/javascript', function () {
+    return view('javascript');
+});
+
 Route::get('/', function () {
     return view('main');
 });