0.0.1

Fixed pathes
alxarno · Jun 17, 2019 · 1b30036 · 1b30036
2 parents abbfd6d + 775d00d
commit 1b30036
Show file tree

Hide file tree

Showing 39 changed files with 163 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@ dist/bundle.js
 *.lock
 *.log
 .vscode/
-stats.json
+stats.json
+*.zip
+*.tar.gz
diff --git a/dist/assets/add.svg → assets/add.svg b/dist/assets/add.svg → assets/add.svg
diff --git a/dist/assets/archive-black-box.svg → assets/archive-black-box.svg b/dist/assets/archive-black-box.svg → assets/archive-black-box.svg
diff --git a/dist/assets/back-arrow.svg → assets/back-arrow.svg b/dist/assets/back-arrow.svg → assets/back-arrow.svg
diff --git a/dist/assets/ban.svg → assets/ban.svg b/dist/assets/ban.svg → assets/ban.svg
diff --git a/dist/assets/cancel.svg → assets/cancel.svg b/dist/assets/cancel.svg → assets/cancel.svg
diff --git a/dist/assets/checked.svg → assets/checked.svg b/dist/assets/checked.svg → assets/checked.svg
diff --git a/dist/assets/clip.svg → assets/clip.svg b/dist/assets/clip.svg → assets/clip.svg
diff --git a/dist/assets/download.svg → assets/download.svg b/dist/assets/download.svg → assets/download.svg
diff --git a/dist/assets/email.svg → assets/email.svg b/dist/assets/email.svg → assets/email.svg
diff --git a/dist/assets/envelope.svg → assets/envelope.svg b/dist/assets/envelope.svg → assets/envelope.svg
diff --git a/dist/assets/exit.svg → assets/exit.svg b/dist/assets/exit.svg → assets/exit.svg
diff --git a/dist/assets/file.svg → assets/file.svg b/dist/assets/file.svg → assets/file.svg
diff --git a/dist/assets/friends.svg → assets/friends.svg b/dist/assets/friends.svg → assets/friends.svg
diff --git a/dist/assets/langs/en.svg → assets/langs/en.svg b/dist/assets/langs/en.svg → assets/langs/en.svg
diff --git a/dist/assets/langs/ru.svg → assets/langs/ru.svg b/dist/assets/langs/ru.svg → assets/langs/ru.svg
diff --git a/dist/assets/left-arrow.svg → assets/left-arrow.svg b/dist/assets/left-arrow.svg → assets/left-arrow.svg
diff --git a/dist/assets/logo.svg → assets/logo.svg b/dist/assets/logo.svg → assets/logo.svg
diff --git a/dist/assets/man-user.svg → assets/man-user.svg b/dist/assets/man-user.svg → assets/man-user.svg
diff --git a/dist/assets/megaphone.svg → assets/megaphone.svg b/dist/assets/megaphone.svg → assets/megaphone.svg
diff --git a/dist/assets/menu-button.svg → assets/menu-button.svg b/dist/assets/menu-button.svg → assets/menu-button.svg
diff --git a/dist/assets/microphone-black-shape.svg → assets/microphone-black-shape.svg b/dist/assets/microphone-black-shape.svg → assets/microphone-black-shape.svg
diff --git a/dist/assets/minus.svg → assets/minus.svg b/dist/assets/minus.svg → assets/minus.svg
diff --git a/dist/assets/more.svg → assets/more.svg b/dist/assets/more.svg → assets/more.svg
diff --git a/dist/assets/pause.svg → assets/pause.svg b/dist/assets/pause.svg → assets/pause.svg
diff --git a/dist/assets/play.svg → assets/play.svg b/dist/assets/play.svg → assets/play.svg
diff --git a/dist/assets/rss-symbol.svg → assets/rss-symbol.svg b/dist/assets/rss-symbol.svg → assets/rss-symbol.svg
diff --git a/dist/assets/save.svg → assets/save.svg b/dist/assets/save.svg → assets/save.svg
diff --git a/dist/assets/settings-work-tool.svg → assets/settings-work-tool.svg b/dist/assets/settings-work-tool.svg → assets/settings-work-tool.svg
diff --git a/dist/assets/support.svg → assets/support.svg b/dist/assets/support.svg → assets/support.svg
diff --git a/dist/assets/trash.svg → assets/trash.svg b/dist/assets/trash.svg → assets/trash.svg
diff --git a/dist/assets/unban.svg → assets/unban.svg b/dist/assets/unban.svg → assets/unban.svg
diff --git a/dist/assets/user.svg → assets/user.svg b/dist/assets/user.svg → assets/user.svg
diff --git a/dist/assets/worlwide.svg → assets/worlwide.svg b/dist/assets/worlwide.svg → assets/worlwide.svg
diff --git a/build.sh b/build.sh
@@ -0,0 +1 @@
+./node_modules/.bin/webpack --config webpack.prod.js
diff --git a/dist/index.html b/dist/index.html
@@ -2,7 +2,7 @@
   <head>
     <title>Swap Messenger</title>
     <link rel="shortcut icon" href="/favicon.png">
