@magmamath/students-features 1.2.1-rc.39 → 1.2.1-rc.4

package/src/features/pmProgress/components/list/ListItem.tsx

@@ -1,161 +0,0 @@
-import React, { useState } from 'react'
-import { ActivityIndicator, View, Pressable, StyleSheet, Text } from 'react-native'
-import {
-  ArrowRightIcon,
-  CheckIcon,
-  COLORS,
-  FONT_FAMILY,
-  HeadingVariants,
-  Typography,
-} from '@magmamath/react-native-ui'
-import { useText } from '../../../../shared/translation'
-
-const FINISHED_BG = '#EFFBF5'
-const FINISHED_TITLE = '#00804A'
-const FINISHED_SUBTITLE = '#29A96F'
-const FINISHED_ICON = '#5CD497'
-const CARD_HEIGHT = 52
-const ICON_SIZE = 25
-const SUBTITLE_FONT_SIZE = 10
-const SUBTITLE_LINE_HEIGHT = 14
-
-export type ListItemProps = {
-  title: string
-  subtitle: string
-  skillsLeft: number
-  isFinished?: boolean
-  isLoading?: boolean
-  onPress?: () => void
-  isSkillsLeftHidden?: boolean
-}
-
-export const ListItem = ({
-  title,
-  subtitle,
-  skillsLeft,
-  isFinished = false,
-  isLoading = false,
-  onPress,
-  isSkillsLeftHidden = false,
-}: ListItemProps) => {
-  const t = useText()
-  const [isHovered, setIsHovered] = useState(false)
-  const isSkillsLeftVisible = skillsLeft > 0 && !isFinished && !isSkillsLeftHidden
-
-  return (
-    <Pressable
-      onPress={onPress}
-      disabled={isLoading}
-      style={[
-        styles.card,
-        isFinished && styles.finished,
-        isHovered && styles.hovered,
-        isLoading && styles.loading,
-      ]}
-      onHoverIn={() => setIsHovered(true)}
-      onHoverOut={() => setIsHovered(false)}
-    >
-      <View style={styles.content}>
-        <Typography
-          variant={HeadingVariants.H10}
-          style={[styles.title, isFinished && styles.titleFinished]}
-          numberOfLines={1}
-        >
-          {title}
-        </Typography>
-        <Typography
-          style={[styles.subtitle, isFinished && styles.subtitleFinished]}
-          numberOfLines={1}
-        >
-          {subtitle}
-        </Typography>
-      </View>
-      <View style={styles.trailing}>
-        {isLoading ? (
-          <View style={styles.loadingIndicator}>
-            <Text>{t('pmProgress.loading')} </Text>
-            <ActivityIndicator size="small" color={COLORS.NEUTRAL_7} />
-          </View>
-        ) : (
-          <>
-            {isSkillsLeftVisible && (
-              <Typography variant={HeadingVariants.H10} style={styles.skills}>
-                {skillsLeft}{' '}
-                {skillsLeft === 1 ? t('pmProgress.skillLeft') : t('pmProgress.skillsLeft')}
-              </Typography>
-            )}
-            <View style={styles.icon}>
-              {isFinished ? (
-                <CheckIcon color={FINISHED_ICON} />
-              ) : (
-                <ArrowRightIcon color={COLORS.NEUTRAL_9} />
-              )}
-            </View>
-          </>
-        )}
-      </View>
-    </Pressable>
-  )
-}
-
-const styles = StyleSheet.create({
-  card: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    height: CARD_HEIGHT,
-    paddingLeft: 32,
-    paddingRight: 16,
-    backgroundColor: 'white',
-    borderRadius: 12,
-    gap: 8,
-    boxShadow: '0px 0px 1px 0px #33333366, 0px 1px 3px 0px #3333331A',
-  },
-  finished: {
-    backgroundColor: FINISHED_BG,
-    boxShadow: '0px 0px 1px 0px #33333366, 0px 1px 3px 0px #3333331A',
-  },
-  hovered: {
-    backgroundColor: '#FAFAFB',
-    boxShadow:
-      '0px 0px 1px 0px #33333366, 0px 1px 3px 0px #3333331A, 4px 4px 10px rgba(51, 51, 51, 0.15)',
-  },
-  content: {
-    flex: 1,
-  },
-  title: {
-    color: COLORS.NEUTRAL_9,
-  },
-  titleFinished: {
-    color: FINISHED_TITLE,
-  },
-  subtitle: {
-    color: COLORS.NEUTRAL_7,
-    fontSize: SUBTITLE_FONT_SIZE,
-    fontFamily: FONT_FAMILY.buenosAires,
-    lineHeight: SUBTITLE_LINE_HEIGHT,
-  },
-  subtitleFinished: {
-    color: FINISHED_SUBTITLE,
-  },
-  trailing: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: 8,
-  },
-  skills: {
-    color: COLORS.NEUTRAL_9,
-  },
-  icon: {
-    width: ICON_SIZE,
-    height: ICON_SIZE,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  loading: {
-    opacity: 0.5,
-  },
-  loadingIndicator: {
-    flexDirection: 'row',
-    gap: 8,
-  },
-})

