23 Commits

Author SHA1 Message Date
4f91309f7f update 2025-12-24 06:29:44 +06:00
bcd457e2d6 update 2025-12-24 06:20:11 +06:00
8eef4fc477 update 2025-12-24 04:39:46 +06:00
614867bd12 update 2025-12-24 04:35:41 +06:00
cdf2bf5952 update 2025-12-24 04:35:13 +06:00
a4bd6705b6 Merge branch 'master' of git.koptilnya.xyz:opti1337/chad
Some checks failed
Deploy / publish-windows (push) Has been cancelled
2025-12-24 04:03:07 +06:00
723048c72a update 2025-12-24 04:02:53 +06:00
06ea0cd488 Обновить .gitea/workflows/deploy-client.yml
Some checks failed
Deploy / publish-windows (push) Failing after 6m3s
2025-12-23 19:52:47 +00:00
007d3ddda7 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Has been cancelled
2025-12-24 00:42:07 +06:00
33cdaebada Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 3m0s
2025-12-24 00:25:30 +06:00
9650ea63fc update
Some checks failed
Deploy / publish-windows (push) Failing after 18s
2025-12-24 00:23:29 +06:00
db59b85bd2 udpate
All checks were successful
Deploy / publish-windows (push) Successful in 3m22s
2025-12-24 00:11:03 +06:00
3f6f3b739e Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 9m54s
2025-12-23 23:43:14 +06:00
b33a896117 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 4m17s
2025-12-23 23:14:44 +06:00
01ae1b5011 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 24s
2025-12-23 22:53:46 +06:00
0ac69610f2 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 26s
2025-12-23 22:52:38 +06:00
c4489b58c9 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 23s
2025-12-23 22:50:37 +06:00
c19bef73e0 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Has been cancelled
2025-12-23 22:44:24 +06:00
c573d2277a update
Some checks failed
Deploy / publish-windows (push) Failing after 23s
2025-12-23 22:42:04 +06:00
3006a82a0f update
Some checks failed
Deploy / publish-windows (push) Failing after 19m11s
2025-12-23 22:03:09 +06:00
a68aa78ae1 update
Some checks failed
Deploy / publish-windows (push) Failing after 16m16s
2025-12-23 21:45:21 +06:00
ba9f51bd5e Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 18m59s
2025-12-23 21:21:44 +06:00
89a3eac2b9 Update deploy-client.yml
Some checks failed
Deploy / publish-windows (push) Failing after 18s
2025-12-23 20:55:14 +06:00
17 changed files with 988 additions and 46 deletions

View File

