Browse Source

added Delimiter + renamed .wsFileGeneric to .wsContentGeneric

Côme Huguiès 7 years ago
parent
commit
772db795d2

+ 8 - 0
src/component/Delimiter/Delimiter.jsx View File

@@ -0,0 +1,8 @@
1
+import React from 'react'
2
+import classnames from 'classnames'
3
+
4
+require('./Delimiter.styl')
5
+
6
+export const Delimiter = props => <div className={classnames(props.customClass, 'delimiter')} />
7
+
8
+export default Delimiter

+ 7 - 0
src/component/Delimiter/Delimiter.styl View File

@@ -0,0 +1,7 @@
1
+@import '../../css/Variable.styl'
2
+
3
+.delimiter
4
+  border-radius 10px
5
+  width 50%
6
+  height 5px
7
+  background-color blue

+ 2 - 2
src/component/Input/BtnSwitch/BtnSwitch.jsx View File

@@ -5,11 +5,11 @@ require('./BtnSwitch.styl')
5 5
 export const BtnSwitch = props =>
6 6
   <div className='btnswitch'>
7 7
     <label className='switch nomarginlabel'>
8
-      <input type='checkbox' />
8
+      <input type='checkbox' checked={props.checked} onChange={props.onChange} />
9 9
       <span className='slider round' />
10 10
     </label>
11 11
     <div className='btnswitch__text'>
12
-      On
12
+      { props.checked ? 'On' : 'Off'}
13 13
     </div>
14 14
   </div>
15 15
 

+ 12 - 12
src/component/Input/SelectStatus/SelectStatus.jsx View File

