diff --git a/.drone.yml b/.drone.yml index ed452c1..f051951 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,9 +6,10 @@ steps: image: node commands: - make build-view + - make git-json volumes: - - name: cache - path: /drone/src/view/node_modules + - name: cache + path: /drone/src/view/node_modules - name: deploy image: alpacadb/docker-lftp environment: diff --git a/Makefile b/Makefile index fc761ea..cd68545 100755 --- a/Makefile +++ b/Makefile @@ -1,15 +1,18 @@ MAKEFLAGS += -j2 -export PORT = 8080 +dev: export PORT = 8080 dev: dev-server dev-view dev-server: - cd server && gin run main.go + cd server && gin -p $$PORT run main.go dev-view: cd view && npm run dev build: build-view build-view: - cd view && npm i && npm run build \ No newline at end of file + cd view && npm i && npm run build + +git-json: + echo "[$$(git log --pretty=format:'{"id":"%h","subject":"%s","date":"%cD"},')]" | sed "s/,]/]/g" > view/public/build/commits.json \ No newline at end of file diff --git a/view/src/App.svelte b/view/src/App.svelte index f645083..3bd9226 100755 --- a/view/src/App.svelte +++ b/view/src/App.svelte @@ -3,6 +3,7 @@ import * as routes from "./routes"; import ToastWrapper from "./components/Toast/ToastWrapper.svelte"; import { route as currentRoute } from "./stores"; + import Changelog from "components/Changelog"; {#if $currentRoute.startsWith("editor")} diff --git a/view/src/components/Changelog/Commit.svelte b/view/src/components/Changelog/Commit.svelte new file mode 100644 index 0000000..25ce069 --- /dev/null +++ b/view/src/components/Changelog/Commit.svelte @@ -0,0 +1,7 @@ + + +

+ {commit.subject} +

diff --git a/view/src/routes/changelog.svelte b/view/src/routes/changelog.svelte new file mode 100644 index 0000000..9d7ede0 --- /dev/null +++ b/view/src/routes/changelog.svelte @@ -0,0 +1,65 @@ + + +
+ +

Changelog

+ + {#each commits as commit} + {#if checkDate(commit)} +

+ {prettyDate(commit.date)} +

+ {/if} + + + {/each} +
+ + diff --git a/view/src/routes/index.ts b/view/src/routes/index.ts index 172193f..da12535 100755 --- a/view/src/routes/index.ts +++ b/view/src/routes/index.ts @@ -1,2 +1,3 @@ export { default as main } from "./main.svelte" -export { default as list } from "./list.svelte" \ No newline at end of file +export { default as list } from "./list.svelte" +export { default as changelog } from "./changelog.svelte" \ No newline at end of file diff --git a/view/src/stores/commits.ts b/view/src/stores/commits.ts new file mode 100644 index 0000000..9d72aa0 --- /dev/null +++ b/view/src/stores/commits.ts @@ -0,0 +1,8 @@ +import { writable } from "svelte/store"; + + + +const store = writable([]); + + +export default store; \ No newline at end of file diff --git a/view/src/stores/index.ts b/view/src/stores/index.ts index b02c986..9cae437 100644 --- a/view/src/stores/index.ts +++ b/view/src/stores/index.ts @@ -1,3 +1,4 @@ import * as images from "./images"; export { images } -export { default as route } from "./route"; \ No newline at end of file +export { default as route } from "./route"; +export { default as commitStore } from "./commits"; \ No newline at end of file diff --git a/view/src/types.d.ts b/view/src/types.d.ts index acf87b0..80f9a27 100644 --- a/view/src/types.d.ts +++ b/view/src/types.d.ts @@ -11,6 +11,12 @@ interface Image { data: ArrayBuffer } +interface Commit { + id: string, + subject: string, + date: Date +} + declare module "*.frag" { const content: string; export default content;