Startseite Erkunden Hilfe
Anmelden
bux
/
tracim_v2
Beobachten 1
Favorisieren 0
Fork 0
Code Issues 0 Pull-Requests 0 Releases 0 Wiki Aktivität
Quellcode durchsuchen

added rebuild frontend script + bugfix

Skylsmoi vor 6 Jahren
Ursprung
867ab8d2f5
Commit
11d71d47f9
6 geänderte Dateien mit 37 neuen und 60 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 2 2
      .gitignore
  2. 4 1
      first_install_frontend.sh
  3. 0 56
      frontend/dist/app/html-document.app.js
  4. 1 0
      frontend/dist/index.html
  5. 2 1
      frontend_lib/src/component/OptionComponent/NewVersionBtn.jsx
  6. 28 0
      rebuild_full_frontend.sh

+ 2 - 2
.gitignore Datei anzeigen 

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

+ 4 - 1
first_install_frontend.sh Datei anzeigen 

@@ -5,8 +5,11 @@ if  [[ $1 = "-w" ]]; then
5 5 
     windoz="windoz"
6 6 
 fi
7 7
8 
+BROWN='\033[0;33m'
9 
+NC='\033[0m' # No Color
10 
+
8 11 
 function log {
9 
-    echo -e "\n>> $ $1\n"
12 
+    echo -e "\n${BROWN}>> $ $1${NC}\n"
10 13 
 }
11 14
12 15 
 log "cd frontend_lib"

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 56
frontend/dist/app/html-document.app.js


+ 1 - 0
frontend/dist/index.html Datei anzeigen 

@@ -41,6 +41,7 @@
41 41 
       .primaryColorBorderLightenHover:hover { border-color: #a3744a; }
42 42 
     </style>
43 43 
   </head>
44 
+
44 45 
   <body>
45 46 
     <div id='content'></div>
46 47

+ 2 - 1
frontend_lib/src/component/OptionComponent/NewVersionBtn.jsx Datei anzeigen 

@@ -10,7 +10,8 @@ const NewVersionBtn = props => {
10 10 
       style={{
11 11 
         backgroundColor: '#fdfdfd',
12 12 
         color: '#333',
13 
-        border: '1px solid',
13 
+        borderWidth: '1px',
14 
+        borderStyle: 'solid',
14 15 
         borderColor: props.customColor,
15 16 
         ':hover': {
16 17 
           backgroundColor: props.customColor,

+ 28 - 0
rebuild_full_frontend.sh Datei anzeigen 

@@ -0,0 +1,28 @@
1 
+#!/bin/bash
2 
+
3 
+windoz=""
4 
+if  [[ $1 = "-w" ]]; then
5 
+    windoz="windoz"
6 
+fi
7 
+
8 
+BROWN='\033[0;33m'
9 
+NC='\033[0m' # No Color
10 
+
11 
+function log {
12 
+    echo -e "\n${BROWN}>> $ $1${NC}\n"
13 
+}
14 
+
15 
+echo -e "\n${BROWN}/!\ ${NC}this script does not run 'npm install'\n${BROWN}/!\ ${NC}it also assumes your webpack dev server of frontend is running"
16 
+
17 
+log "cd frontend_lib"
18 
+cd frontend_lib
19 
+log "npm run buildtracimlib$windoz"
20 
+npm run buildtracimlib$windoz
21 
+cd -
22 
+
23 
+log "cd frontend_app_html-document"
24 
+cd frontend_app_html-document
25 
+log "npm run build$windoz # for frontend_app_html-document"
26 
+npm run build$windoz
27 
+log "cp dist/html-document.app.js"
28 
+cp dist/html-document.app.js ../frontend/dist/app