From 327f62179115b0178f17578472664be0b2cebe2a Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Tue, 7 May 2019 22:40:46 +0900 Subject: [PATCH 1/2] refs #884 Add request loading circle in header menu --- .../store/TimelineSpace/HeaderMenu.spec.ts | 3 +- .../store/TimelineSpace/HeaderMenu.spec.ts | 3 +- .../assets/images/loading-spinner-wide.svg | 57 +++++++ .../components/TimelineSpace/HeaderMenu.vue | 154 ++++++++++-------- .../store/TimelineSpace/HeaderMenu.ts | 27 ++- src/renderer/utils/axiosLoading.ts | 39 +++++ 6 files changed, 205 insertions(+), 78 deletions(-) create mode 100644 src/renderer/assets/images/loading-spinner-wide.svg create mode 100644 src/renderer/utils/axiosLoading.ts diff --git a/spec/renderer/integration/store/TimelineSpace/HeaderMenu.spec.ts b/spec/renderer/integration/store/TimelineSpace/HeaderMenu.spec.ts index bc422844..fc26aa2e 100644 --- a/spec/renderer/integration/store/TimelineSpace/HeaderMenu.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/HeaderMenu.spec.ts @@ -14,7 +14,8 @@ const list: List = { const state = (): HeaderMenuState => { return { title: 'Home', - reload: false + reload: false, + loading: false } } diff --git a/spec/renderer/unit/store/TimelineSpace/HeaderMenu.spec.ts b/spec/renderer/unit/store/TimelineSpace/HeaderMenu.spec.ts index 574f2bb0..caed8457 100644 --- a/spec/renderer/unit/store/TimelineSpace/HeaderMenu.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/HeaderMenu.spec.ts @@ -6,7 +6,8 @@ describe('TimelineSpace/HeaderMenu', () => { beforeEach(() => { state = { title: 'Home', - reload: false + reload: false, + loading: false } }) describe('changeReload', () => { diff --git a/src/renderer/assets/images/loading-spinner-wide.svg b/src/renderer/assets/images/loading-spinner-wide.svg new file mode 100644 index 00000000..76847aa2 --- /dev/null +++ b/src/renderer/assets/images/loading-spinner-wide.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/renderer/components/TimelineSpace/HeaderMenu.vue b/src/renderer/components/TimelineSpace/HeaderMenu.vue index 49c63ca6..de5bdfe2 100644 --- a/src/renderer/components/TimelineSpace/HeaderMenu.vue +++ b/src/renderer/components/TimelineSpace/HeaderMenu.vue @@ -1,59 +1,66 @@