From 97d08c62d581558b0b799bd94eb0d1288fe7d925 Mon Sep 17 00:00:00 2001
From: xander <63683502+xander113@users.noreply.github.com>
Date: Wed, 23 Mar 2022 11:02:23 -1200
Subject: [PATCH 1/2] started catalog

cock
---
 web/app/Http/Controllers/Controller.php       |  28 ++++
 web/app/Models/CatalogCategory.php            |  20 +++
 web/app/Models/Inventory.php                  |  19 +++
 web/app/Models/Item.php                       |  15 ++
 web/app/Models/User.php                       |   8 +-
 .../2021_12_16_011849_create_users_table.php  |   1 +
 .../2022_03_23_215614_create_items_table.php  |  40 ++++++
 ..._03_23_215624_create_inventories_table.php |  36 +++++
 ...215847_create_catalog_categories_table.php |  33 +++++
 web/resources/js/components/Navbar.js         |  17 ++-
 web/resources/js/layouts/App.js               |   9 ++
 web/resources/js/pages/Catalog.js             | 131 ++++++++++++++++++
 web/resources/js/pages/Forum.js               |   2 +-
 web/resources/js/pages/Settings.js            |   4 +-
 web/resources/sass/Graphictoria.scss          |  57 ++++++++
 web/routes/apis.php                           |   4 +
 16 files changed, 413 insertions(+), 11 deletions(-)
 create mode 100644 web/app/Models/CatalogCategory.php
 create mode 100644 web/app/Models/Inventory.php
 create mode 100644 web/app/Models/Item.php
 create mode 100644 web/database/migrations/2022_03_23_215614_create_items_table.php
 create mode 100644 web/database/migrations/2022_03_23_215624_create_inventories_table.php
 create mode 100644 web/database/migrations/2022_03_23_215847_create_catalog_categories_table.php
 create mode 100644 web/resources/js/pages/Catalog.js

diff --git a/web/app/Http/Controllers/Controller.php b/web/app/Http/Controllers/Controller.php
index 63bfe5c..0b881b8 100644
--- a/web/app/Http/Controllers/Controller.php
+++ b/web/app/Http/Controllers/Controller.php
@@ -12,6 +12,9 @@ use App\Models\Category;
 use App\Models\Post;
 use App\Models\Reply;
 use App\Models\Staff;
+use App\Models\CatalogCategory;
+use App\Models\Item;
+use App\Models\Inventory;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -41,6 +44,8 @@ class Controller extends BaseController
                 $array = $user->toArray();
                 $staff = Staff::where('user_id', $user->id)->first();
                 if ($staff) {$array['power'] = $staff->power_level;}
+                $array['bank'] = $user->bank;
+                $array['email'] = $user->email;
                 return Response()->json(["data"=>$array]);
                 break;
             case "fetchedUser":
@@ -86,6 +91,29 @@ class Controller extends BaseController
 
     }
 
