Merge pull request #1050 from visuddhinanda/laravel

导出nissaya

app/Console/Commands/ExportChannel.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+use App\Models\Channel;
+
+class ExportChannel extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'export:channel';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        Storage::disk('local')->put("public/export/channel.csv", "");
+        $file = fopen(storage_path('app/public/export/channel.csv'),"w");
+        fputcsv($file,['id','name','type','language','summary','owner_id','setting','created_at']);
+        $bar = $this->output->createProgressBar(Channel::where('status',30)->count());
+        foreach (Channel::where('status',30)->select(['uid','name','type','lang','summary','owner_uid','setting','created_at'])->cursor() as $chapter) {
+            fputcsv($file,[
+                            $chapter->uid,
+                            $chapter->name,
+                            $chapter->type,
+                            $chapter->lang,
+                            $chapter->summary,
+                            $chapter->owner_uid,
+                            $chapter->setting,
+                            $chapter->created_at,
+                            ]);
+            $bar->advance();
+        }
+        fclose($file);
+        $bar->finish();
+        return 0;
+    }
+}

app/Console/Commands/ExportChapterIndex.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+use App\Models\ProgressChapter;
+
+class ExportChapterIndex extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'export:chapter.index';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'export chapter index';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        Storage::disk('local')->put("public/export/chapter.csv", "");
+        $file = fopen(storage_path('app/public/export/chapter.csv'),"w");
+        fputcsv($file,['id','book','paragraph','language','title','channel_id','progress','updated_at']);
+        $bar = $this->output->createProgressBar(ProgressChapter::count());
+        foreach (ProgressChapter::select(['uid','book','para','lang','title','channel_id','progress','updated_at'])->cursor() as $chapter) {
+            fputcsv($file,[
+                            $chapter->uid,
+                            $chapter->book,
+                            $chapter->para,
+                            $chapter->lang,
+                            $chapter->title,
+                            $chapter->channel_id,
+                            $chapter->progress,
+                            $chapter->updated_at,
+                            ]);
+            $bar->advance();
+        }
+        fclose($file);
+        $bar->finish();
+        return 0;
+    }
+}

