Skip to content

Commit

Permalink
Merge pull request #24 from Naveen-g09/dev
Browse files Browse the repository at this point in the history
dev branch
  • Loading branch information
Naveen-g09 committed Mar 24, 2024
2 parents fac8a34 + 34aad5f commit 2ac5e6d
Show file tree
Hide file tree
Showing 41 changed files with 7,017 additions and 3,943 deletions.
18 changes: 18 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
root: true,
extends: ["universe/native"],
plugins: ["unused-imports"],
rules: {
"no-unused-vars": "off",
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"warn",
{
vars: "all",
varsIgnorePattern: "^_",
args: "after-used",
argsIgnorePattern: "^_",
},
],
},
};
26 changes: 26 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Lint, TypeScript Check, and Format

on: [push]
jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout commit
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18

- name: Install Dependencies
run: yarn install

- name: Lint
run: yarn lint

- name: Formatting Check
run: npm run format-check

- name: Type check
run: npm run type-check
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,11 +29,9 @@
"output": "static",
"favicon": "./assets/images/favicon.png"
},
"plugins": [
"expo-router"
],
"plugins": ["expo-router"],
"experiments": {
"typedRoutes": true
"typedRoutes": false
},
"extra": {
"router": {
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 { useLocalSearchParams, Stack } from "expo-router";
import React from "react";
import { View, Text, StyleSheet } from "react-native";

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();

Check warning on line 19 in app/(tabs)/_layout.tsx

View workflow job for this annotation

GitHub Actions / lint

'colorScheme' is assigned a value but never used. Allowed unused vars must match /^_/u

Check warning on line 19 in app/(tabs)/_layout.tsx

View workflow job for this annotation

GitHub Actions / lint

'colorScheme' is assigned a value but never used
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>
);
}
52 changes: 26 additions & 26 deletions app/(tabs)/account.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@

import { View, Text, TouchableOpacity, ScrollView, StyleSheet, Button } from 'react-native'
import { BottomSheetModal, useBottomSheetModal } from "@gorhom/bottom-sheet";
import React, { useRef } from 'react'

import AccountSheet from '../../components/bottomSheet';
import React, { useRef } from "react";
import {
Text,
TouchableOpacity,
ScrollView,
StyleSheet,
Button,
} from "react-native";

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

//TODO: add a notification icon
//TODO: add a profile icon
Expand All @@ -13,7 +17,7 @@ import AccountSheet from '../../components/bottomSheet';
//TODO: current and past utilities, current and past maintenance, current and past bills, current and past orders, current and past payments, current and past receipts, current and past complaints, current and past suggestions, current and past feedbacks, current and past polls, current and past announcements, current and past notices, current and past chats, current and past events, current and past posts, current and past family members, current and past parking, current and past flat no, current and past name, current and past email, current and past phone number, current and past address, current and past profile picture, current and past edit button
//TODO: add a logout button

const account = () => {
const Account = () => {
const bottomSheetRef = useRef<BottomSheetModal>(null);
const { dismiss } = useBottomSheetModal();
const handleOpenPress = () => bottomSheetRef.current?.present();
Expand Down Expand Up @@ -47,51 +51,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;
Loading

0 comments on commit 2ac5e6d

Please sign in to comment.