Przeglądaj źródła

update of account page

AlexiCauvin 7 lat temu
rodzic
commit
5e1396f960

+ 5 - 7
jsonserver/static_db.json Wyświetl plik

14
     "logged": true,
14
     "logged": true,
15
     "user": {
15
     "user": {
16
       "id": 5,
16
       "id": 5,
17
-      "username": "Smoi",
18
-      "firstname": "Côme",
19
-      "lastname": "Stoilenom",
20
-      "email": "osef@algoo.fr",
21
-      "avatar": "https://avatars3.githubusercontent.com/u/11177014?s=460&v=4",
17
+      "username": "franclecompte",
18
+      "firstname": "François",
19
+      "lastname": "Lecompte",
20
+      "email": "francois.lecompte@algoo.fr",
21
+      "avatar": "https://rawgit.com/tracim/tracim_front/develop/src/img/imgProfil.png",
22
       "role": "Utilisateur",
22
       "role": "Utilisateur",
23
-      "job": "Integrateur | Webdesigner",
24
-      "company": "Algoo",
25
       "caldav_url": "http://algoo.trac.im/caldav/user/5.ics/"
23
       "caldav_url": "http://algoo.trac.im/caldav/user/5.ics/"
26
     }
24
     }
27
   },
25
   },

+ 2 - 2
src/component/Account/Notification.jsx Wyświetl plik

8
 
8
 
