diff --git a/lib/nile/src/index.ts b/lib/nile/src/index.ts index 6ed8e9ac..27f3f27a 100644 --- a/lib/nile/src/index.ts +++ b/lib/nile/src/index.ts @@ -6,6 +6,7 @@ export default Nile; export * from './client/src/models'; export * from './client/src/apis'; -export { ConfigurationParameters, StorageOptions } from './client/src/runtime'; +export type { ConfigurationParameters } from './client/src/runtime'; +export { StorageOptions } from './client/src/runtime'; export * from './model/DeveloperCredentials'; export * from './EventsApi'; diff --git a/lib/nile/tsconfig.json b/lib/nile/tsconfig.json index 1abdf672..1a75e9b4 100644 --- a/lib/nile/tsconfig.json +++ b/lib/nile/tsconfig.json @@ -1,6 +1,6 @@ { // see https://www.typescriptlang.org/tsconfig to better understand tsconfigs - "include": ["src", "types"], + "include": ["src/**/*", "types"], "exclude": ["src/generated/openapi"], "compilerOptions": { "target": "ES6", diff --git a/package.json b/package.json index 5a75c3e1..8c7fa9bd 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,11 @@ "packages/*" ], "scripts": { - "build": "yarn build:js-lib && yarn build:react && yarn build:examples", + "build": "yarn build:js-lib && yarn build:react", "build:js-lib": "yarn workspace @theniledev/js build", "test:js-lib": "yarn workspace @theniledev/js test", "test:react": "yarn workspace @theniledev/react test", "build:react": "yarn workspace @theniledev/react build", - "build:examples": "yarn workspace @theniledev/examples build", "build:react-storybook": "yarn build:js-lib && yarn build:react && yarn workspace @theniledev/react build-storybook", "lint": "yarn eslint . --max-warnings=0", "buildDocs": "yarn workspace @theniledev/js typedoc --plugin typedoc-plugin-markdown --hideBreadcrumbs true src/index.ts", diff --git a/packages/examples/.gitignore b/packages/examples/.gitignore deleted file mode 100644 index 7d093c39..00000000 --- a/packages/examples/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# next.js -/.next/ -/out/ - -# production -/build - -# misc -.DS_Store -*.pem - -# debug -npm-debug.log* -yarn-debug.log* -yarn-error.log* -.pnpm-debug.log* - -# local env files -.env.local -.env.development.local -.env.test.local -.env.production.local - -# vercel -.vercel - -# typescript -*.tsbuildinfo diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md deleted file mode 100644 index 81114195..00000000 --- a/packages/examples/CHANGELOG.md +++ /dev/null @@ -1,430 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -## [0.35.5](https://github.com/TheNileDev/nile-js/compare/v0.35.4...v0.35.5) (2023-04-03) - -**Note:** Version bump only for package @theniledev/examples - -## [0.35.4](https://github.com/TheNileDev/nile-js/compare/v0.35.3...v0.35.4) (2023-02-13) - -**Note:** Version bump only for package @theniledev/examples - -## [0.35.3](https://github.com/TheNileDev/nile-js/compare/v0.35.2...v0.35.3) (2023-01-26) - -**Note:** Version bump only for package @theniledev/examples - -## [0.35.2](https://github.com/TheNileDev/nile-js/compare/v0.35.1...v0.35.2) (2023-01-26) - -**Note:** Version bump only for package @theniledev/examples - -## [0.35.1](https://github.com/TheNileDev/nile-js/compare/v0.35.0...v0.35.1) (2023-01-26) - -### Bug Fixes - -- **nile-js:** set token on Nile create ([f1da2e9](https://github.com/TheNileDev/nile-js/commit/f1da2e9dff7e7bd72e18c9d06b5021936bb0a5d0)) - -# [0.35.0](https://github.com/TheNileDev/nile-js/compare/v0.34.1...v0.35.0) (2023-01-25) - -**Note:** Version bump only for package @theniledev/examples - -## [0.34.1](https://github.com/TheNileDev/nile-js/compare/v0.34.0...v0.34.1) (2023-01-25) - -**Note:** Version bump only for package @theniledev/examples - -# [0.34.0](https://github.com/TheNileDev/nile-js/compare/v0.33.1...v0.34.0) (2023-01-25) - -**Note:** Version bump only for package @theniledev/examples - -## [0.33.1](https://github.com/TheNileDev/nile-js/compare/v0.33.0...v0.33.1) (2022-12-13) - -**Note:** Version bump only for package @theniledev/examples - -# [0.33.0](https://github.com/TheNileDev/nile-js/compare/v0.32.3...v0.33.0) (2022-12-05) - -**Note:** Version bump only for package @theniledev/examples - -## [0.32.3](https://github.com/TheNileDev/nile-js/compare/v0.32.2...v0.32.3) (2022-11-23) - -**Note:** Version bump only for package @theniledev/examples - -## [0.32.2](https://github.com/TheNileDev/nile-js/compare/v0.32.1...v0.32.2) (2022-11-23) - -**Note:** Version bump only for package @theniledev/examples - -## [0.32.1](https://github.com/TheNileDev/nile-js/compare/v0.32.0...v0.32.1) (2022-11-23) - -**Note:** Version bump only for package @theniledev/examples - -# [0.32.0](https://github.com/TheNileDev/nile-js/compare/v0.31.0...v0.32.0) (2022-11-22) - -**Note:** Version bump only for package @theniledev/examples - -# [0.31.0](https://github.com/TheNileDev/nile-js/compare/v0.30.2...v0.31.0) (2022-11-18) - -**Note:** Version bump only for package @theniledev/examples - -## [0.30.2](https://github.com/TheNileDev/nile-js/compare/v0.30.1...v0.30.2) (2022-11-08) - -**Note:** Version bump only for package @theniledev/examples - -## [0.30.1](https://github.com/TheNileDev/nile-js/compare/v0.30.0...v0.30.1) (2022-11-04) - -**Note:** Version bump only for package @theniledev/examples - -# [0.30.0](https://github.com/TheNileDev/nile-js/compare/v0.29.0...v0.30.0) (2022-11-04) - -**Note:** Version bump only for package @theniledev/examples - -# [0.29.0](https://github.com/TheNileDev/nile-js/compare/v0.28.2...v0.29.0) (2022-11-02) - -**Note:** Version bump only for package @theniledev/examples - -## [0.28.2](https://github.com/TheNileDev/nile-js/compare/v0.28.1...v0.28.2) (2022-10-27) - -**Note:** Version bump only for package @theniledev/examples - -## [0.28.1](https://github.com/TheNileDev/nile-js/compare/v0.28.0...v0.28.1) (2022-10-27) - -**Note:** Version bump only for package @theniledev/examples - -# [0.28.0](https://github.com/TheNileDev/nile-js/compare/v0.27.2...v0.28.0) (2022-10-27) - -**Note:** Version bump only for package @theniledev/examples - -## [0.27.2](https://github.com/TheNileDev/nile-js/compare/v0.27.1...v0.27.2) (2022-10-25) - -**Note:** Version bump only for package @theniledev/examples - -## [0.27.1](https://github.com/TheNileDev/nile-js/compare/v0.27.0...v0.27.1) (2022-10-24) - -**Note:** Version bump only for package @theniledev/examples - -# [0.27.0](https://github.com/TheNileDev/nile-js/compare/v0.26.0...v0.27.0) (2022-10-19) - -**Note:** Version bump only for package @theniledev/examples - -# [0.26.0](https://github.com/TheNileDev/nile-js/compare/v0.25.2...v0.26.0) (2022-10-12) - -### Features - -- **react:** accept a whole react-query provider, remove re-exports ([c10acd6](https://github.com/TheNileDev/nile-js/commit/c10acd660e87048ac40ef7de948eee35d9f68829)) - -## [0.25.2](https://github.com/TheNileDev/nile-js/compare/v0.25.1...v0.25.2) (2022-10-11) - -**Note:** Version bump only for package @theniledev/examples - -## [0.25.1](https://github.com/TheNileDev/nile-js/compare/v0.25.0...v0.25.1) (2022-10-11) - -**Note:** Version bump only for package @theniledev/examples - -# [0.25.0](https://github.com/TheNileDev/nile-js/compare/v0.24.0...v0.25.0) (2022-10-06) - -**Note:** Version bump only for package @theniledev/examples - -# [0.24.0](https://github.com/TheNileDev/nile-js/compare/v0.23.0...v0.24.0) (2022-09-30) - -**Note:** Version bump only for package @theniledev/examples - -# [0.23.0](https://github.com/TheNileDev/nile-js/compare/v0.22.3...v0.23.0) (2022-09-28) - -**Note:** Version bump only for package @theniledev/examples - -## [0.22.3](https://github.com/TheNileDev/nile-js/compare/v0.22.2...v0.22.3) (2022-09-26) - -**Note:** Version bump only for package @theniledev/examples - -## [0.22.2](https://github.com/TheNileDev/nile-js/compare/v0.22.1...v0.22.2) (2022-09-26) - -**Note:** Version bump only for package @theniledev/examples - -## [0.22.1](https://github.com/TheNileDev/nile-js/compare/v0.22.0...v0.22.1) (2022-09-23) - -**Note:** Version bump only for package @theniledev/examples - -# [0.22.0](https://github.com/TheNileDev/nile-js/compare/v0.21.0...v0.22.0) (2022-09-22) - -**Note:** Version bump only for package @theniledev/examples - -# [0.21.0](https://github.com/TheNileDev/nile-js/compare/v0.20.2...v0.21.0) (2022-09-21) - -**Note:** Version bump only for package @theniledev/examples - -## [0.20.2](https://github.com/TheNileDev/nile-js/compare/v0.20.1...v0.20.2) (2022-09-19) - -**Note:** Version bump only for package @theniledev/examples - -## [0.20.1](https://github.com/TheNileDev/nile-js/compare/v0.20.0...v0.20.1) (2022-09-16) - -**Note:** Version bump only for package @theniledev/examples - -# [0.20.0](https://github.com/TheNileDev/nile-js/compare/v0.19.1...v0.20.0) (2022-09-16) - -### Features - -- update deps ([a76df31](https://github.com/TheNileDev/nile-js/commit/a76df317687977f667f84bb0affd03d0cc6edd18)) - -## [0.19.1](https://github.com/TheNileDev/nile-js/compare/v0.19.0...v0.19.1) (2022-09-12) - -**Note:** Version bump only for package @theniledev/examples - -# [0.19.0](https://github.com/TheNileDev/nile-js/compare/v0.18.0...v0.19.0) (2022-09-12) - -### Bug Fixes - -- import useQuery from nile ([f18ad9a](https://github.com/TheNileDev/nile-js/commit/f18ad9a37ffc99967c76db1c4976cd2ff7815adb)) - -# [0.18.0](https://github.com/TheNileDev/nile-js/compare/v0.17.1...v0.18.0) (2022-09-06) - -**Note:** Version bump only for package @theniledev/examples - -## [0.17.1](https://github.com/TheNileDev/nile-js/compare/v0.17.0...v0.17.1) (2022-09-01) - -**Note:** Version bump only for package @theniledev/examples - -# [0.17.0](https://github.com/TheNileDev/nile-js/compare/v0.16.3...v0.17.0) (2022-08-30) - -**Note:** Version bump only for package @theniledev/examples - -## [0.16.3](https://github.com/TheNileDev/nile-js/compare/v0.16.2...v0.16.3) (2022-08-25) - -**Note:** Version bump only for package @theniledev/examples - -## [0.16.2](https://github.com/TheNileDev/nile-js/compare/v0.16.1...v0.16.2) (2022-08-25) - -**Note:** Version bump only for package @theniledev/examples - -## [0.16.1](https://github.com/TheNileDev/nile-js/compare/v0.16.0...v0.16.1) (2022-08-18) - -**Note:** Version bump only for package @theniledev/examples - -# [0.16.0](https://github.com/TheNileDev/nile-js/compare/v0.15.0...v0.16.0) (2022-08-18) - -**Note:** Version bump only for package @theniledev/examples - -# [0.15.0](https://github.com/TheNileDev/nile-js/compare/v0.14.2...v0.15.0) (2022-08-17) - -**Note:** Version bump only for package @theniledev/examples - -## [0.14.2](https://github.com/TheNileDev/nile-js/compare/v0.14.1...v0.14.2) (2022-08-17) - -**Note:** Version bump only for package @theniledev/examples - -## [0.14.1](https://github.com/TheNileDev/nile-js/compare/v0.14.0...v0.14.1) (2022-08-17) - -**Note:** Version bump only for package @theniledev/examples - -# [0.14.0](https://github.com/TheNileDev/nile-js/compare/v0.13.1...v0.14.0) (2022-08-16) - -### Features - -- **react:** have opinions about libs, upgrade to use them ([498af4e](https://github.com/TheNileDev/nile-js/commit/498af4e80b0dc880488c14aa89062acd5cac652d)) - -## [0.13.1](https://github.com/TheNileDev/nile-js/compare/v0.13.0...v0.13.1) (2022-08-02) - -**Note:** Version bump only for package @theniledev/examples - -# [0.13.0](https://github.com/TheNileDev/nile-js/compare/v0.12.7...v0.13.0) (2022-07-22) - -**Note:** Version bump only for package @theniledev/examples - -## [0.12.7](https://github.com/TheNileDev/nile-js/compare/v0.12.6...v0.12.7) (2022-07-19) - -### Bug Fixes - -- update demo to use strings ([5898a4c](https://github.com/TheNileDev/nile-js/commit/5898a4ccc506432622ae9f2ced9c2344f4b8713d)) - -## [0.12.6](https://github.com/TheNileDev/nile-js/compare/v0.12.5...v0.12.6) (2022-07-14) - -**Note:** Version bump only for package @theniledev/examples - -## [0.12.5](https://github.com/TheNileDev/nile-js/compare/v0.12.4...v0.12.5) (2022-06-14) - -**Note:** Version bump only for package @theniledev/examples - -## [0.12.4](https://github.com/TheNileDev/nile-js/compare/v0.12.3...v0.12.4) (2022-06-14) - -**Note:** Version bump only for package @theniledev/examples - -## [0.12.3](https://github.com/TheNileDev/nile-js/compare/v0.12.2...v0.12.3) (2022-06-14) - -**Note:** Version bump only for package @theniledev/examples - -## [0.12.2](https://github.com/TheNileDev/nile-js/compare/v0.12.1...v0.12.2) (2022-06-07) - -**Note:** Version bump only for package @theniledev/examples - -## [0.12.1](https://github.com/TheNileDev/nile-js/compare/v0.12.0...v0.12.1) (2022-05-31) - -**Note:** Version bump only for package @theniledev/examples - -# [0.12.0](https://github.com/TheNileDev/nile-js/compare/v0.11.1...v0.12.0) (2022-05-31) - -- feat!: add support for workspaces ([8818bab](https://github.com/TheNileDev/nile-js/commit/8818babcdbb58d0e52e826fdfbdebda002bb9e88)) - -### BREAKING CHANGES - -- workspaces are a whole different structure and spec. - -## [0.11.1](https://github.com/TheNileDev/nile-js/compare/v0.11.0...v0.11.1) (2022-05-19) - -### Bug Fixes - -- show errors from the API, add better examples ([fec034f](https://github.com/TheNileDev/nile-js/commit/fec034f427d0712c3c1be5a34602e305180c041c)) - -# [0.11.0](https://github.com/TheNileDev/nile-js/compare/v0.10.1...v0.11.0) (2022-05-12) - -### Features - -- remove useFetch, implement react-query ([26cc6d4](https://github.com/TheNileDev/nile-js/commit/26cc6d4014aa831bf5781bc281636986c1344bc3)) - -## [0.10.1](https://github.com/TheNileDev/nile-js/compare/v0.10.0...v0.10.1) (2022-05-11) - -**Note:** Version bump only for package @theniledev/examples - -# [0.10.0](https://github.com/TheNileDev/nile-js/compare/v0.9.0...v0.10.0) (2022-05-11) - -### Features - -- add useNileFetch hook ([471a0e9](https://github.com/TheNileDev/nile-js/commit/471a0e9c9055015b531f797ce99bbd31972c1d32)) - -### BREAKING CHANGES - -- changed sdk interface, added \*Raw functions and cancellation - -# [0.9.0](https://github.com/TheNileDev/nile-js/compare/v0.8.0...v0.9.0) (2022-05-02) - -### Bug Fixes - -- **examples:** add typescript defs ([de1e89f](https://github.com/TheNileDev/nile-js/commit/de1e89fe0ebda5ddb41e9d5d5e2cfe2b0837f43b)) -- types in example, remove unused lint ([9f082f7](https://github.com/TheNileDev/nile-js/commit/9f082f728690eb4693437c5045d77d7eb2b7631e)) - -# [0.8.0](https://github.com/TheNileDev/nile-js/compare/v0.7.3...v0.8.0) (2022-04-26) - -**Note:** Version bump only for package @theniledev/examples - -## [0.7.3](https://github.com/TheNileDev/nile-js/compare/v0.7.2...v0.7.3) (2022-04-12) - -**Note:** Version bump only for package @theniledev/examples - -## [0.7.2](https://github.com/TheNileDev/nile-js/compare/v0.7.1...v0.7.2) (2022-04-12) - -**Note:** Version bump only for package @theniledev/examples - -## [0.7.1](https://github.com/TheNileDev/nile-js/compare/v0.7.0...v0.7.1) (2022-04-12) - -**Note:** Version bump only for package @theniledev/examples - -# [0.7.0](https://github.com/TheNileDev/nile-js/compare/v0.6.1...v0.7.0) (2022-04-11) - -**Note:** Version bump only for package @theniledev/examples - -## [0.6.1](https://github.com/TheNileDev/nile-js/compare/v0.6.0...v0.6.1) (2022-04-08) - -**Note:** Version bump only for package @theniledev/examples - -# [0.6.0](https://github.com/TheNileDev/nile-js/compare/v0.5.5...v0.6.0) (2022-04-07) - -### Bug Fixes - -- cleanup examples from old api ([4ba0d0d](https://github.com/TheNileDev/nile-js/commit/4ba0d0d7f46e60c3fad8c85bc4031a570b0b7d41)) - -### Features - -- add invites ([c948a3e](https://github.com/TheNileDev/nile-js/commit/c948a3eacbdb9b4d30d43726282680f7767b7663)) - -## [0.5.5](https://github.com/TheNileDev/nile-js/compare/v0.5.4...v0.5.5) (2022-04-07) - -**Note:** Version bump only for package @theniledev/examples - -### Bug Fixes - -- cleanup examples from old api ([4ba0d0d](https://github.com/TheNileDev/nile-js/commit/4ba0d0d7f46e60c3fad8c85bc4031a570b0b7d41)) - -### Features - -- add invites ([c948a3e](https://github.com/TheNileDev/nile-js/commit/c948a3eacbdb9b4d30d43726282680f7767b7663)) - -## [0.5.5](https://github.com/TheNileDev/nile-js/compare/v0.5.4...v0.5.5) (2022-04-07) - -**Note:** Version bump only for package @theniledev/examples - -## [0.5.4](https://github.com/TheNileDev/nile-js/compare/v0.5.3...v0.5.4) (2022-04-07) - -**Note:** Version bump only for package @theniledev/examples - -## [0.5.3](https://github.com/TheNileDev/nile-js/compare/v0.5.2...v0.5.3) (2022-04-07) - -**Note:** Version bump only for package @theniledev/examples - -## [0.5.2](https://github.com/TheNileDev/nile-js/compare/v0.5.1...v0.5.2) (2022-04-07) - -**Note:** Version bump only for package @theniledev/examples - -## [0.5.1](https://github.com/TheNileDev/nile-js/compare/v0.5.0...v0.5.1) (2022-04-07) - -**Note:** Version bump only for package @theniledev/examples - -# [0.5.0](https://github.com/TheNileDev/nile-js/compare/v0.4.0...v0.5.0) (2022-04-07) - -### Bug Fixes - -- request data from generated files correctly ([2c7be86](https://github.com/TheNileDev/nile-js/commit/2c7be86b2fbab45f26d61fd7596460f0600c4cc0)) - -### Features - -- add autogenerated openapi spec ([17c2557](https://github.com/TheNileDev/nile-js/commit/17c2557040f4b00648d934610f1c2cb3d1f3e240)) - -# [0.4.0](https://github.com/TheNileDev/nile-js/compare/v0.3.1...v0.4.0) (2022-03-30) - -**Note:** Version bump only for package @theniledev/examples - -## [0.3.1](https://github.com/TheNileDev/nile-js/compare/v0.3.0...v0.3.1) (2022-03-29) - -**Note:** Version bump only for package @theniledev/examples - -# 0.3.0 (2022-03-29) - -### Bug Fixes - -- export types, better docs ([161ff49](https://github.com/TheNileDev/nile-js/commit/161ff495f889e1d91e02f1c32be0f21fb5255b52)) - -### Features - -- **react:** add SignUpForm and LoginForm ([04f730d](https://github.com/TheNileDev/nile-js/commit/04f730daa35909296cfc6a470237b5d1c1ab2f80)) - -## [0.2.2](https://github.com/TheNileDev/nile-js/compare/v0.2.1...v0.2.2) (2022-03-29) - -**Note:** Version bump only for package @theniledev/examples - -## [0.2.1](https://github.com/TheNileDev/nile-js/compare/v0.2.0...v0.2.1) (2022-03-29) - -### Bug Fixes - -- export types, better docs ([161ff49](https://github.com/TheNileDev/nile-js/commit/161ff495f889e1d91e02f1c32be0f21fb5255b52)) - -# [0.2.0](https://github.com/TheNileDev/nile-js/compare/v0.1.1...v0.2.0) (2022-03-28) - -### Features - -- **react:** add SignUpForm and LoginForm ([04f730d](https://github.com/TheNileDev/nile-js/commit/04f730daa35909296cfc6a470237b5d1c1ab2f80)) - -## [0.1.1](https://github.com/TheNileDev/nile-js/compare/v0.1.0...v0.1.1) (2022-03-24) - -### Bug Fixes - -- packaging of multiple packages ([cb8b85f](https://github.com/TheNileDev/nile-js/commit/cb8b85f6354afc084087930899662469040c22e3)) - -# 0.1.0 (2022-03-24) - -### Features - -- add create and read to lib, placeholder UI ([a0f9051](https://github.com/TheNileDev/nile-js/commit/a0f90510e142b0b41881b7906837089f7cc6ffea)) -- **dashboard:** add editor, it does nothing ([6769540](https://github.com/TheNileDev/nile-js/commit/676954058acb3ad0771b91d4bed8151e962dd995)) -- **nile-js:** add delete ([fd41d68](https://github.com/TheNileDev/nile-js/commit/fd41d68a663c4e778deae3c6d636af12a04a54a6)) -- **nile-js:** add update ([1e8985a](https://github.com/TheNileDev/nile-js/commit/1e8985adb36882bbc7b038af601118c76fb9c3e7)) - -## 0.0.1 (2022-03-23) - -**Note:** Version bump only for package @theniledev/dashboard diff --git a/packages/examples/README.md b/packages/examples/README.md deleted file mode 100644 index 5e35cf32..00000000 --- a/packages/examples/README.md +++ /dev/null @@ -1,62 +0,0 @@ -# @theniledev/examples - -# @theniledev/examples - -A sandbox app for testing out the react sdk and client libraries. Feel free to use this as a starting point for your own projects. - -This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). - -## pages/signin - -Renders `import { LoginForm } from @theniledev/react` and redirects to the `/users` endpoint, or a `redirect` query parameter, if provided. - -## pages/signup - -Renders `import { SignUpForm } from @theniledev/react` and alerts that a user has signed up. - -## pages/org - -Shows all orgs. -Renders a bespoke sign in form that submits directly to the nile api, then requests a list of users and displays them once returned. - -## pages/users - -Renders invite logic. Requests a list of users, and shows the current user's invite code. Allows the current user to submit an invite code so they can be added to a different users organization. Displays a list of users that have been invited to the current user's organization. Also has a convinience method for signin out for easy testing. - -## Getting Started - -In the **root directory**, build the dependencies of this package. This will output files that will be picked up by the development server. If any modifications are made to `@theniledev/js` or `@theniledev/react`, this command will need re-rerun. -TODO: fix this. nile developers will not feel this pain... but employees will. - -```bash -yarn build -``` - -Within this directory, start the development server - -```bash -npm run dev -# or -yarn dev -``` - -Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. - -You can start editing the page by modifying `pages/index.tsx`. The page auto-updates as you edit the file. - -[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.ts`. - -The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages. - -## Learn More - -To learn more about Next.js, take a look at the following resources: - -- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. -- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. - -You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome! - -## Deploy on Vercel - -This application is deployed on vercel. To see the current running application, without API integration, go to [TODO]() diff --git a/packages/examples/components/Button.tsx b/packages/examples/components/Button.tsx deleted file mode 100644 index ad9f0f8e..00000000 --- a/packages/examples/components/Button.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react'; - -type ButtonProps = { - type?: 'button' | 'submit' | 'reset'; - children: string; - onClick?: () => void; - node: React.ReactNode; -}; - -export function Button(props: ButtonProps) { - const { node, type, children, onClick } = props; - if (React.isValidElement(node)) { - const props = { onClick }; - return React.cloneElement(node, props); - } - return ( - - ); -} diff --git a/packages/examples/components/ComponentList.tsx b/packages/examples/components/ComponentList.tsx deleted file mode 100644 index 5be7e6d3..00000000 --- a/packages/examples/components/ComponentList.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import React from 'react'; -import Link from 'next/link'; - -import styles from '../styles/Home.module.css'; - -import { Button } from './Button'; - -export function ComponentList() { - return ( -
-
- - - - - -
-
- - - - - -
-
- - - - - -
-
- - - - - -
-
- ); -} diff --git a/packages/examples/components/UserTable.tsx b/packages/examples/components/UserTable.tsx deleted file mode 100644 index 6531cf2a..00000000 --- a/packages/examples/components/UserTable.tsx +++ /dev/null @@ -1,31 +0,0 @@ -import React from 'react'; -import { useQuery } from '@tanstack/react-query'; -import { useNile } from '@theniledev/react'; - -export function UserTable() { - const nile = useNile(); - - const { - isLoading, - isError, - error, - data: users = [], - } = useQuery(['nileUsers'], () => nile.users.listUsers()); - - if (isLoading) { - return
Loading...
; - } - - if (isError && error instanceof Error) { - return
{error.message}
; - } - - return ( - <> -

Users

- {users.map((user) => { - return
{user.email}
; - })} - - ); -} diff --git a/packages/examples/next-env.d.ts b/packages/examples/next-env.d.ts deleted file mode 100644 index 4f11a03d..00000000 --- a/packages/examples/next-env.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// -/// - -// NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/packages/examples/next.config.js b/packages/examples/next.config.js deleted file mode 100644 index 593529c4..00000000 --- a/packages/examples/next.config.js +++ /dev/null @@ -1,19 +0,0 @@ -/** @type {import('next').NextConfig} */ -// eslint-disable-next-line @typescript-eslint/no-var-requires -const path = require('path'); - -const nextConfig = { - reactStrictMode: true, - webpack: (config, options) => { - if (options.isServer) { - config.externals = ['@tanstack/react-query', ...config.externals]; - } - - const reactQuery = path.resolve(require.resolve('@tanstack/react-query')); - - config.resolve.alias['@tanstack/react-query'] = reactQuery; - return config; - }, -}; - -module.exports = nextConfig; diff --git a/packages/examples/package.json b/packages/examples/package.json deleted file mode 100644 index 5e915f24..00000000 --- a/packages/examples/package.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "@theniledev/examples", - "license": "MIT", - "private": true, - "version": "0.35.5", - "scripts": { - "dev": "next dev", - "build": "next build", - "start": "next start", - "export": "next export" - }, - "peerDependencies": { - "@tanstack/react-query": "^4.14.1", - "@theniledev/js": "^0.34.1", - "@theniledev/react": "^0.34.1", - "react": "^18.2.0", - "react-dom": "^18.2.0" - }, - "dependencies": { - "@codemirror/autocomplete": "^6.4.0", - "@codemirror/lang-javascript": "^6.1.2", - "@codemirror/language": "^6.4.0", - "@codemirror/lint": "^6.1.0", - "@codemirror/search": "^6.2.3", - "@codemirror/state": "^6.2.0", - "@codemirror/theme-one-dark": "^6.1.0", - "@codemirror/view": "^6.7.3", - "@lezer/common": "^1.0.2", - "@uiw/react-codemirror": "^4.19.7", - "codemirror": "^6.0.1", - "next": "^13.1.5", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-hook-form": "^7.42.1", - "url-parse": "^1.5.10" - }, - "devDependencies": { - "@babel/runtime": "^7.20.13", - "@types/node": "^18.11.18", - "@types/react": "^18.0.27", - "typescript": "^4.9.4" - }, - "repository": { - "type": "git", - "url": "https://github.com/TheNileDev/nile-js.git", - "directory": "packages/examples" - }, - "publishConfig": { - "registry": "https://npm.pkg.github.com/" - } -} diff --git a/packages/examples/pages/_app.tsx b/packages/examples/pages/_app.tsx deleted file mode 100644 index a8fa6f54..00000000 --- a/packages/examples/pages/_app.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -import '../styles/globals.css'; -import type { AppProps } from 'next/app'; -import { NileProvider } from '@theniledev/react'; -import { StorageOptions } from '@theniledev/js'; - -function MyApp({ Component, pageProps }: AppProps) { - return ( - - - - ); -} - -export default MyApp; diff --git a/packages/examples/pages/api/hello.ts b/packages/examples/pages/api/hello.ts deleted file mode 100644 index 89e4d6bd..00000000 --- a/packages/examples/pages/api/hello.ts +++ /dev/null @@ -1,13 +0,0 @@ -// Next.js API route support: https://nextjs.org/docs/api-routes/introduction -import type { NextApiRequest, NextApiResponse } from 'next'; - -type Data = { - name: string; -}; - -export default function handler( - req: NextApiRequest, - res: NextApiResponse -) { - res.status(200).json({ name: 'John Doe' }); -} diff --git a/packages/examples/pages/index.tsx b/packages/examples/pages/index.tsx deleted file mode 100644 index 80a62852..00000000 --- a/packages/examples/pages/index.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import React from 'react'; -import type { NextPage } from 'next'; -import Head from 'next/head'; - -import styles from '../styles/Home.module.css'; -import { ComponentList } from '../components/ComponentList'; - -const Home: NextPage = () => { - return ( -
- - nile js testing - - - - -
-

