Skip to content

Commit

Permalink
feat(story): adjust Karls storyline
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerd Müller committed Jun 27, 2020
1 parent cbdf354 commit 206f82d
Show file tree
Hide file tree
Showing 116 changed files with 271 additions and 376 deletions.
631 changes: 265 additions & 366 deletions apps/demol/src/app/app.json

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added apps/demol/src/assets/02_12_(1).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_12_(13).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_12_(4).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_12_(5).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_12_(9).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(1).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(101).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(103).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(105).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(106).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(108).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(109).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(111).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(118).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(121).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(123).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(124).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(132).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(135).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(139).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(14).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(141).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(146).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(16).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(2).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(21).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(22).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(36).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(46).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(49).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(51).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(52).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(56).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(57).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(58).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(61).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(64).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(65).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(68).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(69).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(71).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(72).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(74).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(75).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(78).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(85).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(91).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(96).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(97).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_1455_(99).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_167_(4).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_2424_(1).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_2453_(1).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_2453_(2).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_2480_(1).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_278_(3).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_278_(7).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_45_(20).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_45_(21).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_45_(25).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_45_(5).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_45_(6).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_45_(9).webp
Binary file not shown.
Binary file added apps/demol/src/assets/02_84_(2).webp
Binary file not shown.
Binary file added apps/demol/src/assets/103.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_0016_Seite155.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_1590_Seite_138.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_214_Seite142.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_2593_(2).webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_2623_(3).webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_29_2_Seite85.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_30_1.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_30_2.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_30_3.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_a.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_aa.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_ac.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_c.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_g.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_h.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_j.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_k.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_l.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_s.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_t.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_v.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_y.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_31_z.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_8_5.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_8_Junge_mit_Becher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added apps/demol/src/assets/2_8_Stegbau.webp
Binary file not shown.
Binary file added apps/demol/src/assets/2_8_Weg_zum_Zeltlager.webp
Binary file not shown.
Binary file not shown.
Binary file added apps/demol/src/assets/PH_dig_205_Seite205.webp
Binary file not shown.
Binary file added apps/demol/src/assets/ankunft.webp
Binary file not shown.
Binary file added apps/demol/src/assets/annameetskarl.webp
Binary file not shown.
Binary file added apps/demol/src/assets/ausblick.webp
Binary file not shown.
Binary file added apps/demol/src/assets/endkapitel.webp
Binary file not shown.
Binary file added apps/demol/src/assets/gemeinsam.webp
Binary file not shown.
Binary file added apps/demol/src/assets/gruppenvorbereitung.webp
Binary file not shown.
Binary file added apps/demol/src/assets/ortsgruppe.webp
Binary file not shown.
Binary file added apps/demol/src/assets/probezeltlager.webp
Binary file not shown.
Binary file added apps/demol/src/assets/reise.webp
Binary file not shown.
Binary file added apps/demol/src/assets/weitermitkarl.webp
Binary file not shown.
2 changes: 0 additions & 2 deletions libs/ui/src/lib/daily/daily.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const dailyItems = ["Waschen und Baden", "Frühstück", "Wanderungen machen", "S
"Lagerruhe - Post- und Zeitungsausgabe", "Tagung des Lagerparlaments", "Gemeinsame Veranstaltungen", "Zeltruhe"];
const schedule = ["6 Uhr", "8 Uhr", "8 ½ – 12 Uhr ", "8 ½ – 9 ½", "12 ½ – 14 ½ ",
"18 – 19 Uhr", "19 ½ – 21 Uhr", "21 Uhr"]
const description = "Um die einzelnen Tagespunkte in die richtige Reihenfolge zu bringen, ziehe sie einfach auf das Plakat. Klicke auf 'Tagesplan anzeigen!', um dir den originalen Tagesablauf anzusehen."

export const Daily = (props: DailyProps) => {

Expand Down Expand Up @@ -54,7 +53,6 @@ export const Daily = (props: DailyProps) => {

return (
<div className="daily">
<div className="description">{description}</div>
{getItems()}
{showStatus()}
</div>
Expand Down
1 change: 0 additions & 1 deletion libs/ui/src/lib/memory/memory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ const Grid = props => {

return (
<div className="memory">
<p className="description">In diesem Aufdeck-Spiel geht es darum, gleiche Paare zu finden. Diese bestehen aus einer Zeichnung und dem dazu passenden Foto. Klicke einfach auf die Kärtchen, um zu sehen, was sich auf der Rückseite befindet. Zusammenpassende Paare bleiben aufgedeckt liegen.</p>
<div className="cards">
{list.map((item, index) => (
<Card
Expand Down
8 changes: 1 addition & 7 deletions libs/ui/src/lib/tictactoe/tictactoe.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import React, { useState, useContext } from "react";

import {AppContext } from '../chapter/context';
import React, { useState } from "react";

import './tictactoe.scss';

Expand Down Expand Up @@ -29,9 +27,6 @@ const computerSymbol = "O";

export const TicTacToe = (props: TicTacToeProps) => {

const [character, setCharacter] = useContext(AppContext);
const status = `Um zu spielen, setze dein Kreuz in eines der Kästchen, indem du dort hinein klickst. Danach ist ${character} dran. Um zu gewinnen, musst du drei Kreuze in einer waagerechten, senkrechten oder diagonalen Reihe platzieren.`;

const [squares, setSquares] = useState(Array(9).fill(null));
const winner = calculateWinner(squares);

Expand Down Expand Up @@ -77,7 +72,6 @@ export const TicTacToe = (props: TicTacToeProps) => {

return (
<div className='game'>
<div className='status'>{status}</div>
<div className='board'>
{squares.map((value, index) => (
renderSquare(index)
Expand Down
5 changes: 5 additions & 0 deletions libs/ui/src/lib/video/video.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ video {
padding: 5px;
}

.fifth {
flex: 1 20%;
padding: 5px;
}

.theater {
flex: 1 auto;
margin: 0 17%;
Expand Down

0 comments on commit 206f82d

Please sign in to comment.