X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=cmd%2Fweb%2FMakefile;h=85bba5bdfa3c48ed3625469c8e69bf4863c7ed3f;hb=87b6d05e5b289f3e9d1554fe455296ba09655c3a;hp=2ebb734d0397af420959fb6f064c72f5a42dd6dc;hpb=2f91f20a8645339385ada602684f4957f20f4da4;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FFront.git

diff --git a/cmd/web/Makefile b/cmd/web/Makefile
index 2ebb734..85bba5b 100644
--- a/cmd/web/Makefile
+++ b/cmd/web/Makefile
@@ -4,20 +4,24 @@ export PATH := $(PATH):./node_modules/.bin
 
 SRC_DIR=js
 BUILD_DIR=build/js
-JSX_SRC= main.jsx signup.jsx signin.jsx otp.jsx poloniex.jsx
+JSX_SRC= header_footer.jsx main.jsx signup.jsx signin.jsx otp.jsx poloniex.jsx password_reset.jsx change_password.jsx
 JS_SRC= cookies.js app.js api.js
-STATIC_FILES= index.html style.css cryptocoins.css cryptocoins.ttf cryptocoins.woff cryptocoins.woff2
+STATIC_FILES= index.html style.css
 JSX_OBJS=$(addprefix $(BUILD_DIR)/,$(JSX_SRC:.jsx=.js))
 JS_OBJS=$(addprefix $(BUILD_DIR)/,$(JS_SRC))
+ICONS=$(addprefix $(STATIC_BUILD_DIR)/icons/black/, $(notdir $(wildcard static/icons/black/*.svg)))
+ICONS+=$(addprefix $(STATIC_BUILD_DIR)/icons/color/, $(notdir $(wildcard static/icons/color/*.svg)))
 STATIC_BUILD_DIR=build/static
 
+$(info $(ICONS))
+
 install:
 	node --version
 	npm --version
 	yarn --version
 	yarn install
 
-static: $(STATIC_BUILD_DIR) js $(addprefix $(STATIC_BUILD_DIR)/, $(STATIC_FILES))
+static: $(STATIC_BUILD_DIR) js $(addprefix $(STATIC_BUILD_DIR)/, $(STATIC_FILES)) $(ICONS)
 
 js: build/static/main.js
 
@@ -27,24 +31,28 @@ $(STATIC_BUILD_DIR)/%: static/%
 $(STATIC_BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
 	mkdir -p $@
+	mkdir -p $@/icons/black
+	mkdir -p $@/icons/color
 
 $(BUILD_DIR)/%.js: $(SRC_DIR)/%.jsx
-	jscs --fix $<
-	babel $< -o $@
-	jshint $@
+	eslint --fix $<
+	cp $< $@
 
 $(BUILD_DIR)/%.js: $(SRC_DIR)/%.js
-	jscs --fix $<
+	eslint $<
+	cp $< $@
+
+$(STATIC_BUILD_DIR)/icons/black/%.svg: static/icons/black/%.svg
 	cp $< $@
-	jshint $@
 
 build/static/main.js: $(JSX_OBJS) $(JS_OBJS) env/$(ENV).env
-	browserify -t [ localenvify --envfile env/$(ENV).env ] \
-						 -t [ debowerify ]  \
-						 $(BUILD_DIR)/main.js -o $@
+	browserify -t [ babelify --presets [ env react ] --plugins [ transform-class-properties ] ] \
+			   -t [ localenvify --envfile env/$(ENV).env ] \
+			   -t [ debowerify ]  \
+			    $(BUILD_DIR)/main.js -o $@
 
-build/webapp.tar.gz: $(addprefix $(STATIC_BUILD_DIR)/, $(STATIC_FILES)) build/static/main.js
-	tar czf $@ --directory=$(dir $<) $(notdir $^)
+build/webapp.tar.gz: $(addprefix $(STATIC_BUILD_DIR)/, $(STATIC_FILES)) build/static/main.js $(ICONS)
+	tar czf $@ --directory=$(dir $<) $(subst $(STATIC_BUILD_DIR)/,,$^)
 
 release: $(STATIC_BUILD_DIR) build/webapp.tar.gz