Components

- -
- - -
- ); -}; - -export default Home; diff --git a/packages/examples/pages/org.tsx b/packages/examples/pages/org.tsx deleted file mode 100644 index a6cb86dd..00000000 --- a/packages/examples/pages/org.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import React from 'react'; -import { useNile, LoginForm } from '@theniledev/react'; -import { useQuery } from '@tanstack/react-query'; - -import { ComponentList } from '../components/ComponentList'; - -const Orgs = React.memo(() => { - const nile = useNile(); - const { isLoading, data: orgs } = useQuery(['organizations'], () => - nile.organizations.listOrganizations() - ); - return ( - <> -
- {isLoading ? ( - Loading... - ) : ( - <> -

🤩 InstaExpense 🤩

- 
{JSON.stringify(orgs, null, 2)}
- - )} -
- - - ); -}); - -Orgs.displayName = 'orgs'; - -function Org() { - const [success, setSuccess] = React.useState(false); - - if (success) { - return ; - } - - return ( - <> -

🤩 InstaExpense 🤩

- { - setSuccess(true); - }} - /> - - - ); -} - -export default Org; diff --git a/packages/examples/pages/signin.tsx b/packages/examples/pages/signin.tsx deleted file mode 100644 index 375d0b18..00000000 --- a/packages/examples/pages/signin.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import React from 'react'; -import { useRouter } from 'next/router'; -import { LoginForm } from '@theniledev/react'; - -import { ComponentList } from '../components/ComponentList'; - -function SignIn() { - const router = useRouter(); - const { redirect } = router.query; - - return ( - <> -

🤩 InstaExpense 🤩

-

Sign in

- { - if (redirect) { - router.push(`/${redirect}`); - } else { - router.push('/users'); - } - }} - /> - - - ); -} - -export default SignIn; diff --git a/packages/examples/pages/signup.tsx b/packages/examples/pages/signup.tsx deleted file mode 100644 index 9c82a54a..00000000 --- a/packages/examples/pages/signup.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react'; -import { SignUpForm } from '@theniledev/react'; - -import { ComponentList } from '../components/ComponentList'; - -function Signup() { - return ( - <> -

