this is an example of how not to do ui

FireMario211 · Sep 16, 2024 · b12f34f · b12f34f
1 parent ced63cb
commit b12f34f
Show file tree

Hide file tree

Showing 30 changed files with 1,692 additions and 380 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,9 @@
 cmake_minimum_required(VERSION 3.21)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+if (APPLE)
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+endif()
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 project(object-workshop VERSION 1.0.0)

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,12 @@
+# v1.2.0
+- Improved on the UI for clicking on objects (Thanks Rue!) - It will be overhauled again next major update.
+- Allowed updating an object rather then needing to delete and reupload
+- Added a "reset zoom" button
+- Added comments
+- Added info button
+- Added Custom Object Bypass
+- Removed the "Enabled" setting as its useless
+- Fixed bug searching with too many tags
 # v1.1.3
 - Changed Android32 to NOT use TextArea (geode needs to fix gd::string!) basically setting a description is now fixed with a few caviats
 - Made downloading pending objects not send a request.

diff --git a/mod.json b/mod.json
@@ -1,5 +1,5 @@
 {
-	"geode": "3.4.0",
+	"geode": "3.7.0",
 	"gd": {
 		"win": "2.206",
 		"android": "2.206",
@@ -8,7 +8,7 @@
 	},
 	"id": "firee.object-workshop",
 	"name": "Object Workshop",
-	"version": "v1.1.3",
+	"version": "v1.2.0",
 	"developer": "Firee",
 	"description": "Download, upload, or find custom objects made by other creators!",
     "resources": {
@@ -22,12 +22,6 @@
     },
     "tags": ["online", "utility", "content", "editor", "interface"],
     "settings": {
-        "enabled": {
-            "name": "Enabled",
-            "description": "Whether or not the mod should replace your Custom Objects screen. Disabling this won't allow you to use the workshop.",
-            "type": "bool",
-            "default": true
-        },
         "token": {
             "name": "Auth Token",
             "description": "Authentication Token (DO NOT CHANGE)",
@@ -42,6 +36,12 @@
             "min": -1,
             "max": 2
         },
+        "object-bypass": {
+            "name": "Custom Object Bypass",
+            "description": "Removes the limit for 1000 objects and removes the limit of 750 maximum custom objects.",
+            "default": true,
+            "type": "bool"
+        },
         "render-objects": {
             "name": "Render Objects",
             "description": "The amount of objects that should be shown. Decrease for performance. (0 = Unlimited)",

diff --git a/server/package.json b/server/package.json
@@ -33,6 +33,7 @@
     "express": "^4.18.2",
     "express-rate-limit": "^7.4.0",
     "express-validator": "^7.2.0",
+    "moment": "^2.30.1",
     "morgan": "^1.10.0",
     "pg": "^8.12.0"
   }

diff --git a/server/src/Components/Object.ts b/server/src/Components/Object.ts
@@ -2,7 +2,6 @@ export default interface ObjectData {
     id: number;
     account_id: number;
     account_name: string;
-    timestamp: Date | number;
     name: string;
     description: string;
     downloads: number;
@@ -11,5 +10,8 @@ export default interface ObjectData {
     rating_count: number;
     tags: Array<string>;
     status: number;
+    version: number;
+    created: string;
+    updated: string;
     data: string;
 };
diff --git a/server/src/Components/User.ts b/server/src/Components/User.ts
@@ -7,4 +7,7 @@ export interface UserData {
     timestamp: Date | number;
     role: number;
     uploads: number;
+    ban_reason: string;
+    c_likes: Array<number>;
+    c_dislikes: Array<number>;
 };