package/src/features/pmProgress/components/list/PmDomainList.tsx

@@ -1,76 +0,0 @@
-import React from 'react'
-import { StyleSheet, View } from 'react-native'
-import { useUnit } from 'effector-react'
-import { BORDER_RADIUS, COLORS, ScrollableList, SPACING } from '@magmamath/react-native-ui'
-import { ListCard } from './ListCard'
-import { Fluency } from './Fluency'
-import { SliceDiamondIcon } from '../../../../shared/icons/SliceDiamondIcon'
-import { usePmProgress } from '../../context/PmProgressContext'
-import { isFluencyDomain } from '../../shared/pmProgress.helpers'
-import { SolvingFlow } from '../../shared/pmProgress.constants'
-
-export const PmDomainList = () => {
-  const { model, onStandardPress } = usePmProgress()
-  const domains = useUnit(model.tree.$domains)
-  const expandedId = useUnit(model.highlight.$expandedId)
-  const hoveredId = useUnit(model.highlight.$hoveredId)
-  const loaderOpeningId = useUnit(model.solving.$loaderOpeningId)
-
-  const fluency = domains.find(({ title }) => isFluencyDomain(title))
-  const list = fluency ? domains.filter(({ title }) => !isFluencyDomain(title)) : domains
-
-  return (
-    <View style={styles.container}>
-      <ScrollableList
-        data={list}
-        hideShadow
-        scrollbarWidth={8}
-        style={styles.scroll}
-        ListFooterComponent={<Fluency data={fluency} />}
-        keyExtractor={(item) => item.domainId}
-        renderItem={({ item, index }) => (
-          <ListCard
-            title={item.title}
-            items={item.standards.map((standard) => ({ ...standard, id: standard.standardId }))}
-            progress={item.scorePercentage}
-            color={item.color}
-            onPress={() => model.highlight.expand(item.domainId)}
-            onHoverIn={() => model.highlight.hover(item.domainId)}
-            onHoverOut={() => model.highlight.hover(null)}
-            onItemPress={async (item) => {
-              try {
-                model.solving.setLoaderOpeningId(item.id)
-                const skill = await model.solving.start({
-                  type: SolvingFlow.STANDARD,
-                  standardId: item.standardId,
-                })
-                await onStandardPress?.(skill)
-              } finally {
-                model.solving.setLoaderOpeningId(null)
-              }
-            }}
-            loadingItemId={loaderOpeningId}
-            isLast={index === list.length - 1}
-            isFirst={index === 0}
-            isExpanded={expandedId === item.domainId}
-            isHighlighted={hoveredId === item.domainId || expandedId === item.domainId}
-            icon={<SliceDiamondIcon color={item.color} />}
-          />
-        )}
-      />
-    </View>
-  )
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    overflow: 'hidden',
-    padding: SPACING[200],
-    backgroundColor: COLORS.NEUTRAL_1,
-    borderRadius: BORDER_RADIUS[400],
-  },
-  scroll: {
-    flex: 1,
-  },
-})

package/src/features/pmProgress/components/locked/PmStatusOverlay.tsx

