Skip to content

Commit

Permalink
Merge branch 'feature/task-management-crud-routes' of https://github.…
Browse files Browse the repository at this point in the history
…com/GenerateNU/Care-Wallet into feature/task-management-crud-routes
  • Loading branch information
oliviaseds committed Feb 14, 2024
2 parents 01919d3 + ff440d9 commit 8ff0c28
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 26 deletions.
2 changes: 1 addition & 1 deletion client/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
"overrides": [
{
"files": ["screens/**/*", "App.tsx", "declaration.d.ts"],
"files": ["screens/**/*", "App.tsx", "nativewind.d.ts"],
"rules": {
// Allows default exports for the above files
"import/no-default-export": "off"
Expand Down
1 change: 1 addition & 0 deletions client/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = function (api) {
api.cache(true);

return {
presets: ['babel-preset-expo'],
plugins: ['react-native-paper/babel', 'nativewind/babel']
Expand Down
7 changes: 0 additions & 7 deletions client/declaration.d.ts

This file was deleted.

8 changes: 8 additions & 0 deletions client/nativewind.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
/// <reference types="nativewind/types" />

declare module '*.svg' {
import React from 'react';

import { SvgProps } from 'react-native-svg';
const content: React.FC<SvgProps>;
export default content;
}
22 changes: 11 additions & 11 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"main": "node_modules/expo/AppEntry.js",
"scripts": {
"ts:check": "tsc",
"start": "expo start",
"start": "expo start --reset-cache",
"android": "expo start --android",
"ios": "expo start --ios",
"web": "expo start --web",
Expand All @@ -15,32 +15,32 @@
},
"dependencies": {
"@firebase/auth": "^1.5.1",
"@react-native-async-storage/async-storage": "1.18.2",
"@react-native-async-storage/async-storage": "1.21.0",
"@react-navigation/bottom-tabs": "^6.5.11",
"@react-navigation/native": "^6.1.9",
"@react-navigation/native-stack": "^6.9.17",
"@tanstack/react-query": "^5.18.1",
"@types/react": "^18.2.55",
"axios": "^1.6.4",
"clsx": "^2.1.0",
"expo": "~49.0.13",
"expo-document-picker": "~11.5.4",
"expo-file-system": "~15.4.5",
"expo-status-bar": "~1.6.0",
"expo": "50.0.6",
"expo-document-picker": "~11.10.1",
"expo-file-system": "~16.0.6",
"expo-status-bar": "~1.11.1",
"firebase": "^10.7.2",
"nativewind": "^2.0.11",
"react": "18.2.0",
"react-native": "0.72.6",
"react-native": "0.73.4",
"react-native-paper": "^5.12.3",
"react-native-safe-area-context": "4.6.3",
"react-native-screens": "~3.22.0",
"react-native-safe-area-context": "4.8.2",
"react-native-screens": "~3.29.0",
"react-native-svg-transformer": "^1.3.0"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/react": "~18.2.14",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@typescript-eslint/parser": "6.18.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
Expand Down
8 changes: 1 addition & 7 deletions client/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: [
'./**/*.html',
'./**/*.js',
'./**/*.jsx',
'./**/*.ts',
'./**/*.tsx'
],
content: ['./App.tsx', './components/**/*.tsx', './screens/**/*.tsx'],
theme: {
colors: {
'carewallet-white': '#FFFFFF',
Expand Down

0 comments on commit 8ff0c28

Please sign in to comment.