Página inicial Explorar Ajuda
Entrar
bux
/
tracim_v2
Observar 1
Favorito 0
Fork 0
Código Issues 0 Pull Requests 0 Versões 0 Wiki Atividade
Ver código fonte

moved assets files for better generation of index.html by backend

Skylsmoi 5 anos atrás
pai
f55824ea3f
commit
32c1e8227f
48 arquivos alterados com 28 adições e 22 exclusões
Visão unificada Mostrar estatísticas do Diff
  1. 3 0
      .gitignore
  2. 3 1
      frontend/.gitignore
  3. 0 0
      frontend/dist/asset/bootstrap/bootstrap-4.0.0-beta.2.js
  4. 0 0
      frontend/dist/asset/bootstrap/bootstrap-4.0.0-beta.css
  5. 0 0
      frontend/dist/asset/bootstrap/jquery-3.2.1.js
  6. 0 0
      frontend/dist/asset/bootstrap/popper-1.12.3.js
  7. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/HELP-US-OUT.txt
  8. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/css/font-awesome.css
  9. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/css/font-awesome.min.css
  10. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/fonts/FontAwesome.otf
  11. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
  12. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
  13. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
  14. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
  15. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
  16. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/animated.less
  17. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/bordered-pulled.less
  18. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/core.less
  19. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/fixed-width.less
  20. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/font-awesome.less
  21. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/icons.less
  22. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/larger.less
  23. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/list.less
  24. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/mixins.less
  25. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/path.less
  26. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/rotated-flipped.less
  27. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/screen-reader.less
  28. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/stacked.less
  29. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/less/variables.less
  30. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_animated.scss
  31. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_bordered-pulled.scss
  32. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_core.scss
  33. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_fixed-width.scss
  34. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_icons.scss
  35. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_larger.scss
  36. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_list.scss
  37. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_mixins.scss
  38. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_path.scss
  39. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_rotated-flipped.scss
  40. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_screen-reader.scss
  41. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_stacked.scss
  42. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/_variables.scss
  43. 0 0
      frontend/dist/asset/font/font-awesome-4.7.0/scss/font-awesome.scss
  44. 0 0
      frontend/dist/asset/tracim/appInterface.js
  45. 0 0
      frontend/dist/asset/tracim/tinymceInit.js
  46. BIN
      frontend/dist/ecbb61e619a4d2801db1054c019316cc.jpg
  47. 16 17
      frontend/dist/index.html
  48. 6 4
      frontend/webpack.config.js

+ 3 - 0
.gitignore Ver arquivo

1 
 .idea/
 1 
 .idea/
2 
 frontend/dist/app/
 2 
 frontend/dist/app/
3 
+frontend/dist/tracim.app.entry.js
4 
+frontend/dist/asset/tracim/tracim.vendor.bundle.js
3 
 frontend_app_html-document/dist/html-document.app.js
 5 
 frontend_app_html-document/dist/html-document.app.js
4 
 frontend_lib/dist/tracim_frontend_lib.js
 6 
 frontend_lib/dist/tracim_frontend_lib.js
7 
+npm-debug.log

+ 3 - 1
frontend/.gitignore Ver arquivo

1 
 # Created by .ignore support plugin (hsz.mobi)
 1 
 # Created by .ignore support plugin (hsz.mobi)
2 
-.idea/
3 
 .git/
 2 
 .git/
4 
 node_modules/
 3 
 node_modules/
4 
+dist/asset/tracim.app.entry.js
5 
+dist/asset/tracim.vendor.bundle.js
6 
+dist/asset/images/

frontend/dist/dev/bootstrap-4.0.0-beta.2.js → frontend/dist/asset/bootstrap/bootstrap-4.0.0-beta.2.js Ver arquivo


frontend/dist/dev/bootstrap-4.0.0-beta.css → frontend/dist/asset/bootstrap/bootstrap-4.0.0-beta.css Ver arquivo


frontend/dist/dev/jquery-3.2.1.js → frontend/dist/asset/bootstrap/jquery-3.2.1.js Ver arquivo


frontend/dist/dev/popper-1.12.3.js → frontend/dist/asset/bootstrap/popper-1.12.3.js Ver arquivo


frontend/dist/font/font-awesome-4.7.0/HELP-US-OUT.txt → frontend/dist/asset/font/font-awesome-4.7.0/HELP-US-OUT.txt Ver arquivo


frontend/dist/font/font-awesome-4.7.0/css/font-awesome.css → frontend/dist/asset/font/font-awesome-4.7.0/css/font-awesome.css Ver arquivo


frontend/dist/font/font-awesome-4.7.0/css/font-awesome.min.css → frontend/dist/asset/font/font-awesome-4.7.0/css/font-awesome.min.css Ver arquivo


