Skip to content

Commit

Permalink
Merge branch 'add-timing-calc'
Browse files Browse the repository at this point in the history
  • Loading branch information
Intrepiware committed Nov 23, 2023
2 parents 2a7e511 + 097265b commit f909cfa
Show file tree
Hide file tree
Showing 13 changed files with 404 additions and 6 deletions.
9 changes: 9 additions & 0 deletions WorkoutBuilder/ClientApp/config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module.exports = {
},
entry: {
"home-index": "./src/home-index.tsx",
"timing-index": "./src/timing-index.tsx",
site: "./src/site.ts",
},
output: {
Expand All @@ -28,6 +29,14 @@ module.exports = {
test: /\.tsx?$/,
exclude: /node_modules/,
},
{
rules: [
{
test: /\.css$/i,
use: ["style-loader", "css-loader"],
},
],
},
],
},
};
188 changes: 185 additions & 3 deletions WorkoutBuilder/ClientApp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions WorkoutBuilder/ClientApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"css-loader": "^6.8.1",
"eslint": "^8.45.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"html-webpack-plugin": "^5.5.3",
"style-loader": "^3.3.3",
"ts-loader": "^9.5.0",
"typescript": "^5.0.2",
"webpack": "^5.89.0",
Expand Down
8 changes: 8 additions & 0 deletions WorkoutBuilder/ClientApp/src/Pages/TimingIndex.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
table.table td:last-child {
width: 25%;
text-align:center;
}

td button {
margin: 0px 2px;
}
Loading

0 comments on commit f909cfa

Please sign in to comment.