app/Console/Commands/ExportNissaya.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+use App\Models\Channel;
+use App\Models\Sentence;
+
+class ExportNissaya extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'export:nissaya';
+    protected $my = ["ႁႏၵ","ခ္","ဃ္","ဆ္","ဈ္","ည္","ဌ္","ဎ္","ထ္","ဓ္","ဖ္","ဘ္","က္","ဂ္","စ္","ဇ္","ဉ္","ဠ္","ဋ္","ဍ္","ဏ္","တ္","ဒ္","န္","ဟ္","ပ္","ဗ္","မ္","ယ္","ရ္","လ္","ဝ္","သ္","င္","င်္","ဿ","ခ","ဃ","ဆ","ဈ","စျ","ည","ဌ","ဎ","ထ","ဓ","ဖ","ဘ","က","ဂ","စ","ဇ","ဉ","ဠ","ဋ","ဍ","ဏ","တ","ဒ","န","ဟ","ပ","ဗ","မ","ယ","ရ","႐","လ","ဝ","သ","aျ္","aွ္","aြ္","aြ","ၱ","ၳ","ၵ","ၶ","ၬ","ၭ","ၠ","ၡ","ၢ","ၣ","ၸ","ၹ","ၺ","႓","ၥ","ၧ","ၨ","ၩ","်","ျ","ႅ","ၼ","ွ","ႇ","ႆ","ၷ","ၲ","႒","႗","ၯ","ၮ","႑","kaၤ","gaၤ","khaၤ","ghaၤ","aှ","aိံ","aုံ","aော","aေါ","aအံ","aဣံ","aဥံ","aံ","aာ","aါ","aိ","aီ","aု","aဳ","aူ","aေ","အါ","အာ","အ","ဣ","ဤ","ဥ","ဦ","ဧ","ဩ","ႏ","ၪ","a္","္","aံ","ေss","ေkh","ေgh","ေch","ေjh","ေññ","ေṭh","ေḍh","ေth","ေdh","ေph","ေbh","ေk","ေg","ေc","ေj","ေñ","ေḷ","ေṭ","ေḍ","ေṇ","ေt","ေd","ေn","ေh","ေp","ေb","ေm","ေy","ေr","ေl","ေv","ေs","ေy","ေv","ေr","ea","eā","၁","၂","၃","၄","၅","၆","၇","၈","၉","၀","း","့","။","၊"];
+    protected $en = ["ndra","kh","gh","ch","jh","ññ","ṭh","ḍh","th","dh","ph","bh","k","g","c","j","ñ","ḷ","ṭ","ḍ","ṇ","t","d","n","h","p","b","m","y","r","l","v","s","ṅ","ṅ","ssa","kha","gha","cha","jha","jha","ñña","ṭha","ḍha","tha","dha","pha","bha","ka","ga","ca","ja","ña","ḷa","ṭa","ḍa","ṇa","ta","da","na","ha","pa","ba","ma","ya","ra","ra","la","va","sa","ya","va","ra","ra","္ta","္tha","္da","္dha","္ṭa","္ṭha","္ka","္kha","္ga","္gha","္pa","္pha","္ba","္bha","္ca","္cha","္ja","္jha","္a","္ya","္la","္ma","္va","္ha","ssa","na","ta","ṭṭha","ṭṭa","ḍḍha","ḍḍa","ṇḍa","ṅka","ṅga","ṅkha","ṅgha","ha","iṃ","uṃ","o","o","aṃ","iṃ","uṃ","aṃ","ā","ā","i","ī","u","u","ū","e","ā","ā","a","i","ī","u","ū","e","o","n","ñ","","","aṃ","sse","khe","ghe","che","jhe","ññe","ṭhe","ḍhe","the","dhe","phe","bhe","ke","ge","ce","je","ñe","ḷe","ṭe","ḍe","ṇe","te","de","ne","he","pe","be","me","ye","re","le","ve","se","ye","ve","re","e","o","1","2","3","4","5","6","7","8","9","0","”","’","．","，"];
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $nissaya_channel = Channel::where('type','nissaya')->select('uid')->get();
+        $channels = [];
+        foreach ($nissaya_channel as $key => $value) {
+            # code...
+            $channels[] = $value->uid;
+        }
+        $this->info('channel:'.count($channels));
+        Storage::disk('local')->put("public/export/nissaya.csv", "");
+        $file = fopen(storage_path('app/public/export/nissaya.csv'),"w");
+        $bar = $this->output->createProgressBar(Sentence::whereIn('channel_uid',$channels)->count());
+        foreach (Sentence::whereIn('channel_uid',$channels)->select('content')->cursor() as $sent) {
+            $lines = explode("\n",$sent->content);
+            foreach ($lines as $key => $line) {
+                # code...
+                if(substr_count(trim($line),'=') === 1){
+                    $nissaya_str = explode('=',$line);
+                    $pali = $this->my2en($nissaya_str[0]);
+                    fputcsv($file,[$pali,$nissaya_str[1]]);
+                    $bar->advance();
+                }
+            }
+        }
+        fclose($file);
+        $bar->finish();
+        return 0;
+    }
+
+    public function my2en($my){
+        return str_replace($this->my,$this->en,$my);
+    }
+}

app/Console/Commands/ExportSentence.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+use App\Models\Sentence;
+
+class ExportSentence extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'export:sentence';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        Storage::disk('local')->put("public/export/sentence.csv", "");
+        $file = fopen(storage_path('app/public/export/sentence.csv'),"w");
+        fputcsv($file,['id','book','paragraph','word_start','word_end','content','content_type','html','channel_id','editor_id','language','updated_at']);
+        $bar = $this->output->createProgressBar(Sentence::where('status',30)->count());
+        foreach (Sentence::where('status',30)->select(['uid','book_id','paragraph','word_start','word_end','content','content_type','channel_uid','editor_uid','language','updated_at'])->cursor() as $chapter) {
+            fputcsv($file,[
+                            $chapter->uid,
+                            $chapter->book_id,
+                            $chapter->paragraph,
+                            $chapter->word_start,
+                            $chapter->word_end,
+                            $chapter->content,
+                            $chapter->content_type,
+                            $chapter->content,
+                            $chapter->channel_uid,
+                            $chapter->editor_uid,
+                            $chapter->language,
+                            $chapter->updated_at,
+                            ]);
+            $bar->advance();
+        }
+        fclose($file);
+        $bar->finish();
+        return 0;
+    }
+}

app/Http/Controllers/CourseController.php

@@ -7,6 +7,7 @@ use App\Models\CourseMember;
 use Illuminate\Http\Request;
 use App\Http\Api\AuthApi;
 use App\Http\Api\StudioApi;