-    <link href="/fonts/Roboto-Regular.ttf" rel="stylesheet">
+    <!-- <link href="/fonts/Roboto-Regular.ttf" rel="stylesheet"> -->
     <style>
       #root{
         width: 100vw;
@@ -62,6 +62,10 @@
           -webkit-transform: scale(1.0);
         }
       }
+      @font-face{
+        font-family: Roboto;
+        src: url('/fonts/Roboto-Regular.ttf')
+      }
     </style>
   </head>
   <body>
@@ -74,7 +78,7 @@
         </div>
       </div>
     </div>
-    <script src="bundle.js"></script>
+    <script src="/bundle.js"></script>
   </body>
 
 </html>
diff --git a/src/index.ts b/src/index.ts
@@ -7,10 +7,13 @@ import WebSocketAPI from "./hard/web-socket";
 import { IWebSocket } from "./interfaces/web-socket";
 import { ILocalStorage } from "./interfaces/local-storage";
 import LocalStorage from "./hard/local-storage";
-// import { GenerateKeys, Test } from "./hard/crypto";
 import config from "./config";
 
-const URL = "https://192.168.1.38:3030";
+let URL = window.location.host;
+// PODUCTION defined in webpack.config/prod.js file, its variable change in compile time
+if (!PRODUCTION) {
+  URL = "https://192.168.1.38:3030";
+}
 const LOGS = true;
 const IMITATION = false;
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,7 +1,7 @@
 const path = require('path');
 const webpack = require('webpack');
 var ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+// const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 // const LoaderOptionsPlugin = require("webpack/lib/LoaderOptionsPlugin");
 
 function getEntrySources(sources) {
@@ -13,8 +13,6 @@ function getEntrySources(sources) {
   return sources;
 }
 
-
-
 module.exports = {
   entry: getEntrySources(['./src/index.ts']),
   output: {
@@ -27,7 +25,7 @@ module.exports = {
     extensions: ['.js', '.json', '.ts', '.tsx'],
     alias:{
       src: path.resolve('./src'),
-      assets:  path.resolve('./dist/assets')
+      assets:  path.resolve('./assets')
     }
   },
   module: {
@@ -95,10 +93,11 @@ module.exports = {
   ]
   },
   plugins: [
-    // new TsconfigPathsPlugin({ configFile: "./tsconfig.json"}),
     new webpack.HotModuleReplacementPlugin(),
-    new ForkTsCheckerWebpackPlugin()
-
+    new webpack.DefinePlugin({
+      'PRODUCTION': false,
+    }),
+    new ForkTsCheckerWebpackPlugin(),
   ],
   devServer: {
     port: 8080,

diff --git a/webpack.prod.js b/webpack.prod.js
@@ -0,0 +1,101 @@
+const path = require('path');
+const webpack = require('webpack');
+var ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+// const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+// const LoaderOptionsPlugin = require("webpack/lib/LoaderOptionsPlugin");
+
+function getEntrySources(sources) {
+  if (process.env.NODE_ENV !== 'production') {
+      sources.push('webpack-dev-server/client?http://localhost:8080');
+      sources.push('webpack/hot/only-dev-server');
+  }
+
+  return sources;
+}
+
+module.exports = {
+  entry: getEntrySources(['./src/index.ts']),
+  output: {
+    path: path.resolve(__dirname, 'dist'),
+    filename: 'bundle.js',
+
+  },
+  cache:true,
+  resolve: {
+    extensions: ['.js', '.json', '.ts', '.tsx'],
+    alias:{
+      src: path.resolve('./src'),
+      assets:  path.resolve('./assets')
+    }
+  },
+  module: {
+    rules:[
+      {
+        enforce: 'pre',
+        test: /\.tsx?$/,
+        loader: 'tslint-loader',
+        exclude: /(node_modules)/,
+    },
+    {
+      test: /\.(ts|tsx)$/,
+      // include: path.resolve(__dirname, 'src'),
+      use:[
+        {
+          loader: "ts-loader",
+          options: {
+            transpileOnly: true
+          }
+        }
+      ]
+    },
+    {
+      test: /\.svg$/,
+      loader: 'svg-inline-loader'
+    },
+    {
+      test: /\.scss$/,
+      use: [
+        "style-loader",
+        "css-loader",
+        {
+          loader: "sass-loader",
+          options:{
+            data: `@import "variables";`,
+            includePaths:[
+              path.resolve(__dirname, "src")
+            ]
+          }
+        }
+      ]
+    },{
+      test: /\.(png|jpe?g)$/,
+      use: [
+        'file-loader',
+        {
+          loader: 'image-webpack-loader',
+          options: {
+            bypassOnDebug:true,
+            mozjpeg: {
+              progressive: true,
+              quality: 65
+            },
+            pngquant: {
+              quality: '65-90',
+              speed: 4
+            },
+          }
+        },
+      ]
+    },{
+      test: /\.otf$/,
+      loader: 'url-loader?limit=100000'
+    }
+  ]
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      'PRODUCTION': true,
+    }),
+    new ForkTsCheckerWebpackPlugin(),
+  ],
+};