diff --git a/cmd b/cmd index 5bc00a5c..73a0d53d 100755 --- a/cmd +++ b/cmd @@ -198,10 +198,12 @@ if [ $# -gt 0 ]; then [ -z "$(env_get APP_KEY)" ] && run_exec php "php artisan key:generate" run_exec php "php artisan migrate --seed" run_exec php "php bin/run --mode=prod" - docker-compose up -d + res=`run_exec mariadb "sh /etc/mysql/repassword.sh"` + docker-compose stop + docker-compose start echo -e "${OK} ${GreenBG} 安装完成 ${Font}" echo -e "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}" - run_exec mariadb "sh /etc/mysql/repassword.sh" + echo -e "$res" elif [[ "$1" == "update" ]]; then shift 1 git fetch --all diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss index ee298177..27fd9d66 100644 --- a/resources/assets/sass/pages/page-file.scss +++ b/resources/assets/sass/pages/page-file.scss @@ -276,57 +276,67 @@ background-repeat: no-repeat; background-size: contain; margin-right: 8px; + background-image: url("../images/file/other.svg"); } - &.upload:before { - background-image: url("../images/file/upload.svg"); - } - &.updir:before { - background-image: url("../images/file/updir.svg"); - } - &.folder:before { - background-image: url("../images/file/folder.svg"); - } - &.document:before { - background-image: url("../images/file/document.svg"); - } - &.mind:before { - background-image: url("../images/file/mind.svg"); - } - &.sheet:before { - background-image: url("../images/file/sheet.svg"); - } - &.flow:before { - background-image: url("../images/file/flow.svg"); - } - &.word:before { - background-image: url("../images/file/word.svg"); - } - &.excel:before { - background-image: url("../images/file/excel.svg"); - } - &.ppt:before { - background-image: url("../images/file/ppt.svg"); - } - &.compress:before { - background-image: url("../images/file/compress.svg"); - } - &.image:before { - background-image: url("../images/file/image.svg"); - } - &.media:before { - background-image: url("../images/file/media.svg"); - } - &.pdf:before { - background-image: url("../images/file/pdf.svg"); - } - &.text:before { - background-image: url("../images/file/text.svg"); + &.archive:before { + background-image: url("../images/file/archive.svg"); } &.cad:before { background-image: url("../images/file/cad.svg"); } - &.other:before { - background-image: url("../images/file/other.svg"); + &.code:before { + background-image: url("../images/file/code.svg"); + } + &.document:before { + background-image: url("../images/file/document.svg"); + } + &.excel:before { + background-image: url("../images/file/excel.svg"); + } + &.flow:before { + background-image: url("../images/file/flow.svg"); + } + &.folder:before { + background-image: url("../images/file/folder.svg"); + } + &.media:before { + background-image: url("../images/file/media.svg"); + } + &.mind:before { + background-image: url("../images/file/mind.svg"); + } + &.ofd:before { + background-image: url("../images/file/ofd.svg"); + } + &.pdf:before { + background-image: url("../images/file/pdf.svg"); + } + &.picture:before { + background-image: url("../images/file/picture.svg"); + } + &.ppt:before { + background-image: url("../images/file/ppt.svg"); + } + &.sheet:before { + background-image: url("../images/file/sheet.svg"); + } + &.tif:before { + background-image: url("../images/file/tif.svg"); + } + &.txt:before { + background-image: url("../images/file/txt.svg"); + } + &.updir:before { + background-image: url("../images/file/updir.svg"); + } + &.upload:before { + background-image: url("../images/file/upload.svg"); + } + &.word:before { + background-image: url("../images/file/word.svg"); + } + &.wps:before { + background-image: url("../images/file/wps.svg"); } } .taskfont { @@ -415,6 +425,7 @@ background-size: contain; margin-top: 12px; position: relative; + background-image: url("../images/file/other.svg"); .share-icon, .share-avatar { position: absolute; @@ -438,56 +449,65 @@ &.shear { opacity: 0.38; } - &.upload .file-icon { - background-image: url("../images/file/upload.svg"); - } - &.updir .file-icon { - background-image: url("../images/file/updir.svg"); - } - &.folder .file-icon { - background-image: url("../images/file/folder.svg"); - } - &.document .file-icon { - background-image: url("../images/file/document.svg"); - } - &.mind .file-icon { - background-image: url("../images/file/mind.svg"); - } - &.sheet .file-icon { - background-image: url("../images/file/sheet.svg"); - } - &.flow .file-icon { - background-image: url("../images/file/flow.svg"); - } - &.word .file-icon { - background-image: url("../images/file/word.svg"); - } - &.excel .file-icon { - background-image: url("../images/file/excel.svg"); - } - &.ppt .file-icon { - background-image: url("../images/file/ppt.svg"); - } - &.compress .file-icon { - background-image: url("../images/file/compress.svg"); - } - &.image .file-icon { - background-image: url("../images/file/image.svg"); - } - &.media .file-icon { - background-image: url("../images/file/media.svg"); - } - &.pdf .file-icon { - background-image: url("../images/file/pdf.svg"); - } - &.text .file-icon { - background-image: url("../images/file/text.svg"); + &.archive .file-icon { + background-image: url("../images/file/archive.svg"); } &.cad .file-icon { background-image: url("../images/file/cad.svg"); } - &.other .file-icon { - background-image: url("../images/file/other.svg"); + &.code .file-icon { + background-image: url("../images/file/code.svg"); + } + &.document .file-icon { + background-image: url("../images/file/document.svg"); + } + &.excel .file-icon { + background-image: url("../images/file/excel.svg"); + } + &.flow .file-icon { + background-image: url("../images/file/flow.svg"); + } + &.folder .file-icon { + background-image: url("../images/file/folder.svg"); + } + &.media .file-icon { + background-image: url("../images/file/media.svg"); + } + &.mind .file-icon { + background-image: url("../images/file/mind.svg"); + } + &.ofd .file-icon { + background-image: url("../images/file/ofd.svg"); + } + &.pdf .file-icon { + background-image: url("../images/file/pdf.svg"); + } + &.picture .file-icon { + background-image: url("../images/file/picture.svg"); + } + &.ppt .file-icon { + background-image: url("../images/file/ppt.svg"); + } + &.sheet .file-icon { + background-image: url("../images/file/sheet.svg"); + } + &.tif .file-icon { + background-image: url("../images/file/tif.svg"); + } + &.txt .file-icon { + background-image: url("../images/file/txt.svg"); + } + &.updir .file-icon { + background-image: url("../images/file/updir.svg"); + } + &.upload .file-icon { + background-image: url("../images/file/upload.svg"); + } + &.word .file-icon { + background-image: url("../images/file/word.svg"); + } + &.wps .file-icon { + background-image: url("../images/file/wps.svg"); } &.highlight { background-color: #f4f5f7; @@ -533,57 +553,67 @@ background-repeat: no-repeat; background-size: contain; margin-right: 8px; + background-image: url("../images/file/other.svg"); } - &.upload:before { - background-image: url("../images/file/upload.svg"); - } - &.updir:before { - background-image: url("../images/file/updir.svg"); - } - &.folder:before { - background-image: url("../images/file/folder.svg"); - } - &.document:before { - background-image: url("../images/file/document.svg"); - } - &.mind:before { - background-image: url("../images/file/mind.svg"); - } - &.sheet:before { - background-image: url("../images/file/sheet.svg"); - } - &.flow:before { - background-image: url("../images/file/flow.svg"); - } - &.word:before { - background-image: url("../images/file/word.svg"); - } - &.excel:before { - background-image: url("../images/file/excel.svg"); - } - &.ppt:before { - background-image: url("../images/file/ppt.svg"); - } - &.compress:before { - background-image: url("../images/file/compress.svg"); - } - &.image:before { - background-image: url("../images/file/image.svg"); - } - &.media:before { - background-image: url("../images/file/media.svg"); - } - &.pdf:before { - background-image: url("../images/file/pdf.svg"); - } - &.text:before { - background-image: url("../images/file/text.svg"); + &.archive:before { + background-image: url("../images/file/archive.svg"); } &.cad:before { background-image: url("../images/file/cad.svg"); } - &.other:before { - background-image: url("../images/file/other.svg"); + &.code:before { + background-image: url("../images/file/code.svg"); + } + &.document:before { + background-image: url("../images/file/document.svg"); + } + &.excel:before { + background-image: url("../images/file/excel.svg"); + } + &.flow:before { + background-image: url("../images/file/flow.svg"); + } + &.folder:before { + background-image: url("../images/file/folder.svg"); + } + &.media:before { + background-image: url("../images/file/media.svg"); + } + &.mind:before { + background-image: url("../images/file/mind.svg"); + } + &.ofd:before { + background-image: url("../images/file/ofd.svg"); + } + &.pdf:before { + background-image: url("../images/file/pdf.svg"); + } + &.picture:before { + background-image: url("../images/file/picture.svg"); + } + &.ppt:before { + background-image: url("../images/file/ppt.svg"); + } + &.sheet:before { + background-image: url("../images/file/sheet.svg"); + } + &.tif:before { + background-image: url("../images/file/tif.svg"); + } + &.txt:before { + background-image: url("../images/file/txt.svg"); + } + &.updir:before { + background-image: url("../images/file/updir.svg"); + } + &.upload:before { + background-image: url("../images/file/upload.svg"); + } + &.word:before { + background-image: url("../images/file/word.svg"); + } + &.wps:before { + background-image: url("../images/file/wps.svg"); } } } diff --git a/resources/assets/statics/public/images/file/other.svg b/resources/assets/statics/public/images/file/other.svg new file mode 100644 index 00000000..356c09f5 --- /dev/null +++ b/resources/assets/statics/public/images/file/other.svg @@ -0,0 +1 @@ +