Merge pull request #4562 from serlo/staging

Deployment

Author: elbotho

.github/workflows/sync-to-gitlab.yml

@@ -0,0 +1,17 @@
+name: Sync to GitLab
+on:
+  push:
+    branches:
+      - staging
+      - production
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Sync to GitLab
+        uses: kulla/sync-to-gitlab@v1
+        with:
+          owner: stephan_kulla
+          repository_name: serlo-frontend
+          token: ${{ secrets.GITLAB_TOKEN }}

.yarn/cache/@serlo-editor-npm-0.24.0-6846c590e6-dc071e92e9.zip

@@ -26,9 +26,6 @@
     "show-unused-exports": "ts-unused-exports tsconfig.json --excludePathsFromReport=src/pages/ --excludePathsFromReport=src/fetcher/graphql-types/operations.ts --allowUnusedTypes",
     "start": "next start"
   },
-  "resolutions": {
-    "@serlo/katex-styles": "1.0.1"
-  },
   "dependencies": {
     "@cortex-js/compute-engine": "^0.22.0",
     "@fortawesome/fontawesome-svg-core": "6.7.2",
@@ -45,7 +42,6 @@
     "@radix-ui/react-navigation-menu": "^1.2.1",
     "@serlo/authorization": "^0.60.0",
     "@serlo/editor": "workspace:*",
-    "@serlo/katex-styles": "1.0.1",
     "@tippyjs/react": "^4.2.6",
     "@vidstack/react": "next",
     "array-move": "^4.0.0",
@@ -62,7 +58,6 @@
     "isomorphic-dompurify": "^2.22.0",
     "js-cookie": "^3.0.5",
     "json-diff": "^1.0.6",
-    "katex": "^0.16.21",
     "mathjs": "^13.2.2",
     "mathlive": "^0.104.0",
     "next": "^14.2.26",
@@ -102,7 +97,6 @@
     "@types/iframe-resizer": "^3.5.13",
     "@types/js-cookie": "^3.0.6",
     "@types/json-diff": "^1.0.3",
-    "@types/katex": "^0.16.7",
     "@types/node": "^20.17.6",
     "@types/nprogress": "^0.2.3",
     "@types/qrcode.react": "^1.0.5",

.yarn/cache/@serlo-editor-npm-0.26.0-bb60b8e32a-fc0337e89d.zip

@@ -2,8 +2,8 @@
 @import 'tailwindcss/base';
 @import 'tailwindcss/components';
 
-@import '../../../../../packages/editor/src/tailwind/components.css';
-@import '../../../../../packages/editor/src/tailwind/utilities.css';
+@import '../../../../../packages/editor/src/assets/tailwind/components.css';
+@import '../../../../../packages/editor/src/assets/tailwind/utilities.css';
 @import './components.css';
 
 @import 'tailwindcss/utilities';

.yarn/cache/@types-katex-npm-0.16.7-c19be7ec5f-4fd15d9355.zip

@@ -11,7 +11,6 @@ import { Breadcrumbs } from '../navigation/breadcrumbs'
 import { MaxWidthDiv } from '../navigation/max-width-div'
 import { SecondaryMenu } from '../navigation/secondary-menu'
 import { NewsletterPopup } from '../scripts/newsletter-popup'
-import type { DonationsBannerProps } from '@/components/content/donations-banner-experiment/donations-banner'
 import {
   type EntityPageBase,
   type SingleEntityPage,
@@ -31,12 +30,6 @@ const CommentAreaEntity = dynamic<CommentAreaEntityProps>(() =>
   )
 )
 
-const DonationsBanner = dynamic<DonationsBannerProps>(() =>
-  import(
-    '@/components/content/donations-banner-experiment/donations-banner'
-  ).then((mod) => mod.DonationsBanner)
-)
-
 export function EntityBase({ children, page, entityId }: EntityBaseProps) {
   const noComments =
     page.kind === 'single-entity' &&
@@ -70,11 +63,6 @@ export function EntityBase({ children, page, entityId }: EntityBaseProps) {
           />
           <main id="content">{children}</main>
 
-          {/* Temporary donations banner trial */}
-          {page.kind === 'single-entity' ? (
-            <DonationsBanner id={entityId} entityData={page.entityData} />
-          ) : null}
-
           <div id="comment-area-begin-scrollpoint" />
           {!noComments && (
             <>

.yarn/cache/caniuse-lite-npm-1.0.30001669-1160fd58ad-8ed0c69d0c.zip

@@ -401,13 +401,13 @@ export function EquationTask({ data, onSolve, onBack }: EquationTaskProps) {
             <div className="mx-auto max-w-[1024px]">
               <div className="flex justify-center">
                 {renderButton(
-                  <span style={{ fontFamily: 'KaTeX_Main' }} className="italic">
+                  <span style={{ fontFamily: 'Fira Math' }} className="italic">
                     x
                   </span>,
                   ['insert', 'x']
                 )}
                 {renderButton(
-                  <span style={{ fontFamily: 'KaTeX_Main' }} className="italic">
+                  <span style={{ fontFamily: 'Fira Math' }} className="italic">
                     y
                   </span>,
                   ['insert', 'y']
@@ -431,13 +431,13 @@ export function EquationTask({ data, onSolve, onBack }: EquationTaskProps) {
               </div>
               <div className="flex justify-center">
                 {renderButton(
-                  <span style={{ fontFamily: 'KaTeX_Main' }} className="italic">
+                  <span style={{ fontFamily: 'Fira Math' }} className="italic">
                     a
                   </span>,
                   ['insert', 'a']
                 )}
                 {renderButton(
-                  <span style={{ fontFamily: 'KaTeX_Main' }} className="italic">
+                  <span style={{ fontFamily: 'Fira Math' }} className="italic">
                     b
                   </span>,
                   ['insert', 'b']

.yarn/cache/caniuse-lite-npm-1.0.30001680-df226595b2-2641d2b18c.zip

@@ -26,12 +26,12 @@ export function FooterNavNew() {
           >
             Mitmachen
           </Link>
-          <Link
+          {/* <Link
             className="serlo-new-landing-button !text-white md:mx-0"
             href="/spenden"
           >
             Spenden
-          </Link>
+          </Link> */}
         </div>
       </div>
       <Separator className="md:hidden" />

.yarn/cache/caniuse-lite-npm-1.0.30001715-820121c75b-c8371dceca.zip

@@ -4,7 +4,6 @@ import {
 } from '@fortawesome/free-solid-svg-icons'
 
 import { FaIcon } from '../fa-icon'
-import DonateIcon from '@/assets-webkit/img/footer-donate.svg'
 import ParticipateIcon from '@/assets-webkit/img/footer-participate.svg'
 import { Link } from '@/components/content/link'
 import { FooterNav } from '@/components/navigation/footer-nav'
@@ -64,15 +63,15 @@ function About() {
               {strings.footer.participate}
             </div>
           </Link>
-          <Link
+          {/* <Link
             href={footerData.donationHref}
             className="group flex flex-col items-center hover:no-underline"
           >
             <DonateIcon className="w-14" />
             <div className="serlo-button-learner mt-2 py-0.5 text-white hover:bg-brand group-hover:bg-brand">
               {strings.footer.donate}
             </div>
-          </Link>
+          </Link> */}
         </div>
       </div>
     </div>