Merge branch 'feature/redesign-2' of https://github.com/rule110-io/su…

…rge-ui into feature/redesign-2
rule110-io · Jan 23, 2022 · bce7ac8 · bce7ac8
2 parents a181905 + 23ad333
commit bce7ac8
Show file tree

Hide file tree

Showing 67 changed files with 313 additions and 1,149 deletions.
diff --git a/appicon.png b/appicon.png
diff --git a/appicon.psd b/appicon.psd
diff --git a/documentation/img/surge1.png b/documentation/img/surge1.png
diff --git a/documentation/img/surge2.png b/documentation/img/surge2.png
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -31,7 +31,6 @@
     "vue-filter-pretty-bytes": "^0.1.5",
     "vue-lodash": "^2.1.2",
     "vue-moment": "^4.1.0",
-    "vue-range-component": "^1.0.3",
     "vue-router": "^3.3.4",
     "vue-slider-component": "^3.2.15",
     "vue-tour": "^1.5.0",

diff --git a/frontend/src/assets/icons/TablePlaceholderIcon.svg b/frontend/src/assets/icons/TablePlaceholderIcon.svg
diff --git a/frontend/src/assets/scss/_main.scss b/frontend/src/assets/scss/_main.scss
@@ -27,6 +27,10 @@ body {
     -ms-user-select: none; /* Internet Explorer/Edge */
     user-select: none;
   }
+
+  input {
+    -webkit-user-select: text;
+  }
 }
 
 b {
@@ -288,12 +292,7 @@ th {
 .table {
   &__row {
     &_active {
-      background: linear-gradient(
-          0deg,
-          rgba(10, 151, 149, 0.2),
-          rgba(10, 151, 149, 0.2)
-        ),
-        #131416;
+      background: linear-gradient(0deg, rgba(10, 151, 149, 0.2), rgba(10, 151, 149, 0.2)), #131416;
       background-blend-mode: normal;
 
       td {

diff --git a/frontend/src/assets/scss/_variables.scss b/frontend/src/assets/scss/_variables.scss
@@ -29,6 +29,7 @@ $grey-light: #7e8084;
 $grey-dark: #28282d;
 $red: #eb5757;
 $danger: #ff3d48;
+$success: #48ff9c;
 $black-light: rgba(255, 255, 255, 0.03);
 $text-white: rgba(255, 255, 255, 0.8);
 $modal-bg: rgba(33, 33, 35, 0.83);

diff --git a/frontend/src/components/Button/Button.scss b/frontend/src/components/Button/Button.scss
@@ -33,7 +33,8 @@
   &:disabled {
     color: rgba($white, 0.2) !important;
     cursor: not-allowed !important;
-    pointer-events: none;
+    background: initial !important;
+    border: 1px solid transparent !important;
   }
 
   &_size {
@@ -105,5 +106,23 @@
         border: $border-primary;
       }
     }
+
+    &_transparent {
+      background: rgba(255, 255, 255, 0.03);
+      border: 1px solid rgba(255, 255, 255, 0.2);
+      color: $white;
+
+      svg {
+        path {
+          stroke: $white;
+        }
+      }
+
+      &:hover {
+        color: $white;
+        background: $primary;
+        border: $border-primary;
+      }
+    }
   }
 }
diff --git a/frontend/src/components/Controls/Switcher/Switcher.scss b/frontend/src/components/Controls/Switcher/Switcher.scss
diff --git a/frontend/src/components/Controls/Switcher/Switcher.vue b/frontend/src/components/Controls/Switcher/Switcher.vue
diff --git a/frontend/src/components/Dashboard/Dashboard.vue b/frontend/src/components/Dashboard/Dashboard.vue
@@ -12,6 +12,7 @@
     <AddFileModal openModalEvent="openAddFileModal" />
     <RemoveFileModal openModalEvent="openRemoveFileModal" />
     <SettingsModal openModalEvent="openSettingsModal" />
+    <UnsubscribeTopicModal openModalEvent="openUnsubscribeTopicModal" />
   </div>
 </template>
 
@@ -28,6 +29,7 @@ import AddTopicModal from "@/components/Modals/AddTopicModal/AddTopicModal";
 import AddFileModal from "@/components/Modals/AddFileModal/AddFileModal";
 import RemoveFileModal from "@/components/Modals/RemoveFileModal/RemoveFileModal";
 import SettingsModal from "@/components/Modals/SettingsModal/SettingsModal";
+import UnsubscribeTopicModal from "@/components/Modals/UnsubscribeTopicModal/UnsubscribeTopicModal";
 
 export default {
   components: {
@@ -37,6 +39,7 @@ export default {
     AddFileModal,
     RemoveFileModal,
     SettingsModal,
+    UnsubscribeTopicModal,
   },
   data: () => {
     return {};

diff --git a/frontend/src/components/File/FileAvatar/FileAvatar.scss b/frontend/src/components/File/FileAvatar/FileAvatar.scss
diff --git a/frontend/src/components/File/FileAvatar/FileAvatar.vue b/frontend/src/components/File/FileAvatar/FileAvatar.vue