Merge pull request #331 from cofacts/search-page

Remove ArticlePageLayout from search page
cofacts · Sep 22, 2020 · 2444bc2 · 2444bc2
2 parents d24e51f + 986f339
commit 2444bc2
Show file tree

Hide file tree

Showing 7 changed files with 461 additions and 714 deletions.
diff --git a/components/AppLayout/AppLayout.js b/components/AppLayout/AppLayout.js
@@ -36,7 +36,10 @@ const apiLogout = () => {
   return fetchAPI('/logout').then(resp => resp.json());
 };
 
-function AppLayout({ children }) {
+/**
+ * @param {boolean} props.container - whether we should use container around children
+ */
+function AppLayout({ children, container = true }) {
   const [isRouteChanging, setRouteChanging] = useState(false);
   const [sidebarOpen, setSidebarOpen] = useState(false);
   const [loginModalOpen, setLoginModalOpen] = useState(false);
@@ -89,7 +92,11 @@ function AppLayout({ children }) {
         user={data?.GetUser}
         onLoginModalOpen={openLoginModal}
       />
-      <Container className={classes.container}>{children}</Container>
+      {container ? (
+        <Container className={classes.container}>{children}</Container>
+      ) : (
+        children
+      )}
       <AppFooter />
       {loginModalOpen && (
         <LoginModal onClose={() => setLoginModalOpen(false)} />

diff --git a/components/ArticlePageLayout.js b/components/ArticlePageLayout.js
diff --git a/components/ListPageControls/index.js b/components/ListPageControls/index.js
@@ -1,5 +1,6 @@
 import Tools from './Tools';
 import Filters from './Filters';
+import BaseFilter from './BaseFilter';
 import ArticleStatusFilter from './ArticleStatusFilter';
 import CategoryFilter from './CategoryFilter';
 import ReplyTypeFilter from './ReplyTypeFilter';
@@ -10,6 +11,7 @@ import LoadMore from './LoadMore';
 export {
   Tools,
   Filters,
+  BaseFilter,
   ArticleStatusFilter,
   CategoryFilter,
   ReplyTypeFilter,