diff --git a/apps/embedded-catalog/.eslintrc.cjs b/apps/embedded-catalog/react/.eslintrc.cjs similarity index 100% rename from apps/embedded-catalog/.eslintrc.cjs rename to apps/embedded-catalog/react/.eslintrc.cjs diff --git a/apps/embedded-catalog/.gitignore b/apps/embedded-catalog/react/.gitignore similarity index 100% rename from apps/embedded-catalog/.gitignore rename to apps/embedded-catalog/react/.gitignore diff --git a/apps/embedded-catalog/README.md b/apps/embedded-catalog/react/README.md similarity index 100% rename from apps/embedded-catalog/README.md rename to apps/embedded-catalog/react/README.md diff --git a/apps/embedded-catalog/index.html b/apps/embedded-catalog/react/index.html similarity index 100% rename from apps/embedded-catalog/index.html rename to apps/embedded-catalog/react/index.html diff --git a/apps/embedded-catalog/package.json b/apps/embedded-catalog/react/package.json similarity index 82% rename from apps/embedded-catalog/package.json rename to apps/embedded-catalog/react/package.json index 5872abaa8..9bb1e5156 100644 --- a/apps/embedded-catalog/package.json +++ b/apps/embedded-catalog/react/package.json @@ -1,5 +1,5 @@ { - "name": "embedded-catalog", + "name": "react", "private": true, "version": "0.0.0", "type": "module", @@ -18,10 +18,13 @@ "@types/react-dom": "^18.2.17", "@typescript-eslint/eslint-plugin": "^6.14.0", "@typescript-eslint/parser": "^6.14.0", - "@vitejs/plugin-react": "^4.2.1", + "@vitejs/plugin-react-swc": "^3.5.0", + "autoprefixer": "^10.4.16", "eslint": "^8.55.0", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.5", + "postcss": "^8.4.31", + "tailwindcss": "^3.3.5", "typescript": "^5.2.2", "vite": "^5.0.8" } diff --git a/apps/embedded-catalog/react/postcss.config.js b/apps/embedded-catalog/react/postcss.config.js new file mode 100644 index 000000000..2e7af2b7f --- /dev/null +++ b/apps/embedded-catalog/react/postcss.config.js @@ -0,0 +1,6 @@ +export default { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +} diff --git a/apps/embedded-catalog/public/vite.svg b/apps/embedded-catalog/react/public/vite.svg similarity index 100% rename from apps/embedded-catalog/public/vite.svg rename to apps/embedded-catalog/react/public/vite.svg diff --git a/apps/embedded-catalog/src/App.css b/apps/embedded-catalog/react/src/App.css similarity index 100% rename from apps/embedded-catalog/src/App.css rename to apps/embedded-catalog/react/src/App.css diff --git a/apps/embedded-catalog/react/src/App.tsx b/apps/embedded-catalog/react/src/App.tsx new file mode 100644 index 000000000..8b4296a21 --- /dev/null +++ b/apps/embedded-catalog/react/src/App.tsx @@ -0,0 +1,17 @@ +import './App.css' + +function App() { + + return ( + <> +
+

+ Hello world! +

+
+ + + ) +} + +export default App diff --git a/apps/embedded-catalog/src/assets/react.svg b/apps/embedded-catalog/react/src/assets/react.svg similarity index 100% rename from apps/embedded-catalog/src/assets/react.svg rename to apps/embedded-catalog/react/src/assets/react.svg diff --git a/apps/embedded-catalog/src/index.css b/apps/embedded-catalog/react/src/index.css similarity index 95% rename from apps/embedded-catalog/src/index.css rename to apps/embedded-catalog/react/src/index.css index 6119ad9a8..e7d4bb2fe 100644 --- a/apps/embedded-catalog/src/index.css +++ b/apps/embedded-catalog/react/src/index.css @@ -1,3 +1,7 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + :root { font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; line-height: 1.5; diff --git a/apps/embedded-catalog/src/main.tsx b/apps/embedded-catalog/react/src/main.tsx similarity index 100% rename from apps/embedded-catalog/src/main.tsx rename to apps/embedded-catalog/react/src/main.tsx diff --git a/apps/embedded-catalog/src/vite-env.d.ts b/apps/embedded-catalog/react/src/vite-env.d.ts similarity index 100% rename from apps/embedded-catalog/src/vite-env.d.ts rename to apps/embedded-catalog/react/src/vite-env.d.ts diff --git a/apps/embedded-catalog/react/tailwind.config.js b/apps/embedded-catalog/react/tailwind.config.js new file mode 100644 index 000000000..d37737fc0 --- /dev/null +++ b/apps/embedded-catalog/react/tailwind.config.js @@ -0,0 +1,12 @@ +/** @type {import('tailwindcss').Config} */ +export default { + content: [ + "./index.html", + "./src/**/*.{js,ts,jsx,tsx}", + ], + theme: { + extend: {}, + }, + plugins: [], +} + diff --git a/apps/embedded-catalog/tsconfig.json b/apps/embedded-catalog/react/tsconfig.json similarity index 100% rename from apps/embedded-catalog/tsconfig.json rename to apps/embedded-catalog/react/tsconfig.json diff --git a/apps/embedded-catalog/tsconfig.node.json b/apps/embedded-catalog/react/tsconfig.node.json similarity index 100% rename from apps/embedded-catalog/tsconfig.node.json rename to apps/embedded-catalog/react/tsconfig.node.json diff --git a/apps/embedded-catalog/vite.config.ts b/apps/embedded-catalog/react/vite.config.ts similarity index 73% rename from apps/embedded-catalog/vite.config.ts rename to apps/embedded-catalog/react/vite.config.ts index 5a33944a9..861b04b35 100644 --- a/apps/embedded-catalog/vite.config.ts +++ b/apps/embedded-catalog/react/vite.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'vite' -import react from '@vitejs/plugin-react' +import react from '@vitejs/plugin-react-swc' // https://vitejs.dev/config/ export default defineConfig({ diff --git a/apps/embedded-catalog/src/App.tsx b/apps/embedded-catalog/src/App.tsx deleted file mode 100644 index afe48ac75..000000000 --- a/apps/embedded-catalog/src/App.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { useState } from 'react' -import reactLogo from './assets/react.svg' -import viteLogo from '/vite.svg' -import './App.css' - -function App() { - const [count, setCount] = useState(0) - - return ( - <> -
- - Vite logo - - - React logo - -
-

Vite + React

-
- -

- Edit src/App.tsx and save to test HMR -

-
-

- Click on the Vite and React logos to learn more -

- - ) -} - -export default App diff --git a/apps/webapp/src/components/connections/ConnectionTable.tsx b/apps/webapp/src/components/connections/ConnectionTable.tsx index aa7ee9319..c4deee0d2 100644 --- a/apps/webapp/src/components/connections/ConnectionTable.tsx +++ b/apps/webapp/src/components/connections/ConnectionTable.tsx @@ -79,7 +79,7 @@ export default function ConnectionTable() { - {isGenerated ? + {isGenerated ?