From 70c308c4aa97acaaf6354420bee7d843ddf97d13 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 31 Aug 2018 13:31:45 +0200
Subject: [Glitch] When search enabled, display hint in search popout

Port 7901f9f63e156732ab10154c34f3c2d188471a9d to glitch-soc
---
 .../flavours/glitch/features/drawer/search/popout/index.js         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/javascript/flavours/glitch/features/drawer')

diff --git a/app/javascript/flavours/glitch/features/drawer/search/popout/index.js b/app/javascript/flavours/glitch/features/drawer/search/popout/index.js
index 6219f46ca..fec090b64 100644
--- a/app/javascript/flavours/glitch/features/drawer/search/popout/index.js
+++ b/app/javascript/flavours/glitch/features/drawer/search/popout/index.js
@@ -9,6 +9,7 @@ import spring from 'react-motion/lib/spring';
 
 //  Utils.
 import Motion from 'flavours/glitch/util/optional_motion';
+import { searchEnabled } from 'flavours/glitch/util/initial_state';
 
 //  Messages.
 const messages = defineMessages({
@@ -28,6 +29,10 @@ const messages = defineMessages({
     defaultMessage: 'Simple text returns matching display names, usernames and hashtags',
     id: 'search_popout.tips.text',
   },
+  full_text: {
+    defaultMessage: 'Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.',
+    id: 'search_popout.tips.full_text',
+  },
   user: {
     defaultMessage: 'user',
     id: 'search_popout.tips.user',
@@ -92,7 +97,7 @@ export default function DrawerSearchPopout ({ style }) {
                 <FormattedMessage {...messages.status} />
               </li>
             </ul>
-            <FormattedMessage {...messages.text} />
+            { searchEnabled ? <FormattedMessage {...messages.full_text} /> : <FormattedMessage {...messages.text} /> }
           </div>
         )}
       </Motion>
-- 
cgit 


From 37a00d4c1dd3aa1b66f60d296fa71fa3201a32da Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 31 Aug 2018 13:54:25 +0200
Subject: [Glitch] Add search item to tab bar for mobile devices

Port c9cbb8de703e321c0d152813a2e22471ffe5eef7 to glitch-soc
---
 app/javascript/flavours/glitch/features/drawer/index.js           | 4 +++-
 app/javascript/flavours/glitch/features/ui/components/tabs_bar.js | 1 +
 app/javascript/flavours/glitch/features/ui/index.js               | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/javascript/flavours/glitch/features/drawer')

diff --git a/app/javascript/flavours/glitch/features/drawer/index.js b/app/javascript/flavours/glitch/features/drawer/index.js
index 1679e9a4b..eb051ba42 100644
--- a/app/javascript/flavours/glitch/features/drawer/index.js
+++ b/app/javascript/flavours/glitch/features/drawer/index.js
@@ -86,6 +86,7 @@ class Drawer extends React.Component {
       searchHidden,
       searchValue,
       submitted,
+      isSearchPage,
     } = this.props;
     const computedClass = classNames('drawer', `mbstobon-${elefriend}`);
 
@@ -110,7 +111,7 @@ class Drawer extends React.Component {
         />
         <div className='contents'>
           <DrawerAccount account={account} />
-          <Composer />
+          {!isSearchPage && <Composer />}
           {multiColumn && <button className='mastodon' onClick={onClickElefriend} />}
           <DrawerResults
             results={results}
@@ -126,6 +127,7 @@ class Drawer extends React.Component {
 //  Props.
 Drawer.propTypes = {
   intl: PropTypes.object.isRequired,
+  isSearchPage: PropTypes.bool,
   multiColumn: PropTypes.bool,
 
   //  State props.
diff --git a/app/javascript/flavours/glitch/features/ui/components/tabs_bar.js b/app/javascript/flavours/glitch/features/ui/components/tabs_bar.js
index 93a74faae..3bc757643 100644
--- a/app/javascript/flavours/glitch/features/ui/components/tabs_bar.js
+++ b/app/javascript/flavours/glitch/features/ui/components/tabs_bar.js
@@ -8,6 +8,7 @@ import { isUserTouching } from 'flavours/glitch/util/is_mobile';
 export const links = [
   <NavLink className='tabs-bar__link primary' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
   <NavLink className='tabs-bar__link primary' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' to='/search' data-preview-title-id='tabs_bar.search' data-preview-icon='bell' ><i className='fa fa-fw fa-search' /><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></NavLink>,
 
   <NavLink className='tabs-bar__link secondary' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
   <NavLink className='tabs-bar__link secondary' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js
index d58e11b55..1cff94321 100644
--- a/app/javascript/flavours/glitch/features/ui/index.js
+++ b/app/javascript/flavours/glitch/features/ui/index.js
@@ -437,6 +437,8 @@ export default class UI extends React.Component {
               <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
               <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
 
+              <WrappedRoute path='/search' component={Drawer} content={children} componentParams={{ isSearchPage: true }} />
+
               <WrappedRoute path='/statuses/new' component={Drawer} content={children} />
               <WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} />
               <WrappedRoute path='/statuses/:statusId/reblogs' component={Reblogs} content={children} />
-- 
cgit 


From 4686b3fa76eaa353d30073f8c23eacd1a297fcdb Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 31 Aug 2018 13:55:43 +0200
Subject: [Glitch] Hide search from Compose on mobile devices

Port 0893b1669548858daee79ab1260fb98646a0b3fa to glitch-soc
---
 .../flavours/glitch/features/drawer/index.js           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'app/javascript/flavours/glitch/features/drawer')

diff --git a/app/javascript/flavours/glitch/features/drawer/index.js b/app/javascript/flavours/glitch/features/drawer/index.js
index eb051ba42..226d342fb 100644
--- a/app/javascript/flavours/glitch/features/drawer/index.js
+++ b/app/javascript/flavours/glitch/features/drawer/index.js
@@ -100,15 +100,15 @@ class Drawer extends React.Component {
             onSettingsClick={onOpenSettings}
           />
         ) : null}
-        <DrawerSearch
-          intl={intl}
-          onChange={onChange}
-          onClear={onClear}
-          onShow={onShow}
-          onSubmit={onSubmit}
-          submitted={submitted}
-          value={searchValue}
-        />
+        {(multiColumn || isSearchPage) && <DrawerSearch
+            intl={intl}
+            onChange={onChange}
+            onClear={onClear}
+            onShow={onShow}
+            onSubmit={onSubmit}
+            submitted={submitted}
+            value={searchValue}
+          /> }
         <div className='contents'>
           <DrawerAccount account={account} />
           {!isSearchPage && <Composer />}
-- 
cgit 


From b4f548fa18487e2335ec032369d452146b19cd42 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 31 Aug 2018 14:01:41 +0200
Subject: Fix account header showing on search page

---
 app/javascript/flavours/glitch/features/drawer/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/javascript/flavours/glitch/features/drawer')

diff --git a/app/javascript/flavours/glitch/features/drawer/index.js b/app/javascript/flavours/glitch/features/drawer/index.js
index 226d342fb..eac0370c2 100644
--- a/app/javascript/flavours/glitch/features/drawer/index.js
+++ b/app/javascript/flavours/glitch/features/drawer/index.js
@@ -110,7 +110,7 @@ class Drawer extends React.Component {
             value={searchValue}
           /> }
         <div className='contents'>
-          <DrawerAccount account={account} />
+          {!isSearchPage && <DrawerAccount account={account} />}
           {!isSearchPage && <Composer />}
           {multiColumn && <button className='mastodon' onClick={onClickElefriend} />}
           <DrawerResults
-- 
cgit 


From 0f1db47a7e551bfc6a2f59d7f2def131bcb5b43c Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 31 Aug 2018 14:18:33 +0200
Subject: Fix search results on compose box

---
 app/javascript/flavours/glitch/features/drawer/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'app/javascript/flavours/glitch/features/drawer')

diff --git a/app/javascript/flavours/glitch/features/drawer/index.js b/app/javascript/flavours/glitch/features/drawer/index.js
index eac0370c2..4649e404f 100644
--- a/app/javascript/flavours/glitch/features/drawer/index.js
+++ b/app/javascript/flavours/glitch/features/drawer/index.js
@@ -113,10 +113,11 @@ class Drawer extends React.Component {
           {!isSearchPage && <DrawerAccount account={account} />}
           {!isSearchPage && <Composer />}
           {multiColumn && <button className='mastodon' onClick={onClickElefriend} />}
-          <DrawerResults
-            results={results}
-            visible={submitted && !searchHidden}
-          />
+          {(multiColumn || isSearchPage) &&
+            <DrawerResults
+              results={results}
+              visible={submitted && !searchHidden}
+            />}
         </div>
       </div>
     );
-- 
cgit