move about page to user page

.prettierignore

@@ -1,3 +1,4 @@
+.eslintignore
 **/.gitignore
 dist/
 deploy_versions/

package.json

@@ -97,6 +97,7 @@
     "webpack": "5.78.0"
   },
   "lint-staged": {
-    "*": "prettier --write"
+    "*.ts": "prettier --write",
+    "*.tsx": "prettier --write"
   }
 }

src/app.config.ts

@@ -6,7 +6,7 @@ export default defineAppConfig({
     'pages/user/myTicket/myTicket',
     'pages/user/inform/inform',
     'pages/user/settings/settings',
-    'pages/user/settings/about/about',
+    'pages/user/about/about',
     'pages/user/report/report',
   ],
   window: {

src/assets/icons/AboutPage/about.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1709817911051" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4420" width="24" height="24" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M523.52 965.12a448 448 0 1 1 448-448 448 448 0 0 1-448 448z m0-832a384 384 0 1 0 384 384 384 384 0 0 0-384-384z" p-id="4421" fill="#c89bc7"></path><path d="M523.52 772.16a32 32 0 0 1-32-32V448a32 32 0 0 1 64 0v292.8a32 32 0 0 1-32 31.36z" p-id="4422" fill="#c89bc7"></path><path d="M523.52 293.12m-48 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0Z" p-id="4423" fill="#c89bc7"></path></svg>

src/pages/user/about/about.tsx

@@ -1,6 +1,6 @@
 import { Component, ReactNode } from 'react';
-import './about.scss';
 import { View } from '@tarojs/components';
+import './about.scss';
 
 export default class SettingsPage extends Component {
   render(): ReactNode {

src/pages/user/settings/settings.tsx

@@ -1,4 +1,4 @@
-import { AtButton, AtList, AtListItem } from 'taro-ui';
+import { AtList, AtListItem } from 'taro-ui';
 import { Component, ReactNode } from 'react';
 import Taro from '@tarojs/taro';
 import { View, Picker } from '@tarojs/components';
@@ -55,13 +55,6 @@ export default class SettingsPage extends Component {
             </AtList>
           </Picker>
         </View>
-        <AtButton type='secondary' onClick={this.handleAbout.bind(this)}>
-          {pt.get().settingsPage.aboutText}
-        </AtButton>
-
-        <AtButton type='primary' onClick={this.handleQuit.bind(this)}>
-          {pt.get().settingsPage.quitText}
-        </AtButton>
       </View>
     );
   }

src/pages/user/user.tsx

@@ -1,9 +1,10 @@
-import { View } from '@tarojs/components';
+import { AtList, AtListItem } from 'taro-ui';
 import { Component, ReactNode } from 'react';
+import { View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import type CustomTabBar from '@/custom-tab-bar';
-import { AtList, AtListItem } from 'taro-ui';
 import PageFooter from '@/components/PageFooter/PageFooter';
+import aboutIcon from '@/assets/icons/AboutPage/about.svg';
 import pt from '@/plain-text';
 import './user.scss';
 
@@ -40,6 +41,12 @@ export default class UserPage extends Component {
     });
   }
 
+  aboutPage() {
+    Taro.navigateTo({
+      url: '/pages/user/about/about',
+    });
+  }
+
   render(): ReactNode {
     return (
       <View>
@@ -48,14 +55,14 @@ export default class UserPage extends Component {
             title={pt.get().userPage.ticketColumn.title}
             note={pt.get().userPage.ticketColumn.note}
             arrow='right'
-            iconInfo={{ size: 25, color: '#E69966', value: 'clock' }}
+            iconInfo={{ color: '#E69966', value: 'clock' }}
             onClick={this.myTicketPage}
           />
           <AtListItem
             title={pt.get().userPage.infoColumn.title}
             note={pt.get().userPage.infoColumn.note}
             arrow='right'
-            iconInfo={{ size: 25, color: '#78A4FA', value: 'user' }}
+            iconInfo={{ color: '#78A4FA', value: 'user' }}
             onClick={this.informPage}
           />
           <AtListItem
@@ -63,7 +70,7 @@ export default class UserPage extends Component {
             note={pt.get().userPage.settingsColumn.note}
             extraText=''
             arrow='right'
-            iconInfo={{ size: 25, color: '#808080', value: 'filter' }}
+            iconInfo={{ color: '#808080', value: 'filter' }}
             onClick={this.settingsPage}
           />
           <AtListItem
@@ -71,9 +78,17 @@ export default class UserPage extends Component {
             note={pt.get().userPage.reportColumn.note}
             extraText=''
             arrow='right'
-            iconInfo={{ size: 25, color: '#9ACD32', value: 'message' }}
+            iconInfo={{ color: '#9ACD32', value: 'message' }}
             onClick={this.reportPage}
           />
+          <AtListItem
+            title={pt.get().userPage.aboutColumn.title}
+            note={pt.get().userPage.aboutColumn.note}
+            extraText=''
+            arrow='right'
+            thumb={aboutIcon}
+            onClick={this.aboutPage}
+          />
         </AtList>
         <PageFooter />
       </View>

src/plain-text/AboutPage.ts

@@ -0,0 +1,5 @@
+export interface AboutPageText {}
+
+export const aboutPageZhCn: AboutPageText = {};
+
+export const aboutPageEnUs: AboutPageText = {};

src/plain-text/SettingsPage.ts

@@ -1,14 +1,5 @@
-export interface SettingsPageText {
+export interface SettingsPageText {}
-  aboutText: string;
-  quitText: string;
-}
 
-export const settingsPageZhCn: SettingsPageText = {
+export const settingsPageZhCn: SettingsPageText = {};
-  aboutText: '关于 EVA Notify',
-  quitText: '退出账号',
-};
 
-export const settingsPageEnUs: SettingsPageText = {
+export const settingsPageEnUs: SettingsPageText = {};
-  aboutText: 'About EVA Notify',
-  quitText: 'Log Out',
-};

src/plain-text/UserPage.ts

@@ -17,6 +17,10 @@ export interface UserPageText {
     title: string;
     note: string;
   };
+  aboutColumn: {
+    title: string;
+    note: string;
+  };
 }
 
 export const userPageZhCn: UserPageText = {
@@ -38,6 +42,10 @@ export const userPageZhCn: UserPageText = {
     title: '意见反馈',
     note: '有什么想说的都可以告诉亦可哦！',
   },
+  aboutColumn: {
+    title: '关于我们',
+    note: '查看开发者信息',
+  },
 };
 
 export const userPageEnUs: UserPageText = {
@@ -59,4 +67,8 @@ export const userPageEnUs: UserPageText = {
     title: '意见反馈',
     note: '有什么想说的都可以告诉亦可哦！',
   },
+  aboutColumn: {
+    title: '关于我们',
+    note: '查看开发者信息',
+  },
 };

src/plain-text/index.ts

@@ -9,6 +9,7 @@ import {
 } from './SettingsPage';
 import { ReportPageText, reportPageEnUs, reportPageZhCn } from './ReportPage';
 import { InformPageText, informPageZhCn, informtPageEnUs } from './InformPage';
+import { AboutPageText, aboutPageEnUs, aboutPageZhCn } from './AboutPage';
 
 interface TextRecord {
   pageFooter: PageFooterText;
@@ -18,6 +19,7 @@ interface TextRecord {
   settingsPage: SettingsPageText;
   reportPage: ReportPageText;
   informPage: InformPageText;
+  aboutPage: AboutPageText;
 }
 
 const textZhCn: TextRecord = {
@@ -28,6 +30,7 @@ const textZhCn: TextRecord = {
   settingsPage: settingsPageZhCn,
   reportPage: reportPageZhCn,
   informPage: informPageZhCn,
+  aboutPage: aboutPageZhCn,
 };
 
 const textEnUs: TextRecord = {
@@ -38,6 +41,7 @@ const textEnUs: TextRecord = {
   settingsPage: settingsPageEnUs,
   reportPage: reportPageEnUs,
   informPage: informtPageEnUs,
+  aboutPage: aboutPageEnUs,
 };
 
 // type Lang = 'zh_CN' | 'en_US' | ...;