diff --git a/.prettierignore b/.prettierignore index baa31f10..7ccd32b4 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1 @@ -optuna_dashboard/static/components/PlotlyDarkMode.ts \ No newline at end of file +optuna_dashboard/ts/components/PlotlyDarkMode.ts \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index bc5b4150..fa39e2f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN npm install ADD ./tsconfig.json /usr/src/tsconfig.json ADD ./webpack.config.js /usr/src/webpack.config.js -ADD ./optuna_dashboard/static/ /usr/src/optuna_dashboard/static +ADD ./optuna_dashboard/ts/ /usr/src/optuna_dashboard/ts RUN mkdir -p /usr/src/optuna_dashboard/public RUN npm run build:prd diff --git a/frontend_tests/DataGrid.test.tsx b/frontend_tests/DataGrid.test.tsx index c525745f..475e360a 100644 --- a/frontend_tests/DataGrid.test.tsx +++ b/frontend_tests/DataGrid.test.tsx @@ -5,7 +5,7 @@ import { cleanup, render, fireEvent } from "@testing-library/react" import { DataGrid, DataGridColumn, -} from "../optuna_dashboard/static/components/DataGrid" +} from "../optuna_dashboard/ts/components/DataGrid" afterEach(cleanup) diff --git a/frontend_tests/TrialTable.test.tsx b/frontend_tests/TrialTable.test.tsx index a3bf1e33..713a71d1 100644 --- a/frontend_tests/TrialTable.test.tsx +++ b/frontend_tests/TrialTable.test.tsx @@ -2,7 +2,7 @@ import React from "react" global.URL.createObjectURL = jest.fn() import { cleanup, render, within, fireEvent } from "@testing-library/react" -import { TrialTable } from "../optuna_dashboard/static/components/StudyDetail" +import { TrialTable } from "../optuna_dashboard/ts/components/StudyDetail" afterEach(cleanup) diff --git a/optuna_dashboard/static/action.ts b/optuna_dashboard/ts/action.ts similarity index 100% rename from optuna_dashboard/static/action.ts rename to optuna_dashboard/ts/action.ts diff --git a/optuna_dashboard/static/apiClient.ts b/optuna_dashboard/ts/apiClient.ts similarity index 100% rename from optuna_dashboard/static/apiClient.ts rename to optuna_dashboard/ts/apiClient.ts diff --git a/optuna_dashboard/static/components/App.tsx b/optuna_dashboard/ts/components/App.tsx similarity index 100% rename from optuna_dashboard/static/components/App.tsx rename to optuna_dashboard/ts/components/App.tsx diff --git a/optuna_dashboard/static/components/DataGrid.tsx b/optuna_dashboard/ts/components/DataGrid.tsx similarity index 100% rename from optuna_dashboard/static/components/DataGrid.tsx rename to optuna_dashboard/ts/components/DataGrid.tsx diff --git a/optuna_dashboard/static/components/GraphEdf.tsx b/optuna_dashboard/ts/components/GraphEdf.tsx similarity index 100% rename from optuna_dashboard/static/components/GraphEdf.tsx rename to optuna_dashboard/ts/components/GraphEdf.tsx diff --git a/optuna_dashboard/static/components/GraphHistory.tsx b/optuna_dashboard/ts/components/GraphHistory.tsx similarity index 100% rename from optuna_dashboard/static/components/GraphHistory.tsx rename to optuna_dashboard/ts/components/GraphHistory.tsx diff --git a/optuna_dashboard/static/components/GraphHyperparameterImportances.tsx b/optuna_dashboard/ts/components/GraphHyperparameterImportances.tsx similarity index 100% rename from optuna_dashboard/static/components/GraphHyperparameterImportances.tsx rename to optuna_dashboard/ts/components/GraphHyperparameterImportances.tsx diff --git a/optuna_dashboard/static/components/GraphIntermediateValues.tsx b/optuna_dashboard/ts/components/GraphIntermediateValues.tsx similarity index 100% rename from optuna_dashboard/static/components/GraphIntermediateValues.tsx rename to optuna_dashboard/ts/components/GraphIntermediateValues.tsx diff --git a/optuna_dashboard/static/components/GraphParallelCoordinate.tsx b/optuna_dashboard/ts/components/GraphParallelCoordinate.tsx similarity index 100% rename from optuna_dashboard/static/components/GraphParallelCoordinate.tsx rename to optuna_dashboard/ts/components/GraphParallelCoordinate.tsx diff --git a/optuna_dashboard/static/components/GraphParetoFront.tsx b/optuna_dashboard/ts/components/GraphParetoFront.tsx similarity index 100% rename from optuna_dashboard/static/components/GraphParetoFront.tsx rename to optuna_dashboard/ts/components/GraphParetoFront.tsx diff --git a/optuna_dashboard/static/components/GraphSlice.tsx b/optuna_dashboard/ts/components/GraphSlice.tsx similarity index 100% rename from optuna_dashboard/static/components/GraphSlice.tsx rename to optuna_dashboard/ts/components/GraphSlice.tsx diff --git a/optuna_dashboard/static/components/Note.tsx b/optuna_dashboard/ts/components/Note.tsx similarity index 100% rename from optuna_dashboard/static/components/Note.tsx rename to optuna_dashboard/ts/components/Note.tsx diff --git a/optuna_dashboard/static/components/PlotlyDarkMode.ts b/optuna_dashboard/ts/components/PlotlyDarkMode.ts similarity index 100% rename from optuna_dashboard/static/components/PlotlyDarkMode.ts rename to optuna_dashboard/ts/components/PlotlyDarkMode.ts diff --git a/optuna_dashboard/static/components/StudyDetail.tsx b/optuna_dashboard/ts/components/StudyDetail.tsx similarity index 100% rename from optuna_dashboard/static/components/StudyDetail.tsx rename to optuna_dashboard/ts/components/StudyDetail.tsx diff --git a/optuna_dashboard/static/components/StudyList.tsx b/optuna_dashboard/ts/components/StudyList.tsx similarity index 100% rename from optuna_dashboard/static/components/StudyList.tsx rename to optuna_dashboard/ts/components/StudyList.tsx diff --git a/optuna_dashboard/static/dateUtil.ts b/optuna_dashboard/ts/dateUtil.ts similarity index 100% rename from optuna_dashboard/static/dateUtil.ts rename to optuna_dashboard/ts/dateUtil.ts diff --git a/optuna_dashboard/static/index.tsx b/optuna_dashboard/ts/index.tsx similarity index 100% rename from optuna_dashboard/static/index.tsx rename to optuna_dashboard/ts/index.tsx diff --git a/optuna_dashboard/static/state.ts b/optuna_dashboard/ts/state.ts similarity index 100% rename from optuna_dashboard/static/state.ts rename to optuna_dashboard/ts/state.ts diff --git a/optuna_dashboard/static/types/index.d.ts b/optuna_dashboard/ts/types/index.d.ts similarity index 100% rename from optuna_dashboard/static/types/index.d.ts rename to optuna_dashboard/ts/types/index.d.ts diff --git a/package.json b/package.json index 39663336..3b56bdd8 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "description": "Dashboard for Optuna", "main": "index.js", "scripts": { - "fmt": "prettier --write \"optuna_dashboard/static/**/*.{ts,tsx}\" \"frontend_tests/*.{ts,tsx}\"", - "lint": "eslint . --ext .ts,.tsx && prettier --list-different \"optuna_dashboard/static/**/*.{ts,tsx}\" \"frontend_tests/*.{ts,tsx}\"", + "fmt": "prettier --write \"optuna_dashboard/ts/**/*.{ts,tsx}\" \"frontend_tests/*.{ts,tsx}\"", + "lint": "eslint . --ext .ts,.tsx && prettier --list-different \"optuna_dashboard/ts/**/*.{ts,tsx}\" \"frontend_tests/*.{ts,tsx}\"", "watch": "NODE_ENV=development TYPESCRIPT_LOADER=esbuild-loader webpack --watch", "build": "webpack", "build:dev": "NODE_ENV=development TYPESCRIPT_LOADER=esbuild-loader webpack", diff --git a/tsconfig.json b/tsconfig.json index b04c4362..b7a9b3e1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,10 +21,10 @@ "strict": true }, "files": [ - "./optuna_dashboard/static/index.tsx" + "./optuna_dashboard/ts/index.tsx" ], "include": [ - "./optuna_dashboard/static/types/**/*", + "./optuna_dashboard/ts/types/**/*", "./frontend_tests/**/*" ], "types": ["node"] diff --git a/webpack.config.js b/webpack.config.js index d92db7cb..719b4d5d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -24,7 +24,7 @@ const typeScriptLoader = process.env.TYPESCRIPT_LOADER === "esbuild-loader" ? { var config = { mode, - entry: [__dirname + '/optuna_dashboard/static/index.tsx'], + entry: [__dirname + '/optuna_dashboard/ts/index.tsx'], output: { path: __dirname + '/optuna_dashboard/public/', filename: 'bundle.js',