před 6 roky · 32c1e8227f
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 
				 .idea/
			
 
				 frontend/dist/app/
			
 
				+frontend/dist/tracim.app.entry.js
			
 
				+frontend/dist/asset/tracim/tracim.vendor.bundle.js
			
 
				 frontend_app_html-document/dist/html-document.app.js
			
 
				 frontend_lib/dist/tracim_frontend_lib.js
			
 
				+npm-debug.log
			
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -1,4 +1,6 @@
 
				 # Created by .ignore support plugin (hsz.mobi)
			
 
				-.idea/
			
 
				 .git/
			
 
				 node_modules/
			
 
				+dist/asset/tracim.app.entry.js
			
 
				+dist/asset/tracim.vendor.bundle.js
			
 
				+dist/asset/images/
			
--- a/frontend/dist/asset/bootstrap/bootstrap-4.0.0-beta.2.js
+++ b/frontend/dist/asset/bootstrap/bootstrap-4.0.0-beta.2.js
--- a/frontend/dist/asset/bootstrap/bootstrap-4.0.0-beta.css
+++ b/frontend/dist/asset/bootstrap/bootstrap-4.0.0-beta.css
--- a/frontend/dist/asset/bootstrap/jquery-3.2.1.js
+++ b/frontend/dist/asset/bootstrap/jquery-3.2.1.js
--- a/frontend/dist/asset/bootstrap/popper-1.12.3.js
+++ b/frontend/dist/asset/bootstrap/popper-1.12.3.js
--- a/frontend/dist/asset/font/font-awesome-4.7.0/HELP-US-OUT.txt
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/HELP-US-OUT.txt
--- a/frontend/dist/asset/font/font-awesome-4.7.0/css/font-awesome.css
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/css/font-awesome.css
--- a/frontend/dist/asset/font/font-awesome-4.7.0/css/font-awesome.min.css
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/css/font-awesome.min.css
--- a/frontend/dist/asset/font/font-awesome-4.7.0/fonts/FontAwesome.otf
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/fonts/FontAwesome.otf
--- a/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
--- a/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
--- a/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
--- a/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
--- a/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/animated.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/animated.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/bordered-pulled.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/bordered-pulled.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/core.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/core.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/fixed-width.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/fixed-width.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/font-awesome.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/font-awesome.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/icons.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/icons.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/larger.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/larger.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/list.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/list.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/mixins.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/mixins.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/path.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/path.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/rotated-flipped.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/rotated-flipped.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/screen-reader.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/screen-reader.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/stacked.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/stacked.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/less/variables.less
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/less/variables.less
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_animated.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_animated.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_bordered-pulled.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_bordered-pulled.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_core.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_core.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_fixed-width.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_fixed-width.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_icons.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_icons.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_larger.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_larger.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_list.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_list.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_mixins.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_mixins.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_path.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_path.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_rotated-flipped.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_rotated-flipped.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_screen-reader.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_screen-reader.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_stacked.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_stacked.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/_variables.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/_variables.scss
--- a/frontend/dist/asset/font/font-awesome-4.7.0/scss/font-awesome.scss
+++ b/frontend/dist/asset/font/font-awesome-4.7.0/scss/font-awesome.scss
--- a/frontend/dist/asset/tracim/appInterface.js
+++ b/frontend/dist/asset/tracim/appInterface.js
--- a/frontend/dist/asset/tracim/tinymceInit.js
+++ b/frontend/dist/asset/tracim/tinymceInit.js
--- a/frontend/dist/ecbb61e619a4d2801db1054c019316cc.jpg
+++ b/frontend/dist/ecbb61e619a4d2801db1054c019316cc.jpg
--- a/frontend/dist/index.html
+++ b/frontend/dist/index.html
@@ -6,20 +6,19 @@
 
				     <title>Tracim</title>
			
 
				     <link rel='shortcut icon' type='image/x-icon' href='/asset/favicon.ico' >
			
 
				 
			
 
				-    <link rel="stylesheet" type="text/css" href="/font/font-awesome-4.7.0/css/font-awesome.css">
			
 
				+    <link rel="stylesheet" type="text/css" href="/asset/font/font-awesome-4.7.0/css/font-awesome.css">
			
 
				     <link href="https://fonts.googleapis.com/css?family=Quicksand:300,400,500,700" rel="stylesheet">
			
 
				     <!--
			
 
				     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
			
 
				     -->
			
 
				     <link rel="stylesheet" type="text/css" href="/asset/hamburger/hamburgers.min.css">
			
 
				-    <link rel="stylesheet" type="text/css" href="/dev/bootstrap-4.0.0-beta.css">
			
 
				+    <link rel="stylesheet" type="text/css" href="/asset/bootstrap/bootstrap-4.0.0-beta.css">
			
 
				 
			
 
				     <style>
			
 
				       /* code bellow will be generated by backend */
			
 
				       .primaryColorFont { color: #7d4e24; }
			
 
				       .primaryColorFontDarken { color: #572800; }
			
 
				       .primaryColorFontLighten { color: #a3744a; }
			
 
				-      .whiteFontColor {color: #fdfdfd;}
			
 
				 
			
 
				       .primaryColorFontHover:hover { color: #7d4e24; }
			
 
				       .primaryColorFontDarkenHover:hover { color: #572800; }
			
@@ -47,23 +46,23 @@
 
				   <body>
			
 
				     <div id='content'></div>
			
 
				 
			
 
				-    <script src='/tracim.vendor.bundle.js'></script>
			
 
				-    <script src='/tracim.app.entry.js'></script>
			
 
				+    <script type='text/javascript' src='/asset/tracim.vendor.bundle.js'></script>
			
 
				+    <script type='text/javascript' src='/asset/tracim.app.entry.js'></script>
			
 
				 
			
 
				-    <script src='/app/workspace.app.js'></script>
			
 
				-    <script src='/app/html-document.app.js'></script>
			
 
				-    <script src='/app/thread.app.js'></script>
			
 
				-    <!-- <script src='/app/file.app.js'></script> -->
			
 
				-    <script src='/app/admin_workspace_user.app.js'></script>
			
 
				+    <script type='text/javascript' src='/app/workspace.app.js'></script>
			
 
				+    <script type='text/javascript' src='/app/html-document.app.js'></script>
			
 
				+    <script type='text/javascript' src='/app/thread.app.js'></script>
			
 
				+    <!-- <script type='text/javascript' src='/app/file.app.js'></script> -->
			
 
				+    <script type='text/javascript' src='/app/admin_workspace_user.app.js'></script>
			
 
				 
			
 
				-    <script src="/dev/jquery-3.2.1.js"></script>
			
 
				-    <script src="/dev/popper-1.12.3.js"></script>
			
 
				-    <script src="/dev/bootstrap-4.0.0-beta.2.js"></script>
			
 
				+    <script type='text/javascript' src='/asset/bootstrap/jquery-3.2.1.js'></script>
			
 
				+    <script type='text/javascript' src='/asset/bootstrap/popper-1.12.3.js'></script>
			
 
				+    <script type='text/javascript' src='/asset/bootstrap/bootstrap-4.0.0-beta.2.js'></script>
			
 
				 
			
 
				-    <script type="text/javascript" src="/asset/tinymce/js/tinymce/jquery.tinymce.min.js"></script>
			
 
				-    <script type="text/javascript" src="/asset/tinymce/js/tinymce/tinymce.min.js"></script>
			
 
				+    <script type='text/javascript' src='/asset/tinymce/js/tinymce/jquery.tinymce.min.js'></script>
			
 
				+    <script type='text/javascript' src='/asset/tinymce/js/tinymce/tinymce.min.js'></script>
			
 
				 
			
 
				-    <script type='text/javascript' src='/appInterface.js'></script>
			
 
				-    <script type='text/javascript' src='/tinymceInit.js'></script>
			
 
				+    <script type='text/javascript' src='/asset/tracim/appInterface.js'></script>
			
 
				+    <script type='text/javascript' src='/asset/tracim/tinymceInit.js'></script>
			
 
				   </body>
			
 
				 </html>
			
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@@ -28,10 +28,10 @@ module.exports = {
 
				     ]
			
 
				   },
			
 
				   output: {
			
 
				-    path: path.resolve(__dirname, 'dist'),
			
 
				+    path: path.resolve(__dirname, 'dist/asset'),
			
 
				     filename: 'tracim.app.entry.js',
			
 
				-    pathinfo: !isProduction,
			
 
				-    publicPath: '/'
			
 
				+    pathinfo: !isProduction
			
 
				+    // publicPath: '/'
			
 
				   },
			
 
				   devServer: {
			
 
				     contentBase: path.join(__dirname, 'dist/'),
			
@@ -70,8 +70,10 @@ module.exports = {
 
				       use: ['style-loader', 'css-loader', 'stylus-loader']
			
 
				     }, {
			
 
				       test: /\.(jpg|png|svg)$/,
			
 
				-      loader: 'url-loader',
			
 
				+      loader: 'file-loader',
			
 
				       options: {
			
 
				+        name: '[name].[ext]',
			
 
				+        outputPath: 'images/', // asset/ is in output.path
			
 
				         limit: 2000
			
 
				       }
			
 
				     }]