Compare commits

...
2 Commits
Author SHA1 Message Date
Amirmahdi 2be0f3e2b8 deploy 2026-06-07 16:04:59 +03:30
Amirmahdi d3089ff2dd feat: add feedback 2026-06-07 15:41:33 +03:30
8 changed files with 334 additions and 3 deletions
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/env bash
# Runs on `git push`. If a tag ref is among what's being pushed, build locally
# and deploy to the server. Normal branch pushes are untouched.
set -euo pipefail
deploy=0
tag=""
while read -r local_ref _local_sha _remote_ref _remote_sha; do
case "$local_ref" in
refs/tags/*)
deploy=1
tag="${local_ref#refs/tags/}"
;;
esac
done
if [ "$deploy" = "1" ]; then
echo "→ Tag '$tag' is being pushed — building locally and deploying to the server…"
exec "$(git rev-parse --show-toplevel)/scripts/deploy.sh"
fi
exit 0
+3
View File
@@ -39,3 +39,6 @@ yarn-error.log*
# typescript # typescript
*.tsbuildinfo *.tsbuildinfo
next-env.d.ts next-env.d.ts
# local deploy secrets
.env.deploy
+60
View File
@@ -0,0 +1,60 @@
# Deployment
The site is a **static export**. It is built **on your machine** and the result
(`out/`) is copied to the server — nothing is built on the server.
- Server: `185.226.116.88`, user `ubuntu`
- Target dir: `/var/www/aramland-admin` (its contents are fully replaced each deploy)
## Deploy by pushing a git tag (automatic)
A versioned git hook ([`.githooks/pre-push`](.githooks/pre-push)) runs the local
build + upload whenever you push a **tag**:
```bash
git tag v1.0.0
git push origin v1.0.0 # ← hook builds locally, then uploads to the server
```
Normal branch pushes are unaffected — only tag pushes deploy.
> The hook path is set via `git config core.hooksPath .githooks` (already configured
> in this clone). On a fresh clone, run that once.
## Deploy manually (no tag)
```bash
npm run deploy # = bash scripts/deploy.sh : build locally + upload
```
## The password
Both paths use [`scripts/deploy.sh`](scripts/deploy.sh), which streams `out/` over a
single SSH connection. By default **SSH asks for the server password once** per deploy.
To make it **unattended** (no prompt), provide the password without committing it:
1. Create `.env.deploy` in the project root (already gitignored):
```bash
DEPLOY_PASSWORD=your-server-password
```
2. Install `sshpass` (the only piece that can feed a password to SSH non-interactively):
- Linux/WSL: `sudo apt-get install -y sshpass`
- macOS: `brew install hudochenkov/sshpass/sshpass`
- Windows Git Bash has no sshpass — either deploy from WSL, or just answer the one
password prompt.
Override the host/user/path too if needed (env or `.env.deploy`):
`DEPLOY_HOST`, `DEPLOY_USER`, `DEPLOY_PATH`.
> **More robust option:** set up an SSH **key** (`ssh-copy-id ubuntu@185.226.116.88`).
> Then deploys are unattended on any OS with no password or sshpass at all.
## Notes / troubleshooting
- **Permission denied** writing the target: the `ubuntu` user must own it →
on the server run `sudo chown -R ubuntu:ubuntu /var/www/aramland-admin`.
- **Web server:** point nginx's site root at `/var/www/aramland-admin`. The export uses
`trailingSlash: true`, so clean URLs resolve to `…/index.html`.
- The deploy replaces the directory **contents** (including dotfiles) in place; it does
not touch nginx config or sibling folders.
+195
View File
@@ -0,0 +1,195 @@
"use client";
import { useCallback, useEffect, useState } from "react";
import { apiFetch, ApiError } from "@/lib/api";
import { useToast } from "@/components/toast";
import { DataTable, type Column } from "@/components/DataTable";
import { Button, Card, ConfirmDialog, PageHeader } from "@/components/ui";
import { TrashIcon } from "@/components/icons";
import { toFa } from "@/lib/utils";
interface Feedback {
id: number;
stars?: number | null;
content?: string | null;
created_at?: string;
user?: {
name?: string | null;
identifier?: string | null;
mobile?: string | null;
} | null;
}
interface Summary {
total: number;
rated: number;
with_comment: number;
average_stars: number;
}
interface AdminResponse {
summary: Summary;
feedback: { data: Feedback[] };
}
function Stars({ value }: { value?: number | null }) {
if (!value) return <span className="text-muted"></span>;
return (
<span className="text-amber-500" dir="ltr" title={toFa(value)}>
{"★".repeat(value)}
<span className="text-border">{"★".repeat(5 - value)}</span>
</span>
);
}
function userName(u: Feedback["user"]): string {
return u?.name || u?.identifier || u?.mobile || "—";
}
function faDate(value?: string): string {
if (!value) return "—";
try {
return toFa(new Date(value).toLocaleDateString("fa-IR"));
} catch {
return "—";
}
}
export default function AppFeedbackPage() {
const toast = useToast();
const [rows, setRows] = useState<Feedback[]>([]);
const [summary, setSummary] = useState<Summary | null>(null);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
const [deleting, setDeleting] = useState<Feedback | null>(null);
const [removing, setRemoving] = useState(false);
// Fetch without touching state synchronously (safe to call from an effect).
const fetchFeedback = useCallback(() => {
return apiFetch<AdminResponse>("/admin/app-feedback")
.then((res) => {
setRows(res.feedback?.data ?? []);
setSummary(res.summary ?? null);
setError(null);
})
.catch((e: unknown) =>
setError(e instanceof ApiError ? e.message : "خطا در دریافت اطلاعات"),
)
.finally(() => setLoading(false));
}, []);
// Reload triggered by user actions (retry / after delete): show the spinner.
const reload = useCallback(() => {
setLoading(true);
setError(null);
fetchFeedback();
}, [fetchFeedback]);
useEffect(() => {
fetchFeedback();
}, [fetchFeedback]);
async function confirmDelete() {
if (!deleting) return;
setRemoving(true);
try {
await apiFetch(`/admin/app-feedback/${deleting.id}`, { method: "DELETE" });
toast.success("بازخورد حذف شد.");
setDeleting(null);
reload();
} catch (err) {
toast.error(err instanceof ApiError ? err.message : "خطا در حذف");
} finally {
setRemoving(false);
}
}
const columns: Column<Feedback>[] = [
{ key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-20" },
{ key: "user", header: "کاربر", render: (r) => userName(r.user) },
{
key: "stars",
header: "امتیاز",
className: "w-28",
render: (r) => <Stars value={r.stars} />,
},
{
key: "content",
header: "ایده / نظر",
render: (r) => r.content || <span className="text-muted"></span>,
},
{
key: "created_at",
header: "تاریخ",
className: "w-32",
render: (r) => faDate(r.created_at),
},
];
return (
<div>
<PageHeader
title="نظرات و ایده‌ها"
subtitle="بازخورد کاربران درباره برنامه"
/>
{summary && (
<div className="mb-6 grid grid-cols-2 gap-3 sm:grid-cols-4">
<Card>
<p className="text-sm text-muted">میانگین امتیاز</p>
<p className="mt-1 text-2xl font-bold text-foreground">
{toFa(summary.average_stars)} <span className="text-amber-500"></span>
</p>
</Card>
<Card>
<p className="text-sm text-muted">کل بازخوردها</p>
<p className="mt-1 text-2xl font-bold text-foreground">
{toFa(summary.total)}
</p>
</Card>
<Card>
<p className="text-sm text-muted">دارای امتیاز</p>
<p className="mt-1 text-2xl font-bold text-foreground">
{toFa(summary.rated)}
</p>
</Card>
<Card>
<p className="text-sm text-muted">دارای نظر</p>
<p className="mt-1 text-2xl font-bold text-foreground">
{toFa(summary.with_comment)}
</p>
</Card>
</div>
)}
<DataTable
columns={columns}
rows={rows}
loading={loading}
error={error}
onRetry={reload}
emptyMessage="هنوز بازخوردی ثبت نشده است."
actions={(row) => (
<Button
variant="ghost"
onClick={() => setDeleting(row)}
aria-label="حذف"
className="text-danger"
>
<TrashIcon className="h-4 w-4" />
</Button>
)}
/>
<ConfirmDialog
open={!!deleting}
message={`آیا از حذف بازخورد «${userName(deleting?.user)}» مطمئن هستید؟`}
loading={removing}
onConfirm={confirmDelete}
onClose={() => setDeleting(null)}
/>
</div>
);
}
+2 -1
View File
@@ -10,6 +10,7 @@ import {
ConfirmDialog, ConfirmDialog,
Field, Field,
Input, Input,
Textarea,
Select, Select,
Switch, Switch,
Modal, Modal,
@@ -339,7 +340,7 @@ export default function MediaPage() {
</Field> </Field>
<Field label="توضیحات"> <Field label="توضیحات">
<Input <Textarea
value={caption} value={caption}
onChange={(e) => setCaption(e.target.value)} onChange={(e) => setCaption(e.target.value)}
placeholder="توضیح کوتاه" placeholder="توضیح کوتاه"
+4 -1
View File
@@ -118,6 +118,9 @@ export const NAV: NavSection[] = [
{ {
label: "محتوای کاربران", label: "محتوای کاربران",
icon: TagIcon, icon: TagIcon,
items: [{ href: "/dashboard/comments", label: "نظرات" }], items: [
{ href: "/dashboard/comments", label: "نظرات" },
{ href: "/dashboard/app-feedback", label: "نظرات و ایده‌ها برنامه" },
],
}, },
]; ];
+2 -1
View File
@@ -6,7 +6,8 @@
"dev": "next dev", "dev": "next dev",
"build": "next build", "build": "next build",
"start": "next start", "start": "next start",
"lint": "eslint" "lint": "eslint",
"deploy": "bash scripts/deploy.sh"
}, },
"dependencies": { "dependencies": {
"next": "16.2.7", "next": "16.2.7",
+46
View File
@@ -0,0 +1,46 @@
#!/usr/bin/env bash
# Build the static site locally, then replace the server directory with it.
#
# - Builds on THIS machine (npm run build -> ./out).
# - Streams out/ over a single SSH connection (tar pipe) and swaps the
# contents of the target dir on the server. No rsync/sshpass required.
#
# Password handling:
# - If `sshpass` is installed AND DEPLOY_PASSWORD is set (env or .env.deploy),
# the deploy is fully unattended.
# - Otherwise SSH prompts for the password once (interactive).
#
# Config (override via env or .env.deploy):
set -euo pipefail
cd "$(git rev-parse --show-toplevel 2>/dev/null || dirname "$(dirname "$0")")"
# Optional local secrets file (gitignored).
[ -f .env.deploy ] && . ./.env.deploy
DEPLOY_HOST="${DEPLOY_HOST:-185.226.116.88}"
DEPLOY_USER="${DEPLOY_USER:-ubuntu}"
DEPLOY_PATH="${DEPLOY_PATH:-/var/www/aramland-admin}"
DEPLOY_PASSWORD="${DEPLOY_PASSWORD:-}"
echo "▸ Building locally…"
npm run build
if [ ! -d out ]; then
echo "✗ Build did not produce ./out" >&2
exit 1
fi
# Pick the SSH command: unattended with sshpass, else interactive prompt.
ssh_cmd=(ssh -o StrictHostKeyChecking=no "$DEPLOY_USER@$DEPLOY_HOST")
if command -v sshpass >/dev/null 2>&1 && [ -n "$DEPLOY_PASSWORD" ]; then
ssh_cmd=(sshpass -p "$DEPLOY_PASSWORD" "${ssh_cmd[@]}")
else
echo " sshpass/password not available — SSH will prompt for the password."
fi
echo "▸ Uploading to $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH"
# Replace the directory contents (incl. dotfiles) then extract the new build.
tar -C out -czf - . | "${ssh_cmd[@]}" \
"set -e; mkdir -p '$DEPLOY_PATH'; find '$DEPLOY_PATH' -mindepth 1 -delete; tar -C '$DEPLOY_PATH' -xzf -"
echo "✓ Deployed to $DEPLOY_HOST:$DEPLOY_PATH"