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

Onboarding #17

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
root: true,
extends: ["universe/native"],
};
34 changes: 34 additions & 0 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
on:
pull_request:
types: [opened, synchronize]
jobs:
preview:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write # Allow comments on PRs
steps:
- name: 🏗 Setup repo
uses: actions/checkout@v3

- name: 🏗 Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: yarn

- name: 🏗 Setup EAS
uses: expo/expo-github-action@v8
with:
eas-version: latest
token: ${{ secrets.EXPO_TOKEN }}

- name: 📦 Install dependencies
run: yarn install

- name: 🚀 Create preview
uses: expo/expo-github-action/preview@v8
with:
# `github.event.pull_request.head.ref` is only available on `pull_request` triggers.
# Use your own, or keep the automatically infered branch name from `--auto`, when using different triggers.
command: eas update --auto --branch ${{ github.event.pull_request.head.ref }}
1 change: 0 additions & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ jobs:

- name: Expo GitHub Action
uses: expo/[email protected]

13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
**This is an application for Society Housing managment which is created for the purpose of MCA collaborative project.**
```Built with Expo-react-Native```
```This will have features such as:```
`Built with Expo-react-Native`
`This will have features such as:`

1. Community Page
2. Call for services and book amenties
3. manage services in the society
Expand All @@ -11,16 +12,16 @@
8. keep a proper track of records
and much more features to be added

```Why Residentron?```
`Why Residentron?`

- We are focusing on being open source and using open source tech stack, which will reduce the cost for customers to pay minimal prices and experiece a seamless connected world while being at home
- ``` Tech Stack includes (not finalised) ```
- `Tech Stack includes (not finalised)`
- Expo
- Supabase
- SQLite

``` USP?: ```
`USP?:`
We are trying to develop it based on age for user (ex: better color modes, font sizes, notification customization, automation, restriction for children), basically something for everyone


figma link:
https://www.figma.com/file/CUdRvs42DT7ZTRutq617pM/Wireframe-1?type=design&node-id=1-2&mode=design&t=TPgUYMvRyLzLWx31-0
10 changes: 3 additions & 7 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
"assetBundlePatterns": [
"**/*"
],
"assetBundlePatterns": ["**/*"],
"ios": {
"supportsTablet": true,
"bundleIdentifier": "com.cheetahworks.residentron"
Expand All @@ -31,9 +29,7 @@
"output": "static",
"favicon": "./assets/images/favicon.png"
},
"plugins": [
"expo-router"
],
"plugins": ["expo-router"],
"experiments": {
"typedRoutes": true
},
Expand All @@ -49,7 +45,7 @@
"policy": "appVersion"
},
"updates": {
"url": "https://u.expo.dev/a85a4ec3-52c3-42a4-9158-fa4c62823448"
"url": "https://u.expo.dev/c60ed383-fb7e-4a56-a589-acae0e73b49f"
},
"owner": "cheetah-works"
}
Expand Down
16 changes: 8 additions & 8 deletions app/(tabs)/[id].tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { View, Text, StyleSheet } from 'react-native';
import { useLocalSearchParams, Stack } from 'expo-router';
import React from "react";
import { View, Text, StyleSheet } from "react-native";
import { useLocalSearchParams, Stack } from "expo-router";

const NewPage = () => {
const { id } = useLocalSearchParams();
Expand All @@ -16,15 +16,15 @@ const NewPage = () => {
const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
backgroundColor: '#F5FCFF', // Add your desired background color
justifyContent: "center",
alignItems: "center",
backgroundColor: "#F5FCFF", // Add your desired background color
},
text: {
fontSize: 20,
textAlign: 'center',
textAlign: "center",
margin: 10,
color: '#333', // Add your desired text color
color: "#333", // Add your desired text color
},
});

Expand Down
39 changes: 24 additions & 15 deletions app/(tabs)/_layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import FontAwesome from "@expo/vector-icons/FontAwesome";
import { Link, Tabs } from "expo-router";
import React from "react";
Expand All @@ -20,12 +19,10 @@ export default function RootLayout() {
const colorScheme = useColorScheme();
return (
<Tabs>


<Tabs.Screen
<Tabs.Screen
name="index"
options={{
title: 'Home',
title: "Home",
tabBarIcon: (props) => <TabBarIcon {...props} name="home" />,
headerTitleAlign: "center",
headerStyle: {
Expand All @@ -47,16 +44,28 @@ export default function RootLayout() {
),
}}
/>
<Tabs.Screen name="category" options={{
tabBarIcon: (props) => <TabBarIcon {...props} name="list" />,
headerShown: false}}/>
<Tabs.Screen name="community" options={{
tabBarIcon: (props) => <TabBarIcon {...props} name="users" />,
headerShown: false}}/>
<Tabs.Screen name="account" options={{
tabBarIcon: (props) => <TabBarIcon {...props} name="user" />,
headerShown: false}}/>
<Tabs.Screen name="[id]" options={{headerShown: false, href:null}}/>
<Tabs.Screen
name="category"
options={{
tabBarIcon: (props) => <TabBarIcon {...props} name="list" />,
headerShown: false,
}}
/>
<Tabs.Screen
name="community"
options={{
tabBarIcon: (props) => <TabBarIcon {...props} name="users" />,
headerShown: false,
}}
/>
<Tabs.Screen
name="account"
options={{
tabBarIcon: (props) => <TabBarIcon {...props} name="user" />,
headerShown: false,
}}
/>
<Tabs.Screen name="[id]" options={{ headerShown: false, href: null }} />
</Tabs>
);
}
48 changes: 26 additions & 22 deletions app/(tabs)/account.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
import { View, Text, TouchableOpacity, ScrollView, StyleSheet, Button } from 'react-native'
import {
View,
Text,
TouchableOpacity,
ScrollView,
StyleSheet,
Button,
} from "react-native";
import { BottomSheetModal, useBottomSheetModal } from "@gorhom/bottom-sheet";
import React, { useRef } from 'react'
import React, { useRef } from "react";

import AccountSheet from '../../components/bottomSheet';
import AccountSheet from "../../components/bottomSheet";

//TODO: add a notification icon
//TODO: add a profile icon
Expand Down Expand Up @@ -45,50 +52,47 @@ const account = () => {
<Button title="Dismiss" onPress={() => dismiss()} />

<AccountSheet ref={bottomSheetRef} />

</ScrollView>
)
}
);
};

