Merge pull request #1 from dev4living/dev-website

Dev website

Author: SimuraEpona

app/Helpers/FileSystem.php

@@ -6,14 +6,14 @@ class FileSystem
 {
     public static function getFullUrl($url)
     {
-        if ($url && substr($url, 0, 4) !== 'http') {
+        if ($url && substr($url, 0, 4) !== 'http' && substr($url, 0, 8) !== '/assets/') {
             if (env('FILESYSTEM_DEFAULT') === 'qiniu' && env('QINIU_DOMAINS_CUSTOM')) {
-                return env('QINIU_DOMAINS_CUSTOM') . '/' . $url;
+                return env('QINIU_DOMAINS_CUSTOM') . $url;
             } else {
                 if (isset($_SERVER['REQUEST_SCHEME'])) {
-                    return $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'] . '/' . $url;
+                    return $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'] . $url;
                 } else {
-                    return 'http://' . $_SERVER['HTTP_HOST'] . '/' . $url;
+                    return 'http://' . $_SERVER['HTTP_HOST'] . $url;
                 }
             }
         } else {

app/Http/Controllers/Api/TimelineController.php

@@ -253,7 +253,7 @@ public function postStoreImg(Request $request)
 
         $ret = [];
         foreach($files as $k => $file) {
-            $uploadPath = 'uploads/timeline/';
+            $uploadPath = '/uploads/timeline/';
             $fileName   = date('Ymd-His_') . str_random(6) . '_' . $file->getClientOriginalName();
             $imgPath = $uploadPath . $fileName;
 

app/Http/Controllers/Api/UserController.php

@@ -137,7 +137,6 @@ public function postSignUp(Request $request)
         ) {
             $User = new User;
             $User->nickname     =   $request->nickname;
-            $User->avatar       =   'assets/images/userAvatar-default.png';
             $User->phone        =   $request->phone;
             $User->password     =   Hash::make($request->password);
 
@@ -200,7 +199,7 @@ public function postUpdateAvatar(Request $request)
         $files = $request->file('uploads');
         $file = $files[0];
 
-        $uploadPath = 'uploads/avatars/';
+        $uploadPath = '/uploads/avatars/';
         $fileName = date('Ymd-His_') . str_random(6) . '_' . $file->getClientOriginalName();
         $imgPath = $uploadPath . $fileName;
 

app/Http/Controllers/AuthController.php

@@ -28,6 +28,14 @@ public function getLogin()
         return view('auth.login');
     }
 
+    /**
+     *
+     */
+    public function getSignup()
+    {
+        return view('auth.signup');
+    }
+
     /**
      *
      */

app/Http/Controllers/TimelineController.php

@@ -19,7 +19,7 @@ class TimelineController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('auth', ['only' => ['postStore']]);
+        $this->middleware('auth', ['only' => ['postStore', 'postStoreComment']]);
     }
 
     /**
@@ -97,9 +97,12 @@ public function postStoreComment(Request $request)
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function getShow($id)
     {
-        //
+        $timeline = Timeline::findOrFail($id);
+        $users = User::limit(5)->orderByRaw('RAND()')->get();
+
+        return view('timeline.show', compact('timeline', 'users'));
     }
 
     /**

app/Http/Controllers/UserCenterController.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+
+class UserCenterController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function getIndex()
+    {
+        return redirect()->to('/ucenter/notice');
+    }
+
+    /**
+     * Notice page
+     */
+    public function getNotice()
+    {
+        return view('ucenter.notice');
+    }
+
+    /**
+     * Timeline page
+     */
+    public function getTimeline()
+    {
+        return view('ucenter.timeline');
+    }
+
+    /**
+     * Topic page
+     */
+    public function getTopic()
+    {
+        return view('ucenter.topic');
+    }
+
+}

app/Http/Controllers/UserController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+
+use Auth;
+use App\User;
+
+class UserController extends Controller
+{
+    /**
+     * Profile page
+     */
+    public function getProfile($id)
+    {
+        $user = User::findOrFail($id);
+        return view('user.profile', compact('user'));
+    }
+}

app/Http/routes.php

@@ -59,3 +59,5 @@
 Route::controller('topic', 'TopicController');
 Route::controller('activity', 'ActivityController');
 Route::controller('timeline', 'TimelineController');
+Route::controller('user', 'UserController');
+Route::controller('ucenter', 'UserCenterController');

app/TimelineImg.php

@@ -26,21 +26,6 @@ public static function getImgs($imgs)
         }
     }
 
-    /**
-     *
-     */
-    public static function getImgUrl($url)
-    {
-        $pattern = '/^http[s]?:\/\/.*/';
-        if (preg_match($pattern, $url)) {
-            return $url;
-        } else {
-            // $domain = '//public.hey-community.cn/';
-            $domain = '';
-            return $domain . $url;
-        }
-    }
-
     /**
      *
      */