+    public function fetchCategoriesCatalog() {
+
+        $categories = CatalogCategory::get();
+
+        return Response()->json(["categories"=>$categories]);
+
+    }
+
+    public function fetchCategoryCatalog($id) {
+        
+        $category = CatalogCategory::where('id', $id)->first();
+
+        if (!$category) {return Response()->json(false);}
+
+        $items = $category->items()->orderBy('updated_at', 'desc')->paginate(25);
+
+        foreach ($items as &$item) {
+            $item['creator'] = User::where('id', $item['creator_id'])->first();
+        }
+
+        return Response()->json(["data"=>$category, "items"=>$items]);
+    }
+
     public function fetchCategory($id) {
         
         $category = Category::where('id', $id)->first();
diff --git a/web/app/Models/CatalogCategory.php b/web/app/Models/CatalogCategory.php
new file mode 100644
index 0000000..588671a
--- /dev/null
+++ b/web/app/Models/CatalogCategory.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class CatalogCategory extends Model
+{
+
+    use HasFactory;
+
+    protected $table = 'catalog_categories';
+
+    function items()
+    {
+        return $this->morphMany('App\Models\Item', 'category');
+    }
+
+}
diff --git a/web/app/Models/Inventory.php b/web/app/Models/Inventory.php
new file mode 100644
index 0000000..f7bdf38
--- /dev/null
+++ b/web/app/Models/Inventory.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Inventory extends Model
+{
+
+    use HasFactory;
+
+    protected $table = 'inventories';
+
+    public function item() {
+        return $this->belongsTo(Item::class);
+    }
+
+}
diff --git a/web/app/Models/Item.php b/web/app/Models/Item.php
new file mode 100644
index 0000000..935f698
--- /dev/null
+++ b/web/app/Models/Item.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Item extends Model
+{
+
+    use HasFactory;
+
+    protected $table = 'items';
+
+}
diff --git a/web/app/Models/User.php b/web/app/Models/User.php
index 18267ac..f0257bd 100644
--- a/web/app/Models/User.php
+++ b/web/app/Models/User.php
@@ -33,7 +33,9 @@ class User extends Authenticatable
         'password',
         'remember_token',
         'token',
-        'email'
+        'email',
+        'email_verified_at',
+        'bank'
     ];
 
     /**
@@ -49,5 +51,9 @@ class User extends Authenticatable
         $staff = Staff::where('user_id', $this->id)->first();
         return $staff;
     }
+
+    public function inventory() {
+        return $this->morphMany('App\Models\Inventory', 'owner');
+    }
     
 }
diff --git a/web/database/migrations/2021_12_16_011849_create_users_table.php b/web/database/migrations/2021_12_16_011849_create_users_table.php
index f91f29d..3dd6eb8 100644
--- a/web/database/migrations/2021_12_16_011849_create_users_table.php
+++ b/web/database/migrations/2021_12_16_011849_create_users_table.php
@@ -20,6 +20,7 @@ class CreateUsersTable extends Migration
             $table->timestamp('email_verified_at')->default(null);
 			$table->string('password');
             $table->string('token');
+            $table->integer('bank')->default(150);
             $table->string('about')->default(null);
             $table->timestamps();
         });
diff --git a/web/database/migrations/2022_03_23_215614_create_items_table.php b/web/database/migrations/2022_03_23_215614_create_items_table.php
new file mode 100644
index 0000000..ce26c93
--- /dev/null
+++ b/web/database/migrations/2022_03_23_215614_create_items_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateItemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('items', function (Blueprint $table) {
+            $table->id();
+            $table->string('title');
+            $table->string('description');
+            $table->string('thumbnail');
+            $table->integer('creator_id');
+            $table->integer('starting_price')->default(5);
+            $table->integer('current_price')->default(5);
+            $table->integer('category_id')->default(1);
+            $table->string('category_type');
+            //may need to add more later idk.
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('items');
+    }
+}
diff --git a/web/database/migrations/2022_03_23_215624_create_inventories_table.php b/web/database/migrations/2022_03_23_215624_create_inventories_table.php
new file mode 100644
index 0000000..00387e9
--- /dev/null
+++ b/web/database/migrations/2022_03_23_215624_create_inventories_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateInventoriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('inventories', function (Blueprint $table) {
+            $table->id();
+            $table->string('item_id');
+            $table->string('owner_id');
+            $table->string('owner_type');
+            $table->string('uid'); //unique id | used for limiteds, the original id of the inventory row. once set, it never changes
+            $table->boolean('status')->default(true);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('inventories');
+    }
+}
diff --git a/web/database/migrations/2022_03_23_215847_create_catalog_categories_table.php b/web/database/migrations/2022_03_23_215847_create_catalog_categories_table.php
new file mode 100644
index 0000000..c0c259c
--- /dev/null
+++ b/web/database/migrations/2022_03_23_215847_create_catalog_categories_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCatalogCategoriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('catalog_categories', function (Blueprint $table) {
+            $table->id();
+            $table->string('title');
+            $table->string('description');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('catalog_categories');
+    }
+}
diff --git a/web/resources/js/components/Navbar.js b/web/resources/js/components/Navbar.js
index ce7099e..aba49c0 100644
--- a/web/resources/js/components/Navbar.js
+++ b/web/resources/js/components/Navbar.js
@@ -51,13 +51,16 @@ const Navbar = (props) => {
 						<>
 							<SearchBar />
 							{props.user?
-							<li className="nav-item dropdown">
-								<button className="btn btn-secondary nav-link dropdown-toggle" href="#" id="graphictoria-nav-dropdown" role="button" data-bs-toggle="dropdown" area-expanded="false">{props.user.username}</button>
-								<ul className="dropdown-menu graphictoria-nav-dropdown" area-labelledby="graphictoria-nav-dropdown">
-									<li><NavLink className="dropdown-item" to="/auth/settings">Settings</NavLink></li>
-									<li><a className="dropdown-item" href={`/account/logout`}>Logout</a></li>
-								</ul>
-							</li> : <Link className="btn btn-success" to="/login">Login / Sign up</Link>}
+							<div className={`flex row`}>
+								<div className={`flex row col flex alc`}>Bank: ${props.user.bank}</div>
+								<li className="nav-item dropdown col flex alc">
+									<button className="btn btn-secondary nav-link dropdown-toggle" href="#" id="graphictoria-nav-dropdown" role="button" data-bs-toggle="dropdown" area-expanded="false">{props.user.username}</button>
+									<ul className="dropdown-menu graphictoria-nav-dropdown" area-labelledby="graphictoria-nav-dropdown">
+										<li><NavLink className="dropdown-item" to="/auth/settings">Settings</NavLink></li>
+										<li><a className="dropdown-item" href={`/account/logout`}>Logout</a></li>
+									</ul>
+								</li>
+							</div> : <Link className="btn btn-success" to="/login">Login / Sign up</Link>}
 						</>
 						:
 						null
diff --git a/web/resources/js/layouts/App.js b/web/resources/js/layouts/App.js
index 92c6667..7735033 100644
--- a/web/resources/js/layouts/App.js
+++ b/web/resources/js/layouts/App.js
@@ -35,6 +35,7 @@ import CreatePost from '../pages/CreatePost.js';
 import CreateReply from '../pages/CreateReply.js';
 import Settings from '../pages/Settings.js';
 import User from '../pages/User.js';
+import Catalog from '../pages/Catalog.js';
 
 axios.defaults.withCredentials = true
 
@@ -155,6 +156,14 @@ const App = () => {
 									<Forum user={user}/>
 								</Route>
 
+								<Route exact path="/catalog">
+									<Catalog user={user}/>
+								</Route>
+
+								<Route exact path="/catalog/category/:id">
+									<Catalog user={user}/>
+								</Route>
+
 								<GuardedRoute exact path="/forum/post" meta={{auth: true}}>
 									<CreatePost user={user}/>
 								</GuardedRoute>
diff --git a/web/resources/js/pages/Catalog.js b/web/resources/js/pages/Catalog.js
new file mode 100644
index 0000000..15c1b3e
--- /dev/null
+++ b/web/resources/js/pages/Catalog.js
@@ -0,0 +1,131 @@
+// © XlXi 2021
+// Graphictoria 5
+
+import axios from 'axios';
+import React, { useEffect, useState } from "react";
+import { Link, useHistory, useParams } from "react-router-dom";
+
+import Config from '../config.js';
+
+import SetTitle from "../Helpers/Title.js";
+
+import Loader from '../Components/Loader.js';
+
+import { GenericErrorModal } from './Errors.js';
+import { Card, CardTitle } from '../Layouts/Card.js';
+import { paginate } from '../helpers/utils.js';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+
+var url = Config.BaseUrl.replace('http://', '');
+var protocol = Config.Protocol;
+
+const Catalog = (props) => {
+
+    var id = useParams().id;
+    const [state, setState] = useState({offline: false, loading: true});
+    const [categories, setCategoires] = useState([]);
+    const [category, setCategory] = useState([]);
+    const [items, setItems] = useState({items: [], currentPage: 1, meta: []});
+    const user = props.user;
+
+    if (!id) id = 1;
+
+    const fetchCategories = async () => {
+        await axios.get(`${protocol}apis.${url}/fetch/categories/catalog`, {headers: {"X-Requested-With":"XMLHttpRequest"}}).then(data=>{
+            setCategoires(data.data.categories);
+        }).catch(error=>{console.log(error);});
+    }
+
+    const fetchCategory = async () => {
+        await axios.get(`${protocol}apis.${url}/fetch/category/catalog/${id}?page=${items.currentPage}`, {headers: {"X-Requested-With":"XMLHttpRequest"}}).then(data=>{
+            if (!data.data) {window.location.href=`/forum`;return;}
+            setCategory(data.data.data);
+            setItems({...items, items: data.data.items.data, meta: data.data.items});
+        }).catch(error=>{console.log(error);});
+    }
+
+    const paginateitems = async (decision) => {
+        paginate(decision, items.currentPage, items.meta).then(res=>{
+            switch(res){
+                case "increase":
+                    setItems({...items, currentPage: items.currentPage+1});
+                    break;
+                case "decrease":
+                    setItems({...items, currentPage: items.currentPage-1});
+                    break;
+                default:
+                    break;
+            }
+        }).catch(error=>console.log(error));
+    }
+
+    useEffect(async ()=>{
+        SetTitle(`Catalog`);
+        await fetchCategory();
+        await fetchCategories();
+        setState({...state, loading: false});
+    }, []);
+
+    useEffect(async()=>{
+        setState({...state, loading: true});
+        await fetchCategory();
+        setState({...state, loading: false});
+    }, [items.currentPage]);
+	
+		return (
+			state.loading || categories.length <= 0
+			?
+			<Loader />
+			:
+			<div className={`flex jcc alc w-100 column`}>
+                <div className="graphictoria-nav-splitter"></div>
+                <div className={`row w-60`}>
+                    <div className={`col-3 justify-content-center flex-column`}>
+                        <div>
+                            <h4>Categories:</h4>
+                            {categories.map(category=>(
+                                <>
+                                <Link to={`/catalog/category/${category.id}`}>{category.title}</Link><br/>
+                                </>
+                            ))}
+                        </div>
+                        <div className="graphictoria-nav-splitter"></div>
+                        <div>
+                            <h4>Options:</h4>
+                            <div className={`flex flex-column`}>
+                                <h6>Search for an item:</h6>
+                                <input placeholder={`temp`}/>
+                            </div>
+                        </div>
+                    </div>
+                    <div className={`col justify-content-center`}>
+                        {items.items.length <= 0 ? <p>There are currently no items!</p> : null}
+                        <div className={`flex flex-row flex-wrap`}>
+                            {items.items.map(item=>(
+                                <>
+                                <Link to={`/item/${item.id}`} className={`flex graphic-post-column col-3`}>
+                                    <div className={`flex column mb-10 alc`}>
+                                        [Thumbnail.]
+                                    </div>
+                                    <div className={`flex flex-column m-0`}>
+                                        <div className={`flex row w-fit-content`}><h6 className={`m-0 mr-15 fs13`}>{item.title}</h6></div>
+                                        <div className={`row fs15 w-fit-content`}>
+                                            <p className={`w-fit-content`}>${item.current_price}</p>
+                                        </div>
+                                    </div>
+                                </Link>
+                                </>
+                            ))}
+                        </div>
+                        {items.items.length >= 1?
+                        <div className={`w-100 jcc alc row mt-15`}>
+                            {items.currentPage >= 2? <button className={`w-fit-content btn btn-primary mr-15`} onClick={(e)=>{paginateitems(true);}}>Previous Page</button> : null}
+                            {items.currentPage < items.meta.last_page? <button className={`w-fit-content btn btn-primary`} onClick={(e)=>{paginateitems(false);}}>Next Page</button> : null}
+                        </div> : null}
+                    </div>
+                </div>
+            </div>
+		);
+}
+
+export default Catalog;
diff --git a/web/resources/js/pages/Forum.js b/web/resources/js/pages/Forum.js
index d5d1a1a..001c140 100644
--- a/web/resources/js/pages/Forum.js
+++ b/web/resources/js/pages/Forum.js
@@ -73,7 +73,7 @@ const Forum = (props) => {
     }, [posts.currentPage]);
 	
 		return (
-			state.loading
+			state.loading || categories.length <= 0
 			?
 			<Loader />
 			:
diff --git a/web/resources/js/pages/Settings.js b/web/resources/js/pages/Settings.js
index c752109..3647fe5 100644
--- a/web/resources/js/pages/Settings.js
+++ b/web/resources/js/pages/Settings.js
@@ -68,8 +68,8 @@ const Settings = (props) => {
                 </div>
                 <div className="graphictoria-nav-splitter"></div>
                 {validity.error?
-                    <div className={`px-5 mb-10 w-60`}>
-                        <div className={`error-dialog w-60`}>
+                    <div className={`px-5 mb-10 w-60 justify-content-center align-items-center`}>
+                        <div className={`error-dialog w-100`}>
                             <p className={`mb-0`}>{validity.message}</p>
                         </div>
                     </div> 
diff --git a/web/resources/sass/Graphictoria.scss b/web/resources/sass/Graphictoria.scss
index 65ce360..143fa64 100644
--- a/web/resources/sass/Graphictoria.scss
+++ b/web/resources/sass/Graphictoria.scss
@@ -330,6 +330,7 @@ html {
 
 .graphictoria-nav-splitter {
   margin-top: 16px;
+  margin-bottom: 16px !important;
 }
 
 .graphictoria-search, #graphictoria-search-dropdown {
@@ -928,10 +929,34 @@ p {
   margin: 0px !important;
 }
 
+.fs10 {
+  font-size: 10px !important;
+}
+
+.fs11 {
+  font-size: 11px !important;
+}
+
 .fs12 {
   font-size: 12px !important;
 }
 
+.fs13 {
+  font-size: 13px !important;
+}
+
+.fs14 {
+  font-size: 14px !important;
+}
+
+.fs15 {
+  font-size: 15px !important;
+}
+
+.fs16 {
+  font-size: 16px !important;
+}
+
 .padding-none {
   padding: 0px !important
 }
@@ -956,6 +981,26 @@ p {
   margin-bottom: 15px !important;
 }
 
+.mb-5 {
+  margin-bottom: 5px !important;
+}
+
+.mt-5 {
+  margin-bottom: 5px !important;
+}
+
+.mb-10 {
+  margin-bottom: 10px !important;
+}
+
+.mt-10 {
+  margin-bottom: 10px !important;
+}
+
+::marker {
+  display: none !important;
+}
+
 .graphic-post {
   padding: 1rem 1rem;
   text-align: start;
@@ -968,6 +1013,18 @@ p {
   align-items: center !important;
 }
 
+.graphic-post-column {
+  padding: 1rem 1rem;
+  text-align: start;
+  color: inherit !important;
+  text-decoration: none !important;
+  background-color: #222 !important;
+  border-radius: 0.25px;
+  display: flex;
+  flex-direction: column;
+  align-items: center !important;
+}
+
 .error-dialog {
   padding: 5px;
   margin-bottom: 10px;
diff --git a/web/routes/apis.php b/web/routes/apis.php
index b720633..bb80f0c 100644
--- a/web/routes/apis.php
+++ b/web/routes/apis.php
@@ -31,6 +31,10 @@ Route::get('/fetch/categories', 'Controller@fetchCategories');
 
 Route::post('/fetch/categories/post', 'Controller@fetchCategoriesFP');
 
+Route::get('/fetch/categories/catalog', 'Controller@fetchCategoriesCatalog');
+
+Route::get('/fetch/category/catalog/{id}', 'Controller@fetchCategoryCatalog');
+
 Route::get('/fetch/category/{id}', 'Controller@fetchCategory');
 
 Route::get('/fetch/posts/{id}', 'Controller@fetchPosts');
-- 
2.40.1


From e67e83c1b6f2cd4e35524027094d882156a116de Mon Sep 17 00:00:00 2001
From: gtoriadotnet <xlxi@gtoria.net>
Date: Thu, 24 Mar 2022 00:05:07 -0400
Subject: [PATCH 2/2] ClientSettings api

---
 web/app/Helpers/COMHelper.php                 |  15 +++
 web/app/Helpers/GridHelper.php                |  35 ++++++
 web/app/Helpers/JSON.php                      |  21 ++++
 web/app/Http/Controllers/AppSettings.php      | 106 ++++++++++++++++++
 web/app/Models/FFlag.php                      |  14 +++
 web/app/Models/FastGroup.php                  |  11 --
 web/app/Models/Fbucket.php                    |  19 ++++
 web/app/Providers/RouteServiceProvider.php    |   5 +
 web/config/database.php                       |  32 +++++-
 .../2021_12_15_224204_create_fflags_table.php |   9 +-
 ...21_12_16_011850_create_fbuckets_table.php} |  13 ++-
 web/database/seeders/FFlagSeeder.php          |  18 +--
 .../seeders/WebConfigurationSeeder.php        |  10 ++
 web/routes/appsettings.php                    |  28 +++++
 14 files changed, 306 insertions(+), 30 deletions(-)
 create mode 100644 web/app/Helpers/COMHelper.php
 create mode 100644 web/app/Helpers/GridHelper.php
 create mode 100644 web/app/Helpers/JSON.php
 create mode 100644 web/app/Http/Controllers/AppSettings.php
 delete mode 100644 web/app/Models/FastGroup.php
 create mode 100644 web/app/Models/Fbucket.php
 rename web/database/migrations/{2021_12_16_011850_create_fastgroups_table.php => 2021_12_16_011850_create_fbuckets_table.php} (66%)
 create mode 100644 web/routes/appsettings.php

diff --git a/web/app/Helpers/COMHelper.php b/web/app/Helpers/COMHelper.php
new file mode 100644
index 0000000..404f1cd
--- /dev/null
+++ b/web/app/Helpers/COMHelper.php
@@ -0,0 +1,15 @@
+<?php
+
+/*
+	Graphictoria 2022
+	JSON Pretty Printer
+*/
+
+namespace App\Helpers;
+
+class COMHelper
+{
+	public static function isCOM() {
+		return (php_sapi_name() === 'cli');
+	}
+}
diff --git a/web/app/Helpers/GridHelper.php b/web/app/Helpers/GridHelper.php
new file mode 100644
index 0000000..106f78c
--- /dev/null
+++ b/web/app/Helpers/GridHelper.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+	Graphictoria 2022
+	JSON Pretty Printer
+*/
+
+namespace App\Helpers;
+
+use App\Helpers\COMHelper;
+
+use App\Models\WebsiteConfiguration;
+
+class GridHelper
+{
+	public static function isIpWhitelisted($request) {
+		$ip = $request->ip();
+		$whitelistedIps = explode(';', WebsiteConfiguration::where('name', 'WhitelistedIPs')->first()->value);
+		
+		return in_array($ip, $whitelistedIps);
+	}
+	
+	public static function isAccessKeyValid($request) {
+		$accessKey = WebsiteConfiguration::where('name', 'ComputeServiceAccessKey')->first()->value;
+		
+		return ($request->header('AccessKey') == $accessKey);
+	}
+	
+	public static function hasAllAccess($request) {
+		if(COMHelper::isCOM()) return true;
+		if(GridHelper::isIpWhitelisted($request) && GridHelper::isAccessKeyValid($request)) return true;
+		
+		return false;
+	}
+}
diff --git a/web/app/Helpers/JSON.php b/web/app/Helpers/JSON.php
new file mode 100644
index 0000000..9a6f6db
--- /dev/null
+++ b/web/app/Helpers/JSON.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+	Graphictoria 2022
+	JSON Pretty Printer
+*/
+
+namespace App\Helpers;
+
+class JSON
+{
+	public static function EncodeResponse($array) {
+		$json = json_encode(
+			$array,
+			JSON_PRETTY_PRINT | JSON_NUMERIC_CHECK | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_LINE_TERMINATORS
+		);
+		
+		return response($json)
+			->header('Content-Type', 'application/json');
+	}
+}
diff --git a/web/app/Http/Controllers/AppSettings.php b/web/app/Http/Controllers/AppSettings.php
new file mode 100644
index 0000000..6f3ea66
--- /dev/null
+++ b/web/app/Http/Controllers/AppSettings.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Cache;
+
+use App\Helpers\JSON;
+use App\Helpers\GridHelper;
+
+use App\Models\FFlag;
+use App\Models\Fbucket;
+
+class AppSettings extends Controller
+{
+	/**
+	 * A list of flag prefixes
+	 *
+	 * @var array
+	 */
+	protected $prefixes = [
+		'Unscoped' => '',
+		'Fast' => 'F',
+		'Dynamic' => 'DF',
+		'Synchronised' => 'SF'
+	];
+	
+	/**
+	 * A list of flag types
+	 *
+	 * @var array
+	 */
+	protected $types = [
+		'Log' => 'Log',
+		'Int' => 'Int',
+		'String' => 'String',
+		'Boolean' => 'Flag'
+	];
+	
+	/**
+     * Returns a JSON array with the error code and message.
+     *
+     * @return Response
+     */
+	private function error($data, $code = 400)
+	{
+		return response(['errors' => [$data]], 400);
+	}
+	
+    /**
+     * Returns a JSON array of settings for the specified bucket.
+     *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string                    $bucketName
+     * @return Response
+     */
+    public function getBucket(Request $request, $bucketName)
+    {
+		$primaryBucket = Fbucket::where('name', $bucketName);
+		
+		if($primaryBucket->exists()) {
+			$primaryBucket = $primaryBucket->first();
+			
+			$bucketIds = [ $primaryBucket->id ];
+			$bucketIds = array_merge($bucketIds, json_decode($primaryBucket->inheritedGroupIds));
+			
+			if($primaryBucket->protected == 1 && !GridHelper::hasAllAccess($request)) {
+				return $this->error([
+					'code' => 2,
+					'message' => 'You do not have access to this bucket.'
+				], 401);
+			}
+			
+			/* */
+			
+			$flags = [];
+			
+			foreach($bucketIds as $bucket) {
+				$fflags = FFlag::where('bucketId', $bucket)->get();
+				
+				foreach($fflags as $flag) {
+					$prefix = $this->prefixes[$flag->type];
+					$dataType = $this->types[$flag->dataType];
+					
+					$name = '';
+					if($prefix != 'Unscoped') {
+						$name = ($prefix . $dataType);
+					}
+					
+					$name .= $flag->name;
+					
+					$flags[$name] = $flag->value;
+				}
+			}
+			
+			return JSON::EncodeResponse($flags);
+		} else {
+			return $this->error([
+				'code' => 1,
+				'message' => 'The requested bucket does not exist.'
+			]);
+		}
+	}
+
+}
diff --git a/web/app/Models/FFlag.php b/web/app/Models/FFlag.php
index 40701e2..e1ef304 100644
--- a/web/app/Models/FFlag.php
+++ b/web/app/Models/FFlag.php
@@ -7,5 +7,19 @@ use Illuminate\Database\Eloquent\Model;
 
 class FFlag extends Model
 {
+	/**
+	 * The database connection that should be used by the migration.
+	 *
+	 * @var string
+	 */
+	protected $connection = 'mysql-fflag';
+	
+	/**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'fflags';
+	
     use HasFactory;
 }
diff --git a/web/app/Models/FastGroup.php b/web/app/Models/FastGroup.php
deleted file mode 100644
index b2041d7..0000000
--- a/web/app/Models/FastGroup.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Fastgroup extends Model
-{
-    use HasFactory;
-}
diff --git a/web/app/Models/Fbucket.php b/web/app/Models/Fbucket.php
new file mode 100644
index 0000000..4ef77bf
--- /dev/null
+++ b/web/app/Models/Fbucket.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+/* FFlag bucket */
+class Fbucket extends Model
+{
+	/**
+	 * The database connection that should be used by the migration.
+	 *
+	 * @var string
+	 */
+	protected $connection = 'mysql-fflag';
+	
+    use HasFactory;
+}
diff --git a/web/app/Providers/RouteServiceProvider.php b/web/app/Providers/RouteServiceProvider.php
index 06bc747..a0e24fe 100644
--- a/web/app/Providers/RouteServiceProvider.php
+++ b/web/app/Providers/RouteServiceProvider.php
@@ -45,6 +45,11 @@ class RouteServiceProvider extends ServiceProvider
                 ->namespace($this->namespace)
                 ->group(base_path('routes/apis.php'));
 				
+			Route::domain('clientsettings.api.' . env('APP_URL'))
+                ->middleware('api')
+                ->namespace($this->namespace)
+                ->group(base_path('routes/appsettings.php'));
+				
 			Route::domain('impulse.' . env('APP_URL'))
                 ->middleware('admin')
                 ->namespace($this->namespace)
diff --git a/web/config/database.php b/web/config/database.php
index 66d8670..a8f2466 100644
--- a/web/config/database.php
+++ b/web/config/database.php
@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'default' => env('DB_CONNECTION', 'mysql'),
+    'default' => env('DB_CONNECTION', 'mysql-primary'),
 
     /*
     |--------------------------------------------------------------------------
@@ -38,17 +38,37 @@ return [
         'sqlite' => [
             'driver' => 'sqlite',
             'url' => env('DATABASE_URL'),
-            'database' => env('DB_DATABASE', database_path('database.sqlite')),
+            'database' => env('DB_PRIMARY_DATABASE', database_path('database.sqlite')),
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
 
-        'mysql' => [
+        'mysql-primary' => [
             'driver' => 'mysql',
             'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
+            'database' => env('DB_PRIMARY_DATABASE', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => true,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
+		
+		'mysql-fflag' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_FFLAG_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
             'unix_socket' => env('DB_SOCKET', ''),
@@ -68,7 +88,7 @@ return [
             'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '5432'),
-            'database' => env('DB_DATABASE', 'forge'),
+            'database' => env('DB_PRIMARY_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
@@ -83,7 +103,7 @@ return [
             'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '1433'),
-            'database' => env('DB_DATABASE', 'forge'),
+            'database' => env('DB_PRIMARY_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
diff --git a/web/database/migrations/2021_12_15_224204_create_fflags_table.php b/web/database/migrations/2021_12_15_224204_create_fflags_table.php
index 6ba9868..d460fae 100644
--- a/web/database/migrations/2021_12_15_224204_create_fflags_table.php
+++ b/web/database/migrations/2021_12_15_224204_create_fflags_table.php
@@ -6,6 +6,13 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateFflagsTable extends Migration
 {
+	/**
+	 * The database connection that should be used by the migration.
+	 *
+	 * @var string
+	 */
+	protected $connection = 'mysql-fflag';
+	
     /**
      * Run the migrations.
      *
@@ -19,7 +26,7 @@ class CreateFflagsTable extends Migration
 			$table->string('value');
 			$table->enum('dataType', ['Log', 'Int', 'String', 'Boolean']);
 			$table->enum('type', ['Unscoped', 'Fast', 'Dynamic', 'Synchronised']);
-			$table->bigInteger('groupId');
+			$table->bigInteger('bucketId');
             $table->timestamps();
         });
     }
diff --git a/web/database/migrations/2021_12_16_011850_create_fastgroups_table.php b/web/database/migrations/2021_12_16_011850_create_fbuckets_table.php
similarity index 66%
rename from web/database/migrations/2021_12_16_011850_create_fastgroups_table.php
rename to web/database/migrations/2021_12_16_011850_create_fbuckets_table.php
index 98339ba..08a0141 100644
--- a/web/database/migrations/2021_12_16_011850_create_fastgroups_table.php
+++ b/web/database/migrations/2021_12_16_011850_create_fbuckets_table.php
@@ -4,8 +4,15 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateFastgroupsTable extends Migration
+class CreateFbucketsTable extends Migration
 {
+	/**
+	 * The database connection that should be used by the migration.
+	 *
+	 * @var string
+	 */
+	protected $connection = 'mysql-fflag';
+	
     /**
      * Run the migrations.
      *
@@ -13,7 +20,7 @@ class CreateFastgroupsTable extends Migration
      */
     public function up()
     {
-        Schema::create('fastgroups', function (Blueprint $table) {
+        Schema::create('fbuckets', function (Blueprint $table) {
             $table->id();
 			$table->string('name');
 			$table->boolean('protected')->default(false);
@@ -29,6 +36,6 @@ class CreateFastgroupsTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('fastgroups');
+        Schema::dropIfExists('fbuckets');
     }
 }
diff --git a/web/database/seeders/FFlagSeeder.php b/web/database/seeders/FFlagSeeder.php
index 4b02ad1..7a323e1 100644
--- a/web/database/seeders/FFlagSeeder.php
+++ b/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\Fbucket;
 
 class FFlagSeeder extends Seeder
 {
@@ -16,41 +16,41 @@ class FFlagSeeder extends Seeder
      */
     public function run()
     {
-		$appSettingsCommon = Fastgroup::create([
+		$appSettingsCommon = Fbucket::create([
 			'name' => 'AppSettingsCommon',
 			'protected' => true
 		]);
 		
-        $clientAppSettings = Fastgroup::create([
+        $clientAppSettings = Fbucket::create([
 			'name' => 'ClientAppSettings',
 			'inheritedGroupIds' => json_encode([ $appSettingsCommon->id ])
 		]);
 		
-		$cloudAppSettings = Fastgroup::create([
+		$cloudAppSettings = Fbucket::create([
 			'name' => 'CloudCompute',
 			'protected' => true,
 			'inheritedGroupIds' => json_encode([ $appSettingsCommon->id ])
 		]);
 		
-		$clientSharedSettings = Fastgroup::create([
+		$clientSharedSettings = Fbucket::create([
 			'name' => 'ClientSharedSettings'
 		]);
 		
-		$arbiterAppSettings = Fastgroup::create([
+		$arbiterAppSettings = Fbucket::create([
 			'name' => 'Arbiter'
 		]);
 		
-		$bootstrapperCommon = Fastgroup::create([
+		$bootstrapperCommon = Fbucket::create([
 			'name' => 'BootstrapperCommon',
 			'protected' => true
 		]);
 		
-		$windowsBootstrapperSettings = Fastgroup::create([
+		$windowsBootstrapperSettings = Fbucket::create([
 			'name' => 'WindowsBootstrapperSettings',
 			'inheritedGroupIds' => json_encode([ $bootstrapperCommon->id ])
 		]);
 		
-		$windowsStudioBootstrapperSettings = Fastgroup::create([
+		$windowsStudioBootstrapperSettings = Fbucket::create([
 			'name' => 'WindowsStudioBootstrapperSettings',
 			'inheritedGroupIds' => json_encode([ $bootstrapperCommon->id ])
 		]);
diff --git a/web/database/seeders/WebConfigurationSeeder.php b/web/database/seeders/WebConfigurationSeeder.php
index d3021d7..e70fa28 100644
--- a/web/database/seeders/WebConfigurationSeeder.php
+++ b/web/database/seeders/WebConfigurationSeeder.php
@@ -23,5 +23,15 @@ class WebConfigurationSeeder extends Seeder
 					'password' => '@bs0lut3lyM@55!v3P@55w0rd'
 				])
 		]); // please please please please please please please change the default password
+		
+		WebsiteConfiguration::create([
+			'name' => 'ComputeServiceAccessKey',
+			'value' => '92a6ac6b-7167-49b1-9ccd-079820ac892b'
+		]); // change this as well
+		
+		WebsiteConfiguration::create([
+			'name' => 'WhitelistedIPs',
+			'value' => '127.0.0.1'
+		]);
     }
 }
diff --git a/web/routes/appsettings.php b/web/routes/appsettings.php
new file mode 100644
index 0000000..a33712a
--- /dev/null
+++ b/web/routes/appsettings.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
+use App\Http\Controllers\AppSettings;
+
+/*
+|--------------------------------------------------------------------------
+| API Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register API routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| is assigned the "api" middleware group. Enjoy building your API!
+|
+*/
+
+Route::get('/', function(){
+	return 'API OK';
+});
+
+Route::get('/Setting/QuietGet/{Bucket}', 'AppSettings@getBucket');
+
+Route::fallback(function(){
+	return response('{"errors":[{"code":404,"message":"NotFound"}]}', 404)
+		->header('Cache-Control', 'private')
+		->header('Content-Type', 'application/json; charset=utf-8');
+});
\ No newline at end of file
-- 
2.40.1