const styles = StyleSheet.create({
container: {
flex: 1,
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
paddingVertical: 20,
backgroundColor: 'powderblue',


backgroundColor: "powderblue",
},
button: {
flexDirection: 'row',
alignItems: 'center',
flexDirection: "row",
alignItems: "center",
paddingHorizontal: 20,
paddingVertical: 10,
marginVertical: 10,
backgroundColor: 'white',
backgroundColor: "white",
borderRadius: 5,
width: '80%',
height: '10%',
shadowColor: '#000', // Shadow color
width: "80%",
height: "10%",
shadowColor: "#000", // Shadow color
shadowOffset: {
width: 0,
height: 2, // Shadow offset
},
shadowOpacity: 0.25, // Shadow opacity
shadowRadius: 3.84, // Shadow radius
elevation: 5
elevation: 5,
},
image: {
marginRight: 10,
},
buttonText: {
color: '#000',
color: "#000",
fontSize: 18,
marginLeft: 10,
fontWeight: 'bold'
fontWeight: "bold",
},
});

export default account
export default account;
54 changes: 24 additions & 30 deletions app/(tabs)/category.tsx
Original file line number Diff line number Diff line change
@@ -1,78 +1,72 @@
import { View, Text, Button, ScrollView, TouchableOpacity } from 'react-native'
import React, { useRef } from 'react'
import { StyleSheet } from 'react-native';
import { Link } from 'expo-router';
import { View, Text, Button, ScrollView, TouchableOpacity } from "react-native";
import React, { useRef } from "react";
import { StyleSheet } from "react-native";
import { Link } from "expo-router";

//TODO: add a notification icon
//TODO: add 4 rectangle grid buttons which has options of everyday help, appliance repair, home cleaning, and moving
//TODO: add 4 rectangle grid buttons which has options of everyday help, appliance repair, home cleaning, and moving
//TODO: add a search bar

const category = () => {

return (
<ScrollView contentContainerStyle={styles.container}>

<Link href={"/ameneties"} asChild>
<TouchableOpacity style={styles.button} >
<TouchableOpacity style={styles.button}>
<Text style={styles.buttonText}>Ameneties</Text>
</TouchableOpacity>
</Link>

<Link href={"/help"} asChild>
<TouchableOpacity style={styles.button} >
<TouchableOpacity style={styles.button}>
<Text style={styles.buttonText}>Everyday Help</Text>
</TouchableOpacity>
</Link>


<Link href={"/repair"} asChild>
<TouchableOpacity style={styles.button} >
<TouchableOpacity style={styles.button}>
<Text style={styles.buttonText}>Appliances Repair</Text>
</TouchableOpacity>
</Link>
</ScrollView>
)
}
);
};

const styles = StyleSheet.create({
container: {
flex: 1,
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
backgroundColor: 'powderblue',


flexDirection: "column",
alignItems: "center",
justifyContent: "center",
backgroundColor: "powderblue",
},
button: {
flexDirection: 'row',
alignItems: 'center',
flexDirection: "row",
alignItems: "center",
paddingHorizontal: 20,
paddingVertical: 10,
marginVertical: 10,
backgroundColor: 'white',
backgroundColor: "white",
borderRadius: 5,
width: '80%',
height: '10%',
shadowColor: '#000', // Shadow color
width: "80%",
height: "10%",
shadowColor: "#000", // Shadow color
shadowOffset: {
width: 0,
height: 2, // Shadow offset
},
shadowOpacity: 0.25, // Shadow opacity
shadowRadius: 3.84, // Shadow radius
elevation: 5
elevation: 5,
},
image: {
marginRight: 10,
},
buttonText: {
color: '#000',
color: "#000",
fontSize: 18,
marginLeft: 10,
fontWeight: 'bold'
fontWeight: "bold",
},
});


export default category
export default category;
Loading
Loading