Various fixes.

[perso/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Front.git] / cmd / web / Makefile

diff --git a/cmd/web/Makefile b/cmd/web/Makefile
index 1d980854639fc27a19a258315940ce693671d6fb..52e2289a9adc4b27b5738a653adca28a6725e34d 100644 (file)
--- a/cmd/web/Makefile
+++ b/cmd/web/Makefile
@@ -4,10 +4,14 @@ 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 account.jsx
 JS_SRC= cookies.js app.js api.js
+STATIC_FILES= index.html style.css fontello.css
+STATIC_FILES+=$(addprefix fonts/, fontello.eot fontello.svg fontello.ttf fontello.woff fontello.woff2)
 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
 
 install:
@@ -16,37 +20,79 @@ install:
        yarn --version
        yarn install
 
-static: js $(STATIC_BUILD_DIR)/index.html $(STATIC_BUILD_DIR)/style.css
+static: $(STATIC_BUILD_DIR) $(STATIC_BUILD_DIR)/fonts js $(addprefix $(STATIC_BUILD_DIR)/, $(STATIC_FILES)) $(ICONS)
 
 js: build/static/main.js
 
-$(STATIC_BUILD_DIR)/index.html: static/index.html
-       cp static/index.html $@
+$(STATIC_BUILD_DIR)/%: static/%
+       cp $< $@
+
+$(STATIC_BUILD_DIR):
+       mkdir -p $(BUILD_DIR)
+       mkdir -p $@
+       mkdir -p $@/icons/black
+       mkdir -p $@/icons/color
 
-$(STATIC_BUILD_DIR)/style.css: static/style.css
-       cp static/style.css $@
+$(STATIC_BUILD_DIR)/fonts:
+       mkdir -p $@
 
 $(BUILD_DIR)/%.js: $(SRC_DIR)/%.jsx
-       mkdir -p $(@D)
-       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: $(STATIC_BUILD_DIR)/main.js $(STATIC_BUILD_DIR)/index.html $(STATIC_BUILD_DIR)/style.css
-       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: build/webapp.tar.gz
+release: $(STATIC_BUILD_DIR) build/webapp.tar.gz
 
 clean:
        rm -rf build
-       rm -rf node_modules
\ No newline at end of file
+       rm -rf node_modules
+
+
+FONT_DIR = ./static/fontello
+FONTELLO_HOST ?= http://fontello.com
+
+fontopen:
+       @if test ! `which curl` ; then \
+               echo 'Install curl first.' >&2 ; \
+               exit 128 ; \
+               fi
+       curl --silent --show-error --fail --output .fontello \
+               --form "config=@fontello_config.json" \
+               ${FONTELLO_HOST}
+       x-www-browser ${FONTELLO_HOST}/`cat .fontello`
+
+
+fontsave:
+       @if test ! `which unzip` ; then \
+               echo 'Install unzip first.' >&2 ; \
+               exit 128 ; \
+               fi
+       @if test ! -e .fontello ; then \
+               echo 'Run `make fontopen` first.' >&2 ; \
+               exit 128 ; \
+               fi
+       rm -rf .fontello.src .fontello.zip
+       curl --silent --show-error --fail --output .fontello.zip \
+               ${FONTELLO_HOST}/`cat .fontello`/get
+       unzip .fontello.zip -d .fontello.src
+       rm -rf ${FONT_DIR}
+       mv `find ./.fontello.src -maxdepth 1 -name 'fontello-*'` ${FONT_DIR}
+       rm -rf .fontello.src .fontello.zip
+       cp ${FONT_DIR}/font/* static/fonts/
+       cp ${FONT_DIR}/css/fontello-codes.css static/fontello.css
+       rm -rf ${FONT_DIR}
\ No newline at end of file