diff --git a/conf/app.php b/conf/app.php index 25fc81d..29e195f 100644 --- a/conf/app.php +++ b/conf/app.php @@ -14,7 +14,7 @@ $configs = array( //并自动把用户ID加入到数据目录content_directory路径后面 'multipleUserUriParse' => false, //只有上面这个开关开启，此默认用户ID才会被使用 - 'defaultUserId' => '1000', + 'defaultUserId' => '', //文档站皮肤 //'content_directory' => 'content/', //directory of contents in /www/ diff --git a/conf/custom_config_tajian.json b/conf/custom_config_tajian.json index d1b01b4..fe3e171 100644 --- a/conf/custom_config_tajian.json +++ b/conf/custom_config_tajian.json @@ -2,7 +2,7 @@ "theme": "tajian", "content_directory": "tajian/", "multipleUserUriParse": true, - "defaultUserId": "1000", + "defaultUserId": "", "heroUnionEnable": true, "heroUnion": { "server_url": "https://herounion.filesite.io", diff --git a/themes/tajian/controller/FrontapiController.php b/themes/tajian/controller/FrontapiController.php index 356c6b6..cb44fc4 100644 --- a/themes/tajian/controller/FrontapiController.php +++ b/themes/tajian/controller/FrontapiController.php @@ -361,20 +361,15 @@ eof; return $this->renderJson(compact('code', 'msg', 'err')); } - //TODO: 采用邀请制注册 - //新用户注册 - public function actionRegister() { - - } - - //用户登陆 - public function actionLogin() { - + //TODO: 把自己的收藏视频压缩成zip包 + protected function createZip() { + } - //打包下载自己的收藏记录 + //TODO: 打包下载自己的收藏记录 public function actionDownloadfavs() { - + $this->createZip(); + exit; } } diff --git a/themes/tajian/controller/SiteController.php b/themes/tajian/controller/SiteController.php index bda5e7e..56507f5 100644 --- a/themes/tajian/controller/SiteController.php +++ b/themes/tajian/controller/SiteController.php @@ -12,6 +12,16 @@ Class SiteController extends Controller { throw new Exception('Please install php extension php-mbstring first!', 500); } + //如果没有开启多用户支持，或者当前用户不为空 + if (empty(FSC::$app['config']['multipleUserUriParse']) || !empty(FSC::$app['user_id'])) { + return $this->renderFavVideos(); + }else { + return $this->renderTajianIndex(); + } + } + + //显示当前用户收藏的视频 + protected function renderFavVideos() { //获取数据 $menus = array(); //菜单，一级目录 $htmlReadme = ''; //Readme.md 内容，底部网站详细介绍 @@ -79,6 +89,18 @@ Class SiteController extends Controller { return $this->render($viewName, $params, $pageTitle); } + //显示TA荐首页 + protected function renderTajianIndex() { + $pageTitle = "Ta荐：好用的视频收藏夹，分享精彩视频给朋友，帮TA节省刷视频的时间吧！"; + + $this->layout = 'index'; + $viewName = 'tajian'; + $params = compact( + 'pageTitle' + ); + return $this->render($viewName, $params, $pageTitle); + } + //获取tag分类 protected function getTags($dirTree, $noFiles = false) { $tags = array(); @@ -194,5 +216,15 @@ Class SiteController extends Controller { return $this->render($viewName, $params, $pageTitle); } + //TODO: 采用邀请制注册 + //新用户注册 + public function actionRegister() { + + } + + //用户登陆 + public function actionLogin() { + + } } diff --git a/themes/tajian/views/layout/index.php b/themes/tajian/views/layout/index.php new file mode 100644 index 0000000..77264d4 --- /dev/null +++ b/themes/tajian/views/layout/index.php @@ -0,0 +1,57 @@ + + + + +<?php echo $pageTitle;?> + + + + + + +
+
+ + Ta荐 + - TaJian.tv + +
+ + + +
+
+ + Theme name +
+ + ©FileSite.io 2022 - execute time: {page_time_cost} ms +
+ 数据采集由 + HeroUnion英雄联盟 + 提供技术支持 +
+ 从GitHub下 Machete源码 快速克隆本站 +
+
+
+ + + + + + diff --git a/themes/tajian/views/layout/main.php b/themes/tajian/views/layout/main.php index 858d002..d5d6f6c 100644 --- a/themes/tajian/views/layout/main.php +++ b/themes/tajian/views/layout/main.php @@ -117,11 +117,11 @@ if (!empty($viewFile) && file_exists($viewFile)) { ©FileSite.io 2022 - execute time: {page_time_cost} ms
- 下Machete源码搭建私有网址导航、文档、图片、视频网站 -
数据采集由 HeroUnion英雄联盟 提供技术支持 +
+ 从GitHub下 Machete源码 快速克隆本站 diff --git a/themes/tajian/views/site/index.php b/themes/tajian/views/site/index.php index d94e8a8..ea8e077 100644 --- a/themes/tajian/views/site/index.php +++ b/themes/tajian/views/site/index.php @@ -85,4 +85,4 @@ eof; } ?> - + diff --git a/themes/tajian/views/site/tajian.php b/themes/tajian/views/site/tajian.php new file mode 100644 index 0000000..84a9bd9 --- /dev/null +++ b/themes/tajian/views/site/tajian.php @@ -0,0 +1,65 @@ + + +
+

+ 一个好用的视频收藏夹 + - 分享喜欢的视频给朋友，帮TA节省刷视频的时间吧！ +

+ +
+
+ + Create your favorite tajian link. +
+ 创建专属收藏夹 + +
+
+ + Download machete source code +
+ 下载Machete源码 + +
+
+ +

使用方法

+
+ 1. 点上面“创建专属收藏夹”， +
    用手机号码 + 邀请码（朋友手机号码末6位）注册 + +     还可以加客服微信索要注册邀请码 + Ta荐客服微信二维码 + + 2. 用手机号码 登录 + + 3. 从各大视频App、网站复制分享链接 +
+ 4. 在“添加”里粘贴后保存 +
+ 5. 分享你的专属链接给朋友 +
+ +

支持的视频App/网站

+ +

其它App和网站将陆续增加。。。

+ +
diff --git a/www/css/tajian.css b/www/css/tajian.css index 2ac7047..d6a6ef2 100644 --- a/www/css/tajian.css +++ b/www/css/tajian.css @@ -23,6 +23,25 @@ a:link{text-decoration:none;} .breadcrumbs{padding-left:1em;padding-top:1em} .footer{margin:7em auto 6em auto;text-align:center} +/* TaJian首页 */ +.tajian_index{max-width:640px;margin:0 auto;padding:10px} +.tajian_index .h1title{margin-top:65px;font-size:17px;color:#444} +.tajian_index .h3title{margin-top:30px;margin-bottom:10px;padding-bottom:8px;border-bottom:1px solid #DDD} +.tajian_index .ulist{margin-top:10px} +.tajian_index .ulist li{list-style:circle;margin-left:26px;padding-left:8px;line-height:1.8} +.tajian_index .btns{margin-top:30px;text-align:center} +.tajian_index .btns img{width:90px;opacity:0.8} +.tajian_index .btns .favbtn{float:left;width:50%} +.tajian_index .btns .downbtn{float:right;width:50%} +.tajian_index .btns a{color:#3e3edc} +.tajian_index .btns a:hover{color:blue} +.tajian_index .btns a:hover img{opacity:1} +.tajian_index .pl20{padding-left:20px} +.tajian_index .pt20{padding-top:20px} +.tajian_index .lh18{line-height:1.8} +.tajian_index .kfwx{float:right;border-radius:6px} +.tajian_index .loginbtn{border:1px solid #50509d;background-color:#50509d;color:#FFF;padding:3px 10px;border-radius:4px} + /* 首页 start*/ .g_app_lay{padding:56px 0 0 200px;} /* 顶部导航 */ @@ -219,6 +238,10 @@ a:link{text-decoration:none;} .menu_ls>a{flex:1;text-align:center;padding:10px 0;margin:0;} .menu_ls>a img{margin:0;} .g_form_style{padding:0 12% 0 10%;width:100%;} + .tajian_index .h1title small{display:block} + .tajian_index .kfwx{float:none;width:130px;display:block;margin-left:1em} + .tajian_index .loginbtn{display:block;width:80%;margin-left:1em;text-align:center} + .hidden-xs{display:none} } .hide{display:none} diff --git a/www/img/download.png b/www/img/download.png new file mode 100644 index 0000000..54b2a9c Binary files /dev/null and b/www/img/download.png differ diff --git a/www/img/favorite.png b/www/img/favorite.png new file mode 100644 index 0000000..f50f6f6 Binary files /dev/null and b/www/img/favorite.png differ diff --git a/www/img/info.svg b/www/img/info.svg new file mode 100644 index 0000000..3c55b88 --- /dev/null +++ b/www/img/info.svg @@ -0,0 +1,4 @@ + +