From 072c000236180112a715f6b6ac40de9723c5b658 Mon Sep 17 00:00:00 2001 From: John Furrow Date: Sat, 31 Oct 2015 22:59:10 -0700 Subject: [PATCH] Rename filter-bar to sidebar for the greater good --- source/sass/base/_layout.scss | 2 +- .../sass/objects/{_filter-bar.scss => _sidebar.scss} | 6 +++--- source/sass/style.scss | 2 +- source/sass/tools/_colors.scss | 4 ++-- .../{filter-bar => sidebar}/ClientStats.js | 2 +- .../components/{filter-bar => sidebar}/LineChart.js | 0 .../components/{filter-bar => sidebar}/SearchBox.js | 4 ++-- .../{filter-bar => sidebar}/StatusFilter.js | 0 .../{filter-bar => sidebar}/StatusFilters.js | 2 +- .../scripts/containers/{FilterBar.js => Sidebar.js} | 12 ++++++------ 10 files changed, 17 insertions(+), 17 deletions(-) rename source/sass/objects/{_filter-bar.scss => _sidebar.scss} (96%) rename source/scripts/components/{filter-bar => sidebar}/ClientStats.js (98%) rename source/scripts/components/{filter-bar => sidebar}/LineChart.js (100%) rename source/scripts/components/{filter-bar => sidebar}/SearchBox.js (92%) rename source/scripts/components/{filter-bar => sidebar}/StatusFilter.js (100%) rename source/scripts/components/{filter-bar => sidebar}/StatusFilters.js (96%) rename source/scripts/containers/{FilterBar.js => Sidebar.js} (67%) diff --git a/source/sass/base/_layout.scss b/source/sass/base/_layout.scss index 438a29d8..5e458087 100644 --- a/source/sass/base/_layout.scss +++ b/source/sass/base/_layout.scss @@ -15,7 +15,7 @@ body { height: 100%; } -.filter-bar { +.sidebar { flex: 1; min-width: 200px; max-width: 240px; diff --git a/source/sass/objects/_filter-bar.scss b/source/sass/objects/_sidebar.scss similarity index 96% rename from source/sass/objects/_filter-bar.scss rename to source/sass/objects/_sidebar.scss index d95ba13f..1f5f319b 100644 --- a/source/sass/objects/_filter-bar.scss +++ b/source/sass/objects/_sidebar.scss @@ -1,8 +1,8 @@ -.filter-bar { - color: $filter-bar--foreground; +.sidebar { + color: $sidebar--foreground; } -.filter-bar { +.sidebar { &__item { diff --git a/source/sass/style.scss b/source/sass/style.scss index 4a216096..edc15400 100644 --- a/source/sass/style.scss +++ b/source/sass/style.scss @@ -17,7 +17,7 @@ @import "objects/action-bar"; @import "objects/client-stats"; @import "objects/dropdown"; -@import "objects/filter-bar"; +@import "objects/sidebar"; @import "objects/modals"; @import "objects/progress-bar"; @import "objects/status-filter"; diff --git a/source/sass/tools/_colors.scss b/source/sass/tools/_colors.scss index a733aa7f..006021da 100644 --- a/source/sass/tools/_colors.scss +++ b/source/sass/tools/_colors.scss @@ -30,8 +30,8 @@ $action--background--hover: rgba(#333e4a, 0.05); $action--border--hover: rgba(#333e4a, 0.15); // filter bar -$filter-bar--foreground: #626466; -$filter-bar--border: #161316; +$sidebar--foreground: #626466; +$sidebar--border: #161316; $client-stats--primary: #333332; $client-stats--secondary: #999997; diff --git a/source/scripts/components/filter-bar/ClientStats.js b/source/scripts/components/sidebar/ClientStats.js similarity index 98% rename from source/scripts/components/filter-bar/ClientStats.js rename to source/scripts/components/sidebar/ClientStats.js index 9bc6eb24..31a447ab 100644 --- a/source/scripts/components/filter-bar/ClientStats.js +++ b/source/scripts/components/sidebar/ClientStats.js @@ -51,7 +51,7 @@ export default class ClientStats extends React.Component { let downloadTotal = format.data(this.state.clientStats.transferred.download); return ( -
+
diff --git a/source/scripts/components/filter-bar/LineChart.js b/source/scripts/components/sidebar/LineChart.js similarity index 100% rename from source/scripts/components/filter-bar/LineChart.js rename to source/scripts/components/sidebar/LineChart.js diff --git a/source/scripts/components/filter-bar/SearchBox.js b/source/scripts/components/sidebar/SearchBox.js similarity index 92% rename from source/scripts/components/filter-bar/SearchBox.js rename to source/scripts/components/sidebar/SearchBox.js index df1d7719..03008495 100644 --- a/source/scripts/components/filter-bar/SearchBox.js +++ b/source/scripts/components/sidebar/SearchBox.js @@ -33,8 +33,8 @@ export default class SearchBox extends React.Component { render() { let classSet = classnames({ - 'filter-bar__item': true, - 'filter-bar__item--search': true, + 'sidebar__item': true, + 'sidebar__item--search': true, 'is-in-use': this.state.searchValue !== '' }); diff --git a/source/scripts/components/filter-bar/StatusFilter.js b/source/scripts/components/sidebar/StatusFilter.js similarity index 100% rename from source/scripts/components/filter-bar/StatusFilter.js rename to source/scripts/components/sidebar/StatusFilter.js diff --git a/source/scripts/components/filter-bar/StatusFilters.js b/source/scripts/components/sidebar/StatusFilters.js similarity index 96% rename from source/scripts/components/filter-bar/StatusFilters.js rename to source/scripts/components/sidebar/StatusFilters.js index 8a646ef0..90fed481 100644 --- a/source/scripts/components/filter-bar/StatusFilters.js +++ b/source/scripts/components/sidebar/StatusFilters.js @@ -69,7 +69,7 @@ export default class StatusFilters extends React.Component { let filters = this.getFilters(); return ( -
    +
    • Filter by Status
      • diff --git a/source/scripts/containers/FilterBar.js b/source/scripts/containers/Sidebar.js similarity index 67% rename from source/scripts/containers/FilterBar.js rename to source/scripts/containers/Sidebar.js index 2afa40e3..c2c2de4f 100644 --- a/source/scripts/containers/FilterBar.js +++ b/source/scripts/containers/Sidebar.js @@ -1,9 +1,9 @@ import React from 'react'; -import ClientStats from '../components/filter-bar/ClientStats'; +import ClientStats from '../components/sidebar/ClientStats'; import { setTorrentsFilter, setTorrentsSearch } from '../actions/UIActions'; -import StatusFilters from '../components/filter-bar/StatusFilters'; -import SearchBox from '../components/filter-bar/SearchBox'; +import StatusFilters from '../components/sidebar/StatusFilters'; +import SearchBox from '../components/sidebar/SearchBox'; import UIActions from '../actions/UIActions'; const methodsToBind = [ @@ -11,7 +11,7 @@ const methodsToBind = [ 'handleSearchChange' ]; -export default class FilterBar extends React.Component { +export default class Sidebar extends React.Component { constructor() { super(); @@ -31,11 +31,11 @@ export default class FilterBar extends React.Component { render() { return ( -