From 2b323470b4760e6d3f4c4c68f8be3a577b7ca43d Mon Sep 17 00:00:00 2001 From: Tim Stallard Date: Mon, 27 Feb 2017 11:17:16 +0000 Subject: [PATCH] Moved loads of stuff --- .gitignore | 2 +- package.json | 4 ++-- {client/src => src}/blocks/affineDecrypt.js | 0 {client/src => src}/blocks/affineEncrypt.js | 0 {client/src => src}/blocks/asciiToHex.js | 0 {client/src => src}/blocks/atbash.js | 0 {client/src => src}/blocks/caesar.js | 0 {client/src => src}/blocks/concat.js | 0 {client/src => src}/blocks/elementsToNumbers.js | 0 {client/src => src}/blocks/frequency.js | 2 +- {client/src => src}/blocks/hexToAscii.js | 0 {client/src => src}/blocks/index.js | 0 {client/src => src}/blocks/input.js | 0 {client/src => src}/blocks/lettersToNums.js | 0 {client/src => src}/blocks/numbersToElements.js | 0 {client/src => src}/blocks/numsToLetters.js | 0 {client/src => src}/blocks/output.js | 0 {client/src => src}/blocks/reverse.js | 0 {client/src => src}/blocks/substitution.js | 0 {client/src => src}/blocks/template.js | 0 {client/src => src}/blocks/transposition.js | 0 {client/src => src}/blocks/transpositionReverse.js | 0 {client/src => src}/blocks/util/coPrime.js | 0 {client/src => src}/blocks/util/elements.js | 0 {client/src => src}/blocks/util/toChar.js | 0 {client/src => src}/blocks/util/toNum.js | 0 {client/src => src}/blocks/vigenereDecode.js | 0 {client/src => src}/blocks/vigenereEncode.js | 0 {client/src => src}/diagram/export.js | 0 {client/src => src}/diagram/import.js | 0 {client/src => src}/diagram/index.js | 0 {client/src => src}/events.js | 0 {client/src => src}/index.html | 0 {client/src => src}/index.js | 0 {client/src => src}/menu.js | 0 {client/src => src}/outputCalculation.js | 0 {client/src => src}/pageInteraction/addBlockToPage.js | 0 {client/src => src}/pageInteraction/block.hbs | 0 {client/src => src}/pageInteraction/dragDrop.js | 0 {client/src => src}/pageInteraction/index.js | 0 {client/src => src}/pageInteraction/joining.js | 0 {client/src => src}/pageInteraction/setupBlocks.js | 0 {client/src => src}/styles.scss | 0 client/webpack.config.js => webpack.config.js | 0 44 files changed, 4 insertions(+), 4 deletions(-) rename {client/src => src}/blocks/affineDecrypt.js (100%) rename {client/src => src}/blocks/affineEncrypt.js (100%) rename {client/src => src}/blocks/asciiToHex.js (100%) rename {client/src => src}/blocks/atbash.js (100%) rename {client/src => src}/blocks/caesar.js (100%) rename {client/src => src}/blocks/concat.js (100%) rename {client/src => src}/blocks/elementsToNumbers.js (100%) rename {client/src => src}/blocks/frequency.js (99%) rename {client/src => src}/blocks/hexToAscii.js (100%) rename {client/src => src}/blocks/index.js (100%) rename {client/src => src}/blocks/input.js (100%) rename {client/src => src}/blocks/lettersToNums.js (100%) rename {client/src => src}/blocks/numbersToElements.js (100%) rename {client/src => src}/blocks/numsToLetters.js (100%) rename {client/src => src}/blocks/output.js (100%) rename {client/src => src}/blocks/reverse.js (100%) rename {client/src => src}/blocks/substitution.js (100%) rename {client/src => src}/blocks/template.js (100%) rename {client/src => src}/blocks/transposition.js (100%) rename {client/src => src}/blocks/transpositionReverse.js (100%) rename {client/src => src}/blocks/util/coPrime.js (100%) rename {client/src => src}/blocks/util/elements.js (100%) rename {client/src => src}/blocks/util/toChar.js (100%) rename {client/src => src}/blocks/util/toNum.js (100%) rename {client/src => src}/blocks/vigenereDecode.js (100%) rename {client/src => src}/blocks/vigenereEncode.js (100%) rename {client/src => src}/diagram/export.js (100%) rename {client/src => src}/diagram/import.js (100%) rename {client/src => src}/diagram/index.js (100%) rename {client/src => src}/events.js (100%) rename {client/src => src}/index.html (100%) rename {client/src => src}/index.js (100%) rename {client/src => src}/menu.js (100%) rename {client/src => src}/outputCalculation.js (100%) rename {client/src => src}/pageInteraction/addBlockToPage.js (100%) rename {client/src => src}/pageInteraction/block.hbs (100%) rename {client/src => src}/pageInteraction/dragDrop.js (100%) rename {client/src => src}/pageInteraction/index.js (100%) rename {client/src => src}/pageInteraction/joining.js (100%) rename {client/src => src}/pageInteraction/setupBlocks.js (100%) rename {client/src => src}/styles.scss (100%) rename client/webpack.config.js => webpack.config.js (100%) diff --git a/.gitignore b/.gitignore index 204a52d..dd87e2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ node_modules -client/build +build diff --git a/package.json b/package.json index 3fb29e9..c0ecb27 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "build": "webpack --config client/webpack.config.js", - "dev-server": "webpack-dev-server --config client/webpack.config.js --watch --progress --colors" + "build": "webpack", + "dev-server": "webpack-dev-server --watch --progress --colors" }, "repository": { "type": "git", diff --git a/client/src/blocks/affineDecrypt.js b/src/blocks/affineDecrypt.js similarity index 100% rename from client/src/blocks/affineDecrypt.js rename to src/blocks/affineDecrypt.js diff --git a/client/src/blocks/affineEncrypt.js b/src/blocks/affineEncrypt.js similarity index 100% rename from client/src/blocks/affineEncrypt.js rename to src/blocks/affineEncrypt.js diff --git a/client/src/blocks/asciiToHex.js b/src/blocks/asciiToHex.js similarity index 100% rename from client/src/blocks/asciiToHex.js rename to src/blocks/asciiToHex.js diff --git a/client/src/blocks/atbash.js b/src/blocks/atbash.js similarity index 100% rename from client/src/blocks/atbash.js rename to src/blocks/atbash.js diff --git a/client/src/blocks/caesar.js b/src/blocks/caesar.js similarity index 100% rename from client/src/blocks/caesar.js rename to src/blocks/caesar.js diff --git a/client/src/blocks/concat.js b/src/blocks/concat.js similarity index 100% rename from client/src/blocks/concat.js rename to src/blocks/concat.js diff --git a/client/src/blocks/elementsToNumbers.js b/src/blocks/elementsToNumbers.js similarity index 100% rename from client/src/blocks/elementsToNumbers.js rename to src/blocks/elementsToNumbers.js diff --git a/client/src/blocks/frequency.js b/src/blocks/frequency.js similarity index 99% rename from client/src/blocks/frequency.js rename to src/blocks/frequency.js index cb746ef..8828802 100644 --- a/client/src/blocks/frequency.js +++ b/src/blocks/frequency.js @@ -60,7 +60,7 @@ module.exports = { topGroups = topGroupsByFrequency(getFrequency(getGroups(input, parseInt(block.properties.type)))); } else if(block.properties.type == "first"){ - //first + //first letter of each word topGroups = topGroupsByFrequency(getFrequency(getFirstLetters(input, parseInt(block.properties.type)))); } $(block.elem).data("chartTop").data.labels = topGroups.labels; diff --git a/client/src/blocks/hexToAscii.js b/src/blocks/hexToAscii.js similarity index 100% rename from client/src/blocks/hexToAscii.js rename to src/blocks/hexToAscii.js diff --git a/client/src/blocks/index.js b/src/blocks/index.js similarity index 100% rename from client/src/blocks/index.js rename to src/blocks/index.js diff --git a/client/src/blocks/input.js b/src/blocks/input.js similarity index 100% rename from client/src/blocks/input.js rename to src/blocks/input.js diff --git a/client/src/blocks/lettersToNums.js b/src/blocks/lettersToNums.js similarity index 100% rename from client/src/blocks/lettersToNums.js rename to src/blocks/lettersToNums.js diff --git a/client/src/blocks/numbersToElements.js b/src/blocks/numbersToElements.js similarity index 100% rename from client/src/blocks/numbersToElements.js rename to src/blocks/numbersToElements.js diff --git a/client/src/blocks/numsToLetters.js b/src/blocks/numsToLetters.js similarity index 100% rename from client/src/blocks/numsToLetters.js rename to src/blocks/numsToLetters.js diff --git a/client/src/blocks/output.js b/src/blocks/output.js similarity index 100% rename from client/src/blocks/output.js rename to src/blocks/output.js diff --git a/client/src/blocks/reverse.js b/src/blocks/reverse.js similarity index 100% rename from client/src/blocks/reverse.js rename to src/blocks/reverse.js diff --git a/client/src/blocks/substitution.js b/src/blocks/substitution.js similarity index 100% rename from client/src/blocks/substitution.js rename to src/blocks/substitution.js diff --git a/client/src/blocks/template.js b/src/blocks/template.js similarity index 100% rename from client/src/blocks/template.js rename to src/blocks/template.js diff --git a/client/src/blocks/transposition.js b/src/blocks/transposition.js similarity index 100% rename from client/src/blocks/transposition.js rename to src/blocks/transposition.js diff --git a/client/src/blocks/transpositionReverse.js b/src/blocks/transpositionReverse.js similarity index 100% rename from client/src/blocks/transpositionReverse.js rename to src/blocks/transpositionReverse.js diff --git a/client/src/blocks/util/coPrime.js b/src/blocks/util/coPrime.js similarity index 100% rename from client/src/blocks/util/coPrime.js rename to src/blocks/util/coPrime.js diff --git a/client/src/blocks/util/elements.js b/src/blocks/util/elements.js similarity index 100% rename from client/src/blocks/util/elements.js rename to src/blocks/util/elements.js diff --git a/client/src/blocks/util/toChar.js b/src/blocks/util/toChar.js similarity index 100% rename from client/src/blocks/util/toChar.js rename to src/blocks/util/toChar.js diff --git a/client/src/blocks/util/toNum.js b/src/blocks/util/toNum.js similarity index 100% rename from client/src/blocks/util/toNum.js rename to src/blocks/util/toNum.js diff --git a/client/src/blocks/vigenereDecode.js b/src/blocks/vigenereDecode.js similarity index 100% rename from client/src/blocks/vigenereDecode.js rename to src/blocks/vigenereDecode.js diff --git a/client/src/blocks/vigenereEncode.js b/src/blocks/vigenereEncode.js similarity index 100% rename from client/src/blocks/vigenereEncode.js rename to src/blocks/vigenereEncode.js diff --git a/client/src/diagram/export.js b/src/diagram/export.js similarity index 100% rename from client/src/diagram/export.js rename to src/diagram/export.js diff --git a/client/src/diagram/import.js b/src/diagram/import.js similarity index 100% rename from client/src/diagram/import.js rename to src/diagram/import.js diff --git a/client/src/diagram/index.js b/src/diagram/index.js similarity index 100% rename from client/src/diagram/index.js rename to src/diagram/index.js diff --git a/client/src/events.js b/src/events.js similarity index 100% rename from client/src/events.js rename to src/events.js diff --git a/client/src/index.html b/src/index.html similarity index 100% rename from client/src/index.html rename to src/index.html diff --git a/client/src/index.js b/src/index.js similarity index 100% rename from client/src/index.js rename to src/index.js diff --git a/client/src/menu.js b/src/menu.js similarity index 100% rename from client/src/menu.js rename to src/menu.js diff --git a/client/src/outputCalculation.js b/src/outputCalculation.js similarity index 100% rename from client/src/outputCalculation.js rename to src/outputCalculation.js diff --git a/client/src/pageInteraction/addBlockToPage.js b/src/pageInteraction/addBlockToPage.js similarity index 100% rename from client/src/pageInteraction/addBlockToPage.js rename to src/pageInteraction/addBlockToPage.js diff --git a/client/src/pageInteraction/block.hbs b/src/pageInteraction/block.hbs similarity index 100% rename from client/src/pageInteraction/block.hbs rename to src/pageInteraction/block.hbs diff --git a/client/src/pageInteraction/dragDrop.js b/src/pageInteraction/dragDrop.js similarity index 100% rename from client/src/pageInteraction/dragDrop.js rename to src/pageInteraction/dragDrop.js diff --git a/client/src/pageInteraction/index.js b/src/pageInteraction/index.js similarity index 100% rename from client/src/pageInteraction/index.js rename to src/pageInteraction/index.js diff --git a/client/src/pageInteraction/joining.js b/src/pageInteraction/joining.js similarity index 100% rename from client/src/pageInteraction/joining.js rename to src/pageInteraction/joining.js diff --git a/client/src/pageInteraction/setupBlocks.js b/src/pageInteraction/setupBlocks.js similarity index 100% rename from client/src/pageInteraction/setupBlocks.js rename to src/pageInteraction/setupBlocks.js diff --git a/client/src/styles.scss b/src/styles.scss similarity index 100% rename from client/src/styles.scss rename to src/styles.scss diff --git a/client/webpack.config.js b/webpack.config.js similarity index 100% rename from client/webpack.config.js rename to webpack.config.js