+
+ Logout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Campaign/AllCampaign.vue b/frontend/src/components/Campaign/AllCampaign.vue
new file mode 100644
index 0000000..c3580ce
--- /dev/null
+++ b/frontend/src/components/Campaign/AllCampaign.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+ Create New Campaign
+
+
+ Active Campaigns
+
+ Manage current campaigns below, or
+
Coordinator Campaigns
+
+
+ Active Voting Rounds
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Campaign/CoordinatorCampaignCard.vue b/frontend/src/components/Campaign/CoordinatorCampaignCard.vue
new file mode 100644
index 0000000..74bc855
--- /dev/null
+++ b/frontend/src/components/Campaign/CoordinatorCampaignCard.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+ All Campaigns
+
+ View all campaigns, active and archived below, or
+
Coordinator Campaigns
+
+
+ Juror Campaigns
+
+
+
+ Latest Round:
++ {{ + lastRound + ? getVotingName(lastRound.round.vote_method) + ' - ' + lastRound.round.status + : '-' + }} +
++ Coordinators ({{ campaign.coordinators.length }}) +
+
+
+
+ {{ coordinator.username[0] }}
+
+ {{ campaign[0].campaign.name }}
+ +
+
+
+
+
+
+ {{ round.name }}
+({{ getVotingName(round.vote_method) }} · {{ round.status }})
+
+
+
+
+
+
+
+
+
+
+ Voting deadline: {{ round.deadline_date?.split('T')[0] }}
+Directions: {{ round.directions }}
+
+
+ + Your Progress: {{ (100 - round.percent_tasks_open).toFixed(1) }}% ({{ round.total_open_tasks ?? 0 }} out of + {{ round.total_tasks ?? 0 }}) +
+
+ Vote
+ Edit Previous Votes
+
+
+
+
+
+
+
+
+
+
+ Date Range
+
+ Once the images are imported to the first round, changing date and time won't affect the
+ images your jury can view. However, changing these values before the import to round 1
+ will ensure that only photos uploaded before the end date and time are visible to your
+ jury.
+
+
+
+ Campaign Coordinators
+
+ Coordinators are people who have access to edit the campaign, rounds, and round
+ statistics.
+
+
+
+
+ Create Campaign
+
+
+ Cancel
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Campaign/ViewCampaign.vue b/frontend/src/components/Campaign/ViewCampaign.vue
new file mode 100644
index 0000000..a806df2
--- /dev/null
+++ b/frontend/src/components/Campaign/ViewCampaign.vue
@@ -0,0 +1,358 @@
+
+ New Campaign
+
+
+ Open Date:
+
+
+
+ Open Time:
+
+
+
+
+ Close Date:
+
+
+
+ Close Time:
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/LoginBox.vue b/frontend/src/components/LoginBox.vue
new file mode 100644
index 0000000..89d9fc1
--- /dev/null
+++ b/frontend/src/components/LoginBox.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+ {{ campaign.name }}
+ +
+ {{ formatDate(campaign.open_date) }} - {{ formatDate(campaign.close_date) }}
+
+
+
+
+
+
+
+
+
+
+
+ Campaign Coordinators
+
+
+
+
+
+
+
+
+
+ Open Date (UTC):
+
+
+ Open Time (UTC):
+
+
+ Close Date (UTC):
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Round/RoundEdit.vue b/frontend/src/components/Round/RoundEdit.vue
new file mode 100644
index 0000000..4d5241a
--- /dev/null
+++ b/frontend/src/components/Round/RoundEdit.vue
@@ -0,0 +1,168 @@
+
+
+
+ {{ $t('login-button') }}
+
+
+ {{ $t('login-box-heading') }}
+{{ $t('login-description') }}
+ +
+
+
+
+
+
+
+
+
+ {{ source.label }}
+
+ Show own statistics (Beta)
+
+
+
+
+
+
+
+
+
+
+
+ + Whether to show own voting statistics (e.g. number of accepted or declined images) of + juror for the round. +
+ +The number of jurors that must vote on each image
+ +Enter the username of the juror you want to add to this round.
+ +
+
+
+
+
+
+ Round File Setting
++ {{ value.label }} + {{ formData.config[key] }} +
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Round/RoundInfo.vue b/frontend/src/components/Round/RoundInfo.vue
new file mode 100644
index 0000000..1902081
--- /dev/null
+++ b/frontend/src/components/Round/RoundInfo.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
+ Voting deadline
++ {{ round.deadline_date.split('T')[0] }} · in + {{ remainingDays }} days +
+
+
+
+ Directions
+{{ round.directions }}
+No directions provided.
+
+
+ Jurors
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Round File Information
+File types: {{ round.config.allowed_filetypes.join(', ') }}
+ ++ {{ key }} + + {{ value }} + +
+ Round File Settings +TODO: Voting
+ Voting Details +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Round/RoundNew.vue b/frontend/src/components/Round/RoundNew.vue
new file mode 100644
index 0000000..d18c0f9
--- /dev/null
+++ b/frontend/src/components/Round/RoundNew.vue
@@ -0,0 +1,474 @@
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Round/RoundView.vue b/frontend/src/components/Round/RoundView.vue
new file mode 100644
index 0000000..1667122
--- /dev/null
+++ b/frontend/src/components/Round/RoundView.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+ {{ formData.name }}
++ {{ getVotingName(formData.vote_method) }} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ source.label }}
+
+ Source
+
+
+
+
+ Enter category
+ No categories found.
+
+
+
+
+
+
+
+
+
+
+ {{ source.label }}
+
+ Show own statistics (Beta)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Category on Wikimedia Commons that gathers all contest images. Example of such + category may be e.g. "Images from Wiki Loves Monuments 2017 in Ghana". +
++ List of files saved as CSV and uploaded as a Google Sheet or Gist. +
++ List of files, one each line without File: prefix +
+ ++ Whether to show own voting statistics (e.g. number of accepted or declined + images) of juror for the round. +
+ +The number of jurors that must vote on each image
+ +Enter the username of the juror you want to add to this round.
+ +Minimal average rating for photo
+ +
+
+
+ {{ $t(key) }}
+
+
+
+
+
+ Round File Setting
+
+
+
+
+
+
+
diff --git a/frontend/src/components/UserAvatarWithName.vue b/frontend/src/components/UserAvatarWithName.vue
new file mode 100644
index 0000000..6ed2a4a
--- /dev/null
+++ b/frontend/src/components/UserAvatarWithName.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+ {{ round.name }}
++ {{ + round.vote_method === 'yesno' + ? 'Yes/No' + : round.vote_method === 'rating' + ? 'Rating' + : 'Ranking' + }} + . {{ round.status }} +
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ user.username[0].toUpperCase() }}
+
+ {{ user.username }}
+
+
+
+
+
+
+
diff --git a/frontend/src/components/UserList.vue b/frontend/src/components/UserList.vue
new file mode 100644
index 0000000..48a1ffb
--- /dev/null
+++ b/frontend/src/components/UserList.vue
@@ -0,0 +1,52 @@
+
+ This screen is under development.
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Vote/VoteRanking.vue b/frontend/src/components/Vote/VoteRanking.vue
new file mode 100644
index 0000000..6e8a5f3
--- /dev/null
+++ b/frontend/src/components/Vote/VoteRanking.vue
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+
+
+ {{ round.name }}
+Part of {{ round.campaign.name }}
+
+
+ Order by:
+
+
+
+
+
+
+
+
+
+ Gallary size
+
+
+
+
+
+ ![]()
+
+
+
+ voted in a day
+5 Sep 2023 at 8:11 UTC
+
+
+
+
+
+
+ This screen is under development.
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Vote/VoteRating.vue b/frontend/src/components/Vote/VoteRating.vue
new file mode 100644
index 0000000..f1ef03e
--- /dev/null
+++ b/frontend/src/components/Vote/VoteRating.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+ {{ round.name }}
+Part of {{ round.campaign.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ This screen is under development.
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Vote/VoteYesNo.vue b/frontend/src/components/Vote/VoteYesNo.vue
new file mode 100644
index 0000000..1d36b2e
--- /dev/null
+++ b/frontend/src/components/Vote/VoteYesNo.vue
@@ -0,0 +1,193 @@
+
+
+ ![]()
+
+
+
+
+
+ {{ imageName }}
+{{ remainingImages }} images remaining
+ +
+
+ 1-5 – One to Five Stars
+ → – Skip (vote later) + +
+ Vote
+
+
+
+
+ You can also use keyboard to vote.+ 1-5 – One to Five Stars
+ → – Skip (vote later) + +
+
+
+ Actions
+ +
+
+ Description
+
+
+
+
+ {{ date }}
+{{ time }}
+This screen is under development.
+
+
+
+
+
+
+
diff --git a/frontend/src/i18n.js b/frontend/src/i18n.js
new file mode 100644
index 0000000..c7f7253
--- /dev/null
+++ b/frontend/src/i18n.js
@@ -0,0 +1,14 @@
+import { createI18n } from 'vue-i18n'
+
+import en from '@/i18n/en.json'
+import hi from '@/i18n/hi.json'
+
+const i18n = createI18n({
+ locale: 'en',
+ messages: {
+ en,
+ hi
+ }
+})
+
+export default i18n
diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
new file mode 100644
index 0000000..5c76388
--- /dev/null
+++ b/frontend/src/i18n/en.json
@@ -0,0 +1,33 @@
+{
+ "login-box-heading": "Please log in",
+ "login-description": "You will be redirected to Meta-Wiki in order to confirm your identity. Montage will not publish anything on Wikimedia projects using your account.",
+ "account-instructions": "If you don't have a Wikimedia account, you can create one on \"Meta Wiki\".",
+ "login-button": "Log in using Wikimedia account",
+
+ "round.ranking": "Ranking",
+ "round.rating": "Rating",
+ "round.yesno": "Yes/No",
+
+ "round.all_mimes": "Round file types",
+ "round.percent_tasks_open": "Percentage of opened tasks",
+ "round.total_cancelled_tasks": "Cancelled tasks",
+ "round.total_disqualified_entries": "Disqualified files",
+ "round.total_open_tasks": "Open tasks",
+ "round.total_round_entries": "Files",
+ "round.total_tasks": "Tasks",
+ "round.total_uploaders": "Uploaders",
+
+ "allowed_filetypes": "Allowed filetypes",
+ "dq_by_filetype": "Disqualify by filetype",
+ "dq_by_resolution": "Disqualify by resolution",
+ "dq_by_upload_date": "Disqualify by upload date",
+ "dq_by_uploader": "Disqualify jurors",
+ "dq_coords": "Disqualify coordinators",
+ "dq_maintainers": "Disqualify maintainers",
+ "dq_organizers": "Disqualify organizers",
+ "final_threshold": "Final threshold",
+ "min_resolution": "Min. resolution",
+ "show_filename": "Show filename",
+ "show_link": "Show link",
+ "show_resolution": "Show resolution"
+}
diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.json
new file mode 100644
index 0000000..07c4819
--- /dev/null
+++ b/frontend/src/i18n/hi.json
@@ -0,0 +1,33 @@
+{
+ "login-box-heading": "कृपया लॉगिन करें",
+ "login-description": "आपकी पहचान की पुष्टि करने के लिए आपको मेटा-विकी पर पुनः निर्देशित किया जाएगा। मोंटेज आपके खाते का उपयोग करके विकिमीडिया परियोजनाओं पर कुछ भी प्रकाशित नहीं करेगा।",
+ "account-instructions": "यदि आपके पास विकिमीडिया खाता नहीं है, तो आप \"मेटा विकी\" पर एक खाता बना सकते हैं।",
+ "login-button": "विकिमीडिया खाते का उपयोग करके लॉग इन करें",
+
+ "round.ranking": "रैंकिंग",
+ "round.rating": "रेटिंग",
+ "round.yesno": "हां/नहीं",
+
+ "round.all_mimes": "राउंड फ़ाइल प्रकार",
+ "round.percent_tasks_open": "खुले कार्यों का प्रतिशत",
+ "round.total_cancelled_tasks": "रद्द किए गए कार्य",
+ "round.total_disqualified_entries": "अयोग्य फ़ाइलें",
+ "round.total_open_tasks": "खुले कार्यों",
+ "round.total_round_entries": "फ़ाइलें",
+ "round.total_tasks": "कार्य",
+ "round.total_uploaders": "अपलोड करने वाले",
+
+ "allowed_filetypes": "स्वीकृत फ़ाइल प्रकार",
+ "dq_by_filetype": "फ़ाइल प्रकार के आधार पर अयोग्य ठहराएँ",
+ "dq_by_resolution": "रिज़ॉल्यूशन के आधार पर अयोग्य ठहराएँ",
+ "dq_by_upload_date": "अपलोड तिथि के आधार पर अयोग्य ठहराएँ",
+ "dq_by_uploader": "जूरी सदस्यों को अयोग्य ठहराएँ",
+ "dq_coords": "समन्वयकों को अयोग्य ठहराएँ",
+ "dq_maintainers": "मेंटेनर्स को अयोग्य ठहराएँ",
+ "dq_organizers": "आयोजकों को अयोग्य ठहराएँ",
+ "final_threshold": "अंतिम सीमा",
+ "min_resolution": "न्यूनतम रिज़ॉल्यूशन",
+ "show_filename": "फ़ाइल नाम दिखाएँ",
+ "show_link": "लिंक दिखाएँ",
+ "show_resolution": "रिज़ॉल्यूशन दिखाएँ"
+}
diff --git a/frontend/src/main.js b/frontend/src/main.js
new file mode 100644
index 0000000..ee3135b
--- /dev/null
+++ b/frontend/src/main.js
@@ -0,0 +1,18 @@
+import { createApp } from 'vue'
+import { createPinia } from 'pinia'
+
+import App from './App.vue'
+import router from './router'
+import i18n from './i18n'
+import Toast from 'vue-toastification'
+import 'vue-toastification/dist/index.css'
+
+
+const app = createApp(App)
+
+app.use(createPinia())
+app.use(router)
+app.use(Toast)
+app.use(i18n)
+
+app.mount('#app')
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
new file mode 100644
index 0000000..26cd3bf
--- /dev/null
+++ b/frontend/src/router/index.js
@@ -0,0 +1,68 @@
+import '@wikimedia/codex/dist/codex.style.css'
+import '@/assets/main.css'
+
+import { createRouter, createWebHashHistory } from 'vue-router'
+import { useUserStore } from '@/stores/user'
+
+import HomeView from '../views/HomeView.vue'
+import NewCampaignView from '@/views/NewCampaignView.vue'
+import CampaignView from '@/views/CampaignView.vue'
+import VoteView from '@/views/VoteView.vue'
+import VoteEditView from '@/views/VoteEditView.vue'
+import AllCampaignView from '@/views/AllCampaignView.vue'
+
+const routes = [
+ {
+ path: '/',
+ name: 'home',
+ component: HomeView
+ },
+ {
+ path: '/campaign/all',
+ name: 'campaign-all',
+ component: AllCampaignView,
+ meta: { requiresAuth: true }
+ },
+ {
+ path: '/campaign/new',
+ name: 'new-campaign',
+ component: NewCampaignView,
+ meta: { requiresAuth: true }
+ },
+ {
+ path: '/campaign/:id',
+ name: 'campaign',
+ component: CampaignView,
+ meta: { requiresAuth: true }
+ },
+ {
+ path: '/vote/:id',
+ name: 'vote',
+ component: VoteView,
+ meta: { requiresAuth: true }
+ },
+ {
+ path: '/vote/:id/edit',
+ name: 'vote-edit',
+ component: VoteEditView,
+ meta: { requiresAuth: true }
+ }
+]
+
+const router = createRouter({
+ history: createWebHashHistory(import.meta.env.BASE_URL),
+ routes
+})
+
+router.beforeEach(async (to, from, next) => {
+ const userStore = useUserStore()
+ await userStore.checkAuth()
+
+ if (to.meta.requiresAuth && userStore.user === null) {
+ return next({ name: 'home' })
+ }
+
+ next()
+})
+
+export default router
\ No newline at end of file
diff --git a/frontend/src/services/adminService.js b/frontend/src/services/adminService.js
new file mode 100644
index 0000000..75b3ca0
--- /dev/null
+++ b/frontend/src/services/adminService.js
@@ -0,0 +1,56 @@
+import { apiBackend } from './api'
+
+const adminService = {
+ get: () => apiBackend.get('admin'),
+
+ allCampaigns: () => apiBackend.get('admin/campaigns/all'),
+
+ getCampaign: (id) => apiBackend.get(`admin/campaign/${id}`),
+
+ getRound: (id) => apiBackend.get(`admin/round/${id}`),
+
+ getReviews: (id) => apiBackend.get(`admin/round/${id}/reviews`),
+
+ addOrganizer: (data) => apiBackend.post('admin/add_organizer', data),
+
+ addCampaign: (data) => apiBackend.post('admin/add_campaign', data),
+
+ addRound: (id, data) => apiBackend.post(`admin/campaign/${id}/add_round`, data),
+
+ finalizeCampaign: (id) => apiBackend.post(`admin/campaign/${id}/finalize`, { post: true }),
+
+ addCoordinator: (id, username) =>
+ apiBackend.post(`admin/campaign/${id}/add_coordinator`, { username }),
+
+ removeCoordinator: (id, username) =>
+ apiBackend.post(`admin/campaign/${id}/remove_coordinator`, { username }),
+
+ activateRound: (id) => apiBackend.post(`admin/round/${id}/activate`, { post: true }),
+
+ pauseRound: (id) => apiBackend.post(`admin/round/${id}/pause`, { post: true }),
+
+ populateRound: (id, data) => apiBackend.post(`admin/round/${id}/import`, data),
+
+ editCampaign: (id, data) => apiBackend.post(`admin/campaign/${id}/edit`, data),
+
+ editRound: (id, data) => apiBackend.post(`admin/round/${id}/edit`, data),
+
+ cancelRound: (id) => apiBackend.post(`admin/round/${id}/cancel`),
+
+ getRoundFlags: (id) => apiBackend.get(`admin/round/${id}/flags`),
+
+ getRoundReviews: (id) => apiBackend.get(`admin/round/${id}/reviews`),
+
+ getRoundVotes: (id) => apiBackend.get(`admin/round/${id}/votes`),
+
+ previewRound: (id) => apiBackend.get(`admin/round/${id}/preview_results`),
+
+ advanceRound: (id, data) => apiBackend.post(`admin/round/${id}/advance`, data),
+
+ // Direct download URLs (manual baseURL needed)
+ downloadRound: (id) => `${apiBackend.defaults.baseURL}admin/round/${id}/results/download`,
+ downloadEntries: (id) => `${apiBackend.defaults.baseURL}admin/round/${id}/entries/download`,
+ downloadReviews: (id) => `${apiBackend.defaults.baseURL}admin/round/${id}/reviews`
+}
+
+export default adminService
diff --git a/frontend/src/services/alertService.js b/frontend/src/services/alertService.js
new file mode 100644
index 0000000..be784a0
--- /dev/null
+++ b/frontend/src/services/alertService.js
@@ -0,0 +1,25 @@
+import { useToast } from 'vue-toastification'
+
+const toast = useToast()
+
+const AlertService = {
+ success(text, time) {
+ toast.success(text, {
+ timeout: time || 2000,
+ position: 'top-right'
+ })
+ },
+ error(error, time) {
+ const message = error?.response?.data?.message || error?.message || 'An error occurred'
+ const detail = error?.response?.data?.detail
+
+ const text = detail ? `${message}: ${detail}` : message
+
+ toast.error(text, {
+ timeout: time || 5000,
+ position: 'top-right'
+ })
+ }
+}
+
+export default AlertService
diff --git a/frontend/src/services/api.js b/frontend/src/services/api.js
new file mode 100644
index 0000000..923cb5c
--- /dev/null
+++ b/frontend/src/services/api.js
@@ -0,0 +1,60 @@
+import axios from 'axios'
+import { useLoadingStore } from '@/stores/loading'
+
+// Create Axios instance for Backend API
+const apiBackend = axios.create({
+ baseURL: '/v1/',
+ timeout: 10000,
+ headers: {
+ 'Content-Type': 'application/json',
+ Accept: 'application/json'
+ }
+})
+
+// Create Axios instance for Commons API
+const apiCommons = axios.create({
+ baseURL: 'https://commons.wikimedia.org/w/api.php',
+ timeout: 10000,
+ headers: {
+ 'Content-Type': 'application/json',
+ Accept: 'application/json'
+ }
+})
+
+const addInterceptors = (instance) => {
+ instance.interceptors.request.use(
+ (config) => {
+ const loadingStore = useLoadingStore()
+ loadingStore.setLoading(true)
+
+ return config
+ },
+ (error) => {
+ const loadingStore = useLoadingStore()
+ loadingStore.setLoading(false)
+
+ return Promise.reject(error)
+ }
+ )
+
+ // Response Interceptor
+ instance.interceptors.response.use(
+ (response) => {
+ const loadingStore = useLoadingStore()
+ loadingStore.setLoading(false)
+
+ return response['data']
+ },
+ (error) => {
+ const loadingStore = useLoadingStore()
+ loadingStore.setLoading(false)
+
+ return Promise.reject(error)
+ }
+ )
+}
+
+addInterceptors(apiBackend)
+addInterceptors(apiCommons)
+
+export { apiBackend, apiCommons }
diff --git a/frontend/src/services/dataService.js b/frontend/src/services/dataService.js
new file mode 100644
index 0000000..cc424cc
--- /dev/null
+++ b/frontend/src/services/dataService.js
@@ -0,0 +1,76 @@
+import { apiCommons } from './api'
+
+const dataService = {
+ async getImageInfo(images) {
+ const parts = Math.ceil(images.length / 50)
+ let promises = []
+
+ for (let i = 0; i < parts; i++) {
+ const part = images.slice(50 * i, 50 * i + 50)
+ promises.push(
+ apiCommons({
+ method: 'GET',
+ params: {
+ action: 'query',
+ prop: 'imageinfo',
+ titles: part.map((image) => 'File:' + image).join('|'),
+ format: 'json',
+ iiprop: 'timestamp|user|userid|size|dimensions|url',
+ iilimit: '10',
+ origin: '*'
+ }
+ })
+ )
+ }
+
+ try {
+ const results = await Promise.all(promises)
+ return results.map((response) => response.data)
+ } catch (error) {
+ console.error('Error fetching image info:', error)
+ throw error
+ }
+ },
+
+ async searchUser(username) {
+ try {
+ const response = await apiCommons({
+ method: 'GET',
+ params: {
+ action: 'query',
+ list: 'globalallusers',
+ format: 'json',
+ rawcontinue: 'true',
+ agufrom: username,
+ origin: '*'
+ }
+ })
+ return response
+ } catch (error) {
+ console.error('Error searching for user:', error)
+ throw error
+ }
+ },
+
+ async searchCategory(category) {
+ try {
+ const response = await apiCommons({
+ method: 'GET',
+ params: {
+ action: 'opensearch',
+ format: 'json',
+ namespace: '14',
+ limit: '10',
+ search: category,
+ origin: '*'
+ }
+ })
+ return response
+ } catch (error) {
+ console.error('Error searching for category:', error)
+ throw error
+ }
+ }
+}
+
+export default dataService
diff --git a/frontend/src/services/dialogService.js b/frontend/src/services/dialogService.js
new file mode 100644
index 0000000..b68a971
--- /dev/null
+++ b/frontend/src/services/dialogService.js
@@ -0,0 +1,57 @@
+import { ref, defineComponent, h, render } from 'vue';
+import { CdxDialog } from '@wikimedia/codex';
+
+const dialogService = () => {
+ const open = ref(false);
+ const dialogConfig = ref({});
+
+ const show = (config) => {
+ dialogConfig.value = config;
+ open.value = true;
+ };
+
+ const DialogComponent = defineComponent({
+ setup() {
+ const onPrimaryAction = () => {
+ open.value = false;
+ if (dialogConfig.value.onPrimary) {
+ dialogConfig.value.onPrimary();
+ }
+ };
+
+ const onDefaultAction = () => {
+ open.value = false;
+ if (dialogConfig.value.onDefault) {
+ dialogConfig.value.onDefault();
+ }
+ };
+
+ return () => h(CdxDialog, {
+ open: open.value,
+ 'onUpdate:open': (value) => open.value = value,
+ title: dialogConfig.value.title,
+ useCloseButton: true,
+ primaryAction: dialogConfig.value.primaryAction,
+ defaultAction: dialogConfig.value.defaultAction,
+ onPrimary: onPrimaryAction,
+ onDefault: onDefaultAction
+ }, {
+ default: () => dialogConfig.value.content
+ });
+ }
+ });
+
+ const mountDialog = () => {
+ const container = document.createElement('div');
+ document.body.appendChild(container);
+ render(h(DialogComponent), container);
+ };
+
+ mountDialog();
+
+ return {
+ show
+ };
+};
+
+export default dialogService;
\ No newline at end of file
diff --git a/frontend/src/services/jurorService.js b/frontend/src/services/jurorService.js
new file mode 100644
index 0000000..900f2e7
--- /dev/null
+++ b/frontend/src/services/jurorService.js
@@ -0,0 +1,58 @@
+import { apiBackend } from './api'
+import _ from 'lodash'
+import dataService from './dataService'
+
+const jurorService = {
+ get: () => apiBackend.get('juror'),
+
+ getCampaign: (id) => apiBackend.get(`juror/campaign/${id}`),
+
+ allCampaigns: () => apiBackend.get('juror/campaigns/all'),
+
+ getPastVotes: (id, offset = 0, orderBy = 'date', sort = 'desc') =>
+ apiBackend.get(`juror/round/${id}/votes?offset=${offset}&order_by=${orderBy}&sort=${sort}`),
+
+ getPastRanking: (id) => apiBackend.get(`juror/round/${id}/rankings`),
+
+ getFaves: () => apiBackend.get('juror/faves'),
+
+ getRound: (id) => apiBackend.get(`juror/round/${id}`),
+
+ getRoundVotesStats: (id) => apiBackend.get(`juror/round/${id}/votes-stats`),
+
+ faveImage: (roundId, entryId) => apiBackend.post(`juror/round/${roundId}/${entryId}/fave`, {}),
+
+ unfaveImage: (roundId, entryId) =>
+ apiBackend.post(`juror/round/${roundId}/${entryId}/unfave`, {}),
+
+ flagImage: (roundId, entryId, reason) =>
+ apiBackend.post(`juror/round/${roundId}/${entryId}/flag`, { reason }),
+
+ setRating: (id, data) => apiBackend.post(`juror/round/${id}/tasks/submit`, data),
+
+ getRoundTasks: (id, offset = 0) => {
+ return apiBackend.get(`juror/round/${id}/tasks?count=5&offset=${offset}`).then((data) => {
+ const tasks = data.data.tasks
+ const files = tasks.map((task) => task.entry.name)
+
+ return dataService.getImageInfo(files).then((responses) => {
+ if (!responses.length) return data
+
+ const hists = _.values(responses[0].query.pages)
+ hists.forEach((element) => {
+ if (element && element.imageinfo) {
+ const image = _.find(tasks, {
+ entry: { url: element.imageinfo[0].url }
+ })
+ if (image) {
+ image.history = element.imageinfo
+ }
+ }
+ })
+ return data
+ })
+ })
+ }
+}
+
+export default jurorService
diff --git a/frontend/src/stores/loading.js b/frontend/src/stores/loading.js
new file mode 100644
index 0000000..1640ac5
--- /dev/null
+++ b/frontend/src/stores/loading.js
@@ -0,0 +1,12 @@
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+
+export const useLoadingStore = defineStore('loading', () => {
+ const loading = ref(null)
+
+ function setLoading(val) {
+ loading.value = val
+ }
+
+ return { loading, setLoading }
+})
diff --git a/frontend/src/stores/user.js b/frontend/src/stores/user.js
new file mode 100644
index 0000000..cf1c562
--- /dev/null
+++ b/frontend/src/stores/user.js
@@ -0,0 +1,33 @@
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+import adminService from '@/services/adminService'
+
+export const useUserStore = defineStore('user-store', () => {
+ const user = ref(null)
+ const isAuthenticated = ref(false)
+
+ function login(userObj) {
+ if (!userObj) {
+ window.location = window.location.origin + '/login'
+ }
+ user.value = userObj
+ isAuthenticated.value = true
+ }
+
+ function logout() {
+ window.location = window.location.origin + '/logout'
+ user.value = null
+ isAuthenticated.value = false
+ }
+
+ async function checkAuth() {
+ if (!isAuthenticated.value) {
+ const res = await adminService.get()
+ if (res.status === 'success' && res.user) {
+ login(res.user)
+ }
+ }
+ }
+
+ return { user, login, logout, checkAuth }
+})
diff --git a/frontend/src/utils.js b/frontend/src/utils.js
new file mode 100644
index 0000000..540c217
--- /dev/null
+++ b/frontend/src/utils.js
@@ -0,0 +1,63 @@
+export function formatDate(dateString) {
+ const options = { year: 'numeric', month: 'short', day: 'numeric' }
+ return new Date(dateString).toLocaleDateString('en-US', options)
+}
+
+export function getVotingName(voting) {
+ const types = {
+ "yesno": "Yes/No",
+ "rating": "Rating",
+ "ranking": "Ranking",
+ }
+
+ return types[voting]
+}
+
+export function getAvatarColor(username) {
+ const colors = [
+ '#1abc9c',
+ '#2ecc71',
+ '#3498db',
+ '#9b59b6',
+ '#34495e',
+ '#16a085',
+ '#27ae60',
+ '#2980b9',
+ '#8e44ad',
+ '#2c3e50',
+ '#f1c40f',
+ '#e67e22',
+ '#e74c3c',
+ '#95a5a6',
+ '#f39c12',
+ '#d35400',
+ '#c0392b',
+ '#bdc3c7',
+ '#7f8c8d'
+ ]
+
+ const sum = stringToColor(username)
+ const color = colors[sum % colors.length]
+ const rgba = hexToRgba(color, 0.5)
+
+ return rgba
+}
+
+function stringToColor(str) {
+ let hash = 0
+ for (let char of str) {
+ hash = char.charCodeAt(0) + ((hash << 5) - hash)
+ }
+ return Math.abs(hash % 19)
+}
+
+function hexToRgba(hex, alpha) {
+ const r = parseInt(cutHex(hex).substring(0, 2), 16)
+ const g = parseInt(cutHex(hex).substring(2, 4), 16)
+ const b = parseInt(cutHex(hex).substring(4, 6), 16)
+ return `rgba(${r}, ${g}, ${b}, ${alpha})`
+}
+
+function cutHex(h) {
+ return h.startsWith('#') ? h.substring(1, 7) : h
+}
diff --git a/frontend/src/views/AllCampaignView.vue b/frontend/src/views/AllCampaignView.vue
new file mode 100644
index 0000000..c56988d
--- /dev/null
+++ b/frontend/src/views/AllCampaignView.vue
@@ -0,0 +1,7 @@
+
+
+ ![]()
+
+
+
+
+
+ {{ imageName }}
+{{ remainingImages }} images remaining
+ +
+
+ ↑↓ – Accept / Decline
+ → – Skip (vote later) + +
+ Vote
+ + + You can also use keyboard to vote.+ ↑↓ – Accept / Decline
+ → – Skip (vote later) + +
+
+
+ Actions
+ +
+
+ Description
+
+
+
+
+ {{ date }}
+{{ time }}
+
+
+
+
+
diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue
new file mode 100644
index 0000000..e8fc6c9
--- /dev/null
+++ b/frontend/src/views/HomeView.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/frontend/src/views/NewCampaignView.vue b/frontend/src/views/NewCampaignView.vue
new file mode 100644
index 0000000..1ed7622
--- /dev/null
+++ b/frontend/src/views/NewCampaignView.vue
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
+
diff --git a/frontend/src/views/VoteView.vue b/frontend/src/views/VoteView.vue
new file mode 100644
index 0000000..cfa097d
--- /dev/null
+++ b/frontend/src/views/VoteView.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
new file mode 100644
index 0000000..5c45e1d
--- /dev/null
+++ b/frontend/vite.config.js
@@ -0,0 +1,16 @@
+import { fileURLToPath, URL } from 'node:url'
+
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+ plugins: [
+ vue(),
+ ],
+ resolve: {
+ alias: {
+ '@': fileURLToPath(new URL('./src', import.meta.url))
+ }
+ }
+})
diff --git a/montage/rdb.py b/montage/rdb.py
index 6b59e2a..3a6e497 100644
--- a/montage/rdb.py
+++ b/montage/rdb.py
@@ -116,7 +116,7 @@
flags attribute.
"""
-MAINTAINERS = ['MahmoudHashemi', 'Slaporte', 'Yarl', 'LilyOfTheWest']
+MAINTAINERS = ['MahmoudHashemi', 'Slaporte', 'Yarl', 'LilyOfTheWest', 'Jayprakash12345']
"""
class RDBSession(sessionmaker()):
diff --git a/requirements.txt b/requirements.txt
index 0d95e70..9422b15 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
#
# pip-compile --annotation-style=line requirements.in
#
--e git+https://github.com/the-maldridge/python-vote-core.git@f0b01e7e24f80673c4c237ee9e6118e8986cf0bb#egg=python3_vote_core # via -r requirements.in
+git+https://github.com/the-maldridge/python-vote-core.git@f0b01e7e24f80673c4c237ee9e6118e8986cf0bb#egg=python3_vote_core # via -r requirements.in
ashes==24.0.0 # via -r requirements.in, chert, clastic
attrs==23.2.0 # via clastic, glom
boltons==24.0.0 # via -r requirements.in, chert, clastic, face, glom, lithoxyl
From 5450cb18c3be5f78f4c40b10265db01c1f68f0a5 Mon Sep 17 00:00:00 2001
From: Jay Prakash <0freerunning@gmail.com>
Date: Mon, 4 Nov 2024 23:31:12 +0530
Subject: [PATCH 02/10] Updated the code
---
frontend/src/assets/main.css | 37 +-
frontend/src/components/AppHeader.vue | 1 -
.../src/components/Campaign/ViewCampaign.vue | 71 +--
frontend/src/components/Round/RoundEdit.vue | 49 +-
frontend/src/components/Round/RoundInfo.vue | 34 +-
frontend/src/components/Round/RoundNew.vue | 83 +---
frontend/src/components/Vote/Vote.vue | 30 ++
frontend/src/components/Vote/VoteYesNo.vue | 445 +++++++++++++-----
frontend/src/main.js | 4 +
frontend/src/router/index.js | 2 +-
frontend/src/services/dataService.js | 3 +-
frontend/src/views/VoteView.vue | 13 +-
12 files changed, 497 insertions(+), 275 deletions(-)
create mode 100644 frontend/src/components/Vote/Vote.vue
diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css
index 5e2c415..3b5113b 100644
--- a/frontend/src/assets/main.css
+++ b/frontend/src/assets/main.css
@@ -5,6 +5,41 @@
font-family: 'Lato', sans-serif;
}
+.greyed {
+ color: #8c8c8c;
+}
+
+.icon-small {
+ font-size: 6px !important;
+}
+
+.key {
+ display: inline-block;
+ margin: 0 0.1em;
+ width: 18px;
+ line-height: 18px;
+ height: 18px;
+
+ text-align: center;
+ color: darkgray;
+ background: white;
+ font-size: 11px;
+ border-radius: 3px;
+ text-shadow: 0 1px 0 white;
+ white-space: nowrap;
+ border: 1px solid grey;
+
+ -moz-box-shadow:
+ 0 1px 0px rgba(0, 0, 0, 0.2),
+ 0 0 0 2px #fff inset;
+ -webkit-box-shadow:
+ 0 1px 0px rgba(0, 0, 0, 0.2),
+ 0 0 0 2px #fff inset;
+ box-shadow:
+ 0 1px 0px rgba(0, 0, 0, 0.2),
+ 0 0 0 2px #fff inset;
+}
+
.juror-campaign-accordion summary:focus {
border-color: white !important;
box-shadow: none !important;
@@ -18,7 +53,7 @@
padding-left: 0 !important;
}
-.date-time-inputs .cdx-label{
+.date-time-inputs .cdx-label {
font-size: 14px !important;
color: gray !important;
}
diff --git a/frontend/src/components/AppHeader.vue b/frontend/src/components/AppHeader.vue
index 55368c1..16b4783 100644
--- a/frontend/src/components/AppHeader.vue
+++ b/frontend/src/components/AppHeader.vue
@@ -19,7 +19,6 @@ import { CdxButton } from '@wikimedia/codex'
import Account from 'vue-material-design-icons/Account.vue'
const userStore = useUserStore()
-console.log(userStore.user)
diff --git a/frontend/src/main.js b/frontend/src/main.js
index ee3135b..b7a1eab 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -7,6 +7,7 @@ import i18n from './i18n'
import Toast from 'vue-toastification'
import 'vue-toastification/dist/index.css'
+import { CdxTooltip } from '@wikimedia/codex'
const app = createApp(App)
@@ -15,4 +16,7 @@ app.use(router)
app.use(Toast)
app.use(i18n)
+// Global directive
+app.directive('tooltip', CdxTooltip)
+
app.mount('#app')
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 26cd3bf..588f2a7 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -65,4 +65,4 @@ router.beforeEach(async (to, from, next) => {
next()
})
-export default router
\ No newline at end of file
+export default router
diff --git a/frontend/src/services/dataService.js b/frontend/src/services/dataService.js
index cc424cc..a15b985 100644
--- a/frontend/src/services/dataService.js
+++ b/frontend/src/services/dataService.js
@@ -24,8 +24,7 @@ const dataService = {
}
try {
- const results = await Promise.all(promises)
- return results.map((response) => response.data)
+ return await Promise.all(promises)
} catch (error) {
console.error('Error fetching image info:', error)
throw error
diff --git a/frontend/src/views/VoteView.vue b/frontend/src/views/VoteView.vue
index cfa097d..afe7a40 100644
--- a/frontend/src/views/VoteView.vue
+++ b/frontend/src/views/VoteView.vue
@@ -1,23 +1,16 @@
-
From b7f7d97d94b41dc95e3d065320ef2188f71e1af4 Mon Sep 17 00:00:00 2001
From: Jay Prakash <0freerunning@gmail.com>
Date: Fri, 29 Nov 2024 21:44:42 +0530
Subject: [PATCH 03/10] Add Rating/Ranking/Edit vote with i18n
---
.dockerignore | 5 +
dockerfile | 3 -
frontend/package-lock.json | 10 +
frontend/package.json | 1 +
frontend/public/favicon.ico | Bin 4286 -> 176289 bytes
frontend/src/assets/logo_white.svg | 71 +++
frontend/src/assets/main.css | 4 +
frontend/src/components/AppHeader.vue | 64 ++-
.../src/components/Campaign/AllCampaign.vue | 21 +-
.../components/Campaign/JurorCampaignCard.vue | 23 +-
frontend/src/components/Vote/Vote.vue | 2 +-
frontend/src/components/Vote/VoteEdit.vue | 259 ++++++---
frontend/src/components/Vote/VoteRanking.vue | 163 +++---
frontend/src/components/Vote/VoteRating.vue | 529 ++++++++++++++----
frontend/src/components/Vote/VoteYesNo.vue | 222 ++++++--
frontend/src/i18n.js | 46 +-
frontend/src/main.js | 22 +-
frontend/src/services/dialogService.js | 2 +-
frontend/src/services/jurorService.js | 2 +-
19 files changed, 1093 insertions(+), 356 deletions(-)
create mode 100644 .dockerignore
create mode 100644 frontend/src/assets/logo_white.svg
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..a1c09b2
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+frontend
+client
+test_data
+fe
+docs
\ No newline at end of file
diff --git a/dockerfile b/dockerfile
index 598762b..b810809 100644
--- a/dockerfile
+++ b/dockerfile
@@ -10,6 +10,3 @@ RUN pip install --upgrade pip
RUN pip install -r requirements.txt
EXPOSE 5000
-
-# Start the application
-CMD ["bash", "-c", "export PYTHONPATH=/app && python tools/create_schema.py && python -m montage"]
\ No newline at end of file
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 3508865..fb4f926 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -11,6 +11,7 @@
"@wikimedia/codex": "^1.14.0",
"@wikimedia/codex-icons": "^1.14.0",
"axios": "^1.7.7",
+ "iso-639-1": "^3.1.3",
"lodash": "^4.17.21",
"pinia": "^2.1.7",
"vue": "^3.4.27",
@@ -2212,6 +2213,15 @@
"dev": true,
"license": "ISC"
},
+ "node_modules/iso-639-1": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/iso-639-1/-/iso-639-1-3.1.3.tgz",
+ "integrity": "sha512-1jz0Wh9hyLMRwqEPchb/KZCiTqfFWtc9R3nm7GHPygBAKS8wdKJ3FH4lvLsri6UtAE5Kz5SnowtXZa//6bqMyw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.0"
+ }
+ },
"node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 6ce7791..3a78b9d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -15,6 +15,7 @@
"@wikimedia/codex": "^1.14.0",
"@wikimedia/codex-icons": "^1.14.0",
"axios": "^1.7.7",
+ "iso-639-1": "^3.1.3",
"lodash": "^4.17.21",
"pinia": "^2.1.7",
"vue": "^3.4.27",
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
index df36fcfb72584e00488330b560ebcf34a41c64c2..d0979bb63eb13580f28f7f51dc842a066466271f 100644
GIT binary patch
literal 176289
zcmeF41)NpY+K10Dz|bKGNDYVzCfHaEDuP`XyTJYw3j;8i<5dt9y9-bZOtAG{W2~!U
zVS
-
@@ -40,8 +46,7 @@
-
+
- Logout
-
+
diff --git a/frontend/src/components/Campaign/AllCampaign.vue b/frontend/src/components/Campaign/AllCampaign.vue
index c3580ce..89b1216 100644
--- a/frontend/src/components/Campaign/AllCampaign.vue
+++ b/frontend/src/components/Campaign/AllCampaign.vue
@@ -71,7 +71,26 @@ onMounted(() => {
'campaign.id'
);
- jurorCampaigns.value = _.values(roundsGroupedByCampaigns);
+ let campaignsJuror = _.values(roundsGroupedByCampaigns)
+
+ // Order campaigns by open date (more recent at the top)
+ campaignsJuror.sort((campaign1, campaign2) => {
+ const getOpenDate = (campaign) =>
+ campaign.length > 0 && campaign[0].campaign ? campaign[0].campaign.open_date : null
+
+ const campaign1OpenDate = getOpenDate(campaign1)
+ const campaign2OpenDate = getOpenDate(campaign2)
+
+ if (campaign1OpenDate === campaign2OpenDate) {
+ return 0
+ } else if (campaign1OpenDate < campaign2OpenDate) {
+ return 1
+ } else {
+ return -1
+ }
+ })
+
+ jurorCampaigns.value = campaignsJuror
})
.catch(alertService.error)
})
diff --git a/frontend/src/components/Campaign/JurorCampaignCard.vue b/frontend/src/components/Campaign/JurorCampaignCard.vue
index 1a58855..56655fe 100644
--- a/frontend/src/components/Campaign/JurorCampaignCard.vue
+++ b/frontend/src/components/Campaign/JurorCampaignCard.vue
@@ -21,14 +21,20 @@
+
+ Logout
+
-
+
+ - Your Progress: {{ (100 - round.percent_tasks_open).toFixed(1) }}% ({{ round.total_open_tasks ?? 0 }} out of - {{ round.total_tasks ?? 0 }}) + Your Progress: {{ (100 - round.percent_tasks_open).toFixed(1) }}% + ({{ round.total_open_tasks ?? 0 }} out of {{ round.total_tasks ?? 0 }})
- Vote
- Edit Previous Votes
+ Edit Previous Votes
This screen is under development.
-
+
-
+
+
-
-
{{ round.name }}
@@ -10,15 +7,15 @@Order by:
-
-
- Gallary size
+Gallery size
- ![]()
+ ![]()
voted in a day
5 Sep 2023 at 8:11 UTC
-
-
+
-
-
+
+
+
+
+ No votes yet!
+You haven't voted on any image this round
+
+
diff --git a/frontend/src/components/Vote/VoteRating.vue b/frontend/src/components/Vote/VoteRating.vue
index f1ef03e..84b6941 100644
--- a/frontend/src/components/Vote/VoteRating.vue
+++ b/frontend/src/components/Vote/VoteRating.vue
@@ -1,186 +1,527 @@
- Round is not active
+This round is not active. Please contact to organizer.
+This screen is under development.
-
-
- ![]()
+
+
+ ![]()
+
-
-
-
{{ imageName }}
-{{ remainingImages }} images remaining
-
-
-
-
+
+
+
+
+
+
Image #{{ rating.current.entry.id }}
+{{ rating.current.name.split('_').join(' ') }}
+{{ stats.total_open_tasks }} images remaining
+Vote
-
diff --git a/frontend/src/components/Round/RoundInfo.vue b/frontend/src/components/Round/RoundInfo.vue
index fdde956..0d43273 100644
--- a/frontend/src/components/Round/RoundInfo.vue
+++ b/frontend/src/components/Round/RoundInfo.vue
@@ -4,7 +4,8 @@
Vote
-
+
-
+
You can also use keyboard to vote.
1-5 – One to Five Stars
→ – Skip (vote later)
+
+ 1-5 – One to Five Stars
→ – Skip (vote later)
Actions
-
{{ $t('montage-login-button') }}
+
Actions
- -
-
![]()
-
+ Description
-
-
+
-
{{ date }}
-{{ time }}
+Description
+
+
+
+
+
+
+ {{ formattedDateTime.date }}
+{{ formattedDateTime.day }}, {{ formattedDateTime.time }}
+
+
+
+
+
+
+ {{ rating.current.entry.resolution / 1000000 }} Mpix
+{{ rating.current.entry.width + ' x ' + rating.current.entry.height }}
+
+
+
+
+
+
+ + {{ rating.current.history.length }} versions +
+last one at {{ formattedDate(rating.current.history[0].timestamp) }}
+
+
+
+
+
+
+ All done!
++ You voted on all images in this round. You can still edit your previous votes using the + button below. +
+
+
diff --git a/frontend/src/components/Vote/VoteYesNo.vue b/frontend/src/components/Vote/VoteYesNo.vue
index 4c6baf8..1d76da5 100644
--- a/frontend/src/components/Vote/VoteYesNo.vue
+++ b/frontend/src/components/Vote/VoteYesNo.vue
@@ -2,9 +2,18 @@
Round is not active
+This round is not active. Please contact to organizer.
+
+
+
+
+
+
+ All done!
++ You voted on all images in this round. You can still edit your previous votes using the + button below. +
+
+
diff --git a/frontend/src/components/LoginBox.vue b/frontend/src/components/LoginBox.vue
index a3cafdf..5b284ff 100644
--- a/frontend/src/components/LoginBox.vue
+++ b/frontend/src/components/LoginBox.vue
@@ -14,16 +14,23 @@
Round is not active
+This round is not active. Please contact to organizer.
+{{ $t('montage-round-deadline') }}
- {{ round.deadline_date.split('T')[0] }} · {{ $t('montage-round-vote-ending', [remainingDays]) }} + {{ round.deadline_date.split('T')[0] }} · + {{ $t('montage-round-vote-ending', [remainingDays]) }}
@@ -12,59 +13,89 @@
-
+ {{ round.directions }}
{{ $t('montage-round-no-direction-given') }}
+
{{ $t('montage-label-round-quorum') }}
+{{ $t('montage-round-quorum-per-photo', [roundDetails.quorum]) }}
+
-
{{ $t('montage-label-round-jurors') }}
+{{ $t('montage-label-round-jurors') }}
-
+ "
+ >
-
-
+
N/A
++ {{ + $t('montage-progress-status', [ + juror.stats.total_tasks - juror.stats.total_open_tasks, + juror.stats.total_tasks + ]) + }} +
++ {{ $t('montage-vote-image-remains', [juror?.stats.total_open_tasks]) }} +
-
-
+
-
{{ $t('montage-round-file-info') }}
-{{ $t('montage-round-file-type') }}: {{ round.config.allowed_filetypes.join(', ') }}
-- {{ $t( 'montage-round-' + key.replaceAll('_', '-')) }} + {{ + $t('montage-round-' + key.replaceAll('_', '-')) + }} {{ value }} @@ -72,21 +103,28 @@ {{ $t('montage-round-file-setting') }}
TODO: Voting
{{ $t('montage-round-voting-details') }}
+
-
-
+
@@ -101,7 +139,7 @@
diff --git a/frontend/src/components/Round/RoundNew.vue b/frontend/src/components/Round/RoundNew.vue
index 9d15002..002c2d3 100644
--- a/frontend/src/components/Round/RoundNew.vue
+++ b/frontend/src/components/Round/RoundNew.vue
@@ -161,7 +161,7 @@
-
+
@@ -243,6 +243,7 @@ const roundIndex = props.rounds.length
const prevRound = roundIndex ? props.rounds[roundIndex - 1] : null
const thresholds = ref(null)
const thresholdOptions = ref(null)
+const isLoading = ref(false)
const formData = ref({
name: `Round ${roundIndex + 1}`,
@@ -304,10 +305,11 @@ const submitRound = () => {
config: formData.value.config
}
+ isLoading.value = true
adminService
.addRound(campaignId, payload)
.then((resp) => {
- alertService.success($t('montage-round-addded'))
+ alertService.success($t('montage-round-added'))
if (selectedImportSource.value === 'selected') {
importSourceValue.value.file_names = importSourceValue.value.file_names
@@ -318,6 +320,9 @@ const submitRound = () => {
importCategory(resp.data.id)
})
.catch(alertService.error)
+ .finally(() => {
+ isLoading.value = false
+ })
} else {
if (!prevRound.id) {
alertService.error($t('montage-something-went-wrong'))
@@ -361,6 +366,7 @@ const importCategory = (id) => {
payload.file_names = importSourceValue.value.file_names
}
+ isLoading.value = true
adminService
.populateRound(id, payload)
.then((response) => {
@@ -393,6 +399,9 @@ const importCategory = (id) => {
}
})
.catch(alertService.error)
+ .finally(() => {
+ isLoading.value = false
+ })
}
watch(thresholds, (value) => {
diff --git a/frontend/src/components/Vote/VoteEdit.vue b/frontend/src/components/Vote/VoteEdit.vue
index dca180b..630a5cc 100644
--- a/frontend/src/components/Vote/VoteEdit.vue
+++ b/frontend/src/components/Vote/VoteEdit.vue
@@ -1,18 +1,30 @@
-
+
+
+
+
+
-
-
-
- {{ round.name }}
+{{ $t('montage-vote-round-part-of-campaign', [round.campaign.name]) }}
+
-
-
- {{ $t('montage-vote-order-by') }}
-
+
-
-
+
![]()
+
+
-
- {{ $t('montage-voted-time', ['a day']) }}
-{{ image.timestamp }}
+{{ $t('montage-voted-time', [dayjs(image.date).fromNow()]) }}
+{{ dayjs(image.date).utc().format('D MMM YYYY [at] H:mm [UTC]') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ {{ $t('montage-voted-time', [dayjs(image.date).fromNow()]) }}
+{{ dayjs(image.date).utc().format('D MMM YYYY [at] H:mm [UTC]') }}
+
+
{{ $t('montage-no-votes-yet') }}
{{ $t('montage-no-votes-this-round') }}
@@ -94,14 +165,22 @@