@@ -6,9 +6,9 @@ export const SelectStatus = props => {
6 6
   translate.setI18n(props.i18n ? props.i18n : i18n) // mandatory to allow Apps to overrides trad
7 7
 
8 8
   return (
9
-    <div className='wsFileGeneric__option__menu__status dropdown'>
9
+    <div className='wsContentGeneric__option__menu__status dropdown'>
10 10
       <button
11
-        className='wsFileGeneric__option__menu__status__dropdownbtn check btn dropdown-toggle'
11
+        className='wsContentGeneric__option__menu__status__dropdownbtn check btn dropdown-toggle'
12 12
         type='button'
13 13
         id='dropdownMenu2'
14 14
         data-toggle='dropdown'
@@ -16,40 +16,40 @@ export const SelectStatus = props => {
16 16
         aria-expanded='false'
17 17
       >
18 18
         {props.t('Input.SelectStatus.validated')}
19
-        <div className='wsFileGeneric__option__menu__status__dropdownbtn__icon'>
19
+        <div className='wsContentGeneric__option__menu__status__dropdownbtn__icon'>
20 20
           <i className='fa fa-check' />
21 21
         </div>
22 22
       </button>
23 23
 
24
-      <div className='wsFileGeneric__option__menu__status__submenu dropdown-menu' aria-labelledby='dropdownMenu2'>
24
+      <div className='wsContentGeneric__option__menu__status__submenu dropdown-menu' aria-labelledby='dropdownMenu2'>
25 25
         <h6 className='dropdown-header'>{props.t('Input.SelectStatus.file_status')}</h6>
26 26
 
27 27
         <div className='dropdown-divider' />
28 28
 
29
-        <button className='wsFileGeneric__option__menu__status__submenu__item current  dropdown-item' type='button'>
29
+        <button className='wsContentGeneric__option__menu__status__submenu__item current  dropdown-item' type='button'>
30 30
           {props.t('Input.SelectStatus.ongoing')}
31
-          <div className='wsFileGeneric__option__menu__status__submenu__item__icon'>
31
+          <div className='wsContentGeneric__option__menu__status__submenu__item__icon'>
32 32
             <i className='fa fa-gears' />
33 33
           </div>
34 34
         </button>
35 35
 
36
-        <button className='wsFileGeneric__option__menu__status__submenu__item check dropdown-item' type='button'>
36
+        <button className='wsContentGeneric__option__menu__status__submenu__item check dropdown-item' type='button'>
37 37
           {props.t('Input.SelectStatus.validated')}
38
-          <div className='wsFileGeneric__option__menu__status__submenu__item__icon'>
38
+          <div className='wsContentGeneric__option__menu__status__submenu__item__icon'>
39 39
             <i className='fa fa-check' />
40 40
           </div>
41 41
         </button>
42 42
 
43
-        <button className='wsFileGeneric__option__menu__status__submenu__item invalid dropdown-item' type='button'>
43
+        <button className='wsContentGeneric__option__menu__status__submenu__item invalid dropdown-item' type='button'>
44 44
           {props.t('Input.SelectStatus.unvalidated')}
45
-          <div className='wsFileGeneric__option__menu__status__submenu__item__icon'>
45
+          <div className='wsContentGeneric__option__menu__status__submenu__item__icon'>
46 46
             <i className='fa fa-times' />
47 47
           </div>
48 48
         </button>
49 49
 
50
-        <button className='wsFileGeneric__option__menu__status__submenu__item ban dropdown-item' type='button'>
50
+        <button className='wsContentGeneric__option__menu__status__submenu__item ban dropdown-item' type='button'>
51 51
           {props.t('Input.SelectStatus.obsolete')}
52
-          <div className='wsFileGeneric__option__menu__status__submenu__item__icon'>
52
+          <div className='wsContentGeneric__option__menu__status__submenu__item__icon'>
53 53
             <i className='fa fa-ban' />
54 54
           </div>
55 55
         </button>

+ 32 - 0
src/component/Input/SelectStatus/SelectStatus.styl View File

@@ -0,0 +1,32 @@
1
+@import '../../../css/Variable.styl'
2
+
3
+&__status
4
+  margin-right 20px
5
+  .current
6
+    color blue
7
+  .check
8
+    color green
9
+  .invalid
10
+    color red
11
+  .ban
12
+    color grey
13
+  &__dropdownbtn
14
+    border 1px solid grey
15
+    width 150px
16
+    background-color transparent
17
+    cursor pointer
18
+    &::after
19
+      color fontColor
20
+    &:hover
21
+      background-color transparent
22
+    &__icon
23
+      display inline-block
24
+      margin 0 15px
25
+  &__submenu
26
+    &__item
27
+      display flex
28
+      justify-content space-between
29
+      margin 5px 0
30
+      cursor pointer
31
+      &:active
32
+        background-color transparent

+ 1 - 1
src/component/PopinFixed/PopinFixed.jsx View File

@@ -9,7 +9,7 @@ require('./PopinFixed.styl')
9 9
 
10 10
 const PopinFixed = props => {
11 11
   return (
12
-    <div className={classnames('wsFileGeneric', props.customClass, {'visible': props.visible})}>
12
+    <div className={classnames('wsContentGeneric', props.customClass, {'visible': props.visible})}>
13 13
       {props.children}
14 14
     </div>
15 15
   )

+ 1 - 31
src/component/PopinFixed/PopinFixed.styl View File

@@ -1,6 +1,6 @@
1 1
 @import '../../css/Variable.styl'
2 2
 
3
-.wsFileGeneric
3
+.wsContentGeneric
4 4
   position fixed
5 5
   top 85px
6 6
   right 0
@@ -56,36 +56,6 @@
56 56
     &__menu
57 57
       display flex
58 58
       align-items center
59
-      &__status
60
-        margin-right 20px
61
-        .current
62
-          color blue
63
-        .check
64
-          color green
65
-        .invalid
66
-          color red
67
-        .ban
68
-          color grey
69
-        &__dropdownbtn
70
-          border 1px solid grey
71
-          width 150px
72
-          background-color transparent
73
-          cursor pointer
74
-          &::after
75
-            color fontColor
76
-          &:hover
77
-            background-color transparent
78
-          &__icon
79
-            display inline-block
80
-            margin 0 15px
81
-        &__submenu
82
-          &__item
83
-            display flex
84
-            justify-content space-between
85
-            margin 5px 0
86
-            cursor pointer
87
-            &:active
88
-              background-color transparent
89 59
       &__action
90 60
         margin 5px 10px 0 0
91 61
         font-size 18px

+ 4 - 4
src/component/PopinFixed/PopinFixedContent.jsx View File

@@ -5,18 +5,18 @@ import PropTypes from 'prop-types'
5 5
 const PopinFixedContent = props => {
6 6
   return props.children.length === 2
7 7
     ? (
8
-      <div className={classnames('wsFileGeneric__content', `${props.customClass}__content`)}>
9
-        <div className={classnames('wsFileGeneric__content__left', `${props.customClass}__content__left`)}>
8
+      <div className={classnames('wsContentGeneric__content', `${props.customClass}__content`)}>
9
+        <div className={classnames('wsContentGeneric__content__left', `${props.customClass}__content__left`)}>
10 10
           {props.children[0]}
11 11
         </div>
12 12
 
13
-        <div className={classnames('wsFileGeneric__content__right', `${props.customClass}__content__right`)}>
13
+        <div className={classnames('wsContentGeneric__content__right', `${props.customClass}__content__right`)}>
14 14
           {props.children[1]}
15 15
         </div>
16 16
       </div>
17 17
     )
18 18
     : (
19
-      <div className={classnames('wsFileGeneric__content', `${props.customClass}__content`)}>
19
+      <div className={classnames('wsContentGeneric__content', `${props.customClass}__content`)}>
20 20
         { props.children }
21 21
       </div>
22 22
     )

+ 5 - 5
src/component/PopinFixed/PopinFixedHeader.jsx View File

@@ -4,21 +4,21 @@ import PropTypes from 'prop-types'
4 4
 
5 5
 const PopinFixedHeader = props => {
6 6
   return (
7
-    <div className={classnames('wsFileGeneric__header', `${props.customClass}__header`)}>
8
-      <div className={classnames('wsFileGeneric__header__icon', `${props.customClass}__header__icon`)}>
7
+    <div className={classnames('wsContentGeneric__header', `${props.customClass}__header`)}>
8
+      <div className={classnames('wsContentGeneric__header__icon', `${props.customClass}__header__icon`)}>
9 9
         <i className={props.icon} />
10 10
       </div>
11 11
 
12
-      <div className={classnames('wsFileGeneric__header__title mr-auto', `${props.customClass}__header__title`)}>
12
+      <div className={classnames('wsContentGeneric__header__title mr-auto', `${props.customClass}__header__title`)}>
13 13
         {props.name}
14 14
       </div>
15 15
 
16
-      <div className={classnames('wsFileGeneric__header__edittitle', `${props.customClass}__header__changetitle`)}>
16
+      <div className={classnames('wsContentGeneric__header__edittitle', `${props.customClass}__header__changetitle`)}>
17 17
         <i className='fa fa-pencil' />
18 18
       </div>
19 19
 
20 20
       <div
21
-        className={classnames('wsFileGeneric__header__close', `${props.customClass}__header__close`)}
21
+        className={classnames('wsContentGeneric__header__close', `${props.customClass}__header__close`)}
22 22
         onClick={props.onClickCloseBtn}
23 23
       >
24 24
         <i className='fa fa-times' />

+ 4 - 4
src/component/PopinFixed/PopinFixedOption.jsx View File

@@ -9,8 +9,8 @@ const PopinFixedOption = props => {
9 9
   translate.setI18n(props.i18n ? props.i18n : i18n) // mandatory to allow Apps to overrides trad
10 10
 
11 11
   return (
12
-    <div className='wsFileGeneric__option'>
13
-      <div className='wsFileGeneric__option__menu'>
12
+    <div className='wsContentGeneric__option'>
13
+      <div className='wsContentGeneric__option__menu'>
14 14
 
15 15
         <div className='wsFileFile__option__menu__addversion btn mr-auto'>
16 16
           {props.t('PopinFixedOption.new_version')}
@@ -19,10 +19,10 @@ const PopinFixedOption = props => {
19 19
 
20 20
         <SelectStatus />
21 21
 
22
-        <div className='wsFileGeneric__option__menu__action'>
22
+        <div className='wsContentGeneric__option__menu__action'>
23 23
           <i className='fa fa-archive' />
24 24
         </div>
25
-        <div className='wsFileGeneric__option__menu__action'>
25
+        <div className='wsContentGeneric__option__menu__action'>
26 26
           <i className='fa fa-trash' />
27 27
         </div>
28 28
       </div>

+ 4 - 2
src/component/Timeline/Timeline.styl View File

@@ -27,8 +27,10 @@
27 27
         position relative
28 28
         top 43px
29 29
         left -25px
30
-        width 45px
31
-        height 45px
30
+        & > img
31
+          width 45px
32
+          height 45px
33
+          border-radius 25px
32 34
       &__createhour
33 35
         margin-left 30px
34 36
         opacity 0.7

+ 3 - 0
src/index.dev.js View File

@@ -12,6 +12,8 @@ import BtnSwitch from './component/Input/BtnSwitch/BtnSwitch.jsx'
12 12
 import Timeline from './component/Timeline/Timeline.jsx'
13 13
 import TimelineDebugData from './component/Timeline/debugData.js'
14 14
 
15
+import Delimiter from './component/Delimiter/Delimiter.jsx'
16
+
15 17
 ReactDOM.render(
16 18
   <PopinFixed customClass={`${'randomClass'}`}>
17 19
     <PopinFixedHeader
@@ -25,6 +27,7 @@ ReactDOM.render(
25 27
 
26 28
     <PopinFixedContent customClass={`${'randomClass'}__contentpage`}>
27 29
       <div>
30
+        <Delimiter />
28 31
         <span>Here will be the app content. Style is handled by the app (obviously)</span>
29 32
         <BtnSwitch />
30 33
         <TextAreaApp customClass={'randomClass'} />

+ 4 - 0
src/index.js View File

@@ -12,6 +12,8 @@ import libTimeline from './component/Timeline/Timeline.jsx'
12 12
 import libTextAreaApp from './component/Input/TextAreaApp/TextAreaApp.jsx'
13 13
 import libBtnSwitch from './component/Input/BtnSwitch/BtnSwitch.jsx'
14 14
 
15
+import libDelimiter from './component/Delimiter/Delimiter.jsx'
16
+
15 17
 export const langFr = fr
16 18
 export const langEn = en
17 19
 
@@ -26,3 +28,5 @@ export const Timeline = libTimeline
26 28
 
27 29
 export const TextAreaApp = libTextAreaApp
28 30
 export const BtnSwitch = libBtnSwitch
31
+
32
+export const Delimiter = libDelimiter