rename folders

rdxi · Dec 20, 2017 · 79e6c9c · 79e6c9c
1 parent 0a243c2
commit 79e6c9c
Show file tree

Hide file tree

Showing 30 changed files with 7 additions and 7 deletions.
diff --git a/public/css/fonts/OpenSans-Bold.ttf → client/public/css/fonts/OpenSans-Bold.ttf b/public/css/fonts/OpenSans-Bold.ttf → client/public/css/fonts/OpenSans-Bold.ttf
diff --git a/public/css/fonts/OpenSans-Bold.woff2 → client/public/css/fonts/OpenSans-Bold.woff2 b/public/css/fonts/OpenSans-Bold.woff2 → client/public/css/fonts/OpenSans-Bold.woff2
diff --git a/public/css/fonts/OpenSans-Regular.ttf → client/public/css/fonts/OpenSans-Regular.ttf b/public/css/fonts/OpenSans-Regular.ttf → client/public/css/fonts/OpenSans-Regular.ttf
diff --git a/public/css/fonts/OpenSans-Regular.woff2 → ...t/public/css/fonts/OpenSans-Regular.woff2 b/public/css/fonts/OpenSans-Regular.woff2 → ...t/public/css/fonts/OpenSans-Regular.woff2
diff --git a/public/css/fonts/OpenSans-Semibold.ttf → ...nt/public/css/fonts/OpenSans-Semibold.ttf b/public/css/fonts/OpenSans-Semibold.ttf → ...nt/public/css/fonts/OpenSans-Semibold.ttf
diff --git a/public/css/fonts/OpenSans-Semibold.woff2 → .../public/css/fonts/OpenSans-Semibold.woff2 b/public/css/fonts/OpenSans-Semibold.woff2 → .../public/css/fonts/OpenSans-Semibold.woff2
diff --git a/public/css/sounds/new-message-old.mp3 → client/public/css/sounds/new-message-old.mp3 b/public/css/sounds/new-message-old.mp3 → client/public/css/sounds/new-message-old.mp3
diff --git a/public/css/sounds/new-message-old2.mp3 → ...nt/public/css/sounds/new-message-old2.mp3 b/public/css/sounds/new-message-old2.mp3 → ...nt/public/css/sounds/new-message-old2.mp3
diff --git a/public/css/sounds/new-message.mp3 → client/public/css/sounds/new-message.mp3 b/public/css/sounds/new-message.mp3 → client/public/css/sounds/new-message.mp3
diff --git a/public/css/style.css → client/public/css/style.css b/public/css/style.css → client/public/css/style.css
diff --git a/public/favicon.ico → client/public/favicon.ico b/public/favicon.ico → client/public/favicon.ico
diff --git a/public/index.html → client/public/index.html b/public/index.html → client/public/index.html
@@ -81,7 +81,7 @@
   </div>
 
   <script src="/socket.io/socket.io.js"></script>
-  <script src="js/modules/libs/tribute-es5.min.js"></script>
+  <script src="js/libs/tribute-es5.min.js"></script>
   <script src="js/bundle.js"></script>
 
   <script id="message-template" type="text/template">

diff --git a/client/public/js/bundle.js b/client/public/js/bundle.js
diff --git a/public/js/modules/libs/tribute-es5.js → client/public/js/libs/tribute-es5.js b/public/js/modules/libs/tribute-es5.js → client/public/js/libs/tribute-es5.js
diff --git a/public/js/modules/libs/tribute-es5.min.js → client/public/js/libs/tribute-es5.min.js b/public/js/modules/libs/tribute-es5.min.js → client/public/js/libs/tribute-es5.min.js
diff --git a/public/js/client.js → client/src/client.js b/public/js/client.js → client/src/client.js
diff --git a/public/js/modules/emojiHandlers.js → client/src/modules/emojiHandlers.js b/public/js/modules/emojiHandlers.js → client/src/modules/emojiHandlers.js
diff --git a/public/js/modules/modalHandlers.js → client/src/modules/modalHandlers.js b/public/js/modules/modalHandlers.js → client/src/modules/modalHandlers.js
diff --git a/public/js/modules/renderHtml.js → client/src/modules/renderHtml.js b/public/js/modules/renderHtml.js → client/src/modules/renderHtml.js
diff --git a/public/js/modules/renderHtml.test.js → client/src/modules/renderHtml.test.js b/public/js/modules/renderHtml.test.js → client/src/modules/renderHtml.test.js
@@ -1,6 +1,6 @@
 const test = require('tape');
 
