Merge pull request #66 from 30-seconds/dev-sprint2-2020

2020 Sprint 2 Milestone
Chalarangelo · Feb 1, 2020 · cb898f0 · cb898f0
2 parents 2a6962a + c9e7b12
commit cb898f0
Show file tree

Hide file tree

Showing 144 changed files with 1,648 additions and 709 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "content/sources/30csharp"]
 	path = content/sources/30csharp
 	url = https://github.com/30-seconds/30-seconds-of-csharp
+[submodule "content/sources/30blog"]
+	path = content/sources/30blog
+	url = https://github.com/30-seconds/30-seconds-blog
diff --git a/.storybook/addons.js b/.storybook/addons.js
diff --git a/.storybook/config.js b/.storybook/config.js
diff --git a/.storybook/contexts.js b/.storybook/contexts.js
diff --git a/.storybook/presets.js b/.storybook/presets.js
diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
diff --git a/.storybook/theme.js b/.storybook/theme.js
diff --git a/.storybook/viewports.js b/.storybook/viewports.js
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
diff --git a/assets/icons.woff2 b/assets/icons.woff2
diff --git a/config.js b/config.js
@@ -57,12 +57,12 @@ module.exports = {
   ],
   // Snippet ranking engine parameters
   rankingEngine: {
-    tagScorelimit: 12,
+    tagScoreLimit: 12,
     expertiseScoreLimit: 8,
     timeScoreLimitMultiplier: 0.6,
-    beginnerExpertiseScore: 6,
+    beginnerExpertiseScore: 3,
     intermediateExpertiseScore: 8,
-    advancedExpertiseScore: 2,
+    advancedExpertiseScore: 5,
     firstSeenScorePercentage: 0.47,
     lastUpdateScorePercentage: 0.36,
     updateCountScorePercentage: 0.17,

diff --git a/content/configs/30blog.js b/content/configs/30blog.js
@@ -0,0 +1,38 @@
+export default {
+  name: '30 seconds Blog',
+  dirName: '30blog',
+  repoUrl: 'https://github.com/30-seconds/30-seconds-blog',
+  snippetPath: 'blog_posts',
+  requirables: [
+    'blog_data/snippets.json',
+    // 'blog_data/blog_authors.json',
+  ],
+  slug: 'blog',
+  reducer: 'blogReducer',
+  resolver: 'blogResolver',
+  isBlog: true,
+  featured: 1,
+  theme: {
+    backColor: '#1f253d',
+    foreColor: '#edf0fc',
+    iconName: 'blog',
+  },
+  biasPenaltyMultiplier: 1.01,
+  images: {
+    name: 'blog_images',
+    path: 'blog_images',
+  },
+  tagScores: {
+    'javascript': 5,
+    'react': 4,
+    'css': 4,
+    'array': 4,
+    'list': 4,
+    'object': 4,
+    'python': 3,
+    'webdev': 3,
+    'devtools': 2,
+    'csharp': 2,
+    'php': 1,
+  },
+};
diff --git a/content/configs/30code.js b/content/configs/30code.js
@@ -8,10 +8,11 @@ export default {
   ],
   slug: 'js',
   reducer: 'es6Reducer',
-  featured: 1,
+  featured: 2,
   theme: {
     backColor: '#f6d854',
     foreColor: '#392f31',
+    iconName: 'js',
   },
   biasPenaltyMultiplier: 1.02,
   tagScores: {

diff --git a/content/configs/30csharp.js b/content/configs/30csharp.js
@@ -7,10 +7,11 @@ export default {
     'snippet_data/snippets.json',
   ],
   slug: 'c-sharp',
-  featured: 4,
+  featured: 6,
   theme: {
     backColor: '#672179',
     foreColor: '#ffffff',
+    iconName: 'csharp',
   },
   biasPenaltyMultiplier: 1.02,
   tagScores: {

diff --git a/content/configs/30css.js b/content/configs/30css.js
@@ -13,6 +13,7 @@ export default {
   theme: {
     backColor: '#3f4de4',
     foreColor: '#ffffff',
+    iconName: 'css',
   },
   biasPenaltyMultiplier: 1.02,
   tagScores: {

diff --git a/content/configs/30php.js b/content/configs/30php.js
@@ -7,9 +7,11 @@ export default {
     'snippet_data/snippets.json',
   ],
   slug: 'php',
+  featured: 7,
   theme: {
     backColor: '#8b9bd6',
     foreColor: '#2a2843',
+    iconName: 'php',
   },
   biasPenaltyMultiplier: 1.06,
   tagScores: {

diff --git a/content/configs/30python.js b/content/configs/30python.js
@@ -7,10 +7,11 @@ export default {
     'snippet_data/snippets.json',
   ],
   slug: 'python',
-  featured: 2,
+  featured: 4,
   theme: {
     backColor: '#3c77a9',
     foreColor: '#ffffff',
+    iconName: 'python',
   },
   biasPenaltyMultiplier: 1.02,
   tagScores: {

diff --git a/content/configs/30react.js b/content/configs/30react.js
@@ -13,6 +13,7 @@ export default {
   theme: {
     backColor: '#282c34',
     foreColor: '#61dafb',
+    iconName: 'react',
   },
   biasPenaltyMultiplier: 1.08,
   tagScores: {