Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tabs/feature/jared rudraksh #8

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4568702
Tab folders, files structure with added layout file
jaredsbt Jan 16, 2025
264ecfd
Changed names
jaredsbt Jan 16, 2025
b8b395b
Added 3 tabs but need to change icons
Jan 16, 2025
47c526f
Rounded the corners of the tabs
Jan 21, 2025
dbc8426
Fixed styling of the tabs border radius, and added the icon svg files…
Jan 21, 2025
f84d19f
Added the declarations.d.ts file to incorporate svg files without iss…
Jan 21, 2025
78330ed
added metro.config.js file in frontend/
Jan 21, 2025
2ae1509
Tried fixing the errors but instead made things work...app isnt launc…
Jan 21, 2025
c141492
merging tabs and lint fixes
jaredsbt Jan 21, 2025
a22b0c8
Minor change. Also past few commits have been failing lint check...in…
Jan 21, 2025
3529be5
Trying to fix eslint issues
Jan 21, 2025
1f04418
Fixed last lint error. Finished implementation of tabs
Jan 21, 2025
f4b6bb2
Button component, Index page renders InternetError
jaredsbt Jan 27, 2025
baa603f
Merged Changes
jaredsbt Jan 27, 2025
79a7e85
Completed No internet Page
jaredsbt Jan 27, 2025
309101f
merged main
HarshGurnani Jan 28, 2025
73835c5
Changed resources icon
jaredsbt Jan 29, 2025
1d152cd
Merged harsh changes
jaredsbt Jan 29, 2025
61c568d
Minor changes
Jan 29, 2025
33a8a22
Merge branch 'tabs/feature/jared-rudraksh' of https://github.com/Trit…
Jan 29, 2025
480d00d
Fixed lint error
Jan 29, 2025
b936acf
Button Component is now Resuable. Width increased to match design Update
jaredsbt Jan 29, 2025
6944c1c
merging main
HarshGurnani Feb 3, 2025
d6e63f9
moved Button component, fixed string wrapped in text error
HarshGurnani Feb 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
Binary file added backend/.DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions frontend/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ out/
public/
next.config.js
vite.config.ts
metro.config.js
src/app/old_home.tsx
1 change: 1 addition & 0 deletions frontend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"import/ignore": ["node_modules/react-native/index\\.js$"]
},
"plugins": ["@typescript-eslint", "react"],
"ignorePatterns": ["babel.config.js"],
"rules": {
"import/no-unresolved": "off",

Expand Down
18 changes: 9 additions & 9 deletions frontend/App.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
import { StatusBar } from "expo-status-bar";
import { StyleSheet, Text, View } from "react-native";

export default function App() {
return (
<View style={styles.container}>
<Text style={styles.text}>Home screen</Text>
<StatusBar style="auto" />
</View>
);
}

const styles = StyleSheet.create({
container: {
flex: 1,
Expand All @@ -21,3 +12,12 @@ const styles = StyleSheet.create({
color: "#fff",
},
});

export default function App() {
return (
<View style={styles.container}>
<Text style={styles.text}>Home screen</Text>
<StatusBar style="auto" />
</View>
);
}
1 change: 1 addition & 0 deletions frontend/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ module.exports = function (api) {
api.cache(true);
return {
presets: ["babel-preset-expo"],
plugins: ["expo-router/babel"],
};
};
8 changes: 8 additions & 0 deletions frontend/declarations.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
declare module "*.svg" {
import React from "react";
import { SvgProps } from "react-native-svg";

const content: React.FC<SvgProps>;

export default content;
}
2 changes: 1 addition & 1 deletion frontend/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
}
],
"configuration_version": "1"
}
}
32 changes: 32 additions & 0 deletions frontend/metro.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// // metro.config.js
// const { getDefaultConfig } = require("expo/metro-config");

// module.exports = (() => {
// const config = getDefaultConfig(__dirname);

// const { transformer, resolver } = config;

// config.transformer = {
// ...transformer,
// babelTransformerPath: require.resolve("react-native-svg-transformer"),
// };
// config.resolver = {
// ...resolver,
// assetExts: resolver.assetExts.filter((ext) => ext !== "svg"),
// sourceExts: [...resolver.sourceExts, "svg"],
// };

// return config;
// })();

// frontend/metro.config.js

const { getDefaultConfig } = require("expo/metro-config");

const defaultConfig = getDefaultConfig(__dirname);

defaultConfig.transformer.babelTransformerPath = require.resolve("react-native-svg-transformer");
defaultConfig.resolver.assetExts = defaultConfig.resolver.assetExts.filter((ext) => ext !== "svg");
defaultConfig.resolver.sourceExts.push("svg");

module.exports = defaultConfig;
Loading