Merge branch 'laravel' into chanpter_progress

app/Http/Controllers/DhammaTermController.php

@@ -51,6 +51,7 @@ class DhammaTermController extends Controller
 									->where('word', $request->get("word"))
 									->orderBy('created_at','desc')
 									->get();
+                $count = count($result);
 				break;
             case 'hot-meaning':
                 $key='term/hot_meaning';

app/Http/Kernel.php

@@ -21,6 +21,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \App\Http\Middleware\EnableCrossRequestMiddleware::class,
     ];
 
     /**

app/Http/Middleware/EnableCrossRequestMiddleware.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class EnableCrossRequestMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+                $response = $next($request);
+        $origin = $request->server('HTTP_ORIGIN') ? $request->server('HTTP_ORIGIN') : '';
+        $allow_origin = [
+            env("CROSS_REQUEST_ALLOW_ORIGIN",'http://localhost:8001'),
+        ];
+        if (in_array($origin, $allow_origin)) {
+            $response->header('Access-Control-Allow-Origin', $origin);
+            $response->header('Access-Control-Allow-Headers', 'Origin, Content-Type, Cookie, X-CSRF-TOKEN, Accept, Authorization, X-XSRF-TOKEN');
+            $response->header('Access-Control-Expose-Headers', 'Authorization, authenticated');
+            $response->header('Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, OPTIONS');
+            $response->header('Access-Control-Allow-Credentials', 'true');
+        }
+        /*
+        ————————————————
+        原文作者：qbhy
+        转自链接：https://learnku.com/articles/6504/laravel-cross-domain-solution
+        版权声明：著作权归作者所有。商业转载请联系作者获得授权，非商业转载请保留以上作者信息和原文链接。
+        */
+        return $next($request);
+    }
+}

dashboard/.umirc.ts

@@ -6,9 +6,5 @@ export default defineConfig({
 	},
 	base: '/my/',
 	fastRefresh: {},
-	layout: {
-		name: 'wikipali',
-		locale: true,
-		layout: 'side',
-	}
+
 });

dashboard/src/pages/demo/day-4.tsx

@@ -13,62 +13,24 @@ const { Link } = Anchor;
 message.config({
 	maxCount: 4
 });
-//表数据
-const dataSource = [
-	{
-		key: '1',
-		name: 'name1',
-		age: 32,
-		adress: "西湖南路"
-	},
-	{
-		key: '2',
-		name: 'name2',
-		age: 34,
-		adress: '西湖公园'
-	},
-	{
-		key: '3',
-		name: 'name1',
-		age: 32,
-		adress: "西湖南路"
-	},
-	{
-		key: '4',
-		name: 'name2',
-		age: 34,
-		adress: '西湖公园'
-	},
-	{
-		key: '5',
-		name: 'name1',
-		age: 32,
-		adress: "西湖南路"
-	},
-	{
-		key: '6',
-		name: 'name2',
-		age: 34,
-		adress: '西湖公园'
-	}
-]
+
 //表头
 const columns = [
 	{
-		title: 'Id',
-		dataIndex: 'id',
-		key: 'id',
+		title: 'word',
+		dataIndex: 'word',
+		key: 'word',
 		render: text => <a>{text}</a>,
 	},
 	{
-		title: 'user_id',
-		dataIndex: 'user_id',
-		key: 'user_id',
+		title: '意思',
+		dataIndex: 'meaning',
+		key: 'meaning',
 	},
 	{
-		title: "title",
-		dataIndex: 'title',
-		key: 'title',
+		title: "其他意思",
+		dataIndex: 'other_meaning',
+		key: 'other_meaning',
 	}
 ]
 