@@ -1,101 +0,0 @@
-import React, { ReactNode } from 'react'
-import { StyleSheet, View } from 'react-native'
-import {
-  COLORS,
-  ErrorIcon,
-  HeadingVariants,
-  LockIcon,
-  SPACING,
-  Typography,
-} from '@magmamath/react-native-ui'
-import { useText } from '../../../../shared/translation'
-import { TranslationKeys } from '../../../../shared/translation/types'
-import { PmProgressStatus } from '../../shared/pmProgress.constants'
-
-type EmptyStateVariant = {
-  icon: ReactNode
-  circleColor: string
-  titleKey: TranslationKeys
-  subtitleKey: TranslationKeys
-}
-
-const PM_EMPTY_STATE_VARIANTS: Record<PmProgressStatus, EmptyStateVariant> = {
-  [PmProgressStatus.LOCKED]: {
-    icon: <LockIcon color={COLORS.NEUTRAL_6} size={40} />,
-    circleColor: COLORS.NEUTRAL_2,
-    titleKey: 'pmProgress.allLockedTitle',
-    subtitleKey: 'pmProgress.allLockedSubtitle',
-  },
-  [PmProgressStatus.ERROR]: {
-    icon: <ErrorIcon color={COLORS.PRIMARY_RED} size={40} />,
-    circleColor: COLORS.RED_1,
-    titleKey: 'pmProgress.initErrorTitle',
-    subtitleKey: 'pmProgress.initErrorSubtitle',
-  },
-}
-
-type PmStatusOverlayProps = {
-  status: PmProgressStatus
-}
-
-export const PmStatusOverlay = ({ status }: PmStatusOverlayProps) => {
-  const t = useText()
-
-  const variant = PM_EMPTY_STATE_VARIANTS[status]
-  if (!variant) return null
-
-  return (
-    <View style={styles.container}>
-      <View style={styles.content}>
-        <View style={[styles.iconCircle, { backgroundColor: variant.circleColor }]}>
-          {variant.icon}
-        </View>
-        <View style={styles.text}>
-          <Typography variant={HeadingVariants.H2} style={styles.title}>
-            {t(variant.titleKey)}
-          </Typography>
-          <Typography variant={HeadingVariants.H7} style={styles.subtitle}>
-            {t(variant.subtitleKey)}
-          </Typography>
-        </View>
-      </View>
-    </View>
-  )
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  content: {
-    alignItems: 'center',
-    gap: SPACING[500],
-    paddingBottom: SPACING[800],
-  },
-  iconCircle: {
-    width: 88,
-    height: 88,
-    borderRadius: 44,
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  text: {
-    alignItems: 'center',
-    gap: SPACING[200],
-    maxWidth: 340,
-  },
-  title: {
-    color: COLORS.NEUTRAL_9,
-    textAlign: 'center',
-    fontSize: 24,
-    fontWeight: '500',
-  },
-  subtitle: {
-    color: COLORS.NEUTRAL_7,
-    textAlign: 'center',
-    fontSize: 16,
-    fontWeight: '400',
-  },
-})

package/src/features/pmProgress/components/recs/PmTeacherRecs.tsx

