diff --git a/.prettierrc.json b/.prettierrc.json index 48fd51f..fc1273c 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -4,7 +4,7 @@ "tabWidth": 4, "singleQuote": true, "printWidth": 100, - "trailingComma": "none", "useTabs": true, + "trailingComma": "none", "vueIndentScriptAndStyle": true -} \ No newline at end of file +} diff --git a/src/assets/icons/angle.svg b/src/assets/icons/angle.svg new file mode 100644 index 0000000..31cb922 --- /dev/null +++ b/src/assets/icons/angle.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/icons/generateSketchEdit.svg b/src/assets/icons/generateSketchEdit.svg new file mode 100644 index 0000000..862683d --- /dev/null +++ b/src/assets/icons/generateSketchEdit.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/sketchDelete.svg b/src/assets/icons/sketchDelete.svg new file mode 100644 index 0000000..626b364 --- /dev/null +++ b/src/assets/icons/sketchDelete.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/sketchRestore.svg b/src/assets/icons/sketchRestore.svg new file mode 100644 index 0000000..eb792f4 --- /dev/null +++ b/src/assets/icons/sketchRestore.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/versionDelete.svg b/src/assets/icons/versionDelete.svg new file mode 100644 index 0000000..60d20d1 --- /dev/null +++ b/src/assets/icons/versionDelete.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/icons/versionNewChat.svg b/src/assets/icons/versionNewChat.svg new file mode 100644 index 0000000..d498bb2 --- /dev/null +++ b/src/assets/icons/versionNewChat.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/versionRestore.svg b/src/assets/icons/versionRestore.svg new file mode 100644 index 0000000..51e96c2 --- /dev/null +++ b/src/assets/icons/versionRestore.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/icon/xyz.png b/src/assets/images/icon/xyz.png new file mode 100644 index 0000000..a09a06d Binary files /dev/null and b/src/assets/images/icon/xyz.png differ diff --git a/src/lang/en.ts b/src/lang/en.ts index 8fb1572..09d659e 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1,11 +1,9 @@ export default { - AlphaVersion: '2026 Alpha Version', Login: { - login: 'Log in', - register: 'Register', - signUp: 'Sign up', - loginTo: 'Log on to FiDA', - loginTitle: 'A multi-agent canvas for rapid, trend driven design iteration.', + Login: 'Log in', + SignUp: 'Sign up', + LoginTo: 'Log on to', + LoginTitle: 'A multi-agent canvas for rapid, trend driven design iteration.', name: 'Name', email: 'Email', password: 'Password', @@ -23,7 +21,7 @@ export default { agreeTermsPolicy: 'I agree to the Terms, Policy and Fees.', noAccountToSignUp: `Don't have an account? Sign up`, - signUpFor: 'Sign up for FiDA', + registerFor: 'Register for', registerTip: 'A multi-agent canvas for rapid, trend driven design iteration.', havenAccountToLogin: `Already have an account? Log in`, verifyEmail: 'Verify your email address', @@ -33,23 +31,21 @@ export default { resendCodeIn: 'Resend Code in {time}', orContinueWith: 'or continue with', googleLogin: 'Sign in with Google', - wechatLogin: 'Sign in with Wechat', - indexTip: 'A multi-agent canvas for rapid, trend driven design iteration.' + wechatLogin: 'Sign in with Wechat' }, Nuic: { - hiName: 'Hi, {name}. This is Fiphant.', - nuic1Title: `Help him discover the "YOU" in your space.`, + hiName: 'Hi, {name}.', + nuic1Title: `Help Fiphant discover the 'YOU' in your space.`, nuic1Tip: `Let's set up your profile. A few quick details will help Fiphant understand
your needs and find exactly what you're looking for.`, letsGo: 'Let’s go, Fiphant!', skip: 'Skip', next: 'Next', - nuic2Title: `What vibe do you usually go for?`, + nuic2Title: `What's your dream home vibe ?`, loadMore: 'Load more', - nuic3Title: `Where are you based? What do you do?`, + nuic3Title: `Where are you based? What do you do ?`, basedIn: 'Based in', role: 'Role', - allSet: 'All set!', - loadingTip: 'We’re customizing your dashboard.' + allSet: 'All set!' }, Home: { creditsNum: 'Credits: {num}', @@ -117,6 +113,17 @@ export default { input: 'Input', userRequest: 'User Request', sketch: 'Sketch', - generateResult: 'Generate Result' + generateResult: 'Generate Result', + linearNodeTree: 'Linear Node Tree', + branchingNodeTree: 'Branching Node Tree', + restore: 'Restore', + newChat: 'New Chat', + delete: 'Delete' + }, + //generateSketch + generateSketch: { + restore: 'Restore', + delete: 'Delete', + edit: 'Edit' } } diff --git a/src/views/canvas/components/cards/add-print.vue b/src/views/canvas/components/cards/add-print.vue new file mode 100644 index 0000000..c1907f9 --- /dev/null +++ b/src/views/canvas/components/cards/add-print.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/canvas/components/cards/color-palette.vue b/src/views/canvas/components/cards/color-palette.vue new file mode 100644 index 0000000..e4ee1ee --- /dev/null +++ b/src/views/canvas/components/cards/color-palette.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/canvas/components/cards/edit-material.vue b/src/views/canvas/components/cards/edit-material.vue new file mode 100644 index 0000000..e2ec238 --- /dev/null +++ b/src/views/canvas/components/cards/edit-material.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/views/canvas/components/card.vue b/src/views/canvas/components/cards/index.vue similarity index 71% rename from src/views/canvas/components/card.vue rename to src/views/canvas/components/cards/index.vue index 825b9eb..5bbe685 100644 --- a/src/views/canvas/components/card.vue +++ b/src/views/canvas/components/cards/index.vue @@ -1,12 +1,12 @@ \ No newline at end of file diff --git a/src/views/home/generateSketch/generateItem.vue b/src/views/home/generateSketch/generateItem.vue new file mode 100644 index 0000000..a8db8c9 --- /dev/null +++ b/src/views/home/generateSketch/generateItem.vue @@ -0,0 +1,164 @@ + + + + \ No newline at end of file diff --git a/src/views/home/generateSketch/index.vue b/src/views/home/generateSketch/index.vue new file mode 100644 index 0000000..c96924a --- /dev/null +++ b/src/views/home/generateSketch/index.vue @@ -0,0 +1,52 @@ + + + + \ No newline at end of file diff --git a/src/views/home/left-nav.vue b/src/views/home/left-nav.vue index 635cefa..7191cf9 100644 --- a/src/views/home/left-nav.vue +++ b/src/views/home/left-nav.vue @@ -7,7 +7,7 @@ - @@ -104,14 +104,20 @@ name: 'Conversation Item 5' } ]) - const onHome = () => { - console.log('onHome') + const onCreateProject = () => { + router.push({ name: 'mainInput' }) } + const onHome = () => {} const onCanvas = () => { router.push({ name: 'canvas' }) } const onHistory = () => { - showHistory.value = !showHistory.value + if (isCollapse.value) { + globalStore.setHomeLeftNavCollapse(false) + showHistory.value = true + } else { + showHistory.value = !showHistory.value + } } const onClickHistoryItem = (item: any) => { router.push({ name: 'test', params: { id: item.id } }) @@ -129,7 +135,7 @@ } } - + \ No newline at end of file diff --git a/src/views/home/versionTree/tree/view2/secondaryNode.vue b/src/views/home/versionTree/tree/view2/secondaryNode.vue index 6f86417..b2552fb 100644 --- a/src/views/home/versionTree/tree/view2/secondaryNode.vue +++ b/src/views/home/versionTree/tree/view2/secondaryNode.vue @@ -20,8 +20,8 @@ const props = defineProps<{
- +
{{ props.data.id }}
diff --git a/src/views/login/css/style.css b/src/views/login/css/style.css index d552fa6..8614e4e 100644 --- a/src/views/login/css/style.css +++ b/src/views/login/css/style.css @@ -88,8 +88,8 @@ justify-content: center; color: #252727; } -.register > .right > .box > .title::v-deep > *, -.login > .right > .box > .title::v-deep > * { +.register > .right > .box > .title:deep(*), +.login > .right > .box > .title:deep(*) { margin-left: 1rem; font-family: LBold; margin-bottom: -1rem; @@ -102,36 +102,33 @@ color: #666; margin-top: 0.5rem; } -.register > .right > .box > .el-form, -.login > .right > .box > .el-form { +.register > .right > .box:deep(.el-form), +.login > .right > .box:deep(.el-form) { margin-top: 5rem; width: 100%; -} -.register > .right > .box > .el-form::v-deep, -.login > .right > .box > .el-form::v-deep { font-family: Regular; } -.register > .right > .box > .el-form::v-deep .el-form-item, -.login > .right > .box > .el-form::v-deep .el-form-item { +.register > .right > .box:deep(.el-form) .el-form-item, +.login > .right > .box:deep(.el-form) .el-form-item { margin-bottom: 2rem; } -.register > .right > .box > .el-form::v-deep .el-form-item__label, -.login > .right > .box > .el-form::v-deep .el-form-item__label { +.register > .right > .box:deep(.el-form) .el-form-item__label, +.login > .right > .box:deep(.el-form) .el-form-item__label { color: #252727; font-size: 1.8rem; margin-bottom: 0.8rem; font-family: Medium; } -.register > .right > .box > .el-form::v-deep .el-input, -.login > .right > .box > .el-form::v-deep .el-input { +.register > .right > .box:deep(.el-form) .el-input, +.login > .right > .box:deep(.el-form) .el-input { --el-input-height: 5rem; --el-input-border-radius: 0.8rem; --el-input-text-color: #252727; --el-border-color: #dfdfdf; font-size: 1.4rem; } -.register > .right > .box > .el-form::v-deep .forgetPassword, -.login > .right > .box > .el-form::v-deep .forgetPassword { +.register > .right > .box:deep(.el-form) .forgetPassword, +.login > .right > .box:deep(.el-form) .forgetPassword { margin-top: -1.2rem; margin-bottom: 2rem; font-size: 1.6rem; @@ -140,29 +137,29 @@ cursor: pointer; text-decoration: underline; } -.register > .right > .box > .el-form::v-deep .privacy, -.login > .right > .box > .el-form::v-deep .privacy { +.register > .right > .box:deep(.el-form) .privacy, +.login > .right > .box:deep(.el-form) .privacy { --el-checkbox-height: auto; margin-bottom: 4rem; } -.register > .right > .box > .el-form::v-deep .privacy .el-checkbox__label, -.login > .right > .box > .el-form::v-deep .privacy .el-checkbox__label { +.register > .right > .box:deep(.el-form) .privacy .el-checkbox__label, +.login > .right > .box:deep(.el-form) .privacy .el-checkbox__label { font-size: 1.6rem; color: #666666; font-weight: 400; } -.register > .right > .box > .el-form::v-deep .privacy .el-checkbox__label > div > span, -.login > .right > .box > .el-form::v-deep .privacy .el-checkbox__label > div > span { +.register > .right > .box:deep(.el-form) .privacy .el-checkbox__label > div > span, +.login > .right > .box:deep(.el-form) .privacy .el-checkbox__label > div > span { text-decoration: underline; cursor: pointer; } -.register > .right > .box > .el-form::v-deep .el-form-item__error, -.login > .right > .box > .el-form::v-deep .el-form-item__error { +.register > .right > .box:deep(.el-form) .el-form-item__error, +.login > .right > .box:deep(.el-form) .el-form-item__error { padding-top: 1px; font-size: 1.4rem; } -.register > .right > .box > .el-form::v-deep .submit, -.login > .right > .box > .el-form::v-deep .submit { +.register > .right > .box:deep(.el-form) .submit, +.login > .right > .box:deep(.el-form) .submit { width: 100%; height: 6rem; background: #252727; @@ -179,8 +176,8 @@ color: #666; font-family: Regular; } -.register > .right > .box > .tip-2::v-deep > span, -.login > .right > .box > .tip-2::v-deep > span { +.register > .right > .box > .tip-2:deep(span), +.login > .right > .box > .tip-2:deep(span) { text-decoration: underline; color: #FF7A50; cursor: pointer; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 571b061..db51358 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -41,7 +41,10 @@ width: 100%; display: flex; justify-content: center; - // align-items: center; + > * { + position: relative; + z-index: 1; + } > .tip { position: absolute; width: 100%; @@ -51,6 +54,7 @@ text-align: center; font-family: Regular; color: #fff; + z-index: 0; } > .logo { width: auto; diff --git a/src/views/login/less/style.less b/src/views/login/less/style.less index da039f3..544a68a 100644 --- a/src/views/login/less/style.less +++ b/src/views/login/less/style.less @@ -85,7 +85,7 @@ justify-content: center; color: #252727; - &::v-deep>* { + &:deep(*) { margin-left: 1rem; font-family: LBold; margin-bottom: -1rem; @@ -100,76 +100,73 @@ margin-top: 0.5rem; } - >.el-form { + &:deep(.el-form) { margin-top: 5rem; width: 100%; + font-family: Regular; - &::v-deep { - font-family: Regular; + .el-form-item { + margin-bottom: 2rem; + } - .el-form-item { - margin-bottom: 2rem; - } + .el-form-item__label { + color: #252727; + font-size: 1.8rem; + margin-bottom: 0.8rem; + font-family: Medium; + } - .el-form-item__label { - color: #252727; - font-size: 1.8rem; - margin-bottom: 0.8rem; - font-family: Medium; - } + .el-input { + --el-input-height: 5rem; + --el-input-border-radius: 0.8rem; + --el-input-text-color: #252727; + --el-border-color: #dfdfdf; + font-size: 1.4rem; + } - .el-input { - --el-input-height: 5rem; - --el-input-border-radius: 0.8rem; - --el-input-text-color: #252727; - --el-border-color: #dfdfdf; - font-size: 1.4rem; - } + .forgetPassword { + margin-top: -1.2rem; + margin-bottom: 2rem; + font-size: 1.6rem; + text-align: right; + color: #666666; + cursor: pointer; + text-decoration: underline; + } - .forgetPassword { - margin-top: -1.2rem; - margin-bottom: 2rem; + + .privacy { + --el-checkbox-height: auto; + margin-bottom: 4rem; + + .el-checkbox__label { font-size: 1.6rem; - text-align: right; color: #666666; - cursor: pointer; - text-decoration: underline; - } + font-weight: 400; - - .privacy { - --el-checkbox-height: auto; - margin-bottom: 4rem; - - .el-checkbox__label { - font-size: 1.6rem; - color: #666666; - font-weight: 400; - - >div { - >span { - text-decoration: underline; - cursor: pointer; - } + >div { + >span { + text-decoration: underline; + cursor: pointer; } } } + } - .el-form-item__error { - padding-top: 1px; - font-size: 1.4rem; - } + .el-form-item__error { + padding-top: 1px; + font-size: 1.4rem; + } - .submit { - width: 100%; - height: 6rem; - background: #252727; - font-size: 2rem; - border-radius: 0.8rem; - color: #fff; - font-weight: 600; - font-family: SemiBold; - } + .submit { + width: 100%; + height: 6rem; + background: #252727; + font-size: 2rem; + border-radius: 0.8rem; + color: #fff; + font-weight: 600; + font-family: SemiBold; } } @@ -179,7 +176,7 @@ color: #666; font-family: Regular; - &::v-deep>span { + &:deep(span) { text-decoration: underline; color: #FF7A50; cursor: pointer; diff --git a/src/views/login/visible-code.vue b/src/views/login/visible-code.vue index 73aeb50..c49896b 100644 --- a/src/views/login/visible-code.vue +++ b/src/views/login/visible-code.vue @@ -73,7 +73,7 @@ font-size: 1.8rem; color: #666; font-family: Regular; - &::v-deep > span { + &:deep(span) { color: #252727; font-family: Medium; } diff --git a/src/views/nuic/index.vue b/src/views/nuic/index.vue index 7498093..6b787db 100644 --- a/src/views/nuic/index.vue +++ b/src/views/nuic/index.vue @@ -110,7 +110,7 @@ } } } - &::v-deep > .view { + &:deep(.view) { margin-top: 5rem; display: flex; flex-direction: column; diff --git a/src/views/nuic/nuic-1.vue b/src/views/nuic/nuic-1.vue index 967689a..47dbc1c 100644 --- a/src/views/nuic/nuic-1.vue +++ b/src/views/nuic/nuic-1.vue @@ -37,7 +37,7 @@ font-weight: 500; font-size: 4rem; margin-bottom: 2rem; - &::v-deep > b { + &:deep(b) { font-size: 4.8rem; font-family: MBold; } diff --git a/src/views/nuic/nuic-2.vue b/src/views/nuic/nuic-2.vue index d129c52..63717d8 100644 --- a/src/views/nuic/nuic-2.vue +++ b/src/views/nuic/nuic-2.vue @@ -43,7 +43,7 @@ font-weight: 500; font-size: 4rem; margin-bottom: 6rem; - &::v-deep > b { + &:deep(b) { font-size: 4.8rem; font-family: MBold; } diff --git a/src/views/nuic/nuic-3.vue b/src/views/nuic/nuic-3.vue index daa50ba..906044c 100644 --- a/src/views/nuic/nuic-3.vue +++ b/src/views/nuic/nuic-3.vue @@ -61,7 +61,7 @@ font-weight: 500; font-size: 4rem; margin-bottom: 9.8rem; - &::v-deep > b { + &:deep(b) { font-size: 4.8rem; font-family: MBold; } @@ -80,7 +80,7 @@ > .el-select { width: 100%; --el-border-radius-base: 0.8rem; - &::v-deep { + &:deep { font-family: Regular; .el-select__wrapper { min-height: auto;