Merge pull request #6560 from gitcoinco/kevin/toolbox

removes tools/ from app

app/app/tests/test_app_urls.py

@@ -132,19 +132,3 @@ def test_uniterested_reverse(self):
     def test_uniterested_resolve(self):
         """Test the uninterested url and check the resolution"""
         self.assertEqual(resolve('/actions/bounty/1/interest/2/uninterested/').view_name, 'uninterested')
-
-    def test_vote_up_reverse(self):
-        """Test the vote up url and check the reverse"""
-        self.assertEqual(reverse('vote_tool_up', args=[1]), '/actions/tool/1/voteUp')
-
-    def test_vote_up_resolve(self):
-        """Test the vote up url and check the resolution"""
-        self.assertEqual(resolve('/actions/tool/1/voteUp').view_name, 'vote_tool_up')
-
-    def test_vote_down_reverse(self):
-        """Test the vote down url and check the reverse"""
-        self.assertEqual(reverse('vote_tool_down', args=[1]), '/actions/tool/1/voteDown')
-
-    def test_vote_down_resolve(self):
-        """Test the vote down url and check the resolution"""
-        self.assertEqual(resolve('/actions/tool/1/voteDown').view_name, 'vote_tool_down')

app/app/urls.py

@@ -349,10 +349,6 @@
     # Alpha functionality
     re_path(r'^profile/(.*)/(.*)?', dashboard.views.profile, name='profile_by_tab'),
     re_path(r'^profile/(.*)?', dashboard.views.profile, name='profile'),
-    re_path(r'^toolbox/?', dashboard.views.toolbox, name='toolbox'),
-    path('actions/tool/<int:tool_id>/voteUp', dashboard.views.vote_tool_up, name='vote_tool_up'),
-    path('actions/tool/<int:tool_id>/voteDown', dashboard.views.vote_tool_down, name='vote_tool_down'),
-    re_path(r'^tools/?', dashboard.views.toolbox, name='tools'),
     re_path(r'^labs/?', dashboard.views.labs, name='labs'),
 
     # gas views

app/assets/v2/css/gitcoin.css

@@ -927,7 +927,6 @@ textarea.status-textarea {
   color: var(--townsquare-link-color);
 }
 
-
 .dark-mode .bg-light {
-    background-color: var(--bg-shade-0)!important;
-}
+  background-color: var(--bg-shade-0)!important;
+}

app/dashboard/admin.py

@@ -24,11 +24,11 @@
 from django.utils.safestring import mark_safe
 
 from .models import (
-    Activity, BlockedURLFilter, BlockedUser, Bounty, BountyEvent, BountyFulfillment, BountyInvites, BountySyncRequest,
-    CoinRedemption, CoinRedemptionRequest, Coupon, Earning, FeedbackEntry, HackathonEvent, HackathonProject,
-    HackathonRegistration, HackathonSponsor, Interest, LabsResearch, PortfolioItem, Profile, ProfileView,
-    SearchHistory, Sponsor, Tip, TipPayout, TokenApproval, Tool, ToolVote, TribeMember, UserAction,
-    UserVerificationModel, Poll, Question, Option, Answer, FundRequest
+    Activity, Answer, BlockedURLFilter, BlockedUser, Bounty, BountyEvent, BountyFulfillment, BountyInvites,
+    BountySyncRequest, CoinRedemption, CoinRedemptionRequest, Coupon, Earning, FeedbackEntry, FundRequest,
+    HackathonEvent, HackathonProject, HackathonRegistration, HackathonSponsor, Interest, LabsResearch, Option, Poll,
+    PortfolioItem, Profile, ProfileView, Question, SearchHistory, Sponsor, Tip, TipPayout, TokenApproval, TribeMember,
+    UserAction, UserVerificationModel,
 )
 
 
@@ -82,12 +82,6 @@ class EarningAdmin(admin.ModelAdmin):
     search_fields = ['from_profile__handle', 'to_profile__handle']
 
 
-class ToolAdmin(admin.ModelAdmin):
-    ordering = ['-id']
-    list_display = ['created_on', '__str__']
-    raw_id_fields = ['votes']
-
-
 class ActivityAdmin(admin.ModelAdmin):
     ordering = ['-id']
     raw_id_fields = ['bounty', 'profile', 'tip', 'kudos', 'grant', 'subscription', 'other_profile', 'kudos_transfer', 'hackathonevent']
@@ -118,11 +112,6 @@ class TokenApprovalAdmin(admin.ModelAdmin):
     search_fields = ['profile__handle', 'token_name', 'token_address']
 
 
-class ToolVoteAdmin(admin.ModelAdmin):
-    raw_id_fields = ['profile']
-    ordering = ['-id']
-
-
 class BountyInvitesAdmin(admin.ModelAdmin):
     raw_id_fields = ['bounty', 'inviter', 'invitee']
     ordering = ['-id']
@@ -483,8 +472,6 @@ class AnswersAdmin(admin.ModelAdmin):
 admin.site.register(TokenApproval, TokenApprovalAdmin)
 admin.site.register(CoinRedemption, GeneralAdmin)
 admin.site.register(CoinRedemptionRequest, GeneralAdmin)
-admin.site.register(Tool, ToolAdmin)
-admin.site.register(ToolVote, ToolVoteAdmin)
 admin.site.register(Sponsor, SponsorAdmin)
 admin.site.register(HackathonEvent, HackathonEventAdmin)
 admin.site.register(HackathonSponsor, HackathonSponsorAdmin)

app/dashboard/management/commands/send_bulk_tips.py

@@ -24,19 +24,19 @@
 from django.core import management
 from django.core.management.base import BaseCommand
 from django.utils import timezone
-from dashboard.views import record_user_action
 
 from dashboard.abi import erc20_abi as abi
 from dashboard.models import Activity, Earning, Profile, Tip, TipPayout
+from dashboard.notifications import maybe_market_tip_to_email, maybe_market_tip_to_github, maybe_market_tip_to_slack
+from dashboard.tip_views import record_tip_activity
 from dashboard.utils import get_tx_status, get_web3, has_tx_mined
+from dashboard.views import record_user_action
 from gas.utils import recommend_min_gas_price_to_confirm_in_time
 from marketing.mails import (
     grant_match_distribution_final_txn, grant_match_distribution_kyc, grant_match_distribution_test_txn,
 )
 from townsquare.models import Comment
 from web3 import HTTPProvider, Web3
-from dashboard.notifications import maybe_market_tip_to_email, maybe_market_tip_to_github, maybe_market_tip_to_slack
-from dashboard.tip_views import record_tip_activity
 
 WAIT_TIME_BETWEEN_PAYOUTS = 15
 

app/dashboard/models.py

@@ -35,7 +35,7 @@
 from django.contrib.postgres.fields import ArrayField, JSONField
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import connection, models
-from django.db.models import Count, F, Q, Sum, Subquery
+from django.db.models import Count, F, Q, Subquery, Sum
 from django.db.models.signals import m2m_changed, post_delete, post_save, pre_save
 from django.dispatch import receiver
 from django.forms.models import model_to_dict