@@ -1,127 +0,0 @@
-import React from 'react'
-import { StyleSheet, Text, View } from 'react-native'
-import { ListCard } from '../list/ListCard'
-import { PentagonIcon } from '../../../../shared/icons/PentagonIcon'
-import {
-  BORDER_RADIUS,
-  Button,
-  ButtonSize,
-  ButtonVariant,
-  COLORS,
-  SPACING,
-} from '@magmamath/react-native-ui'
-import { useText } from '../../../../shared/translation'
-import { useUnit, useStoreMap } from 'effector-react'
-import { CustomDomain, OpeningLoaderId, SolvingFlow } from '../../shared/pmProgress.constants'
-import { usePmProgress } from '../../context/PmProgressContext'
-
-export const PmTeacherRecs = () => {
-  const t = useText()
-  const { model, onPracticePress, onTeacherRecommendationPress } = usePmProgress()
-  const expandedId = useUnit(model.highlight.$expandedId)
-  const loaderOpeningId = useUnit(model.solving.$loaderOpeningId)
-
-  const { total, recommendations } = useStoreMap(
-    model.recommendations.$teacher,
-    ({ items, total }) => ({
-      total,
-      recommendations: items.map((skill) => ({
-        id: skill._id,
-        skillId: skill._id,
-        title: skill.nameTranslations,
-        subtitle: skill.shortDescriptionTranslations,
-        isCompleted: false,
-        skillsLeft: 0,
-      })),
-    }),
-  )
-
-  if (!recommendations.length) return null
-
-  return (
-    <View style={styles.container}>
-      <View style={styles.wrapper}>
-        <ListCard
-          title={t('pmProgress.teacherRecs')}
-          items={recommendations}
-          maxItems={3}
-          color={COLORS.PRIMARY_YELLOW}
-          expandedColor={COLORS.YELLOW_1}
-          onPress={() => model.highlight.expand(CustomDomain.TEACHER)}
-          onItemPress={async (item) => {
-            try {
-              model.solving.setLoaderOpeningId(item.id)
-              const skill = await model.solving.start({
-                type: SolvingFlow.TEACHER,
-                skillId: item.skillId,
-              })
-              await onPracticePress?.(skill)
-            } finally {
-              model.solving.setLoaderOpeningId(null)
-            }
-          }}
-          loadingItemId={loaderOpeningId}
-          isLast
-          isFirst
-          isSkillsLeftHidden
-          isExpanded={expandedId === CustomDomain.TEACHER}
-          isHighlighted={expandedId === CustomDomain.TEACHER}
-          icon={<PentagonIcon color={COLORS.PRIMARY_YELLOW} />}
-          rightContent={
-            <Button
-              onPress={async () => {
-                try {
-                  model.solving.setLoaderOpeningId(OpeningLoaderId.PRACTICE_BUTTON)
-                  const skill = await model.solving.start({ type: SolvingFlow.TEACHER })
-                  await onTeacherRecommendationPress?.(skill)
-                } finally {
-                  model.solving.setLoaderOpeningId(null)
-                }
-              }}
-              disabled={loaderOpeningId !== null}
-              isLoading={loaderOpeningId === OpeningLoaderId.PRACTICE_BUTTON}
-              size={ButtonSize.SMALL}
-              variant={ButtonVariant.SECONDARY}
-            >
-              {t('pmProgress.practiceButton')}
-            </Button>
-          }
-        />
-        {recommendations.length > 0 && (
-          <View style={styles.badge}>
-            <Text style={styles.text}>{total}</Text>
-          </View>
-        )}
-      </View>
-    </View>
-  )
-}
-
-const styles = StyleSheet.create({
-  container: {
-    overflow: 'visible',
-    padding: SPACING[200],
-    borderRadius: BORDER_RADIUS[400],
-    backgroundColor: COLORS.NEUTRAL_1,
-  },
-  wrapper: {
-    position: 'relative',
-  },
-  badge: {
-    position: 'absolute',
-    top: -8,
-    right: -8,
-    width: 20,
-    height: 20,
-    backgroundColor: COLORS.PRIMARY_RED,
-    alignItems: 'center',
-    justifyContent: 'center',
-    borderRadius: '50%',
-  },
-  text: {
-    textAlign: 'center',
-    fontSize: 12,
-    fontWeight: '600',
-    color: COLORS.NEUTRAL_1,
-  },
-})

package/src/features/pmProgress/components/standard/StandardTag.tsx

