Merge branch 'chore/audit-fix' into feat/history-update-july

This commit is contained in:
Christian Landgren 2021-08-16 23:54:05 +02:00
commit b8f6b0c53c
10 changed files with 1195 additions and 1171 deletions

View File

@ -22,7 +22,6 @@ import { studentName } from '../utils/peopleHelpers'
import { translate } from '../utils/translation' import { translate } from '../utils/translation'
import { RootStackParamList } from './navigation.component' import { RootStackParamList } from './navigation.component'
import { StudentAvatar } from './studentAvatar.component' import { StudentAvatar } from './studentAvatar.component'
import { DaySummary } from './daySummary.component'
interface ChildListItemProps { interface ChildListItemProps {
child: Child child: Child
@ -95,7 +94,6 @@ export const ChildListItem = ({ child, color }: ChildListItemProps) => {
const className = getClassName() const className = getClassName()
const styles = useStyleSheet(themeStyles) const styles = useStyleSheet(themeStyles)
const date = moment()
return ( return (
<TouchableOpacity <TouchableOpacity

View File

@ -80,7 +80,9 @@ export const Children = () => {
useEffect(() => { useEffect(() => {
navigation.setOptions({ navigation.setOptions({
headerLeft: () => { headerLeft: () => {
return <TopNavigationAction icon={CloseOutlineIcon} onPress={settings} /> return (
<TopNavigationAction icon={CloseOutlineIcon} onPress={settings} />
)
}, },
}) })
}, [navigation, settings]) }, [navigation, settings])

View File

@ -6,5 +6,4 @@ import { AppRegistry } from 'react-native'
import App from './App' import App from './App'
import { name as appName } from './app.json' import { name as appName } from './app.json'
AppRegistry.registerComponent(appName, () => App) AppRegistry.registerComponent(appName, () => App)

View File

@ -12,8 +12,7 @@
"test:watch": "jest --watch", "test:watch": "jest --watch",
"typecheck": "tsc --watch", "typecheck": "tsc --watch",
"i18n": "sync-i18n --files '**/translations/*.json' --primary en --languages ar de pl so sv --space 2", "i18n": "sync-i18n --files '**/translations/*.json' --primary en --languages ar de pl so sv --space 2",
"check-i18n": "npm run i18n -- --check", "check-i18n": "npm run i18n -- --check"
"postinstall": "patch-package"
}, },
"dependencies": { "dependencies": {
"@eva-design/eva": "2.0.0", "@eva-design/eva": "2.0.0",
@ -81,7 +80,7 @@
"@types/react-native-restart": "^0.0.0", "@types/react-native-restart": "^0.0.0",
"@ui-kitten/metro-config": "5.0.0", "@ui-kitten/metro-config": "5.0.0",
"babel-jest": "^26.6.3", "babel-jest": "^26.6.3",
"eslint": "^7.24.0", "eslint": "^7.32.0",
"eslint-config-prettier": "^8.2.0", "eslint-config-prettier": "^8.2.0",
"eslint-plugin-prettier": "^3.4.0", "eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react-native-a11y": "^2.0.4", "eslint-plugin-react-native-a11y": "^2.0.4",

View File

@ -1,3 +1,3 @@
module.exports = { module.exports = {
assets: ['./assets/fonts'] assets: ['./assets/fonts'],
} }

View File

@ -30,7 +30,7 @@ export const fontWeight: Record<FontWeight, TextStyle> = {
}, },
bold: { bold: {
...systemWeights.bold, ...systemWeights.bold,
} },
} }
export const header: TextStyle = { export const header: TextStyle = {

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,10 @@
import message from '../content/flash.json' import message from '../content/flash.json'
const Flash = () => ( const Flash = (): JSX.Element => (
<> <>
{message.subject && {message.subject &&
<div className="max-w-6xl mx-auto mt-4"> <div className="max-w-6xl mx-auto mt-4">
<div className="bg-pink-100 sm:rounded px-4 py-3 shadow-md" role="alert"> <div className="bg-pink-100 fg-black text-red-800 sm:rounded px-4 py-3 shadow-md" role="alert">
<div className="flex space-x-4"> <div className="flex space-x-4">
<svg <svg
className="w-6 h-6 mt-1" className="w-6 h-6 mt-1"

View File

@ -1,4 +1,4 @@
{ {
"subject": "", "subject": "Utvecklare sökes",
"body": "" "body": "I Göteborg"
} }

937
yarn.lock

File diff suppressed because it is too large Load Diff