+use App\Http\Resources\CourseResource;
 
 class CourseController extends Controller
 {
@@ -28,13 +29,17 @@ class CourseController extends Controller
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的权限
-                if($user['user_uid'] !== StudioApi::getIdByName($request->get('name'))){
+                if($user['user_uid'] !== StudioApi::getIdByName($request->get('studio'))){
                     return $this->error(__('auth.failed'));
                 }
 
                 $table = Course::where('studio_id', $user["user_uid"]);
 				break;
             case 'study':
+                $user = AuthApi::current($request);
+                if(!$user){
+                    return $this->error(__('auth.failed'));
+                }
                 //我学习的课程
                 $course = CourseMember::where('user_id',$user["user_uid"])
                                       ->where('role','member')
@@ -47,6 +52,23 @@ class CourseController extends Controller
                 }
                 $table = Course::whereIn('id', $courseId);
                 break;
+            case 'teach':
+                //我任教的课程
+                $user = AuthApi::current($request);
+                if(!$user){
+                    return $this->error(__('auth.failed'));
+                }
+                $course = CourseMember::where('user_id',$user["user_uid"])
+                ->where('role','manager')
+                ->select('course_id')
+                ->get();
+                $courseId = [];
+                foreach ($course as $key => $value) {
+                    # code...
+                    $courseId[] = $value->course_id;
+                }
+                $table = Course::whereIn('id', $courseId);
+                break;
         }
         $table = $table->select($indexCol);
         if(isset($_GET["search"])){
@@ -72,12 +94,29 @@ class CourseController extends Controller
         }
         $result = $table->get();
 		if($result){
-			return $this->ok(["rows"=>$result,"count"=>$count]);
+			return $this->ok(["rows"=>CourseResource::collection($result),"count"=>$count]);
 		}else{
 			return $this->error("没有查询到数据");
 		}
     }