@@ -1,182 +0,0 @@
-import React from 'react'
-import { StyleSheet, View, Text } from 'react-native'
-import { DomainColor, PmProgressModel } from '@magmamath/students-features'
-import { SliceDiamondIcon } from '../../../../shared/icons/SliceDiamondIcon'
-import { COLORS, FONT_FAMILY } from '@magmamath/react-native-ui'
-import { usePmProgress } from '../../context/PmProgressContext'
-import { useStoreMap } from 'effector-react'
-
-type ColorPreset = {
-  background: string
-  titleColor: string
-  tagColor: string
-}
-
-const DOMAIN_COLOR_PRESETS: Record<DomainColor, ColorPreset> = {
-  [COLORS.PRIMARY_RED]: {
-    background: COLORS.RED_1,
-    titleColor: COLORS.RED_6,
-    tagColor: COLORS.PRIMARY_RED,
-  },
-  [COLORS.PRIMARY_MAGENTA]: {
-    background: COLORS.MAGENTA_1,
-    titleColor: COLORS.MAGENTA_6,
-    tagColor: COLORS.PRIMARY_MAGENTA,
-  },
-  [COLORS.PRIMARY_PURPLE]: {
-    background: COLORS.PURPLE_1,
-    titleColor: COLORS.PURPLE_6,
-    tagColor: COLORS.PRIMARY_PURPLE,
-  },
-  [COLORS.PRIMARY_INDIGO]: {
-    background: COLORS.INDIGO_1,
-    titleColor: COLORS.INDIGO_6,
-    tagColor: COLORS.PRIMARY_INDIGO,
-  },
-  [COLORS.PRIMARY_TURQUOISE]: {
-    background: COLORS.TURQUOISE_1,
-    titleColor: COLORS.TURQUOISE_6,
-    tagColor: COLORS.PRIMARY_TURQUOISE,
-  },
-  [COLORS.PRIMARY_GREEN]: {
-    background: COLORS.GREEN_1,
-    titleColor: COLORS.GREEN_6,
-    tagColor: COLORS.PRIMARY_GREEN,
-  },
-  [COLORS.PRIMARY_ORANGE]: {
-    background: COLORS.ORANGE_1,
-    titleColor: COLORS.ORANGE_6,
-    tagColor: COLORS.PRIMARY_ORANGE,
-  },
-  [COLORS.RED_4]: { background: COLORS.RED_1, titleColor: COLORS.RED_6, tagColor: COLORS.RED_4 },
-  [COLORS.MAGENTA_4]: {
-    background: COLORS.MAGENTA_1,
-    titleColor: COLORS.MAGENTA_6,
-    tagColor: COLORS.MAGENTA_4,
-  },
-  [COLORS.PURPLE_4]: {
-    background: COLORS.PURPLE_1,
-    titleColor: COLORS.PURPLE_6,
-    tagColor: COLORS.PURPLE_4,
-  },
-  [COLORS.INDIGO_4]: {
-    background: COLORS.INDIGO_1,
-    titleColor: COLORS.INDIGO_6,
-    tagColor: COLORS.INDIGO_4,
-  },
-  [COLORS.TURQUOISE_4]: {
-    background: COLORS.TURQUOISE_1,
-    titleColor: COLORS.TURQUOISE_6,
-    tagColor: COLORS.TURQUOISE_4,
-  },
-  [COLORS.GREEN_4]: {
-    background: COLORS.GREEN_1,
-    titleColor: COLORS.GREEN_6,
-    tagColor: COLORS.GREEN_4,
-  },
-  [COLORS.ORANGE_4]: {
-    background: COLORS.ORANGE_1,
-    titleColor: COLORS.ORANGE_6,
-    tagColor: COLORS.ORANGE_4,
-  },
-  [COLORS.RED_6]: { background: COLORS.RED_1, titleColor: COLORS.RED_6, tagColor: COLORS.RED_6 },
-  [COLORS.MAGENTA_6]: {
-    background: COLORS.MAGENTA_1,
-    titleColor: COLORS.MAGENTA_6,
-    tagColor: COLORS.MAGENTA_6,
-  },
-  [COLORS.PURPLE_6]: {
-    background: COLORS.PURPLE_1,
-    titleColor: COLORS.PURPLE_6,
-    tagColor: COLORS.PURPLE_6,
-  },
-  [COLORS.INDIGO_6]: {
-    background: COLORS.INDIGO_1,
-    titleColor: COLORS.INDIGO_6,
-    tagColor: COLORS.INDIGO_6,
-  },
-  [COLORS.TURQUOISE_6]: {
-    background: COLORS.TURQUOISE_1,
-    titleColor: COLORS.TURQUOISE_6,
-    tagColor: COLORS.TURQUOISE_6,
-  },
-  [COLORS.GREEN_6]: {
-    background: COLORS.GREEN_1,
-    titleColor: COLORS.GREEN_6,
-    tagColor: COLORS.GREEN_6,
-  },
-  [COLORS.ORANGE_6]: {
-    background: COLORS.ORANGE_1,
-    titleColor: COLORS.ORANGE_6,
-    tagColor: COLORS.ORANGE_6,
-  },
-}
-
-type StandardTagProps = {
-  skillId: string
-  model: PmProgressModel
-}
-
-export const StandardTag = ({ skillId, model }: StandardTagProps) => {
-  const standardInfo = useStoreMap({
-    store: model.tree.$domains,
-    keys: [skillId],
-    fn: (domains, [skillId]) => {
-      const domain = domains.find((d) => d.standards.some((s) => s.skillIds.includes(skillId)))
-      const standard = domain?.standards.find(({ skillIds }) => skillIds.includes(skillId))
-      if (!standard || !domain) return null
-      return { title: standard.title, tag: standard.subtitle, color: domain.color }
-    },
-  })
-
-  if (!standardInfo) return null
-
-  const preset = DOMAIN_COLOR_PRESETS[standardInfo.color as DomainColor]
-
-  return (
-    <View style={[styles.container, { backgroundColor: preset.background }]}>
-      <SliceDiamondIcon color={preset.tagColor} />
-      <View style={styles.textContainer}>
-        <Text numberOfLines={2} style={[styles.title, { color: preset.titleColor }]}>
-          {standardInfo.title}
-        </Text>
-        <Text numberOfLines={1} style={[styles.tag, { color: preset.tagColor }]}>
-          {standardInfo.tag}
-        </Text>
-      </View>
-    </View>
-  )
-}
-
-const styles = StyleSheet.create({
-  container: {
-    minWidth: 110,
-    maxWidth: 200,
-    paddingHorizontal: 8,
-    paddingVertical: 4,
-    borderRadius: 12,
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: 8,
-    alignSelf: 'flex-start',
-    shadowColor: '#333333',
-    shadowOffset: { width: 0, height: 1 },
-    shadowOpacity: 0.1,
-    shadowRadius: 3,
-    elevation: 2,
-  },
-  textContainer: {
-    flex: 1,
-    flexDirection: 'column',
-    justifyContent: 'center',
-    alignItems: 'flex-start',
-  },
-  title: {
-    fontSize: 13,
-    fontFamily: FONT_FAMILY.buenosAires,
-  },
-  tag: {
-    fontSize: 10,
-    fontFamily: FONT_FAMILY.buenosAires,
-  },
-})

