feat: v2.1.0

.env.default

@@ -0,0 +1,5 @@
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=postgres
+PGDATA=/var/lib/postgresql/data/lexico
+POSTGRES_HOST_AUTH_METHOD=password

.github/CODEOWNERS

@@ -0,0 +1 @@
+*       @JimmyPaolini

.github/workflows/database:dev.yaml

@@ -0,0 +1,24 @@
+name: database
+on:
+  workflow_dispatch:
+
+jobs:
+  database:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Node
+        uses: actions/setup-node@v2
+      - name: Download Postgres
+        run: sudo apt-get update && sudo apt-get install postgresql
+      - name: Install Dependencies
+        run: npm install && cd ingestion && npm install
+      - name: Setup Environment
+        run: echo "${{secrets.ENV_FILE}}" > .env
+      - name: Login Kubernetes
+        run: mkdir ~/.kube && echo "${{secrets.KUBE_CONFIG}}" > ~/.kube/config
+      - name: Database Port Forward
+        run: kubectl port-forward service/database 5432 -n lexico-dev &
+      - name: Deploy Database
+        run: cd ingestion && tsc && node --unhandled-rejections=strict dist/ingestion/src/restore.js ingested

.github/workflows/deploy.yaml

@@ -65,6 +65,12 @@ jobs:
       - name: Get Version
         id: package-version
         uses: martinbeentjes/npm-get-version-action@master
+      - name: Get Cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ github.workspace }}/.next/cache
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]sx?') }}
+          restore-keys: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
       - name: Login Docker
         uses: actions-hub/docker/login@master
         env:

.github/workflows/server:dev.yaml

@@ -0,0 +1,33 @@
+name: server
+on:
+  workflow_dispatch:
+
+jobs:
+  server:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Node
+        uses: actions/setup-node@v2
+      - name: Get Version
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@master
+      - name: Login Docker
+        uses: actions-hub/docker/login@master
+        env:
+          DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
+          DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+      - name: Build Server Image
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: >-
+          DOCKER_BUILDKIT=1 docker build -f infra/docker/server.Dockerfile .
+          -t jimmypaolini/lexico-server:dev
+      - name: Push Server Image
+        uses: actions-hub/docker@master
+        with:
+          args: push jimmypaolini/lexico-server
+      - name: Login Kubernetes
+        run: mkdir ~/.kube && echo "${{secrets.KUBE_CONFIG}}" > ~/.kube/config
+      - name: Deploy Server
+        run: kubectl rollout restart deployment server -n lexico-dev

.github/workflows/web.yaml

@@ -13,13 +13,18 @@ jobs:
       - name: Get Version
         id: package-version
         uses: martinbeentjes/npm-get-version-action@master
+      - name: Get Cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ github.workspace }}/web/.next/cache
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]sx?') }}
+          restore-keys: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
       - name: Login Docker
         uses: actions-hub/docker/login@master
         env:
           DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
           DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
       - name: Build Web Image
-        if: steps.cache.outputs.cache-hit != 'true'
         run: >-
           DOCKER_BUILDKIT=1 docker build -f infra/docker/web.Dockerfile .
           -t jimmypaolini/lexico-web:${{steps.package-version.outputs.current-version}}

.github/workflows/web:dev.yaml

@@ -0,0 +1,39 @@
+name: web
+on:
+  workflow_dispatch:
+
+jobs:
+  web:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Node
+        uses: actions/setup-node@v2
+      - name: Get Version
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@master
+      - name: Get Cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ github.workspace }}/web/.next/cache
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]sx?') }}
+          restore-keys: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
+      - name: Login Docker
+        uses: actions-hub/docker/login@master
+        env:
+          DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
+          DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+      - name: Build Web Image
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: >-
+          DOCKER_BUILDKIT=1 docker build -f infra/docker/web.Dockerfile .
+          -t jimmypaolini/lexico-web:dev
+      - name: Push Web Image
+        uses: actions-hub/docker@master
+        with:
+          args: push jimmypaolini/lexico-web
+      - name: Login Kubernetes
+        run: mkdir ~/.kube && echo "${{secrets.KUBE_CONFIG}}" > ~/.kube/config
+      - name: Deploy Web
+        run: kubectl rollout restart deployment web -n lexico-dev

.gitignore

@@ -1,10 +1,8 @@
 **/.DS_Store
-**/.vscode
-**/.idea
 
 **/node_modules
-**/dist
-**/*.env*
+**/dist/**
+**/.env
 
 **/.next/
 **/out/
@@ -13,5 +11,4 @@
 **/elasticsearch_volume
 
 **/data/wiktionary
-
-.DS_Store
+**/storybook-static

.vscode/launch.json