-
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function showMyCourseNumber(Request $request){
+        $user = AuthApi::current($request);
+        if(!$user){
+            return $this->error(__('auth.failed'));
+        }
+        //我建立的课程
+        $create = Course::where('studio_id', $user["user_uid"])->count();
+        //我学习的课程
+        $study = CourseMember::where('user_id',$user["user_uid"])
+        ->where('role','member')
+        ->count();
+        return $this->ok(['create'=>$create,'teach'=>0,'study'=>$study]);
+    }
     /**
      * Store a newly created resource in storage.
      *
@@ -92,7 +131,8 @@ class CourseController extends Controller
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        if($user['user_uid'] !== StudioApi::getIdByName($request->get('studio'))){
+        $studio_id = StudioApi::getIdByName($request->get('studio'));
+        if($user['user_uid'] !== $studio_id){
             return $this->error(__('auth.failed'));
         }
         //查询是否重复
@@ -102,9 +142,9 @@ class CourseController extends Controller
 
         $course = new Course;
         $course->title = $request->get('title');
-        $course->studio_id = $user['user_uid'];
+        $course->studio_id = $studio_id;
         $course->save();
-        return $this->ok($course);
+        return $this->ok(new CourseResource($course));
     }
 
     /**
@@ -116,7 +156,7 @@ class CourseController extends Controller
     public function show(Course $course)
     {
         //
-        return $this->ok($course);
+        return $this->ok(new CourseResource($course));
 
     }
 
@@ -135,18 +175,20 @@ class CourseController extends Controller
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        if($user['user_uid'] !== StudioApi::getIdByName($request->get('studio'))){
+        if($user['user_uid'] !== $course->studio_id){
             return $this->error(__('auth.failed'));
         }
         //查询标题是否重复
         if(Course::where('title',$request->get('title'))->where('studio_id',$user['user_uid'])->exists()){
-            return $this->error(__('validation.exists',['name']));
+            if($course->title !== $request->get('title')){
+                return $this->error(__('validation.exists',['name']));
+            }
         }
         $course->title = $request->get('title');
         $course->subtitle = $request->get('subtitle');
         $course->cover = $request->get('cover');
         $course->content = $request->get('content');
-        $course->teacher = $request->get('teacher');
+        $course->teacher = $request->get('teacher_id');
         $course->start_at = $request->get('start_at');
         $course->end_at = $request->get('end_at');
         $course->save();

app/Http/Controllers/CourseMemberController.php

@@ -3,9 +3,11 @@
 namespace App\Http\Controllers;
 
 use App\Models\CourseMember;
+use App\Models\Course;
 use Illuminate\Http\Request;
 use App\Http\Resources\CourseMemberResource;
 use App\Http\Api\AuthApi;
+use Illuminate\Support\Facades\Log;
 
 class CourseMemberController extends Controller
 {
@@ -18,12 +20,12 @@ class CourseMemberController extends Controller
     {
         //
         $result=false;
-		$indexCol = ['id','user_id','course_id','role','status','updated_at','created_at'];
+		$indexCol = ['id','user_id','course_id','role','updated_at','created_at'];
 		switch ($request->get('view')) {
             case 'course':
 	            # 获取 course 内所有 成员
                 $user = AuthApi::current($request);
-                if($user){
+                if(!$user){
                     return $this->error(__('auth.failed'));
                 }
                 //TODO 判断当前用户是否有指定的 course 的权限
@@ -49,8 +51,30 @@ class CourseMemberController extends Controller
         }
         $result = $table->get();
 
+        //获取当前用户角色
+        $isOwner = Course::where('id',$request->get('id'))->where('studio_id',$user["user_uid"])->exists();
+        $role = 'unknown';
+        if($isOwner){
+            $role = 'owner';
+        }else{
+            foreach ($result as $key => $value) {
+            # 找到当前用户
+            if($user["user_uid"]===$value->user_id){
+                switch ($value->role) {
+                    case 'assistant':
+                        $role = 'manager';
+                        break;
+                    default:
+                        # code...
+                        break;
+                }
+                break;
+            }
+        }
+        }
+
 		if($result){
-			return $this->ok(["rows"=>GroupMemberResource::collection($result),"count"=>$count]);
+			return $this->ok(["rows"=>CourseMemberResource::collection($result),'role'=>$role,"count"=>$count]);
 		}else{
 			return $this->error("没有查询到数据");
 		}
@@ -119,17 +143,24 @@ class CourseMemberController extends Controller
     {
         //查看删除者有没有删除权限
         //查询删除者的权限
-        $currUser = AuthApi::current($request);
-        if(!$currUser){
+        $user = AuthApi::current($request);
+        if(!$user){
             return $this->error(__('auth.failed'));
         }
 
-        $currUser = CourseMember::where('course_id',$courseMember->course_id)
-                        ->where('user_id',$currUser["user_uid"])
-                        ->select('role')->first();
-        if(!$currUser || $currUser->role ==="member"){
-            //普通成员没有删除权限
-            return $this->error(__('auth.failed'));
+
+        Log::info('course'.$courseMember->course_id);
+        Log::info('user id'.$user["user_uid"]);
+
+        $isOwner = Course::where('id',$courseMember->course_id)->where('studio_id',$user["user_uid"])->exists();
+        if(!$isOwner){
+            $courseUser = CourseMember::where('course_id',$courseMember->course_id)
+                ->where('user_id',$user["user_uid"])
+                ->select('role')->first();
+           if(!$courseUser || $courseUser->role ==="student"){
+                //普通成员没有删除权限
+                return $this->error(__('auth.failed'));
+            }
         }
 
         $delete = $courseMember->delete();

app/Http/Controllers/ExportWbwController.php

@@ -57,14 +57,15 @@ class ExportWbwController extends Controller
                     $style = $word->style->__toString();
                     if($type !== '.ctl.' && $style !== 'note'){
                         $sent['data'][]=[
-                        'pali'=>$word->real->__toString(),
-                    'mean' => $word->mean->__toString(),
-                    'type' => ltrim($type,'.'),
-                    'grammar' => ltrim(str_replace('$.',',',$word->gramma->__toString()),'.') ,
-                    'parent' => $word->parent->__toString(),
-                    'factors' => $word->org->__toString(),
-                    'factormeaning' => $word->om->__toString()
-                    ];
+                            'pali'=>$word->real->__toString(),
+                            'mean' => $word->mean->__toString(),
+                            'type' => ltrim($type,'.'),
+                            'grammar' => ltrim(str_replace('$.',',',$word->gramma->__toString()),'.') ,
+                            'case' => ltrim(str_replace(['$.','#.'],[' ',' '],$word->case->__toString()),'.') ,
+                            'parent' => $word->parent->__toString(),
+                            'factors' => $word->org->__toString(),
+                            'factormeaning' => $word->om->__toString()
+                        ];
                     }
 
                 }

app/Http/Controllers/WbwLookupController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\UserDict;
+use App\Models\DictInfo;
 use App\Models\WbwTemplate;
 use Illuminate\Http\Request;
 use App\Tools\CaseMan;
@@ -37,6 +38,16 @@ class WbwLookupController extends Controller
     {
         //
 		$startAt = microtime(true);
+
+        /**
+         * 先查询字典名称
+         */
+        $dict_info = DictInfo::whereIn('id',$this->dictList)->select('id','shortname')->get();
+        $dict_name = [];
+        foreach ($dict_info as $key => $value) {
+            # code...
+            $dict_name[$value->id] = $value->shortname;
+        }
 		$caseman = new CaseMan();
 		$output  = array();
 		$wordPool = array();
