Merge pull request #55 from dqualizer/Remove-Typescript

typescript removed
dqualizer · Aug 14, 2023 · 99db7a8 · 99db7a8
2 parents 740f673 + 72aefff
commit 99db7a8
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 63 deletions.
diff --git a/index.html b/index.html
@@ -10,7 +10,7 @@
 
 <body>
   <div id="root"></div>
-  <script type="module" src="/src/main.tsx"></script>
+  <script type="module" src="/src/main.jsx"></script>
 </body>
 
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "@types/react-router-dom": "^5.3.3",
     "axios": "^1.4.0",
     "dagre": "^0.8.5",
+    "dotenv": "^16.3.1",
     "flowbite-react": "^0.4.11",
     "localforage": "^1.10.0",
     "match-sorter": "^6.3.1",
@@ -32,7 +33,6 @@
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.9",
-    "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
     "@vitejs/plugin-react": "^3.1.0",
     "autoprefixer": "^10.4.14",
@@ -41,7 +41,6 @@
     "source-map-loader": "^4.0.1",
     "tailwindcss": "^3.3.2",
     "ts-loader": "^9.4.4",
-    "typescript": "^5.1.6",
     "vite": "^4.2.0"
   }
 }
diff --git a/src/main.tsx → src/main.jsx b/src/main.tsx → src/main.jsx
@@ -1,20 +1,14 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
-import ReactTooltip from "react-tooltip";
+
 import App, { damLoader } from "./pages/App";
 import "./index.css";
 import { createBrowserRouter, RouterProvider } from "react-router-dom";
 import Home from "./pages/Home";
-import {
-  QueryClient,
-  QueryClientProvider,
-  useQuery,
-} from "@tanstack/react-query";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import DqEdit from "./pages/DqEdit";
-import { getDomainById } from "./queries/dam.js";
 import Domains from "./pages/Domains";
-import Contexts from "./pages/Contexts";
 import { Link } from "react-router-dom";
 import NewDomain from "./pages/NewDomain";
 import CreateBlankDomain from "./pages/CreateBlankDomain";
@@ -122,7 +116,7 @@ const router = createBrowserRouter([
   },
 ]);
 
-ReactDOM.createRoot(document.getElementById("root")!).render(
+ReactDOM.createRoot(document.getElementById("root")).render(
   <React.StrictMode>
     <QueryClientProvider client={queryClient}>
       <RouterProvider router={router} />

diff --git a/src/pages/App.tsx → src/pages/App.jsx b/src/pages/App.tsx → src/pages/App.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useMemo } from "react";
+import { useState, useRef, useMemo } from "react";
 import "reactflow/dist/style.css";
 import {
   Background,
@@ -14,12 +14,10 @@ import Sidebar from "../components/Sidebar";
 import IconNode from "../nodes/IconNode";
 import { createInitialElements } from "../utils/createInitialElements";
 import { getLayoutedElements } from "../utils/layoutElements";
-import { RouteObject, useLoaderData, useParams } from "react-router-dom";
+import { useLoaderData, useParams } from "react-router-dom";
 import { getAllRqas } from "../queries/rqa";
 import { getDamById } from "../queries/dam";
 
-import { AppLoaderProps } from "../interfaces/AppLoaderProps";
-import { ReactJSXIntrinsicAttributes } from "@emotion/react/types/jsx-namespace";
 import { string } from "prop-types";
 import loadtestSpecs from "../data/loadtest-specs.json";
 import { useQuery } from "@tanstack/react-query";

diff --git a/src/pages/Home.tsx → src/pages/Home.jsx b/src/pages/Home.tsx → src/pages/Home.jsx
@@ -1,7 +1,5 @@
 import dqLogo from "../assets/dqualizer_logo.png";
-
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-
 import { Link, useLoaderData } from "react-router-dom";
 import { getAllDams } from "../queries/dam";
 

diff --git a/src/queries/dam.js b/src/queries/dam.js
@@ -3,7 +3,6 @@ const backend = import.meta.env.VITE_BACKEND_URL;
 
 
 export const getAllDams = () => {
-    console.log(backend);
     return axios.get(`${backend}/dam/`)
         .then(res => res.data);
 }

diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/tsconfig.node.json b/tsconfig.node.json
diff --git a/vite.config.js b/vite.config.js
@@ -0,0 +1,12 @@
+import dotenv from 'dotenv';
+dotenv.config();
+
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+
+export default defineConfig({
+    plugins: [react()],
+    build: {
+        outDir: 'dist/app',
+    },
+});
diff --git a/vite.config.ts b/vite.config.ts