@@ -0,0 +1,10 @@
+{
+  "configurations": [
+    {
+      "name": "Debug Chrome localhost:3000",
+      "request": "attach",
+      "type": "chrome",
+      "url": "http://localhost:3000",
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,59 @@
+{
+  "peacock.color": "#66023C",
+  "workbench.colorCustomizations": {
+    "activityBar.activeBorder": "#121f01",
+    "activityBar.activeBackground": "#980359",
+    "activityBar.background": "#980359",
+    "activityBar.foreground": "#e7e7e7",
+    "activityBar.inactiveForeground": "#e7e7e799",
+    "activityBarBadge.background": "#121f01",
+    "activityBarBadge.foreground": "#e7e7e7",
+    "commandCenter.border": "#e7e7e799",
+    "sash.hoverBorder": "#980359",
+    "statusBar.background": "#66023c",
+    "statusBar.foreground": "#e7e7e7",
+    "statusBarItem.hoverBackground": "#980359",
+    "statusBarItem.remoteBackground": "#66023c",
+    "statusBarItem.remoteForeground": "#e7e7e7",
+    "titleBar.activeBackground": "#66023c",
+    "titleBar.activeForeground": "#e7e7e7",
+    "titleBar.inactiveBackground": "#66023c99",
+    "titleBar.inactiveForeground": "#e7e7e799"
+  },
+  "material-icon-theme.files.associations": {
+    "package.json": "npm",
+    "package-lock.json": "npm",
+    "tsconfig.json": "settings",
+    "docker-compose.database.yml": "docker",
+    "settings.json": "vscode",
+    "keybindings.json": "vscode"
+  },
+  "material-icon-theme.folders.associations": {
+    "database_volume": "database",
+    "infra": "environment",
+    "entity": "class",
+    "ingestion": "scripts",
+    "resolver": "routes",
+    "library": "lib",
+    "dictionary": "app",
+    "wiktionary": "content",
+    ".next": "vercel",
+    "cypress": "test",
+    "cleaning": "coverage",
+    "migration": "scripts"
+  },
+  "prettier.configPath": "cleaning/.prettierrc.js",
+  "prettier.ignorePath": "cleaning/.prettierignore",
+  "eslint.options": { "overrideConfigFile": "cleaning/.eslintrc.js" },
+  "eslint.workingDirectories": ["./"],
+  "eslint.lintTask.options": "--config cleaning/.eslintrc.js --ignore-file cleaning/.eslintignore .",
+  "eslint.probe": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact",
+    "graphql",
+    "html",
+    "markdown"
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,74 @@
+{
+  "version": "2.0.0",
+  "presentation": {
+    "echo": false,
+    "reveal": "always",
+    "focus": true,
+    "panel": "dedicated",
+    "showReuseMessage": true,
+  },
+  "tasks": [
+    {
+      "label": "🌑 Lexico",
+      "dependsOn": [
+        "🖥️ web",
+        "🖥️ web:dev",
+        "📡 server",
+        "📡 server:dev",
+        "🛢️ database",
+        "🐺 lexico",
+      ],
+      "icon": { "id": "globe", "color": "terminal.ansiGreen" },
+      "problemMatcher": []
+    },
+    {
+      "label": "🐺 lexico",
+      "command": "zsh",
+      "icon": { "id": "terminal", "color": "terminal.ansiGreen" },
+      "isBackground": true,
+      "type": "shell",
+    },
+    {
+      "label": "🛢️ database",
+      "command": "yarn database",
+      "icon": { "id": "run", "color": "terminal.ansiRed" },
+      "isBackground": true,
+      "type": "shell",
+    },
+    {
+      "label": "🍽️ ingestion",
+      "command": "cd ingestion && zsh",
+      "icon": { "id": "terminal", "color": "terminal.ansiBlue" },
+      "isBackground": true,
+      "type": "shell",
+    },
+    {
+      "label": "📡 server",
+      "command": "cd ./server && zsh",
+      "icon": { "id": "terminal", "color": "terminal.ansiBlue" },
+      "isBackground": true,
+      "type": "shell",
+    },
+    {
+      "label": "📡 server:dev",
+      "command": "cd ./server && yarn dev",
+      "icon": { "id": "run", "color": "terminal.ansiRed" },
+      "isBackground": true,
+      "type": "shell",
+    },
+    {
+      "label": "🖥️ web",
+      "command": "cd ./web && zsh",
+      "icon": { "id": "terminal", "color": "terminal.ansiBlue" },
+      "isBackground": true,
+      "type": "shell",
+    },
+    {
+      "label": "🖥️ web:dev",
+      "command": "cd ./web && yarn dev",
+      "icon": { "id": "run", "color": "terminal.ansiRed" },
+      "isBackground": true,
+      "type": "shell",
+    },
+  ]
+}

README.md

@@ -23,6 +23,7 @@
 <a href="https://nextjs.org"><img width="64" height="64" alt="nextjs" src="web/public/icon/tool/nextjs.png"></a>
 <a href="https://reactjs.org"><img width="64" height="64" alt="react" src="web/public/icon/tool/react.png"></a>
 <a href="https://material-ui.com"><img width="64" height="64" alt="materialui" src="web/public/icon/tool/materialui.png"></a>
+<a href="https://cssinjs.org"><img width="64" height="64" alt="jss" src="web/public/icon/tool/jss.png"></a>
 <a href="https://storybook.js.org"><img width="64" height="64" alt="storybook" src="web/public/icon/tool/storybook.png"></a>
 <a href="https://react-query.tanstack.com"><img width="64" height="64" alt="react-query" src="web/public/icon/tool/react-query.png"></a>
 <a href="https://formik.org"><img width="64" height="64" alt="formik" src="web/public/icon/tool/formik.png"></a>
@@ -49,4 +50,4 @@
 
 ### Database Schema
 
-<p align="center"><a href="https://drawsql.app/lexico/diagrams/lexico"><img src="assets/database_schema.png"></a></p>
+<p align="center"><img src="assets/erd.png"></p>

.eslintignore → cleaning/.eslintignore

@@ -1,19 +1,23 @@
 **/.DS_Store
-**/.vscode
 **/.idea
 
 **/node_modules
-**/dist
+**/dist/**
 
-**/.next/
-**/out/
+**/.next
+**/out
 
 **/database_volume
-**/elasticsearch_volume
 
-**/data/wiktionary
+**/data
 **/assets
 
 **/ingestion/src/dictionary
 **/README.md
 **/LICENSE.md
+
+**/migration
+.next-env.d.ts
+**/schema.graphql
+**/generated.ts
+**/storybook-static