@@ -51,16 +62,21 @@ class WbwLookupController extends Controller
 			$deep = $request->get("deep");
 		}
 		for ($i=0; $i < $deep; $i++) {
-			# code...
+			# 查询深度
 			foreach ($wordPool as $word => $info) {
 				# code...
-				if($info['done'] == false){
+				if($info['done'] === false){
 					$wordPool[$word]['done'] = true;
 					$count = 0;
 					foreach ($this->dictList as  $dictId) {
 						# code...
-						$result = Cache::remember("dict/{$dictId}/".$word,1000,function() use($word,$dictId){
-							return UserDict::where('word',$word)->where('dict_id',$dictId)->orderBy('confidence','desc')->get();
+						$result = Cache::remember("dict/{$dictId}/".$word,10,function() use($word,$dictId,$dict_name){
+                            $data = UserDict::where('word',$word)->where('dict_id',$dictId)->orderBy('confidence','desc')->get();
+                            foreach ($data as $key => $value) {
+                                # code...
+                                $value->dict_shortname  = $dict_name[$dictId];
+                            }
+							return $data;
 						});
 						$count += count($result);
 						if(count($result)>0){

app/Http/Resources/CourseMemberResource.php

@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Api\UserApi;
 
 class CourseMemberResource extends JsonResource
 {
@@ -14,6 +15,14 @@ class CourseMemberResource extends JsonResource
      */
     public function toArray($request)
     {
-        return parent::toArray($request);
+        return [
+            "id"=>$this->id,
+            "user_id"=> $this->user_id,
+            "course_id"=> $this->course_id,
+            "role"=> $this->role,
+            "user"=> UserApi::getById($this->user_id),
+            "created_at"=> $this->created_at,
+            "updated_at"=> $this->updated_at,
+        ];
     }
 }

app/Http/Resources/CourseResource.php

@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Api\UserApi;
 
 class CourseResource extends JsonResource
 {
@@ -14,6 +15,21 @@ class CourseResource extends JsonResource
      */
     public function toArray($request)
     {
-        return parent::toArray($request);
+        return [
+            "id"=>$this->id,
+            "title"=> $this->title,
+            "subtitle"=> $this->subtitle,
+            "teacher"=> UserApi::getById($this->teacher),
+            "course_count"=>10,
+            "type"=> 1,
+            "anthology_id"=> '',
+            "start_at"=> $this->start_at,
+            "end_at"=> $this->end_at,
+            "content"=> $this->content,
+            "content_type"=> $this->content_type,
+            "cover"=> $this->cover,
+            "created_at"=> $this->created_at,
+            "updated_at"=> $this->updated_at,
+        ];
     }
 }

app/Models/Course.php

@@ -8,4 +8,10 @@ use Illuminate\Database\Eloquent\Model;
 class Course extends Model
 {
     use HasFactory;
+    protected $primaryKey = 'id';
+    protected $casts = [
+        'id' => 'string'
+    ];
+    public  $incrementing = false;
+
 }

resources/views/export_wbw.blade.php

@@ -22,6 +22,7 @@
             <b>{{$wbw["pali"]}}</b>
             <span>{{$wbw["type"]}}</span>
             <span>{{$wbw["grammar"]}}</span>
+            <span>{{$wbw["case"]}}</span>
             <span> of </span>
             <span>{{$wbw["parent"]}}</span>
             <span>{{$wbw["mean"]}}</span>

routes/api.php

@@ -90,6 +90,7 @@ Route::group(['prefix' => 'v2'],function(){
     Route::apiResource('wbwlookup',WbwLookupController::class);
     Route::apiResource('course',CourseController::class);
     Route::apiResource('course-member',CourseMemberController::class);
+    Route::get('course-my-course', [CourseController::class, 'showMyCourseNumber']);
 
 
     Route::get('guide/{lang}/{file}', function ($lang,$file) {

routes/web.php

@@ -19,15 +19,6 @@ Route::redirect('/', '/app/pcdl/index.php');
 Route::redirect('/app', '/app/pcdl/index.php');
 Route::redirect('/app/pcdl', '/app/pcdl/index.php');
 
-Route::get('/user/{id}', function ($id) {
-    return 'User '.$id;
-});
-
-Route::get('/home/{name}', function ($name) {
-    return view('home', ['name' => $name]);
-});
-
-
 Route::get('/api/sentence/progress/image', [SentenceInfoController::class,'showprogress']);
 Route::get('/api/sentence/progress/daily/image', [SentenceInfoController::class,'showprogressdaily']);
 Route::get('/wbwanalyses', [WbwAnalysisController::class,'index']);