hieu/chatngay_chatboard_dev
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ok

Browse Source
This commit is contained in:
hieutmd
2023-05-02 11:43:24 +07:00
parent 4770ce26d2
commit 2b491b16cd
14 changed files with 7812 additions and 24103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31696
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
src/components/ActionTabs/components/CreateOrderForm.tsx
View File

@@ -220,7 +220,7 @@ const OrderForm = ({customer_id}: {customer_id: string|number}) => {
<Form.Item
{...restField}
name={[name, 'name']}
fieldKey={[fieldKey, 'name']}
//fieldKey={[fieldKey, 'name']}
hidden
>
<Input />
@@ -229,7 +229,7 @@ const OrderForm = ({customer_id}: {customer_id: string|number}) => {
<Form.Item
{...restField}
name={[name, 'sku']}
fieldKey={[fieldKey, 'sku']}
//fieldKey={[fieldKey, 'sku']}
hidden
>
<Input />
@@ -238,7 +238,7 @@ const OrderForm = ({customer_id}: {customer_id: string|number}) => {
<Form.Item
{...restField}
name={[name, 'id']}
fieldKey={[fieldKey, 'id']}
//fieldKey={[fieldKey, 'id']}
hidden
>
<Input />
@@ -247,7 +247,7 @@ const OrderForm = ({customer_id}: {customer_id: string|number}) => {
<Form.Item
{...restField}
name={[name, 'price']}
fieldKey={[fieldKey, 'price']}
//fieldKey={[fieldKey, 'price']}
>
<Input style={{width: 90}} placeholder="giá" />
</Form.Item>
@@ -255,7 +255,7 @@ const OrderForm = ({customer_id}: {customer_id: string|number}) => {
<Form.Item
{...restField}
name={[name, 'quantity']}
fieldKey={[fieldKey, 'quantity']}
//fieldKey={[fieldKey, 'quantity']}
rules={[
{ required: true, message: 'Nhập số lượng' }
]}
@@ -302,7 +302,7 @@ const OrderForm = ({customer_id}: {customer_id: string|number}) => {
<Form.Item
{...restField}
name={[name, 'name']}
fieldKey={[fieldKey, 'name']}
//fieldKey={[fieldKey, 'name']}
rules={[{ required: true, message: 'Chưa nhập tiêu đề' }]}
>
<SelectWithAddItem current_lists={['Phí ship', 'Thuế VAT', 'Đóng gói']} />
@@ -311,7 +311,7 @@ const OrderForm = ({customer_id}: {customer_id: string|number}) => {
<Form.Item
{...restField}
name={[name, 'price']}
fieldKey={[fieldKey, 'price']}
//fieldKey={[fieldKey, 'price']}
rules={[{ required: true, message: 'price' }]}
>
<Input placeholder="giá" />

8
src/components/ConversationList/index.tsx
View File

@@ -1,6 +1,6 @@
import React, { createRef, useState } from 'react';
import debounce from "lodash/debounce";
import { Image, Input, Menu, Dropdown, Layout } from "antd";
import {Image, Input, Menu, Dropdown, Layout, InputRef} from "antd";
import classNames from "classnames";
import { useDispatch, useSelector } from 'react-redux';
@@ -25,12 +25,12 @@ const { Sider } = Layout;
//Note: this component has been well-tested, do NOT change it!!
const ConversationSearch = ({ setKeyword }: { setKeyword: (keyword: string) => void }) => {
const search_wait_time = 300; // milli seconds
const inputRef = createRef<Input>();
const inputRef = createRef<InputRef>();
const startSearch = () => {
//const time = new Date().getSeconds();
const keyword = (inputRef.current) ? inputRef.current.input.value : '';
const keyword = (inputRef.current) ? inputRef.current?.input?.value : '';
//console.log('Keyword = ' + keyword + ' at ' + time);
setKeyword(keyword);
if(keyword) setKeyword(keyword);
}
return (

6
src/components/SelectBox/SelectWithList.tsx
View File

@@ -4,16 +4,18 @@ import {isFound} from "@/lib/vietnamese";
const { Option } = Select;
const SelectWithList = (props : {options: {value: string|number, text: string}[]} & SelectProps<string> ) => {
const SelectWithList = (props : {options: {value: string|number, label: string}[]} & SelectProps<string> ) => {
const {options, ...others} = props;
return (
<Select
showSearch
optionFilterProp="children"
filterOption={(input, option) =>
// option!.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
// @ts-ignore
isFound(input, option!.children)
}
/*filterSort={(optionA, optionB) =>
@@ -23,7 +25,7 @@ const SelectWithList = (props : {options: {value: string|number, text: string}[]
{...others}
>
{
options.map(op => <Option key={op.value} value={op.value}>{op.text}</Option>)
options.map(op => <Option key={op.value} value={op.value}>{op.label}</Option>)
}
</Select>
)

6
src/components/Tagging/index.tsx
View File

@@ -1,4 +1,4 @@
import {Tag, Input, Tooltip, message} from 'antd';
import {Tag, Input, Tooltip, message, InputRef} from 'antd';
import { PlusOutlined } from '@ant-design/icons';
import React, {createRef, Fragment, useState} from "react";
@@ -64,7 +64,7 @@ const AddNewTag = ({onEnter} : {onEnter: (txt: string) => void}) => {
class EditableTagGroup extends React.Component<EditableTagGroupProps, EditableTagGroupState> {
private editInputRef: React.RefObject<Input>;
private editInputRef: React.RefObject<InputRef>;
constructor(props: EditableTagGroupProps) {
super(props);
@@ -75,7 +75,7 @@ class EditableTagGroup extends React.Component<EditableTagGroupProps, EditableTa
loadExistingList: false
}
this.editInputRef = createRef<Input>();
this.editInputRef = createRef<InputRef>();
}

2
src/config.ts
View File

@@ -20,3 +20,5 @@ export const getConnectNode = (node_id: string) => {
export const SOCKET_OPTIONS = {
}
export const CREDENTIAL_SAVE_KEY = 'chatngay-u';

6
src/constant/gender.ts
View File

@@ -1,7 +1,7 @@
const GENDER_LIST = [
{"value":"u","text":"Chưa biết"},
{"value":"f","text":"Nữ"},
{"value":"m","text":"Nam"}
{"value":"u","label":"Chưa biết"},
{"value":"f","label":"Nữ"},
{"value":"m","label":"Nam"}
];
export default GENDER_LIST;

126
src/constant/province_list.ts
View File

@@ -1,70 +1,70 @@
const PROVINCE_LIST = [
// top provinces
{"value":"ha-noi","text":"Hà Nội"},
{"value":"tp-hcm","text":"TP HCM"},
{"value":"da-nang","text":"Đà Nẵng"},
{"value":"hai-phong","text":"Hải Phòng"},
{"value":"can-tho","text":"Cần Thơ"},
{"value":"ha-noi","label":"Hà Nội"},
{"value":"tp-hcm","label":"TP HCM"},
{"value":"da-nang","label":"Đà Nẵng"},
{"value":"hai-phong","label":"Hải Phòng"},
{"value":"can-tho","label":"Cần Thơ"},
// others
{"value":"an-giang","text":"An Giang"},
{"value":"ba-ria-vung-tau","text":"Bà Rịa - Vũng Tàu"},
{"value":"bac-giang","text":"Bắc Giang"},
{"value":"bac-kan","text":"Bắc Kạn"},
{"value":"bac-lieu","text":"Bạc Liêu"},
{"value":"bac-ninh","text":"Bắc Ninh"},
{"value":"ben-tre","text":"Bến Tre"},
{"value":"binh-dinh","text":"Bình Định"},
{"value":"binh-duong","text":"Bình Dương"},
{"value":"binh-phuoc","text":"Bình Phước"},
{"value":"binh-thuan","text":"Bình Thuận"},
{"value":"ca-mau","text":"Cà Mau"},
{"value":"cao-bang","text":"Cao Bằng"},
{"value":"dak-lak","text":"Đắk Lắk"},
{"value":"dak-nong","text":"Đắk Nông"},
{"value":"dien-bien","text":"Điện Biên"},
{"value":"dong-nai","text":"Đồng Nai"},
{"value":"dong-thap","text":"Đồng Tháp"},
{"value":"gia-lai","text":"Gia Lai"},
{"value":"ha-giang","text":"Hà Giang"},
{"value":"ha-nam","text":"Hà Nam"},
{"value":"ha-tinh","text":"Hà Tĩnh"},
{"value":"hai-duong","text":"Hải Dương"},
{"value":"hau-giang","text":"Hậu Giang"},
{"value":"hoa-binh","text":"Hòa Bình"},
{"value":"hung-yen","text":"Hưng Yên"},
{"value":"khanh-hoa","text":"Khánh Hòa"},
{"value":"kien-giang","text":"Kiên Giang"},
{"value":"kon-tum","text":"Kon Tum"},
{"value":"lai-chau","text":"Lai Châu"},
{"value":"lam-dong","text":"Lâm Đồng"},
{"value":"lang-son","text":"Lạng Sơn"},
{"value":"lao-cai","text":"Lào Cai"},
{"value":"long-an","text":"Long An"},
{"value":"nam-dinh","text":"Nam Định"},
{"value":"nghe-an","text":"Nghệ An"},
{"value":"ninh-binh","text":"Ninh Bình"},
{"value":"ninh-thuan","text":"Ninh Thuận"},
{"value":"phu-tho","text":"Phú Thọ"},
{"value":"quang-binh","text":"Quảng Bình"},
{"value":"quang-nam","text":"Quảng Nam"},
{"value":"quang-ngai","text":"Quảng Ngãi"},
{"value":"quang-ninh","text":"Quảng Ninh"},
{"value":"quang-tri","text":"Quảng Trị"},
{"value":"soc-trang","text":"Sóc Trăng"},
{"value":"son-la","text":"Sơn La"},
{"value":"tay-ninh","text":"Tây Ninh"},
{"value":"thai-binh","text":"Thái Bình"},
{"value":"thai-nguyen","text":"Thái Nguyên"},
{"value":"thanh-hoa","text":"Thanh Hóa"},
{"value":"thua-thien-hue","text":"Thừa Thiên Huế"},
{"value":"tien-giang","text":"Tiền Giang"},
{"value":"tra-vinh","text":"Trà Vinh"},
{"value":"tuyen-quang","text":"Tuyên Quang"},
{"value":"vinh-long","text":"Vĩnh Long"},
{"value":"vinh-phuc","text":"Vĩnh Phúc"},
{"value":"yen-bai","text":"Yên Bái"},
{"value":"phu-yen","text":"Phú Yên"}
{"value":"an-giang","label":"An Giang"},
{"value":"ba-ria-vung-tau","label":"Bà Rịa - Vũng Tàu"},
{"value":"bac-giang","label":"Bắc Giang"},
{"value":"bac-kan","label":"Bắc Kạn"},
{"value":"bac-lieu","label":"Bạc Liêu"},
{"value":"bac-ninh","label":"Bắc Ninh"},
{"value":"ben-tre","label":"Bến Tre"},
{"value":"binh-dinh","label":"Bình Định"},
{"value":"binh-duong","label":"Bình Dương"},
{"value":"binh-phuoc","label":"Bình Phước"},
{"value":"binh-thuan","label":"Bình Thuận"},
{"value":"ca-mau","label":"Cà Mau"},
{"value":"cao-bang","label":"Cao Bằng"},
{"value":"dak-lak","label":"Đắk Lắk"},
{"value":"dak-nong","label":"Đắk Nông"},
{"value":"dien-bien","label":"Điện Biên"},
{"value":"dong-nai","label":"Đồng Nai"},
{"value":"dong-thap","label":"Đồng Tháp"},
{"value":"gia-lai","label":"Gia Lai"},
{"value":"ha-giang","label":"Hà Giang"},
{"value":"ha-nam","label":"Hà Nam"},
{"value":"ha-tinh","label":"Hà Tĩnh"},
{"value":"hai-duong","label":"Hải Dương"},
{"value":"hau-giang","label":"Hậu Giang"},
{"value":"hoa-binh","label":"Hòa Bình"},
{"value":"hung-yen","label":"Hưng Yên"},
{"value":"khanh-hoa","label":"Khánh Hòa"},
{"value":"kien-giang","label":"Kiên Giang"},
{"value":"kon-tum","label":"Kon Tum"},
{"value":"lai-chau","label":"Lai Châu"},
{"value":"lam-dong","label":"Lâm Đồng"},
{"value":"lang-son","label":"Lạng Sơn"},
{"value":"lao-cai","label":"Lào Cai"},
{"value":"long-an","label":"Long An"},
{"value":"nam-dinh","label":"Nam Định"},
{"value":"nghe-an","label":"Nghệ An"},
{"value":"ninh-binh","label":"Ninh Bình"},
{"value":"ninh-thuan","label":"Ninh Thuận"},
{"value":"phu-tho","label":"Phú Thọ"},
{"value":"quang-binh","label":"Quảng Bình"},
{"value":"quang-nam","label":"Quảng Nam"},
{"value":"quang-ngai","label":"Quảng Ngãi"},
{"value":"quang-ninh","label":"Quảng Ninh"},
{"value":"quang-tri","label":"Quảng Trị"},
{"value":"soc-trang","label":"Sóc Trăng"},
{"value":"son-la","label":"Sơn La"},
{"value":"tay-ninh","label":"Tây Ninh"},
{"value":"thai-binh","label":"Thái Bình"},
{"value":"thai-nguyen","label":"Thái Nguyên"},
{"value":"thanh-hoa","label":"Thanh Hóa"},
{"value":"thua-thien-hue","label":"Thừa Thiên Huế"},
{"value":"tien-giang","label":"Tiền Giang"},
{"value":"tra-vinh","label":"Trà Vinh"},
{"value":"tuyen-quang","label":"Tuyên Quang"},
{"value":"vinh-long","label":"Vĩnh Long"},
{"value":"vinh-phuc","label":"Vĩnh Phúc"},
{"value":"yen-bai","label":"Yên Bái"},
{"value":"phu-yen","label":"Phú Yên"}
];

18
src/lib/api.ts
View File

@@ -2,20 +2,22 @@ import axios, {AxiosResponse} from "axios";
import {SERVER_API} from "@/config";
import {ChatboxTextMessage} from "@/typings/message.d";
import {getAdminInfo} from "@/lib/user";
import {getUserCredential} from "@/lib/user";
import {APIResponse} from "@/typings/network";
import {message} from "antd";
type APIResultType = {status: 'ok'|'error', data?: any, msg?: string};
const admin_info = getAdminInfo();
//const admin_info = getAdminInfo();
const user_credentials = getUserCredential();
// reference: https://www.npmjs.com/package/axios#axios-api
const axios_instance = axios.create({
baseURL: SERVER_API,
timeout: 10000,
headers: {
Authorization: admin_info.jwt, // admin_info.jwt contains client_id & admin_id
Authorization: user_credentials, // admin_info.jwt, // admin_info.jwt contains client_id & admin_id
}
})
@@ -60,7 +62,7 @@ const get = async (endpoint: string, params?: object): Promise<APIResultType> =>
});
return formatAxiosResponse(res);
}catch (e) {
}catch (e: any) {
return {
status: 'error',
msg: e.message,
@@ -73,7 +75,7 @@ const post = async (endpoint: string, data?: object): Promise<APIResultType> =>
let res: AxiosResponse = await axios_instance.post(endpoint, data);
return formatAxiosResponse(res);
}catch (e) {
}catch (e: any) {
return {
status: 'error',
msg: e.message,
@@ -88,7 +90,7 @@ const put = async (endpoint: string, data: object, params?: object): Promise<API
});
return formatAxiosResponse(res);
}catch (e) {
}catch (e: any) {
return {
status: 'error',
msg: e.message,
@@ -103,7 +105,7 @@ const patch = async (endpoint: string, data: any, params?: object): Promise<APIR
});
return formatAxiosResponse(res);
}catch (e) {
}catch (e: any) {
return {
status: 'error',
msg: e.message,
@@ -118,7 +120,7 @@ const del = async (endpoint: string, params?: object): Promise<APIResultType> =>
});
return formatAxiosResponse(res);
}catch (e) {
}catch (e: any) {
return {
status: 'error',
msg: e.message,

8
src/lib/user.ts
View File

@@ -4,6 +4,9 @@ import {AdminInfo} from "@/typings/user";
import {actions} from "@/store/actions";
import {getConnectNode} from "@/config";
import store from "store2";
import {CREDENTIAL_SAVE_KEY} from "@/config";
let _user_last_active_time: number = 0;
@@ -13,6 +16,11 @@ let _user_last_active_time: number = 0;
}
}*/
export const getUserCredential = (): string | undefined => {
return store.has(CREDENTIAL_SAVE_KEY) ? store(CREDENTIAL_SAVE_KEY) : undefined;
}
const getAdminInfo = () : AdminInfo => {
//if(MODE === 'dev') return x as AdminInfo;
return window.admin_info || { client_id:'', id: '', name:'', jwt: '', group_id: '', node: '' };

3
src/setupProxy.js
View File

@@ -5,7 +5,8 @@ const createProxyMiddleware = require('http-proxy-middleware');
// proxy middleware options
// see: https://www.npmjs.com/package/http-proxy-middleware#http-proxy-options
const options = {
target: 'https://api195.chatngay.com/admin/', // target host
// target: 'https://api195.chatngay.com/admin/', // target host
target: 'http://local.chatngay.api/admin/', //https://api195.chatngay.com/admin/', // target host
changeOrigin: true, // needed for virtual hosted sites
//ws: true, // proxy websockets
pathRewrite: {

2
src/store/actions.ts
View File

@@ -6,7 +6,7 @@ import {Dispatch} from "redux";
import storage, {userChatHistoryStorageKey} from "@/lib/storage";
const changeUserVisibilityState = (new_state: VisibilityState) : Action => {
const changeUserVisibilityState = (new_state: DocumentVisibilityState) : Action => {
return _createAction('UPDATE_USER_VISIBILITY_STATE', new_state);
}

2
src/store/reducers.ts
View File

@@ -7,7 +7,7 @@ import {ChatboxTextMessage, ServerMessage, StatusMessageType} from "@/typings/me
import {findObjectInArray} from "@/lib/utils";
const updateUserVisibilityState = (current_state: VisibilityState = 'visible', action: Action) : VisibilityState => {
const updateUserVisibilityState = (current_state: DocumentVisibilityState = 'visible', action: Action) : DocumentVisibilityState => {
if(action.type === 'UPDATE_USER_VISIBILITY_STATE') {
return action.payload;
}

2
src/store/typing.d.ts vendored
View File

@@ -6,7 +6,7 @@ export type NetworkingStatusType = 'online' | 'offline';
export type NodeConnectionStatusType = 'ok' | 'error' | 'reconnected';
export interface AppState {
userVisibilityState: VisibilityState;
userVisibilityState: DocumentVisibilityState;
network_connection: NetworkingStatusType; // user's internet is working or not?
node_connection: NodeConnectionStatusType; // connection to node
user_list: UserInfo[];