Merge pull request gitcoinco#5093 from gitcoinco/kevin/profile-v2

Profile v2 MVP
svipal · Sep 17, 2019 · 9e9fb5a · 9e9fb5a
2 parents 6e832c5 + c8d3978
commit 9e9fb5a
Show file tree

Hide file tree

Showing 72 changed files with 2,765 additions and 938 deletions.
diff --git a/app/app/context.py b/app/app/context.py
@@ -93,6 +93,7 @@ def preprocess(request):
         'release': settings.RELEASE,
         'env': settings.ENV,
         'email_key': email_key,
+        'orgs': profile.organizations if profile else [],
         'profile_id': profile.id if profile else '',
         'hotjar': settings.HOTJAR_CONFIG,
         'ipfs_config': {

diff --git a/app/app/settings.py b/app/app/settings.py
@@ -43,6 +43,7 @@
 IS_DEBUG_ENV = ENV in DEBUG_ENVS
 HOSTNAME = env('HOSTNAME', default=socket.gethostname())
 BASE_URL = env('BASE_URL', default='http://localhost:8000/')
+OVERRIDE_NETWORK = env('OVERRIDE_NETWORK', default=None)
 SECRET_KEY = env('SECRET_KEY', default='YOUR-SupEr-SecRet-KeY')
 ADMINS = (env.tuple('ADMINS', default=('TODO', '[email protected]')))
 BASE_DIR = root()

diff --git a/app/app/urls.py b/app/app/urls.py
@@ -94,7 +94,10 @@
 
     # api views
     url(r'^api/v0.1/profile/(.*)?/keywords', dashboard.views.profile_keywords, name='profile_keywords'),
+    url(r'^api/v0.1/profile/(.*)?/activity.json', dashboard.views.profile_activity, name='profile_activity'),
+    url(r'^api/v0.1/profile/(.*)?/rep.csv', dashboard.views.profile_rep, name='profile_rep'),
     url(r'^api/v0.1/profile/banner', dashboard.views.change_user_profile_banner, name='change_user_profile_banner'),
+    url(r'^api/v0.1/activity', retail.views.create_status_update, name='create_status_update'),
     url(
         r'^api/v0.1/profile/(.*)?/jobopportunity',
         dashboard.views.profile_job_opportunity,
@@ -134,6 +137,7 @@
     # dashboard views
     re_path(r'^onboard/(?P<flow>\w+)/$', dashboard.views.onboard, name='onboard'),
     re_path(r'^onboard/contributor/avatar/?$', dashboard.views.onboard_avatar, name='onboard_avatar'),
+    re_path(r'^onboard/?$', dashboard.views.onboard, name='onboard'),
     url(r'^postcomment/', dashboard.views.post_comment, name='post_comment'),
     url(r'^explorer/?', dashboard.views.dashboard, name='explorer'),
 
@@ -264,6 +268,7 @@
     re_path(r'^users/?', dashboard.views.users_directory, name='users_directory'),
 
     # 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'),

diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
@@ -1628,3 +1628,15 @@ div.busyOverlay {
 .daterangepicker .ranges li.active {
   background-color: #5b24ff !important;
 }
+
+.admin_only{
+  background-color: #f2f5ea !important;
+  border-radius: 3px;
+}
+.only_visible_to_me_color{
+  background-color: #d3e3f7;
+}
+.only_visible_to_me{
+  padding: 3px 5px;
+  border-radius: 3px;
+}
diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css
@@ -400,6 +400,16 @@ div.button-pink {
   margin-right: 0.5rem;
 }
 
+#tabs .nav-link span {
+  position: relative;
+  font-size: 0.3rem;
+  font-weight: bold;
+  background-color: #ddd;
+  border-radius: 10px;
+  padding: 3px 5px;
+  top: -5px;
+}
+
 .nav-link:visited {
   color: #eff4ee;
 }