diff --git a/app.json b/app.json index f278847..9264dc0 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,7 @@ "expo": { "name": "WingetNite", "slug": "wingetnite", - "version": "2.5.0", + "version": "4.0.0", "orientation": "portrait", "icon": "./assets/android/android/play_store_512.png", "userInterfaceStyle": "dark", @@ -18,7 +18,7 @@ "supportsTablet": true }, "android": { - "versionCode": 3, + "versionCode": 4, "adaptiveIcon": { "foregroundImage": "./assets/android/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png", "backgroundImage": "./assets/android/android/res/mipmap-xxxhdpi/ic_launcher_background.png", diff --git a/components/Flatpakapps.js b/components/Flatpakapps.js index 0e84957..8e2e502 100644 --- a/components/Flatpakapps.js +++ b/components/Flatpakapps.js @@ -1,11 +1,26 @@ -import React from 'react'; -import { ScrollView } from 'react-native'; +import React, { useState, useEffect } from 'react'; +import { ScrollView, StyleSheet } from 'react-native'; import Appcard from './Appcard'; -import appData from '../appData.json'; +import axios from 'axios'; export default function Flatpakapps() { + const [appData, setAppData] = useState([]); + + useEffect(() => { + fetchData(); + }, []); + + const fetchData = async () => { + try { + const response = await axios.get('https://raw.githubusercontent.com/zachvlat/wingetNite/master/appData.json'); + setAppData(response.data); + } catch (error) { + console.error('Error fetching data:', error); + } + }; + return ( - + {appData.map((app, index) => ( ); } + +const styles = StyleSheet.create({ + scrollView: { + paddingBottom: 80, + }, +}); \ No newline at end of file diff --git a/components/Wingetapps.js b/components/Wingetapps.js index 2ce2853..78c0d62 100644 --- a/components/Wingetapps.js +++ b/components/Wingetapps.js @@ -1,14 +1,38 @@ -import React from 'react'; -import { ScrollView } from 'react-native'; +import React, { useState, useEffect } from 'react'; +import { ScrollView, StyleSheet } from 'react-native'; import Appcard from './Appcard'; -import appData from '../appData.json'; +import axios from 'axios'; export default function Wingetapps() { + const [appData, setAppData] = useState([]); + + useEffect(() => { + fetchData(); + }, []); + + const fetchData = async () => { + try { + const response = await axios.get('https://raw.githubusercontent.com/zachvlat/wingetNite/master/appData.json'); + setAppData(response.data); + } catch (error) { + console.error('Error fetching data:', error); + } + }; + return ( - + {appData.map((app, index) => ( - + ))} ); } + +const styles = StyleSheet.create({ + scrollView: { + paddingBottom: 80, + }, +}); diff --git a/package-lock.json b/package-lock.json index 56651f6..12b1652 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "2.5.0", "dependencies": { "@expo/webpack-config": "^19.0.0", + "axios": "^1.6.8", "eas-cli": "^5.9.0", "expo": "~49.0.15", "expo-status-bar": "~1.6.0", @@ -7665,6 +7666,29 @@ "node": ">= 4.0.0" } }, + "node_modules/axios": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/babel-core": { "version": "7.0.0-bridge.0", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz", @@ -11618,9 +11642,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", - "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -16681,6 +16705,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", diff --git a/package.json b/package.json index 8d3be67..8dd825b 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "@expo/webpack-config": "^19.0.0", + "axios": "^1.6.8", "eas-cli": "^5.9.0", "expo": "~49.0.15", "expo-status-bar": "~1.6.0",