-const html = require('fs').readFileSync('./public/index.html', { encoding: 'utf-8' });
+const html = require('fs').readFileSync('./client/public/index.html', { encoding: 'utf-8' });
 const JSDOM = require("jsdom").JSDOM;
 const window = new JSDOM(html).window;
 

diff --git a/public/js/modules/sidebarHandlers.js → client/src/modules/sidebarHandlers.js b/public/js/modules/sidebarHandlers.js → client/src/modules/sidebarHandlers.js
diff --git a/public/js/modules/soundOfMessage.js → client/src/modules/soundOfMessage.js b/public/js/modules/soundOfMessage.js → client/src/modules/soundOfMessage.js
diff --git a/public/js/modules/userMentions.js → client/src/modules/userMentions.js b/public/js/modules/userMentions.js → client/src/modules/userMentions.js
diff --git a/public/js/modules/utils/highlightInput.js → client/src/modules/utils/highlightInput.js b/public/js/modules/utils/highlightInput.js → client/src/modules/utils/highlightInput.js
diff --git a/public/js/modules/utils/isImageLink.js → client/src/modules/utils/isImageLink.js b/public/js/modules/utils/isImageLink.js → client/src/modules/utils/isImageLink.js
diff --git a/public/js/modules/utils/polyfillarrayfind.js → ...nt/src/modules/utils/polyfillarrayfind.js b/public/js/modules/utils/polyfillarrayfind.js → ...nt/src/modules/utils/polyfillarrayfind.js
diff --git a/public/js/modules/utils/scrollToBottom.js → client/src/modules/utils/scrollToBottom.js b/public/js/modules/utils/scrollToBottom.js → client/src/modules/utils/scrollToBottom.js
diff --git a/package.json b/package.json
@@ -5,12 +5,12 @@
   "main": "index.js",
   "scripts": {
     "start": "node server/server.js",
-    "test-client": "tape public/js/**/*.test.js | tap-spec",
+    "test-client": "tape client/**/*.test.js | tap-spec",
     "test-server": "tape server/**/*.test.js | tap-spec",
     "test-watch-client": "nodemon --exec \"npm run test-client\"",
     "test-watch-server": "nodemon --exec \"npm run test-server\"",
-    "build-client-js": "browserify public/js/client.js | uglifyjs > public/js/bundle.js",
-    "start-watchify": "watchify public/js/client.js -v -o \"uglifyjs > public/js/bundle.js\"",
+    "build-client-js": "browserify client/src/client.js | uglifyjs > client/public/js/bundle.js",
+    "start-watchify": "watchify client/src/client.js -v -o \"uglifyjs > client/public/js/bundle.js\"",
     "start-nodemon": "nodemon server/server.js",
     "watch": "concurrently --timestamp-format \"HH:mm:ss\" --prefix \"{time} [{index}]\"  --kill-others  \"npm run start-watchify\" \"npm run start-nodemon\""
   },

diff --git a/public/js/bundle.js b/public/js/bundle.js
diff --git a/server/server.js b/server/server.js
@@ -1,6 +1,6 @@
 const port = process.env.PORT || 3000;
 const path = require('path');
-const publicPath = path.join(__dirname, '../public');
+const publicPath = path.join(__dirname, '../client/public');
 
 const express = require('express');
 const compression = require('compression');