Skip to content

Commit

Permalink
Merge pull request #1 from super-reality/feature-add-server-shaw
Browse files Browse the repository at this point in the history
Feature add server shaw
  • Loading branch information
lalalune authored Mar 11, 2022
2 parents 860c320 + ea6c912 commit e6c55e4
Show file tree
Hide file tree
Showing 264 changed files with 135,958 additions and 3,041 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
uses: actions/setup-node@v2
if: steps.core_diff.outcome != 'success' && (steps.no_thoth_core_label.outcome == 'success' || contains(github.event.pull_request.labels.*.name, 'thoth-core'))
with:
node-version: '14.17.6'
node-version: '16.14.0'

- name: Install Dependencies
run: yarn install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/thoth-core-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '14.17.6'
node-version: '16.14.0'
- name: git setup
run: |
git config --global user.name 'Thoth CI'
Expand Down
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,13 @@ build
.vscode/chrome

# Generated Styles for AreaPlugin
core/src/plugins/areaPlugin/style.css.d.ts
core/src/plugins/areaPlugin/style.css.d.ts
yarn-error.log
client/.env
server/.env
core/.env
google_credentials.json

# Ignore lockfiles
yarn.lock
package-lock.json
7 changes: 4 additions & 3 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Add Github npm package registry, so we can install private npm packages
@latitudegames:registry=https://npm.pkg.github.com/
//npm.pkg.github.com/:_authToken=${NPM_TOKEN}

#@latitudegames:registry=https://npm.pkg.github.com/
#npm.pkg.github.com/:_authToken=${NPM_TOKEN}
legacy-peer-deps=true
shamefully-hoist=true
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.6
16.6.2
12 changes: 11 additions & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,14 @@ Copyright 2021 Latitude, Inc.