9
   return (
9
   return (
10
     <div className='account__userpreference__setting__notification'>
10
     <div className='account__userpreference__setting__notification'>
11
-      <div className='notification__title subTitle ml-2 ml-sm-0'>
12
-        Mes Espaces de Travail
11
+      <div className='notification__sectiontitle subTitle ml-2 ml-sm-0'>
12
+        Espace de Travail et Notification
13
       </div>
13
       </div>
14
 
14
 
15
       <div className='notification__text ml-2 ml-sm-0'>
15
       <div className='notification__text ml-2 ml-sm-0'>

+ 94 - 16
src/component/Account/PersonalData.jsx Wyświetl plik

3
 export const PersonalData = props => {
3
 export const PersonalData = props => {
4
   return (
4
   return (
5
     <div className='account__userpreference__setting__personaldata'>
5
     <div className='account__userpreference__setting__personaldata'>
6
-      <div className='personaldata__title subTitle ml-2 ml-sm-0'>
7
-        Mes informations personnelles
6
+      <div className='personaldata__sectiontitle subTitle ml-2 ml-sm-0'>
7
+        Information du compte et personnelles
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'>
11
         NYI
11
         NYI
12
       </div>
12
       </div>
13
 
13
 
14
-      <div className='personaldata__form'>
15
-        <div className='personaldata__form__title'>
16
-          Mot de passe :
17
-        </div>
18
-        <input className='personaldata__form__txtinput form-control' type='password' placeholder='Ancien mot de passe' />
19
-        <input className='personaldata__form__txtinput form-control' type='password' placeholder='Nouveau mot de passe' />
14
+      <div className='personaldata__dataconnexion d-flex align-items-center justify-content-between flex-wrap'>
15
+        <form className='personaldata__form mr-5'>
16
+          <div className='personaldata__form__title'>
17
+            Mot de passe :
18
+          </div>
19
+          <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
20
+            <input className='personaldata__form__txtinput form-control mr-3' type='password' placeholder='Ancien mot de passe' />
21
+            <input className='personaldata__form__txtinput form-control mt-3 mt-sm-0' type='password' placeholder='Nouveau mot de passe' />
22
+          </div>
23
+          <div className='d-flex justify-content-sm-end'>
24
+            <button type='submit' className='personaldata__form__button btn btn-outline-primary d-flex justify-content-end'>
25
+              Envoyer
26
+            </button>
27
+          </div>
28
+        </form>
29
+
30
+        <form className='personaldata__form'>
31
+          <div className='personaldata__form__title'>
32
+            Adresse mail :
33
+          </div>
34
+          <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
35
+            <input className='personaldata__form__txtinput form-control mr-3' type='email' placeholder='Ancienne adresse mail' />
36
+            <input className='personaldata__form__txtinput form-control mt-3 mt-sm-0' type='email' placeholder='Nouvelle adresse mail' />
37
+          </div>
38
+          <div className='d-flex justify-content-sm-end'>
39
+            <button type='submit' className='personaldata__form__button btn btn-outline-primary d-flex justify-content-end'>
40
+              Envoyer
41
+            </button>
42
+          </div>
43
+        </form>
20
       </div>
44
       </div>
21
 
45
 
22
-      <div className='personaldata__form'>
23
-        <div className='personaldata__form__title'>
24
-          Adresse mail :
25
-        </div>
26
-        <input className='personaldata__form__txtinput form-control' type='email' placeholder='Ancienne adresse mail' />
27
-        <input className='personaldata__form__txtinput form-control' type='email' placeholder='Nouvelle adresse mail' />
46
+      <div className='personaldata__dataheader d-flex align-items-center justify-content-between flex-wrap'>
47
+
48
+        <form className='personaldata__form mr-5'>
49
+          <div className='personaldata__form__title'>
50
+            Nom de Famille :
51
+          </div>
52
+          <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
53
+            <input className='personaldata__form__txtinput form-control mr-3' type='password' placeholder='Ancien nom de famille' />
54
+            <input className='personaldata__form__txtinput form-control mt-3 mt-sm-0' type='password' placeholder='Nouveau nom de famille' />
55
+          </div>
56
+          <div className='d-flex justify-content-sm-end'>
57
+            <button type='submit' className='personaldata__form__button btn btn-outline-primary'>
58
+              Envoyer
59
+            </button>
60
+          </div>
61
+        </form>
62
+
63
+        <form className='personaldata__form'>
64
+          <div className='personaldata__form__title'>
65
+            Prénom :
66
+          </div>
67
+          <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
68
+            <input className='personaldata__form__txtinput form-control mr-3' type='password' placeholder='Ancien prénom' />
69
+            <input className='personaldata__form__txtinput form-control mt-3 mt-sm-0' type='password' placeholder='Nouveau prénom' />
70
+          </div>
71
+          <div className='d-flex justify-content-sm-end'>
72
+            <button type='submit' className='personaldata__form__button btn btn-outline-primary'>
73
+              Envoyer
74
+            </button>
75
+          </div>
76
+        </form>
28
       </div>
77
       </div>
29
-      <div className='personaldata__form__button btn btn-primary'>
30
-        Envoyer
78
+
79
+      <div className='account__userpreference__setting__calendar mt-4 '>
80
+
81
+        <div className='calendar__sectiontitle subTitle ml-2 ml-sm-0'>
82
+          Calendrier
83
+        </div>
84
+
85
+        <div className='calendar__text ml-2 ml-sm-0'>
86
+          NYI
87
+        </div>
88
+
89
+        <div className='calendar__title ml-2 ml-sm-0'>
90
+          Accèder à votre Calendrier personnel
91
+        </div>
92
+        <div className='calendar__link ml-2 ml-sm-0'>
93
+          { /* {props.user.caldavUrl} */ }
94
+        </div>
95
+
96
+        <div className='calendar__title ml-2 ml-sm-0'>
97
+          Changer de Fuseau Horaire :
98
+        </div>
99
+
100
+        <div className='calendar__timezone ml-2 ml-sm-0 dropdown'>
101
+          <button className='calendar__timezone__btn btn dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
102
+            Fuseau Horaire
103
+          </button>
104
+          <div className='calendar__timezone__submenu dropdown-menu'>
105
+            { /* {props.timezone.map((t, i) => <div className='calendar__timezone__submenu__item dropdown-item' key={i}>{t.place} {t.gmt}</div>)} */ }
106
+          </div>
107
+        </div>
31
       </div>
108
       </div>
109
+
32
     </div>
110
     </div>
33
   )
111
   )
34
 }
112
 }

+ 3 - 3
src/component/Account/UserInfo.jsx Wyświetl plik

10
         <div className='account__userinformation__name mb-3'>
10
         <div className='account__userinformation__name mb-3'>
11
           {`${props.user.firstname} ${props.user.lastname}`}
11
           {`${props.user.firstname} ${props.user.lastname}`}
12
         </div>
12
         </div>
13
-        <a href={`mailto:${props.user.email}`} className='account__userinformation__email mb-3'>
13
+        <a href={`mailto:${props.user.email}`} className='account__userinformation__email d-block mb-3'>
14
           {props.user.email}
14
           {props.user.email}
15
         </a>
15
         </a>
16
         <div className='account__userinformation__role mb-3'>
16
         <div className='account__userinformation__role mb-3'>
17
           {props.user.role}
17
           {props.user.role}
18
         </div>
18
         </div>
19
-        <div className='account__userinformation__job mb-3'>
19
+        { /* <div className='account__userinformation__job mb-3'>
20
           {props.user.job}
20
           {props.user.job}
21
         </div>
21
         </div>
22
         <a href='http://www.algoo.fr' className='account__userinformation__company'>
22
         <a href='http://www.algoo.fr' className='account__userinformation__company'>
23
           {props.user.company}
23
           {props.user.company}
24
-        </a>
24
+        </a> */ }
25
       </div>
25
       </div>
26
     </div>
26
     </div>
27
   )
27
   )

