diff --git a/dbal/ts/src/adapters/acl-adapter.ts b/dbal/ts/src/adapters/acl-adapter.ts index 90fda272d..04fafd4c8 100644 --- a/dbal/ts/src/adapters/acl-adapter.ts +++ b/dbal/ts/src/adapters/acl-adapter.ts @@ -1,5 +1,5 @@ import type { DBALAdapter, AdapterCapabilities } from '../adapters/adapter' -import type { ListOptions, ListResult } from '../core/types' +import type { ListOptions, ListResult } from '../core/foundation/types' import { DBALError } from '../core/foundation/errors' interface User { diff --git a/dbal/ts/src/adapters/adapter.ts b/dbal/ts/src/adapters/adapter.ts index 4844ea530..6993d0380 100644 --- a/dbal/ts/src/adapters/adapter.ts +++ b/dbal/ts/src/adapters/adapter.ts @@ -1,4 +1,4 @@ -import type { ListOptions, ListResult } from '../core/types' +import type { ListOptions, ListResult } from '../core/foundation/types' export interface AdapterCapabilities { transactions: boolean diff --git a/dbal/ts/src/adapters/prisma-adapter.ts b/dbal/ts/src/adapters/prisma-adapter.ts index 3f1318a5d..1963364b7 100644 --- a/dbal/ts/src/adapters/prisma-adapter.ts +++ b/dbal/ts/src/adapters/prisma-adapter.ts @@ -1,6 +1,6 @@ import { PrismaClient } from '@prisma/client' import type { DBALAdapter, AdapterCapabilities } from './adapter' -import type { ListOptions, ListResult } from '../core/types' +import type { ListOptions, ListResult } from '../core/foundation/types' import { DBALError } from '../core/foundation/errors' type PrismaAdapterDialect = 'postgres' | 'mysql' | 'sqlite' | 'generic' diff --git a/frontends/nextjs/src/lib/database-lib/database.ts b/frontends/nextjs/src/lib/database-lib/database.ts index 97fda0413..0f76cf001 100644 --- a/frontends/nextjs/src/lib/database-lib/database.ts +++ b/frontends/nextjs/src/lib/database-lib/database.ts @@ -5,6 +5,6 @@ * Prefer importing directly from '@/lib/db' for new code. */ -// Re-export everything from the new db module -export * from './db' -export { Database } from './db' +// Re-export everything from the db module +export * from '../db' +export { Database } from '../db' diff --git a/frontends/nextjs/src/lib/db/index.ts b/frontends/nextjs/src/lib/db/index.ts new file mode 100644 index 000000000..272b0e8ec --- /dev/null +++ b/frontends/nextjs/src/lib/db/index.ts @@ -0,0 +1,7 @@ +/** + * Database module - main entry point + * Re-exports all database functionality from core + */ + +export * from './core' +export { Database } from './core' diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/crud/verify-credentials.ts b/frontends/nextjs/src/lib/security/secure-db/operations/crud/verify-credentials.ts index 6c5b0182a..916a882b7 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/crud/verify-credentials.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/crud/verify-credentials.ts @@ -1,4 +1,4 @@ -import { Database } from '@/lib/db' +import { Database } from '@/lib/database-lib/database' import type { SecurityContext } from '../types' import { executeQuery } from '../execute-query' import { sanitizeInput } from '../sanitize-input' diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-comments.ts b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-comments.ts index e3a6b15b9..7984be386 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-comments.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-comments.ts @@ -1,7 +1,7 @@ import { getComments as fetchComments } from '@/lib/db/comments' import type { Comment } from '@/lib/types/level-types' import type { SecurityContext } from '../types' -import { executeQuery } from '../execute-query' +import { executeQuery } from '../../execute-query' /** * Get comments with security checks diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-lua-scripts.ts b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-lua-scripts.ts index 1468a66fc..b7ac3a1a1 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-lua-scripts.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-lua-scripts.ts @@ -1,7 +1,7 @@ import { getLuaScripts as fetchLuaScripts } from '@/lib/db/lua-scripts' import type { LuaScript } from '@/lib/types/level-types' import type { SecurityContext } from '../types' -import { executeQuery } from '../execute-query' +import { executeQuery } from '../../execute-query' /** * Get Lua scripts with security checks diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-model-schemas.ts b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-model-schemas.ts index b2a063f15..60663e52f 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-model-schemas.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-model-schemas.ts @@ -1,7 +1,7 @@ import { getSchemas as fetchSchemas } from '@/lib/db/schemas' import type { ModelSchema } from '@/lib/types/schema-types' import type { SecurityContext } from '../types' -import { executeQuery } from '../execute-query' +import { executeQuery } from '../../execute-query' /** * Get model schemas with security checks diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-page-configs.ts b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-page-configs.ts index 812241264..5325f2de7 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-page-configs.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-page-configs.ts @@ -1,7 +1,7 @@ import { getPages as fetchPages } from '@/lib/db/pages' import type { PageConfig } from '@/lib/types/level-types' import type { SecurityContext } from '../types' -import { executeQuery } from '../execute-query' +import { executeQuery } from '../../execute-query' /** * Get page configs with security checks diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-workflows.ts b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-workflows.ts index e232f5747..4833807f7 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-workflows.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/getters/entities/get-workflows.ts @@ -1,7 +1,7 @@ import { getWorkflows as fetchWorkflows } from '@/lib/db/workflows' import type { Workflow } from '@/lib/types/level-types' import type { SecurityContext } from '../types' -import { executeQuery } from '../execute-query' +import { executeQuery } from '../../execute-query' /** * Get workflows with security checks diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/user/create-user.ts b/frontends/nextjs/src/lib/security/secure-db/operations/user/create-user.ts index 7ee9714f1..aedda3ccd 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/user/create-user.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/user/create-user.ts @@ -1,4 +1,4 @@ -import { Database } from '@/lib/db' +import { Database } from '@/lib/database-lib/database' import type { User } from '@/lib/types/level-types' import type { SecurityContext } from '../types' import { executeQuery } from '../execute-query' diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/user/delete-user.ts b/frontends/nextjs/src/lib/security/secure-db/operations/user/delete-user.ts index dfaa4f5b7..07ca6d92e 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/user/delete-user.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/user/delete-user.ts @@ -1,4 +1,4 @@ -import { Database } from '@/lib/db' +import { Database } from '@/lib/database-lib/database' import type { SecurityContext } from '../types' import { executeQuery } from '../execute-query' diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/user/get-user-by-id.ts b/frontends/nextjs/src/lib/security/secure-db/operations/user/get-user-by-id.ts index 4c2405fda..6e9a999f6 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/user/get-user-by-id.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/user/get-user-by-id.ts @@ -1,4 +1,4 @@ -import { Database } from '@/lib/db' +import { Database } from '@/lib/database-lib/database' import type { User } from '@/lib/types/level-types' import type { SecurityContext } from '../types' import { executeQuery } from '../execute-query' diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/user/get-users.ts b/frontends/nextjs/src/lib/security/secure-db/operations/user/get-users.ts index a186417f7..68a8084df 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/user/get-users.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/user/get-users.ts @@ -1,4 +1,4 @@ -import { Database } from '@/lib/db' +import { Database } from '@/lib/database-lib/database' import type { User } from '@/lib/types/level-types' import type { SecurityContext } from '../types' import { executeQuery } from '../execute-query' diff --git a/frontends/nextjs/src/lib/security/secure-db/operations/user/update-user.ts b/frontends/nextjs/src/lib/security/secure-db/operations/user/update-user.ts index e0dbd639c..4d6db76a7 100644 --- a/frontends/nextjs/src/lib/security/secure-db/operations/user/update-user.ts +++ b/frontends/nextjs/src/lib/security/secure-db/operations/user/update-user.ts @@ -1,4 +1,4 @@ -import { Database } from '@/lib/db' +import { Database } from '@/lib/database-lib/database' import type { User } from '@/lib/types/level-types' import type { SecurityContext } from '../types' import { executeQuery } from '../execute-query' diff --git a/frontends/nextjs/src/lib/security/secure-db/query/execute-query.ts b/frontends/nextjs/src/lib/security/secure-db/query/execute-query.ts index a68deccfc..ea61e82af 100644 --- a/frontends/nextjs/src/lib/security/secure-db/query/execute-query.ts +++ b/frontends/nextjs/src/lib/security/secure-db/query/execute-query.ts @@ -1,5 +1,5 @@ import type { SecurityContext, OperationType, ResourceType } from './types' -import { checkRateLimit } from './check-rate-limit' +import { checkRateLimit } from '../rate-limiting/check-rate-limit' import { loadRateLimitConfig } from './rate-limit-store' import { checkAccess } from './check-access' import { logOperation } from './log-operation' diff --git a/frontends/nextjs/src/lib/security/secure-db/rate-limiting/check-rate-limit.ts b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/check-rate-limit.ts index 51f2e213b..6548f5eb6 100644 --- a/frontends/nextjs/src/lib/security/secure-db/rate-limiting/check-rate-limit.ts +++ b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/check-rate-limit.ts @@ -1,4 +1,4 @@ -import { getRateLimitConfig, rateLimitMap } from './rate-limit-store' +import { getRateLimitConfig, rateLimitMap } from './store/rate-limit-store' /** * Check if user is within rate limits diff --git a/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-all-rate-limits.ts b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-all-rate-limits.ts index b64c9c820..a01f1f406 100644 --- a/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-all-rate-limits.ts +++ b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-all-rate-limits.ts @@ -1,4 +1,4 @@ -import { rateLimitMap } from './rate-limit-store' +import { rateLimitMap } from './store/rate-limit-store' /** * Clear all rate limits (useful for testing) diff --git a/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-rate-limit.ts b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-rate-limit.ts index 9f2531504..d5f7d80fb 100644 --- a/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-rate-limit.ts +++ b/frontends/nextjs/src/lib/security/secure-db/rate-limiting/clear-rate-limit.ts @@ -1,4 +1,4 @@ -import { rateLimitMap } from './rate-limit-store' +import { rateLimitMap } from './store/rate-limit-store' /** * Clear rate limit for a user (useful for testing) diff --git a/frontends/nextjs/src/main.scss b/frontends/nextjs/src/main.scss index 78814c001..6af495234 100644 --- a/frontends/nextjs/src/main.scss +++ b/frontends/nextjs/src/main.scss @@ -3,14 +3,14 @@ // ======================================== // Theme & Variables -@use './styles/theme.scss' as *; +@use './styles/core/theme.scss' as *; @use './styles/variables.scss' as *; // Utilities -@use './styles/mixins.scss' as *; +@use './styles/core/_mixins.scss' as *; // Global Styles -@use './styles/base.scss' as *; +@use './styles/core/_base.scss' as *; // Components -@use './styles/components.scss' as *; +@use './styles/core/_components.scss' as *;