Browse Source

Merge branch 'develop' of github.com:tracim/tracim_v2 into develop

Guénaël Muller 6 years ago
parent
commit
8b2d0db7f6

+ 0 - 1
frontend_app_html-document/package.json View File

36
     "style-loader": "^0.19.0",
36
     "style-loader": "^0.19.0",
37
     "stylus": "^0.54.5",
37
     "stylus": "^0.54.5",
38
     "stylus-loader": "^3.0.1",
38
     "stylus-loader": "^3.0.1",
39
-    "tracim_frontend_lib": "git://github.com/tracim/tracim_lib.git",
40
     "url-loader": "^0.6.2",
39
     "url-loader": "^0.6.2",
41
     "webpack": "^3.8.1",
40
     "webpack": "^3.8.1",
42
     "whatwg-fetch": "^2.0.3"
41
     "whatwg-fetch": "^2.0.3"

+ 0 - 1
frontend_app_thread/package.json View File

36
     "style-loader": "^0.19.0",
36
     "style-loader": "^0.19.0",
37
     "stylus": "^0.54.5",
37
     "stylus": "^0.54.5",
38
     "stylus-loader": "^3.0.1",
38
     "stylus-loader": "^3.0.1",
39
-    "tracim_lib": "git://github.com/tracim/tracim_lib.git",
40
     "url-loader": "^0.6.2",
39
     "url-loader": "^0.6.2",
41
     "webpack": "^3.8.1",
40
     "webpack": "^3.8.1",
42
     "whatwg-fetch": "^2.0.3"
41
     "whatwg-fetch": "^2.0.3"

+ 0 - 0
frontend_app_thread/rebuild_thread.sh View File


+ 1 - 1
frontend_app_thread/src/container/PopupCreateThread.jsx View File

2
 import {
2
 import {
3
   CardPopupCreateContent,
3
   CardPopupCreateContent,
4
   handleFetchResult
4
   handleFetchResult
5
-} from 'tracim_lib'
5
+} from 'tracim_frontend_lib'
6
 import { postThreadContent } from '../action.async.js'
6
 import { postThreadContent } from '../action.async.js'
7
 
7
 
8
 const debug = { // outdated
8
 const debug = { // outdated

+ 1 - 1
frontend_app_thread/src/container/Thread.jsx View File

10
   Timeline,
10
   Timeline,
11
   SelectStatus,
11
   SelectStatus,
12
   ArchiveDeleteContent
12
   ArchiveDeleteContent
13
-} from 'tracim_lib'
13
+} from 'tracim_frontend_lib'
14
 import {
14
 import {
15
   getThreadContent,
15
   getThreadContent,
16
   getThreadComment,
16
   getThreadComment,

+ 1 - 1
frontend_app_thread/src/css/index.styl View File

1
-@import "../../node_modules/tracim_lib/src/css/Variable.styl"
1
+@import "../../node_modules/tracim_frontend_lib/src/css/Variable.styl"
2
 
2
 
3
 .thread
3
 .thread
4
   width 70%
4
   width 70%

+ 1 - 1
frontend_app_thread/src/i18n.js View File

1
 import i18n from 'i18next'
1
 import i18n from 'i18next'
2
 import { reactI18nextModule } from 'react-i18next'
2
 import { reactI18nextModule } from 'react-i18next'
3
-import { langFr, langEn } from 'tracim_lib'
3
+import { langFr, langEn } from 'tracim_frontend_lib'
4
 import fr from './translate/fr.js'
4
 import fr from './translate/fr.js'
5
 import en from './translate/en.js'
5
 import en from './translate/en.js'
6
 
6
 

+ 1 - 1
frontend_app_thread/webpack.config.js View File

21
   //   'react-dom': {commonjs: 'react-dom', commonjs2: 'react-dom', amd: 'react-dom', root: '_'},
21
   //   'react-dom': {commonjs: 'react-dom', commonjs2: 'react-dom', amd: 'react-dom', root: '_'},
22
   //   classnames: {commonjs: 'classnames', commonjs2: 'classnames', amd: 'classnames', root: '_'},
22
   //   classnames: {commonjs: 'classnames', commonjs2: 'classnames', amd: 'classnames', root: '_'},
23
   //   'prop-types': {commonjs: 'prop-types', commonjs2: 'prop-types', amd: 'prop-types', root: '_'},
23
   //   'prop-types': {commonjs: 'prop-types', commonjs2: 'prop-types', amd: 'prop-types', root: '_'},
24
-  //   tracim_lib: {commonjs: 'tracim_lib', commonjs2: 'tracim_lib', amd: 'tracim_lib', root: '_'}
24
+  //   tracim_frontend_lib: {commonjs: 'tracim_frontend_lib', commonjs2: 'tracim_frontend_lib', amd: 'tracim_frontend_lib', root: '_'}
25
   // }
25
   // }
26
   // : {},
26
   // : {},
27
   devServer: {
27
   devServer: {

+ 8 - 0
rebuild_full_frontend.sh View File

21
 npm run build$windoz
21
 npm run build$windoz
22
 log "cp dist/html-document.app.js"
22
 log "cp dist/html-document.app.js"
23
 cp dist/html-document.app.js ../frontend/dist/app
23
 cp dist/html-document.app.js ../frontend/dist/app
24
+cd -
25
+
26
+log "cd frontend_app_thread"
27
+cd frontend_app_thread
28
+log "npm run build$windoz # for frontend_app_thread"
29
+npm run build$windoz
30
+log "cp dist/thread.app.js"
31
+cp dist/thread.app.js ../frontend/dist/app