fixed notice board on dashboard funtionality and design

Neeraj Sharma
1 parent 01d009dde7
Showing 1 changed file with 8 additions and 6 deletions Show diff stats
src/pages/Dashboard/dashboard.vue
@@ -14,7 +14,8 @@
         <v-card-text>
           <v-layout>
             <v-flex align-center justify-center layout text-xs-center class="mt-2">
-              <img src="/static/icon/user.png" width="70px" />
+              <img src="/static/icon/user.png" width="70px" v-if="!notice.eventImageUrl" />
+              <img :src="notice.eventImageUrl" width="280px" v-else-if="notice.eventImageUrl" />
             </v-flex>
           </v-layout>
           <v-container grid-list-md>
@@ -27,7 +28,7 @@
                     </h5>
                   </v-flex>
                   <v-flex sm6 xs8>
-                    <h5 class="my-1">{{ editedItem.title }}</h5>
+                    <h5 class="my-1">{{ notice.title }}</h5>
                   </v-flex>
                 </v-layout>
                 <v-layout>
@@ -37,7 +38,7 @@
                     </h5>
                   </v-flex>
                   <v-flex sm6 xs8>
-                    <h5 class="my-1">{{ editedItem.description }}</h5>
+                    <h5 class="my-1">{{ notice.description }}</h5>
                   </v-flex>
                 </v-layout>
               </v-flex>
@@ -122,7 +123,8 @@
           <v-card>
             <v-flex xs12 class="text-xs-center">
               <v-avatar size="60px" class="mx-auto" style="margin: auto;display:block;">
-                <img src="/static/icon/user.png" />
+                <img src="/static/icon/user.png" v-if="!userData.schoolLogoUrl" />
+                <img :src="userData.schoolLogoUrl" v-else-if="userData.schoolLogoUrl" />
               </v-avatar>
               <h5 class="pt-1">
                 <i>{{ userData.name }}</i>
@@ -252,7 +254,7 @@ export default {
         }
       },
       selected: {},
-      editedItem: {},
+      notice: {},
       userData: {},
       students: "",
       parents: "",
@@ -277,7 +279,7 @@ export default {
     },
     profile(item) {
       // this.editedIndex = this.desserts.indexOf(item);
-      this.editedItem = Object.assign({}, item);
+      this.notice = Object.assign({}, item);
       this.dialogNotice = true;
     },
     date: function(date) {
...	...	@@ -14,7 +14,8 @@
14	14	<v-card-text>
15	15	<v-layout>
16	16	<v-flex align-center justify-center layout text-xs-center class="mt-2">
17		- <img src="/static/icon/user.png" width="70px" />
	17	+ <img src="/static/icon/user.png" width="70px" v-if="!notice.eventImageUrl" />
	18	+ <img :src="notice.eventImageUrl" width="280px" v-else-if="notice.eventImageUrl" />
18	19	</v-flex>
19	20	</v-layout>
20	21	<v-container grid-list-md>
...	...	@@ -27,7 +28,7 @@
27	28	</h5>
28	29	</v-flex>
29	30	<v-flex sm6 xs8>
30		- <h5 class="my-1">{{ editedItem.title }}</h5>
	31	+ <h5 class="my-1">{{ notice.title }}</h5>
31	32	</v-flex>
32	33	</v-layout>
33	34	<v-layout>
...	...	@@ -37,7 +38,7 @@
37	38	</h5>
38	39	</v-flex>
39	40	<v-flex sm6 xs8>
40		- <h5 class="my-1">{{ editedItem.description }}</h5>
	41	+ <h5 class="my-1">{{ notice.description }}</h5>
41	42	</v-flex>
42	43	</v-layout>
43	44	</v-flex>
...	...	@@ -122,7 +123,8 @@
122	123	<v-card>
123	124	<v-flex xs12 class="text-xs-center">
124	125	<v-avatar size="60px" class="mx-auto" style="margin: auto;display:block;">
125		- <img src="/static/icon/user.png" />
	126	+ <img src="/static/icon/user.png" v-if="!userData.schoolLogoUrl" />
	127	+ <img :src="userData.schoolLogoUrl" v-else-if="userData.schoolLogoUrl" />
126	128	</v-avatar>
127	129	<h5 class="pt-1">
128	130	<i>{{ userData.name }}</i>
...	...	@@ -252,7 +254,7 @@ export default {
252	254	}
253	255	},
254	256	selected: {},
255		- editedItem: {},
	257	+ notice: {},
256	258	userData: {},
257	259	students: "",
258	260	parents: "",
...	...	@@ -277,7 +279,7 @@ export default {
277	279	},
278	280	profile(item) {
279	281	// this.editedIndex = this.desserts.indexOf(item);
280		- this.editedItem = Object.assign({}, item);
	282	+ this.notice = Object.assign({}, item);
281	283	this.dialogNotice = true;
282	284	},
283	285	date: function(date) {
...	...