Voters ({{ partyAbbr }})
-{{ registeredVotersParty | formatNumber }}
+{{ voterCount }}
@@ -40,11 +40,13 @@ export default {
'division-count',
'vacancy-count'
],
- computed: mapGetters([
+ computed: {
+ ...mapGetters([
'partyAbbr'
]),
- filters: {
- formatNumber
+ voterCount() {
+ return formatNumber(this.registeredVotersParty)
+ }
}
}
diff --git a/src/components/ward-map.vue b/src/components/ward-map.vue
index de343ed9..4638236e 100644
--- a/src/components/ward-map.vue
+++ b/src/components/ward-map.vue
@@ -1,26 +1,27 @@
-
-
+
-
+ ref="geojsonLayer">
+
-
diff --git a/src/config.js b/src/config.js
index f7e6de97..1c1a27d8 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,5 +1,4 @@
export const CONTENTFUL_SPACE_ID = 'i9q3kobl32q0'
export const CONTENTFUL_ACCESS_TOKEN = '61db4007a6a0337a0f70fd445ea61a7a9999d4943bd8b13acd2ed7c423394d07'
-export const MAPZEN_API_KEY = 'mapzen-vw3WEMv'
-export const SAMPLE_BALLOT_FORM = 'https://form.jotform.com/81176016314146'
+export const AIS_API_KEY = '1b01266e2aed8a69416249fc00ac0ed0'
export const TURNOUT_ELECTION = '2019 Primary'
diff --git a/src/main.js b/src/main.js
index fc9aba54..cac5308d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,12 +1,10 @@
-import Vue from 'vue'
+import { createApp } from 'vue'
import App from './App.vue'
import router from './router'
import store from './store'
-new Vue({ // eslint-disable-line
- el: '#app',
- render: h => h(App),
- router,
- store
-})
+const app = createApp(App)
+app.use(store)
+app.use(router)
+app.mount('#app')
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 2653f360..7562e504 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,5 +1,4 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
+import { createRouter, createWebHistory } from 'vue-router'
import Splash from '../views/splash.vue'
import WardLeaderList from '../views/ward-leader-list.vue'
@@ -8,8 +7,6 @@ import CityMap from '../views/city-map.vue'
import ContentPage from '../views/content-page.vue'
import Feedback from '../views/feedback.vue'
-Vue.use(VueRouter)
-
const routes = [
{
path: '/',
@@ -50,8 +47,8 @@ const routes = [
}
]
-const router = new VueRouter({
- mode: 'history',
+const router = createRouter({
+ history: createWebHistory(),
routes,
scrollBehavior
})
diff --git a/src/store/actions.js b/src/store/actions.js
index 26b2e132..8a0e6c8c 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -1,4 +1,4 @@
-import nanoid from 'nanoid'
+import { nanoid } from 'nanoid'
import Api from '../api'
import { CONTENTFUL_SPACE_ID, CONTENTFUL_ACCESS_TOKEN } from '../config'
@@ -20,7 +20,7 @@ export async function FETCH_LEADERS (ctx) {
ctx.commit('FETCH_LEADERS_SUCCESS', leaders)
} catch (err) {
logError(err)
- ctx.dispatch('NOTIFY', `Failed to retrieve ward leaders`)
+ ctx.dispatch('NOTIFY', 'Failed to retrieve ward leaders')
}
ctx.commit('END_REQUEST', 'FETCH_LEADERS')
}
@@ -33,7 +33,7 @@ export async function FETCH_LEADER (ctx, { ward, subWard, party }) {
ctx.commit('FETCH_LEADER_SUCCESS', leader)
} catch (err) {
logError(err)
- ctx.dispatch('NOTIFY', `Failed to get information about the ward leader`)
+ ctx.dispatch('NOTIFY', 'Failed to get information about the ward leader')
}
ctx.commit('END_REQUEST', 'FETCH_LEADER')
}
@@ -45,7 +45,7 @@ export async function FETCH_SAMPLE_BALLOTS (ctx, { ward, subWard, party }) {
ctx.commit('FETCH_SAMPLE_BALLOTS_SUCCESS', sampleBallots)
} catch (err) {
logError(err)
- ctx.dispatch('NOTIFY', `Failed to get sample ballots`)
+ ctx.dispatch('NOTIFY', 'Failed to get sample ballots')
}
ctx.commit('END_REQUEST', 'FETCH_SAMPLE_BALLOTS')
}
@@ -57,7 +57,7 @@ export async function FETCH_COMMITTEE_PERSONS (ctx, { ward, subWard, party }) {
ctx.commit('FETCH_COMMITTEE_PERSONS_SUCCESS', committeePersons)
} catch (err) {
logError(err)
- ctx.dispatch('NOTIFY', `Failed to get list of committee persons`)
+ ctx.dispatch('NOTIFY', 'Failed to get list of committee persons')
}
ctx.commit('END_REQUEST', 'FETCH_COMMITTEE_PERSONS')
}
@@ -81,7 +81,7 @@ export async function FETCH_CITYWIDE_BOUNDARIES (ctx) {
ctx.commit('FETCH_CITYWIDE_BOUNDARIES_SUCCESS', citywideBoundaries)
} catch (err) {
logError(err)
- ctx.dispatch('NOTIFY', `Failed to retrieve ward boundaries`)
+ ctx.dispatch('NOTIFY', 'Failed to retrieve ward boundaries')
}
ctx.commit('END_REQUEST', 'FETCH_CITYWIDE_BOUNDARIES')
}
@@ -93,7 +93,7 @@ export async function FETCH_CONTENT_PAGE (ctx, slug) {
ctx.commit('FETCH_CONTENT_PAGE_SUCCESS', contentPage)
} catch (err) {
logError(err)
- ctx.dispatch('NOTIFY', `Failed to retrieve content`)
+ ctx.dispatch('NOTIFY', 'Failed to retrieve content')
}
ctx.commit('END_REQUEST', 'FETCH_CONTENT_PAGE')
}
diff --git a/src/store/index.js b/src/store/index.js
index 763012af..33113c4a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,13 +1,10 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
+import { createStore } from 'vuex'
import * as getters from './getters'
import * as mutations from './mutations'
import * as actions from './actions'
-Vue.use(Vuex)
-
-const store = new Vuex.Store({
+const store = createStore({
strict: (process.env.NODE_ENV !== 'production'),
state: {
pendingRequests: {},
diff --git a/src/store/mutations.js b/src/store/mutations.js
index e962122c..361f1a5c 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -1,5 +1,3 @@
-import Vue from 'vue'
-
export function FETCH_LEADERS_SUCCESS (state, leaders) {
state.leaders = leaders
}
@@ -33,17 +31,17 @@ export function FETCH_CONTENT_PAGE_SUCCESS (state, contentPage) {
}
export function ADD_NOTIFICATION (state, notification) {
- Vue.set(state.notifications, notification.id, notification)
+ state.notifications[notification.id] = notification
}
export function REMOVE_NOTIFICATION (state, id) {
- Vue.delete(state.notifications, id)
+ delete state.notifications[id]
}
export function BEGIN_REQUEST (state, name) {
- Vue.set(state.pendingRequests, name, true)
+ state.pendingRequests[name] = true
}
export function END_REQUEST (state, name) {
- Vue.delete(state.pendingRequests, name)
+ delete state.pendingRequests[name]
}
diff --git a/src/util.js b/src/util.js
index 44b7ec5a..425c3bdf 100644
--- a/src/util.js
+++ b/src/util.js
@@ -14,7 +14,7 @@ export function ordinalize (value) {
export function slugify (value) {
return value.toString().toLowerCase().trim()
- .replace(/[^a-zA-Z0-9]/g, '-') // Replace non-alphanumeric chars with -
- .replace(/--+/g, '-') // Replace multiple - with single -
- .replace(/^-|-$/i, '') // Remove leading/trailing hyphen
+ .replace(/[^a-zA-Z0-9]/g, '-') // Replace non-alphanumeric chars with -
+ .replace(/--+/g, '-') // Replace multiple - with single -
+ .replace(/^-|-$/i, '') // Remove leading/trailing hyphen
}
diff --git a/src/views/city-map.vue b/src/views/city-map.vue
index e4a500c9..72d71359 100644
--- a/src/views/city-map.vue
+++ b/src/views/city-map.vue
@@ -1,52 +1,44 @@
-
-
+
-
+
-
+ :options="geojsonOpts">
+
-
diff --git a/src/views/content-page.vue b/src/views/content-page.vue
index d9209ba8..8718cce6 100644
--- a/src/views/content-page.vue
+++ b/src/views/content-page.vue
@@ -11,7 +11,7 @@