🤩 InstaExpense 🤩

-

Sign up

- { - alert('user signed up!'); - }} - /> - - - ); -} - -export default Signup; diff --git a/packages/examples/pages/users.tsx b/packages/examples/pages/users.tsx deleted file mode 100644 index 4767afa2..00000000 --- a/packages/examples/pages/users.tsx +++ /dev/null @@ -1,86 +0,0 @@ -import React, { useCallback, useState } from 'react'; -import { useRouter } from 'next/router'; -import { Invite, Organization } from '@theniledev/js'; -import { useNile } from '@theniledev/react'; -import { useQuery } from '@tanstack/react-query'; - -import { UserTable } from '../components/UserTable'; - -const useOrgQuery = () => { - const nile = useNile(); - const { isLoading: userLoading, data: user } = useQuery(['me'], () => - nile.users.me() - ); - - const { isLoading: orgLoading, data: orgs } = useQuery( - ['organizations'], - () => nile.organizations.listOrganizations() - ); - const currentUserEmail = user?.email; - - const orgId = React.useMemo(() => { - const org = orgs?.filter( - (org: Organization) => org.name === currentUserEmail - ); - const [{ id }] = - orgs && orgs?.length > 0 ? (org as Organization[]) : [{ id: '' }]; - return id; - }, [currentUserEmail, orgs]); - return [userLoading || orgLoading, orgId]; -}; - -function SignIn() { - const nile = useNile(); - const [joinCode, setJoinCode] = useState(''); - const router = useRouter(); - const [loadingOrgId, orgId] = useOrgQuery(); - - const { isLoading: invitesLoading, data: invites = [] } = useQuery( - ['invites'], - () => nile.organizations.listInvites({ org: String(orgId) }), - { enabled: !!orgId } - ); - - const handleLogout = useCallback(() => { - nile.authToken = ''; - router.push('/signin'); - }, [nile, router]); - - const submitInvite = useCallback(async () => { - await nile.organizations.acceptInvite({ - code: joinCode, - org: String(orgId), - }); - }, [joinCode, nile, orgId]); - - const isLoading = loadingOrgId || invitesLoading; - - if (isLoading) { - return <>Loading...; - } - - return ( - <> -

🤩 InstaExpense 🤩

-

Sign in

- - - setJoinCode(e.target.value)} - /> - - {invites?.map(({ inviter, status, code }: Invite, idx: number) => { - return ( -
- {`Invite ${inviter} status ${status} code ${code}`} -
- ); - })} - - ); -} - -export default SignIn; diff --git a/packages/examples/pages/workspaces.tsx b/packages/examples/pages/workspaces.tsx deleted file mode 100644 index 5024109e..00000000 --- a/packages/examples/pages/workspaces.tsx +++ /dev/null @@ -1,97 +0,0 @@ -import React, { useState } from 'react'; -import { useNile } from '@theniledev/react'; -import { LoginInfo, User } from '@theniledev/js'; -import { useForm } from 'react-hook-form'; -import { useQuery } from '@tanstack/react-query'; - -import { ComponentList } from '../components/ComponentList'; - -function DeveloperLoginForm(props: { setShowForm: (show: boolean) => void }) { - const nile = useNile(); - const { setShowForm } = props; - const { register, handleSubmit } = useForm(); - const onSubmitCreate = React.useCallback( - async (loginInfo: LoginInfo) => { - await nile.developers.createDeveloper({ createUserRequest: loginInfo }); - setShowForm(false); - }, - [nile, setShowForm] - ); - const onSubmitLogin = React.useCallback( - async (loginInfo: LoginInfo) => { - await nile.developers.loginDeveloper({ loginInfo }); - setShowForm(false); - }, - [nile, setShowForm] - ); - - return ( - <> -

Developer create

-
onSubmitCreate(data as LoginInfo))} - > - - - -
-

