Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v0.1.0' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
thomageanderson committed Feb 13, 2023
2 parents aed527d + edf61c5 commit 2d271e1
Show file tree
Hide file tree
Showing 560 changed files with 7,726 additions and 11,487 deletions.
9 changes: 7 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
DATABASE_URL=postgresql://postgres:ZTE*[email protected]:5432/postgres
SHADOW_DATABASE_URL=postgresql://postgres:ZTE*[email protected]:5432/postgres_shadow
WEAVIATE_CLIENT_SCHEME=http
WEAVIATE_CLIENT_HOST=localhost:8080
WEAVIATE_CLIENT_SCHEME=https
WEAVIATE_IMPORT_DATA=true
WEAVIATE_CLIENT_HOST=magicktest.weaviate.network
OPENAI_API_KEY=
PLUGINS=@magickml/plugin-weaviate,@magickml/plugin-discord
# default projectId
PROJECT_ID=bb1b3d24-84e0-424e-b4f1-57603f307a88
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ dev.db

package-lock.json
yarn.lock
packages/prisma/prisma/dev.db

files/
44 changes: 44 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"skipFiles": [
"<node_internals>/**"
],
"program": "${file}",
"outFiles": [
"${workspaceFolder}/**/*.js"
]
},
{
"name": "Client",
"type": "chrome",
"request": "launch",
"url": "http://localhost:4200"
},
{
"name": "SpellCaster",
"type": "node",
"request": "attach",
"port": 7777
},
{
"name": "Server",
"type": "node",
"request": "attach",
"port": 7778
},
{
"name": "AgentServer",
"type": "node",
"request": "attach",
"port": 7779
}
]
}
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{
}
"typescript.tsserver.experimental.enableProjectDiagnostics": true
}
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p align="center"><img src="files/MAGICK-banner.png" /></p>
<p align="center"><img src="apps/docs/readme-files/MAGICK-banner.png" /></p>

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
Expand Down Expand Up @@ -52,6 +52,12 @@ We recommend either installing the docker desktop app, and running `docker-compo

We will be working on more database docoumentation to help you get your data store up and running.

## Self signed certificates

Developing locally, it can be very helpful to have google chrome accept all self signed cetificates coming from localhost. To do this, simply paste the following snippet into chromes URL bar and enable the feature:

`chrome://flags/#allow-insecure-localhost`

## Contributors

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
Expand Down
Empty file removed apps/.gitkeep
Empty file.
14 changes: 0 additions & 14 deletions apps/agent-server/env.d.ts

This file was deleted.

3 changes: 0 additions & 3 deletions apps/agent-server/environments/environment.prod.ts

This file was deleted.

3 changes: 0 additions & 3 deletions apps/agent-server/environments/environment.ts

This file was deleted.

16 changes: 0 additions & 16 deletions apps/agent-server/jest.config.ts

This file was deleted.

70 changes: 0 additions & 70 deletions apps/agent-server/project.json

This file was deleted.

Loading

0 comments on commit 2d271e1

Please sign in to comment.