Skip to content

Commit

Permalink
no message
Browse files Browse the repository at this point in the history
  • Loading branch information
kuaifan committed Apr 1, 2022
1 parent 8c39a81 commit 9dad51f
Show file tree
Hide file tree
Showing 12 changed files with 59 additions and 15 deletions.
25 changes: 22 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ proxy_set_header X-Forwarded-Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

# 2、Enter directory and run command
# 2、Running commands in a project
./cmd https
```

Expand All @@ -95,7 +95,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
**Note: Please back up your data before upgrading!**

```bash
# Method 1: enter directory and run command
# Method 1: Running commands in a project
./cmd update

# Or method 2: use this method if method 1 fails
Expand All @@ -108,9 +108,28 @@ git pull

If 502 after the upgrade please run `./cmd restart` restart the service.

## Transfer

Follow these steps to complete the project migration after the new project is installed:

1. Backup original database

```bash
# Run command under old project
./cmd mysql backup
```

2. Copy `database backup file` and `public/uploads` directory to the new project.

3. Restore database to new project
```bash
# Run command under new project
./cmd mysql recovery
```

## Uninstall

```bash
# Enter directory and run command
# Running commands in a project
./cmd uninstall
```
25 changes: 22 additions & 3 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ proxy_set_header X-Forwarded-Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

# 2、进入项目所在目录,运行以下命令
# 2、在项目下运行命令
./cmd https
```

Expand All @@ -96,7 +96,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
**注意:在升级之前请备份好你的数据!**

```bash
# 方法1:进入项目所在目录,运行以下命令
# 方法1:在项目下运行命令
./cmd update

# (或者)方法2:如果方法1失败请使用此方法
Expand All @@ -109,9 +109,28 @@ git pull

如果升级后出现502请运行 `./cmd restart` 重启服务即可。

## 迁移项目

在新项目安装好之后按照以下步骤完成项目迁移:

1、备份原数据库

```bash
# 在旧的项目下运行命令
./cmd mysql backup
```

2、将`数据库备份文件``public/uploads`目录拷贝至新项目

3、还原数据库至新项目
```bash
# 在新的项目下运行命令
./cmd mysql recovery
```

## 卸载项目

```bash
# 进入项目所在目录,运行以下命令
# 在项目下运行命令
./cmd uninstall
```
6 changes: 4 additions & 2 deletions electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,15 @@
{
"target": "nsis",
"arch": [
"x64"
"x64",
"arm64"
]
},
{
"target": "msi",
"arch": [
"x64"
"x64",
"arm64"
]
}
]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.12.75",
"version": "0.12.77",
"description": "DooTask is task management system.",
"scripts": {
"start": "./cmd dev",
Expand Down
2 changes: 1 addition & 1 deletion public/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/js/build/600.js → public/js/build/115.js

Large diffs are not rendered by default.

File renamed without changes.
2 changes: 1 addition & 1 deletion public/js/hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
915b2c852fe637b2
cd59275006599f5b
1 change: 1 addition & 0 deletions resources/assets/js/components/PreviewImage/view.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
border-color: #fff;
height: 44px;
width: 44px;
overflow: hidden;
position: absolute;
top: 50%;
z-index: 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div v-if="loading" class="project-load"><Loading/></div>
</div>
<ul class="project-icons">
<li class="project-avatar" @click="projectDropdown('user')">
<li class="project-avatar" :class="{'cursor-default': projectData.owner_userid !== userId}" @click="projectDropdown('user')">
<ul>
<li>
<UserAvatar :userid="projectData.owner_userid" :size="36" :borderWitdh="2" :openDelay="0">
Expand Down
3 changes: 3 additions & 0 deletions resources/assets/sass/pages/components/project-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
&:hover {
box-shadow: 0 0 6px #cccccc;
}
&.cursor-default {
cursor: default;
}
&.project-avatar {
width: auto;
min-width: 36px;
Expand Down

0 comments on commit 9dad51f

Please sign in to comment.