Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prototype: Meine Mathe-Skills #3474

Draft
wants to merge 469 commits into
base: staging
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
469 commits
Select commit Hold shift + click to select a range
f4fc672
also show if calculator is not allowed
elbotho Apr 3, 2024
89a0010
Merge branch 'meine-mathe-skills' of https://github.com/serlo/fronten…
elbotho Apr 3, 2024
c2ec345
prettier
elbotho Apr 3, 2024
264ecc1
feat: parallelogram 1
Entkenntnis Apr 3, 2024
5b00e9d
feat: add Parallelogram 2
Entkenntnis Apr 3, 2024
8f5b16d
fix: typo
Entkenntnis Apr 3, 2024
dfca1fa
use some shared components for styling
elbotho Apr 3, 2024
fdb8c96
feat: move oblique image to upper area
Entkenntnis Apr 4, 2024
620a3aa
fix: highlight content of prototype
Entkenntnis Apr 4, 2024
1708841
Edited 'parallelogram-1'
FelixEcca Apr 4, 2024
1cf6466
Typo fixed
FelixEcca Apr 4, 2024
f60e7f9
refactor: some updates
Entkenntnis Apr 4, 2024
c1b22e9
feat: finish parallelogramm-3
Entkenntnis Apr 4, 2024
c921f49
refactor: change some urls
Entkenntnis Apr 4, 2024
10f61d9
refactor: oblique images
Entkenntnis Apr 4, 2024
db8b51e
feat: add events
Entkenntnis Apr 4, 2024
b9e7988
feat: bootstrap new exercises
Entkenntnis Apr 4, 2024
bd42c83
feat: finish find function
Entkenntnis Apr 4, 2024
69bf439
fix: remove todo
Entkenntnis Apr 4, 2024
53bf0d6
feat: Add Logarithmus im Kopf
Entkenntnis Apr 4, 2024
ce8679a
fix: debug quadratische Ergänzung
Entkenntnis Apr 5, 2024
e897f20
refactor: some small polishments
Entkenntnis Apr 5, 2024
567f091
refactor: move completing the square into separate exercise
Entkenntnis Apr 5, 2024
7f2eb23
fix: wheel of fortune not always stopping on line
Entkenntnis Apr 5, 2024
d0ac223
feat: add scheitelform with formula
Entkenntnis Apr 5, 2024
7f57069
Update parallelogram-3.tsx
FelixEcca Apr 5, 2024
be9bcb6
refacotr: value set for parabola
Entkenntnis Apr 5, 2024
c5b7e6b
Kontext Englischvokabeln etwas gefixt
FelixEcca Apr 5, 2024
e29091e
Merge branch 'meine-mathe-skills' of https://github.com/serlo/fronten…
FelixEcca Apr 5, 2024
aa35e45
refactor: rework modelling with parabolsd
Entkenntnis Apr 5, 2024
31560cf
feat: add 🌶
elbotho Apr 5, 2024
d276682
Merge branch 'staging' into meine-mathe-skills
elbotho Apr 5, 2024
f87e020
fixes
Entkenntnis Apr 5, 2024
4627b5d
feat: mark difficulty for exercises part A
Entkenntnis Apr 5, 2024
41617b4
feat: review kapital und anlagezeit
Entkenntnis Apr 5, 2024
db7866b
add input fields to simplified wheel of fortune exercise
elbotho Apr 6, 2024
c6f2112
fix: logical improvement
Entkenntnis Apr 8, 2024
2172554
Trigonometrie
yanncloud Apr 8, 2024
6b3c4a0
EsLint fix
yanncloud Apr 8, 2024
1166cef
add interactive solution draft
elbotho Apr 8, 2024
675dbc6
remove other modes for now
elbotho Apr 8, 2024
344e1d1
remove other exercise modes for now
elbotho Apr 8, 2024
25f9631
Merge branch 'meine-mathe-skills' into wheel-of-fortune-interactive-s…
elbotho Apr 8, 2024
14c2bec
fix: lint
Entkenntnis Apr 9, 2024
f8e5c8a
refactor: remove cent amountmi
Entkenntnis Apr 9, 2024
cb3caf5
content fixes
Entkenntnis Apr 9, 2024
12df685
Merge branch 'meine-mathe-skills' into wheel-of-fortune-interactive-s…
Entkenntnis Apr 9, 2024
42b94d9
Merge pull request #3612 from serlo/wheel-of-fortune-interactive-solu…
elbotho Apr 9, 2024
2447e89
fix wof task
elbotho Apr 9, 2024
2678fd4
rework: Eisdielse
Entkenntnis Apr 9, 2024
9cb3e28
Merge branch 'meine-mathe-skills' of https://github.com/serlo/fronten…
Entkenntnis Apr 9, 2024
c793563
update difficulties
Entkenntnis Apr 9, 2024
dee47ca
refactor: mark todo exercises
Entkenntnis Apr 9, 2024
a62fe63
fix: mising difficulty
Entkenntnis Apr 9, 2024
918250d
simplify wof diagram, add dangerous feature 😅
elbotho Apr 9, 2024
a2dcc28
Merge branch 'meine-mathe-skills' of https://github.com/serlo/fronten…
elbotho Apr 9, 2024
1ef98a4
refactor: simplify and fix wheel rotation
elbotho Apr 9, 2024
a9ce652
only show 2 🌶 or more
elbotho Apr 10, 2024
7e4f34e
Self-generating task on the cosine rule in triangle p. 146/6
yanncloud Apr 10, 2024
c0bd8df
Update . to , (toLocaleString('de-DE'))
yanncloud Apr 10, 2024
0563b58
fixed false {} in line 124
yanncloud Apr 10, 2024
feffab7
fix: wording
Entkenntnis Apr 11, 2024
3cc6d3a
feat: latex builder
Entkenntnis Apr 11, 2024
c644f38
feat: add useful links
Entkenntnis Apr 11, 2024
7e6edf5
fix: hide zero as summand
Entkenntnis Apr 11, 2024
1bdb426
fix: trig 1 typo
Entkenntnis Apr 11, 2024
88e8f3b
fix: wheel of fortune
Entkenntnis Apr 11, 2024
f701059
fix: fine tune wording
Entkenntnis Apr 11, 2024
291961e
fix: another wording
Entkenntnis Apr 11, 2024
a856442
refactor: review existing exercises and add placeholders
Entkenntnis Apr 11, 2024
7789e01
fix: tolocalestring
Entkenntnis Apr 11, 2024
296a5ab
fix: show hint for alternatives
Entkenntnis Apr 12, 2024
ac1fbd2
feat: add new exercise
Entkenntnis Apr 12, 2024
f999c9c
fix: remove construction sign
Entkenntnis Apr 12, 2024
28f8ab5
fix: less repetition
Entkenntnis Apr 12, 2024
1abcff7
feat: add exercise task
Entkenntnis Apr 12, 2024
33db8d4
feat: finish exercise solution
Entkenntnis Apr 12, 2024
8c69f38
fix: lint
Entkenntnis Apr 12, 2024
907287b
fix lint now
Entkenntnis Apr 12, 2024
970cb3d
task only suitable for track 1
Entkenntnis Apr 12, 2024
8115282
feat: new exercise
Entkenntnis Apr 12, 2024
9784033
feat: add tree diagram exercise
Entkenntnis Apr 13, 2024
930871e
feat: Add exercise
Entkenntnis Apr 13, 2024
3413515
change placeholder title
Entkenntnis Apr 13, 2024
6e0782e
feat: new exercise "Verlosung"
Entkenntnis Apr 13, 2024
3ed234a
fix: lint
Entkenntnis Apr 13, 2024
1034200
Update tree-diagram.tsx
peter-furlan Apr 15, 2024
58a7c59
Update asymptote-1.tsx
peter-furlan Apr 15, 2024
927cdce
Merge branch 'staging' into meine-mathe-skills
elbotho Apr 15, 2024
413d8db
Update tombola.tsx
peter-furlan Apr 16, 2024
1d0493f
Merge branch 'staging' into meine-mathe-skills
elbotho Apr 16, 2024
8df7f09
Merge branch 'staging' into meine-mathe-skills
elbotho Apr 16, 2024
5a9f2ce
fix(math-skills): typo in trigonometry-1 closes #3661
elbotho Apr 16, 2024
92ea890
feat: exclude reviewers from data tracking
Entkenntnis Apr 17, 2024
07d74d4
feat: add heartbeat
Entkenntnis Apr 17, 2024
e01dbde
fix: simplify _document for this branch
Entkenntnis Apr 17, 2024
d9a1acc
disable sentry in branch
Entkenntnis Apr 17, 2024
0735ad7
Update plot-function-1.tsx
peter-furlan Apr 18, 2024
d4b9f66
feat: make some progress on right triangle
Entkenntnis Apr 19, 2024
6a43893
fix: use newgreen
Entkenntnis Apr 19, 2024
cf4540e
feat: finish exercise
Entkenntnis Apr 19, 2024
d8d44be
feat: add intersecting lines exercise
Entkenntnis Apr 20, 2024
4e0b141
prepare: setup new exercises
Entkenntnis Apr 20, 2024
61919c5
Update asymptote-1.tsx
peter-furlan Apr 21, 2024
9a65c17
add new exercise
Entkenntnis Apr 21, 2024
1b69ea8
Update right-triangle.tsx
Entkenntnis Apr 21, 2024
a903384
fix: mini graphics improvements
Entkenntnis Apr 22, 2024
bf972e5
feat: add link to contact form
Entkenntnis Apr 22, 2024
989a351
feat: better reachable back link
Entkenntnis Apr 22, 2024
98dac10
feat: wip sin/cos theorem
Entkenntnis Apr 22, 2024
b4bd34b
feat: finish law of sine / cosine
Entkenntnis Apr 22, 2024
126e50e
Merge branch 'staging' into meine-mathe-skills
elbotho Apr 23, 2024
e5f41d7
fix: law of cosine
Entkenntnis Apr 23, 2024
da4287f
Merge branch 'meine-mathe-skills' of https://github.com/serlo/fronten…
Entkenntnis Apr 23, 2024
0d440ae
feat: placeholders for new exercises
Entkenntnis Apr 23, 2024
fd258b3
experiment: try hiding button top right
Entkenntnis Apr 23, 2024
0ad5a37
always use name in title, remove exercise button
elbotho Apr 23, 2024
1218e07
add scoll position fix
elbotho Apr 23, 2024
5058e8f
draft for filter function
elbotho Apr 23, 2024
104670c
mix order
elbotho Apr 23, 2024
ca3a050
feat: add new exercise
Entkenntnis Apr 23, 2024
77626d0
fix lint, remove construction sign
Entkenntnis Apr 23, 2024
2c365a4
fix: highlight color
Entkenntnis Apr 23, 2024
611760c
fix: update url
Entkenntnis Apr 23, 2024
203a7da
feat: change default branch to II/III
Entkenntnis Apr 23, 2024
9d21508
feat: generator and task done for pizza stück
Entkenntnis Apr 24, 2024
f21c805
add topic mapping
elbotho Apr 24, 2024
4f98663
Merge branch 'meine-mathe-skills' into math-skills-filter
elbotho Apr 24, 2024
d09b202
prettier
elbotho Apr 24, 2024
5f275c2
Merge pull request #3707 from serlo/math-skills-filter
Entkenntnis Apr 24, 2024
e3d49be
feat: rework filter categories
Entkenntnis Apr 24, 2024
130e071
fix filter reset on track change
elbotho Apr 24, 2024
a6cf4be
prettier
elbotho Apr 24, 2024
cad56c9
feat: finish kreissektor
Entkenntnis Apr 24, 2024
22d49d3
Merge branch 'meine-mathe-skills' of https://github.com/serlo/fronten…
Entkenntnis Apr 24, 2024
cc73ac2
fix: reset filter only on missing topic
elbotho Apr 24, 2024
d478ddb
feat: pizza pattern
elbotho Apr 24, 2024
38f5603
fix: circle sector number printing
Entkenntnis Apr 24, 2024
e70d871
feat: finish trapez akrobatik iteration 1
Entkenntnis Apr 24, 2024
b8af8a2
fix: change difficulty back to 1
Entkenntnis Apr 24, 2024
1b668f8
feat: add context
Entkenntnis Apr 24, 2024
f71e0f5
feat: update url
Entkenntnis Apr 24, 2024
f203f8c
try more prominent skip button
elbotho Apr 25, 2024
2d09d0b
feat: finish review
Entkenntnis Apr 25, 2024
efa7bb4
fix: add label
Entkenntnis Apr 25, 2024
3ae7479
fix: reorder exercises
Entkenntnis Apr 25, 2024
4fd8957
tiny card design improvement
elbotho Apr 25, 2024
88f4a49
try 🌶 with emoji font
elbotho Apr 25, 2024
2d98a80
Merge branch 'meine-mathe-skills' of https://github.com/serlo/fronten…
elbotho Apr 25, 2024
3755570
experiment: reword skip button
Entkenntnis Apr 25, 2024
6af5946
fix lint
Entkenntnis Apr 25, 2024
650c4aa
Merge branch 'staging' into meine-mathe-skills
elbotho Apr 25, 2024
ea3396b
color spoiler
elbotho Apr 25, 2024
95cd907
close hint spoiler on new ex
elbotho Apr 25, 2024
34f41f1
scroll to top on new exercise
elbotho Apr 25, 2024
690fa8f
animal colored spoiler
elbotho Apr 25, 2024
25a8da9
shoot stars on generate button
elbotho Apr 25, 2024
14b1cfa
fix: avoid -1
Entkenntnis Apr 25, 2024
5bc3af3
feat: break habits in this exercise
Entkenntnis Apr 25, 2024
75bd54c
experiment: try new generator button behaviour
Entkenntnis Apr 25, 2024
a0b48c6
fix: Glücksrad Einführung
Entkenntnis Apr 26, 2024
cfb9c5a
prepare: add placeholders
Entkenntnis Apr 26, 2024
74d4afa
fix: consistent rounding, better generator
Entkenntnis Apr 26, 2024
3f2b29e
fix: round to two digits
Entkenntnis Apr 26, 2024
4ec2168
refactor: make colors more consistent
Entkenntnis Apr 26, 2024
5a8dcca
feat: make pyramide dynamic
Entkenntnis Apr 26, 2024
d7f154b
fix: refactoring
Entkenntnis Apr 26, 2024
85646c7
chore(math-skills): use other alpha symbol (⍺) for readability
elbotho Apr 26, 2024
aee9020
refactor: self-evaluation exercise to use useMemo for rendering task
elbotho Apr 26, 2024
f544d57
improve rotation in WheelDiagram component
elbotho Apr 26, 2024
3672afd
refactor wheel of fortune to use same wheel component and colored sec…
elbotho Apr 26, 2024
3ee8031
Merge pull request #3728 from serlo/math-skills-alpha
Entkenntnis Apr 27, 2024
48b25f4
volume and surface of cylinder
yanncloud Apr 30, 2024
0155490
little cleanup of the cylinder
yanncloud Apr 30, 2024
8df0aec
refactor: first batch of changes
Entkenntnis May 1, 2024
528292c
refactor: helper returns string
Entkenntnis May 1, 2024
178cb69
Merge pull request #3729 from serlo/math-skills-wheel-refactor
Entkenntnis May 1, 2024
bb14247
fix: no space between minus and number in pp
Entkenntnis May 2, 2024
ee843ae
refactor: add helper for polynoms
Entkenntnis May 2, 2024
81d87de
feat: finish "Parabel aus Punkten"
Entkenntnis May 2, 2024
534df1a
fix: update url, add difficulty
Entkenntnis May 2, 2024
88a5cd8
prepare: setup placeholder exercises and rework structure
Entkenntnis May 2, 2024
6bd1b42
chore: add jsdoc comments to pp
elbotho May 2, 2024
3e1fcf9
use pp instead of toLocaleString & toString…
elbotho May 2, 2024
8dbacfa
prettier
elbotho May 2, 2024
10e34d4
use buildJSX helper everywhere
elbotho May 2, 2024
749681d
simplify buildJSX helper by moving id to options
elbotho May 2, 2024
3de1dfc
use useMathSkillsName
elbotho May 2, 2024
b0cae60
replace MainTask, HightlightGray, HighlightGreen
elbotho May 2, 2024
ff639de
remove old imports
elbotho May 2, 2024
fe1c9ca
some cleanup
elbotho May 2, 2024
fb5cc83
Update cylinder.tsx
peter-furlan May 3, 2024
0b753e5
drawing of ellipse changed
peter-furlan May 3, 2024
f0ed707
Merge branch 'meine-mathe-skills' into math-skills-some-refactoring
Entkenntnis May 3, 2024
5dab1ff
Merge pull request #3749 from serlo/math-skills-some-refactoring
Entkenntnis May 3, 2024
03293da
fix: prettier
Entkenntnis May 3, 2024
e140eaa
fix: use big sqrt
Entkenntnis May 3, 2024
461a9f4
Cylinder no longer wip
peter-furlan May 3, 2024
f8d3946
feat: finish find parabola
Entkenntnis May 6, 2024
da36ed4
fix: remove wip, change url
Entkenntnis May 6, 2024
dc3d702
volume and surface cone
yanncloud May 6, 2024
7a6025d
Hint added
yanncloud May 6, 2024
56109fe
Update static-math.tsx
peter-furlan May 9, 2024
2d033ea
wip: first exercise type for area of parabola
Entkenntnis May 10, 2024
d4eba20
feat: Raute done
Entkenntnis May 10, 2024
cd5f42d
feat: add Drache
Entkenntnis May 10, 2024
0367eee
feat: add A(x) of triangle
Entkenntnis May 10, 2024
4ac77a4
volume and surface of a the sphere
yanncloud May 10, 2024
9f67fe6
Merge branch 'meine-mathe-skills' of https://github.com/serlo/fronten…
yanncloud May 10, 2024
d4a2605
Added Math.round to path 2
yanncloud May 10, 2024
687238b
feat: finish Fläche in Abhängigkeit
Entkenntnis May 10, 2024
3567f33
Merge branch 'meine-mathe-skills' of https://github.com/serlo/fronten…
Entkenntnis May 10, 2024
ffe05ef
feat: added second variatione
Entkenntnis May 10, 2024
2344096
feat: that's it, completing first iteration of track 2
Entkenntnis May 10, 2024
07ec0b6
typos
peter-furlan May 10, 2024
5185898
Update ball.tsx
peter-furlan May 10, 2024
75f139e
Merge branch 'staging' into meine-mathe-skills
Entkenntnis May 13, 2024
8f90107
wip: prepare for next work package
Entkenntnis May 13, 2024
59e6adc
review
Entkenntnis May 13, 2024
bf9929a
review
Entkenntnis May 13, 2024
ae3cfc5
wip: add second and third case
Entkenntnis May 13, 2024
a524cf7
finish last case
Entkenntnis May 13, 2024
df024bd
almost done, there is just one minor thing to fix
Entkenntnis May 14, 2024
db01bc2
feat: finish section Potenzfunktionen
Entkenntnis May 14, 2024
d2efd79
Merge branch 'staging' into meine-mathe-skills
Entkenntnis May 14, 2024
535a8e7
refactor: change title
Entkenntnis May 15, 2024
4c7855a
Update static-math.tsx
peter-furlan May 18, 2024
1fd5597
Merge branch 'staging' into meine-mathe-skills
elbotho May 21, 2024
aad4aea
fix imports
elbotho May 21, 2024
b3a50e9
hotfix: disable prerendering
Entkenntnis May 21, 2024
cb42bd9
fix: Kegel
Entkenntnis May 21, 2024
6317734
fix: Glücksrad wrong color name
Entkenntnis May 21, 2024
e35f48f
fix: typo in graph verschieben/spiegeln
Entkenntnis May 21, 2024
a9e5994
fix: regression in sinus/kosinus/tangens
Entkenntnis May 21, 2024
ef6a43c
fix: missing heute in Kapital berechnen
Entkenntnis May 21, 2024
73616cf
fix: use merge_op helper in eigenschaften exponentialfunktion
Entkenntnis May 21, 2024
8ecce7e
fix: graph zeichnen potenzfunktionen
Entkenntnis May 23, 2024
313fb29
fix: another attempt at fixing it
Entkenntnis May 23, 2024
b5a3fd9
Revert "hotfix: disable prerendering"
Entkenntnis May 25, 2024
5a54f73
fix: edge case in find parabola
Entkenntnis May 25, 2024
96e0779
fix: missing variables in Knifflige Aufgabe
Entkenntnis May 25, 2024
25542e4
Update asymptote-1.tsx
Entkenntnis May 27, 2024
37db5ef
Update trigonometry-1.tsx
Entkenntnis May 27, 2024
15cbd60
fix: prettier
Entkenntnis May 27, 2024
ac4fcf5
fix: avoid over exact internal values
Entkenntnis May 27, 2024
13b3696
reformulate
Entkenntnis May 28, 2024
54568c1
fix typo
Entkenntnis May 28, 2024
78b0ee3
make it mathematically better
Entkenntnis May 28, 2024
36231a5
refactor(taxonomy): Remove `taxonomyId`
kulla Jun 12, 2024
b00eb03
Merge pull request #3883 from serlo/ONM12-kulla-2024-06-12-15-28
elbotho Jun 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
2 changes: 1 addition & 1 deletion apps/web/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const nextConfig = {
},
reactStrictMode: true,
productionBrowserSourceMaps: true,
transpilePackages: ['ramda', '@serlo/editor'], // context: https://github.com/vercel/next.js/issues/40183
transpilePackages: ['jsxgraph', 'ramda', '@serlo/editor'], // context: https://github.com/vercel/next.js/issues/40183
experimental: {
scrollRestoration: true,
},
Expand Down
2 changes: 2 additions & 0 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,12 @@
"graphql-request": "^6.1.0",
"iframe-resizer": "^4.3.11",
"iframe-resizer-react": "^1.1.0",
"immer": "9",
"io-ts": "^2.2.21",
"is-hotkey": "^0.2.0",
"js-cookie": "^3.0.5",
"json-diff": "^1.0.6",
"jsxgraph": "^1.8.0",
"katex": "^0.16.10",
"mathjs": "^12.4.1",
"mathlive": "^0.98.6",
Expand Down
37 changes: 37 additions & 0 deletions apps/web/public/_assets/img/math-skills/crocodile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading