Merge branch 'master' of https://github.com/primefaces/sigma-vue

rashadbabayev · Sep 7, 2021 · e18a375 · e18a375
2 parents f77545f + e9fc42b
commit e18a375
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 32 deletions.
diff --git a/public/assets/layout/data/events.json b/public/assets/layout/data/events.json
@@ -3,66 +3,66 @@
     	{
             "id": 1,
     		"title": "All Day Event",
-    		"start": "2019-01-01"
+    		"start": "2023-01-01"
     	},
     	{
             "id": 2,
     		"title": "Long Event",
-    		"start": "2019-01-07",
-    		"end": "2019-01-10"
+    		"start": "2023-01-07",
+    		"end": "2023-01-10"
     	},
     	{
     		"id": 3,
     		"title": "Repeating Event",
-    		"start": "2019-01-09T16:00:00"
+    		"start": "2023-01-09T16:00:00"
     	},
     	{
     		"id": 4,
     		"title": "Repeating Event",
-    		"start": "2019-01-16T16:00:00"
+    		"start": "2023-01-16T16:00:00"
     	},
     	{
             "id": 5,
     		"title": "Conference",
-    		"start": "2019-01-11",
-    		"end": "2019-01-13"
+    		"start": "2023-01-11",
+    		"end": "2023-01-13"
     	},
     	{
             "id": 6,
     		"title": "Meeting",
-    		"start": "2019-01-12T10:30:00",
-    		"end": "2019-01-12T12:30:00"
+    		"start": "2023-01-12T10:30:00",
+    		"end": "2023-01-12T12:30:00"
     	},
     	{
             "id": 7,
     		"title": "Lunch",
-    		"start": "2019-01-12T12:00:00"
+    		"start": "2023-01-12T12:00:00"
     	},
     	{
             "id": 8,
     		"title": "Meeting",
-    		"start": "2019-01-12T14:30:00"
+    		"start": "2023-01-12T14:30:00"
     	},
     	{
             "id": 9,
     		"title": "Happy Hour",
-    		"start": "2019-01-12T17:30:00"
+    		"start": "2023-01-12T17:30:00"
     	},
     	{
             "id": 10,
     		"title": "Dinner",
-    		"start": "2019-01-12T20:00:00"
+    		"start": "2023-01-12T20:00:00"
     	},
     	{
             "id": 11,
     		"title": "Birthday Party",
-    		"start": "2019-01-13T07:00:00"
+    		"start": "2023-01-13T07:00:00"
     	},
     	{
             "id": 12,
     		"title": "Click for Google",
     		"url": "http://google.com/",
-    		"start": "2019-01-28"
+    		"start": "2023-01-28"
     	}
     ]
 }
diff --git a/src/components/ChartDemo.vue b/src/components/ChartDemo.vue
@@ -7,14 +7,14 @@
 				<Chart type="line" :data="lineData" />
 			</div>
 
-			<div class="card">
+			<div class="card flex flex-column align-items-center">
 				<h5>Pie Chart</h5>
-				<Chart type="pie" :data="pieData" />
+				<Chart type="pie" :data="pieData" style="width: 50%" />
 			</div>
 
-			<div class="card">
+			<div class="card  flex flex-column align-items-center">
 				<h5>Polar Area Chart</h5>
-				<Chart type="polarArea" :data="polarData" />
+				<Chart type="polarArea" :data="polarData" style="width: 50%" />
 			</div>
 		</div>
 		<div class="col-12 lg:col-6">
@@ -23,14 +23,14 @@
 				<Chart type="bar" :data="barData" />
 			</div>
 
-			<div class="card">
+			<div class="card flex flex-column align-items-center">
 				<h5>Doughnut Chart</h5>
-				<Chart type="doughnut" :data="doughnutData" />
+				<Chart type="doughnut" :data="doughnutData" style="width: 50%" />
 			</div>
 
-			<div class="card">
+			<div class="card flex flex-column align-items-center">
 				<h5>Radar Chart</h5>
-				<Chart type="radar" :data="radarData" />
+				<Chart type="radar" :data="radarData" style="width: 50%" />
 			</div>
 		</div>
 	</div>
@@ -48,14 +48,16 @@ export default {
 						data: [65, 59, 80, 81, 56, 55, 40],
 						fill: false,
 						backgroundColor: '#2f4860',
-						borderColor: '#2f4860'
+						borderColor: '#2f4860',
+						tension: 0.4
 					},
 					{
 						label: 'Second Dataset',
 						data: [28, 48, 40, 19, 86, 27, 90],
 						fill: false,
 						backgroundColor: '#00bb7e',
-						borderColor: '#00bb7e'
+						borderColor: '#00bb7e',
+						tension: 0.4
 					}
 				]
 			},

diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
@@ -285,13 +285,16 @@ export default {
 			dropdownCity: null,
 			options: {
 				plugins:[dayGridPlugin, timeGridPlugin, interactionPlugin],
-				defaultDate: '2019-01-01',
-				header: {
+				initialDate: '2023-01-01',
+				headerToolbar: {
 					left: 'prev,next',
 					center: 'title',
 					right: 'dayGridMonth,timeGridWeek,timeGridDay'
 				},
-				editable: true
+				editable: true,
+                selectable:true, 
+                selectMirror: true, 
+                dayMaxEvents: true,
 			},
 			events: null,
 			products: null,
@@ -304,14 +307,16 @@ export default {
 						data: [65, 59, 80, 81, 56, 55, 40],
 						fill: false,
 						backgroundColor: '#2f4860',
-						borderColor: '#2f4860'
+						borderColor: '#2f4860',
+						tension: 0.4
 					},
 					{
 						label: 'Second Dataset',
 						data: [28, 48, 40, 19, 86, 27, 90],
 						fill: false,
 						backgroundColor: '#00bb7e',
-						borderColor: '#00bb7e'
+						borderColor: '#00bb7e',
+						tension: 0.4
 					}
 				]
 			},

diff --git a/src/pages/CalendarDemo.vue b/src/pages/CalendarDemo.vue
@@ -48,13 +48,16 @@ export default {
 			changedEvent: {title:'', start: null, end:'', allDay: null},
 			options: {
 				plugins:[dayGridPlugin, timeGridPlugin, interactionPlugin],
-				defaultDate: '2019-01-01',
-				header: {
+				initialDate: '2023-01-01',
+				headerToolbar: {
 					left: 'prev,next',
 					center: 'title',
 					right: 'dayGridMonth,timeGridWeek,timeGridDay'
 				},
 				editable: true,
+                selectable:true, 
+                selectMirror: true, 
+                dayMaxEvents: true,
 				eventClick: (e) => {
 					this.eventDialog = true;