diff --git a/backend/app/Category.php b/backend/app/Category.php
index c2da926..8123b8e 100644
--- a/backend/app/Category.php
+++ b/backend/app/Category.php
@@ -28,6 +28,7 @@ class Category extends Model implements SluggableInterface
{
return $this->hasOne('Flox\Item')
->selectRaw('category_id, count(*) as aggregate')
+ ->where('removed', false)
->groupBy('category_id');
}
diff --git a/client/app/sites/show.js b/client/app/sites/show.js
deleted file mode 100644
index f8ffa6a..0000000
--- a/client/app/sites/show.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import Api from '../api';
-
-// Todo: Make it work!
-class Show extends React.Component {
-
- constructor(props) {
- super(props);
- this.loadItem();
-
- this.state = {
- item: {}
- };
- }
-
- render() {
- let style = {
- backgroundImage:
- this.state.item.poster == 'null' || typeof this.state.item.poster === 'undefined'
- ? ''
- : 'url(' + config.posterBig + this.state.item.poster + ')'
- };
-
- return (
-
-
-
-
-
-
- {style.backgroundImage ? '' :
}
-
-
-
-
-
-
{this.state.item.title}
-
-
-
-
-
- );
- }
-
- loadItem() {
- Api.searchItemBySlug(this.props.params.item).then((value) => {
- Api.searchTMDBByID(value.tmdb_id);
- });
- }
-}
-
-export default Show;
diff --git a/client/assets/sass/_base.scss b/client/assets/sass/_base.scss
index 9b2b1be..6854f5c 100644
--- a/client/assets/sass/_base.scss
+++ b/client/assets/sass/_base.scss
@@ -4,6 +4,7 @@
box-sizing: border-box;
}
+
.wrap {
width: $width;
margin: 0 auto;
diff --git a/client/assets/sass/_header.scss b/client/assets/sass/_header.scss
index bc6376a..83f4b49 100644
--- a/client/assets/sass/_header.scss
+++ b/client/assets/sass/_header.scss
@@ -16,9 +16,9 @@
.site-nav {
float: right;
- margin: 0 20px 0 0;
- padding: 0 20px 0 0;
- border-right: 1px solid #c86ede;
+ //margin: 0 20px 0 0;
+ //padding: 0 20px 0 0;
+ //border-right: 1px solid #c86ede;
li {
float: left;
@@ -53,6 +53,15 @@
}
}
+.add-wrap {
+ border-left: 1px solid #c86ede;
+ margin: 0 0 0 20px;
+}
+
+.icon-add {
+ margin: 0 0 0 20px;
+}
+
.icon-search-wrap {
margin: 0 0 0 10px;
}
diff --git a/client/package.json b/client/package.json
index 0888e21..b663aa4 100644
--- a/client/package.json
+++ b/client/package.json
@@ -5,7 +5,6 @@
},
"dependencies": {
"laravel-elixir": "^5.0.*",
- "laravel-elixir-lost": "^2.0.0",
"laravel-elixir-spritesmith": "^0.3.*",
"react": "^0.14.7",
"react-dom": "^0.14.7",