diff --git a/.vscode/settings.json b/.vscode/settings.json index 499dbc9c..fc5e0c7f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,6 +8,12 @@ "./sashimi-platform", "./sashimi-webapp" ], + // Emmet + "emmet.syntaxProfiles": { + "vue-html": "html", + "vue": "html" + }, + // Aggressive eslint auto fix "eslint.autoFixOnSave": true, @@ -17,7 +23,9 @@ ] }, "eslint.validate": [ - "javascript", "html" + "javascript", "html", + "javascriptreact", + "vue" ], "vsicons.presets.angular": false } diff --git a/sashimi-webapp/index.html b/sashimi-webapp/index.html index 8d4ad8fe..ae43d43e 100644 --- a/sashimi-webapp/index.html +++ b/sashimi-webapp/index.html @@ -28,6 +28,23 @@ rel="stylesheet"> + + + + + + + + + + + + + + + + +
diff --git a/sashimi-webapp/package.json b/sashimi-webapp/package.json index b79e229e..a8595e46 100644 --- a/sashimi-webapp/package.json +++ b/sashimi-webapp/package.json @@ -30,10 +30,12 @@ "chai": "^3.5.0", "chalk": "^1.1.3", "chromedriver": "^2.27.2", + "codemirror": "^5.25.0", "connect-history-api-fallback": "^1.3.0", "cross-env": "^3.1.4", "cross-spawn": "^5.0.1", "css-loader": "^0.26.1", + "dom-compare": "^0.2.1", "eslint": "^3.14.1", "eslint-config-airbnb-base": "^11.0.1", "eslint-friendly-formatter": "^2.0.7", @@ -48,6 +50,7 @@ "file-loader": "^0.10.0", "friendly-errors-webpack-plugin": "^1.1.3", "function-bind": "^1.1.0", + "he": "^1.1.1", "highlight.js": "^9.9.0", "html-loader": "^0.4.5", "html-webpack-plugin": "^2.28.0", @@ -90,7 +93,7 @@ "url-loader": "^0.5.7", "vue": "^2.1.10", "vue-async-computed": "^3.0.0", - "vue-codemirror": "^2.1.8", + "vue-codemirror": "^3.0.3", "vue-loader": "^10.3.0", "vue-router": "^2.2.0", "vue-style-loader": "^2.0.0", diff --git a/sashimi-webapp/src/App.vue b/sashimi-webapp/src/App.vue index 5b20e9ff..d47b28e1 100644 --- a/sashimi-webapp/src/App.vue +++ b/sashimi-webapp/src/App.vue @@ -41,6 +41,10 @@ img { -ms-user-select: none; } +a { + color: black; + text-decoration: none; +} :focus { outline: 0; } @@ -119,7 +123,7 @@ img { } &-img { - width: $button-img-width; + width: $button-sashimi-width; } } @@ -144,7 +148,7 @@ img { } img { - width: 40px; + width: 150px; } p { diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Black.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Black.ttf new file mode 100755 index 00000000..093fbf96 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Black.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-BlackItalic.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-BlackItalic.ttf new file mode 100755 index 00000000..00db009e Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-BlackItalic.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Bold.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Bold.ttf new file mode 100755 index 00000000..a3ca4b60 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Bold.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-BoldItalic.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-BoldItalic.ttf new file mode 100755 index 00000000..1bccb977 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-BoldItalic.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraBold.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraBold.ttf new file mode 100755 index 00000000..a7324253 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraBold.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraBoldItalic.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraBoldItalic.ttf new file mode 100755 index 00000000..05e26d69 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraBoldItalic.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraLight.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraLight.ttf new file mode 100755 index 00000000..2ad4ac06 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraLight.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraLightItalic.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraLightItalic.ttf new file mode 100755 index 00000000..b73b0fa9 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-ExtraLightItalic.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Italic.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Italic.ttf new file mode 100755 index 00000000..85269a1d Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Italic.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Light.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Light.ttf new file mode 100755 index 00000000..2f5d0493 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Light.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-LightItalic.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-LightItalic.ttf new file mode 100755 index 00000000..bac17d00 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-LightItalic.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Regular.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Regular.ttf new file mode 100755 index 00000000..9abe932d Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-Regular.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-SemiBold.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-SemiBold.ttf new file mode 100755 index 00000000..c27eaf46 Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-SemiBold.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-SemiBoldItalic.ttf b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-SemiBoldItalic.ttf new file mode 100755 index 00000000..59b6402d Binary files /dev/null and b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans-SemiBoldItalic.ttf differ diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans.scss b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans.scss new file mode 100644 index 00000000..05de2966 --- /dev/null +++ b/sashimi-webapp/src/assets/fonts/Nunito_Sans/NunitoSans.scss @@ -0,0 +1,24 @@ +/* vietnamese */ +@font-face { + font-family: 'Nunito Sans'; + font-style: normal; + font-weight: 400; + src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(https://fonts.gstatic.com/s/nunitosans/v2/iJ4p9wO0GDKJ-D5teKuZqtDiNsR5a-9Oe_Ivpu8XWlY.woff2) format('woff2'); + unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Nunito Sans'; + font-style: normal; + font-weight: 400; + src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(https://fonts.gstatic.com/s/nunitosans/v2/iJ4p9wO0GDKJ-D5teKuZqqE8kM4xWR1_1bYURRojRGc.woff2) format('woff2'); + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Nunito Sans'; + font-style: normal; + font-weight: 400; + src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(https://fonts.gstatic.com/s/nunitosans/v2/iJ4p9wO0GDKJ-D5teKuZqogp9Q8gbYrhqGlRav_IXfk.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; +} \ No newline at end of file diff --git a/sashimi-webapp/src/assets/fonts/Nunito_Sans/OFL.txt b/sashimi-webapp/src/assets/fonts/Nunito_Sans/OFL.txt new file mode 100755 index 00000000..a6a76595 --- /dev/null +++ b/sashimi-webapp/src/assets/fonts/Nunito_Sans/OFL.txt @@ -0,0 +1,92 @@ +Copyright 2016 The Nunito Project Authors (contact@sansoxygen.com), +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/sashimi-webapp/src/assets/images/icons/icon-delete.svg b/sashimi-webapp/src/assets/images/icons/icon-delete.svg new file mode 100644 index 00000000..faa07c56 --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icon-delete.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-download.svg b/sashimi-webapp/src/assets/images/icons/icon-download.svg new file mode 100644 index 00000000..b0f4806c --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icon-download.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-duplicate.svg b/sashimi-webapp/src/assets/images/icons/icon-duplicate.svg new file mode 100644 index 00000000..fba751aa --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icon-duplicate.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-editor.svg b/sashimi-webapp/src/assets/images/icons/icon-editor.svg new file mode 100644 index 00000000..6b400add --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icon-editor.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-file.svg b/sashimi-webapp/src/assets/images/icons/icon-file.svg index ec42de78..ae1ebae1 100644 --- a/sashimi-webapp/src/assets/images/icons/icon-file.svg +++ b/sashimi-webapp/src/assets/images/icons/icon-file.svg @@ -1,13 +1,12 @@ - - - - document-file - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-folder.svg b/sashimi-webapp/src/assets/images/icons/icon-folder.svg index 3f00173f..7e86457c 100644 --- a/sashimi-webapp/src/assets/images/icons/icon-folder.svg +++ b/sashimi-webapp/src/assets/images/icons/icon-folder.svg @@ -1,13 +1,11 @@ - - - - file - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-new-file.svg b/sashimi-webapp/src/assets/images/icons/icon-new-file.svg new file mode 100644 index 00000000..cf5f58b2 --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icon-new-file.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-new-folder.svg b/sashimi-webapp/src/assets/images/icons/icon-new-folder.svg new file mode 100644 index 00000000..3feaa6ec --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icon-new-folder.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-split-screen.svg b/sashimi-webapp/src/assets/images/icons/icon-split-screen.svg new file mode 100644 index 00000000..9881fc2f --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icon-split-screen.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-upload.svg b/sashimi-webapp/src/assets/images/icons/icon-upload.svg new file mode 100644 index 00000000..ab51f542 --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icon-upload.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icon-viewer.svg b/sashimi-webapp/src/assets/images/icons/icon-viewer.svg new file mode 100644 index 00000000..2cf3f208 --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icon-viewer.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/sashimi-webapp/src/assets/images/icons/icons-folder.svg b/sashimi-webapp/src/assets/images/icons/icons-folder.svg new file mode 100644 index 00000000..670b7518 --- /dev/null +++ b/sashimi-webapp/src/assets/images/icons/icons-folder.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/sashimi-note.svg b/sashimi-webapp/src/assets/sashimi-note.svg new file mode 100644 index 00000000..22b5816f --- /dev/null +++ b/sashimi-webapp/src/assets/sashimi-note.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sashimi-webapp/src/assets/styles/loader.scss b/sashimi-webapp/src/assets/styles/loader.scss index 293bb357..9342d6df 100644 --- a/sashimi-webapp/src/assets/styles/loader.scss +++ b/sashimi-webapp/src/assets/styles/loader.scss @@ -3,5 +3,6 @@ @import './vendor/normalize/normalize'; @import './vendor/highlight.js/ocean.min'; @import './static/vendors/katex/katex.min'; +@import '../fonts/Nunito_Sans/NunitoSans.scss'; @import './variables'; diff --git a/sashimi-webapp/src/assets/styles/variables.scss b/sashimi-webapp/src/assets/styles/variables.scss index 1170af7c..4d2fa251 100644 --- a/sashimi-webapp/src/assets/styles/variables.scss +++ b/sashimi-webapp/src/assets/styles/variables.scss @@ -1,5 +1,5 @@ // $fonts -$font-primary: 'Avenir', Helvetica, Arial, sans-serif; +$font-primary: 'Avenir', 'Nunito Sans', Helvetica, Arial, sans-serif; $font-size-primary: 15px; $font-size-secondary: 14px; @@ -9,15 +9,18 @@ $documents-name-font-size: 13px; // widths and heights $content-navbar-height: 71px; -$file-manager-navbar-height: 122px; -$file-manager-navbar-height-mobile: 157px; +$file-manager-navbar-height: 134px; +$file-manager-navbar-height-mobile: 174px; -$button-logo-width: 155px; -$button-img-width: 35px; +$button-logo-width: 158px; +$button-sashimi-width: 35px; $navbar-elements-left-margin: 18px; $navbar-button-dropdown-width: 140px; +$searchbar-icons-width: 44px; +$searchbar-mobile-margin-left: 15px; + // colors $grey-background: #F7F7F7; $grey-border: #D5D5D5; diff --git a/sashimi-webapp/src/components/editor-viewer/Content.vue b/sashimi-webapp/src/components/editor-viewer/Content.vue index 838bc78c..89a65a48 100644 --- a/sashimi-webapp/src/components/editor-viewer/Content.vue +++ b/sashimi-webapp/src/components/editor-viewer/Content.vue @@ -1,13 +1,13 @@