From aec74bd8d67d526d5e3c20aaa98e929bd78c2f1e Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Fri, 30 Jun 2017 15:09:00 +0100 Subject: [PATCH] Move fonts and add go to editorconfig --- .editorconfig | 5 +++ .../{ => assets}/fonts/material/icons.woff2 | Bin .../fonts/roboto/medium-cyrillic-ext.woff2 | Bin .../fonts/roboto/medium-cyrillic.woff2 | Bin .../fonts/roboto/medium-greek-ext.woff2 | Bin .../fonts/roboto/medium-greek.woff2 | Bin .../fonts/roboto/medium-latin-ext.woff2 | Bin .../fonts/roboto/medium-latin.woff2 | Bin .../fonts/roboto/medium-vietnamese.woff2 | Bin .../fonts/roboto/normal-cyrillic-ext.woff2 | Bin .../fonts/roboto/normal-cyrillic.woff2 | Bin .../fonts/roboto/normal-greek-ext.woff2 | Bin .../fonts/roboto/normal-greek.woff2 | Bin .../fonts/roboto/normal-latin-ext.woff2 | Bin .../fonts/roboto/normal-latin.woff2 | Bin .../fonts/roboto/normal-vietnamese.woff2 | Bin _assets/src/css/fonts.css | 30 +++++++++--------- _assets/src/main.js | 2 -- _assets/src/store/getters.js | 14 ++++++++ _assets/src/store/store.js | 14 +------- _assets/src/webdav.js | 1 + 21 files changed, 36 insertions(+), 30 deletions(-) rename _assets/src/{ => assets}/fonts/material/icons.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/medium-cyrillic-ext.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/medium-cyrillic.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/medium-greek-ext.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/medium-greek.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/medium-latin-ext.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/medium-latin.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/medium-vietnamese.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/normal-cyrillic-ext.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/normal-cyrillic.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/normal-greek-ext.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/normal-greek.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/normal-latin-ext.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/normal-latin.woff2 (100%) rename _assets/src/{ => assets}/fonts/roboto/normal-vietnamese.woff2 (100%) create mode 100644 _assets/src/store/getters.js diff --git a/.editorconfig b/.editorconfig index 9d08a1a8..a34668e5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,3 +7,8 @@ indent_size = 2 end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true + +# 4 space indentation +[*.go] +indent_style = tab +indent_size = 4 \ No newline at end of file diff --git a/_assets/src/fonts/material/icons.woff2 b/_assets/src/assets/fonts/material/icons.woff2 similarity index 100% rename from _assets/src/fonts/material/icons.woff2 rename to _assets/src/assets/fonts/material/icons.woff2 diff --git a/_assets/src/fonts/roboto/medium-cyrillic-ext.woff2 b/_assets/src/assets/fonts/roboto/medium-cyrillic-ext.woff2 similarity index 100% rename from _assets/src/fonts/roboto/medium-cyrillic-ext.woff2 rename to _assets/src/assets/fonts/roboto/medium-cyrillic-ext.woff2 diff --git a/_assets/src/fonts/roboto/medium-cyrillic.woff2 b/_assets/src/assets/fonts/roboto/medium-cyrillic.woff2 similarity index 100% rename from _assets/src/fonts/roboto/medium-cyrillic.woff2 rename to _assets/src/assets/fonts/roboto/medium-cyrillic.woff2 diff --git a/_assets/src/fonts/roboto/medium-greek-ext.woff2 b/_assets/src/assets/fonts/roboto/medium-greek-ext.woff2 similarity index 100% rename from _assets/src/fonts/roboto/medium-greek-ext.woff2 rename to _assets/src/assets/fonts/roboto/medium-greek-ext.woff2 diff --git a/_assets/src/fonts/roboto/medium-greek.woff2 b/_assets/src/assets/fonts/roboto/medium-greek.woff2 similarity index 100% rename from _assets/src/fonts/roboto/medium-greek.woff2 rename to _assets/src/assets/fonts/roboto/medium-greek.woff2 diff --git a/_assets/src/fonts/roboto/medium-latin-ext.woff2 b/_assets/src/assets/fonts/roboto/medium-latin-ext.woff2 similarity index 100% rename from _assets/src/fonts/roboto/medium-latin-ext.woff2 rename to _assets/src/assets/fonts/roboto/medium-latin-ext.woff2 diff --git a/_assets/src/fonts/roboto/medium-latin.woff2 b/_assets/src/assets/fonts/roboto/medium-latin.woff2 similarity index 100% rename from _assets/src/fonts/roboto/medium-latin.woff2 rename to _assets/src/assets/fonts/roboto/medium-latin.woff2 diff --git a/_assets/src/fonts/roboto/medium-vietnamese.woff2 b/_assets/src/assets/fonts/roboto/medium-vietnamese.woff2 similarity index 100% rename from _assets/src/fonts/roboto/medium-vietnamese.woff2 rename to _assets/src/assets/fonts/roboto/medium-vietnamese.woff2 diff --git a/_assets/src/fonts/roboto/normal-cyrillic-ext.woff2 b/_assets/src/assets/fonts/roboto/normal-cyrillic-ext.woff2 similarity index 100% rename from _assets/src/fonts/roboto/normal-cyrillic-ext.woff2 rename to _assets/src/assets/fonts/roboto/normal-cyrillic-ext.woff2 diff --git a/_assets/src/fonts/roboto/normal-cyrillic.woff2 b/_assets/src/assets/fonts/roboto/normal-cyrillic.woff2 similarity index 100% rename from _assets/src/fonts/roboto/normal-cyrillic.woff2 rename to _assets/src/assets/fonts/roboto/normal-cyrillic.woff2 diff --git a/_assets/src/fonts/roboto/normal-greek-ext.woff2 b/_assets/src/assets/fonts/roboto/normal-greek-ext.woff2 similarity index 100% rename from _assets/src/fonts/roboto/normal-greek-ext.woff2 rename to _assets/src/assets/fonts/roboto/normal-greek-ext.woff2 diff --git a/_assets/src/fonts/roboto/normal-greek.woff2 b/_assets/src/assets/fonts/roboto/normal-greek.woff2 similarity index 100% rename from _assets/src/fonts/roboto/normal-greek.woff2 rename to _assets/src/assets/fonts/roboto/normal-greek.woff2 diff --git a/_assets/src/fonts/roboto/normal-latin-ext.woff2 b/_assets/src/assets/fonts/roboto/normal-latin-ext.woff2 similarity index 100% rename from _assets/src/fonts/roboto/normal-latin-ext.woff2 rename to _assets/src/assets/fonts/roboto/normal-latin-ext.woff2 diff --git a/_assets/src/fonts/roboto/normal-latin.woff2 b/_assets/src/assets/fonts/roboto/normal-latin.woff2 similarity index 100% rename from _assets/src/fonts/roboto/normal-latin.woff2 rename to _assets/src/assets/fonts/roboto/normal-latin.woff2 diff --git a/_assets/src/fonts/roboto/normal-vietnamese.woff2 b/_assets/src/assets/fonts/roboto/normal-vietnamese.woff2 similarity index 100% rename from _assets/src/fonts/roboto/normal-vietnamese.woff2 rename to _assets/src/assets/fonts/roboto/normal-vietnamese.woff2 diff --git a/_assets/src/css/fonts.css b/_assets/src/css/fonts.css index 4fef9f99..f355f0e8 100644 --- a/_assets/src/css/fonts.css +++ b/_assets/src/css/fonts.css @@ -2,7 +2,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/normal-cyrillic-ext.woff2) format('woff2'); + src: local('Roboto'), local('Roboto-Regular'), url(../assets/fonts/roboto/normal-cyrillic-ext.woff2) format('woff2'); unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; } @@ -10,7 +10,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/normal-cyrillic.woff2) format('woff2'); + src: local('Roboto'), local('Roboto-Regular'), url(../assets/fonts/roboto/normal-cyrillic.woff2) format('woff2'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } @@ -18,7 +18,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/normal-greek-ext.woff2) format('woff2'); + src: local('Roboto'), local('Roboto-Regular'), url(../assets/fonts/roboto/normal-greek-ext.woff2) format('woff2'); unicode-range: U+1F00-1FFF; } @@ -26,7 +26,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/normal-greek.woff2) format('woff2'); + src: local('Roboto'), local('Roboto-Regular'), url(../assets/fonts/roboto/normal-greek.woff2) format('woff2'); unicode-range: U+0370-03FF; } @@ -34,7 +34,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/normal-vietnamese.woff2) format('woff2'); + src: local('Roboto'), local('Roboto-Regular'), url(../assets/fonts/roboto/normal-vietnamese.woff2) format('woff2'); unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } @@ -42,7 +42,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/normal-latin-ext.woff2) format('woff2'); + src: local('Roboto'), local('Roboto-Regular'), url(../assets/fonts/roboto/normal-latin-ext.woff2) format('woff2'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } @@ -50,7 +50,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto/normal-latin.woff2) format('woff2'); + src: local('Roboto'), local('Roboto-Regular'), url(../assets/fonts/roboto/normal-latin.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } @@ -58,7 +58,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/medium-cyrillic-ext.woff2) format('woff2'); + src: local('Roboto Medium'), local('Roboto-Medium'), url(../assets/fonts/roboto/medium-cyrillic-ext.woff2) format('woff2'); unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; } @@ -66,7 +66,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/medium-cyrillic.woff2) format('woff2'); + src: local('Roboto Medium'), local('Roboto-Medium'), url(../assets/fonts/roboto/medium-cyrillic.woff2) format('woff2'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } @@ -74,7 +74,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/medium-greek-ext.woff2) format('woff2'); + src: local('Roboto Medium'), local('Roboto-Medium'), url(../assets/fonts/roboto/medium-greek-ext.woff2) format('woff2'); unicode-range: U+1F00-1FFF; } @@ -82,7 +82,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/medium-greek.woff2) format('woff2'); + src: local('Roboto Medium'), local('Roboto-Medium'), url(../assets/fonts/roboto/medium-greek.woff2) format('woff2'); unicode-range: U+0370-03FF; } @@ -90,7 +90,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/medium-vietnamese.woff2) format('woff2'); + src: local('Roboto Medium'), local('Roboto-Medium'), url(../assets/fonts/roboto/medium-vietnamese.woff2) format('woff2'); unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } @@ -98,7 +98,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/medium-latin-ext.woff2) format('woff2'); + src: local('Roboto Medium'), local('Roboto-Medium'), url(../assets/fonts/roboto/medium-latin-ext.woff2) format('woff2'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } @@ -106,7 +106,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto/medium-latin.woff2) format('woff2'); + src: local('Roboto Medium'), local('Roboto-Medium'), url(../assets/fonts/roboto/medium-latin.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } @@ -114,7 +114,7 @@ font-family: 'Material Icons'; font-style: normal; font-weight: 400; - src: local('Material Icons'), local('MaterialIcons-Regular'), url(../fonts/material/icons.woff2) format('woff2'); + src: local('Material Icons'), local('MaterialIcons-Regular'), url(../assets/fonts/material/icons.woff2) format('woff2'); } .prompt .file-list ul li:before, diff --git a/_assets/src/main.js b/_assets/src/main.js index c21e8511..23ef437f 100644 --- a/_assets/src/main.js +++ b/_assets/src/main.js @@ -1,5 +1,3 @@ -// The Vue build version to load with the `import` command -// (runtime-only or standalone) has been set in webpack.base.conf with an alias. import Vue from 'vue' import App from './App' import store from './store/store' diff --git a/_assets/src/store/getters.js b/_assets/src/store/getters.js new file mode 100644 index 00000000..9cdec4f7 --- /dev/null +++ b/_assets/src/store/getters.js @@ -0,0 +1,14 @@ +const getters = { + showOverlay: state => { + return state.showInfo || + state.showHelp || + state.showDelete || + state.showRename || + state.showMove || + state.showNewFile || + state.showNewDir + }, + selectedCount: state => state.selected.length +} + +export default getters diff --git a/_assets/src/store/store.js b/_assets/src/store/store.js index e452bae1..7f9c19d9 100644 --- a/_assets/src/store/store.js +++ b/_assets/src/store/store.js @@ -1,6 +1,7 @@ import Vue from 'vue' import Vuex from 'vuex' import mutations from './mutations' +import getters from './getters' Vue.use(Vuex) @@ -21,19 +22,6 @@ const state = { showNewDir: false } -const getters = { - showOverlay: state => { - return state.showInfo || - state.showHelp || - state.showDelete || - state.showRename || - state.showMove || - state.showNewFile || - state.showNewDir - }, - selectedCount: state => state.selected.length -} - export default new Vuex.Store({ strict: process.env.NODE_ENV !== 'production', state, diff --git a/_assets/src/webdav.js b/_assets/src/webdav.js index bd40f3a4..c6d797db 100644 --- a/_assets/src/webdav.js +++ b/_assets/src/webdav.js @@ -1,3 +1,4 @@ +// TODO: use store var $ = window.info function convertURL (url) {