app/User.php

@@ -64,16 +64,7 @@ public function timelineComments()
         return $this->hasMany('App\TimelineComment', 'user_id')->orderBy('created_at', 'desc')->with('author');
     }
 
-    /**
-     *
-     */
-    public static function getAvatarUrl($url)
-    {
-        return TimelineImg::getImgUrl($url);
-    }
-
-
-    /**
+    /*
      *
      */
     public static function getGenderName($v)

database/migrations/2014_10_12_000000_create_users_table.php

@@ -17,7 +17,7 @@ public function up()
             $table->increments('id');
             $table->string('wx_open_id', 191)->nullable();
             $table->string('nickname', 191);
-            $table->string('avatar', 191);
+            $table->string('avatar', 191)->default('/assets/images/userAvatar-default.png');
             $table->string('bio', 191);
             $table->integer('gender');
             $table->string('email', 191)->nullable();

database/seeds/TimelineImgTableSeeder.php

@@ -24,7 +24,7 @@ public function run()
 
             if (env('FAKER_IMAGE_SAVE')) {
                 $imgUrl = $faker->image(storage_path('app/uploads/timeline'));
-                $imgUrl = strstr($imgUrl, 'uploads/timeline');
+                $imgUrl = strstr($imgUrl, '/uploads/timeline');
             } else {
                 $imgUrl = $faker->imageUrl();
             }

database/seeds/UserTableSeeder.php

@@ -15,14 +15,14 @@ public function run()
 
         \App\User::create([
             'nickname'      =>      'Rod',
-            'avatar'        =>      'assets/images/userAvatar-default.png',
+            'avatar'        =>      '/assets/images/userAvatar-default.png',
             'email'         =>      'supgeek.rod@gmail.com',
             'phone'         =>      '17090402884',
             'password'      =>      bcrypt('123123'),
         ]);
         \App\User::create([
             'nickname'      =>      'Test User',
-            'avatar'        =>      'assets/images/userAvatar-default.png',
+            'avatar'        =>      '/assets/images/userAvatar-default.png',
             'email'         =>      'test@hey-community.cn',
             'phone'         =>      '12312341234',
             'password'      =>      Hash::make('123123'),
@@ -32,7 +32,7 @@ public function run()
 
             if (env('FAKER_IMAGE_SAVE')) {
                 $imgUrl = $faker->image(storage_path('app/uploads/avatars'), 300, 300, 'people');
-                $imgUrl = strstr($imgUrl, 'uploads/avatars');
+                $imgUrl = strstr($imgUrl, '/uploads/avatars');
             } else {
                 $imgUrl = $faker->imageUrl(300, 300, 'people');
             }

public/assets/img/avatar-dhg.png

@@ -23,32 +23,40 @@
 
     //
     .list-topic {
-      .avatar {
-        position: absolute;
-        width: 40px;
-        height: 40px;
-        border-radius: 50%;
-      }
-      .body {
-        margin-left: 52px;
-        overflow: hidden;
-        .title {
-          font-size: 16px;
-          font-weight: 500;
-          line-height: 20px;
-          white-space: nowrap;
-          text-overflow: ellipsis;
+      @extend %list-topic;
+    }
+  }
+}
 
-          .info {
-            position: absolute;
-            right: 18px;
-            padding-left: 1em;
-            background-color: #fff;
-            font-size: 14px;
-            font-weight: normal;
-            color: #777;
-          }
-        }
+.list-topic {
+  @extend %list-topic;
+}
+
+%list-topic {
+  .avatar {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+  }
+  .body {
+    margin-left: 52px;
+    overflow: hidden;
+    .title {
+      font-size: 16px;
+      font-weight: 500;
+      line-height: 20px;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+
+      .info {
+        position: absolute;
+        right: 18px;
+        padding-left: 1em;
+        background-color: #fff;
+        font-size: 14px;
+        font-weight: normal;
+        color: #777;
       }
     }
   }

public/assets/img/avatar-fat.jpg

@@ -3,6 +3,7 @@
 return [
     // Navigation
     'home'     => 'Home',
+    'timeline' => 'Timeline',
     'topic'    => 'Topic',
     'activity' => 'Activity',
     'logout'   => 'Logout',
@@ -68,6 +69,10 @@
     'advertise' => 'Advertise',
 
 
+    // common
+    'detail'                                =>          'Detail',
+
+
 
     //
     // topic

public/assets/img/avatar-mdo.png

@@ -3,6 +3,7 @@
 return [
     // Navigation
     'home'     => '首页',
+    'timeline' => '动态',
     'topic'    => '话题',
     'activity' => '活动',
     'logout'   => '退出',
@@ -68,6 +69,10 @@
     'advertise' => '广告',
 
 
+    // common
+    'detail'                                =>          '详情',
+
+
 
     //
     // topic