Skip to content

Commit

Permalink
Dev 0.4.2 app update (#107)
Browse files Browse the repository at this point in the history
Update Docker applications.
  • Loading branch information
zhanghengxin committed Feb 6, 2023
1 parent a35ee78 commit 95aca2e
Show file tree
Hide file tree
Showing 25 changed files with 1,408 additions and 958 deletions.
4 changes: 2 additions & 2 deletions .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ NODE_ENV=dev
# VUE_APP_DEV_IP=192.168.2.157
# VUE_APP_DEV_IP=192.168.2.132
#VUE_APP_DEV_IP=192.168.2.118
#VUE_APP_DEV_IP=192.168.2.231
VUE_APP_DEV_IP=192.168.2.219
#VUE_APP_DEV_IP=192.168.2.243
VUE_APP_DEV_IP=192.168.2.180
VUE_APP_DEV_PORT=80
#VUE_APP_DEV_PORT=81
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"typescript": "^4.8.3",
"useless-files-webpack-plugin": "^1.0.1",
"vue-cli-plugin-buefy": "~0.3.8",
"vue-socket.io": "^3.0.10",
"vue-template-compiler": "^2.6.11",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.9.2"
Expand Down
24 changes: 24 additions & 0 deletions src/assets/img/loading/waiting-white.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 22 additions & 3 deletions src/assets/img/waiting.svg → src/assets/img/loading/waiting.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion src/assets/lang/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,13 @@
"Installation completed": "Installation completed",
"Starting installation": "Starting installation",
"New": "New",
"NEW": "NEW",
"Check then update": "Check then update",
"At least one extra hard drive is needed for this feature.": "At least one extra hard drive is needed for this feature.",
"APP may not be available": "App may not be available",
"Please": "Please"
"Please": "Please",
"Currently is the latest version!": "Currently is the latest version!",
"{name} has been updated to the latest version!": "{name} has been updated to the latest version!",
"Unable to update at the moment!": "Unable to update at the moment!",
"Updating": "Updating"
}
15 changes: 10 additions & 5 deletions src/assets/lang/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
*
* Copyright (c) 2023 by IceWhale, All Rights Reserved.
*/
// import be_by from './be_BY.json' // Belarusian: Беларуская
import be_by from './be_BY.json' // Belarusian: Беларуская
import zh_cn from './zh_CN.json' // Chinese: 简体中文
import en_us from './en_US.json' // English: English
import fr_fr from './fr_FR.json' // French: Français
import de_de from './de_DE.json' // German: Deutsch
import hu_hu from './hu_HU.json' // Hungarian: Magyar
// import id_id from './id_ID.json' // Indonesian: Bahasa Indonesia
import id_id from './id_ID.json' // Indonesian: Bahasa Indonesia
import it_it from './it_IT.json' // Italian: Italiano
// import ko_kr from './ko_KR.json' // Korean: 한국어
import ko_kr from './ko_KR.json' // Korean: 한국어
import pl_pl from './pl_PL.json' // Polish: Polski
import pt_br from './pt_BR.json' // Portuguese: Português
import ru_ru from './ru_RU.json' // Russian: Русский
import es_es from './es_ES.json' // Spanish: Español
// import sv_se from './sv_SE.json' // Swedish: Svenska
import sv_se from './sv_SE.json' // Swedish: Svenska :瑞典语
import nb_no from './nb_NO.json' // Norwegian: Norsk
import uk_ua from './uk_UA.json' // Ukrainian: Українська

Expand All @@ -38,5 +38,10 @@ export default {
ru_ru,
es_es,
nb_no,
uk_ua
uk_ua,
sv_se,

be_by,
id_id,
ko_kr
}
11 changes: 11 additions & 0 deletions src/assets/scss/app.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*!
* @LastEditors: zhanghengxin ezreal.zhang@icewhale.org
* @LastEditTime: 2023/2/1 上午10:44
* @FilePath: /CasaOS-UI/src/assets/scss/app.scss
* @Description:
*
* Copyright (c) 2022 by IceWhale, All Rights Reserved.
*/

// Import Font
@import '~@fontsource/roboto/300.css';
@import '~@fontsource/roboto/400.css';
Expand Down Expand Up @@ -39,7 +48,9 @@
@import "common/others";
@import "common/widgets";
@import "common/sections";

@import "common/font";
@import "common/color";

// Pages and Components
@import "components/filebrowser";
19 changes: 19 additions & 0 deletions src/assets/scss/common/_images.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*!
* @LastEditors: zhanghengxin ezreal.zhang@icewhale.org
* @LastEditTime: 2023/2/1 下午4:01
* @FilePath: /CasaOS-UI/src/assets/scss/common/_images.scss
* @Description:
*
* Copyright (c) 2022 by IceWhale, All Rights Reserved.
*/

/************************************
*
* Images
Expand Down Expand Up @@ -50,12 +59,22 @@

.img-c {
.image {
cursor: pointer;
transition: all 0.3s;
}

.image.disabled {
transition: none;
}

&:hover {
.image {
transform: scale3d(1.1, 1.1, 1.1);
}

.image.disabled {
pointer-events: none;
transform: scale3d(1, 1, 1);
}
}
}
39 changes: 34 additions & 5 deletions src/assets/scss/common/_size.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,45 @@
/*!
* @LastEditors: zhanghengxin ezreal.zhang@icewhale.org
* @LastEditTime: 2023/2/1 下午4:35
* @FilePath: /CasaOS-UI/src/assets/scss/common/_size.scss
* @Description:
*
* Copyright (c) 2023 by IceWhale, All Rights Reserved.
*/

.is-size-16px {
font-size: 1rem !important;
font-size: 1rem !important;
}

.is-size-14px {
font-size: 0.875rem !important;
font-size: 0.875rem !important;
}

.is-size-12px {
font-size: 0.75rem !important;
font-size: 0.75rem !important;
}


.is-size-7 {
word-break: keep-all;
}
word-break: keep-all;
}

.is-20x20 {
width: 20px;
height: 20px;
}

.is-24x24 {
width: 24px;
height: 24px;
}

.is-32x32 {
width: 32px;
height: 32px;
}

.is-64x64 {
width: 64px;
height: 64px;
}
34 changes: 34 additions & 0 deletions src/assets/scss/common/color.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*!
* @LastEditors: zhanghengxin ezreal.zhang@icewhale.org
* @LastEditTime: 2023/2/1 上午10:43
* @FilePath: /CasaOS-UI/src/assets/scss/common/color.scss
* @Description:
*
* Copyright (c) 2022 by IceWhale, All Rights Reserved.
*/


$grey-200: hsla(208, 16%, 94%, 1);
$grey-600: hsla(208, 14%, 58%, 1);

$gray-800: hsla(208, 20%, 20%, 1);

.op80 {
opacity: 0.8;
}

.has-text-grey-200 {
color: $grey-200;
}

.has-text-grey-600 {
color: $grey-600;
}

.has-text-red {
color: hsla(18, 98%, 55%, 1) !important;
}

.has-background-gray-800 {
background-color: $gray-800;
}
12 changes: 0 additions & 12 deletions src/assets/scss/common/font.scss
Original file line number Diff line number Diff line change
Expand Up @@ -265,15 +265,3 @@

font-feature-settings: 'pnum' on, 'lnum' on;
}

.has-text-grey-200 {
color: hsla(208, 16%, 94%, 1);
}

.has-text-grey-600 {
color: hsla(208, 14%, 58%, 1);
}

.has-text-red {
color: hsla(18, 98%, 55%, 1);
}

0 comments on commit 95aca2e

Please sign in to comment.