raulfdm · raulfdm · Dec 8, 2023 · Dec 8, 2023 · Dec 8, 2023 · Dec 8, 2023
diff --git a/.github/workflows/app.yml → .github/workflows/ci.yml b/.github/workflows/app.yml → .github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: App
+name: CI
 
 on: [push]
 
@@ -19,10 +19,7 @@ jobs:
 
       # Necessary because it's being used in the code
       - name: Linting/Formating
-        run: bunx @biomejs/biome ci src
+        run: bun run lint:ci
 
       - name: Build
         run: bun run build
-
-      - name: Build Web docs
-        run: bun run docs:build
diff --git a/.gitignore b/.gitignore
@@ -72,14 +72,12 @@ typings/
 # Serverless directories
 .serverless
 
-# Others
-docs/
-
 ## macOS
 .DS_Store
 
 ## Misc
 .temp
 .cache
 documentation/.vuepress/dist
-dist/
+dist/
+.turbo
diff --git a/Dockerfile → apps/taco/Dockerfile b/Dockerfile → apps/taco/Dockerfile
@@ -14,11 +14,17 @@ FROM base as installer
 # install with devDependencies to be used later
 RUN mkdir -p /temp/dev
 COPY package.json bun.lockb /temp/dev/
+COPY /apps/taco/package.json /temp/dev/apps/taco/package.json
+COPY /apps/website/package.json /temp/dev/apps/website/package.json
 RUN cd /temp/dev && bun install --frozen-lockfile --ignore-scripts
 
 # install with --production (exclude devDependencies)
 RUN mkdir -p /temp/prod
 COPY package.json bun.lockb /temp/prod/
+COPY /apps/taco/package.json /temp/prod/apps/taco/package.json
+# We need to include the website package.json because otherwise it will throw
+# an error due to a difference between lockfiles
+COPY /apps/website/package.json /temp/prod/apps/website/package.json
 RUN cd /temp/prod && bun install --frozen-lockfile --production --ignore-scripts
 
 # ------------------------------ #
@@ -28,8 +34,8 @@ ENV NODE_ENV=production
 COPY --from=installer /temp/dev/node_modules node_modules
 COPY . .
 
-RUN bun run build
-RUN bunx prisma generate
+RUN bun run build --filter=taco-api
+RUN cd ./apps/taco && bunx prisma generate
 
 # ------------------------------ #
 FROM base AS release
@@ -39,10 +45,10 @@ COPY --from=installer /temp/prod/node_modules /app/node_modules
 # Includes the prisma client generated
 COPY --from=prerelease /app/node_modules/.prisma /app/node_modules/.prisma
 # Includes the database and schema
-COPY --from=prerelease /app/src/infrastructure/prisma /app/src/infrastructure/prisma
-COPY --from=prerelease /app/dist/app.js .
-COPY --from=prerelease /app/package.json .
+COPY --from=prerelease /app/apps/taco/src/infrastructure/prisma /app/src/infrastructure/prisma
+COPY --from=prerelease /app/apps/taco/dist/app.js .
+COPY --from=prerelease /app/apps/taco/package.json .
 
 # run the app
-EXPOSE 4000/tcp
+EXPOSE 4000
 ENTRYPOINT [ "bun", "run", "app.js" ]
