diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 5158214..e15d9fb 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -19,6 +19,7 @@ module.exports = { 'typescript-sort-keys', ], rules: { + '@typescript-eslint/promise-function-async': 'off', '@typescript-eslint/strict-boolean-expressions': 'off', '@typescript-eslint/triple-slash-reference': 'off', 'arrow-body-style': ['error', 'as-needed'], diff --git a/packages/client/components/PieCircle.tsx b/packages/client/components/PieCircle.tsx index 08dcc09..684a5da 100644 --- a/packages/client/components/PieCircle.tsx +++ b/packages/client/components/PieCircle.tsx @@ -1,9 +1,9 @@ import React from 'react'; import Chart from 'react-google-charts'; import styled, { useTheme } from 'styled-components'; +import { capitalize } from 'utils'; import { type Theme } from '@/lib/theme'; import { type PieCircleData } from '@/lib/types'; -import { capitalize } from '@/lib/utils'; export const PieCircle = (props: { pieCircleData: PieCircleData }): JSX.Element => { const { pieCircleData } = props; diff --git a/packages/client/lib/storage.ts b/packages/client/lib/storage.ts index ab4fd66..3cfda82 100644 --- a/packages/client/lib/storage.ts +++ b/packages/client/lib/storage.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/ban-types */ import { create } from 'zustand'; +import { SPEND_SCREEN_ID, SPEND_SCREEN_NAME } from 'utils/constants'; import { type UserSpendData, type Tab } from '@/lib/types'; -import { SPEND_SCREEN_ID, SPEND_SCREEN_NAME } from '@/lib/constants'; interface appStore { - tab: Tab; setTab: (props: Tab) => void; setUserSpendData: (props: UserSpendData[]) => void; + tab: Tab; userSpendData: UserSpendData[]; } diff --git a/packages/client/lib/theme.ts b/packages/client/lib/theme.ts index d4d1426..8753aae 100644 --- a/packages/client/lib/theme.ts +++ b/packages/client/lib/theme.ts @@ -1,3 +1,4 @@ +/* eslint-disable typescript-sort-keys/interface */ /* eslint-disable sort-keys-fix/sort-keys-fix */ export interface Theme { colors: { diff --git a/packages/client/lib/types.d.ts b/packages/client/lib/types.d.ts index 7a9d559..1137bb3 100644 --- a/packages/client/lib/types.d.ts +++ b/packages/client/lib/types.d.ts @@ -9,8 +9,8 @@ interface Currency { } interface Category { - label: string; backgroundColor: string; + label: string; } export interface UserSpendData { diff --git a/packages/client/lib/utils.ts b/packages/client/lib/utils.ts deleted file mode 100644 index b6b734b..0000000 --- a/packages/client/lib/utils.ts +++ /dev/null @@ -1 +0,0 @@ -export const capitalize = (str: string): string => str.charAt(0).toUpperCase() + str.slice(1); diff --git a/packages/client/package.json b/packages/client/package.json index c3a65da..dce8f8c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,13 +1,8 @@ { - "name": "spendia", + "name": "client", "private": true, "version": "0.0.0", "type": "module", - "scripts.backup": { - "dev": "vite", - "build": "tsc && vite build", - "preview": "vite preview" - }, "scripts": { "dev": "next dev -p 8080", "build": "next build", diff --git a/packages/client/pages/index.tsx b/packages/client/pages/index.tsx index a931728..9ad5872 100644 --- a/packages/client/pages/index.tsx +++ b/packages/client/pages/index.tsx @@ -1,9 +1,9 @@ import React from 'react'; import Head from 'next/head'; import styled, { ThemeProvider } from 'styled-components'; +import { APP_NAME, SPEND_SCREEN_ID } from 'utils/constants'; import { Header, SpendScreen } from '@/screens'; import { type Tab } from '@/lib/types'; -import { APP_NAME, SPEND_SCREEN_ID } from '@/lib/constants'; import { useAppStore } from '@/lib/storage'; import theme from '@/lib/theme'; diff --git a/packages/client/screens/Header/data.ts b/packages/client/screens/Header/data.ts index b992c3a..8009418 100644 --- a/packages/client/screens/Header/data.ts +++ b/packages/client/screens/Header/data.ts @@ -1,4 +1,4 @@ -import { SPEND_SCREEN_ID, SPEND_SCREEN_NAME } from '../../lib/constants'; +import { SPEND_SCREEN_ID, SPEND_SCREEN_NAME } from 'utils/constants'; import { type Tab } from '../../lib/types'; export const tabs: Tab[] = [ diff --git a/packages/client/screens/SpendScreen/SpendScreen.tsx b/packages/client/screens/SpendScreen/SpendScreen.tsx index f8f5251..f36e50f 100644 --- a/packages/client/screens/SpendScreen/SpendScreen.tsx +++ b/packages/client/screens/SpendScreen/SpendScreen.tsx @@ -4,7 +4,7 @@ import { PieCircle } from '@/components'; import { type Theme } from '@/lib/theme'; import { useAppStore } from '@/lib/storage'; import { type PieCircleData } from '@/lib/types'; -import { trpc } from '../../trpc'; +import { trpc } from '@/trpc'; export const SpendScreen = (): JSX.Element => { const userSpendData = useAppStore((state) => state.userSpendData); diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json index 01c1a48..34fb98c 100644 --- a/packages/client/tsconfig.json +++ b/packages/client/tsconfig.json @@ -1,18 +1,12 @@ { "extends": "../../tsconfig.json", - "files": [ - "../server/app.ts" - ], + "files": ["../server/app.ts"], "compilerOptions": { "rootDir": "../", "composite": true, "target": "ESNext", "useDefineForClassFields": true, - "lib": [ - "DOM", - "DOM.Iterable", - "ESNext" - ], + "lib": ["DOM", "DOM.Iterable", "ESNext"], "allowJs": false, "skipLibCheck": true, "allowSyntheticDefaultImports": true, @@ -27,9 +21,7 @@ "incremental": true, "baseUrl": ".", "paths": { - "@/*": [ - "./*" - ] + "@/*": ["./*"] }, "plugins": [ { @@ -51,8 +43,5 @@ "path": "./tsconfig.node.json" } ], - "exclude": [ - "node_modules", - "../server/app.ts" - ] + "exclude": ["node_modules"] } diff --git a/packages/server/app.ts b/packages/server/app.ts index 83095dc..a600c75 100644 --- a/packages/server/app.ts +++ b/packages/server/app.ts @@ -5,11 +5,13 @@ import dotenv from 'dotenv'; import dbConnection from './db'; import { publicProcedure, router } from './trpc'; import { User, UserSchema } from './schemas'; +import { type UserType } from './types'; +import seed from './seed'; dotenv.config(); const appRouter = router({ - userById: publicProcedure.input(z.string()).query(async (opts) => { + userById: publicProcedure.input(z.string()).query(async (opts): Promise => { const { input } = opts; const user = await User.findById(input); return user; @@ -18,7 +20,7 @@ const appRouter = router({ const user = await User.create(input); return user; }), - userList: publicProcedure.query(async () => { + userList: publicProcedure.query(async (): Promise => { const users = await User.find(); return users; }), @@ -34,6 +36,7 @@ const server = createHTTPServer({ dbConnection() .then(() => { server.listen(3000); + void seed(); }) .catch((e) => { // eslint-disable-next-line no-console diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json index 314102f..d27f70e 100644 --- a/packages/server/nodemon.json +++ b/packages/server/nodemon.json @@ -1,5 +1,5 @@ { "watch": "**/*", "ext": "ts, json", - "exec": "ts-node app.ts" + "exec": "ts-node --require ts-node/register ./app.ts" } diff --git a/packages/server/package.json b/packages/server/package.json index 98a6c7f..2464ef0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -3,11 +3,14 @@ "version": "1.0.0", "description": "", "main": "index.js", + "type": "module", + "exports": "./dist/index.js", "devDependencies": { + "@faker-js/faker": "^8.0.2", "nodemon": "^2.0.22" }, "scripts": { - "dev": "nodemon app.ts", + "dev": "nodemon --watch './**/*.ts' --exec 'node --experimental-specifier-resolution=node --loader ts-node/esm' app.ts", "build": "tsc --build" }, "author": "", diff --git a/packages/server/seed.ts b/packages/server/seed.ts new file mode 100644 index 0000000..12882fb --- /dev/null +++ b/packages/server/seed.ts @@ -0,0 +1,46 @@ +import { getRandomItem } from 'utils'; +import { Currency, Spending, SpendingCategory, User } from './schemas'; + +export default async (): Promise => { + if (process.env.NODE_ENV !== 'development') { + return; + } + void import('@faker-js/faker').then(async ({ faker }) => { + const EMAIL = 'abc1234@gmail.com'; + if (await User.exists({ email: EMAIL })) { + return; + } + const user = await User.create({ + email: EMAIL, + name: faker.person.fullName(), + password: '123456', + }); + const spendingCategories = await SpendingCategory.insertMany( + [ + { backgroundColor: 'rgb(99, 128, 255)', label: 'invest' }, + { backgroundColor: 'rgb(54, 162, 235)', label: 'school' }, + { backgroundColor: 'rgb(145, 86, 255)', label: 'party' }, + ].map(({ backgroundColor, label }) => ({ backgroundColor, label, userId: user.id })), + ); + const currencies = await Currency.insertMany([ + { + label: 'USD', + }, + { + label: 'EUR', + }, + { + label: 'ARS', + }, + ]); + await Spending.insertMany( + [...Array(10)].map(() => ({ + amount: Math.random() * 10000, + currencyId: getRandomItem(currencies).id, + date: faker.date.past(), + spendingCategoryId: getRandomItem(spendingCategories).id, + userId: user.id, + })), + ); + }); +}; diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index ceacd99..29a8024 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -26,7 +26,8 @@ // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ /* Modules */ - "module": "commonjs" /* Specify what module code is generated. */, + "module": "ES2020" /* Specify what module code is generated. */, + "moduleResolution": "Node", "rootDir": "./" /* Specify the root folder within your source files. */, // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ diff --git a/packages/client/lib/constants.ts b/packages/utils/constants/constants.ts similarity index 100% rename from packages/client/lib/constants.ts rename to packages/utils/constants/constants.ts diff --git a/packages/utils/constants/index.ts b/packages/utils/constants/index.ts new file mode 100644 index 0000000..c94f80f --- /dev/null +++ b/packages/utils/constants/index.ts @@ -0,0 +1 @@ +export * from './constants'; diff --git a/packages/utils/index.ts b/packages/utils/index.ts new file mode 100644 index 0000000..04bca77 --- /dev/null +++ b/packages/utils/index.ts @@ -0,0 +1 @@ +export * from './utils'; diff --git a/packages/utils/package.json b/packages/utils/package.json new file mode 100644 index 0000000..6cae0e4 --- /dev/null +++ b/packages/utils/package.json @@ -0,0 +1,8 @@ +{ + "name": "utils", + "version": "1.0.0", + "main": "index.js", + "type": "module", + "license": "MIT", + "private": true +} diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json new file mode 100644 index 0000000..0992a64 --- /dev/null +++ b/packages/utils/tsconfig.json @@ -0,0 +1,116 @@ +{ + "extends": "../../tsconfig.json", + "files": ["../utils/index.ts"], + "compilerOptions": { + "rootDir": "../", + "composite": true, + "incremental": true, + /* Visit https://aka.ms/tsconfig to read more about this file */ + + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + + /* Language and Environment */ + "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + + /* Modules */ + "module": "commonjs" /* Specify what module code is generated. */, + // "rootDir": "./", /* Specify the root folder within your source files. */ + // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + // "outDir": "./", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, + + /* Type Checking */ + "strict": true /* Enable all strict type-checking options. */, + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + }, + "include": ["**/*"], + "exclude": ["node_modules", "../utils/index.ts"] +} diff --git a/packages/utils/utils.ts b/packages/utils/utils.ts new file mode 100644 index 0000000..7c71089 --- /dev/null +++ b/packages/utils/utils.ts @@ -0,0 +1,6 @@ +export const capitalize = (str: string): string => str.charAt(0).toUpperCase() + str.slice(1); + +export const getRandomItem = (array: any[]): any => { + const randomIndex = Math.floor(Math.random() * array.length); + return array[randomIndex]; +};