Przeglądaj źródła

multiple modification in the front, modification on css rules, adding icon in jsx

AlexiCauvin 6 lat temu
rodzic
commit
134e9a51f5

+ 4 - 4
jsonserver/static_db.json Wyświetl plik

99
   }],
99
   }],
100
   "workspace_detail": {
100
   "workspace_detail": {
101
     "id": 1,
101
     "id": 1,
102
-    "title": "Liste des contenus",
102
+    "title": "Tous les contenus",
103
     "owner_id": 5,
103
     "owner_id": 5,
104
     "content": [
104
     "content": [
105
       {
105
       {
218
       "day": "27/11/17",
218
       "day": "27/11/17",
219
       "hour": "11h45"
219
       "hour": "11h45"
220
     },
220
     },
221
-    "text": "Voici le début de ce qui nous servira de cachier des charges pour la partie design du logiciel, chacun peut completer le documents, nésité pas à faire des retours ! "
221
+    "text": "Voici le début de ce qui nous servira de cachier des charges pour la partie design du logiciel, chacun peut completer le documents, n'hésité pas à faire des retours ! "
222
   }, {
222
   }, {
223
     "id": 1,
223
     "id": 1,
224
     "type": "message",
224
     "type": "message",
249
     "id": 3,
249
     "id": 3,
250
     "type": "version",
250
     "type": "version",
251
     "author": {
251
     "author": {
252
-      "id": 1,
253
-      "username": "smoi",
252
+      "id": 5,
253
+      "username": "stoi",
254
       "avatar": "https://www.algoo.fr/static/images/algoo_images/algoo-logo.jpg"
254
       "avatar": "https://www.algoo.fr/static/images/algoo_images/algoo-logo.jpg"
255
     },
255
     },
256
     "createdAt": {
256
     "createdAt": {

+ 8 - 2
src/component/Header/MenuActionListItem/MenuProfil.jsx Wyświetl plik

15
             </div>
15
             </div>
16
           </button>
16
           </button>
17
           <div className='profilgroup__setting dropdown-menu' aria-labelledby='dropdownMenuButton'>
17
           <div className='profilgroup__setting dropdown-menu' aria-labelledby='dropdownMenuButton'>
18
-            <Link className='setting__link dropdown-item' to={PAGE.ACCOUNT}>Mon compte</Link>
18
+            <Link className='setting__link dropdown-item' to={PAGE.ACCOUNT}>
19
+              <i className='fa fa-fw fa-user-o mr-2' />
20
+              Mon compte
21
+            </Link>
19
             {/* <div className='setting__link dropdown-item'>Mot de passe</div> */}
22
             {/* <div className='setting__link dropdown-item'>Mot de passe</div> */}
20
-            <div className='setting__link dropdown-item' onClick={props.onClickLogout}>Se déconnecter</div>
23
+            <div className='setting__link dropdown-item' onClick={props.onClickLogout}>
24
+              <i className='fa fa-fw fa-sign-out mr-2' />
25
+              Se déconnecter
26
+            </div>
21
           </div>
27
           </div>
22
         </div>
28
         </div>
23
       </li>
29
       </li>

+ 4 - 1
src/component/common/layout/PageTitle.jsx Wyświetl plik

5
 const PageTitle = props => {
5
 const PageTitle = props => {
6
   return (
6
   return (
7
     <div className={classnames(props.parentClass, props.customClass, 'pageTitleGeneric')}>
7
     <div className={classnames(props.parentClass, props.customClass, 'pageTitleGeneric')}>
8
-      <div className={classnames(`${props.parentClass}__title`, 'pageTitleGeneric__title')}>
8
+      <div className={classnames(`${props.parentClass}__title`, 'pageTitleGeneric__title d-flex align-items-center')}>
9
+        <div className='pageTitleGeneric__title__icon mr-3'>
10
+          <i className='fa fa-fw fa-th' />
11
+        </div>
9
         {props.title}
12
         {props.title}
10
       </div>
13
       </div>
11
       {props.children}
14
       {props.children}

+ 1 - 1
src/container/Sidebar.jsx Wyświetl plik

78
           </nav>
78
           </nav>
79
 
79
 
80
           <div className='sidebar__btnnewworkspace'>
80
           <div className='sidebar__btnnewworkspace'>
81
-            <button className='sidebar__btnnewworkspace__btn btn btn-primary'>
81
+            <button className='sidebar__btnnewworkspace__btn btn btn-primary mb-5'>
82
               {t('Sidebar.create_new_workspace')}
82
               {t('Sidebar.create_new_workspace')}
83
             </button>
83
             </button>
84
           </div>
84
           </div>

+ 0 - 9
src/css/ExtandedAction.styl Wyświetl plik

1
 .extandedaction
1
 .extandedaction
2
-  .btn-outline-primary
3
-    color fontColor
4
-    border-color secondColor
5
-    &:hover, &:focus, &:active
6
-      color off-white
7
-      border-color thirdColor
8
-      background-color thirdColor
9
-      box-shadow 0 0 1px 2px fifthColor
10
-      outline fifthColor
11
   &__subdropdown
2
   &__subdropdown
12
     margin 0
3
     margin 0
13
     padding 0
4
     padding 0

+ 6 - 1
src/css/Generic.styl Wyświetl plik

32
   border-color hover-button
32
   border-color hover-button
33
   box-shadow 0 0 1px 2px secondColor
33
   box-shadow 0 0 1px 2px secondColor
34
 
34
 
35
+.dropdown-item
36
+  &:hover, &:focus, &:visited, &:focus-within
37
+    background-color thirdColor
38
+    color off-white
39
+
35
 .sidebarpagecontainer
40
 .sidebarpagecontainer
36
   display flex
41
   display flex
37
   padding-top 88px
42
   padding-top 88px
110
       cursor pointer
115
       cursor pointer
111
 
116
 
112
 .fa-file-image-o
117
 .fa-file-image-o
113
-  color previewColor
118
+  color fileColor
114
 
119
 
115
 .fa-comments-o
120
 .fa-comments-o
116
   color threadColor
121
   color threadColor

+ 2 - 3
src/css/Header.styl Wyświetl plik

102
             left inherit
102
             left inherit
103
             right 0
103
             right 0
104
             cursor pointer
104
             cursor pointer
105
-            .dropdown-item
105
+            .setting__link
106
+              padding 10px
106
               color fontColor
107
               color fontColor
107
-            &__link
108
-              padding 10px 0
109
 
108
 
110
 @media (min-width: min-lg) and (max-width: max-lg)
109
 @media (min-width: min-lg) and (max-width: max-lg)
111
   .header
110
   .header

+ 2 - 2
src/css/Login.styl Wyświetl plik

1
 .loginpage
1
 .loginpage
2
   padding-top 85px // 85 = header height
2
   padding-top 85px // 85 = header height
3
   min-height calc(100% - 50px)
3
   min-height calc(100% - 50px)
4
-  background darkBlue url('../img/tracimLogoAsBg.png') no-repeat 25% 3px
4
+  background secondColor url('../img/tracimLogoAsBg.png') no-repeat 25% 3px
5
   background-size contain
5
   background-size contain
6
   width 100%
6
   width 100%
7
   &__logo
7
   &__logo
13
     box-shadow shadow-right
13
     box-shadow shadow-right
14
     margin-bottom 50px
14
     margin-bottom 50px
15
     .connection__header
15
     .connection__header
16
-      background-color blue
16
+      background-color thirdColor
17
       color #FFF
17
       color #FFF
18
       font-size 25px
18
       font-size 25px
19
   .connection__form
19
   .connection__form

+ 2 - 4
src/css/Sidebar.styl Wyświetl plik

27
   top 87px
27
   top 87px
28
 
28
 
29
 leftside()
29
 leftside()
30
-  flex-grow 0
31
   height 100%
30
   height 100%
32
   font-size 18px
31
   font-size 18px
33
   background-color rgba(253, 253, 253, 0.3)
32
   background-color rgba(253, 253, 253, 0.3)
83
           &:hover
82
           &:hover
84
             background-color fifthColor
83
             background-color fifthColor
85
         &__number
84
         &__number
85
+          display flex
86
           leftside()
86
           leftside()
87
           padding 12px
87
           padding 12px
88
           width 50px
88
           width 50px
89
           letter-spacing 2px
89
           letter-spacing 2px
90
         &__name
90
         &__name
91
-          flex-grow 2
92
           padding 10px
91
           padding 10px
93
           font-size 20px
92
           font-size 20px
94
           color off-white
93
           color off-white
96
           overflow hidden
95
           overflow hidden
97
           text-overflow ellipsis
96
           text-overflow ellipsis
98
         &__icon
97
         &__icon
99
-          flex-grow 0
100
-          padding 10px
98
+          margin 0 10px 0 auto
101
           color white
99
           color white
102
         &__submenu
100
         &__submenu
103
           margin 0
101
           margin 0

+ 1 - 1
src/css/Variable.styl Wyświetl plik

79
 /**** BOX SHADOW ****/
79
 /**** BOX SHADOW ****/
80
 shadow-bottom = 0px 0px 5px 1px #606060
80
 shadow-bottom = 0px 0px 5px 1px #606060
81
 shadow-right = 2px 2px 5px 0px #404040
81
 shadow-right = 2px 2px 5px 0px #404040
82
-shadow-all = 1px 1px 5px 2px #ababab
82
+shadow-all = 0px 0px 3px 1px #656565
83
 shadow-all-side-blue = 0px 0px 1px 1px lightBlue
83
 shadow-all-side-blue = 0px 0px 1px 1px lightBlue
84
 shadow-all-side-green = 0 0 1px 2px green
84
 shadow-all-side-green = 0 0 1px 2px green
85
 shadow-all-side-thread = 0 0 1px 2px threadColor
85
 shadow-all-side-thread = 0 0 1px 2px threadColor