diff options
Diffstat (limited to 'main')
5 files changed, 24 insertions, 47 deletions
diff --git a/main/app/sprinkles/admin/src/Controller/UserController.php b/main/app/sprinkles/admin/src/Controller/UserController.php index b733d78..45bedf5 100644 --- a/main/app/sprinkles/admin/src/Controller/UserController.php +++ b/main/app/sprinkles/admin/src/Controller/UserController.php @@ -1129,26 +1129,19 @@ class UserController extends SimpleController $UsersFriends = Capsule::select("SELECT id FROM (SELECT user_id AS id FROM user_follow WHERE followed_by_id = $user->id UNION ALL SELECT followed_by_id FROM user_follow WHERE user_id = $user->id) t GROUP BY id HAVING COUNT(id) > 1"); + /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ + $classMapper = $this->ci->classMapper; + foreach ($UsersFriends as $Key => $UsersFriendId) { // NOT THAT EFFICIENT... - $UsersFriendInformation = Capsule::table('users') - ->where('id', "=", $UsersFriendId->id) - ->select("users.id", "users.user_name as username") + $UsersFriendInformation = $classMapper->createInstance('user')// select doesnt work with instance + ->where('id', $UsersFriendId->id) ->get(); - $UsersFriends[$Key] = $UsersFriendInformation[0]; - } - - /* - $UsersFriends = Capsule::table('user_follow as f1') - ->select("u1.user_name as username", "u2.user_name as username") - ->leftJoin("users as u1", "u1.id", "=", "f1.user_id") - ->leftJoin("users as u2", "u2.id", "=", "f1.followed_by_id") - ->whereExists(function ($query) { - $query->select(Capsule::raw(1)) - ->from("user_follow as f2") - ->where("f2.user_id", "=", "f1.followed_by_id"); - }) - //->select("user_follow.user_id as id", "users.user_name as username") - ->get();*/ + + $UsersFriends[$Key]->id = $UsersFriendInformation[0]->id; + $UsersFriends[$Key]->username = $UsersFriendInformation[0]->user_name; + $UsersFriends[$Key]->avatar = $UsersFriendInformation[0]->avatar; + $UsersFriends[$Key]->full_name = $UsersFriendInformation[0]->full_name; + } $result = $UsersFriends; diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js index 9493644..ccb80d4 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js @@ -5,6 +5,7 @@ var NavbarLine = $(".NavbarLine"); var UserSearchBar = $("#UserSearchBar"); var SearchResults = $(".SearchResults"); var SelectReceiver = $(".SelectReceiver"); +var FriendList = $(".FriendList"); var alerts = $("#alerts-page"); var ExploreData = $("#ExploreData"); @@ -193,13 +194,9 @@ $(document).ready(function () { $.ajax({ url: site.uri.public + "/api/users/u/" + current_username + "/friends", success: function (receivers) { - receivers.forEach(function (receiver) { - $.ajax({ // not that efficient... - url: site.uri.public + "/api/users/u/" + receiver.username, - success: function (receiversInfo) { - SelectReceiver.append("<div class='ReceiverSelector' data-username='" + receiversInfo.user_name + "' data-id='" + receiversInfo.id + "'><img class='Avatar' src='" + receiversInfo.avatar + "'/><div class='UsersFullName'>" + receiversInfo.full_name + "</div></div>"); - } - }); + receivers.forEach(function (receiversInfo) { + SelectReceiver.append("<div class='ReceiverSelector' data-username='" + receiversInfo.username + "' data-id='" + receiversInfo.id + "'><img class='Avatar' src='" + receiversInfo.avatar + "'/><div class='UsersFullName'>" + receiversInfo.full_name + "</div></div>"); + FriendList.append("<img class='Avatar' src='" + receiversInfo.avatar + "'><a class='FriendName' href='" + site.uri.public + "/users/u/" + receiversInfo.username + "'>" + receiversInfo.full_name + "</a><br>"); }) }, error: function () { diff --git a/main/app/sprinkles/core/src/Controller/CoreController.php b/main/app/sprinkles/core/src/Controller/CoreController.php index b80a106..f78d4c1 100644 --- a/main/app/sprinkles/core/src/Controller/CoreController.php +++ b/main/app/sprinkles/core/src/Controller/CoreController.php @@ -29,12 +29,6 @@ class CoreController extends SimpleController */ public function pageIndex($request, $response, $args) { - /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ - $classMapper = $this->ci->classMapper; - - $friends = $classMapper->staticMethod('user', 'orderBy', 'created_at', 'desc') - ->get(); - $FeedImages = DB::table('image_posts') ->orderBy('Created') ->get(); @@ -47,7 +41,6 @@ class CoreController extends SimpleController } return $this->ci->view->render($response, 'pages/index.html.twig', [ - '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 765fa3b..306dac1 100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -93,12 +93,6 @@ </div> <div class="MainInTab FriendsTabWindow"> <div class="FriendList"> - {% for friend in friends %} - <img class="Avatar" src="{{ friend.avatar }}" data-caching-key="{{ friend.user_name }}_avatar_cached"> - <a class="FriendName" - href="{{ site.uri.public }}/users/u/{{ friend.user_name }}">{{ friend.first_name }} {{ friend.last_name }}</a> - <br> - {% endfor %} </div> </div> </div> diff --git a/main/app/sprinkles/core/templates/pages/test.html.twig b/main/app/sprinkles/core/templates/pages/test.html.twig index 6f64962..4edfaa0 100644 --- a/main/app/sprinkles/core/templates/pages/test.html.twig +++ b/main/app/sprinkles/core/templates/pages/test.html.twig @@ -25,13 +25,13 @@ <script> - $.ajax({ - type: 'GET', - url: site.uri.public + '/api/users/u/' + 'marvinborner' + '/publickey', - dataType : "json", - success: function (response) { - console.log(response); - //window.location.reload(); - } - }); + $.ajax({ + type: 'GET', + url: site.uri.public + '/api/users/u/' + 'marvinborner' + '/publickey', + dataType : "json", + success: function (response) { + console.log(response); + //window.location.reload(); + } + }); </script>
\ No newline at end of file |