v0.9.8 bug fixes
This commit is contained in:
@@ -10,7 +10,7 @@
|
|||||||
PROJECT_NAME=jama
|
PROJECT_NAME=jama
|
||||||
|
|
||||||
# Image version to run (set by build.sh, or use 'latest')
|
# Image version to run (set by build.sh, or use 'latest')
|
||||||
JAMA_VERSION=0.9.6
|
JAMA_VERSION=0.9.8
|
||||||
|
|
||||||
# App port — the host port Docker maps to the container
|
# App port — the host port Docker maps to the container
|
||||||
PORT=3000
|
PORT=3000
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "jama-backend",
|
"name": "jama-backend",
|
||||||
"version": "0.9.6",
|
"version": "0.9.8",
|
||||||
"description": "TeamChat backend server",
|
"description": "TeamChat backend server",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ app.use('/uploads', express.static('/app/uploads'));
|
|||||||
app.use('/api/auth', require('./routes/auth')(io));
|
app.use('/api/auth', require('./routes/auth')(io));
|
||||||
app.use('/api/users', require('./routes/users'));
|
app.use('/api/users', require('./routes/users'));
|
||||||
app.use('/api/groups', require('./routes/groups')(io));
|
app.use('/api/groups', require('./routes/groups')(io));
|
||||||
app.use('/api/messages', require('./routes/messages'));
|
app.use('/api/messages', require('./routes/messages')(io));
|
||||||
app.use('/api/settings', require('./routes/settings'));
|
app.use('/api/settings', require('./routes/settings'));
|
||||||
app.use('/api/about', require('./routes/about'));
|
app.use('/api/about', require('./routes/about'));
|
||||||
app.use('/api/help', require('./routes/help'));
|
app.use('/api/help', require('./routes/help'));
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
const express = require('express');
|
const express = require('express');
|
||||||
const multer = require('multer');
|
const multer = require('multer');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const router = express.Router();
|
|
||||||
const { getDb } = require('../models/db');
|
const { getDb } = require('../models/db');
|
||||||
|
|
||||||
|
module.exports = function(io) {
|
||||||
|
const router = express.Router();
|
||||||
const { authMiddleware } = require('../middleware/auth');
|
const { authMiddleware } = require('../middleware/auth');
|
||||||
|
|
||||||
const imgStorage = multer.diskStorage({
|
const imgStorage = multer.diskStorage({
|
||||||
@@ -104,6 +106,7 @@ router.post('/group/:groupId', authMiddleware, (req, res) => {
|
|||||||
`).get(result.lastInsertRowid);
|
`).get(result.lastInsertRowid);
|
||||||
|
|
||||||
message.reactions = [];
|
message.reactions = [];
|
||||||
|
io.to(`group:${req.params.groupId}`).emit('message:new', message);
|
||||||
res.json({ message });
|
res.json({ message });
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -131,6 +134,7 @@ router.post('/group/:groupId/image', authMiddleware, uploadImage.single('image')
|
|||||||
`).get(result.lastInsertRowid);
|
`).get(result.lastInsertRowid);
|
||||||
|
|
||||||
message.reactions = [];
|
message.reactions = [];
|
||||||
|
io.to(`group:${req.params.groupId}`).emit('message:new', message);
|
||||||
res.json({ message });
|
res.json({ message });
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -173,4 +177,5 @@ router.post('/:id/reactions', authMiddleware, (req, res) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
module.exports = router;
|
return router;
|
||||||
|
};
|
||||||
|
|||||||
2
build.sh
2
build.sh
@@ -13,7 +13,7 @@
|
|||||||
# ─────────────────────────────────────────────────────────────
|
# ─────────────────────────────────────────────────────────────
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
VERSION="${1:-0.9.6}"
|
VERSION="${1:-0.9.8}"
|
||||||
ACTION="${2:-}"
|
ACTION="${2:-}"
|
||||||
REGISTRY="${REGISTRY:-}"
|
REGISTRY="${REGISTRY:-}"
|
||||||
IMAGE_NAME="jama"
|
IMAGE_NAME="jama"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "jama-frontend",
|
"name": "jama-frontend",
|
||||||
"version": "0.9.6",
|
"version": "0.9.8",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -247,10 +247,8 @@ export default function ChatWindow({ group, onBack, onGroupUpdated, onDirectMess
|
|||||||
{iconGroupInfo ? (
|
{iconGroupInfo ? (
|
||||||
<img src={iconGroupInfo} alt="info" style={{ width: 22, height: 22, objectFit: 'contain' }} />
|
<img src={iconGroupInfo} alt="info" style={{ width: 22, height: 22, objectFit: 'contain' }} />
|
||||||
) : (
|
) : (
|
||||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="1.5" stroke="currentColor" width="22" height="22">
|
||||||
<circle cx="12" cy="12" r="10"/>
|
<path strokeLinecap="round" strokeLinejoin="round" d="M15 9h3.75M15 12h3.75M15 15h3.75M4.5 19.5h15a2.25 2.25 0 0 0 2.25-2.25V6.75A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25v10.5A2.25 2.25 0 0 0 4.5 19.5Zm6-10.125a1.875 1.875 0 1 1-3.75 0 1.875 1.875 0 0 1 3.75 0Zm1.294 6.336a6.721 6.721 0 0 1-3.17.789 6.721 6.721 0 0 1-3.168-.789 3.376 3.376 0 0 1 6.338 0Z" />
|
||||||
<line x1="12" y1="16" x2="12" y2="12"/>
|
|
||||||
<line x1="12" y1="8" x2="12.01" y2="8"/>
|
|
||||||
</svg>
|
</svg>
|
||||||
)}
|
)}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
Reference in New Issue
Block a user