-
+
-
@@ -89,7 +95,7 @@ import thingAlbum from '@/assets/svgs/thing-album.svg';
import recyclingbin from '@/assets/svgs/recyclingbin.svg';
import Folder from "@/components/Folder/Folder.vue";
import ai from '@/assets/svgs/ai.svg';
-
+import share from '@/assets/svgs/share.svg';
const {t} = useI18n();
const router = useRouter();
diff --git a/src/layout/default/Sidebar/index.scss b/src/layout/default/Sidebar/index.scss
index d617b21..9b155e4 100644
--- a/src/layout/default/Sidebar/index.scss
+++ b/src/layout/default/Sidebar/index.scss
@@ -1,6 +1,6 @@
.sidebar {
width: 220px;
- height: calc(100vh - 275px);
+ height: calc(100vh - 271px);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
overflow-y: scroll;
overflow-x: hidden;
@@ -22,6 +22,7 @@
justify-content: center;
align-items: flex-start;
border-top: 1px solid #e8e8e8;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
.sidebar-folder-text-title {
diff --git a/src/locales/index.ts b/src/locales/index.ts
index 13079e1..3655091 100644
--- a/src/locales/index.ts
+++ b/src/locales/index.ts
@@ -9,12 +9,21 @@ const messages = {
};
const language: string = (navigator.language || 'en').toLocaleLowerCase(); // 获取浏览器的语言
+function getLanguage(): string | null {
+ let lang: string | null = null;
+ const langStr: string | null = localStorage.getItem('lang');
+ if (langStr) {
+ lang = JSON.parse(langStr).lang;
+ }
+ return lang;
+}
+
const i18n: any = createI18n({
legacy: false,
compositionOnly: false,
globalInjection: true,
silentTranslationWarn: true,
- locale: language.split('-')[0] || 'zh',
+ locale: getLanguage() || language.split('-')[0] || 'zh', // 首先从缓存里拿，没有的话就用浏览器语言，
silentFallbackWarn: true,
missingWarn: true,
fallbackWarn: false,
diff --git a/src/locales/language/en.ts b/src/locales/language/en.ts
index 2665540..27a82c4 100644
--- a/src/locales/language/en.ts
+++ b/src/locales/language/en.ts
@@ -129,5 +129,7 @@ export default {
locationAlbums: 'Location',
thingsAlbums: 'Things',
recyclingBin: 'Recycling Bin',
+ upscale: 'Image Inpainting',
+ share: 'Quickly Share'
}
};
diff --git a/src/locales/language/zh.ts b/src/locales/language/zh.ts
index ebb86ba..81313d5 100644
--- a/src/locales/language/zh.ts
+++ b/src/locales/language/zh.ts
@@ -116,6 +116,8 @@ export default {
locationAlbums: '地点',
thingsAlbums: '事物',
recyclingBin: '回收站',
+ upscale: '图像修复',
+ share: '快传'
}
};
diff --git a/src/router/modules/main_router.ts b/src/router/modules/main_router.ts
index 545b59c..ab3031b 100644
--- a/src/router/modules/main_router.ts
+++ b/src/router/modules/main_router.ts
@@ -15,7 +15,25 @@ export default [
children: [
...photo,
...albums,
- ...recycling_bin
+ ...recycling_bin,
+ {
+ path: '/main/photo/upscale',
+ name: 'upscale',
+ component: () => import('@/views/Upscale/Upscale.vue'),
+ meta: {
+ requiresAuth: false,
+ title: '图像修复'
+ }
+ },
+ {
+ path: '/main/photo/share',
+ name: 'share',
+ component: () => import('@/views/ImageShare/ImageShare.vue'),
+ meta: {
+ requiresAuth: false,
+ title: '快传'
+ }
+ }
]
}
diff --git a/src/router/modules/notFound.ts b/src/router/modules/not_found.ts
similarity index 100%
rename from src/router/modules/notFound.ts
rename to src/router/modules/not_found.ts
diff --git a/src/router/router.ts b/src/router/router.ts
index 51a7d85..dd442d9 100644
--- a/src/router/router.ts
+++ b/src/router/router.ts
@@ -3,7 +3,7 @@ import login from './modules/login';
import useStore from "@/store";
import {message} from "ant-design-vue";
-import notFound from "./modules/notFound.ts";
+import notFound from "./modules/not_found.ts";
import landing from "./modules/landing.ts";
import mainRouter from "./modules/main_router.ts";
import i18n from "@/locales";
diff --git a/src/utils/alova/adapter/localforageStorageAdapter.ts b/src/utils/alova/adapter/localforageStorageAdapter.ts
index eff7e1f..d743c8d 100644
--- a/src/utils/alova/adapter/localforageStorageAdapter.ts
+++ b/src/utils/alova/adapter/localforageStorageAdapter.ts
@@ -2,24 +2,17 @@ import localforage from "localforage";
export const localforageStorageAdapter = {
- set(key: string, value: any) {
- localforage.setItem(key, value).then();
+ async set(key: string, value: any) {
+ await localforage.setItem(key, value);
},
- get(key: string) {
- let value: any;
- localforage.getItem(key).then((res: any) => {
- if (res === null || res === undefined || res === "") {
- value = "";
- } else {
- value = res;
- }
- });
- return value ? JSON.parse(value) : value;
+ async get(key: string) {
+ const res: any = await localforage.getItem(key);
+ return res ? JSON.parse(res) : null;
},
- remove(key: any) {
- localforage.removeItem(key).then();
+ async remove(key: any) {
+ await localforage.removeItem(key);
},
- clear() {
- localforage.clear().then();
+ async clear() {
+ await localforage.clear();
}
};
diff --git a/src/views/ImageShare/ImageShare.vue b/src/views/ImageShare/ImageShare.vue
new file mode 100644
index 0000000..db3c841
--- /dev/null
+++ b/src/views/ImageShare/ImageShare.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/src/views/ImageShare/index.scss b/src/views/ImageShare/index.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/Login/LoginFooter.vue b/src/views/Login/LoginFooter.vue
index e7212a0..7aad1b7 100644
--- a/src/views/Login/LoginFooter.vue
+++ b/src/views/Login/LoginFooter.vue
@@ -2,7 +2,8 @@
- {{ t("login.qrLogin") }}
+
+ {{ t("login.qrLogin") }}