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

Deployment #4295

Merged
merged 233 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
233 commits
Select commit Hold shift + click to select a range
eb81198
feat(plugin-interactive-video): add boilerplate code for plugin (wip)
elbotho Sep 17, 2024
0bf3735
feat(interactive-video): add vidstack player (wip)
elbotho Sep 17, 2024
373b6bb
add chapter/mark overlay button (wip)
elbotho Sep 19, 2024
87ed745
Merge branch 'staging' into feat/add-interactive-video-plugin
elbotho Sep 24, 2024
404bae6
fix
elbotho Sep 24, 2024
4d66163
Merge branch 'staging' into feat/add-interactive-video-plugin
elbotho Sep 27, 2024
c546a60
refactor(interactive-video): remove endTime from state for now
elbotho Sep 27, 2024
e7651f6
refactor(interactive-video): move overlay modal to component
elbotho Sep 27, 2024
fc4358d
refactor(interactive-video): add to plugin menu again
elbotho Sep 27, 2024
1f5d29a
refactor(interactive-video): simplify rewatch state
elbotho Sep 27, 2024
6a7fbb5
refactor(interactive-video): i18n, cleanup ui, switchbutton component
elbotho Sep 27, 2024
f3afe13
refactor(interactive-video): move marks list to component
elbotho Sep 27, 2024
66d97a2
feat(interactive-video): start work on static renderer
elbotho Sep 27, 2024
0d11c83
feat(interactive-video): make sure marks don't overlap
elbotho Sep 27, 2024
e4406dc
fix(interactive-video): make sure first mark can be added
elbotho Sep 27, 2024
7c61749
fix(interactive-video): stop dependency cycle
elbotho Sep 27, 2024
3ee5589
improve prevent seeking feature
elbotho Oct 4, 2024
8c58c96
refactor(editor): add plugin id to editorLearnerEvent
elbotho Oct 4, 2024
38aaa3c
feat(interactive-video): listen and store learner interactions
elbotho Oct 4, 2024
ea4a0f2
feat(interactive-video): add barebones replay feature, refactor
elbotho Oct 4, 2024
74921e4
feat(interactive-video): make modal work in fullscreen
elbotho Oct 4, 2024
52bfc5c
fix(interactive-video): check if playing is allowed as well
elbotho Oct 4, 2024
c3b4114
feat(interactive-video): add small animation, refactor
elbotho Oct 4, 2024
4a37e8e
refactor(interactive-video): remove fillers for now
elbotho Oct 4, 2024
7841e98
feat(interactive-video): custom timeslider with dots
elbotho Oct 4, 2024
36ee255
feat(interactive-video): allow quick navigation before overlay opens
elbotho Oct 4, 2024
e5ec494
refactor(interactive-video): make sure marks are always sorted by sta…
elbotho Oct 4, 2024
68ce349
feat(interactive-video): make sure empty title gets focus
elbotho Oct 4, 2024
646569a
feat(interactive-video): color dots according to mark settings
elbotho Oct 4, 2024
4bd30a9
feat(interactive-video): add some spacing
elbotho Oct 4, 2024
43b2691
feat(interactive-video): format seconds
elbotho Oct 7, 2024
437c051
fix(interactive-video): find last previous mark, not first
elbotho Oct 7, 2024
ac549d5
Merge branch 'staging' into feat/add-interactive-video-plugin
elbotho Oct 7, 2024
fc8ba90
feat(interactive-video): add translations
elbotho Oct 7, 2024
4aa99d1
eslint
elbotho Oct 7, 2024
b150cea
fix(interactive-video): make sure player UI is still clickable, make …
elbotho Oct 10, 2024
28a4ced
feat(interactive-video): add side margin
elbotho Oct 10, 2024
99b8aff
feat(interactive-video): smaller dots in timeline, subtler colors
elbotho Oct 10, 2024
429c00a
feat(interactive-video): show exercise type in MarksList, change style
elbotho Oct 10, 2024
85e7dfe
fix(interactive-video): longer placeholder, translate missing string
elbotho Oct 10, 2024
1cfc129
fix(interactive-video): do not auto focus title so exercise toolbar i…
elbotho Oct 10, 2024
05535e0
feat(interactive-video): add video src selection
elbotho Oct 10, 2024
7c79498
feat(interactive-video): add context button to change video
elbotho Oct 10, 2024
b7cf716
refactor(interactive-video): use static string instead of instance data
elbotho Oct 10, 2024
24c3846
refactor(rows): write reverse lookup for interactive plugins menu items
elbotho Oct 10, 2024
4dbb2db
feat(blanks): add blanks typeguard
elbotho Oct 10, 2024
6290bb2
feat(interactive-video): add interactive type icon and title string i…
elbotho Oct 10, 2024
42a59a8
feat(interactive-video): only show marks list when focused
elbotho Oct 10, 2024
b7690d9
feat(interactive-video): green dots when exercise is solved
elbotho Oct 10, 2024
b8d2334
fix(interactive-video): some i18n
elbotho Oct 10, 2024
418bcce
fix(interactive-video): typo
elbotho Oct 11, 2024
8d6738d
fix(interactive-video): make sure dots don't get squished
elbotho Oct 11, 2024
eaad765
fix(interactive-video): refocus plugin after modal closes
elbotho Oct 11, 2024
e589d09
fix(interactive-video): add suspense hopefully solve react error
elbotho Oct 17, 2024
767b28f
Merge branch 'staging' into feat/add-interactive-video-plugin
elbotho Oct 17, 2024
1c0bea4
feat(interactive-video): hide exercise task until interactive is sele…
elbotho Oct 17, 2024
bd38034
Merge branch 'staging' into feat/add-interactive-video-plugin
elbotho Oct 29, 2024
9582c18
fix(interactive-video): update imports
elbotho Oct 29, 2024
ffc1967
refactor(interactive-video): replace close button with save button
elbotho Oct 29, 2024
999819d
refactor(interactive-video): integrate preview in edit view so vidpla…
elbotho Oct 29, 2024
4821634
feat(plugin-rows): replace drag handle with reorder buttons
hejtful Nov 5, 2024
777ffcf
feat(plugin-rows): scroll down-moved-plugin back into view
hejtful Nov 5, 2024
054d235
chore(editor): rename "solution" to "solution approach" to make ui cl…
elbotho Nov 5, 2024
ed765e4
Merge branch 'staging' into feat/add-interactive-video-plugin
elbotho Nov 13, 2024
ed8c76b
refactor(interactive-video): cleanup after merge, change save button …
elbotho Nov 13, 2024
64d305a
refactor(interactive-video): self-review, cleanup, refactoring
elbotho Nov 13, 2024
a8a0a53
chore: yarn
elbotho Nov 13, 2024
40c2fe6
chore(interactive-video): fix vidstack version to "next" again
elbotho Nov 13, 2024
01032bf
feat: plugin hover focus state frame shadow (in progress)
hejtful Nov 14, 2024
ecf2cdd
feat(editor): more layout fixes
hejtful Nov 14, 2024
0827011
feat(editor): article layout fix
hejtful Nov 14, 2024
94f53db
feat(editor): nested shadows fix
hejtful Nov 14, 2024
4859023
refactor(editor): Add hook for isSerlo
Nov 15, 2024
9334312
fix(editor): Allow absolute urls for integrations
Nov 15, 2024
dcff5ac
refactor(editor): Rename variable
Nov 15, 2024
a2981c1
chore(editor): Release v0.19.1
Nov 15, 2024
6e5a72f
chore: update changelog for version 0.19.1
github-actions[bot] Nov 15, 2024
53f622c
Merge branch 'staging' into feat/plugin-hover-focus-state-frame
hejtful Nov 18, 2024
3c0dd9a
chore(yarn): arm64 files
hejtful Nov 18, 2024
0f61689
fix(editor): toolbar shadow
hejtful Nov 18, 2024
83cc5b6
fix(editor): multimedia positioning
hejtful Nov 18, 2024
38b2d65
wip: test iframe click event
LarsTheGlidingSquirrel Nov 18, 2024
4576182
Merge branch 'staging' into feat/add-interactive-video-plugin
elbotho Nov 18, 2024
4070d2a
fix(editor): box positioning fixes
hejtful Nov 18, 2024
3e465ac
Merge pull request #4294 from serlo/production
elbotho Nov 18, 2024
ad05524
Merge pull request #4152 from serlo/feat/add-interactive-video-plugin
elbotho Nov 18, 2024
928877d
fix(editor): table positioning (not 100% wysiwyg)
hejtful Nov 18, 2024
e653768
Revert "wip: test iframe click event"
LarsTheGlidingSquirrel Nov 18, 2024
23bb69a
fix(editor): prettier
hejtful Nov 18, 2024
8538298
fix(editor): injection positioning
hejtful Nov 18, 2024
b31d7a7
fix(editor): toolbar shadow overlay pointer events
hejtful Nov 18, 2024
05da55d
fix(editor): exercise positioning
hejtful Nov 18, 2024
c95d865
chore(editor): merge staging
hejtful Nov 18, 2024
e6e3d1a
fix(e2e): adapt some exercise tests
elbotho Nov 18, 2024
6a43bfa
fix(e2e): adapt one more
elbotho Nov 18, 2024
d05ab20
Merge pull request #4296 from serlo/e2e/adapt-some-exercise-tests
elbotho Nov 18, 2024
57bb267
Update packages/editor/src/editor-ui/plugin-toolbar/plugin-toolbar.tsx
hejtful Nov 18, 2024
e45a64e
Update packages/editor/src/editor-ui/embed-wrapper.tsx
hejtful Nov 18, 2024
14f681a
Update packages/editor/src/plugins/box/editor.tsx
hejtful Nov 18, 2024
cb7d23e
fix(editor): box and spoiler shadows
hejtful Nov 18, 2024
c8e045f
fix(editor): article intro explanation toolbar positioning
hejtful Nov 18, 2024
5fe81f5
fix(editor): shadow finetuning box spoiler multimedia
hejtful Nov 18, 2024
1917738
fix(editor): text bottom padding
hejtful Nov 18, 2024
30a9865
fix(editor): class specificity
hejtful Nov 18, 2024
20172f4
fix(editor): class specificity 2nd try
hejtful Nov 18, 2024
646e494
fix(editor): code/highlight afterfix
hejtful Nov 18, 2024
f172162
fix(editor): exercise shadows
hejtful Nov 18, 2024
b844cd7
fix(editor): exercise shadow overlap
hejtful Nov 18, 2024
dc5cf84
fix(editor): table spoiler box positioning
hejtful Nov 18, 2024
7ba0798
fix(editor): Implement feedback of Botho, renaming variable and early…
CodingDive Nov 18, 2024
725fec5
refactor(editor): Convert www into https://
CodingDive Nov 18, 2024
3d114d7
Merge branch 'staging' into fix/link-absolute-serlo-urls-in-integrations
CodingDive Nov 18, 2024
18f7024
fix(web): spoiler children
hejtful Nov 18, 2024
ce81143
fix(editor): multimedia explanation three quarters
hejtful Nov 18, 2024
0c156a4
chore(deps): bump cross-spawn from 6.0.5 to 6.0.6
dependabot[bot] Nov 18, 2024
b690638
Merge pull request #4297 from serlo/dependabot/npm_and_yarn/cross-spa…
elbotho Nov 18, 2024
1be1218
fix(plugin-edusharing): allow focusing the plugin by clicking on the …
LarsTheGlidingSquirrel Nov 19, 2024
5da3424
Merge pull request #4298 from serlo/edu-sharing-plugin-focus
LarsTheGlidingSquirrel Nov 19, 2024
01cd35f
fix(auth): add missing kratos string
elbotho Nov 19, 2024
6625c54
Merge pull request #4299 from serlo/fix/missing-kratos-string
elbotho Nov 19, 2024
34779b1
fix(editor): table right padding
hejtful Nov 19, 2024
b44b8e0
Update source file index.ts
kulla Nov 19, 2024
7bea4da
New translations index.ts (French)
kulla Nov 19, 2024
bc3566d
New translations index.ts (Spanish)
kulla Nov 19, 2024
3b6749f
New translations index.ts (German)
kulla Nov 19, 2024
4622913
New translations index.ts (Tamil)
kulla Nov 19, 2024
03238ef
New translations index.ts (Hindi)
kulla Nov 19, 2024
4f90f60
Merge pull request #4300 from serlo/staging-translated
elbotho Nov 19, 2024
0dc859c
refactor(editor): normalize links only on serlo.org
elbotho Nov 19, 2024
bf639db
Merge pull request #4301 from serlo/refactor/link-normalization
CodingDive Nov 19, 2024
c46fb0b
fix(editor): multimedia side padding
hejtful Nov 19, 2024
431b251
i18n(editor): Change placeholder text
CodingDive Nov 19, 2024
db7305a
fix(editor): allow nullish state in `SerloRenderer`
LarsTheGlidingSquirrel Nov 20, 2024
98f2f76
Merge pull request #4302 from serlo/allow-nullish-state-in-serlo-rend…
LarsTheGlidingSquirrel Nov 20, 2024
0ad71a3
fix(editor): remove fixed size from text area icon
LarsTheGlidingSquirrel Nov 20, 2024
74da59f
Merge pull request #4303 from serlo/fix-plugin-icon-size
LarsTheGlidingSquirrel Nov 20, 2024
e565853
Merge pull request #4289 from serlo/fix/link-absolute-serlo-urls-in-i…
CodingDive Nov 20, 2024
6b5fac6
chore(editor): Regenerate changelog
CodingDive Nov 20, 2024
d75b412
chore: update changelog for version 0.19.1
github-actions[bot] Nov 20, 2024
51eff94
Merge pull request #4304 from serlo/chore/release-editor-v0.19.1
CodingDive Nov 20, 2024
67bc6ab
chore(editor-web-component): Release v0.10.2
CodingDive Nov 20, 2024
668b541
Merge pull request #4305 from serlo/chore/release-editor-web-componen…
CodingDive Nov 20, 2024
88ae1e5
fix(kratos): handle new error msgs for password
hugotiburtino Nov 20, 2024
4666b88
fix(editor): Render toasts in Toaster
CodingDive Nov 20, 2024
b79c45e
refactor(auth): fix minor typo and remove now unnecessary hack
hugotiburtino Nov 20, 2024
9ad96ad
fix: Wording of comment
CodingDive Nov 20, 2024
e9d6d2b
Merge pull request #4277 from serlo/feat/plugin-hover-focus-state-frame
hejtful Nov 21, 2024
6c2fd3e
chore: upgrade slate
hejtful Nov 21, 2024
6421150
e2e: adjust tests
hejtful Nov 21, 2024
2e22a09
Merge pull request #4307 from serlo/fix/render-toasts-in-editor-integ…
CodingDive Nov 21, 2024
ca4f50f
refactor(i18n): only translate into English the new msg
hugotiburtino Nov 21, 2024
7ba098e
chore(editor): Release v0.19.2
CodingDive Nov 21, 2024
0c473ec
Merge pull request #4308 from serlo/chore/upgrade-slate
hejtful Nov 21, 2024
9a626f0
fix(plugin-edusharing): keep overlay but let pointer events pass through
LarsTheGlidingSquirrel Nov 21, 2024
cf9bc02
chore: update changelog for version 0.19.2
github-actions[bot] Nov 21, 2024
fc2117b
Merge pull request #4310 from serlo/chore/release-editor-v0.19.2
CodingDive Nov 21, 2024
7fe5662
Merge pull request #4306 from serlo/kratos-password-new-untranslated
hugotiburtino Nov 21, 2024
6982913
New translations index.ts (French)
kulla Nov 21, 2024
f47430e
New translations index.ts (Spanish)
kulla Nov 21, 2024
a8d712e
New translations index.ts (German)
kulla Nov 21, 2024
cd13fd2
New translations index.ts (Tamil)
kulla Nov 21, 2024
6e91cad
New translations index.ts (Hindi)
kulla Nov 21, 2024
3bb57dc
Update source file index.ts
kulla Nov 22, 2024
8503447
refactor!(video): remove references to wikimedia commons
hugotiburtino Nov 22, 2024
39e20b9
refactor!(video): do not support wikimedia commons videos anymore
hugotiburtino Nov 22, 2024
842a69e
format
hugotiburtino Nov 22, 2024
865d617
format again
hugotiburtino Nov 22, 2024
38bb5de
fix(plugin-edusharing): make loading plugin state have aspect 16/9 to…
LarsTheGlidingSquirrel Nov 22, 2024
da05e16
New translations index.ts (German)
kulla Nov 22, 2024
5b3f020
Merge pull request #4311 from serlo/staging-translated
elbotho Nov 22, 2024
945ee1c
feat(video): allow getting any video from asset bucket
hugotiburtino Nov 22, 2024
a1de58c
feat(video): show video from serlo asset directly, not getting consent
hugotiburtino Nov 22, 2024
f9c6a5c
Merge pull request #4309 from serlo/fix-edu-sharing-focus
LarsTheGlidingSquirrel Nov 25, 2024
61c10d4
fix(plugin-edusharing): use `open-iframe-resizer`
LarsTheGlidingSquirrel Nov 25, 2024
f6ebb5b
Merge remote-tracking branch 'origin/staging' into plugin-edusharing-…
LarsTheGlidingSquirrel Nov 25, 2024
0135668
Merge branch 'staging' into feat/rows-new-reorder-buttons
hejtful Nov 25, 2024
64976f7
fix(plugin-edusharing): prevent lingering scroll bar
LarsTheGlidingSquirrel Nov 25, 2024
dcab24d
feat(editor): reorder plugins animation
hejtful Nov 25, 2024
4f99855
feat(rows-editor): reorder buttons design
hejtful Nov 25, 2024
4da0a3a
refactor(rows-editor): try lazy loading motion animations
hejtful Nov 25, 2024
89e707a
refactor(plugin-injection): use open-iframe-resizer
hejtful Nov 25, 2024
e2c1aed
Merge pull request #4315 from serlo/refactor/serlo-injection-open-ifr…
LarsTheGlidingSquirrel Nov 25, 2024
a595636
refactor: replace `iframe-resizer` fully with `open-iframe-resizer`
LarsTheGlidingSquirrel Nov 27, 2024
db294da
refactor(rows-editor): scroll into view before switching animation
hejtful Nov 27, 2024
97e92d2
refactor(rows-editor): add offset when scrolling into view
hejtful Nov 27, 2024
9e60b4b
feat(plugin-text-area-exercise): enable in staging
LarsTheGlidingSquirrel Nov 27, 2024
2f2e05f
Merge pull request #4316 from serlo/enable-text-area-exercise-in-staging
LarsTheGlidingSquirrel Nov 27, 2024
3392ed2
fix(input-exercise): use correct icon
hejtful Nov 27, 2024
798c08e
Merge pull request #4317 from serlo/fix/plugin-input-exercise-icon
hejtful Nov 27, 2024
0acc9ff
feat(interactive-video): add plugin icon
elbotho Nov 28, 2024
e6fee9b
Merge pull request #4319 from serlo/add-interactive-video-icon
elbotho Nov 28, 2024
dc38a1f
feat(interactive-video): add tool to delete all marks
elbotho Nov 28, 2024
75c5467
fix(interactive-video): update button className
elbotho Nov 28, 2024
058dc18
feat(interactive-video): try save info text instead of save button
elbotho Nov 28, 2024
35d91de
Merge pull request #4314 from serlo/plugin-edusharing-use-open-iframe…
LarsTheGlidingSquirrel Nov 28, 2024
dd693dd
fix(page-editor-preview): hide editor toolbar artifacts
LarsTheGlidingSquirrel Nov 29, 2024
6523abc
add open iframe resizer code to assets
elbotho Nov 29, 2024
087775e
refactor(web): hide localstorage notice on editor-preview as well
elbotho Nov 29, 2024
3006f43
Merge pull request #4325 from serlo/small-change-editor-preview
LarsTheGlidingSquirrel Nov 29, 2024
5688acf
Merge pull request #4323 from serlo/fix-remove-editor-toolbar-in-edit…
LarsTheGlidingSquirrel Nov 29, 2024
79de580
chore: allow cors on staging for injection content endpoint
elbotho Nov 29, 2024
0fa62b0
Merge pull request #4324 from serlo/iframe-resizer-local-file
elbotho Dec 1, 2024
ad5ad0e
Merge pull request #4313 from serlo/feat/rows-new-reorder-buttons
hejtful Dec 2, 2024
ec374b1
Merge pull request #4320 from serlo/feat/interactive-video-delete
elbotho Dec 2, 2024
e583bf5
test(plugin-box): remove deprecated focus e2e workaround
hejtful Dec 2, 2024
c62194f
Merge pull request #4328 from serlo/test/fix-box-focus-e2e
hejtful Dec 2, 2024
f5dd39e
Merge pull request #4312 from serlo/remove-wikimedia-video
elbotho Dec 2, 2024
625cece
chore(editor-web-component): Release v0.10.3, last version supporting…
Dec 3, 2024
1e61197
Merge pull request #4332 from serlo/chore/release-editor-web-componen…
CodingDive Dec 3, 2024
28809be
refactor(editor-packages): Throw out all mentions of shadow dom
Dec 3, 2024
40b0909
fix(editor): Render visual/latex select in math toolbar
Dec 3, 2024
daad3d9
Try to fix nested math issue
Dec 3, 2024
52d8aab
Merge pull request #4334 from serlo/fix/portal-math-toolbar-controls
CodingDive Dec 3, 2024
9012712
Merge pull request #4333 from serlo/refactor/remove-shadow-dom-techni…
CodingDive Dec 4, 2024
4d16d23
chore(editor): Release v0.20.0
CodingDive Dec 4, 2024
b2a6d8c
chore: update changelog for version 0.20.0
github-actions[bot] Dec 4, 2024
2b7fd26
Merge pull request #4335 from serlo/chore/release-editor-v0.20.0
CodingDive Dec 4, 2024
245a4af
chore(editor-web-component): Release version 0.11.0
CodingDive Dec 4, 2024
ca933de
Merge pull request #4336 from serlo/chore/release-editor-web-componen…
CodingDive Dec 4, 2024
2181fe8
docs(editor-web-component): Small clarification and update in shadow …
CodingDive Dec 4, 2024
d182bb5
docs(editor-web-component): Change wording
CodingDive Dec 4, 2024
24a8937
docs(editor-web-component): Wording for style isolation
CodingDive Dec 4, 2024
a3339ea
Merge pull request #4337 from serlo/docs/clarify-smaller-or-equal-to-…
CodingDive Dec 4, 2024
bc0b658
types(editor): Export SupportedLanguage type
CodingDive Dec 6, 2024
32511fe
feat(editor-web-component): Expose language strings
CodingDive Dec 6, 2024
33a230c
Merge pull request #4340 from serlo/feat/expose-language-in-editor-we…
CodingDive Dec 6, 2024
86cce13
chore(editor): Release v0.20.1
CodingDive Dec 6, 2024
d6a3c2f
chore: update changelog for version 0.20.1
github-actions[bot] Dec 6, 2024
30673b7
Merge pull request #4341 from serlo/chore/release-editor-v0.20.1
CodingDive Dec 6, 2024
b832274
chore(editor-web-component): Release v0.12.0 with support for the lan…
CodingDive Dec 6, 2024
980adb8
Merge pull request #4342 from serlo/chore/release-editor-web-componen…
CodingDive Dec 6, 2024
cd8895d
fix(plugin-rows): whole plugin drag handle bug
hejtful Dec 9, 2024
835bce9
Merge pull request #4343 from serlo/fix/dragging-spill
hejtful Dec 10, 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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"@serlo/editor": "workspace:*",
"@serlo/katex-styles": "1.0.1",
"@tippyjs/react": "^4.2.6",
"@vidstack/react": "next",
"array-move": "^4.0.0",
"autoprefixer": "^10.4.20",
"canvas-confetti": "^1.9.3",
Expand Down Expand Up @@ -131,7 +132,7 @@
"prettier-plugin-packagejson": "^2.5.3",
"prettier-plugin-tailwindcss": "^0.6.8",
"prop-types": "^15.8.1",
"slate": "^0.103.0",
"slate": "0.110.2",
"tailwindcss": "^3.4.15",
"tailwindcss-animate": "^1.0.7",
"ts-unused-exports": "^10.1.0",
Expand Down
8 changes: 8 additions & 0 deletions apps/web/public/_assets/open-iframe-resizer-1.2.1.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apps/web/src/assets-webkit/styles/serlo-tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@import 'tailwindcss/components';

