Browse Source

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

Guénaël Muller 5 years ago
parent
commit
4e2aba5d37

+ 1 - 1
.gitignore View File

@@ -1,4 +1,4 @@
1 1
 .idea/
2
-frontend/dist/app/html-document.app.js
2
+frontend/dist/app/
3 3
 frontend_app_html-document/dist/html-document.app.js
4 4
 frontend_lib/dist/tracim_frontend_lib.js

rebuild_full_frontend.sh → build_full_frontend.sh View File


+ 0 - 44
first_install_frontend.sh View File

@@ -1,44 +0,0 @@
1
-#!/bin/bash
2
-
3
-. bash_library.sh # source bash_library.sh
4
-
5
-windoz=""
6
-if  [[ $1 = "-w" ]]; then
7
-    windoz="windoz"
8
-fi
9
-
10
-log "cd frontend_lib"
11
-cd frontend_lib
12
-log "npm i"
13
-npm i
14
-log "sudo npm link"
15
-sudo npm link
16
-log "npm run buildtracimlib$windoz"
17
-npm run buildtracimlib$windoz
18
-cd -
19
-
20
-log "cd frontend_app_html-document"
21
-cd frontend_app_html-document
22
-log "npm i"
23
-npm i
24
-log "npm link tracim_frontend_lib"
25
-npm link tracim_frontend_lib
26
-log "npm run build$windoz # for frontend_app_html-document"
27
-npm run build$windoz
28
-log "cp dist/html-document.app.js"
29
-cp dist/html-document.app.js ../frontend/dist/app
30
-cd -
31
-
32
-log "cd frontend"
33
-cd frontend
34
-log "npm i"
35
-npm i
36
-log "npm link tracim_frontend_lib"
37
-npm link tracim_frontend_lib
38
-if [[ $1 = "-w" ]]; then
39
-    log "npm run servdev # for frontend"
40
-    npm run servdev
41
-else
42
-    log "npm run servdev-dashboard # for frontend"
43
-    npm run servdev-dashboard
44
-fi

+ 1 - 1
frontend/src/appFactory.js View File

@@ -25,7 +25,7 @@ export function appFactory (WrappedComponent) {
25 25
         apiHeader: FETCH_CONFIG.headers // should this be used by app ? right now, apps have their own headers
26 26
       },
27 27
       idWorkspace,
28
-      idFolder
28
+      idFolder: idFolder === 'null' ? null : idFolder
29 29
     })
30 30
 
31 31
     emitEventApp = (type, data) => GLOBAL_dispatchEvent({ type, data })

+ 0 - 1
frontend/src/css/Login.styl View File

@@ -45,7 +45,6 @@
45 45
         padding-left 45px
46 46
     &__btnsubmit
47 47
       display block
48
-      margin 0 auto
49 48
       border none
50 49
       width 150px
51 50
       background-color green

+ 25 - 0
install_frontend_dependencies.sh View File

@@ -0,0 +1,25 @@
1
+#!/bin/bash
2
+
3
+. bash_library.sh # source bash_library.sh
4
+
5
+log "cd frontend_lib"
6
+cd frontend_lib
7
+log "npm i"
8
+npm i
9
+log "sudo npm link"
10
+sudo npm link
11
+cd -
12
+
13
+log "cd frontend_app_html-document"
14
+cd frontend_app_html-document
15
+log "npm i"
16
+npm i
17
+log "npm link tracim_frontend_lib"
18
+npm link tracim_frontend_lib
19
+cd -
20
+
21
+log "cd frontend"
22
+cd frontend
23
+log "npm i"
24
+npm i
25
+cd -