frontend/dist/font/font-awesome-4.7.0/fonts/FontAwesome.otf → frontend/dist/asset/font/font-awesome-4.7.0/fonts/FontAwesome.otf Ver arquivo


frontend/dist/font/font-awesome-4.7.0/fonts/fontawesome-webfont.eot → frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.eot Ver arquivo


frontend/dist/font/font-awesome-4.7.0/fonts/fontawesome-webfont.svg → frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.svg Ver arquivo


frontend/dist/font/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf → frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf Ver arquivo


frontend/dist/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff → frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff Ver arquivo


frontend/dist/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 → frontend/dist/asset/font/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/animated.less → frontend/dist/asset/font/font-awesome-4.7.0/less/animated.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/bordered-pulled.less → frontend/dist/asset/font/font-awesome-4.7.0/less/bordered-pulled.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/core.less → frontend/dist/asset/font/font-awesome-4.7.0/less/core.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/fixed-width.less → frontend/dist/asset/font/font-awesome-4.7.0/less/fixed-width.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/font-awesome.less → frontend/dist/asset/font/font-awesome-4.7.0/less/font-awesome.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/icons.less → frontend/dist/asset/font/font-awesome-4.7.0/less/icons.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/larger.less → frontend/dist/asset/font/font-awesome-4.7.0/less/larger.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/list.less → frontend/dist/asset/font/font-awesome-4.7.0/less/list.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/mixins.less → frontend/dist/asset/font/font-awesome-4.7.0/less/mixins.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/path.less → frontend/dist/asset/font/font-awesome-4.7.0/less/path.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/rotated-flipped.less → frontend/dist/asset/font/font-awesome-4.7.0/less/rotated-flipped.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/screen-reader.less → frontend/dist/asset/font/font-awesome-4.7.0/less/screen-reader.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/stacked.less → frontend/dist/asset/font/font-awesome-4.7.0/less/stacked.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/less/variables.less → frontend/dist/asset/font/font-awesome-4.7.0/less/variables.less Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_animated.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_animated.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_bordered-pulled.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_bordered-pulled.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_core.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_core.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_fixed-width.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_fixed-width.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_icons.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_icons.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_larger.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_larger.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_list.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_list.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_mixins.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_mixins.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_path.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_path.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_rotated-flipped.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_rotated-flipped.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_screen-reader.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_screen-reader.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_stacked.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_stacked.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/_variables.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/_variables.scss Ver arquivo


frontend/dist/font/font-awesome-4.7.0/scss/font-awesome.scss → frontend/dist/asset/font/font-awesome-4.7.0/scss/font-awesome.scss Ver arquivo


frontend/dist/appInterface.js → frontend/dist/asset/tracim/appInterface.js Ver arquivo


frontend/dist/tinymceInit.js → frontend/dist/asset/tracim/tinymceInit.js Ver arquivo


BIN
frontend/dist/ecbb61e619a4d2801db1054c019316cc.jpg Ver arquivo


+ 16 - 17
frontend/dist/index.html Ver arquivo

6 
     <title>Tracim</title>
 6 
     <title>Tracim</title>
7 
     <link rel='shortcut icon' type='image/x-icon' href='/asset/favicon.ico' >
 7 
     <link rel='shortcut icon' type='image/x-icon' href='/asset/favicon.ico' >
8
8
9 
-    <link rel="stylesheet" type="text/css" href="/font/font-awesome-4.7.0/css/font-awesome.css">
9 
+    <link rel="stylesheet" type="text/css" href="/asset/font/font-awesome-4.7.0/css/font-awesome.css">
10 
     <link href="https://fonts.googleapis.com/css?family=Quicksand:300,400,500,700" rel="stylesheet">
 10 
     <link href="https://fonts.googleapis.com/css?family=Quicksand:300,400,500,700" rel="stylesheet">
11 
     <!--
 11 
     <!--
12 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
 12 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
13 
     -->
 13 
     -->
14 
     <link rel="stylesheet" type="text/css" href="/asset/hamburger/hamburgers.min.css">
 14 
     <link rel="stylesheet" type="text/css" href="/asset/hamburger/hamburgers.min.css">
15 
-    <link rel="stylesheet" type="text/css" href="/dev/bootstrap-4.0.0-beta.css">
15 
+    <link rel="stylesheet" type="text/css" href="/asset/bootstrap/bootstrap-4.0.0-beta.css">
16
16
17 
     <style>
 17 
     <style>
18 
       /* code bellow will be generated by backend */
 18 
       /* code bellow will be generated by backend */