package/src/features/pmProgress/context/PmProgressContext.tsx

@@ -1,25 +0,0 @@
-import { createContext, useContext } from 'react'
-import { PmProgressModel } from '../model/PmProgressModel'
-import { Skill, GradeLabelsMap } from '@magmamath/students-features'
-
-export type PmProgressContextValue = {
-  model: PmProgressModel
-  customGradeLabels?: GradeLabelsMap
-  readOnly?: boolean
-  onStartPress?: (skill: Skill) => Promise<void>
-  onPracticePress?: (skill: Skill) => Promise<void>
-  onStandardPress?: (skill: Skill) => Promise<void>
-  onTeacherRecommendationPress?: (skill: Skill) => Promise<void>
-}
-
-const PmProgressContext = createContext<PmProgressContextValue | null>(null)
-
-export function usePmProgress(): PmProgressContextValue {
-  const value = useContext(PmProgressContext)
-  if (!value) {
-    throw new Error('usePmProgress must be used within PmProgressProvider')
-  }
-  return value
-}
-
-export const PmProgressProvider = PmProgressContext.Provider

package/src/features/pmProgress/index.ts

@@ -1,6 +0,0 @@
-export { PmProgress } from './PmProgress'
-export { PmProgressModel } from './model/PmProgressModel'
-export { StandardTag } from './components/standard/StandardTag'
-export { TreeNormalizer } from './shared/TreeNormalizer'
-export * from './shared/pmProgress.types'
-export * from './shared/pmProgress.constants'

package/src/features/pmProgress/model/PmHighlightModel.ts

@@ -1,11 +0,0 @@
-import { createEvent, createStore, restore } from 'effector'
-
-export class PmHighlightModel {
-  public readonly expand = createEvent<string>()
-  public readonly hover = createEvent<string | null>()
-
-  public readonly $hoveredId = restore(this.hover, null)
-  public readonly $expandedId = createStore<string | null>(null).on(this.expand, (current, id) =>
-    current === id ? null : id,
-  )
-}