Commit 6f44bddbf05858a8a9f01a0ba11507ccab165300

Authored by Georg Hopp
1 parent 262bf239

Some improvements to build

... ... @@ -12,6 +12,10 @@ WASM_EXTRA =
12 12 endif
13 13
14 14 define msg
  15 + @printf "\033[38;5;197m%s\033[0m" "$(1)"
  16 +endef
  17 +
  18 +define msgnl
15 19 @printf "\033[38;5;197m%s\033[0m\n" "$(1)"
16 20 endef
17 21
... ... @@ -20,38 +24,62 @@ start:
20 24 cargo watch -i static/ -i var/ -s "PROFILE=$(PROFILE) make run"
21 25
22 26 wasm:
23   - $(call msg,BUILD WASM UI)
  27 + $(call msgnl,BUILD WASM UI)
24 28 @PROFILE=$(PROFILE) wasm-pack build $(WASM_PROFILE) -d ../static/ui \
25 29 -t web ./ui -- $(WASM_EXTRA)
26 30
27 31 build:
28   - $(call msg,PATCH DIFFY)
29   - @cargo patch
30   - $(call msg,BUILD SERVER)
  32 + $(call msgnl,PATCH DIFFY)
  33 + @@PROFILE=$(PROFILE) cargo patch
  34 + $(call msgnl,BUILD SERVER)
31 35 @PROFILE=$(PROFILE) cargo build $(CARGO_PROFILE) --bin artshop-server
32 36
33 37 run: build wasm
34   - $(call msg,RUN SERVER)
  38 + $(call msgnl,RUN SERVER)
35 39 @PROFILE=$(PROFILE) cargo run $(CARGO_PROFILE) --bin artshop-server
36 40
37 41 release:
38 42 docker build -t artshop -f build/Dockerfile .
39 43
  44 +createdb: downdb devdb
  45 + $(call msg,TRY TO CONNECT TO DB )
  46 + @while true;\
  47 + do\
  48 + echo "SELECT VERSION();"|\
  49 + docker exec -i mariadb-dev \
  50 + mysql -p123456 >/dev/null 2>&1 && break;\
  51 + echo -n ".";\
  52 + sleep 3;\
  53 + done; echo
  54 + $(call msgnl,INITIALIZE APPLICATION DB)
  55 + echo "CREATE DATABASE artshop CHARACTER SET = 'utf8mb3' \
  56 + COLLATE = 'utf8mb3_general_ci'; \
  57 + GRANT ALL PRIVILEGES ON artshop.* TO 'artshop'@'%'"|\
  58 + docker exec -i mariadb-dev mysql -p123456
  59 + $(call msgnl,RUN MIGRATIONS)
  60 + @diesel migration run
  61 +
  62 +downdb:
  63 + $(call msgnl,STOP DB CONTAINER)
  64 + @docker stop mariadb-dev||true
  65 + $(call msgnl,REMOVE DB CONTAINER)
  66 + @docker rm -v mariadb-dev||true
  67 +
40 68 devdb:
41   - docker network create mariadb-dev-network
42   - docker run --detach --network mariadb-dev-network --name mariadb-dev \
  69 + $(call msgnl,CREATE DB CONTAINER)
  70 + @docker run --detach --name mariadb-dev \
43 71 -p 3306:3306 \
44 72 --env MARIADB_USER=artshop \
45 73 --env MARIADB_PASSWORD=123456 \
46 74 --env MARIADB_ROOT_PASSWORD=123456 mariadb:latest
47 75
48 76 enterdb:
49   - docker exec -it mariadb-dev mysql -D artshop -u artshop -p
  77 + docker exec -it mariadb-dev mysql -D artshop -u artshop -p123456||true
50 78 # docker run -it --network mariadb-dev-network --rm mariadb:latest \
51 79 # mysql -h mariadb-dev -u artshop -p
52 80
53 81 rootdb:
54   - docker exec -it mariadb-dev mysql -p
  82 + docker exec -it mariadb-dev mysql -p123456||true
55 83
56 84 clean:
57 85 cargo clean
... ...
... ... @@ -102,7 +102,7 @@ erstellen. Theoretisch könnte für solche Böcke dann Syntax-Highliting eingeba
102 102 ```shell
103 103 #!/bin/env sh
104 104
105   -FOO="foo"
  105 +FOO=\"foo\"
106 106
107 107 function func() {
108 108 local BAR=bar
... ... @@ -193,6 +193,6 @@ wie hier.</pre>
193 193 </ul>
194 194
195 195 [lnk1]: https://heise.de/tp/ 'Telepolis'
196   -[lnk2]: https://arkdown.land/markdown-table 'markdown.land' "
  196 +[lnk2]: https://arkdown.land/markdown-table 'markdown.land'"
197 197 , '2022-01-29 21:33:34.000'
198 198 , '2022-01-29 21:33:34.000' );
... ...
... ... @@ -91,6 +91,8 @@ macro_rules! upload_filename {
91 91
92 92
93 93 impl Image {
  94 + // TODO some handling for files that are not processed now
  95 + // that is uuid is still None.
94 96 pub(crate) fn path(&self, size :Size) -> String {
95 97 let uuid = Uuid::try_from( self.uuid
96 98 . as_ref()
... ...
... ... @@ -62,6 +62,12 @@
62 62 background: #f7f7f7;
63 63 }
64 64
  65 +.markdown img {
  66 + display: block;
  67 + margin-left: auto;
  68 + margin-right: auto;
  69 +}
  70 +
65 71 .markdown p {
66 72 text-align: justify;
67 73 text-indent: .5em;
... ...
... ... @@ -27,7 +27,7 @@ pub(super) async fn markdown_logic( mut rx_logic: broadcast::Receiver<MarkdownLo
27 27 MarkdownLogic::Store => {
28 28 let new_md = state.get_md();
29 29 if md.json.content != new_md {
30   - md.json.content = state.get_md();
  30 + md.json.content = new_md;
31 31 md.save().await.unwrap();
32 32 }
33 33 },
... ...
Please register or login to post a comment