Merge pull request #5324 from thelostone-mc/stb

stable -> master
gitcoinco · Oct 16, 2019 · cb6dd65 · cb6dd65
2 parents a04dfea + fce8e6c
commit cb6dd65
Show file tree

Hide file tree

Showing 80 changed files with 2,050 additions and 472 deletions.
diff --git a/app/app/settings.py b/app/app/settings.py
@@ -38,7 +38,7 @@
 env.read_env(str(root.path('app/.env')))  # reading .env file
 
 DEBUG = env.bool('DEBUG', default=True)
-QUESTS_LIVE = DEBUG
+QUESTS_LIVE = True
 ENV = env('ENV', default='local')
 DEBUG_ENVS = env.list('DEBUG_ENVS', default=['local', 'stage', 'test'])
 IS_DEBUG_ENV = ENV in DEBUG_ENVS

diff --git a/app/app/urls.py b/app/app/urls.py
@@ -98,6 +98,7 @@
     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/(.*)?/earnings.csv', dashboard.views.profile_earnings, name='profile_earnings'),
+    url(r'^api/v0.1/profile/(.*)?/ratings/(.*).csv', dashboard.views.profile_ratings, name='profile_ratings'),
     url(r'^api/v0.1/profile/(.*)?/viewers.csv', dashboard.views.profile_viewers, name='profile_viewers'),
     url(r'^api/v0.1/profile/(.*)?/spent.csv', dashboard.views.profile_spent, name='profile_spent'),
     url(r'^api/v0.1/profile/banner', dashboard.views.change_user_profile_banner, name='change_user_profile_banner'),
@@ -157,6 +158,7 @@
     # quests
     path('quests/', quests.views.index, name='quests_index'),
     re_path(r'^quests/(?P<obj_id>\d+)/(?P<name>\w*)', quests.views.details, name='quest_details'),
+    re_path(r'^quests/new/?', quests.views.newquest, name='newquest'),
 
     # Contributor dashboard
     path(

diff --git a/app/assets/v2/audio/boss-battle1.mid b/app/assets/v2/audio/boss-battle1.mid
diff --git a/app/assets/v2/audio/boss-battle2.mid b/app/assets/v2/audio/boss-battle2.mid
diff --git a/app/assets/v2/audio/boss-battle3.mid b/app/assets/v2/audio/boss-battle3.mid
diff --git a/app/assets/v2/audio/boss-battle4.mid b/app/assets/v2/audio/boss-battle4.mid
diff --git a/app/assets/v2/css/products.css b/app/assets/v2/css/products.css
@@ -20,26 +20,54 @@
   color: #ffffff;
 }
 
-.quests{
-  background-color: #55508e;
+.hackathons{
+  background-color: #ff92be;
   color: #ffffff;
 }
 
-.quests span img{
-  max-width: 50px;
+.quests{
+  background-color: #55508e;
+  color: #ffffff;
 }
 
 .codefund{
   background-color: #4c008f;
   color: #ffffff;
 }
 
+.matching{
+  background-color: #444;
+  color: #ffffff;
+}
+
+.matching img,
+.hackathons img{
+  max-width: 500px;
+}
+.quests span img{
+  max-width: 50px;
+}
+
 .labs{
   background-color: #bf2781;
   color: #ffffff;
+}
 
+.tag
+{
+  background-color: #e7f0fa;
+  color: var(--gc-blue);
+  font-size: 10px;
+  display: block;
+  list-style: none;
+  padding: 5px;
+  width: 66px;
 }
 
+.codefund .tag
+{
+  width: 140px;
+}
 @media(min-width: 1200px) {
   .intro-header{
     font-size:76px;
@@ -141,6 +169,16 @@
   color: #000;
 }
 
+.button-hackathons{
+  background-color: #ffa2de;
+  color: white;
+}
+
+.button-matching{
+  background-color: #222;
+  color: white;
+}
+
 .button-labs{
   background-color: #782456;
   color: #fff;