@@ -101,15 +63,17 @@ export default () => {
 	const [tableData, setTableData] = useState();
 
 
-	function getTableData(){
-		fetch('https://gorest.co.in/public-api/posts')
+	function getTableData(e){
+        //let url='https://gorest.co.in/public-api/posts';
+        let url='http://127.0.0.1:8000/api/v2/terms?view=word&word=dhamma';
+		fetch(url)
 			.then(function (response) {
 				console.log("ajex:", response);
 				return response.json();
 			})
 			.then(function (myJson) {
 				console.log("ajex",myJson.data);
-				setTableData(myJson.data);
+				setTableData(myJson.data.rows);
 			});		
 	}
 	function pageChange(page: number, pagesize?: number | undefined) {
@@ -125,14 +89,15 @@ export default () => {
 			<Header className="header">
 				<div className="logo" />
 
-				<Menu onClick={handleClick} theme="dark" mode="horizontal" defaultSelectedKeys={['2']}>
+				<Menu onClick={handleClick} theme="dark" mode="horizontal" defaultSelectedKeys={['1']}>
 					<Menu.Item key="0">
 						<WidgetCommitNofifiction time={commitTime} message={commitMsg} successful={commitStatus} />
 					</Menu.Item>
-					<Menu.Item key="1" onClick={getTableData}>Palicanon</Menu.Item>
-					<Menu.Item key="2">Course</Menu.Item>
-					<Menu.Item key="3">nav 3</Menu.Item>
-					<SubMenu key="submenu" icon={<UserOutlined />} title="Others">
+					<Menu.Item key="1" >圣典</Menu.Item>
+					<Menu.Item key="2">课程</Menu.Item>
+					<Menu.Item key="3">字典</Menu.Item>
+					<Menu.Item key="3">文集</Menu.Item>
+					<SubMenu key="submenu" icon={<UserOutlined />} title="更多">
 						<Menu.ItemGroup title="group1">
 							<Menu.Item key="4">option1</Menu.Item>
 							<Menu.Item key="5">option2</Menu.Item>
@@ -148,24 +113,47 @@ export default () => {
 			</Header>
 			<Layout>
 				<Affix offsetTop={top}>
-					<Sider className="site-layout-background">
+					<Sider 
+                        className="site-layout-background"
+                        breakpoint="lg"
+                        collapsedWidth="0"
+                        onBreakpoint={broken => {
+                            console.log(broken);
+                        }}
+                        onCollapse={(collapsed, type) => {
+                            console.log(collapsed, type);
+                        }}
+                    >
 						<Menu
 							mode="inline"
 							defaultSelectedKeys={['1']}
 							defaultOpenKeys={['sub1']}
 							style={{ height: '100%', borderRight: 0 }}
+                            onClick={getTableData}
 						>
-							<SubMenu key="sub1" icon={<UserOutlined />} title="subnav 1">
-								<Menu.Item key="1">option1</Menu.Item>
-								<Menu.Item key="2">option2</Menu.Item>
-								<Menu.Item key="3">option3</Menu.Item>
-								<Menu.Item key="4">option4</Menu.Item>
+							<SubMenu key="sutta" icon={<UserOutlined />} title="经藏">
+								<Menu.Item key="dn">长部</Menu.Item>
+								<Menu.Item key="mn">中部</Menu.Item>
+								<Menu.Item key="sn">相应部</Menu.Item>
+								<Menu.Item key="an">增支部</Menu.Item>
+								<Menu.Item key="kn">小部</Menu.Item>
+							</SubMenu>
+							<SubMenu key="vinaya" icon={<UserOutlined />} title="律藏">
+								<Menu.Item key="6">分别</Menu.Item>
+								<Menu.Item key="7">篇章</Menu.Item>
+								<Menu.Item key="8">附录</Menu.Item>
+							</SubMenu>
+							<SubMenu key="abhidhamma" icon={<UserOutlined />} title="阿毗达摩藏">
+								<Menu.Item key="9">法集论</Menu.Item>
+								<Menu.Item key="10">option2</Menu.Item>
+								<Menu.Item key="11">option3</Menu.Item>
+								<Menu.Item key="12">option4</Menu.Item>
 							</SubMenu>
-							<SubMenu key="sub2" icon={<UserOutlined />} title="subnav 2">
-								<Menu.Item key="5">option1</Menu.Item>
-								<Menu.Item key="6">option2</Menu.Item>
-								<Menu.Item key="7">option3</Menu.Item>
-								<Menu.Item key="8">option4</Menu.Item>
+							<SubMenu key="others" icon={<UserOutlined />} title="其他">
+								<Menu.Item key="9">法集论</Menu.Item>
+								<Menu.Item key="10">option2</Menu.Item>
+								<Menu.Item key="11">option3</Menu.Item>
+								<Menu.Item key="12">option4</Menu.Item>
 							</SubMenu>
 						</Menu>
 					</Sider>

public/app/term/term.css

@@ -735,11 +735,11 @@ pw {
     right: 2em;
 }
 
-.sent_tran_inner:hover .tool_bar > .right {
+.sent_tran_inner:hover > .tool_bar > .right {
 	/*display: block;*/
 }
-.list_with_head:hover .tool_bar > .right {
-	/*display: block;*/
+.list_with_head:hover > .tool_bar > .right {
+	display: block;
 }
 .list_with_head {
 	position: relative;