Added classnames module

taurus-code · Jun 18, 2018 · eb59044 · eb59044
1 parent cdcfa07
commit eb59044
Show file tree

Hide file tree

Showing 133 changed files with 308 additions and 234 deletions.
diff --git a/dist/js/bundle.js b/dist/js/bundle.js
diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
     "bcrypt-nodejs": "^0.0.3",
     "body-parser": "^1.18.2",
     "catchify": "^2.6.1",
+    "classnames": "^2.2.6",
     "client-sessions": "^0.8.0",
     "cookie-parser": "^1.4.3",
     "dotenv": "^4.0.0",

diff --git a/src/components/edit-profile/__test__/__snapshots__/edit-profile.test.js.snap b/src/components/edit-profile/__test__/__snapshots__/edit-profile.test.js.snap
@@ -137,7 +137,7 @@ exports[`Edit-Profile Component should match snapshot 1`] = `
           className="edit_update"
         >
           <span
-            className="emoji_span  "
+            className="emoji_span"
             data-tip="Add emojis"
             onClick={[Function]}
           >
@@ -154,14 +154,14 @@ exports[`Edit-Profile Component should match snapshot 1`] = `
             
           </div>
           <a
-            className="pri_btn edit_done "
+            className="pri_btn edit_done"
             href="#"
             onClick={[Function]}
           >
             Update profile
           </a>
           <a
-            className="sec_btn resend_vl "
+            className="sec_btn resend_vl"
             href="#"
             onClick={[Function]}
           >
@@ -263,7 +263,7 @@ exports[`Edit-Profile Component should match snapshot 1`] = `
             value=""
           />
           <a
-            className="sec_btn  "
+            className="sec_btn"
             href="#"
             onClick={[Function]}
           >

diff --git a/src/components/edit-profile/__test__/__snapshots__/edit-tags.test.js.snap b/src/components/edit-profile/__test__/__snapshots__/edit-tags.test.js.snap
@@ -24,7 +24,7 @@ Array [
       value="programmer"
     />
     <a
-      className="sec_btn  "
+      className="sec_btn"
       href="#"
       onClick={[Function]}
     >

diff --git a/src/components/edit-profile/__test__/__snapshots__/resend-vl.test.js.snap b/src/components/edit-profile/__test__/__snapshots__/resend-vl.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`ResendVL Component should match snapshot and show SecondaryButton 1`] = `
 <a
-  className="sec_btn resend_vl "
+  className="sec_btn resend_vl"
   href="#"
   onClick={[Function]}
 >

diff --git a/src/components/explore/groups/__test__/__snapshots__/explore-groups-list.test.js.snap b/src/components/explore/groups/__test__/__snapshots__/explore-groups-list.test.js.snap
@@ -30,7 +30,7 @@ exports[`ExploreGroupsList Component should match snapshot 1`] = `
     className="m_bottom"
   >
     <a
-      className="pri_btn follow "
+      className="pri_btn follow"
       href="#"
       onClick={[Function]}
     >
@@ -70,7 +70,7 @@ exports[`ExploreGroupsList Component should match snapshot when mutualMembersCou
     className="m_bottom"
   >
     <a
-      className="pri_btn follow "
+      className="pri_btn follow"
       href="#"
       onClick={[Function]}
     >

diff --git a/src/components/explore/groups/__test__/__snapshots__/explore-groups.test.js.snap b/src/components/explore/groups/__test__/__snapshots__/explore-groups.test.js.snap
@@ -62,7 +62,7 @@ exports[`ExpGroups Component should match snapshot 1`] = `
             className="m_bottom"
           >
             <a
-              className="pri_btn follow "
+              className="pri_btn follow"
               href="#"
               onClick={[Function]}
             >
@@ -99,7 +99,7 @@ exports[`ExpGroups Component should match snapshot 1`] = `
             className="m_bottom"
           >
             <a
-              className="pri_btn follow "
+              className="pri_btn follow"
               href="#"
               onClick={[Function]}
             >

