Управувај со корисници
@@ -108,5 +110,5 @@
@click="updateStatus(req.id, 'rejected')">Одбиј
-
+
📌 Прво обработи ги најстарите нарачки.
@@ -118,16 +120,27 @@
-
-
-
Index: zinemaster-frontend/src/components/MainPage.vue
===================================================================
--- zinemaster-frontend/src/components/MainPage.vue (revision 644d6fbea5324eadd4c531f6c37f855fb121be1f)
+++ zinemaster-frontend/src/components/MainPage.vue (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
@@ -7,8 +7,11 @@
Сите нарачки
+
- ![Profile]()
+ ![Profile]()
+
+
Управувај со корисници
@@ -180,5 +183,7 @@
+
+
@@ -188,4 +193,8 @@
import { useRouter } from 'vue-router';
import Swal from 'sweetalert2';
+import RequestBell from './RequestBell.vue';
+import StatusBell from './StatusBell.vue';
+import axios from 'axios';
+
const router = useRouter();
@@ -194,6 +203,19 @@
const userProfileImage = ref("https://www.gravatar.com/avatar/?d=mp");
console.log(user)
-
-onMounted(() => {
+const processedCount = ref(0)
+const token = localStorage.getItem('auth_token')
+
+
+
+async function ping(){
+ try {
+ await axios.post('http://localhost:8081/api/dev/ping-admins', null,{
+ headers: { Authorization: `Bearer ${token}` }
+ })
+ } catch (e) {
+ console.error('Ping failed:', e?.response?.status, e?.response?.data || e.message)
+ }
+}
+onMounted(async () => {
const stored = localStorage.getItem('user');
if (!stored) {
@@ -211,4 +233,6 @@
const logout = () => {
localStorage.removeItem('user');
+ localStorage.removeItem('auth_token');
+ localStorage.removeItem('saved');
router.push('/login');
};
@@ -222,4 +246,17 @@
const selectedCategory = ref('');
+
+
+async function resetProcessedCount() {
+ if (!user.value?.id) return
+ try {
+ await axios.post(`http://localhost:8081/api/users/${user.value.id}/processed-count/reset`)
+ processedCount.value = 0
+ } catch (e) {
+ console.error("Failed to reset processed count", e)
+ }
+}
+
+
const startRequest = () => {
requestItems.value = [];
@@ -233,5 +270,5 @@
if (!selectedCategory.value) return products.value;
return products.value.filter(p =>
- p.categories && p.categories.some(cat => cat.id === selectedCategory.value)
+ p.categories && p.categories.some(cat => cat.id === selectedCategory.value)//barem edna kategorija
);
});
Index: zinemaster-frontend/src/components/OAuth2Callback.vue
===================================================================
--- zinemaster-frontend/src/components/OAuth2Callback.vue (revision 644d6fbea5324eadd4c531f6c37f855fb121be1f)
+++ zinemaster-frontend/src/components/OAuth2Callback.vue (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
@@ -9,50 +9,40 @@
Index: zinemaster-frontend/src/components/ProfilePage.vue
===================================================================
--- zinemaster-frontend/src/components/ProfilePage.vue (revision 644d6fbea5324eadd4c531f6c37f855fb121be1f)
+++ zinemaster-frontend/src/components/ProfilePage.vue (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
@@ -7,5 +7,7 @@
Дома
Сите нарачки
+
+
Управувај со корисници
@@ -131,12 +133,38 @@
+
+
+
Index: zinemaster-frontend/src/components/StatusBell.vue
===================================================================
--- zinemaster-frontend/src/components/StatusBell.vue (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
+++ zinemaster-frontend/src/components/StatusBell.vue (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
@@ -0,0 +1,35 @@
+
+
+ {{ count }}
+
+
+
+
+
+
+
+
Index: zinemaster-frontend/src/components/useBell.js
===================================================================
--- zinemaster-frontend/src/components/useBell.js (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
+++ zinemaster-frontend/src/components/useBell.js (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
@@ -0,0 +1,161 @@
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
+import http from '@/api'
+import { connectWs, addWsListener } from '@/ws'
+
+function getStoredUser() {
+ try { return JSON.parse(localStorage.getItem('user') || 'null') } catch { return null }
+}
+
+const statusToMacedonian = (status) => {
+ switch (status) {
+ case 'approved': return 'Одобрено';
+ case 'pending': return 'Во тек';
+ case 'rejected': return 'Одбиено';
+ default: return status;
+ }
+};
+
+function endpoints(kind, me) {
+ if (kind === 'status') {
+ return {
+ countUrl: `/api/users/${me}/status/unseen-count`,
+ resetUrl: `/api/users/${me}/status/unseen/reset`,
+ parseCount: (data) => Number(data) || 0
+ }
+ }
+ return {
+ countUrl: `/api/users/${me}/counters`,
+ resetUrl: `/api/users/${me}/unread/reset`,
+ parseCount: (data) => Number(data?.unread ?? 0),
+ }
+}
+
+export function useBell(kind /* 'request' | 'status' */, username) {
+ let nextId = 1
+ const list = ref([])
+ const bootUnread = ref(0)
+ const liveUnread = ref(0)
+ const liveAck = ref(false)
+
+ const storedUser = getStoredUser()
+ const me = username || storedUser?.username || localStorage.getItem('username') || ''
+ console.log('[Bell] user =', me)
+
+ const { countUrl, resetUrl } = endpoints(kind, me)
+
+ function pushToast(title, summary, inc = true) {
+ if (!title && !summary) return
+ const n = { id: nextId++, title, summary, createdAt: new Date() }
+ list.value.unshift(n)
+ if (list.value.length > 5) list.value.pop()
+ if (inc) liveUnread.value += 1
+ setTimeout(() => dismiss(n.id), 6000)
+ }
+
+ function dismiss(id) {
+ const i = list.value.findIndex(n => n.id === id)
+ if (i !== -1) list.value.splice(i, 1)
+ }
+
+ function timeAgo(d) {
+ const s = (Date.now() - d.getTime()) / 1000
+ if (s < 60) return 'just now'
+ return `${Math.floor(s / 60)}m ago`
+ }
+
+ let resetTimer = null
+ async function resetUnreadDebounced() {
+ if (!me || resetTimer) return
+ resetTimer = setTimeout(async () => {
+ resetTimer = null
+ await http.post(resetUrl)
+ bootUnread.value = 0
+ liveUnread.value = 0
+ }, 400)
+ }
+
+ async function markAllRead() {
+ if (!me) return
+ await http.post(resetUrl)
+ bootUnread.value = 0
+ liveUnread.value = 0
+ }
+
+ function startLiveAcknowledge() {
+ liveAck.value = true
+ markAllRead()
+ }
+
+ function stopLiveAcknowledge() {
+ liveAck.value = false
+ loadBootCount()
+ }
+
+ const count = computed(() => bootUnread.value + liveUnread.value)
+ const items = computed(() => list.value.filter(n => n && n.id != null))
+
+ async function loadBootCount() {
+ try {
+ if (!me) { bootUnread.value = 0; return }
+ const { data } = await http.get(countUrl)
+ const v = (typeof data === 'number')
+ ? data
+ : (Number(data?.unread ?? data?.unseen ?? 0))
+ bootUnread.value = Number.isFinite(v) ? Number(v) : 0
+ } catch {
+ bootUnread.value = 0
+ }
+ }
+
+ let removeWs = null
+
+ onMounted(async () => {
+ await loadBootCount()
+ connectWs(() => localStorage.getItem('auth_token') || '')
+
+ removeWs = addWsListener({
+ onConnect: async () => { await loadBootCount() },
+ onNewRequest: (payload) => {
+ if (kind !== 'request') return
+ const id = payload?.requestId ?? ''
+ const summary = payload?.summary ?? (id ? `Request #${id}` : 'New request')
+ if (liveAck.value) {
+ pushToast('New Request', summary, false)
+ resetUnreadDebounced()
+ } else {
+ pushToast('New Request', summary)
+ }
+ },
+ onStatusChange: (payload) => {
+ if (kind !== 'status') return
+ if (!payload) return
+ console.log('[WS] status payload:', payload)
+ const recipient =
+ payload.to ??
+ payload.makerUsername ??
+ payload.recipient
+
+ if (recipient && recipient !== me) return
+
+ if (payload.maker && payload.maker !== me) return
+ const id = payload?.requestId ?? ''
+ const st = payload?.newStatus ?? payload?.status ?? ''
+ const summary = id ? `Request #${id} → ${statusToMacedonian(st)}` : st
+ if (liveAck.value) {
+ pushToast(`Status: ${st}`, summary, false)
+ resetUnreadDebounced()
+ } else {
+ pushToast(`Status: ${st}`, summary)
+ }
+ }
+ })
+
+
+ setTimeout(loadBootCount, 500)
+ })
+
+
+ onBeforeUnmount(() => { if (removeWs) removeWs() })
+
+ return { items, count, dismiss, timeAgo, markAllRead, startLiveAcknowledge, stopLiveAcknowledge }
+}
Index: zinemaster-frontend/src/main.js
===================================================================
--- zinemaster-frontend/src/main.js (revision 644d6fbea5324eadd4c531f6c37f855fb121be1f)
+++ zinemaster-frontend/src/main.js (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
@@ -1,2 +1,3 @@
+import http from '@/api'
import { createApp } from 'vue';
import App from './App.vue';
@@ -4,5 +5,9 @@
import 'bootstrap/dist/css/bootstrap.min.css';
-createApp(App).use(router).mount('#app');
+
+const app = createApp(App)
+app.config.globalProperties.$http = http
+app.use(router)
+app.mount('#app')
const params = new URLSearchParams(window.location.search)
const tok = params.get('token')
Index: zinemaster-frontend/src/ws.js
===================================================================
--- zinemaster-frontend/src/ws.js (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
+++ zinemaster-frontend/src/ws.js (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
@@ -0,0 +1,59 @@
+
+import { Client } from '@stomp/stompjs'
+import SockJS from 'sockjs-client'
+
+let client = null
+let listeners = []
+
+export function connectWs(getToken) {
+ if (client?.active) return
+ const tok = getToken();
+ console.log(tok)
+
+ const token = localStorage.getItem('auth_token') ;
+
+ client = new Client({
+ webSocketFactory: () => new SockJS('http://localhost:8081/stomp'),
+ connectHeaders: token ? { Authorization: `Bearer ${token}` } : {},
+ reconnectDelay: 3000,
+ heartbeatIncoming: 20000,
+ heartbeatOutgoing: 20000,
+ debug: () => {}
+ })
+
+ client.onConnect = () => {
+ console.log('[WS] connected')
+
+
+ client.subscribe('/user/queue/requests', (frame) => {
+ let payload
+ try { payload = JSON.parse(frame.body) } catch { return }
+ listeners.forEach(l => l?.onNewRequest?.(payload))
+ })
+
+ client.subscribe('/user/queue/status', (frame) => {
+ let payload
+ try { payload = JSON.parse(frame.body) } catch { return }
+ listeners.forEach(l => l?.onStatusChange?.(payload))
+ })
+
+ listeners.forEach(l => l?.onConnect?.())
+ }
+
+
+ client.onStompError = f => console.error('[WS] STOMP error:', f.headers?.message)
+ client.onWebSocketClose = e => console.warn('[WS] closed:', e?.reason || '')
+
+ client.activate()
+}
+
+export function addWsListener(handlers) {
+ listeners.push(handlers)
+ return () => { listeners = listeners.filter(h => h !== handlers) }
+}
+
+export function disconnectWs() {
+ if (client?.active) client.deactivate()
+ client = null
+ listeners = []
+}
Index: zinemaster-frontend/vue.config.js
===================================================================
--- zinemaster-frontend/vue.config.js (revision 644d6fbea5324eadd4c531f6c37f855fb121be1f)
+++ zinemaster-frontend/vue.config.js (revision 157c73048f63a67fef803399cb69ddef6c7f26de)
@@ -4,7 +4,19 @@
devServer: {
port: 8082,
+ historyApiFallback: {
+ rewrites: [{ from: /^\/oauth2\/callback$/, to: '/index.html' }]
+ },
proxy: {
- '^/api': { target: 'http://localhost:8081', changeOrigin: true, ws: false, timeout: 120000 },
- '^/oauth2/callback': { bypass: () => true }
+ '/api': {
+ target: 'http://localhost:8081',
+ changeOrigin: true,
+ ws: false,
+ timeout: 120000
+ },
+ '/stomp': {
+ target: 'http://localhost:8081',
+ changeOrigin: true,
+ ws: true
+ }
}
}