diff --git a/apps/taco/biome.json b/apps/taco/biome.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.4.0/schema.json",
+  "extends": ["../../biome.json"]
+}
diff --git a/docker-compose.yml → apps/taco/docker-compose.yml b/docker-compose.yml → apps/taco/docker-compose.yml
diff --git a/apps/taco/package.json b/apps/taco/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "taco-api",
+  "description": "Brazilian Table of Food Composition (TACO) - GraphQL API",
+  "version": "2.3.0",
+  "type": "module",
+  "homepage": "https://github.com/raulfdm/taco-api",
+  "bugs": {
+    "url": "https://github.com/raulfdm/taco-api/issues"
+  },
+  "scripts": {
+    "start": "NODE_ENV=production bun run src/app.ts",
+    "dev": "NODE_ENV=development bun --watch src/app.ts",
+    "studio": "prisma studio",
+    "build": "bun run scripts/build.ts",
+    "lint": "biome lint src",
+    "lint:ci": "biome ci src",
+    "db:migrate": "NODE_ENV=development prisma migrate dev",
+    "db:generate": "NODE_ENV=development prisma generate",
+    "db:seed": "NODE_ENV=development prisma db seed",
+    "db:reset": "NODE_ENV=development prisma migrate reset",
+    "prepare": "bun run db:generate"
+  },
+  "dependencies": {
+    "@prisma/client": "5.7.0",
+    "cors": "2.8.5",
+    "express": "4.18.2",
+    "graphql": "16.8.1",
+    "graphql-http": "1.22.0",
+    "graphql-modules": "2.3.0",
+    "zod": "3.22.4"
+  },
+  "devDependencies": {
+    "@types/cors": "2.8.17",
+    "@types/express": "4.17.21",
+    "bun-types": "1.0.15",
+    "csvtojson": "2.0.10",
+    "prisma": "5.7.0",
+    "typescript": "5.3.2"
+  },
+  "packageManager": "bun@1.0.15",
+  "engines": {
+    "bun": "1.0.15"
+  },
+  "prisma": {
+    "seed": "bun run ./src/infrastructure/seed/index.ts",
+    "schema": "./src/infrastructure/prisma/schema.prisma"
+  }
+}
diff --git a/scripts/build.ts → apps/taco/scripts/build.ts b/scripts/build.ts → apps/taco/scripts/build.ts
diff --git a/src/app.ts → apps/taco/src/app.ts b/src/app.ts → apps/taco/src/app.ts
diff --git a/src/infrastructure/env.ts → apps/taco/src/infrastructure/env.ts b/src/infrastructure/env.ts → apps/taco/src/infrastructure/env.ts
diff --git a/src/infrastructure/primaClient.ts → apps/taco/src/infrastructure/primaClient.ts b/src/infrastructure/primaClient.ts → apps/taco/src/infrastructure/primaClient.ts
diff --git a/...ions/20230425065839_initial/migration.sql → ...ions/20230425065839_initial/migration.sql b/...ions/20230425065839_initial/migration.sql → ...ions/20230425065839_initial/migration.sql
diff --git a/...ure/prisma/migrations/migration_lock.toml → ...ure/prisma/migrations/migration_lock.toml b/...ure/prisma/migrations/migration_lock.toml → ...ure/prisma/migrations/migration_lock.toml
diff --git a/src/infrastructure/prisma/schema.prisma → ...o/src/infrastructure/prisma/schema.prisma b/src/infrastructure/prisma/schema.prisma → ...o/src/infrastructure/prisma/schema.prisma
diff --git a/src/infrastructure/prisma/taco.db → apps/taco/src/infrastructure/prisma/taco.db b/src/infrastructure/prisma/taco.db → apps/taco/src/infrastructure/prisma/taco.db
diff --git a/src/infrastructure/seed/amino-acids.ts → ...co/src/infrastructure/seed/amino-acids.ts b/src/infrastructure/seed/amino-acids.ts → ...co/src/infrastructure/seed/amino-acids.ts
diff --git a/src/infrastructure/seed/categories.ts → ...aco/src/infrastructure/seed/categories.ts b/src/infrastructure/seed/categories.ts → ...aco/src/infrastructure/seed/categories.ts
diff --git a/src/infrastructure/seed/fatty-acids.ts → ...co/src/infrastructure/seed/fatty-acids.ts b/src/infrastructure/seed/fatty-acids.ts → ...co/src/infrastructure/seed/fatty-acids.ts
diff --git a/src/infrastructure/seed/foods.ts → apps/taco/src/infrastructure/seed/foods.ts b/src/infrastructure/seed/foods.ts → apps/taco/src/infrastructure/seed/foods.ts
diff --git a/src/infrastructure/seed/index.ts → apps/taco/src/infrastructure/seed/index.ts b/src/infrastructure/seed/index.ts → apps/taco/src/infrastructure/seed/index.ts
diff --git a/src/infrastructure/seed/nutrients.ts → ...taco/src/infrastructure/seed/nutrients.ts b/src/infrastructure/seed/nutrients.ts → ...taco/src/infrastructure/seed/nutrients.ts
diff --git a/src/infrastructure/seed/units/index.ts → ...co/src/infrastructure/seed/units/index.ts b/src/infrastructure/seed/units/index.ts → ...co/src/infrastructure/seed/units/index.ts
diff --git a/src/infrastructure/seed/units/types.ts → ...co/src/infrastructure/seed/units/types.ts b/src/infrastructure/seed/units/types.ts → ...co/src/infrastructure/seed/units/types.ts
diff --git a/src/infrastructure/seed/units/unitsToSave.ts → .../infrastructure/seed/units/unitsToSave.ts b/src/infrastructure/seed/units/unitsToSave.ts → .../infrastructure/seed/units/unitsToSave.ts
diff --git a/src/modules/aminoAcid/index.ts → apps/taco/src/modules/aminoAcid/index.ts b/src/modules/aminoAcid/index.ts → apps/taco/src/modules/aminoAcid/index.ts
diff --git a/src/modules/aminoAcid/schema.ts → apps/taco/src/modules/aminoAcid/schema.ts b/src/modules/aminoAcid/schema.ts → apps/taco/src/modules/aminoAcid/schema.ts
diff --git a/src/modules/aminoAcid/typeDef.ts → apps/taco/src/modules/aminoAcid/typeDef.ts b/src/modules/aminoAcid/typeDef.ts → apps/taco/src/modules/aminoAcid/typeDef.ts
diff --git a/src/modules/category/index.ts → apps/taco/src/modules/category/index.ts b/src/modules/category/index.ts → apps/taco/src/modules/category/index.ts
diff --git a/src/modules/category/schema.ts → apps/taco/src/modules/category/schema.ts b/src/modules/category/schema.ts → apps/taco/src/modules/category/schema.ts
diff --git a/src/modules/category/typeDef.ts → apps/taco/src/modules/category/typeDef.ts b/src/modules/category/typeDef.ts → apps/taco/src/modules/category/typeDef.ts
diff --git a/src/modules/fattyAcid/index.ts → apps/taco/src/modules/fattyAcid/index.ts b/src/modules/fattyAcid/index.ts → apps/taco/src/modules/fattyAcid/index.ts
diff --git a/src/modules/fattyAcid/schema.ts → apps/taco/src/modules/fattyAcid/schema.ts b/src/modules/fattyAcid/schema.ts → apps/taco/src/modules/fattyAcid/schema.ts
diff --git a/src/modules/fattyAcid/typeDef.ts → apps/taco/src/modules/fattyAcid/typeDef.ts b/src/modules/fattyAcid/typeDef.ts → apps/taco/src/modules/fattyAcid/typeDef.ts
diff --git a/src/modules/food/index.ts → apps/taco/src/modules/food/index.ts b/src/modules/food/index.ts → apps/taco/src/modules/food/index.ts
diff --git a/src/modules/food/schema.ts → apps/taco/src/modules/food/schema.ts b/src/modules/food/schema.ts → apps/taco/src/modules/food/schema.ts
diff --git a/src/modules/food/typeDef.ts → apps/taco/src/modules/food/typeDef.ts b/src/modules/food/typeDef.ts → apps/taco/src/modules/food/typeDef.ts
diff --git a/src/modules/index.ts → apps/taco/src/modules/index.ts b/src/modules/index.ts → apps/taco/src/modules/index.ts
diff --git a/src/modules/main/index.ts → apps/taco/src/modules/main/index.ts b/src/modules/main/index.ts → apps/taco/src/modules/main/index.ts
diff --git a/src/modules/main/schema.ts → apps/taco/src/modules/main/schema.ts b/src/modules/main/schema.ts → apps/taco/src/modules/main/schema.ts
diff --git a/src/modules/nutrient/index.ts → apps/taco/src/modules/nutrient/index.ts b/src/modules/nutrient/index.ts → apps/taco/src/modules/nutrient/index.ts
diff --git a/src/modules/nutrient/schema.ts → apps/taco/src/modules/nutrient/schema.ts b/src/modules/nutrient/schema.ts → apps/taco/src/modules/nutrient/schema.ts
diff --git a/src/modules/nutrient/typeDef.ts → apps/taco/src/modules/nutrient/typeDef.ts b/src/modules/nutrient/typeDef.ts → apps/taco/src/modules/nutrient/typeDef.ts
diff --git a/src/modules/unit/index.ts → apps/taco/src/modules/unit/index.ts b/src/modules/unit/index.ts → apps/taco/src/modules/unit/index.ts
diff --git a/src/modules/unit/schema.ts → apps/taco/src/modules/unit/schema.ts b/src/modules/unit/schema.ts → apps/taco/src/modules/unit/schema.ts
diff --git a/src/modules/unit/typeDefs.ts → apps/taco/src/modules/unit/typeDefs.ts b/src/modules/unit/typeDefs.ts → apps/taco/src/modules/unit/typeDefs.ts
diff --git a/apps/taco/tsconfig.json b/apps/taco/tsconfig.json
@@ -0,0 +1,35 @@
+{
+  "compilerOptions": {
+    "lib": [
+      "ESNext"
+    ],
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
+    "isolatedModules": true,
+    "resolveJsonModule": true,
+    "module": "esnext",
+    "target": "esnext",
+    "moduleResolution": "bundler",
+    "moduleDetection": "force",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
+    "composite": true,
+    "strict": true,
+    "noUncheckedIndexedAccess": true,
+    "downlevelIteration": true,
+    "skipLibCheck": true,
+    "jsx": "react-jsx",
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "allowJs": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": [
+        "src/*"
+      ]
+    },
+    "types": [
+      "bun-types" // add Bun global
+    ]
+  }
+}
diff --git a/apps/website/biome.json b/apps/website/biome.json
@@ -0,0 +1,11 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.4.0/schema.json",
+  "extends": ["../../biome.json"],
+  "files": {
+    "ignore": [
+      "./docs/.vuepress/dist/**/*",
+      "./docs/.vuepress/.temp/**/*",
+      "./docs/.vuepress/.cache/**/*"
+    ]
+  }
+}
diff --git a/apps/website/docs/.vuepress/config.ts b/apps/website/docs/.vuepress/config.ts
@@ -0,0 +1,67 @@
+import { defaultTheme, defineUserConfig } from "vuepress";
+
+export default defineUserConfig({
+  theme: defaultTheme({
+    repo: "raulfdm/taco-api",
+    locales: {
+      "/": {
+        navbar: [
+          {
+            text: "Versão",
+            children: [
+              {
+                text: "Changelog",
+                link: "https://github.com/raulfdm/taco-api/blob/main/CHANGELOG.md",
+              },
+              {
+                text: "v1.0.0",
+                link: "https://6447d8ec2c2ccb00085151ca--taco-api.netlify.app/",
+              },
+            ],
+          },
+        ],
+        selectLanguageName: "Português",
+        toggleColorMode: "Alternar modo escuro",
+        openInNewWindow: "Abrir em nova aba",
+        backToHome: "Voltar para página inicial",
+        tip: "Dica",
+        warning: "Atenção",
+        danger: "Perigo",
+        contributorsText: "Contribuidores",
+        lastUpdatedText: "Atualizado pela última vez em",
+        editLinkText: "Edite esta página",
+        selectLanguageText: "Idiomas",
+      },
+      "/en/": {
+        navbar: [
+          {
+            text: "Version",
+            children: [
+              {
+                text: "Changelog",
+                link: "https://github.com/raulfdm/taco-api/blob/main/CHANGELOG.md",
+              },
+              {
+                text: "v1.0.0",
+                link: "https://6447d8ec2c2ccb00085151ca--taco-api.netlify.app/",
+              },
+            ],
+          },
+        ],
+        selectLanguageName: "English",
+      },
+    },
+  }),
+  locales: {
+    "/": {
+      lang: "pt-BR",
+      title: "TACO API",
+      description: "Tabela Brasileira de Composição de Alimentos",
+    },
+    "/en/": {
+      lang: "en-US",
+      title: "TACO API",
+      description: "Brazilian Table of Food Composition",
+    },
+  },
+});
diff --git a/documentation/README.md → apps/website/docs/README.md b/documentation/README.md → apps/website/docs/README.md
diff --git a/documentation/en/README.md → apps/website/docs/en/README.md b/documentation/en/README.md → apps/website/docs/en/README.md
diff --git a/documentation/images/graphql-client.png → apps/website/docs/images/graphql-client.png b/documentation/images/graphql-client.png → apps/website/docs/images/graphql-client.png
diff --git a/apps/website/package.json b/apps/website/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "website",
+  "private": true,
+  "scripts": {
+    "dev": "vuepress dev docs",
+    "build": "vuepress build docs",
+    "lint": "biome lint docs",
+    "lint:ci": "biome ci docs"
+  },
+  "devDependencies": {
+    "@vuepress/client": "2.0.0-rc.0",
+    "vue": "3.3.11",
+    "vuepress": "2.0.0-rc.0"
+  }
+}
diff --git a/bun.lockb b/bun.lockb
diff --git a/.bunfig.toml → bunfig.toml b/.bunfig.toml → bunfig.toml
diff --git a/documentation/.vuepress/config.ts b/documentation/.vuepress/config.ts