@@ -1,13 +1,13 @@
name: Deploy
on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
# on:
# push:
# tags:
# - "v[0-9]+.[0-9]+.[0-9]+"
paths:
- ".gitea/workflows/deploy-client.yml"
- "client/**"
# paths:
# - ".gitea/workflows/deploy-client.yml"
# - "client/**"
jobs:
publish-windows:
@@ -36,14 +36,16 @@ jobs:
--build-arg TAURI_SIGNING_PRIVATE_KEY=${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
docker create --name chad-client-windows-container chad-client-windows-builder
docker cp chad-client-windows-container:/app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis ./nsis
mkdir -p artifacts
docker cp chad-client-windows-container:/artifacts artifacts/
docker rm chad-client-windows-container
ls -la artifacts
- name: Publish
uses: akkuman/gitea-release-action@v1
with:
files: |
nsis/**
artifacts/**
draft: true
# publish-web:

2
client/.gitattributes vendored Normal file
View File

@@ -0,0 +1,2 @@
/.yarn/releases/** binary
/.yarn/plugins/** binary

3
client/.gitignore vendored
View File

@@ -23,6 +23,7 @@ logs
.env.*
!.env.example
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
@@ -32,3 +33,5 @@ logs
scripts/release.ps1
.tauri
updater.json

Binary file not shown.

942
client/.yarn/releases/yarn-4.12.0.cjs vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1 +1,3 @@
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.12.0.cjs

View File

@@ -1,13 +1,14 @@
FROM node:lts
# === Build ===
FROM node:lts AS builder
WORKDIR /app
RUN corepack enable yarn
RUN yarn set version stable
# RUN corepack enable yarn && yarn set version stable
COPY package.json yarn.lock .yarnrc.yml ./
COPY .yarn ./.yarn
RUN yarn install
RUN yarn install --immutable
COPY . .
ARG COMMIT_SHA=unknown
@@ -19,11 +20,12 @@ ENV COMMIT_SHA=$COMMIT_SHA \
TAURI_SIGNING_PRIVATE_KEY=$TAURI_SIGNING_PRIVATE_KEY \
TAURI_SIGNING_PRIVATE_KEY_PASSWORD=
RUN apt update && apt install -y \
RUN apt update && apt install -y --no-install-recommends \
nsis \
clang \
lld \
llvm
llvm \
&& rm -rf /var/lib/apt/lists/*
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
@@ -35,6 +37,12 @@ RUN cargo install --locked cargo-xwin
RUN yarn tauri build --runner cargo-xwin --target x86_64-pc-windows-msvc
RUN node scripts/generate-updater.js
RUN node scripts/generate-updater.mjs
RUN ls -la
# === Artifacts ===
FROM scratch AS artifacts
COPY --from=builder /app/updater.json ./artifacts
COPY --from=builder /app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/ ./artifacts
CMD ["true"]

View File

@@ -13,7 +13,6 @@ declare module 'vue' {
PrimeButton: typeof import('primevue/button')['default']
PrimeButtonGroup: typeof import('primevue/buttongroup')['default']
PrimeCard: typeof import('primevue/card')['default']
PrimeFieldset: typeof import('primevue/fieldset')['default']
PrimeFloatLabel: typeof import('primevue/floatlabel')['default']
PrimeInputText: typeof import('primevue/inputtext')['default']
PrimeMenu: typeof import('primevue/menu')['default']

View File

@@ -66,11 +66,11 @@ export const useSignaling = createSharedComposable(() => {
const uri = host ? `${protocol}//${host}` : ``
socket.value = io(`http://localhost:4000/webrtc`, {
path: `/chad/ws`,
// socket.value = io(`http://localhost:4000/webrtc`, {
// path: `/chad/ws`,
socket.value = io(`${uri}/webrtc`, {
path: `${pathname}/ws`,
transports: ['websocket'],
// socket.value = io(`${uri}/webrtc`, {
// path: `${pathname}/ws`,
withCredentials: true,
auth: {
userId: me.value.id,

View File

@@ -1,7 +1,7 @@
<template>
<div class="grid grid-cols-2 h-screen">
<div class="flex flex-col shadow-xl shadow-surface-950 overflow-y-hidden">
<AppHeader title="Сиськи отвалились">
<AppHeader title="Надарики">
<template #right>
<PrimeButtonGroup class="ml-auto">
<PrimeButton

View File

@@ -7,7 +7,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
if (!isTauri.value)
return
if (from?.name)
if (from?.name || !!to.redirectedFrom)
return
const { checkForUpdates } = useUpdater()
@@ -15,6 +15,6 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
const update = await checkForUpdates()
if (update) {
return navigateTo({ name: 'Updating' })
return navigateTo({ name: 'Updater' })
}
})

View File

@@ -23,7 +23,6 @@ definePageMeta({
auth: false,
middleware: () => {
const { lastUpdate } = useUpdater()
if (!lastUpdate.value)
return navigateTo('/')
},

View File

@@ -1,11 +0,0 @@
{
"pub_date": "2025-10-19T23:31:56Z",
"version": "0.2.4",
"platforms": {
"windows-x86_64": {
"url": "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/chad_0.2.4_x64-setup.exe",
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVUMHdwTUN1SnhESjA5ekxpMGNPQURBSWVYekdEb3kxZ2tKVUNyMVRmcG9vckpsT1Fhcm9PTFp4ZVdDdEtvdWVDYWY0bkJBWjZOby9QNkNNWFJUT1VBY0tRZVNXUVl6eVEwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzYwOTE2NzE1CWZpbGU6Y2hhZF8wLjIuNF94NjQtc2V0dXAuZXhlCitPYjR2QjNxNk9HdjV1WmdnUFFWRWxraDJzUFZrd1p2bGwrcEpaWjEzZExaQUJvWWNjL1VWWFZlVG4yR2hIeDFSNzJTRk1MMDVtdGo4NGE0ckp0bERBPT0K"
}
},
"notes": ""
}

View File

@@ -29,7 +29,7 @@
"vue": "^3.5.22",
"vue-router": "^4.5.1"
},
"packageManager": "yarn@4.10.3",
"packageManager": "yarn@4.12.0",
"devDependencies": {
"@antfu/eslint-config": "^5.4.1",
"@primevue/nuxt-module": "^4.4.0",

View File

@@ -13,11 +13,11 @@ const BASE_URL = 'https://git.koptilnya.xyz/opti1337/chad/releases/download/late
const tauriConfRaw = fs.readFileSync(TAURI_CONF, 'utf8')
const tauriConf = JSON.parse(tauriConfRaw)
const version = tauriConf.package.version
const version = tauriConf.version
const SIG_FILE = path.resolve(
__dirname,
`../src-tauri/target/release/bundle/nsis/chad_${version}_x64-setup.exe.sig`,
`../src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/chad_${version}_x64-setup.exe.sig`,
)
const signature = fs.readFileSync(SIG_FILE, 'utf8').trim()

View File

@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "chad",
"version": "0.2.6",
"version": "0.2.11",
"identifier": "xyz.koptilnya.chad",
"build": {
"frontendDist": "../.output/public",

View File

@@ -1,4 +0,0 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1