From b777ecdc0236631254fcbe75851de75e2d134d32 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Fri, 27 Apr 2018 20:08:57 +0200
Subject: Began image feed implementation

---
 main/app/sprinkles/admin/routes/users.php          |  2 +
 .../sprinkles/core/assets/SiteAssets/css/main.css  | 12 ++--
 .../core/src/Controller/CoreController.php         | 12 ++--
 .../sprinkles/core/templates/pages/index.html.twig | 65 +++++++++++-----------
 4 files changed, 49 insertions(+), 42 deletions(-)

(limited to 'main/app/sprinkles')

diff --git a/main/app/sprinkles/admin/routes/users.php b/main/app/sprinkles/admin/routes/users.php
index f1b2243..ece5757 100644
--- a/main/app/sprinkles/admin/routes/users.php
+++ b/main/app/sprinkles/admin/routes/users.php
@@ -25,6 +25,8 @@ $app->group('/api/users', function () {
 
     $this->get('/u/{user_name}/activities', 'UserFrosting\Sprinkle\Admin\Controller\UserController:getActivities');
 
+    $this->get('/u/{user_name}/posts', 'UserFrosting\Sprinkle\Admin\Controller\UserController:getActivities');
+
     $this->get('/u/{user_name}/roles', 'UserFrosting\Sprinkle\Admin\Controller\UserController:getRoles');
 
     $this->get('/u/{user_name}/permissions', 'UserFrosting\Sprinkle\Admin\Controller\UserController:getPermissions');
diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
index 01ec6b1..0ca1d7b 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css
+++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
@@ -35,10 +35,6 @@ html, body {
     border: 0;
 }
 
-.main {
-    height: 100%;
-}
-
 a {
     text-decoration: none;
     color: #4a93c0;
@@ -54,11 +50,19 @@ hr {
     padding: 0;
 }
 
+img {
+    pointer-events: none;
+}
+
 hr.ShorterLine {
     margin: 0 auto;
     width: 90%;
 }
 
+.main {
+    height: 100%;
+}
+
 /*******
 SWIPEABLE
 *******/
diff --git a/main/app/sprinkles/core/src/Controller/CoreController.php b/main/app/sprinkles/core/src/Controller/CoreController.php
index be5fd8f..be88b47 100644
--- a/main/app/sprinkles/core/src/Controller/CoreController.php
+++ b/main/app/sprinkles/core/src/Controller/CoreController.php
@@ -11,6 +11,7 @@ namespace UserFrosting\Sprinkle\Core\Controller;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
 use Slim\Exception\NotFoundException as NotFoundException;
+use Illuminate\Database\Capsule\Manager as DB;
 
 /**
  * CoreController Class
@@ -32,13 +33,16 @@ class CoreController extends SimpleController
         /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = $this->ci->classMapper;
 
-        // Probably a better way to do this
-        $users = $classMapper->staticMethod('user', 'orderBy', 'created_at', 'desc')
-            //->take(8)
+        $friends = $classMapper->staticMethod('user', 'orderBy', 'created_at', 'desc')
+            ->get();
+
+        $FeedImages = DB::table('image_posts')
+            ->orderBy('Created')
             ->get();
 
         return $this->ci->view->render($response, 'pages/index.html.twig', [
-            'users' => $users
+            'friends' => $friends,
+            'FeedImages' => $FeedImages
         ]);
     }
 
diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig
index b40b958..a24ae13 100644
--- a/main/app/sprinkles/core/templates/pages/index.html.twig
+++ b/main/app/sprinkles/core/templates/pages/index.html.twig
@@ -14,27 +14,31 @@
             <div class="carousel-cell FeedTab">
                 <div class="headerWrap">
                     <div class="header">
-                    <span class="LeftButtonHeader"><img draggable="false" ondragstart="return false;"
-                                                        src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
+                    <span class="LeftButtonHeader"><img src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
                         <span class="HeaderCaption">{{ translate("TAB_CAPTIONS.FEED") }}</span>
                         <span class="RightButtonHeader"><i class="fas fa-bell"></i></span>
                     </div>
                     <hr>
                 </div>
+                <div class="MainInTab">
+                    {% for FeedImage in FeedImages %}
+                        <img src="{{ site.uri.public }}/image/{{ FeedImage.PostID }}" alt="An image">
+                    {% endfor %}
+                </div>
             </div>
 
             <div class="carousel-cell ExploreTab">
                 <div class="headerWrap">
                     <div class="header">
-                    <span class="LeftButtonHeader"><img draggable="false" ondragstart="return false;"
-                                                        src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
+                    <span class="LeftButtonHeader"><img src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
                         <span class="HeaderCaption">{{ translate("TAB_CAPTIONS.EXPLORE") }}</span>
                         <span class="RightButtonHeader"><i class="fas fa-bell"></i></span>
                     </div>
                     <hr>
                 </div>
                 <div class="MainInTab ExploreTabWindow">
-                    <input id="UserSearchBar" class="UserSearchBar" type="text" title="{{ translate("EXPLORE_TAB.USER_SEARCH_PH") }}"
+                    <input id="UserSearchBar" class="UserSearchBar" type="text"
+                           title="{{ translate("EXPLORE_TAB.USER_SEARCH_PH") }}"
                            placeholder="{{ translate("EXPLORE_TAB.USER_SEARCH_PH") }}">
                     <br>
                     <div class="SearchResults">
@@ -48,8 +52,7 @@
             <div class="carousel-cell ChatTab">
                 <div class="headerWrap">
                     <div class="header">
-                    <span class="LeftButtonHeader"><img class="svg" draggable="false" ondragstart="return false;"
-                                                        src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
+                    <span class="LeftButtonHeader"><img src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
                         <span class="HeaderCaption">{{ translate("TAB_CAPTIONS.CHAT") }}</span>
                         <span class="RightButtonHeader"><i class="fas fa-bell"></i></span>
                     </div>
@@ -61,29 +64,29 @@
                     </div>
                     <input title="{{ translate("CHAT_MESSAGES.JOIN_GROUP_PH") }}"
                            placeholder="{{ translate("CHAT_MESSAGES.JOIN_GROUP_PH") }}"
-                           id="SubscribeTextInput" class="ChatInput" type="text"/>
+                           id="SubscribeTextInput" class="ChatInput" type="text" />
                     <input title="{{ translate("CHAT_MESSAGES.WRITE_MESSAGE_PH") }}"
                            placeholder="{{ translate("CHAT_MESSAGES.WRITE_MESSAGE_PH") }}"
-                           id="ChatTextInput" class="ChatInput" type="text"/>
+                           id="ChatTextInput" class="ChatInput" type="text" />
                 </div>
             </div>
 
             <div class="carousel-cell FriendsTab">
                 <div class="headerWrap">
                     <div class="header">
-                    <span class="LeftButtonHeader"><img draggable="false" ondragstart="return false;"
-                                                        src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
+                    <span class="LeftButtonHeader"><img src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
                         <span class="HeaderCaption">{{ translate("TAB_CAPTIONS.FRIENDS") }}</span>
                         <span class="RightButtonHeader"><i class="fas fa-bell"></i></span>
                     </div>
                     <hr>
                 </div>
                 <div class="MainInTab">
-                    {% for user in users %}
+                    {% for friend in friends %}
                         <li>
-                            <img src="{{ user.avatar }}" alt="User Image">
-                            <a class="users-list-name" href="{{site.uri.public}}/users/u/{{user.user_name}}">{{user.first_name}} {{user.last_name}}</a>
-                            <span class="users-list-date">{{ user.registered }}</span>
+                            <img src="{{ friend.avatar }}" alt="User Image">
+                            <a class="users-list-name"
+                               href="{{ site.uri.public }}/users/u/{{ friend.user_name }}">{{ friend.first_name }} {{ friend.last_name }}</a>
+                            <span class="users-list-date">{{ friend.registered }}</span>
                         </li>
                     {% endfor %}
                 </div>
@@ -92,8 +95,7 @@
             <div class="carousel-cell PersonalTab">
                 <div class="headerWrap">
                     <div class="header">
-                    <span class="LeftButtonHeader"><img draggable="false" ondragstart="return false;"
-                                                        src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
+                    <span class="LeftButtonHeader"><img src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span>
                         <span class="HeaderCaption">{{ translate("TAB_CAPTIONS.PERSONAL") }}</span>
                         <span class="RightButtonHeader"><i class="fas fa-bell"></i></span>
                     </div>
@@ -102,7 +104,7 @@
                 <div class="MainInTab PersonalTabWindow">
                     <div class="PersonalOverviewHeader">
                         <div class="GenderFab Female">&#9792;</div>
-                        <img class="AvatarImage" src="{{ current_user.avatar }}"/>
+                        <img class="AvatarImage" src="{{ current_user.avatar }}" />
                         <div class="GenderFab Male">&#9794;</div>
                     </div>
                     <br>
@@ -118,26 +120,21 @@
         </div>
 
         <div class="Navbar">
-         <span id="0" class="NavbarIconWrap">
-             <img draggable="false" ondragstart="return false;"
-                  src="{{ assets.url('assets://SiteAssets/icons/FriendFeedOutline.svg') }}">
-        </span>
+            <span id="0" class="NavbarIconWrap">
+                <img src="{{ assets.url('assets://SiteAssets/icons/FriendFeedOutline.svg') }}">
+            </span>
             <span id="1" class="NavbarIconWrap">
-            <img draggable="false" ondragstart="return false;"
-                 src="{{ assets.url('assets://SiteAssets/icons/ExploreGlobeOutline.svg') }}">
-        </span>
+                <img src="{{ assets.url('assets://SiteAssets/icons/ExploreGlobeOutline.svg') }}">
+            </span>
             <span id="2" class="NavbarIconWrap ActiveTab">
-            <img draggable="false" ondragstart="return false;"
-                 src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutlineActivated.svg') }}">
-        </span>
+                <img src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutlineActivated.svg') }}">
+            </span>
             <span id="3" class="NavbarIconWrap">
-            <img draggable="false" ondragstart="return false;"
-                 src="{{ assets.url('assets://SiteAssets/icons/UserGroupOutline.svg') }}">
-         </span>
+                <img src="{{ assets.url('assets://SiteAssets/icons/UserGroupOutline.svg') }}">
+            </span>
             <span id="4" class="NavbarIconWrap">
-            <img draggable="false" ondragstart="return false;"
-                 src="{{ assets.url('assets://SiteAssets/icons/UserOutline.svg') }}">
-        </span>
+                <img src="{{ assets.url('assets://SiteAssets/icons/UserOutline.svg') }}">
+            </span>
         </div>
         <span class='NavbarLine'></span>
     </div>
-- 
cgit v1.2.3