19 
       .primaryColorFont { color: #7d4e24; }
 19 
       .primaryColorFont { color: #7d4e24; }
20 
       .primaryColorFontDarken { color: #572800; }
 20 
       .primaryColorFontDarken { color: #572800; }
21 
       .primaryColorFontLighten { color: #a3744a; }
 21 
       .primaryColorFontLighten { color: #a3744a; }
22 
-      .whiteFontColor {color: #fdfdfd;}
23
22
24 
       .primaryColorFontHover:hover { color: #7d4e24; }
 23 
       .primaryColorFontHover:hover { color: #7d4e24; }
25 
       .primaryColorFontDarkenHover:hover { color: #572800; }
 24 
       .primaryColorFontDarkenHover:hover { color: #572800; }
47 
   <body>
 46 
   <body>
48 
     <div id='content'></div>
 47 
     <div id='content'></div>
49
48
50 
-    <script src='/tracim.vendor.bundle.js'></script>
51 
-    <script src='/tracim.app.entry.js'></script>
49 
+    <script type='text/javascript' src='/asset/tracim.vendor.bundle.js'></script>
50 
+    <script type='text/javascript' src='/asset/tracim.app.entry.js'></script>
52
51
53 
-    <script src='/app/workspace.app.js'></script>
54 
-    <script src='/app/html-document.app.js'></script>
55 
-    <script src='/app/thread.app.js'></script>
56 
-    <!-- <script src='/app/file.app.js'></script> -->
57 
-    <script src='/app/admin_workspace_user.app.js'></script>
52 
+    <script type='text/javascript' src='/app/workspace.app.js'></script>
53 
+    <script type='text/javascript' src='/app/html-document.app.js'></script>
54 
+    <script type='text/javascript' src='/app/thread.app.js'></script>
55 
+    <!-- <script type='text/javascript' src='/app/file.app.js'></script> -->
56 
+    <script type='text/javascript' src='/app/admin_workspace_user.app.js'></script>
58
57
59 
-    <script src="/dev/jquery-3.2.1.js"></script>
60 
-    <script src="/dev/popper-1.12.3.js"></script>
61 
-    <script src="/dev/bootstrap-4.0.0-beta.2.js"></script>
58 
+    <script type='text/javascript' src='/asset/bootstrap/jquery-3.2.1.js'></script>
59 
+    <script type='text/javascript' src='/asset/bootstrap/popper-1.12.3.js'></script>
60 
+    <script type='text/javascript' src='/asset/bootstrap/bootstrap-4.0.0-beta.2.js'></script>
62
61
63 
-    <script type="text/javascript" src="/asset/tinymce/js/tinymce/jquery.tinymce.min.js"></script>
64 
-    <script type="text/javascript" src="/asset/tinymce/js/tinymce/tinymce.min.js"></script>
62 
+    <script type='text/javascript' src='/asset/tinymce/js/tinymce/jquery.tinymce.min.js'></script>
63 
+    <script type='text/javascript' src='/asset/tinymce/js/tinymce/tinymce.min.js'></script>
65
64
66 
-    <script type='text/javascript' src='/appInterface.js'></script>
67 
-    <script type='text/javascript' src='/tinymceInit.js'></script>
65 
+    <script type='text/javascript' src='/asset/tracim/appInterface.js'></script>
66 
+    <script type='text/javascript' src='/asset/tracim/tinymceInit.js'></script>
68 
   </body>
 67 
   </body>
69 
 </html>
 68 
 </html>

+ 6 - 4
frontend/webpack.config.js Ver arquivo

28 
     ]
 28 
     ]
29 
   },
 29 
   },
30 
   output: {
 30 
   output: {
31 
-    path: path.resolve(__dirname, 'dist'),
31 
+    path: path.resolve(__dirname, 'dist/asset'),
32 
     filename: 'tracim.app.entry.js',
 32 
     filename: 'tracim.app.entry.js',
33 
-    pathinfo: !isProduction,
34 
-    publicPath: '/'
33 
+    pathinfo: !isProduction
34 
+    // publicPath: '/'
35 
   },
 35 
   },
36 
   devServer: {
 36 
   devServer: {
37 
     contentBase: path.join(__dirname, 'dist/'),
 37 
     contentBase: path.join(__dirname, 'dist/'),
70 
       use: ['style-loader', 'css-loader', 'stylus-loader']
 70 
       use: ['style-loader', 'css-loader', 'stylus-loader']
71 
     }, {
 71 
     }, {
72 
       test: /\.(jpg|png|svg)$/,
 72 
       test: /\.(jpg|png|svg)$/,
73 
-      loader: 'url-loader',
73 
+      loader: 'file-loader',
74 
       options: {
 74 
       options: {
75 
+        name: '[name].[ext]',
76 
+        outputPath: 'images/', // asset/ is in output.path
75 
         limit: 2000
 77 
         limit: 2000
76 
       }
 78 
       }
77 
     }]
 79 
     }]