Skip to content

Commit e3daf62

Browse files
Merge branch 'main' into feat/add-folder
- Resolve merge conflicts caused by directory restructure in main: - Moved new dialog components from (protected)/_protected to _protected - Confirmed update of tables-tree.tsx in new location
2 parents 8e500b9 + 936cb40 commit e3daf62

357 files changed

Lines changed: 12545 additions & 3369 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Release to Discord
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
github-releases-to-discord:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v3
13+
- name: GitHub Releases to Discord
14+
uses: SethCohen/github-releases-to-discord@v1
15+
with:
16+
webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}
17+
color: '2105893'
18+
username: Release Changelog
19+
avatar_url: 'https://conar.app/apple-touch-icon.png'
20+
content: '||@everyone||'
21+
footer_title: Changelog
22+
reduce_headings: true

.github/workflows/lint-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup pnpm
2525
uses: pnpm/action-setup@v4
2626
with:
27-
version: 10.27.0
27+
version: 10.28.0
2828

2929
- name: Restore cached dependencies
3030
id: cache-restore

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
build:
88
name: Build
9-
runs-on: ubuntu-latest
9+
runs-on: macos-latest
1010
steps:
1111
- name: Check out Git repository
1212
uses: actions/checkout@v3
@@ -19,17 +19,17 @@ jobs:
1919
- name: Install pnpm
2020
uses: pnpm/action-setup@v2
2121
with:
22-
version: 10.27.0
22+
version: 10.28.0
2323

2424
- name: Install Dependencies
2525
run: pnpm install --frozen-lockfile
2626

2727
- name: Build ToDesktop
2828
run: pnpm run build:todesktop
2929
env:
30+
NODE_OPTIONS: --max-old-space-size=8192
3031
TODESKTOP_ACCESS_TOKEN: ${{ secrets.TODESKTOP_ACCESS_TOKEN }}
3132
TODESKTOP_EMAIL: ${{ secrets.TODESKTOP_EMAIL }}
3233
VITE_PUBLIC_API_URL: ${{ secrets.VITE_PUBLIC_API_URL }}
33-
VITE_PUBLIC_AUTH_SECRET: ${{ secrets.VITE_PUBLIC_AUTH_SECRET }}
3434
VITE_PUBLIC_POSTHOG_API_KEY: ${{ secrets.VITE_PUBLIC_POSTHOG_API_KEY }}
3535
VITE_PUBLIC_WEB_URL: ${{ secrets.VITE_PUBLIC_WEB_URL }}

README.md

Lines changed: 2 additions & 2 deletions

apps/api/.env.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
API_URL=http://localhost:3000
22
WEB_URL=http://localhost:3001
33
DATABASE_URL=postgresql://postgres:postgres@localhost:5432/conar
4+
ALERTS_EMAIL=
45
ENCRYPTION_SECRET=example
56
BETTER_AUTH_SECRET=Rbuw5KIliGWJ7pVdCPHNFo2UX91xhQg8+GMXYNCqC/M=
67
STRIPE_SECRET_KEY=
@@ -11,7 +12,6 @@ REDIS_URL=redis://default:root@localhost:6379
1112
POSTHOG_API_KEY=
1213
RESEND_API_KEY=
1314
RESEND_FROM_EMAIL=info@conar.app
14-
LOOPS_API_KEY=
1515
OPENAI_API_KEY=
1616
ANTHROPIC_API_KEY=
1717
GOOGLE_GENERATIVE_AI_API_KEY=
@@ -22,3 +22,4 @@ GITHUB_CLIENT_ID=
2222
GITHUB_CLIENT_SECRET=
2323
EXA_API_KEY=
2424
GITHUB_TOKEN=
25+
TODESKTOP_WEBHOOK_SECRET=

apps/api/.env.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
API_URL=http://localhost:3000
22
WEB_URL=http://localhost:3001
33
DATABASE_URL="./.pglite"
4+
ALERTS_EMAIL=
45
ENCRYPTION_SECRET=example
56
BETTER_AUTH_SECRET=example
67
STRIPE_SECRET_KEY=
@@ -11,7 +12,6 @@ REDIS_URL=
1112
POSTHOG_API_KEY=
1213
RESEND_API_KEY=
1314
RESEND_FROM_EMAIL=info@conar.app
14-
LOOPS_API_KEY=
1515
OPENAI_API_KEY=
1616
ANTHROPIC_API_KEY=
1717
GOOGLE_GENERATIVE_AI_API_KEY=
@@ -22,3 +22,4 @@ GITHUB_CLIENT_ID=
2222
GITHUB_CLIENT_SECRET=
2323
EXA_API_KEY=
2424
GITHUB_TOKEN=
25+
TODESKTOP_WEBHOOK_SECRET=

apps/api/drizzle.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { defineConfig } from 'drizzle-kit'
22
import { env, nodeEnv } from '~/env'
33

44
export default defineConfig({
5-
schema: './src/drizzle/schema/*.ts',
6-
out: './src/drizzle/migrations',
5+
schema: './drizzle/schema/*.ts',
6+
out: './drizzle/migrations',
77
...(nodeEnv === 'test' && { driver: 'pglite' }),
88
dialect: 'postgresql',
99
casing: 'snake_case',
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ import * as auth from './schema/auth'
55
import * as chats from './schema/chats'
66
import * as databases from './schema/databases'
77
import * as queries from './schema/queries'
8+
import * as subscriptions from './schema/subscriptions'
89
import '@electric-sql/pglite'
910

1011
export * from './schema/auth'
1112
export * from './schema/chats'
1213
export * from './schema/databases'
1314
export * from './schema/queries'
15+
export * from './schema/subscriptions'
1416

1517
const config = {
1618
logger: true,
@@ -19,6 +21,7 @@ const config = {
1921
...databases,
2022
...chats,
2123
...queries,
24+
...subscriptions,
2225
},
2326
casing: 'snake_case',
2427
} satisfies Parameters<typeof drizzle>[1]

0 commit comments

Comments
 (0)