diff --git a/web/satellite/.gitignore b/web/satellite/.gitignore index f17f073f5..f95433400 100644 --- a/web/satellite/.gitignore +++ b/web/satellite/.gitignore @@ -4,6 +4,12 @@ dist coverage temp +# wasm related files +wasm_exec.js +wasm_exec.js.br +*.wasm +*.wasm.br + # local env files .env.local .env.*.local diff --git a/web/satellite/src/components/common/VLoader.vue b/web/satellite/src/components/common/VLoader.vue new file mode 100644 index 000000000..73a59a899 --- /dev/null +++ b/web/satellite/src/components/common/VLoader.vue @@ -0,0 +1,39 @@ +// Copyright (C) 2021 Storj Labs, Inc. +// See LICENSE for copying information. + + + + + + diff --git a/web/satellite/src/components/header/HeaderArea.vue b/web/satellite/src/components/header/HeaderArea.vue index a81c85e5c..37d2de729 100644 --- a/web/satellite/src/components/header/HeaderArea.vue +++ b/web/satellite/src/components/header/HeaderArea.vue @@ -1,7 +1,44 @@ -// Copyright (C) 2019 Storj Labs, Inc. +// Copyright (C) 2021 Storj Labs, Inc. // See LICENSE for copying information. - + - + diff --git a/web/satellite/src/components/header/headerArea.html b/web/satellite/src/components/header/headerArea.html deleted file mode 100644 index 079871c0d..000000000 --- a/web/satellite/src/components/header/headerArea.html +++ /dev/null @@ -1,31 +0,0 @@ - - - -
-
-
- -
- -

Close

-
-
- - - -
- - - -
diff --git a/web/satellite/src/components/header/headerArea.scss b/web/satellite/src/components/header/headerArea.scss deleted file mode 100644 index 3521fe9c8..000000000 --- a/web/satellite/src/components/header/headerArea.scss +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - -.header-container { - font-family: 'font_regular', sans-serif; - min-height: 62px; - background-color: #fff; - display: flex; - align-items: center; - justify-content: space-between; - padding: 0 30px; - position: relative; - - &__left-area { - display: flex; - align-items: center; - - &__logo-area { - width: 220px; - - &__menu-button { - display: none; - } - - &__close-button { - display: flex; - align-items: center; - cursor: pointer; - - &__title { - margin-left: 13px; - font-size: 16px; - line-height: 23px; - color: #a9b5c1; - } - } - } - } -} - -.logo { - cursor: pointer; -} - -.adapted-navigation { - position: absolute; - top: 62px; - left: 0; - z-index: 100; - height: 100vh; - background: #e6e9ef; -} - -.navigation-blur { - height: 100vh; - width: 100%; - position: absolute; - top: 62px; - left: 220px; - z-index: 100; - background: rgba(134, 134, 148, 0.4); -} - -.project-selection, -.resources-selection { - margin-right: 35px; -} - -@media screen and (min-width: 1281px) { - - .adapted-navigation, - .navigation-blur, - .header-container__left-area__close-button { - display: none; - } -} - -@media screen and (max-width: 1280px) { - - .header-container { - padding: 0 40px; - - &__left-area { - - &__logo-area { - - &__menu-button { - display: block; - cursor: pointer; - } - } - } - } - - .logo { - display: none; - } - - /deep/ .edit-project { - margin-left: 0; - } -} diff --git a/web/satellite/src/components/header/projectsDropdown/ProjectDropdown.vue b/web/satellite/src/components/header/projectsDropdown/ProjectDropdown.vue index 0b8710be8..25783a18c 100644 --- a/web/satellite/src/components/header/projectsDropdown/ProjectDropdown.vue +++ b/web/satellite/src/components/header/projectsDropdown/ProjectDropdown.vue @@ -3,7 +3,13 @@