Browse Source

redo fixes before repo merge

AlexiCauvin 6 years ago
parent
commit
a6e60fe660

+ 3 - 0
frontend/dist/index.html View File

19
       .primaryColorFont { color: #7d4e24; }
19
       .primaryColorFont { color: #7d4e24; }
20
       .primaryColorFontDarken { color: #572800; }
20
       .primaryColorFontDarken { color: #572800; }
21
       .primaryColorFontLighten { color: #a3744a; }
21
       .primaryColorFontLighten { color: #a3744a; }
22
+      .whiteFontColor {color: #fdfdfd;}
22
 
23
 
23
       .primaryColorFontHover:hover { color: #7d4e24; }
24
       .primaryColorFontHover:hover { color: #7d4e24; }
24
       .primaryColorFontDarkenHover:hover { color: #572800; }
25
       .primaryColorFontDarkenHover:hover { color: #572800; }
35
       .primaryColorBorder { border-color: #7d4e24; }
36
       .primaryColorBorder { border-color: #7d4e24; }
36
       .primaryColorBorderDarken { border-color: #572800; }
37
       .primaryColorBorderDarken { border-color: #572800; }
37
       .primaryColorBorderLighten { border-color: #a3744a; }
38
       .primaryColorBorderLighten { border-color: #a3744a; }
39
+      .whiteColorBorder { border-color: #fdfdfd; }
38
 
40
 
39
       .primaryColorBorderHover:hover { border-color: #7d4e24; }
41
       .primaryColorBorderHover:hover { border-color: #7d4e24; }
40
       .primaryColorBorderDarkenHover:hover { border-color: #572800; }
42
       .primaryColorBorderDarkenHover:hover { border-color: #572800; }
41
       .primaryColorBorderLightenHover:hover { border-color: #a3744a; }
43
       .primaryColorBorderLightenHover:hover { border-color: #a3744a; }
44
+
42
     </style>
45
     </style>
43
   </head>
46
   </head>
44
 
47
 

+ 1 - 1
frontend/src/component/Account/Notification.jsx View File

37
                 <td>
37
                 <td>
38
                   <div className='notification__table__role'>
38
                   <div className='notification__table__role'>
39
                     <div className='notification__table__role__icon'>
39
                     <div className='notification__table__role__icon'>
40
-                      <i className={`fa ${getRole(ws.role).icon}`} />
40
+                      <i className={`fa fa-fw ${getRole(ws.role).icon}`} />
41
                     </div>
41
                     </div>
42
                     <div className='notification__table__role__text d-none d-sm-flex'>
42
                     <div className='notification__table__role__text d-none d-sm-flex'>
43
                       {props.t(getRole(ws.role).translationKey)}
43
                       {props.t(getRole(ws.role).translationKey)}

+ 1 - 1
frontend/src/component/Account/Password.jsx View File

4
   return (
4
   return (
5
     <div className='account__userpreference__setting__personaldata'>
5
     <div className='account__userpreference__setting__personaldata'>
6
       <div className='personaldata__sectiontitle subTitle ml-2 ml-sm-0'>
6
       <div className='personaldata__sectiontitle subTitle ml-2 ml-sm-0'>
7
-        Information du compte
7
+        Changer de mot de passe
8
       </div>
8
       </div>
9
 
9
 
10
       <div className='personaldata__text ml-2 ml-sm-0'>
10
       <div className='personaldata__text ml-2 ml-sm-0'>

+ 6 - 6
frontend/src/component/Account/Timezone.jsx View File

6
   const handleChangeTimezone = selectedTimezone => props.onChangeTimezone(props.timezone.find(t => t.place === selectedTimezone.place))
6
   const handleChangeTimezone = selectedTimezone => props.onChangeTimezone(props.timezone.find(t => t.place === selectedTimezone.place))
7
 
7
 
8
   return (
8
   return (
9
-    <div className='account__userpreference__setting__calendar'>
9
+    <div className='account__userpreference__setting__timezone'>
10
 
10
 
11
-      <div className='calendar__title ml-2 ml-sm-0'>
12
-        Changer de Fuseau Horaire :
11
+      <div className='timezone__title subTitle ml-2 ml-sm-0'>
12
+        Changer de Fuseau Horaire
13
       </div>
13
       </div>
14
 
14
 
15
-      <div className='calendar__text ml-2 ml-sm-0'>
15
+      <div className='timezone__text ml-2 ml-sm-0'>
16
         NYI
16
         NYI
17
       </div>
17
       </div>
18
 
18
 
19
-      <div className='calendar__timezone ml-2 ml-sm-0 dropdown'>
19
+      <div className='timezone__time ml-2 ml-sm-0 dropdown'>
20
         <Select
20
         <Select
21
           name='timezoneSelect'
21
           name='timezoneSelect'
22
-          className='calendar__timezone__select'
22
+          className='timezone__time__select'
23
           value={props.timezoneUser}
23
           value={props.timezoneUser}
24
           labelKey='place'
24
           labelKey='place'
25
           valueKey='place'
25
           valueKey='place'

+ 10 - 8
frontend/src/container/Account.jsx View File

7
 import UserInfo from '../component/Account/UserInfo.jsx'
7
 import UserInfo from '../component/Account/UserInfo.jsx'
8
 import MenuSubComponent from '../component/Account/MenuSubComponent.jsx'
8
 import MenuSubComponent from '../component/Account/MenuSubComponent.jsx'
9
 import PersonalData from '../component/Account/PersonalData.jsx'
9
 import PersonalData from '../component/Account/PersonalData.jsx'
10
-import Calendar from '../component/Account/Calendar.jsx'
10
+// import Calendar from '../component/Account/Calendar.jsx'
11
 import Notification from '../component/Account/Notification.jsx'
11
 import Notification from '../component/Account/Notification.jsx'
12
 import Password from '../component/Account/Password.jsx'
12
 import Password from '../component/Account/Password.jsx'
13
 import Timezone from '../component/Account/Timezone.jsx'
13
 import Timezone from '../component/Account/Timezone.jsx'
42
         name: 'timezone',
42
         name: 'timezone',
43
         menuLabel: 'Fuseau Horaire',
43
         menuLabel: 'Fuseau Horaire',
44
         active: false
44
         active: false
45
-      },
46
-      {
47
-        name: 'calendar',
48
-        menuLabel: 'Calendrier personnel',
49
-        active: false
50
       }]
45
       }]
46
+      // {
47
+      //   name: 'calendar',
48
+      //   menuLabel: 'Calendrier personnel',
49
+      //   active: false
50
+      // }]
51
     }
51
     }
52
   }
52
   }
53
 
53
 
79
         case 'personalData':
79
         case 'personalData':
80
           return <PersonalData />
80
           return <PersonalData />
81
 
81
 
82
-        case 'calendar':
83
-          return <Calendar user={this.props.user} />
82
+        {/*
83
+          case 'calendar':
84
+            return <Calendar user={this.props.user} />
85
+        */}
84
 
86
 
85
         case 'notification':
87
         case 'notification':
86
           return <Notification
88
           return <Notification

+ 24 - 22
frontend/src/container/Dashboard.jsx View File

80
                 <div className='dashboard__header__acces' />
80
                 <div className='dashboard__header__acces' />
81
               </div>
81
               </div>
82
               <div className='dashboard__header__advancedmode mr-3'>
82
               <div className='dashboard__header__advancedmode mr-3'>
83
-                <button type='button' className='btn btn-primary' disabled>Activer édition avancé</button>
83
+                <button type='button' className='btn btn-primary'>Activer édition avancé</button>
84
               </div>
84
               </div>
85
             </div>
85
             </div>
86
 
86
 
129
                         Abonné(e)
129
                         Abonné(e)
130
                       </button>
130
                       </button>
131
                       <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
131
                       <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
132
-                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item' disabled>Abonné(e)
132
+                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item'>Abonné(e)
133
                         </div>
133
                         </div>
134
-                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item dropdown-item' disabled>Non Abonné(e)
134
+                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item dropdown-item'>Non Abonné(e)
135
                         </div>
135
                         </div>
136
                       </div>
136
                       </div>
137
                     </div>
137
                     </div>
140
               </div>
140
               </div>
141
             </div>
141
             </div>
142
 
142
 
143
-            <div className='dashboard__calltoaction'>
144
-              <div className='dashboard__calltoaction__button btnaction thread'>
143
+            <div className='dashboard__calltoaction justify-content-xl-center'>
144
+              <div className='dashboard__calltoaction__button btnaction btnthread'>
145
                 <div className='dashboard__calltoaction__button__text'>
145
                 <div className='dashboard__calltoaction__button__text'>
146
                   <div className='dashboard__calltoaction__button__text__icon'>
146
                   <div className='dashboard__calltoaction__button__text__icon'>
147
                     <i className='fa fa-comments-o' />
147
                     <i className='fa fa-comments-o' />
174
                 </div>
174
                 </div>
175
               </div>
175
               </div>
176
 
176
 
177
-              <div className='dashboard__calltoaction__button btnaction visioconf'>
178
-                <div className='dashboard__calltoaction__button__text'>
179
-                  <div className='dashboard__calltoaction__button__text__icon'>
180
-                    <i className='fa fa-video-camera' />
181
-                  </div>
182
-                  <div className='dashboard__calltoaction__button__text__title'>
183
-                    Débuter une visioconférence
177
+              {/*
178
+                <div className='dashboard__calltoaction__button btnaction visioconf'>
179
+                  <div className='dashboard__calltoaction__button__text'>
180
+                    <div className='dashboard__calltoaction__button__text__icon'>
181
+                      <i className='fa fa-video-camera' />
182
+                    </div>
183
+                    <div className='dashboard__calltoaction__button__text__title'>
184
+                      Débuter une visioconférence
185
+                    </div>
184
                   </div>
186
                   </div>
185
                 </div>
187
                 </div>
186
-              </div>
187
 
188
 
188
-              <div className='dashboard__calltoaction__button btnaction calendar'>
189
-                <div className='dashboard__calltoaction__button__text'>
190
-                  <div className='dashboard__calltoaction__button__text__icon'>
191
-                    <i className='fa fa-calendar' />
192
-                  </div>
193
-                  <div className='dashboard__calltoaction__button__text__title'>
194
-                    Voir le Calendrier
189
+                <div className='dashboard__calltoaction__button btnaction calendar'>
190
+                  <div className='dashboard__calltoaction__button__text'>
191
+                    <div className='dashboard__calltoaction__button__text__icon'>
192
+                      <i className='fa fa-calendar' />
193
+                    </div>
194
+                    <div className='dashboard__calltoaction__button__text__title'>
195
+                      Voir le Calendrier
196
+                    </div>
195
                   </div>
197
                   </div>
196
                 </div>
198
                 </div>
197
-              </div>
199
+              */ }
198
 
200
 
199
               <div className='dashboard__calltoaction__button btnaction explore'>
201
               <div className='dashboard__calltoaction__button btnaction explore'>
200
                 <div className='dashboard__calltoaction__button__text'>
202
                 <div className='dashboard__calltoaction__button__text'>
511
                         </ul>
513
                         </ul>
512
                       </div>
514
                       </div>
513
                       <div className='dashboard__memberlist__form__submitbtn'>
515
                       <div className='dashboard__memberlist__form__submitbtn'>
514
-                        <button className='btn btn-outline-primary' disabled>Valider</button>
516
+                        <button className='btn btn-outline-primary'>Valider</button>
515
                       </div>
517
                       </div>
516
                     </form>
518
                     </form>
517
                   }
519
                   }

+ 9 - 2
frontend/src/container/Login.jsx View File

65
     if (this.props.user.logged) return <Redirect to={{pathname: '/'}} />
65
     if (this.props.user.logged) return <Redirect to={{pathname: '/'}} />
66
     else {
66
     else {
67
       return (
67
       return (
68
-        <section className='loginpage'>
68
+        <section className='loginpage primaryColorBg'>
69
           <div className='container-fluid'>
69
           <div className='container-fluid'>
70
 
70
 
71
             <LoginLogo customClass='loginpage__logo' logoSrc={LoginLogoImg} />
71
             <LoginLogo customClass='loginpage__logo' logoSrc={LoginLogoImg} />
126
                       <Button
126
                       <Button
127
                         htmlType='button'
127
                         htmlType='button'
128
                         bootstrapType='primary'
128
                         bootstrapType='primary'
129
-                        customClass='connection__form__btnsubmit'
129
+                        customClass='connection__form__btnsubmit ml-auto'
130
                         label='Connexion'
130
                         label='Connexion'
131
                         onClick={this.handleClickSubmit}
131
                         onClick={this.handleClickSubmit}
132
                       />
132
                       />
138
             </div>
138
             </div>
139
 
139
 
140
           </div>
140
           </div>
141
+
142
+          <footer className='loginpage__footer'>
143
+            <div className='loginpage__footer__text whiteFontColor'>
144
+              copyright © 2013 - 2018 tracim project.
145
+           </div>
146
+          </footer>
147
+
141
         </section>
148
         </section>
142
       )
149
       )
143
     }
150
     }

+ 3 - 3
frontend/src/container/Sidebar.jsx View File

59
     return (
59
     return (
60
       <div className={classnames('sidebar primaryColorBgDarken', {'sidebarclose': sidebarClose})}>
60
       <div className={classnames('sidebar primaryColorBgDarken', {'sidebarclose': sidebarClose})}>
61
         <div className='sidebarSticky'>
61
         <div className='sidebarSticky'>
62
-          <div className='sidebar__expand primaryColorBg.darken' onClick={this.handleClickToggleSidebar}>
62
+          <div className='sidebar__expand primaryColorBg whiteColorBorder' onClick={this.handleClickToggleSidebar}>
63
             <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
63
             <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
64
           </div>
64
           </div>
65
 
65
 
83
           </nav>
83
           </nav>
84
 
84
 
85
           <div className='sidebar__btnnewworkspace'>
85
           <div className='sidebar__btnnewworkspace'>
86
-            <button className='sidebar__btnnewworkspace__btn btn btn-primary mb-5' disabled>
86
+            <button className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'>
87
               {t('Sidebar.create_new_workspace')}
87
               {t('Sidebar.create_new_workspace')}
88
             </button>
88
             </button>
89
           </div>
89
           </div>
90
 
90
 
91
           <div className='sidebar__footer mb-2'>
91
           <div className='sidebar__footer mb-2'>
92
-            <div className='sidebar__footer__text d-flex align-items-end justify-content-center'>
92
+            <div className='sidebar__footer__text whiteFontColor d-flex align-items-end justify-content-center'>
93
               Copyright - 2013 - 2018
93
               Copyright - 2013 - 2018
94
               <div className='sidebar__footer__text__link'>
94
               <div className='sidebar__footer__text__link'>
95
                 <a href='http://www.tracim.fr/' target='_blank' className='ml-3'>tracim.fr</a>
95
                 <a href='http://www.tracim.fr/' target='_blank' className='ml-3'>tracim.fr</a>

+ 4 - 5
frontend/src/css/AccountPage.styl View File

56
     justify-content center
56
     justify-content center
57
     align-items center
57
     align-items center
58
     flex-wrap wrap
58
     flex-wrap wrap
59
-    border 1px solid grey
60
     padding 25px
59
     padding 25px
61
     font-size 18px
60
     font-size 18px
62
     &__wrapper
61
     &__wrapper
143
       .calendar
142
       .calendar
144
         &__text
143
         &__text
145
           settingText()
144
           settingText()
146
-        &__title
147
-          margin 15px 0
148
-          font-size 18px
149
         &__link
145
         &__link
150
           display inline-block
146
           display inline-block
151
           border 1px solid grey
147
           border 1px solid grey
152
           border-radius 5px
148
           border-radius 5px
153
           padding 10px 25px
149
           padding 10px 25px
154
-        &__timezone
150
+      .timezone
151
+        &__text
152
+          settingText()
153
+        &__time
155
           margin 15px 0 30px 0
154
           margin 15px 0 30px 0
156
           &__select
155
           &__select
157
             max-width 300px
156
             max-width 300px

+ 2 - 1
frontend/src/css/Dashboard.styl View File

32
 
32
 
33
 .dashboard
33
 .dashboard
34
   margin-left 20px
34
   margin-left 20px
35
+  width 100%
35
   &__header
36
   &__header
36
     flexwrap()
37
     flexwrap()
37
     align-items center
38
     align-items center
94
         &__title
95
         &__title
95
           font-size 18px
96
           font-size 18px
96
           color white
97
           color white
97
-    .thread
98
+    .btnthread
98
       background-color threadColor
99
       background-color threadColor
99
     .writefile
100
     .writefile
100
       background-color writefile
101
       background-color writefile

+ 23 - 17
frontend/src/css/Login.styl View File

1
 .loginpage
1
 .loginpage
2
   padding-top 85px // 85 = header height
2
   padding-top 85px // 85 = header height
3
-  min-height calc(100% - 50px)
4
-  background secondColor url('../img/tracimLogoAsBg.png') no-repeat 25% 3px
3
+  min-height 100%
4
+  background-image url('../img/tracimLogoAsBg.png')
5
+  background-repeat no-repeat
5
   background-size contain
6
   background-size contain
7
+  background-position center
6
   width 100%
8
   width 100%
7
   &__logo
9
   &__logo
8
     margin 0 auto
10
     margin 0 auto
9
     padding 50px 0
11
     padding 50px 0
10
     width 170px
12
     width 170px
11
   &__connection
13
   &__connection
14
+    margin-bottom 50px
12
     border none
15
     border none
13
     box-shadow shadow-right
16
     box-shadow shadow-right
14
-    margin-bottom 50px
15
     .connection__header
17
     .connection__header
16
       background-color thirdColor
18
       background-color thirdColor
17
       color #FFF
19
       color #FFF
18
       font-size 25px
20
       font-size 25px
19
   .connection__form
21
   .connection__form
20
-    width 70%
21
     margin 0 auto
22
     margin 0 auto
23
+    width 70%
22
     &__rememberme
24
     &__rememberme
23
       &__label
25
       &__label
24
         font-size 13px
26
         font-size 13px
34
     &__groupepw
36
     &__groupepw
35
       position relative
37
       position relative
36
       &__icon
38
       &__icon
37
-        font-size 20px
38
-        width 20px
39
         position absolute
39
         position absolute
40
         top 5px
40
         top 5px
41
         left 8px
41
         left 8px
42
+        width 20px
43
+        font-size 20px
42
       &__input
44
       &__input
43
         padding-left 45px
45
         padding-left 45px
44
     &__btnsubmit
46
     &__btnsubmit
47
+      display block
48
+      margin 0 auto
49
+      border none
45
       width 150px
50
       width 150px
46
       background-color green
51
       background-color green
47
-      border none
48
       cursor pointer
52
       cursor pointer
49
-      display block
50
-      margin 0 auto
51
       &:hover
53
       &:hover
52
         background-color btnCallAction-hover
54
         background-color btnCallAction-hover
53
       &:focus
55
       &:focus
54
         box-shadow shadow-all-side-green
56
         box-shadow shadow-all-side-green
55
     &__pwforgot
57
     &__pwforgot
58
+      margin-top 3px
56
       cursor pointer
59
       cursor pointer
57
       font-size 13px
60
       font-size 13px
58
-      margin-top 3px
59
       &:hover::after
61
       &:hover::after
60
-        content ' '
61
         position absolute
62
         position absolute
62
         top 20px
63
         top 20px
63
         right 15px
64
         right 15px
64
-        width 130px
65
-        padding-bottom 2px
66
         border-bottom 1px solid darkGrey
65
         border-bottom 1px solid darkGrey
66
+        padding-bottom 2px
67
+        content ' '
68
+        width 130px
69
+  &__footer
70
+    text-align center
71
+    &__text
72
+      font-size 17px
67
 
73
 
68
 @media (min-width: min-lg) and (max-width: max-lg)
74
 @media (min-width: min-lg) and (max-width: max-lg)
69
-  .loginpage__content
75
+  .loginpage
70
     .connection__form
76
     .connection__form
71
       width 100%
77
       width 100%
72
 
78
 
73
 @media (min-width: min-md) and (max-width: max-md)
79
 @media (min-width: min-md) and (max-width: max-md)
74
-  .loginpage__content
80
+  .loginpage
75
     .connection__form
81
     .connection__form
76
       width 95%
82
       width 95%
77
 
83
 
78
 @media (min-width: min-sm) and (max-width: max-sm)
84
 @media (min-width: min-sm) and (max-width: max-sm)
79
-  .loginpage__content
85
+  .loginpage
80
     padding-top 69px
86
     padding-top 69px
81
     display block
87
     display block
82
     .connection__form
88
     .connection__form
83
       width 90%
89
       width 90%
84
 
90
 
85
 @media (max-width: max-xs)
91
 @media (max-width: max-xs)
86
-  .loginpage__content
92
+  .loginpage
87
     padding-top 69px
93
     padding-top 69px
88
     background-size cover
94
     background-size cover
89
     display block
95
     display block

+ 3 - 8
frontend/src/css/Sidebar.styl View File

27
   &__expand
27
   &__expand
28
     position absolute
28
     position absolute
29
     top 0
29
     top 0
30
-    right -42px
30
+    right -43px
31
     display flex
31
     display flex
32
     justify-content center
32
     justify-content center
33
     align-items center
33
     align-items center
34
-    border-left 1px solid off-white
34
+    border-left-width 1px
35
+    border-left-style solid
35
     border-bottom-right-radius 15px
36
     border-bottom-right-radius 15px
36
     padding 8px 15px
37
     padding 8px 15px
37
     cursor pointer
38
     cursor pointer
44
       display block
45
       display block
45
       margin 0 auto
46
       margin 0 auto
46
       padding 15px 30px
47
       padding 15px 30px
47
-      background-color thirdColor
48
-      border-color thirdColor
49
-      &:hover, &:focus, &:active, &:visited
50
-        background-color fifthColor
51
-        border-color fifthColor
52
   &__navigation
48
   &__navigation
53
     padding 0
49
     padding 0
54
     overflow hidden
50
     overflow hidden
111
                 background-color rgba(253, 253, 253, 0.8)
107
                 background-color rgba(253, 253, 253, 0.8)
112
   &__footer
108
   &__footer
113
     &__text
109
     &__text
114
-      color off-white
115
       font-size 14px
110
       font-size 14px
116
       &__link
111
       &__link
117
         & > a
112
         & > a