From b8f07a7b344807b88711e8ff2ad1f2ff4e2b4bc4 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Thu, 22 Oct 2020 15:02:20 +0200 Subject: [PATCH] redo some makefile stuff, add jdbc for backend --- .../Deps__org_clojure_java_jdbc_0_7_11.xml | 9 +++++ Makefile | 23 +++++++------ backend/backend.iml | 1 + backend/deps.edn | 3 +- backend/resources/public/index.html | 2 ++ frontend/assets/img/klammer.svg | 12 +++++++ frontend/assets/sass/style.scss | 34 +++++++++++++++---- frontend/src/Main.elm | 8 ++--- 8 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 .idea/libraries/Deps__org_clojure_java_jdbc_0_7_11.xml create mode 100644 frontend/assets/img/klammer.svg diff --git a/.idea/libraries/Deps__org_clojure_java_jdbc_0_7_11.xml b/.idea/libraries/Deps__org_clojure_java_jdbc_0_7_11.xml new file mode 100644 index 0000000..2056dfb --- /dev/null +++ b/.idea/libraries/Deps__org_clojure_java_jdbc_0_7_11.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Makefile b/Makefile index 29b7456..21f6f32 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ ROOT=$(shell pwd) -BACKEND_ASSETS_DIR=backend/resources/public/compiled -TARGET_CSS_DIR=$(BACKEND_ASSETS_DIR)/css +SOURCE_ASSETS_IMG_DIR=frontend/assets/img +SOURCE_ASSETS_IMG_FILES=$(wildcard frontend/assets/img/*) +TARGET_ASSETS_IMG_DIR=frontend/compiled/img + +TARGET_CSS_DIR=frontend/compiled/css TARGET_CSS_FILE=$(TARGET_CSS_DIR)/style.css -LIVE_CSS_DIR=frontend/compiled/css -LIVE_CSS_FILE=$(LIVE_CSS_DIR)/style.css TARGET_JS_DIR=$(BACKEND_ASSETS_DIR)/js TARGET_JS_FILE=$(TARGET_JS_DIR)/app.js @@ -15,7 +16,7 @@ SOURCE_SASS_FILE=frontend/assets/sass/style.scss INDEX_FILE=backend/resources/public/index.html .PHONY: compile -compile: $(TARGET_JS_FILE) $(TARGET_CSS_FILE) +compile: $(TARGET_JS_FILE) $(TARGET_CSS_FILE) $(TARGET_ASSETS_IMG_DIR) $(TARGET_JS_FILE): $(SOURCE_ELM_FILES) mkdir -p $(TARGET_JS_DIR) @@ -25,9 +26,9 @@ $(TARGET_CSS_FILE): $(SOURCE_SASS_FILE) mkdir -p $(TARGET_CSS_DIR) sassc --style compressed $(SOURCE_SASS_FILE) > $(TARGET_CSS_FILE) -$(LIVE_CSS_FILE): $(SOURCE_SASS_FILE) - mkdir -p $(LIVE_CSS_DIR) - sassc $(SOURCE_SASS_FILE) > $(LIVE_CSS_FILE) +$(TARGET_ASSETS_IMG_DIR): $(SOURCE_ASSETS_IMG_FILES) + mkdir -p $(TARGET_ASSETS_IMG_DIR) + cp $(SOURCE_ASSETS_IMG_DIR)/* $(TARGET_ASSETS_IMG_DIR) .PHONY: compile-debug compile-debug: @@ -44,6 +45,6 @@ elm-live: --debug \ --output=compiled/js/app.js -.PHONE: sass-live -sass-live: - while sleep 1; do make -s $(LIVE_CSS_FILE); done +.PHONY: assets-live +assets-live: + while sleep 1; do make -s $(TARGET_CSS_FILE); make -s $(TARGET_ASSETS_IMG_DIR); done diff --git a/backend/backend.iml b/backend/backend.iml index 8bbd6f0..c843824 100644 --- a/backend/backend.iml +++ b/backend/backend.iml @@ -44,6 +44,7 @@ + diff --git a/backend/deps.edn b/backend/deps.edn index 67a5648..959a7f3 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -2,5 +2,6 @@ {http-kit/http-kit {:mvn/version "2.3.0"} metosin/reitit {:mvn/version "0.5.6"} ring/ring-defaults {:mvn/version "0.3.2"} - hiccup/hiccup {:mvn/version "1.0.5"}} + hiccup/hiccup {:mvn/version "1.0.5"} + org.clojure/java.jdbc {:mvn/version "0.7.11"}} :paths ["src" "resources"]} diff --git a/backend/resources/public/index.html b/backend/resources/public/index.html index 007feca..c030aff 100644 --- a/backend/resources/public/index.html +++ b/backend/resources/public/index.html @@ -25,6 +25,8 @@ let uuid = localStorage.getItem("uuid") || createUUID(); localStorage.setItem("uuid", uuid) + console.debug("your uuid is " + uuid) + Elm.Main.init({ flags: { userUuid: uuid diff --git a/frontend/assets/img/klammer.svg b/frontend/assets/img/klammer.svg new file mode 100644 index 0000000..24f5cdd --- /dev/null +++ b/frontend/assets/img/klammer.svg @@ -0,0 +1,12 @@ + + +image/svg+xml + + + + + diff --git a/frontend/assets/sass/style.scss b/frontend/assets/sass/style.scss index aedab33..07fd22c 100644 --- a/frontend/assets/sass/style.scss +++ b/frontend/assets/sass/style.scss @@ -1,3 +1,5 @@ +$ciColor: #691487; + html { font-family: sans-serif; } @@ -5,22 +7,42 @@ html { body { display: grid; grid-template-areas: - "title navbar" + "navbar navbar" "content content"; grid-template-columns: 20rem 1fr; margin: 0; } -.app-title { - grid-area: title; - margin: 0; -} - nav { grid-area: navbar; align-self: center; + background-color: $ciColor; + color: white; + padding: 5px; + + display: grid; + grid-template-areas: "title rest-nav"; + grid-template-columns: 15em 1fr; + + .app-title { + margin: 0; + padding-left: .5em; + grid-area: title; + background-image: url("../img/klammer.svg"); + background-repeat: no-repeat; + background-size: contain; + } + + .board-search-input { + background-color: white; + border-radius: .3em; + border: 1px solid white; + padding: .4em; + } + ul { + grid-area: rest-nav; list-style-type: none; margin: 0; padding: 0; diff --git a/frontend/src/Main.elm b/frontend/src/Main.elm index d0e10b3..b8086db 100644 --- a/frontend/src/Main.elm +++ b/frontend/src/Main.elm @@ -83,11 +83,11 @@ view : Model -> Browser.Document Msg view model = { title = "Open-Retro" , body = - [ h1 [ class "app-title" ] [ text "Open-Retro" ] - , nav [] - [ ul [] + [ nav [] + [ h1 [ class "app-title" ] [ text "Open-Retro" ] + , ul [] [ li [] - [ input [ placeholder "Board ID..." ] [] + [ input [ class "board-search-input", placeholder "Board ID..." ] [] ] , li [] [ text "⊕ New board"