Skip to content

Commit 948384b

Browse files
Merge pull request #1352 from breatheco-de/development
Development
2 parents 630faeb + 260e363 commit 948384b

File tree

143 files changed

+6344
-2235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+6344
-2235
lines changed

.storybook/i18next.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import i18n from 'i18next';
33
import Backend from 'i18next-http-backend';
44
import LanguageDetector from 'i18next-browser-languagedetector';
55

6-
const ns = ['common', 'live-event', 'program-card', 'final-project', 'profile', 'call-to-action', 'code-viewer',];
6+
const ns = ['common', 'live-event', 'program-card', 'final-project', 'profile', 'call-to-action',
7+
'code-viewer', 'choose-program', 'assignments'];
78
const supportedLngs = ['en', 'es'];
89
const resources = ns.reduce((acc, n) => {
910
supportedLngs.forEach((lng) => {

bun.lockb

-128 KB
Binary file not shown.

customtypes/page/index.json

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"fieldset": "Slice Zone",
3939
"config": {
4040
"choices": {
41+
"info_cards": { "type": "SharedSlice" },
4142
"trust_cards": { "type": "SharedSlice" },
4243
"title_introduction": { "type": "SharedSlice" },
4344
"markdown": { "type": "SharedSlice" },

i18n.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module.exports = {
55
'/': ['home', 'social'],
66
'/login': ['login', 'signup'],
77
'/example': ['counter'],
8-
'/cohort/[cohortSlug]/[slug]/[version]': ['dashboard', 'choose-program', 'projects', 'profile'],
9-
'/cohort/[cohortSlug]/assignments': ['assignments'],
8+
'/cohort/[cohortSlug]/[slug]/[version]': ['dashboard', 'choose-program', 'projects', 'profile', 'assignments'],
9+
'/cohort/[cohortSlug]/assignments': ['assignments', 'dashboard'],
1010
'/cohort/[cohortSlug]/student/[studentId]': ['student', 'assignments'],
1111
'/cohort/[cohortSlug]/attendance': ['attendance'],
1212
'/docs/[syllabusSlug]/[assetSlug]': ['docs'],
@@ -17,10 +17,10 @@ module.exports = {
1717
'/lessons': ['lesson'],
1818
'/project/[slug]': ['projects'],
1919
'/checkout': ['signup'],
20-
'/interactive-coding-tutorial/[slug]': ['projects'],
20+
'/interactive-coding-tutorial/[slug]': ['projects', 'exercises'],
2121
'/interactive-coding-tutorials': ['projects'],
2222
'/interactive-exercise/[slug]': ['exercises', 'workshops'],
23-
'/choose-program': ['choose-program', 'dashboard', 'profile'],
23+
'/choose-program': ['choose-program', 'dashboard', 'profile', 'assignments'],
2424
'/syllabus/[cohortSlug]/[lesson]/[lessonSlug]': ['syllabus', 'dashboard', 'projects'],
2525
'/survey/[surveyId]': ['survey'],
2626
'/mentorship': ['mentorship'],

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"@emotion/server": "^11.11.0",
5151
"@emotion/styled": "11.11.0",
5252
"@fnando/sparkline": "^0.3.10",
53+
"@fontsource-variable/space-grotesk": "^5.0.16",
5354
"@fontsource/lato": "4.5.10",
5455
"@loadable/component": "5.15.3",
5556
"@monaco-editor/react": "^4.6.0",

0 commit comments

Comments
 (0)