diff --git a/src/components/explore/groups/explore-groups.js b/src/components/explore/groups/explore-groups.js
@@ -7,6 +7,7 @@ import Nothing from '../../others/nothing'
 import ExploreGroupsList from './explore-groups-list'
 import IsLoading from '../../others/isLoading'
 import { cLoading } from '../../../utils/utils'
+import classNames from 'classnames'
 
 class ExploreGroups extends Component {
 
@@ -38,7 +39,7 @@ class ExploreGroups extends Component {
           <IsLoading loading={loading} />
 
           <div
-            className={`m_div ${cLoading(loading)}`}
+            className={classNames('m_div', cLoading(loading))}
             style={{ marginTop: 0 }}
           >
             <div

diff --git a/src/components/explore/photos/explore-photos.js b/src/components/explore/photos/explore-photos.js
@@ -6,6 +6,7 @@ import { getPhotosToExplore } from '../../../actions/explore'
 import ExplorePhotoGallery from './photo-gallery'
 import IsLoading from '../../others/isLoading'
 import { cLoading } from '../../../utils/utils'
+import classNames from 'classnames'
 
 class ExpPhotos extends Component {
 
@@ -27,11 +28,10 @@ class ExpPhotos extends Component {
         <Title value='Explore photos' />
 
         <FadeIn duration='300ms'>
-
           <IsLoading loading={loading} />
 
           <div
-            className={`m_div explore_photos ${cLoading(loading)}`}
+            className={classNames('m_div', 'explore_photos', cLoading(loading))}
             style={{ marginTop: 0 }}
           >
             <ExplorePhotoGallery/>

diff --git a/src/components/explore/users/__test__/__snapshots__/explore-users-list.test.js.snap b/src/components/explore/users/__test__/__snapshots__/explore-users-list.test.js.snap
@@ -30,7 +30,7 @@ exports[`ExploreUsersList Component should match snapshot 1`] = `
     className="m_bottom"
   >
     <a
-      className="pri_btn follow "
+      className="pri_btn follow"
       href="#"
       onClick={[Function]}
     >
@@ -70,7 +70,7 @@ exports[`ExploreUsersList Component should match snapshot when mutualUsersCount
     className="m_bottom"
   >
     <a
-      className="pri_btn follow "
+      className="pri_btn follow"
       href="#"
       onClick={[Function]}
     >

diff --git a/src/components/explore/users/__test__/__snapshots__/explore-users.test.js.snap b/src/components/explore/users/__test__/__snapshots__/explore-users.test.js.snap
@@ -62,7 +62,7 @@ exports[`ExpUsers Component should match snapshot 1`] = `
             className="m_bottom"
           >
             <a
-              className="pri_btn follow "
+              className="pri_btn follow"
               href="#"
               onClick={[Function]}
             >
@@ -99,7 +99,7 @@ exports[`ExpUsers Component should match snapshot 1`] = `
             className="m_bottom"
           >
             <a
-              className="pri_btn follow "
+              className="pri_btn follow"
               href="#"
               onClick={[Function]}
             >

diff --git a/src/components/explore/users/explore-users.js b/src/components/explore/users/explore-users.js
@@ -7,6 +7,7 @@ import ExploreUsersList from './explore-users-list'
 import Nothing from '../../others/nothing'
 import IsLoading from '../../others/isLoading'
 import { cLoading } from '../../../utils/utils'
+import classNames from 'classnames'
 
 class ExploreUsers extends Component {
 
@@ -38,7 +39,7 @@ class ExploreUsers extends Component {
           <IsLoading loading={loading} />
 
           <div
-            className={`m_div ${cLoading(loading)}`}
+            className={classNames('m_div', cLoading(loading))}
             style={{ marginTop: 0 }}
           >
             <div

diff --git a/src/components/group/change-admin/__test__/__snapshots__/ca-list.test.js.snap b/src/components/group/change-admin/__test__/__snapshots__/ca-list.test.js.snap
@@ -34,7 +34,7 @@ exports[`ChangeAdminList Component should match snapshot 1`] = `
       className="modal_ff"
     >
       <a
-        className="pri_btn  "
+        className="pri_btn"
         href="#"
         onClick={[Function]}
       >

diff --git a/src/components/group/change-admin/__test__/__snapshots__/change-admin.test.js.snap b/src/components/group/change-admin/__test__/__snapshots__/change-admin.test.js.snap
@@ -101,7 +101,7 @@ Array [
                   className="modal_ff"
                 >
                   <a
-                    className="pri_btn  "
+                    className="pri_btn"
                     href="#"
                     onClick={[Function]}
                   >
@@ -170,7 +170,7 @@ Array [
         className="modal_bottom"
       >
         <a
-          className="pri_btn  "
+          className="pri_btn"
           href="#"
           onClick={[Function]}
         >

diff --git a/src/components/group/create-group/__test__/__snapshots__/actions.test.js.snap b/src/components/group/create-group/__test__/__snapshots__/actions.test.js.snap
@@ -3,14 +3,14 @@
 exports[`CreateGroupActions Component should match snapshot 1`] = `
 Array [
   <a
-    className="sec_btn  "
+    className="sec_btn"
     href="#"
     onClick={[MockFunction]}
   >
     Back
   </a>,
   <a
-    className="pri_btn c_g_update "
+    className="pri_btn c_g_update"
     href="#"
     onClick={[MockFunction]}
   >

diff --git a/src/components/group/create-group/__test__/__snapshots__/cd-modal.test.js.snap b/src/components/group/create-group/__test__/__snapshots__/cd-modal.test.js.snap
@@ -68,7 +68,7 @@ exports[`CreateGroupModal Component should match snapshot 1`] = `
         className="e_p_bottom modal_bottom"
       >
         <span
-          className="emoji_span  "
+          className="emoji_span"
           data-tip="Add emojis"
           onClick={[Function]}
         >
@@ -85,7 +85,7 @@ exports[`CreateGroupModal Component should match snapshot 1`] = `
           
         </div>
         <a
-          className="sec_btn  "
+          className="sec_btn"
           href="#"
           onClick={[MockFunction]}
         >

diff --git a/src/components/group/create-group/__test__/__snapshots__/create-group.test.js.snap b/src/components/group/create-group/__test__/__snapshots__/create-group.test.js.snap
@@ -9,7 +9,7 @@ exports[`CreateGroup Component should match snapshot 1`] = `
       Create public or private group of your interest with people you know.
     </span>
     <a
-      className="sec_btn  "
+      className="sec_btn"
       href="#"
       onClick={[Function]}
     >

diff --git a/src/components/group/group-banner/__test__/__snapshots__/join.test.js.snap b/src/components/group/group-banner/__test__/__snapshots__/join.test.js.snap
@@ -19,7 +19,7 @@ exports[`JoinGroup Component should match snapshot and show <Join/> when joined
   className="pro_ff"
 >
   <a
-    className="pri_btn follow "
+    className="pri_btn follow"
     href="#"
     onClick={[Function]}
   >
@@ -33,7 +33,7 @@ exports[`JoinGroup Component should match snapshot and show <Leave/> when joined
   className="pro_ff"
 >
   <a
-    className="pri_btn unfollow "
+    className="pri_btn unfollow"
     href="#"
     onClick={[Function]}
   >

diff --git a/src/components/group/invite/__test__/__snapshots__/invite-list.test.js.snap b/src/components/group/invite/__test__/__snapshots__/invite-list.test.js.snap
@@ -34,7 +34,7 @@ exports[`InviteList Component should match snapshot 1`] = `
       className="modal_ff"
     >
       <a
-        className="pri_btn invite_btn "
+        className="pri_btn invite_btn"
         href="#"
         onClick={[Function]}
       >

diff --git a/src/components/group/invite/__test__/__snapshots__/invite.test.js.snap b/src/components/group/invite/__test__/__snapshots__/invite.test.js.snap
@@ -101,7 +101,7 @@ Array [
                   className="modal_ff"
                 >
                   <a
-                    className="pri_btn invite_btn "
+                    className="pri_btn invite_btn"
                     href="#"
                     onClick={[Function]}
                   >
@@ -170,7 +170,7 @@ Array [
         className="modal_bottom"
       >
         <a
-          className="pri_btn  "
+          className="pri_btn"
           href="#"
           onClick={[Function]}
         >

diff --git a/src/components/group/join-group/__test__/__snapshots__/join.test.js.snap b/src/components/group/join-group/__test__/__snapshots__/join.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Join Component should match snapshot 1`] = `
 <a
-  className="pri_btn follow "
+  className="pri_btn follow"
   href="#"
   onClick={[Function]}
 >

diff --git a/src/components/group/join-group/__test__/__snapshots__/leave.test.js.snap b/src/components/group/join-group/__test__/__snapshots__/leave.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Leave Component should match snapshot 1`] = `
 <a
-  className="pri_btn unfollow "
+  className="pri_btn unfollow"
   href="#"
   onClick={[Function]}
 >

diff --git a/src/components/group/sections/edit/__test__/__snapshots__/edit-s.test.js.snap b/src/components/group/sections/edit/__test__/__snapshots__/edit-s.test.js.snap
@@ -100,7 +100,7 @@ exports[`EditGroup Component should match snapshot 1`] = `
             className="g_e_save"
           >
             <span
-              className="emoji_span  "
+              className="emoji_span"
               data-tip="Add emojis"
               onClick={[Function]}
             >
@@ -117,7 +117,7 @@ exports[`EditGroup Component should match snapshot 1`] = `
               
             </div>
             <a
-              className="sec_btn g_e_save_btn "
+              className="sec_btn g_e_save_btn"
               href="#"
               onClick={[Function]}
             >

diff --git a/src/components/group/sections/gallery/gallery-s.js b/src/components/group/sections/gallery/gallery-s.js
@@ -7,6 +7,7 @@ import End from '../../../others/end'
 import { bottomScroll, cLoading } from '../../../../utils/utils'
 import GroupPhotos from './photos'
 import IsLoading from '../../../others/isLoading'
+import classNames from 'classnames'
 
 class GroupGallery extends Component {
 
@@ -43,7 +44,9 @@ class GroupGallery extends Component {
 
           <IsLoading loading={loading} />
 
-          <div className={`pro_senapati photos_senapati ${cLoading(loading)}`}>
+          <div
+            className={classNames('pro_senapati', 'photos_senapati', cLoading(loading))}
+          >
             <GroupPhotos/>
           </div>
 

diff --git a/src/components/group/sections/members/__test__/__snapshots__/members-s.test.js.snap b/src/components/group/sections/members/__test__/__snapshots__/members-s.test.js.snap
@@ -75,7 +75,7 @@ exports[`GroupMembers Component should match snapshot 1`] = `
                 </div>
               </span>
               <a
-                className="sec_btn  "
+                className="sec_btn"
                 href="#"
                 onClick={[Function]}
               >

diff --git a/src/components/group/sections/members/member/__test__/__snapshots__/member.test.js.snap b/src/components/group/sections/members/member/__test__/__snapshots__/member.test.js.snap
@@ -43,7 +43,7 @@ exports[`MembersList Component should match snapshot with <RemoveMember/> 1`] =
       </div>
     </span>
     <a
-      className="sec_btn  "
+      className="sec_btn"
       href="#"
       onClick={[Function]}
     >

diff --git a/...omponents/group/sections/members/member/__test__/__snapshots__/remove-member.test.js.snap b/...omponents/group/sections/members/member/__test__/__snapshots__/remove-member.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`RemoveMember Component should match snapshot 1`] = `
 <a
-  className="sec_btn  "
+  className="sec_btn"
   href="#"
   onClick={[Function]}
 >