Skip to content

Commit b30840b

Browse files
committed
Updating new UI
1 parent 11af96c commit b30840b

36 files changed

+1944
-1885
lines changed

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ deps:
3737

3838
build-frontend: deps
3939
@echo "Building frontend"
40-
cd src/public && npm run build
40+
cd src/public && npm run pretty && npm run build
4141

4242
releases: build-frontend
4343
@echo "Building Wigo releases"
@@ -131,6 +131,7 @@ clean:
131131
@rm -rf release
132132
@rm -rf $(DEBROOT)
133133
@rm -rf dev
134+
@rm -rf public
134135

135136
build-dev: deps
136137
@echo "Building Wigo for development"
@@ -157,7 +158,9 @@ run-dev: build-dev
157158
ln -s $(BASE_DIR)/probes/examples/$$probe $(BASE_DIR)/dev/probes/300/$$probe; \
158159
fi; \
159160
done; \
160-
ln -s $(BASE_DIR)/lib $(BASE_DIR)/dev/lib; \
161+
if [ ! -e $(BASE_DIR)/dev/lib ]; then \
162+
ln -s $(BASE_DIR)/lib $(BASE_DIR)/dev/lib; \
163+
fi; \
161164
if [ ! -e $(BASE_DIR)/dev/wigo.crt ]; then \
162165
(cd $(BASE_DIR)/dev && $(BASE_DIR)/release/current/generate_cert -ca=true -duration=87600h0m0s -host "127.0.0.1" --rsa-bits=4096;) \
163166
fi; \
@@ -166,7 +169,7 @@ run-dev: build-dev
166169
sleep 1; \
167170
tail -f $(BASE_DIR)/dev/wigo.log 2>/dev/null & \
168171
TAIL_PID=$$!; \
169-
cd $(BASE_DIR)/src/public && npm run watch; \
172+
cd $(BASE_DIR)/src/public && npm run pretty && npm run watch; \
170173
EXIT_CODE=$$?; \
171174
kill $$WIGO_PID $$TAIL_PID 2>/dev/null; \
172175
wait $$WIGO_PID $$TAIL_PID 2>/dev/null; \

src/public/index.html

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)