Merge branch 'main' of https://github.com/Dhravya/supermemory into new-ui

10 files changed, 90 insertions, 25 deletions

diff --git a/.github/actions/buildextension/action.yml b/.github/actions/buildextension/action.yml
index dc1dc80d..b65953d7 100644
--- a/.github/actions/buildextension/action.yml
+++ b/.github/actions/buildextension/action.yml
@@ -26,4 +26,4 @@ runs:
       uses: actions/upload-artifact@v3
       with:
         name: extension-${{ github.sha }}
-        path: apps/extensions/dist/extension-${{ github.sha }}.zip
\ No newline at end of file
+        path: apps/extension/dist/extension-${{ github.sha }}.zip
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 056fca08..c99080ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,10 +1,18 @@
-name: Build
+name: Build and Deploy Changes
 
 on:
   push:
     branches: [main]
+    paths:
+      - 'apps/web/**'
+      - 'apps/extension/**'
+      - 'apps/cf-ai-backend/**'
   pull_request:
     branches: [main]
+    paths:
+      - 'apps/web/**'
+      - 'apps/extension/**'
+      - 'apps/cf-ai-backend/**'
 
 jobs:
   build-extension:
@@ -12,6 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/buildextension
+
   build-app:
     runs-on: ubuntu-latest
     steps:
@@ -41,9 +50,25 @@ jobs:
 
       - name: Publish to Cloudflare Pages
         uses: cloudflare/pages-action@v1
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
           directory: apps/web/.vercel/output/static
           branch: main
+
+  # deploy-cf-worker:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout repo
+  #       uses: actions/checkout@v3
+
+  #     - name: Deploy to Cloudflare Workers
+  #       uses: cloudflare/[email protected]
+  #       with:
+  #         apiToken: ${{ secrets.CF_API_TOKEN }}
+  #         workingDirectory: apps/cf-ai-backend
+  #       env:
+  #         OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+  #         SECURITY_KEY: ${{ secrets.BACKEND_SECURITY_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57168bb0..bdc9d474 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,4 +27,4 @@ jobs:
           clientID: ${{ secrets.GOOGLE_CLIENT_ID }}
           clientSecret: ${{ secrets.GOOGLE_CLIENT_SECRET }}
           clientRefreshToken: ${{ secrets.GOOGLE_REFRESH_TOKEN }}
-          extensionFile: apps/extension/extension-${{ github.sha }}.zip
+          extensionFile: apps/extension/dist/extension-${{ github.sha }}.zip
diff --git a/apps/cf-ai-backend/.gitignore b/apps/cf-ai-backend/.gitignore
index c51412d9..3b0fe33c 100644
--- a/apps/cf-ai-backend/.gitignore
+++ b/apps/cf-ai-backend/.gitignore
@@ -1,5 +1,4 @@
 # Logs
-wrangler.toml
 
 logs
 _.log
