v1.0.5

Author: byteful

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@modl-gg/shared-web",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Shared schemas and types for the modl ecosystem.",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",

package.json

@@ -31,10 +31,10 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
 
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
->(({ className, children, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & { overlayClassName?: string }
+>(({ className, children, overlayClassName, ...props }, ref) => (
   <DialogPortal>
-    <DialogOverlay />
+    <DialogOverlay className={overlayClassName} />
     <DialogPrimitive.Content
       ref={ref}
       className={cn(

src/components/ui/dialog.tsx

@@ -14,34 +14,34 @@ export interface IModlServer extends Document {
   emailVerificationToken?: string;
 
   // Provisioning & Status
-  provisioningStatus: 'pending' | 'in-progress' | 'completed' | 'failed';
+  provisioningStatus: 'PENDING' | 'IN_PROGRESS' | 'COMPLETED' | 'FAILED';
   provisioningNotes?: string;
   provisioningSignInToken?: string;
   provisioningSignInTokenExpiresAt?: Date;
 
   // Plan & Billing
-  plan: 'free' | 'premium';
-  subscription_status: 'active' | 'canceled' | 'past_due' | 'inactive' | 'trialing' | 'incomplete' | 'incomplete_expired' | 'unpaid' | 'paused';
-  current_period_start?: Date;
-  current_period_end?: Date;
-  stripe_customer_id?: string;
-  stripe_subscription_id?: string;
+  plan: 'FREE' | 'PREMIUM';
+  subscriptionStatus?: 'ACTIVE' | 'CANCELED' | 'PAST_DUE' | 'INACTIVE' | 'TRIALING' | 'INCOMPLETE' | 'INCOMPLETE_EXPIRED' | 'UNPAID' | 'PAUSED';
+  currentPeriodStart?: Date;
+  currentPeriodEnd?: Date;
+  stripeCustomerId?: string;
+  stripeSubscriptionId?: string;
 
   // Usage Tracking & Billing
-  cdn_usage_current_period?: number; // GB used in current billing period
-  ai_requests_current_period?: number; // AI requests used in current billing period
-  usage_billing_enabled?: boolean; // Whether to charge for overages
-  usage_billing_updated_at?: Date;
+  cdnUsageCurrentPeriod?: number; // GB used in current billing period
+  aiRequestsCurrentPeriod?: number; // AI requests used in current billing period
+  usageBillingEnabled?: boolean; // Whether to charge for overages
+  usageBillingUpdatedAt?: Date;
 
   // Migration Settings
   migrationFileSizeLimit?: number; // Custom migration file size limit in bytes (optional, defaults to 5GB)
 
   // Custom Domain
-  customDomain_override?: string;
-  customDomain_status?: 'pending' | 'active' | 'error' | 'verifying';
-  customDomain_lastChecked?: Date;
-  customDomain_error?: string;
-  customDomain_cloudflareId?: string;
+  customDomainOverride?: string;
+  customDomainStatus?: 'PENDING' | 'ACTIVE' | 'ERROR' | 'VERIFYING';
+  customDomainLastChecked?: Date;
+  customDomainError?: string;
+  customDomainCloudflareId?: string;
 
   // Analytics/Stats from modl-admin
   userCount: number;
@@ -63,32 +63,32 @@ export const ModlServerSchema = new Schema<IModlServer>({
   emailVerified: { type: Boolean, default: false, index: true },
   emailVerificationToken: { type: String, unique: true, sparse: true },
 
-  provisioningStatus: { type: String, enum: ['pending', 'in-progress', 'completed', 'failed'], default: 'pending', index: true },
+  provisioningStatus: { type: String, enum: ['PENDING', 'IN_PROGRESS', 'COMPLETED', 'FAILED'], default: 'PENDING', index: true },
   provisioningNotes: { type: String },
   provisioningSignInToken: { type: String, unique: true, sparse: true },
   provisioningSignInTokenExpiresAt: { type: Date },
 
-  plan: { type: String, enum: ['free', 'premium'], default: 'free', index: true },
-  subscription_status: { type: String, enum: ['active', 'canceled', 'past_due', 'inactive', 'trialing', 'incomplete', 'incomplete_expired', 'unpaid', 'paused'], default: 'inactive', index: true },
-  current_period_start: { type: Date, sparse: true },
-  current_period_end: { type: Date, sparse: true },
-  stripe_customer_id: { type: String, unique: true, sparse: true },
-  stripe_subscription_id: { type: String, unique: true, sparse: true },
+  plan: { type: String, enum: ['FREE', 'PREMIUM'], default: 'FREE', index: true },
+  subscriptionStatus: { type: String, enum: ['ACTIVE', 'CANCELED', 'PAST_DUE', 'INACTIVE', 'TRIALING', 'INCOMPLETE', 'INCOMPLETE_EXPIRED', 'UNPAID', 'PAUSED'], default: 'INACTIVE', index: true },
+  currentPeriodStart: { type: Date, sparse: true },
+  currentPeriodEnd: { type: Date, sparse: true },
+  stripeCustomerId: { type: String, unique: true, sparse: true },
+  stripeSubscriptionId: { type: String, unique: true, sparse: true },
 
   // Usage Tracking & Billing
-  cdn_usage_current_period: { type: Number, default: 0 },
-  ai_requests_current_period: { type: Number, default: 0 },
-  usage_billing_enabled: { type: Boolean, default: false },
-  usage_billing_updated_at: { type: Date, sparse: true },
+  cdnUsageCurrentPeriod: { type: Number, default: 0 },
+  aiRequestsCurrentPeriod: { type: Number, default: 0 },
+  usageBillingEnabled: { type: Boolean, default: false },
+  usageBillingUpdatedAt: { type: Date, sparse: true },
 
   // Migration Settings
   migrationFileSizeLimit: { type: Number, sparse: true },
 
-  customDomain_override: { type: String, unique: true, sparse: true },
-  customDomain_status: { type: String, enum: ['pending', 'active', 'error', 'verifying'], sparse: true },
-  customDomain_lastChecked: { type: Date, sparse: true },
-  customDomain_error: { type: String, sparse: true },
-  customDomain_cloudflareId: { type: String, unique: true, sparse: true },
+  customDomainOverride: { type: String, unique: true, sparse: true },
+  customDomainStatus: { type: String, enum: ['PENDING', 'ACTIVE', 'ERROR', 'VERIFYING'], sparse: true },
+  customDomainLastChecked: { type: Date, sparse: true },
+  customDomainError: { type: String, sparse: true },
+  customDomainCloudflareId: { type: String, unique: true, sparse: true },
 
   userCount: { type: Number, default: 0 },
   ticketCount: { type: Number, default: 0 },
@@ -104,11 +104,11 @@ export const ModlServerSchema = new Schema<IModlServer>({
 
 // Indexes for common queries
 ModlServerSchema.index({ adminEmail: 1 });
-ModlServerSchema.index({ plan: 1, subscription_status: 1 });
+ModlServerSchema.index({ plan: 1, subscriptionStatus: 1 });
 ModlServerSchema.index({ provisioningStatus: 1, emailVerified: 1 });
 ModlServerSchema.index({ serverName: 'text', customDomain: 'text', adminEmail: 'text' });
 
 // Only create the model on server-side (Node.js environment)
 export const ModlServerModel = typeof window === 'undefined' && mongoose?.models
   ? (mongoose.models.ModlServer || model<IModlServer>('ModlServer', ModlServerSchema))
-  : null; 
+  : null; 

src/schemas/ModlServerSchema.ts

@@ -1,4 +1,4 @@
-import mongoose, { Document, Schema, Types, Int32 } from 'mongoose';
+import mongoose, { Schema } from 'mongoose';
 import slugify from 'slugify';
 
 // Player Schemas
@@ -131,11 +131,10 @@ export const StaffSchema = new Schema({
 }, { timestamps: true });
 
 export const InvitationSchema = new Schema({
-  email: { type: String, required: true, unique: true },
+  email: { type: String, required: true },
   role: { type: String, required: true }, // Removed enum to allow custom roles - validation handled in application logic
   token: { type: String, required: true, unique: true },
   expiresAt: { type: Date, required: true },
-  status: { type: String, enum: ['pending', 'accepted'], default: 'pending' },
 }, { timestamps: true });
 
 
@@ -164,8 +163,8 @@ export const TicketSchema = new Schema({
   status: { type: String, required: true, enum: ['Unfinished', 'Open', 'Closed', 'Under Review', 'Pending Player Response', 'Resolved'], default: 'Unfinished' },
   subject: { type: String, default: '' },
   created: { type: Date, default: Date.now },
-  creator: { type: String, required: true },
-  creatorUuid: { type: String, required: true },
+  creatorName: { type: String, required: true },
+  creatorUuid: { type: String },
   reportedPlayer: { type: String },
   reportedPlayerUuid: { type: String },
   chatMessages: [{ type: String }],
@@ -215,11 +214,10 @@ export const KnowledgebaseArticleSchema = new Schema({
     title: { type: String, required: true, trim: true },
     slug: { type: String, unique: true, index: true },
     content: { type: String, required: true },
-    category: { type: Schema.Types.ObjectId, ref: 'KnowledgebaseCategory', required: true },
-    author: { type: Schema.Types.ObjectId, ref: 'User' },
-    is_visible: { type: Boolean, default: true },
+    categoryId: { type: String, required: true, index: true },
+    isVisible: { type: Boolean, default: true },
     ordinal: { type: Number, default: 0 },
-  }, { timestamps: { createdAt: 'created_at', updatedAt: 'updated_at' } }
+  }, { timestamps: true }
 );
 
 KnowledgebaseArticleSchema.pre('save', function (next) {
@@ -234,8 +232,9 @@ export const KnowledgebaseCategorySchema = new Schema({
     slug: { type: String, unique: true, index: true },
     description: { type: String, trim: true },
     ordinal: { type: Number, default: 0 },
+    isVisible: { type: Boolean, default: true },
   }, {
-    timestamps: { createdAt: 'created_at', updatedAt: 'updated_at' },
+    timestamps: true,
     toJSON: { virtuals: true },
     toObject: { virtuals: true },
   }
@@ -251,7 +250,7 @@ KnowledgebaseCategorySchema.pre('save', function (next) {
 KnowledgebaseCategorySchema.virtual('articles', {
   ref: 'KnowledgebaseArticle',
   localField: '_id',
-  foreignField: 'category',
+  foreignField: 'categoryId',
   justOne: false,
   options: { sort: { ordinal: 1 } }
 });
@@ -262,42 +261,42 @@ export const HomepageCardSchema = new Schema({
     title: { type: String, required: true, trim: true },
     description: { type: String, required: true, trim: true },
     icon: { type: String, required: true, trim: true },
-    icon_color: { type: String, trim: true },
-    action_type: { type: String, required: true, enum: ['url', 'category_dropdown'], default: 'url' },
-    action_url: { type: String, trim: true,
+    iconColor: { type: String, trim: true },
+    actionType: { type: String, required: true, enum: ['url', 'category_dropdown'], default: 'url' },
+    actionUrl: { type: String, trim: true,
       validate: {
         validator: function(this: any, v: string) {
-          return this.action_type !== 'url' || Boolean(v && v.length > 0);
+          return this.actionType !== 'url' || Boolean(v && v.length > 0);
         },
         message: 'URL is required when action type is URL'
       }
     },
-    action_button_text: { type: String, trim: true,
+    actionButtonText: { type: String, trim: true,
       default: function(this: any) {
-        return this.action_type === 'url' ? 'Learn More' : undefined;
+        return this.actionType === 'url' ? 'Learn More' : undefined;
       }
     },
-    category_id: { type: Schema.Types.ObjectId, ref: 'KnowledgebaseCategory',
+    categoryId: { type: String,
       validate: {
-        validator: function(this: any, v: Types.ObjectId) {
-          return this.action_type !== 'category_dropdown' || Boolean(v);
+        validator: function(this: any, v: string) {
+          return this.actionType !== 'category_dropdown' || Boolean(v);
         },
         message: 'Category is required when action type is category dropdown'
       }
     },
-    background_color: { type: String, trim: true },
-    is_enabled: { type: Boolean, default: true },
+    backgroundColor: { type: String, trim: true },
+    isEnabled: { type: Boolean, default: true },
     ordinal: { type: Number, default: 0 },
   }, { 
-    timestamps: { createdAt: 'created_at', updatedAt: 'updated_at' },
+    timestamps: true,
     toJSON: { virtuals: true },
     toObject: { virtuals: true }
   }
 );
 
 HomepageCardSchema.virtual('category', {
   ref: 'KnowledgebaseCategory',
-  localField: 'category_id',
+  localField: 'categoryId',
   foreignField: '_id',
   justOne: true
-}); 
+}); 

src/schemas/TenantSchemas.ts

@@ -35,16 +35,16 @@ export interface Invitation {
   role: 'Admin' | 'Moderator' | 'Helper';
   token: string;
   expiresAt: Date;
-  status: 'pending' | 'accepted';
+  createdAt?: Date;
+  updatedAt?: Date;
 }
 
 // Authentication & Session
 export interface EmailCode {
   email: string;
-  code: string;
+  codeHash: string;
+  failedAttempts: number;
   expiresAt: Date;
-  used: boolean;
-  createdAt: Date;
 }
 
 // @ts-ignore
@@ -68,18 +68,22 @@ export interface IModlServer {
   databaseName?: string;
   adminEmail: string;
   emailVerified: boolean;
-  provisioningStatus: 'pending' | 'in-progress' | 'completed' | 'failed';
-  plan: 'free' | 'premium';
-  subscription_status: 'active' | 'canceled' | 'past_due' | 'inactive' | 'trialing' | 'incomplete' | 'incomplete_expired' | 'unpaid' | 'paused';
-  current_period_start?: Date;
-  current_period_end?: Date;
-  stripe_customer_id?: string;
-  stripe_subscription_id?: string;
-  cdn_usage_current_period?: number;
-  ai_requests_current_period?: number;
-  usage_billing_enabled?: boolean;
-  customDomain_override?: string;
-  customDomain_status?: 'pending' | 'active' | 'error' | 'verifying';
+  provisioningStatus: 'PENDING' | 'IN_PROGRESS' | 'COMPLETED' | 'FAILED';
+  plan: 'FREE' | 'PREMIUM';
+  subscriptionStatus?: 'ACTIVE' | 'CANCELED' | 'PAST_DUE' | 'INACTIVE' | 'TRIALING' | 'INCOMPLETE' | 'INCOMPLETE_EXPIRED' | 'UNPAID' | 'PAUSED';
+  currentPeriodStart?: Date;
+  currentPeriodEnd?: Date;
+  stripeCustomerId?: string;
+  stripeSubscriptionId?: string;
+  cdnUsageCurrentPeriod?: number;
+  aiRequestsCurrentPeriod?: number;
+  usageBillingEnabled?: boolean;
+  usageBillingUpdatedAt?: Date;
+  customDomainOverride?: string;
+  customDomainStatus?: 'PENDING' | 'ACTIVE' | 'ERROR' | 'VERIFYING';
+  customDomainLastChecked?: Date;
+  customDomainError?: string;
+  customDomainCloudflareId?: string;
   userCount: number;
   ticketCount: number;
   region?: string;
@@ -206,8 +210,8 @@ export interface ITicket extends Document {
   subject: string;
   created: Date;
   updatedAt: Date;
-  creator: string;
-  creatorUuid: string;
+  creatorName: string;
+  creatorUuid?: string;
   reportedPlayer?: string;
   reportedPlayerUuid?: string;
   chatMessages?: string[];
@@ -233,15 +237,15 @@ export interface KnowledgebaseArticleStub {
   title: string;
   slug: string;
   ordinal: number;
-  is_visible: boolean;
+  isVisible: boolean;
   categoryId: string;
 }
 
 export interface KnowledgebaseArticle extends KnowledgebaseArticleStub {
   content: string;
   category: { id: string; name: string; slug: string; };
-  created_at: string;
-  updated_at: string;
+  createdAt: string;
+  updatedAt: string;
 }
 
 // Homepage Cards
@@ -250,13 +254,13 @@ export interface HomepageCard {
   title: string;
   description: string;
   icon: string;
-  icon_color?: string;
-  action_type: 'url' | 'category_dropdown';
-  action_url?: string;
-  action_button_text?: string;
-  category_id?: string;
-  background_color?: string;
-  is_enabled: boolean;
+  iconColor?: string;
+  actionType: 'url' | 'category_dropdown';
+  actionUrl?: string;
+  actionButtonText?: string;
+  categoryId?: string;
+  backgroundColor?: string;
+  isEnabled: boolean;
   ordinal: number;
   category?: KnowledgebaseCategory;
 }
@@ -322,4 +326,4 @@ export interface InsertServer {
   emailVerificationToken?: string;
   emailVerified?: boolean;
 }
-export type Server = InsertServer & { id: string; }; 
+export type Server = InsertServer & { id: string; };