@import '../../../../../packages/editor/src/tailwind/components.css';
@import '../../../../../packages/editor/src/tailwind/utilities.css';
@import './components.css';

@import 'tailwindcss/utilities';
Expand Down
3 changes: 1 addition & 2 deletions apps/web/src/components/auth/message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ export function Message({
? (typedContext.reason as string)
: ''
const searchString = reason + text
if (searchString.includes('password length'))
return strings.auth.passwordTooShort

if (searchString.includes('passwords are limited to a maximum length'))
return strings.auth.passwordTooLong
if (searchString.includes('does not match pattern'))
Expand Down
12 changes: 0 additions & 12 deletions apps/web/src/components/content/iframe-resizer.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions apps/web/src/components/content/lazy-iframe-resizer.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion apps/web/src/components/modal-with-close-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export interface ModalWithCloseButtonProps {
extraCloseButtonClassName?: string
extraOverlayClassName?: string
onEscapeKeyDown?: (event: KeyboardEvent) => void
onKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void
onKeyDown?: (event: React.KeyboardEvent) => void
}

export function ModalWithCloseButton({
Expand Down
5 changes: 2 additions & 3 deletions apps/web/src/components/pages/editor/education-plugins.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,9 @@ const pluginData = [
title: 'Video',
titleDe: 'Video',
icon: faFilm,
description:
'Embed videos directly from YouTube, Vimeo or Wikimedia Commons in your content.',
description: 'Embed videos directly from YouTube or Vimeo in your content.',
descriptionDe:
'Du kannst Videos direkt von YouTube, Vimeo oder Wikimedia Commons in deinen Inhalt einbetten.',
'Du kannst Videos direkt von YouTube oder Vimeo in deinen Inhalt einbetten.',
example: null,
image: 'video.png',
category: 'basic',
Expand Down
60 changes: 27 additions & 33 deletions apps/web/src/components/user/profile-settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,22 @@ export function ProfileSettings({ rawDescription }: ProfileSettingsProps) {
)

return (
<SpoilerRenderer
title={<>{buttonText}</>}
content={
<>
<p className="serlo-p mt-5">
{replacePlaceholders(description, { chatLink })}
</p>
<ol className="serlo-ol">
<li>{replacePlaceholders(steps.goToChat, { chatLink })}</li>
<li>{steps.signIn}</li>
<li>
{replacePlaceholders(steps.goToMyAccount, { myAccountLink })}
</li>
<li>{steps.uploadPicture}</li>
<li>{replacePlaceholders(steps.refreshPage, { refreshLink })}</li>
</ol>
</>
}
/>
<SpoilerRenderer title={<>{buttonText}</>}>
<>
<p className="serlo-p mt-5">
{replacePlaceholders(description, { chatLink })}
</p>
<ol className="serlo-ol">
<li>{replacePlaceholders(steps.goToChat, { chatLink })}</li>
<li>{steps.signIn}</li>
<li>
{replacePlaceholders(steps.goToMyAccount, { myAccountLink })}
</li>
<li>{steps.uploadPicture}</li>
<li>{replacePlaceholders(steps.refreshPage, { refreshLink })}</li>
</ol>
</>
</SpoilerRenderer>
)
}

Expand All @@ -105,20 +102,17 @@ export function ProfileSettings({ rawDescription }: ProfileSettingsProps) {
const editUrl = `https://docs.google.com/forms/d/e/1FAIpQLSdb_My7YAVNA7ha9XnBcYCZDk36cOqgcWkBqowatbefX0IzEg/viewform?usp=pp_url&entry.14483495=${username}`

return (
<SpoilerRenderer
title={<>{buttonText}</>}
content={
<>
<p className="serlo-p mt-5">{intro}</p>
<p className="serlo-p">{privacy}</p>
<p className="serlo-p">
<a href={editUrl} className="serlo-button-learner-primary">
{toForm}
</a>
</p>
</>
}
/>
<SpoilerRenderer title={<>{buttonText}</>}>
<>
<p className="serlo-p mt-5">{intro}</p>
<p className="serlo-p">{privacy}</p>
<p className="serlo-p">
<a href={editUrl} className="serlo-button-learner-primary">
{toForm}
</a>
</p>
</>
</SpoilerRenderer>
)
}

Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/data/de/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ export const instanceData = {
code1060002: "Wir haben dir eine E-Mail mit einem Link zum Wiederherstellen an die angegebene Adresse geschickt. %break% Schau in deine Mailbox und benutze den Link.",
code1070003: "Speichern",
code1070005: "Absenden",
code1070009: "Weiter",
code1080001: "Eine E-Mail mit einem Bestätigungslink wurde an die angegebene E-Mail-Adresse gesendet.",
code1080002: "Du hast deine E-Mail-Adresse erfolgreich bestätigt.",
code4000001: '%reason%',
Expand All @@ -365,6 +366,7 @@ export const instanceData = {
code4000007: "Ein Account mit der selben E-Mailadresse oder dem selben Benutzernamen existiert schon.",
code4000008: "Der Bestätigungscode ist ungültig. Bitte versuche es nochmal.",
code4000010: "Hast du deine E-Mailadresse schon bestätigt?.%break% %verificationLinkText%",
code4000032: "Dein Passwort hat weniger als 8 Zeichen.",
code4060004: "Der Link zum Wiederherstellen ist nicht gültig oder wurde schon benutzt. Bitte versuche dir noch mal einen Link zuschicken zu lassen.",
code4070001: "Der Bestätigungslink ist nicht gültig oder wurde schon benutzt. Bitte versuche dir noch mal einen Link zuschicken zu lassen.",
code4070005: "Dieser Bestätigungslink ist leider nicht mehr gültig. Bitte versuche eine neue E-Mail anzufordern."
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/data/en/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ export const instanceData = {
'An email containing a recovery link has been sent to the email address you provided. %break% Check your mailbox and click on the provided link it contains.',
code1070003: 'Save',
code1070005: 'Submit',
code1070009: 'Continue',
code1080001:
'An email containing a verification link has been sent to the email address you provided.',
code1080002: 'You have successfully verified your email address.',
Expand All @@ -400,6 +401,7 @@ export const instanceData = {
'The provided authentication code is invalid, please try again.',
code4000010:
'Have you already verified your email address?.%break% %verificationLinkText%',
code4000032: "You inserted less than 8 characters.",
code4060004:
'The recovery link is not valid or has already been used. Please try requesting an email again',
code4070001:
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/data/es/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ export const instanceData = {
code1060002: "Se ha enviado un correo con un enlace de recuperación a la dirección de correo electrónico que proporcionaste. %break% Comprueba tu buzón y haz clic en el enlace que contiene.",
code1070003: "Guardar",
code1070005: "Enviar",
code1070009: "Continuar",
code1080001: "Se ha enviado un correo electrónico con un enlace de verificación a la dirección de correo electrónico que proporcionaste.",
code1080002: "Has verificado correctamente tu dirección de correo electrónico.",
code4000001: '%reason%',
Expand All @@ -365,6 +366,7 @@ export const instanceData = {
code4000007: "Ya existe una cuenta con el mismo correo electrónico o nombre de usuario.",
code4000008: "El código de autentificación proporcionado no es válido, por favor, inténtalo de nuevo.",
code4000010: "¿Has verificado ya tu dirección de correo electrónico?%break%%verificationLinkText%",
code4000032: "You inserted less than 8 characters.",
code4060004: "El enlace de recuperación no es válido o ya ha sido utilizado. Por favor, intenta solicitar un correo electrónico de nuevo",
code4070001: "El enlace de verificación no es válido o ya ha sido utilizado. Por favor, intenta solicitar un correo electrónico de nuevo.",
code4070005: "Lo sentimos, este enlace de verificación ya no es válido. Por favor, intenta solicitar un correo electrónico de nuevo."
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/data/fr/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ export const instanceData = {
code1060002: 'An email containing a recovery link has been sent to the email address you provided. %break% Check your mailbox and click on the provided link it contains.',
code1070003: "Sauvegarder",
code1070005: "Soumettre",
code1070009: 'Continue',
code1080001: 'An email containing a verification link has been sent to the email address you provided.',
code1080002: 'You have successfully verified your email address.',
code4000001: '%reason%',
Expand All @@ -365,6 +366,7 @@ export const instanceData = {
code4000007: 'An account with the same email or username exists already.',
code4000008: 'The provided authentication code is invalid, please try again.',
code4000010: 'Have you already verified your email address?.%break% %verificationLinkText%',
code4000032: "You inserted less than 8 characters.",
code4060004: 'The recovery link is not valid or has already been used. Please try requesting an email again',
code4070001: 'The verification link is not valid or has already been used. Please try requesting an email again.',
code4070005: 'Sorry, this verification link is not valid any more. Please try requesting an email again.'
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/data/hi/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ export const instanceData = {
code1060002: 'An email containing a recovery link has been sent to the email address you provided. %break% Check your mailbox and click on the provided link it contains.',
code1070003: "सहेजें",
code1070005: "जमा करें",
code1070009: 'Continue',
code1080001: 'An email containing a verification link has been sent to the email address you provided.',
code1080002: 'You have successfully verified your email address.',
code4000001: '%reason%',
Expand All @@ -365,6 +366,7 @@ export const instanceData = {
code4000007: 'An account with the same email or username exists already.',
code4000008: 'The provided authentication code is invalid, please try again.',
code4000010: 'Have you already verified your email address?.%break% %verificationLinkText%',
code4000032: "You inserted less than 8 characters.",
code4060004: 'The recovery link is not valid or has already been used. Please try requesting an email again',
code4070001: 'The verification link is not valid or has already been used. Please try requesting an email again.',
code4070005: 'Sorry, this verification link is not valid any more. Please try requesting an email again.'
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/data/ta/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ export const instanceData = {
code1060002: 'An email containing a recovery link has been sent to the email address you provided. %break% Check your mailbox and click on the provided link it contains.',
code1070003: "சேமி",
code1070005: "இணைக்க",
code1070009: 'Continue',
code1080001: 'An email containing a verification link has been sent to the email address you provided.',
code1080002: 'You have successfully verified your email address.',
code4000001: '%reason%',
Expand All @@ -365,6 +366,7 @@ export const instanceData = {
code4000007: 'An account with the same email or username exists already.',
code4000008: 'The provided authentication code is invalid, please try again.',
code4000010: 'Have you already verified your email address?.%break% %verificationLinkText%',
code4000032: "You inserted less than 8 characters.",
code4060004: 'The recovery link is not valid or has already been used. Please try requesting an email again',
code4070001: 'The verification link is not valid or has already been used. Please try requesting an email again.',
code4070005: 'Sorry, this verification link is not valid any more. Please try requesting an email again.'
Expand Down
1 change: 0 additions & 1 deletion apps/web/src/helper/use-consent.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export enum ExternalProvider {
YouTube = 'YouTube',
WikimediaCommons = 'WikimediaCommons',
Vimeo = 'Vimeo',
GeoGebra = 'GeoGebra',
Twingle = 'Twingle',
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/pages/___editor_preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function Content() {
value={{ editorVariant: 'serlo-org', userId: 'serlo-preview-user' }}
>
<main id="content" className="flex">
<section className="min-h-screen w-[50vw] border-4 border-r-0 border-editor-primary">
<section className="min-h-screen w-1/2 border-4 border-r-0 border-editor-primary">
<header className="mx-side flex justify-between align-middle font-bold">
<h2 className="mb-12 text-editor-primary">Edit</h2>
<div>
Expand Down Expand Up @@ -153,7 +153,7 @@ function Content() {
</header>
<div className="px-2">{editor}</div>
</section>
<section className="min-h-screen w-[50vw] border-4 border-editor-primary">
<section className="min-h-screen w-1/2 border-4 border-editor-primary">
<h2 className="mx-side mb-12 font-bold text-editor-primary">
Preview
</h2>
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/pages/api/frontend/injection-content.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type { NextApiRequest, NextApiResponse } from 'next'

import { endpoint } from '@/api/endpoint'
import { InjectionOnlyContentQuery } from '@/fetcher/graphql-types/operations'
import { isProduction } from '@/helper/is-production'

/**
* Allows frontend (and later other) instances to get content of injected entity
Expand Down Expand Up @@ -134,6 +135,7 @@ export default async function handler(
function respondWithContent(content: any) {
const twoDaysInSeconds = 172800
res.setHeader('Cache-Control', `maxage=${twoDaysInSeconds}`)
if (!isProduction) res.setHeader('Access-Control-Allow-Origin', '*')
res.status(200).json(content)
}
}
Expand Down
7 changes: 5 additions & 2 deletions apps/web/src/pages/content-only/[...slug].tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { GetStaticPaths, GetStaticProps } from 'next'
import Script from 'next/script'

import { LazyIframeResizer } from '@/components/content/lazy-iframe-resizer'
import { Entity } from '@/components/entity/entity'
import { FrontendClientBase } from '@/components/frontend-client-base/frontend-client-base'
import { HeadTags } from '@/components/head-tags'
Expand Down Expand Up @@ -52,7 +52,10 @@ export default renderedPageNoHooks<SlugProps>(({ pageData }) => {
serloEntityData={{ entityId }}
authorization={pageData.authorization}
>
<LazyIframeResizer />
<Script
src="https://cdn.jsdelivr.net/npm/@open-iframe-resizer/[email protected]/dist/index.min.js"
strategy="lazyOnload"
/>
{pageData.metaData ? (
<HeadTags
data={pageData.metaData}
Expand Down
Loading
Loading