Developer login

-
onSubmitLogin(data as LoginInfo))}> - - - -
- - ); -} - -function Workspaces() { - const nile = useNile(); - const { isLoading, data: user } = useQuery( - ['me'], - () => nile.users.me() - ); - - if (isLoading) { - return <>Loading...; - } - if (!user) { - return <>You are not logged in; - } - - return ( - <> -

Welcome to Nile, {user.email}

- Your workspace id is {user.id} - - - ); -} - -function WorkspacePage() { - const nile = useNile(); - const [showForm, setShowForm] = useState(!nile.authToken); - - if (showForm) { - return ; - } - return ; -} - -export default WorkspacePage; diff --git a/packages/examples/public/.nojekyll b/packages/examples/public/.nojekyll deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/examples/public/favicon.ico b/packages/examples/public/favicon.ico deleted file mode 100644 index 718d6fea..00000000 Binary files a/packages/examples/public/favicon.ico and /dev/null differ diff --git a/packages/examples/public/vercel.svg b/packages/examples/public/vercel.svg deleted file mode 100644 index fbf0e25a..00000000 --- a/packages/examples/public/vercel.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/examples/styles/Home.module.css b/packages/examples/styles/Home.module.css deleted file mode 100644 index d1266655..00000000 --- a/packages/examples/styles/Home.module.css +++ /dev/null @@ -1,115 +0,0 @@ -.container { - padding: 0 2rem; -} - -.main { - min-height: 100vh; - padding: 4rem 0; - flex: 1; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; -} - -.footer { - display: flex; - flex: 1; - padding: 2rem 0; - border-top: 1px solid #eaeaea; - justify-content: center; - align-items: center; -} - -.footer a { - display: flex; - justify-content: center; - align-items: center; - flex-grow: 1; -} - -.title a { - color: #0070f3; - text-decoration: none; -} - -.title a:hover, -.title a:focus, -.title a:active { - text-decoration: underline; -} - -.title { - margin: 0; - line-height: 1.15; - font-size: 4rem; -} - -.title, -.description { - text-align: center; -} - -.description { - margin: 4rem 0; - line-height: 1.5; - font-size: 1.5rem; -} - -.code { - background: #fafafa; - border-radius: 5px; - padding: 0.75rem; - font-size: 1.1rem; - font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, - Bitstream Vera Sans Mono, Courier New, monospace; -} - -.grid { - display: flex; - align-items: center; - justify-content: center; - flex-wrap: wrap; -} - -.card { - margin: 1rem; - padding: 1.5rem; - text-align: left; - color: inherit; - text-decoration: none; - border: 1px solid #eaeaea; - border-radius: 10px; - transition: color 0.15s ease, border-color 0.15s ease; - max-width: 300px; -} - -.card:hover, -.card:focus, -.card:active { - color: #0070f3; - border-color: #0070f3; -} - -.card h2 { - margin: 0 0 1rem 0; - font-size: 1.5rem; -} - -.card p { - margin: 0; - font-size: 1.25rem; - line-height: 1.5; -} - -.logo { - height: 1em; - margin-left: 0.5rem; -} - -@media (max-width: 600px) { - .grid { - width: 100%; - flex-direction: column; - } -} diff --git a/packages/examples/styles/globals.css b/packages/examples/styles/globals.css deleted file mode 100644 index 425f9a1d..00000000 --- a/packages/examples/styles/globals.css +++ /dev/null @@ -1,55 +0,0 @@ -html, -body { - padding: 0; - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; -} - -a { - color: inherit; - text-decoration: none; -} - -* { - box-sizing: border-box; -} -input { - font-size: 16px; - padding: 8px; - font-size: 14px; - border: 1px solid #eee; - border-radius: 4px; -} -input:focus { - box-shadow: 0 2 #444; -} - -button { - font-size: 16px; - padding: 6px 12px; - border-radius: 4px; - border: 1px solid orangered; - background-color: pink; - color: purple; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.2); - cursor: pointer; - transition: all 0.2s; -} -button:hover { - background-color: palegoldenrod; -} - -form { - display: flex; - flex-direction: column; - max-width: 520px; - margin: 0 auto; - margin: 100px auto; - padding: 50px 100px 100px 100px; - box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.2); -} - -label { - min-width: 176px; -} diff --git a/packages/examples/tsconfig.json b/packages/examples/tsconfig.json deleted file mode 100644 index 8eaff6e9..00000000 --- a/packages/examples/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig", - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"] -} diff --git a/packages/react/.gitignore b/packages/react/.gitignore index d4de8fc0..d079706a 100644 --- a/packages/react/.gitignore +++ b/packages/react/.gitignore @@ -3,3 +3,4 @@ node_modules .cache dist +yarn.lock \ No newline at end of file diff --git a/packages/react/.storybook/main.js b/packages/react/.storybook/main.js index 3cd4728c..cf4c3c04 100644 --- a/packages/react/.storybook/main.js +++ b/packages/react/.storybook/main.js @@ -26,14 +26,12 @@ module.exports = { type: 'javascript/auto', }); - config.resolve.modules = [ - ...(config.resolve.modules || []), - path.resolve(__dirname, '../'), - ]; + config.resolve.modules = [...(config.resolve.modules || [])]; config.resolve.alias = { ...config.resolve.alias, - '~/lib': path.resolve(__dirname, '../lib'), + '@theniledev/react/*': path.resolve(__dirname, '../src/*'), + '@theniledev/react': path.resolve(__dirname, '../src/'), }; config.module.rules.push({ test: /\.css$/, diff --git a/packages/react/package.json b/packages/react/package.json index 0187b33c..d95110bd 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -2,8 +2,7 @@ "name": "@theniledev/react", "version": "0.35.5", "license": "MIT", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./src/index.ts", "files": [ "dist", "src" @@ -34,7 +33,6 @@ "trailingComma": "es5" }, "author": "jrea", - "module": "dist/react-lib.esm.js", "repository": { "type": "git", "url": "https://github.com/TheNileDev/nile-js.git", @@ -86,7 +84,7 @@ "@emotion/styled": "^11.10.5", "@mui/icons-material": "^5.11.0", "@mui/joy": "5.0.0-alpha.73", - "@mui/material": "5.11.6", + "@mui/material": "5.11.16", "@mui/x-data-grid": "^5.17.20", "@mui/x-date-pickers": "^5.0.15", "@tanstack/react-query": "^4.23.0", diff --git a/packages/react/src/context/themeJoiner.ts b/packages/react/src/context/themeJoiner.ts index f533c3dd..d2ec2754 100644 --- a/packages/react/src/context/themeJoiner.ts +++ b/packages/react/src/context/themeJoiner.ts @@ -1,108 +1,77 @@ -/** - * this should go away in the future when joy reaches parity with material - */ +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +//@ts-nocheck import { deepmerge } from '@mui/utils'; -import type {} from '@mui/material/themeCssVarsAugmentation'; -import { - experimental_extendTheme as extendMuiTheme, - TypeAction, - Overlays, - PaletteColorChannel, - PaletteAlert, - PaletteAppBar, - PaletteAvatar, - PaletteChip, - PaletteFilledInput, - PaletteLinearProgress, - PaletteSlider, - PaletteSkeleton, - PaletteSnackbarContent, - PaletteSpeedDialAction, - PaletteStepConnector, - PaletteStepContent, - PaletteSwitch, - PaletteTableCell, - PaletteTooltip, - Shadows, - ZIndex, -} from '@mui/material/styles'; -import { - extendTheme as extendJoyTheme, - Theme as JoyTheme, -} from '@mui/joy/styles'; - -// extends Joy theme to include tokens from Material UI -declare module '@mui/joy/styles' { - interface Palette { - secondary: PaletteColorChannel; - error: PaletteColorChannel; - dividerChannel: string; - action: TypeAction; - Alert: PaletteAlert; - AppBar: PaletteAppBar; - Avatar: PaletteAvatar; - Chip: PaletteChip; - FilledInput: PaletteFilledInput; - LinearProgress: PaletteLinearProgress; - Skeleton: PaletteSkeleton; - Slider: PaletteSlider; - SnackbarContent: PaletteSnackbarContent; - SpeedDialAction: PaletteSpeedDialAction; - StepConnector: PaletteStepConnector; - StepContent: PaletteStepContent; - Switch: PaletteSwitch; - TableCell: PaletteTableCell; - Tooltip: PaletteTooltip; - } - - interface ThemeVars { - // attach to Joy UI `theme.vars` - shadows: Shadows; - overlays: Overlays; - zIndex: ZIndex; - } -} - -declare module '@mui/material/styles' { - interface Theme { - // put everything back to Material UI `theme.vars` - vars: JoyTheme['vars']; - } -} - -const palette = { - primary: { main: '#6fe2ff' }, - secondary: { - main: '#ffb96a', - }, - neutral: { - main: '#d8d3ff', - dark: '#aea4fe', - contrastText: '#fff', - }, - background: { - paper: '#383742', - default: '#0f0f0e', - }, -}; +import { experimental_extendTheme as extendMuiTheme } from '@mui/material/styles'; +import colors from '@mui/joy/colors'; +import { extendTheme as extendJoyTheme } from '@mui/joy/styles'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -//@ts-ignore -export const muiTheme = extendMuiTheme({ +const { unstable_sxConfig: muiSxConfig, ...muiTheme } = extendMuiTheme({ + // This is required to point to `var(--joy-*)` because we are using + // `CssVarsProvider` from Joy UI. cssVarPrefix: 'joy', colorSchemes: { light: { - palette, + palette: { + primary: { + main: '#ffb96a', + }, + grey: colors.grey, + error: { + main: colors.red[500], + }, + info: { + main: colors.purple[500], + }, + success: { + main: colors.green[500], + }, + warning: { + main: colors.yellow[200], + }, + common: { + white: '#FFF', + black: '#09090D', + }, + divider: colors.grey[200], + text: { + primary: colors.grey[800], + secondary: colors.grey[600], + }, + }, }, dark: { - palette, + palette: { + primary: { + main: colors.blue[600], + }, + grey: colors.grey, + error: { + main: colors.red[600], + }, + info: { + main: colors.purple[600], + }, + success: { + main: colors.green[600], + }, + warning: { + main: colors.yellow[300], + }, + common: { + white: '#FFF', + black: '#09090D', + }, + divider: colors.grey[800], + text: { + primary: colors.grey[100], + secondary: colors.grey[300], + }, + }, }, }, }); -// remove things that break -// if the theme is being overridden, these need added to the custom theme -const joyTheme = extendJoyTheme({ +const { unstable_sxConfig: joySxConfig, ...joyTheme } = extendJoyTheme({ cssVarPrefix: 'joy', colorSchemes: { light: { @@ -146,6 +115,30 @@ const joyTheme = extendJoyTheme({ }, }); -const theme = deepmerge(muiTheme, joyTheme); +const mergedTheme = { + ...muiTheme, + ...joyTheme, + colorSchemes: deepmerge(muiTheme.colorSchemes, joyTheme.colorSchemes), + typography: { + ...muiTheme.typography, + ...joyTheme.typography, + }, +} as unknown as ReturnType; + +mergedTheme.generateCssVars = (colorScheme) => ({ + css: { + ...muiTheme.generateCssVars(colorScheme).css, + ...joyTheme.generateCssVars(colorScheme).css, + }, + vars: deepmerge( + muiTheme.generateCssVars(colorScheme).vars, + joyTheme.generateCssVars(colorScheme).vars + ), +}); + +mergedTheme.unstable_sxConfig = { + ...muiSxConfig, + ...joySxConfig, +}; -export default theme; +export default mergedTheme; diff --git a/packages/react/src/lib/utils/refresh.ts b/packages/react/src/lib/utils/refresh.ts index 21b098aa..b1196196 100644 --- a/packages/react/src/lib/utils/refresh.ts +++ b/packages/react/src/lib/utils/refresh.ts @@ -1,7 +1,7 @@ import { UpdateInterval } from '../../components/Metrics/types'; export const allowedUpdateInterval = (updateInterval: void | number) => { - if (updateInterval < UpdateInterval.ThirtySeconds) { + if (updateInterval != null && updateInterval < UpdateInterval.ThirtySeconds) { // eslint-disable-next-line no-console console.warn( 'Interval not used. The interval must be at least 30 seconds.' diff --git a/packages/react/stories/InstanceList.stories.tsx b/packages/react/stories/InstanceList.stories.tsx index 66512564..8ea27397 100644 --- a/packages/react/stories/InstanceList.stories.tsx +++ b/packages/react/stories/InstanceList.stories.tsx @@ -6,13 +6,16 @@ import { OrganizationTypeEnum, Organization, } from '@theniledev/js'; -import { Box, Button, Stack, Typography } from '@mui/joy'; import { GridRenderCellParams } from '@mui/x-data-grid'; -import { Add } from '@mui/icons-material'; import Card from '@mui/joy/Card'; +import Stack from '@mui/joy/Stack'; +import Typography from '@mui/joy/Typography'; +import Button from '@mui/joy/Button'; +import Add from '@mui/icons-material/Add'; +import Box from '@mui/joy/Box'; -import InstanceList from '../src/components/InstanceList/InstanceList'; import { NileProvider } from '../src/context'; +import InstanceList from '../src/components/InstanceList/InstanceList'; const entityData = { id: 'ent_02qdzM9QKiB7lzR3HZVVEv', @@ -53,6 +56,7 @@ const instances: Instance[] = [ created: new Date(), updated: new Date(), seq: 13, + org: 'somRog', type: 'clusters', properties: { status: 'provisioning', @@ -197,11 +201,7 @@ const ActionButtons = () => ( actionButtons={[