@magmamath/students-features 0.2.9 → 0.2.11

package/src/lib/helpers/helpers.ts

@@ -1,28 +1,36 @@
-import { RELATIVE_TIME_LABELS } from '../../shared/translation/constants'
-import { Locale } from '@magmamath/students-features'
+import { getText } from '../../shared/translation/helpers'
 
 export const generateRandomId = () =>
   Date.now().toString(36) + Math.random().toString(36).substring(2)
 
-export const getRelativeTimeText = (date: Date, lang: Locale) => {
-  const t = RELATIVE_TIME_LABELS[lang] || RELATIVE_TIME_LABELS[Locale.EN]
+const getYears = (days: number) => Math.floor(days / 365)
+const getMonths = (days: number) => Math.floor(days / 30)
+const getDays = (hours: number) => Math.floor(hours / 24)
+const getHours = (minutes: number) => Math.floor(minutes / 60)
+const getMinutes = (seconds: number) => Math.floor(seconds / 60)
+const getSeconds = (milliseconds: number) => Math.floor(milliseconds / 1000)
+
+export const getRelativeTimeText = (date: Date) => {
   const timeBufferMs = 2000 // adds 2 seconds time buffer because when used with sockets, it displayed -1 seconds ago, instead of 1 second ago.
 
   const now = new Date().getTime()
   const targetDate = new Date(date).getTime() - timeBufferMs
   const diffTime = now - targetDate
 
-  const seconds = Math.floor(diffTime / 1000)
-  const minutes = Math.floor(seconds / 60)
-  const hours = Math.floor(minutes / 60)
-  const days = Math.floor(hours / 24)
-  const months = Math.floor(days / 30)
-  const years = Math.floor(days / 365)
+  const seconds = getSeconds(diffTime)
+  const minutes = getMinutes(seconds)
+  const hours = getHours(minutes)
+  const days = getDays(hours)
+  const months = getMonths(days)
+  const years = getYears(days)
 
-  if (seconds < 60) return t.justNow
-  if (minutes < 60) return `${minutes} ${minutes === 1 ? t.minuteAgo : t.minutesAgo}`
-  if (hours < 24) return `${hours} ${hours === 1 ? t.hourAgo : t.hoursAgo}`
-  if (days < 30) return `${days} ${days === 1 ? t.dayAgo : t.daysAgo}`
-  if (months < 12) return `${months} ${months === 1 ? t.monthAgo : t.monthsAgo}`
-  return `${years} ${years === 1 ? t.yearAgo : t.yearsAgo}`
+  if (seconds < 60) return getText('time.justNow')
+  if (minutes < 60)
+    return `${minutes} ${minutes === 1 ? getText('time.minuteAgo') : getText('time.minutesAgo')}`
+  if (hours < 24)
+    return `${hours} ${hours === 1 ? getText('time.hourAgo') : getText('time.hoursAgo')}`
+  if (days < 30) return `${days} ${days === 1 ? getText('time.dayAgo') : getText('time.daysAgo')}`
+  if (months < 12)
+    return `${months} ${months === 1 ? getText('time.monthAgo') : getText('time.monthsAgo')}`
+  return `${years} ${years === 1 ? getText('time.yearAgo') : getText('time.yearsAgo')}`
 }

package/src/lib/localization/en.json

@@ -1,2 +1,14 @@
 {
+  "teacherFeedback.noComments": "No comments yet",
+  "time.justNow": "just now",
+  "time.minuteAgo": "minute ago",
+  "time.minutesAgo": "minutes ago",
+  "time.hourAgo": "hour ago",
+  "time.hoursAgo": "hours ago",
+  "time.dayAgo": "day ago",
+  "time.daysAgo": "days ago",
+  "time.monthAgo": "month ago",
+  "time.monthsAgo": "months ago",
+  "time.yearAgo": "year ago",
+  "time.yearsAgo": "years ago"
 }

package/src/lib/localization/gb.json

@@ -1,2 +1,14 @@
 {
+  "teacherFeedback.noComments": "No comments yet",
+  "time.justNow": "just now",
+  "time.minuteAgo": "minute ago",
+  "time.minutesAgo": "minutes ago",
+  "time.hourAgo": "hour ago",
+  "time.hoursAgo": "hours ago",
+  "time.dayAgo": "day ago",
+  "time.daysAgo": "days ago",
+  "time.monthAgo": "month ago",
+  "time.monthsAgo": "months ago",
+  "time.yearAgo": "year ago",
+  "time.yearsAgo": "years ago"
 }

package/src/lib/localization/sw.json

@@ -1,2 +1,14 @@
 {
+  "teacherFeedback.noComments": "Inga kommentarer än",
+  "time.justNow": "alldeles nyss",
+  "time.minuteAgo": "minut sedan",
+  "time.minutesAgo": "minuter sedan",
+  "time.hourAgo": "timme sedan",
+  "time.hoursAgo": "timmar sedan",
+  "time.dayAgo": "dag sedan",
+  "time.daysAgo": "dagar sedan",
+  "time.monthAgo": "månad sedan",
+  "time.monthsAgo": "månader sedan",
+  "time.yearAgo": "år sedan",
+  "time.yearsAgo": "år sedan"
 }

package/src/shared/translation/constants.ts

@@ -8,45 +8,3 @@ export const LOCALIZATION_CONFIGS = {
   [Locale.GB]: GB,
   [Locale.SW]: SW,
 }
-
-export const RELATIVE_TIME_LABELS = {
-  [Locale.EN]: {
-    justNow: 'just now',
-    minuteAgo: 'minute ago',
-    minutesAgo: 'minutes ago',
-    hourAgo: 'hour ago',
-    hoursAgo: 'hours ago',
-    dayAgo: 'day ago',
-    daysAgo: 'days ago',
-    monthAgo: 'month ago',
-    monthsAgo: 'months ago',
-    yearAgo: 'year ago',
-    yearsAgo: 'years ago',
-  },
-  [Locale.SW]: {
-    justNow: 'alldeles nyss',
-    minuteAgo: 'minut sedan',
-    minutesAgo: 'minuter sedan',
-    hourAgo: 'timme sedan',
-    hoursAgo: 'timmar sedan',
-    dayAgo: 'dag sedan',
-    daysAgo: 'dagar sedan',
-    monthAgo: 'månad sedan',
-    monthsAgo: 'månader sedan',
-    yearAgo: 'år sedan',
-    yearsAgo: 'år sedan',
-  },
-  [Locale.GB]: {
-    justNow: 'just now',
-    minuteAgo: 'minute ago',
-    minutesAgo: 'minutes ago',
-    hourAgo: 'hour ago',
-    hoursAgo: 'hours ago',
-    dayAgo: 'day ago',
-    daysAgo: 'days ago',
-    monthAgo: 'month ago',
-    monthsAgo: 'months ago',
-    yearAgo: 'year ago',
-    yearsAgo: 'years ago',
-  },
-}

package/src/shared/translation/helpers.ts

@@ -1,34 +1,34 @@
 import { LOCALIZATION_CONFIGS } from './constants'
 import { $localization, setLocalization } from './model'
-import { GetText, LocalizationConfig } from './types'
+import { GetText, LocalizationConfig, TranslationKeys } from './types'
 
 export const getSubstitutedString = (str: string, substitutions: Record<string, string> = {}) => {
-    const substitutionsArray = Object.entries(substitutions)
-    let result = str
+  const substitutionsArray = Object.entries(substitutions)
+  let result = str
 
-    if (!substitutionsArray.length) return result
+  if (!substitutionsArray.length) return result
 
-    substitutionsArray.forEach(([key, value]) => {
-        result = result.replace(`{{${key}}}`, value)
-    })
+  substitutionsArray.forEach(([key, value]) => {
+    result = result.replace(`{{${key}}}`, value)
+  })
 
-    return result
+  return result
 }
 
-export const getText: GetText = (key, args = null) => {
-    const config = $localization.getState()
+export const getText: GetText = (key: TranslationKeys, args = null) => {
+  const config = $localization.getState()
 
-    const translation = config?.[key]
+  const translation = config?.[key]
 
-    if (translation && args) {
-        return getSubstitutedString(translation, args)
-    }
+  if (translation && args) {
+    return getSubstitutedString(translation, args)
+  }
 
-    return translation ?? key
+  return translation ?? key
 }
 
 export const setFeaturesLocalization = (
-    generator: ((config: typeof LOCALIZATION_CONFIGS) => LocalizationConfig) | LocalizationConfig,
+  generator: ((config: typeof LOCALIZATION_CONFIGS) => LocalizationConfig) | LocalizationConfig,
 ) => {
-    setLocalization(generator)
+  setLocalization(generator)
 }

package/src/shared/translation/types.ts

@@ -1,9 +1,17 @@
-export type GetText = (key: string, args?: Record<string, string> | null) => string
+import enTranslations from '../../lib/localization/en.json'
+
+export type Translations = typeof enTranslations
+export type TranslationKeys = keyof Translations
+
+export type GetText = <T extends TranslationKeys>(
+  key: T,
+  args?: Record<string, string> | null,
+) => Translations[T]
 
 export enum Locale {
-    EN = 'en-SE',
-    SW = 'sv-SE',
-    GB = 'en-GB',
+  EN = 'en-SE',
+  SW = 'sv-SE',
+  GB = 'en-GB',
 }
 
 export type LocalizationConfig = Record<string, string>

package/dist/commonjs/features/feedback/assets/icons/MessageBubbleIcon.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNativeSvg","_interopRequireWildcard","_reactNativeUi","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","MessageBubbleIcon","size","color","COLORS","NEUTRAL_1","jsx","width","height","viewBox","fill","children","Path","d","stroke","strokeWidth","strokeLinejoin","exports"],"sourceRoot":"../../../../../../src","sources":["features/feedback/assets/icons/MessageBubbleIcon.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,eAAA,GAAAC,uBAAA,CAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AAA8D,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAK,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAf,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAI,UAAA,GAAAJ,CAAA,KAAAK,OAAA,EAAAL,CAAA;AAEvD,MAAMmB,iBAAiB,GAAGA,CAAC;EAAEC,IAAI,GAAG,EAAE;EAAEC,KAAK,GAAGC,qBAAM,CAACC;AAAqB,CAAC,KAAK;EACvF,oBACE,IAAAzB,WAAA,CAAA0B,GAAA,EAAC7B,eAAA,CAAAU,OAAG;IAACoB,KAAK,EAAEL,IAAK;IAACM,MAAM,EAAEN,IAAK;IAACO,OAAO,EAAC,WAAW;IAACC,IAAI,EAAC,MAAM;IAAAC,QAAA,eAC7D,IAAA/B,WAAA,CAAA0B,GAAA,EAAC7B,eAAA,CAAAmC,IAAI;MACHC,CAAC,EAAC,+SAA+S;MACjTC,MAAM,EAAEX,KAAM;MACdY,WAAW,EAAC,GAAG;MACfC,cAAc,EAAC;IAAO,CACvB;EAAC,CACC,CAAC;AAEV,CAAC;AAAAC,OAAA,CAAAhB,iBAAA,GAAAA,iBAAA","ignoreList":[]}

package/dist/commonjs/features/feedback/assets/icons/XCloseIcon.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNativeSvg","_interopRequireWildcard","_reactNativeUi","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","XCloseIcon","size","color","COLORS","NEUTRAL_9","jsx","width","height","viewBox","fill","children","Path","d","exports"],"sourceRoot":"../../../../../../src","sources":["features/feedback/assets/icons/XCloseIcon.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,eAAA,GAAAC,uBAAA,CAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AAA8D,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAK,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAf,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAI,UAAA,GAAAJ,CAAA,KAAAK,OAAA,EAAAL,CAAA;AAEvD,MAAMmB,UAAU,GAAGA,CAAC;EAAEC,IAAI,GAAG,EAAE;EAAEC,KAAK,GAAGC,qBAAM,CAACC;AAAqB,CAAC,KAAK;EAChF,oBACE,IAAAzB,WAAA,CAAA0B,GAAA,EAAC7B,eAAA,CAAAU,OAAG;IAACoB,KAAK,EAAEL,IAAK;IAACM,MAAM,EAAEN,IAAK;IAACO,OAAO,EAAC,WAAW;IAACC,IAAI,EAAC,MAAM;IAAAC,QAAA,eAC7D,IAAA/B,WAAA,CAAA0B,GAAA,EAAC7B,eAAA,CAAAmC,IAAI;MACHC,CAAC,EAAC,ufAAuf;MACzfH,IAAI,EAAEP;IAAM,CACb;EAAC,CACC,CAAC;AAEV,CAAC;AAAAW,OAAA,CAAAb,UAAA,GAAAA,UAAA","ignoreList":[]}

package/dist/module/features/feedback/assets/icons/MessageBubbleIcon.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["React","Svg","Path","COLORS","jsx","_jsx","MessageBubbleIcon","size","color","NEUTRAL_1","width","height","viewBox","fill","children","d","stroke","strokeWidth","strokeLinejoin"],"sourceRoot":"../../../../../../src","sources":["features/feedback/assets/icons/MessageBubbleIcon.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,GAAG,IAAIC,IAAI,QAAQ,kBAAkB;AAC5C,SAAoBC,MAAM,QAAQ,4BAA4B;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAE9D,OAAO,MAAMC,iBAAiB,GAAGA,CAAC;EAAEC,IAAI,GAAG,EAAE;EAAEC,KAAK,GAAGL,MAAM,CAACM;AAAqB,CAAC,KAAK;EACvF,oBACEJ,IAAA,CAACJ,GAAG;IAACS,KAAK,EAAEH,IAAK;IAACI,MAAM,EAAEJ,IAAK;IAACK,OAAO,EAAC,WAAW;IAACC,IAAI,EAAC,MAAM;IAAAC,QAAA,eAC7DT,IAAA,CAACH,IAAI;MACHa,CAAC,EAAC,+SAA+S;MACjTC,MAAM,EAAER,KAAM;MACdS,WAAW,EAAC,GAAG;MACfC,cAAc,EAAC;IAAO,CACvB;EAAC,CACC,CAAC;AAEV,CAAC","ignoreList":[]}

package/dist/module/features/feedback/assets/icons/XCloseIcon.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["React","Svg","Path","COLORS","jsx","_jsx","XCloseIcon","size","color","NEUTRAL_9","width","height","viewBox","fill","children","d"],"sourceRoot":"../../../../../../src","sources":["features/feedback/assets/icons/XCloseIcon.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,GAAG,IAAIC,IAAI,QAAQ,kBAAkB;AAC5C,SAAoBC,MAAM,QAAQ,4BAA4B;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAE9D,OAAO,MAAMC,UAAU,GAAGA,CAAC;EAAEC,IAAI,GAAG,EAAE;EAAEC,KAAK,GAAGL,MAAM,CAACM;AAAqB,CAAC,KAAK;EAChF,oBACEJ,IAAA,CAACJ,GAAG;IAACS,KAAK,EAAEH,IAAK;IAACI,MAAM,EAAEJ,IAAK;IAACK,OAAO,EAAC,WAAW;IAACC,IAAI,EAAC,MAAM;IAAAC,QAAA,eAC7DT,IAAA,CAACH,IAAI;MACHa,CAAC,EAAC,ufAAuf;MACzfF,IAAI,EAAEL;IAAM,CACb;EAAC,CACC,CAAC;AAEV,CAAC","ignoreList":[]}

package/dist/typescript/commonjs/features/feedback/assets/icons/MessageBubbleIcon.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MessageBubbleIcon.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/feedback/assets/icons/MessageBubbleIcon.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAU,MAAM,4BAA4B,CAAA;AAE9D,eAAO,MAAM,iBAAiB,oBAA6C,SAAS,sBAWnF,CAAA"}

package/dist/typescript/commonjs/features/feedback/assets/icons/XCloseIcon.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"XCloseIcon.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/feedback/assets/icons/XCloseIcon.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAU,MAAM,4BAA4B,CAAA;AAE9D,eAAO,MAAM,UAAU,oBAA6C,SAAS,sBAS5E,CAAA"}

package/dist/typescript/module/features/feedback/assets/icons/MessageBubbleIcon.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MessageBubbleIcon.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/feedback/assets/icons/MessageBubbleIcon.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAU,MAAM,4BAA4B,CAAA;AAE9D,eAAO,MAAM,iBAAiB,oBAA6C,SAAS,sBAWnF,CAAA"}

package/dist/typescript/module/features/feedback/assets/icons/XCloseIcon.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"XCloseIcon.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/feedback/assets/icons/XCloseIcon.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAU,MAAM,4BAA4B,CAAA;AAE9D,eAAO,MAAM,UAAU,oBAA6C,SAAS,sBAS5E,CAAA"}