This product includes software developed at Latitude, Inc. (https://www.latitude.io).

Licensed under Apache License 2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Thoth is a multishot system builder. It leverages a visual coding style interfac
1. Clone the repository
1. Navigate to the project root by running `cd thoth`
1. Run `yarn install` to install project dependencies
1. Run `yarn start` to start the @thoth/client app
1. Run `yarn start` to start the @latitudegames/thoth-client app

## Core Local Setup

Expand Down Expand Up @@ -49,12 +49,12 @@ In the project directory, you can run:

### `yarn start`

Runs @thoth/client in the development mode.\
Runs @latitudegames/thoth-client in the development mode.\
Open [http://localhost:3001](http://localhost:3001) to view it in the browser.

### `yarn build`

Builds the @thoth/client app for production to the `client/build` folder.
Builds the @latitudegames/thoth-client app for production to the `client/build` folder.

### `yarn build:core`

Expand Down
31 changes: 26 additions & 5 deletions client/.env
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
EXTEND_ESLINT = true
# Leave this true if you are developing against the Latitude API
# Set this to false if you are developing against the included server
REACT_APP_USE_LATITUDE=false

EXTEND_ESLINT=true

# This prod site root assumes the netlify build context $URL is available, replace for other hosts
REACT_APP_SITE_ROOT_URL_PROD=https://thoth.latitude.io

REACT_APP_SITE_ROOT_URL=http://localhost:3001
REACT_APP_LAPI_ROOT_URL=http://localhost:8000
REACT_APP_SITE_ROOT_URL_PROD=$URL
REACT_APP_SITE_ROOT_URL=http://localhost:8001

# Latitude API URL (if using)

REACT_APP_LAPI_ROOT_URL=http://localhost:8000
REACT_APP_LAPI_ROOT_URL_PROD=https://api.latitude.io

# Thoth API URL

REACT_APP_API_ROOT_URL=http://localhost:8001
REACT_APP_API_ROOT_URL_PROD=http://localhost:8001

REACT_APP_CORS_URL=http://localhost:8002

REACT_APP_SITE_STAGING=https://62264f21c3a9860ad1e5bdd3--optimistic-turing-def916.netlify.app/

# Oauth Client Id
REACT_APP_OAUTH_CLIENT_ID=a6b51c87-7565-42ab-a4b0-38a07f3b6c56

REACT_APP_OAUTH_CLIENT_ID=a6b51c87-7565-42ab-a4b0-38a07f3b6c56

EXTEND_ESLINT=true
REACT_APP_USE_AGENTS=true

REACT_APP_SPEECH_SERVER_URL=http://localhost:65532
REACT_APP_SEARCH_SERVER_URL=http://localhost:65531
30 changes: 30 additions & 0 deletions client/.env.default
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Leave this true if you are developing against the Latitude API
# Set this to false if you are developing against the included server
REACT_APP_USE_LATITUDE=true

EXTEND_ESLINT=true

# This prod site root assumes the netlify build context $URL is available, replace for other hosts
REACT_APP_SITE_ROOT_URL_PROD=$URL
REACT_APP_SITE_ROOT_URL=http://localhost:8001

# Latitude API URL (if using)
REACT_APP_LAPI_ROOT_URL=http://localhost:8000
REACT_APP_LAPI_ROOT_URL_PROD=https://api.latitude.io

# Thoth API URL
REACT_APP_API_ROOT_URL=http://localhost:8001
REACT_APP_API_ROOT_URL_PROD=http://localhost:8001

REACT_APP_CORS_URL=http://localhost:8002

REACT_APP_SITE_STAGING=https://62264f21c3a9860ad1e5bdd3--optimistic-turing-def916.netlify.app/

# Oauth Client Id
REACT_APP_OAUTH_CLIENT_ID=a6b51c87-7565-42ab-a4b0-38a07f3b6c56

EXTEND_ESLINT=true
REACT_APP_USE_AGENTS=true

REACT_APP_SPEECH_SERVER_URL=http://localhost:65532
REACT_APP_SEARCH_SERVER_URL=http://localhost:65531
19 changes: 8 additions & 11 deletions client/.env.example
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
EXTEND_ESLINT = true

# This prod site root assumes the netlify build context $URL is available, replace for other hosts
REACT_APP_SITE_ROOT_URL_PROD=$URL
REACT_APP_SITE_ROOT_URL=http://localhost:3001
REACT_APP_LAPI_ROOT_URL=http://localhost:8000
REACT_APP_LAPI_ROOT_URL_PROD=https://api.latitude.io
REACT_APP_SITE_STAGING=https://62264f21c3a9860ad1e5bdd3--optimistic-turing-def916.netlify.app/

# Oauth Client Id
REACT_APP_OAUTH_CLIENT_ID=a6b51c87-7565-42ab-a4b0-38a07f3b6c56
# REACT_APP_API_ROOT_URL=https://api.latitude.io
# REACT_APP_API_ROOT_URL=https://latitude-api-staging.herokuapp.com
REACT_APP_API_ROOT_URL=http://localhost:8001
REACT_APP_CORS_URL=http://localhost:8002
REACT_APP_USE_LATITUDE=true
EXTEND_ESLINT=true
REACT_APP_USE_AGENTS=false
REACT_APP_SPEECH_SERVER_URL=http://localhost:65532
2 changes: 1 addition & 1 deletion client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ node_modules
build
.DS_Store
dist
LICENSE
.env
26 changes: 19 additions & 7 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@thoth/client",
"name": "@latitudegames/thoth-client",
"version": "0.1.0",
"license": "Apache-2.0",
"author": "Michael Sharpe <m.sharpe@project89.org> (https://www.project89.org)",
Expand All @@ -21,7 +21,7 @@
},
"dependencies": {
"@callstack/async-storage": "^2.0.3",
"@latitudegames/thoth-core": "0.0.63",
"@latitudegames/thoth-core": "^0.0.64",
"@material-ui/core": "^4.12.1",
"@material-ui/icons": "^4.11.2",
"@monaco-editor/react": "^4.2.1",
Expand All @@ -32,6 +32,8 @@
"@types/react": "^17.0.15",
"@types/react-dom": "^17.0.9",
"@types/react-redux": "^7.1.18",
"axios": "^0.21.4",
"better-react-spinkit": "^2.0.4",
"classnames": "^2.3.1",
"deep-equal": "^2.0.5",
"eslint-config-react-app": "^6.0.0",
Expand All @@ -48,15 +50,18 @@
"pubsub-js": "^1.9.3",
"react": "^17.0.2",
"react-console-emulator": "^5.0.1",
"react-custom-scrollbars": "^4.2.1",
"react-custom-scrollbars-2": "^4.4.0",
"react-dom": "^17.0.2",
"react-hook-form": "^7.15.4",
"react-hotkeys-hook": "^3.3.2",
"react-icons": "^4.2.0",
"react-player": "^2.9.0",
"react-pouchdb": "^2.1.0",
"react-redux": "^7.2.5",
"react-router": "^6.0.0-beta.8",
"react-router-dom": "6",
"react-router": "^6.0.0",
"react-router-dom": "^6.0.0",
"react-scroll-to-bottom": "^4.2.0",
"react-select": "^4.3.1",
"react-simple-code-editor": "^0.11.0",
"rebass": "^4.0.7",
Expand All @@ -67,10 +72,16 @@
"rete-react-render-plugin": "^0.2.1",
"rxdb": "^9.21.0",
"rxjs": "^7.2.0",
"terminal-in-react": "^4.3.1",
"typescript": "^4.1.2",
"unique-names-generator": "^4.5.0",
"axios": "^0.21.4",
"terminal-in-react": "^4.3.1",
"typescript": "^4.1.2",
"uuid": "^8.3.2",
"web-vitals": "^1.0.1",
"wouter": "^2.7.4"
"vite-plugin-env-compatible": "^1.1.1",
"vite-plugin-react": "^4.0.1",
"web-vitals": "^1.0.1"
},
"devDependencies": {
"@babel/plugin-external-helpers": "^7.14.5",
Expand All @@ -90,7 +101,8 @@
"crypto-browserify": "^3.12.0",
"css-loader": "^6.3.0",
"css-modules-typescript-loader": "^4.0.1",
"dotenv-webpack": "^7.0.3",
"dotenv-flow-webpack": "^1.1.0",
"dotenv-webpack": "^7.1.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"enzyme-to-json": "^3.6.2",
Expand Down
26 changes: 0 additions & 26 deletions client/scripts/module.ts

This file was deleted.

98 changes: 0 additions & 98 deletions client/scripts/package-lock.json

This file was deleted.

7 changes: 0 additions & 7 deletions client/scripts/package.json

This file was deleted.

Loading

0 comments on commit e6c55e4

Please sign in to comment.