+ 7 - 5
src/container/Account.jsx Wyświetl plik

25
         name: 'personalData',
25
         name: 'personalData',
26
         menuLabel: 'Informations Compte',
26
         menuLabel: 'Informations Compte',
27
         active: true
27
         active: true
28
-      }, {
29
-        name: 'calendar',
30
-        menuLabel: 'Calendrier',
31
-        active: false
32
-      }, {
28
+      },
29
+      // {
30
+      //   name: 'calendar',
31
+      //   menuLabel: 'Calendrier',
32
+      //   active: false
33
+      // },
34
+      {
33
         name: 'notification',
35
         name: 'notification',
34
         menuLabel: 'Notifications',
36
         menuLabel: 'Notifications',
35
         active: false
37
         active: false

+ 36 - 4
src/css/AccountPage.styl Wyświetl plik

11
 .table tr:nth-child(even)
11
 .table tr:nth-child(even)
12
   background-color grey-hover
12
   background-color grey-hover
13
 
13
 
14
+
15
+/**** MENU HAMBURGER ON EXPAND BAR *****/
16
+
17
+.hamburger--spring .hamburger-inner
18
+  margin 4px 8px
19
+
20
+.hamburger--spring .hamburger-inner::before
21
+  top 7px
22
+
23
+.hamburger--spring .hamburger-inner::after
24
+  top 14px
25
+
26
+/***************************************/
27
+
28
+.hamburger--spring
29
+  .hamburger-inner
30
+    transition-delay 0.22s
31
+    background-color transparent
32
+    &::before
33
+      top -3px
34
+      transition top 0.1s 0.15s cubic-bezier(0.33333, 0, 0.66667, 0.33333), transform 0.13s 0.22s cubic-bezier(0.215, 0.61, 0.355, 1)
35
+      transform translate3d(0, 10px, 0) rotate(45deg)
36
+    &::after
37
+      top -3px
38
+      transition top 0.2s cubic-bezier(0.33333, 0, 0.66667, 0.33333), transform 0.13s 0.22s cubic-bezier(0.215, 0.61, 0.355, 1)
39
+      transform translate3d(0, 10px, 0) rotate(-45deg)
40
+
41
+.hamburger-inner, .hamburger-inner::after, .hamburger-inner::before
42
+  width 30px
43
+
14
 .account
44
 .account
15
   &__userinformation
45
   &__userinformation
16
     display flex
46
     display flex
91
             margin-bottom 15px
121
             margin-bottom 15px
92
             font-size 18px
122
             font-size 18px
93
           &__txtinput
123
           &__txtinput
94
-            display inline-flex
124
+            display block
95
             width auto
125
             width auto
96
-            margin 0 15px 15px 0
97
             border 1px solid blue
126
             border 1px solid blue
98
             border-radius 5px
127
             border-radius 5px
99
-            padding 8px 15px
100
           &__button
128
           &__button
101
             vertical-align top
129
             vertical-align top
102
             border 1px solid blue
130
             border 1px solid blue
170
             &:focus
198
             &:focus
171
               outline none
199
               outline none
172
             &__box
200
             &__box
173
-              margin-top 15px
201
+              margin 15px 5px 0 0
174
               &__icon, &__icon::before, &__icon::after
202
               &__icon, &__icon::before, &__icon::after
175
                 width 30px
203
                 width 30px
176
         &__list
204
         &__list
236
 
264
 
237
 @media (max-width: max-xs)
265
 @media (max-width: max-xs)
238
 
266
 
267
+  .hamburger-box
268
+    width 45px
269
+    height 22px
270
+
239
   .account
271
   .account
240
     &__userinformation
272
     &__userinformation
241
       &__avatar
273
       &__avatar