From eae8d0acedc7e4749975f067d3faf6c05841c87d Mon Sep 17 00:00:00 2001 From: Jeff Chiu Date: Tue, 10 Nov 2020 09:53:42 -0800 Subject: [PATCH] reorganize template folder --- index.html | 13 ------------- package-lock.json | 4 ++-- package.json | 2 +- src/css/styles.css | 2 +- src/index.html | 15 +++++---------- src/js/main.js | 11 +++++++++++ src/main.js | 17 ----------------- webpack.config.js | 4 ++-- 8 files changed, 22 insertions(+), 46 deletions(-) delete mode 100644 index.html create mode 100644 src/js/main.js delete mode 100644 src/main.js diff --git a/index.html b/index.html deleted file mode 100644 index fddd096..0000000 --- a/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Template Page - - -
- -
- - \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 3de025e..d283e4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "shape-tracker", + "name": "TODO", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "shape-tracker", + "name": "TODO", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index ac4dc61..b3d561c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "NAME", //rename please!! + "name": "TODO", "version": "1.0.0", "description": "_{This is a detailed description of your application. Its purpose and usage. Give as much detail as needed to explain what the application does, and any other information you want users or other developers to have. }_", "main": "main.js", diff --git a/src/css/styles.css b/src/css/styles.css index 74e0742..31be161 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -1,3 +1,3 @@ body { - background-color: lightblue; + background-color: TODO; } \ No newline at end of file diff --git a/src/index.html b/src/index.html index 8c922e9..5b0fa50 100644 --- a/src/index.html +++ b/src/index.html @@ -1,20 +1,15 @@ - Shape Tracker + TODO -

Enter three lengths to determine if they can make a triangle.

-
- - - - - - + + +
-
  • test one two three
  • +
  • diff --git a/src/js/main.js b/src/js/main.js new file mode 100644 index 0000000..fd3db9e --- /dev/null +++ b/src/js/main.js @@ -0,0 +1,11 @@ +import $ from 'jquery'; +import 'bootstrap'; +import 'bootstrap/dist/css/bootstrap.min.css'; +import './css/styles.css'; + +$(document).ready(function() { + $('#TODO-form').submit(function(event) { + event.preventDefault(); + + }); +}); \ No newline at end of file diff --git a/src/main.js b/src/main.js deleted file mode 100644 index cd54882..0000000 --- a/src/main.js +++ /dev/null @@ -1,17 +0,0 @@ -import $ from 'jquery'; -import 'bootstrap'; -import 'bootstrap/dist/css/bootstrap.min.css'; -import './css/styles.css'; -import Triangle from './triangle.js'; - -$(document).ready(function() { - $('#triangle-checker-form').submit(function(event) { - event.preventDefault(); - const length1 = $('#length1').val(); - const length2 = $('#length2').val(); - const length3 = $('#length3').val(); - const triangle = new Triangle(length1, length2, length3); - const response = triangle.checkType(); - $('#response').append("

    " + response + "

    "); - }); -}); \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index 902a539..d39b40c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,7 +3,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const { CleanWebpackPlugin } = require('clean-webpack-plugin'); module.exports = { - entry: './src/main.js', + entry: './src/js/main.js', output: { filename: 'bundle.js', path: path.resolve(__dirname, 'dist') @@ -15,7 +15,7 @@ module.exports = { plugins: [ new CleanWebpackPlugin(), new HtmlWebpackPlugin({ - title: 'NAME HERE', + title: 'TODO', template: './src/index.html', inject: 'body' })