diff --git a/apps/cf-ai-backend/wrangler.toml b/apps/cf-ai-backend/wrangler.toml
new file mode 100644
index 00000000..9e3ee21b
--- /dev/null
+++ b/apps/cf-ai-backend/wrangler.toml
@@ -0,0 +1,58 @@
+name = "cf-ai-backend"
+main = "src/index.ts"
+compatibility_date = "2024-02-23"
+
+[[vectorize]]
+binding = "VECTORIZE_INDEX"
+index_name = "any-vector"
+
+[ai]
+binding = "AI"
+
+# Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
+# Note: Use secrets to store sensitive data.
+# Docs: https://developers.cloudflare.com/workers/platform/environment-variables
+# [vars]
+# MY_VARIABLE = "production_value"
+
+# Bind a KV Namespace. Use KV as persistent storage for small key-value pairs.
+# Docs: https://developers.cloudflare.com/workers/runtime-apis/kv
+# [[kv_namespaces]]
+# binding = "MY_KV_NAMESPACE"
+# id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+# Bind an R2 Bucket. Use R2 to store arbitrarily large blobs of data, such as files.
+# Docs: https://developers.cloudflare.com/r2/api/workers/workers-api-usage/
+# [[r2_buckets]]
+# binding = "MY_BUCKET"
+# bucket_name = "my-bucket"
+
+# Bind a Queue producer. Use this binding to schedule an arbitrary task that may be processed later by a Queue consumer.
+# Docs: https://developers.cloudflare.com/queues/get-started
+# [[queues.producers]]
+# binding = "MY_QUEUE"
+# queue = "my-queue"
+
+# Bind a Queue consumer. Queue Consumers can retrieve tasks scheduled by Producers to act on them.
+# Docs: https://developers.cloudflare.com/queues/get-started
+# [[queues.consumers]]
+# queue = "my-queue"
+
+# Bind another Worker service. Use this binding to call another Worker without network overhead.
+# Docs: https://developers.cloudflare.com/workers/platform/services
+# [[services]]
+# binding = "MY_SERVICE"
+# service = "my-service"
+
+# Bind a Durable Object. Durable objects are a scale-to-zero compute primitive based on the actor model.
+# Durable Objects can live for as long as needed. Use these when you need a long-running "server", such as in realtime apps.
+# Docs: https://developers.cloudflare.com/workers/runtime-apis/durable-objects
+# [[durable_objects.bindings]]
+# name = "MY_DURABLE_OBJECT"
+# class_name = "MyDurableObject"
+
+# Durable Object migrations.
+# Docs: https://developers.cloudflare.com/workers/learning/using-durable-objects#configure-durable-object-classes-with-migrations
+# [[migrations]]
+# tag = "v1"
+# new_classes = ["MyDurableObject"]
diff --git a/apps/extension/README.md b/apps/extension/README.md
index 0d6babed..7619225f 100644
--- a/apps/extension/README.md
+++ b/apps/extension/README.md
@@ -28,3 +28,4 @@ export default {
 - Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
 - Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
 - Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
+  
\ No newline at end of file
diff --git a/apps/extension/src/content.tsx b/apps/extension/src/content.tsx
index 4c194c53..0bc71e07 100644
--- a/apps/extension/src/content.tsx
+++ b/apps/extension/src/content.tsx
@@ -8,7 +8,7 @@ window.addEventListener('message', (event) => {
     if (
       !(
         window.location.hostname === 'localhost' ||
-        window.location.hostname === 'anycontext.dhr.wtf'
+        window.location.hostname.endsWith('dhr.wtf')
       )
     ) {
       console.log(
diff --git a/apps/web/README.md b/apps/web/README.md
index 42da305a..c81448e4 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -65,4 +65,4 @@ In order to enable the example:
 
 After doing this you can run the `dev` or `preview` script and visit the `/api/hello` route to see the example in action.
 
-Finally, if you also want to see the example work in the deployed application make sure to add a `MY_KV_NAMESPACE` binding to your Pages application in its [dashboard kv bindings settings section](https://dash.cloudflare.com/?to=/:account/pages/view/:pages-project/settings/functions#kv_namespace_bindings_section). After having configured it make sure to re-deploy your application.
+Finally, if you also want to see the example work in the deployed application make sure to add a `MY_KV_NAMESPACE` binding to your Pages application in its [dashboard kv bindings settings section](https://dash.cloudflare.com/?to=/:account/pages/view/:pages-project/settings/functions#kv_namespace_bindings_section). After having configured it make sure to re-deploy your application.
\ No newline at end of file
diff --git a/apps/web/example.wrangler.toml b/apps/web/example.wrangler.toml
deleted file mode 100644
index 688d8137..00000000
--- a/apps/web/example.wrangler.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-name = "web"
-compatibility_date = "2024-03-29"
-compatibility_flags = ["nodejs_compat"]
-
-[[vectorize]]
-binding = "VECTORIZE_INDEX" 
-index_name = "anycontext-idx"
-
-[[d1_databases]]
-binding = "DATABASE"
-database_name = "dev-d1-anycontext"
-
-[vars]
-GOOGLE_CLIENT_ID="-"
-GOOGLE_CLIENT_SECRET="-"
-NEXTAUTH_SECRET="sec"
-NEXTAUTH_URL="http://localhost:3000"
-BACKEND_SECURITY_KEY="XP1FNh+rTYghq2TmrFbMLCCBy+eBAvi8iuoMuV9zDUc="
diff --git a/apps/web/wrangler.toml b/apps/web/wrangler.toml
index 6630b0d0..12619fdb 100644
--- a/apps/web/wrangler.toml
+++ b/apps/web/wrangler.toml
@@ -9,4 +9,4 @@ index_name = "anycontext-idx"
 [[d1_databases]]
 binding = "DATABASE"
 database_name = "dev-d1-anycontext"
-database_id = "fc562605-157a-4f60-b439-2a24ffed5b4c"
\ No newline at end of file
+database_id = "fc562605-157a-4f60-b439-2a24ffed5b4c"