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

Feature/auth0 #17

Merged
merged 25 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
abec08a
Temp commit
akshayd2020 Oct 13, 2023
919afb1
Started firebase fix
akshayd2020 Oct 15, 2023
90e001c
Added first component
akshayd2020 Oct 15, 2023
68f4f56
Updated screen content component
akshayd2020 Oct 15, 2023
32b7739
Updated all reusable components
akale22 Oct 16, 2023
93fd7d9
Fixed rounding and icons for reusable components
akale22 Oct 16, 2023
b89c878
Small update on an icon
akale22 Oct 16, 2023
eaab69e
Updated screens / components related to onboarding workflow
akale22 Oct 18, 2023
ffab820
Moved files around
akale22 Oct 18, 2023
1e5c91a
Finished all but persona screen
akale22 Oct 18, 2023
c4172ce
All onboarding lofi screens done
akale22 Oct 18, 2023
af5c3d7
feat(Onboarding-Flow): Added boiler plate for Onboarding Context
akshayd2020 Oct 18, 2023
edff56f
Updated flow
akale22 Oct 19, 2023
9734e61
Merge pull request #15 from GenerateNU/feature/add-db-data
DOOduneye Oct 19, 2023
1684708
style: formatting
DOOduneye Oct 19, 2023
66c1a63
bump: version 0.1.1 → 0.2.0
DOOduneye Oct 19, 2023
0438d8a
Working on slider
akale22 Oct 19, 2023
3cea2df
Buggy slider
akale22 Oct 19, 2023
36e53ce
Updated import statements
akale22 Oct 19, 2023
6cc7139
Somewhat working slider
akale22 Oct 19, 2023
8d94a11
feat(Slider): Make Slider update state
akshayd2020 Oct 19, 2023
0e4b3cd
feat(HomeScreen): implemented a simple HomeScreen for allhands
DOOduneye Oct 19, 2023
31a553f
Merge pull request #16 from GenerateNU/feature/insert-user
DOOduneye Oct 19, 2023
d22b0b3
feat(HomeScreen): added new HomeScreen component/screen
DOOduneye Oct 19, 2023
1f9799f
Merge branch 'main' into feature/auth0
DOOduneye Oct 19, 2023
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
2 changes: 1 addition & 1 deletion .cz.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
name = "cz_conventional_commits"
tag_format = "$version"
version_scheme = "semver"
version = "0.1.1"
version = "0.2.0"
update_changelog_on_bump = true
major_version_zero = true
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
## 0.2.0 (2023-10-19)

### BREAKING CHANGE

- Completely redos frontend

### Feat

- **migrations**: added insert, drop, and reset
- **db.go**: function to add data to the db
- **Onboarding-Flow**: Added boiler plate for Onboarding Context
- redo how the frontend is set up

### Fix

- **taskfile.yaml**: added task kill function
- **Yarn-lock**: Fix node package issues that causes build to fail

## 0.1.1 (2023-10-07)

### Fix

- **db.go**: added error checking for migration

## 0.1.0 (2023-10-07)

### Feat
Expand Down
14 changes: 9 additions & 5 deletions client-new/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@ import { StyleSheet, Text, View } from "react-native";
import Router from "./src/navigation/Router";
import { NativeBaseProvider, extendTheme } from "native-base";
import { SafeAreaProvider } from "react-native-safe-area-context";
import { Auth0Provider } from "react-native-auth0";
import { AuthProvider } from "./src/contexts/AuthContext";

export default function App() {
const theme = extendTheme({
fontConfig: {},
colors: {},
});
return (
<SafeAreaProvider>
<NativeBaseProvider>
<Router />
</NativeBaseProvider>
</SafeAreaProvider>
<AuthProvider>
<SafeAreaProvider>
<NativeBaseProvider>
<Router />
</NativeBaseProvider>
</SafeAreaProvider>
</AuthProvider>
);
}

Expand Down
5 changes: 3 additions & 2 deletions client-new/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
],
"ios": {
"supportsTablet": true,
"bundleIdentifier": "com.dupuguntla.a.legacy"
"bundleIdentifier": "com.legacy"
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#ffffff"
}
},
"package": "com.legacy"
},
"web": {
"favicon": "./assets/favicon.png"
Expand Down
17 changes: 17 additions & 0 deletions client-new/firebase.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import * as firebase from "firebase/app";
import * as firebaseAuth from "firebase/auth";

const firebaseConfig = {
apiKey: "AIzaSyDjdkEvyE9m0URAbvyFSIpJVNI-xEATs84",
authDomain: "legacy-4ba7f.firebaseapp.com",
projectId: "legacy-4ba7f",
storageBucket: "legacy-4ba7f.appspot.com",
messagingSenderId: "403289696368",
appId: "1:403289696368:web:eae1fe6606facbbfdf6cb5",
measurementId: "G-ES6PJGKJTJ"
};

// Initialize Firebase
const app = firebase.initializeApp(firebaseConfig);

export const auth = firebaseAuth.getAuth(app);;
7 changes: 6 additions & 1 deletion client-new/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,27 @@
"ts:check": "tsc"
},
"dependencies": {
"@react-native-community/slider": "^4.4.3",
"@react-navigation/native": "^6.1.8",
"@react-navigation/native-stack": "^6.9.14",
"@types/react": "^18.2.28",
"@types/react-dom": "^18.2.13",
"@types/react-native": "^0.72.3",
"expo": "~49.0.13",
"expo-dev-client": "^2.4.11",
"expo-secure-store": "^12.5.0",
"expo-status-bar": "~1.6.0",
"firebase": "^10.5.0",
"native-base": "^3.4.28",
"react": "18.2.0",
"react-dom": "^18.2.0",
"react-native": "0.72.5",
"react-native-auth0": "^3.0.2",
"react-native-responsive-screen": "^1.4.2",
"react-native-safe-area-context": "^4.7.2",
"react-native-screens": "^3.25.0",
"react-native-svg": "^13.14.0"
"react-native-svg": "^13.14.0",
"react-native-vector-icons": "^10.0.0"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
29 changes: 29 additions & 0 deletions client-new/src/components/reusable/Circle.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { View, Text } from "native-base";
import { border } from "native-base/lib/typescript/theme/styled-system";
import {
widthPercentageToDP as w,
heightPercentageToDP as h,
} from "react-native-responsive-screen";

type CircleProps = {
color: string;
border?: boolean
};

export default function Circle(props: CircleProps) {

const borderWidth = props.border ? 1 : 0

return (
<>
<View
height={h("1.6%")}
width={h("1.6%")}
backgroundColor={props.color}
borderRadius={w("80%") / 2}
borderColor={"#000000"}
borderWidth={borderWidth}
></View>
</>
);
}
38 changes: 38 additions & 0 deletions client-new/src/components/reusable/CircleProgressBar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { View } from "native-base";
import Circle from "./Circle";
import {
widthPercentageToDP as w,
heightPercentageToDP as h,
} from "react-native-responsive-screen";

type CircleProgressBarProps = {
totalCircles: number;
completedCircles: number;
};

export default function CircleProgressBar(props: CircleProgressBarProps) {
const circles = [];

for (let i = 0; i < props.totalCircles; i++) {
if (i === 0 && props.completedCircles === 0) {
circles.push(<Circle color="#FFFFFF" border={true} key={i}/>);
} else if (i < props.completedCircles) {
circles.push(<Circle color="#000000" key={i}/>);
} else if (i === props.completedCircles) {
circles.push(<Circle color="#D9D9D9" border={true} key={i}/>);
} else {
circles.push(<Circle color="#D9D9D9" />);
}
}

return (
<View
width={w("80%") * (props.totalCircles / 6)}
flexDirection={"row"}
justifyContent={"space-between"}
alignItems={"center"}
>
{circles}
</View>
);
}
28 changes: 28 additions & 0 deletions client-new/src/components/reusable/CompaniesFooter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Text, View } from "native-base";
import {
widthPercentageToDP as w,
heightPercentageToDP as h,
} from "react-native-responsive-screen";

export default function CompaniesFooter() {
return (
<>
<View
width={w("80%")}
flexDirection={"row"}
justifyContent={"space-between"}
alignItems={"center"}
paddingBottom={h("1.5%")}
>
<Text fontSize={12}>Company 1</Text>
<Text fontSize={12}>Company 2</Text>
<Text fontSize={12}>Company 3</Text>
</View>
<View justifyContent={"space-between"} alignItems={"center"}>
<Text fontWeight={"bold"} fontSize={12}>
See why these companies are partnered with Legacy
</Text>
</View>
</>
);
}
32 changes: 32 additions & 0 deletions client-new/src/components/reusable/HalfScreenWideButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { Text, Button } from "native-base";
import React from "react";
import {
widthPercentageToDP as w,
heightPercentageToDP as h,
} from "react-native-responsive-screen";

type ScreenWideButtonProps = {
text: string;
textColor: string;
backgroundColor: string;
borderColor: string;
onClick?: (input) => any;
};

export default function HalfScreenWideButton(props: ScreenWideButtonProps) {
return (
<>
<Button
backgroundColor={props.backgroundColor}
width={w("37.5%")}
height={h("5%")}
borderRadius={w("80%") / 2}
onPress={props.onClick}
borderColor={props.borderColor}
borderWidth={1}
>
<Text color={props.textColor}>{props.text}</Text>
</Button>
</>
);
}
10 changes: 10 additions & 0 deletions client-new/src/components/reusable/LegacyWordmark.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Text, View } from "native-base";
export default function LegacyWordmark() {
return (
<View justifyContent={"center"}>
<Text fontWeight={"bold"} fontSize={"xl"}>
Legacy Wordmark
</Text>
</View>
);
}
10 changes: 10 additions & 0 deletions client-new/src/components/reusable/LetsGo.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Text, View } from "native-base";
export default function LetsGo() {
return (
<>
<Text fontWeight={"bold"} fontSize={"6xl"}>
Let's go!
</Text>
</>
);
}
77 changes: 77 additions & 0 deletions client-new/src/components/reusable/QuestionaireBox.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import React from "react";
import { View, Text, Slider } from "native-base";
import {
widthPercentageToDP as w,
heightPercentageToDP as h,
} from "react-native-responsive-screen";
import ResponseSlider from "./ResponseSlider";

type QuestionaireBoxProps = {
text1: string;
text2: string;
initialSliderValue: number;
field: string;
handleChange: (name, value) => void
};

export default function QuestionaireBox(props: QuestionaireBoxProps) {
return (
<View
backgroundColor={"#FFFFFF"}
borderRadius={10}
paddingTop={h("3%")}
paddingBottom={h("3%")}
width={w("80%")}
height={h("50%")}
alignItems={"center"}
>
<View alignItems={"center"} width={w("70%")}>
<Text fontSize={20} fontWeight={600} paddingBottom={h("1.5%")}>
{props.text1}
</Text>
<Text
fontSize={16}
fontWeight={300}
textAlign={"center"}
paddingBottom={h("2%")}
>
{props.text2}
</Text>
</View>

<View
width={w("40%")}
height={w("40%")}
backgroundColor={"#D9D9D9"}
marginBottom={h("6.1%")}
></View>

<View
width={w("68%")}
flexDirection="row"
justifyContent={"space-between"}
alignItems="center"
paddingBottom={h("0.5%")}
>
<Text fontSize={11}>1</Text>
<Text fontSize={11}>5</Text>
</View>

<Slider
w={w("67%")}
colorScheme="gray"
defaultValue={props.initialSliderValue}
minValue={1}
maxValue={5}
step={1}
onChange={(value) => props.handleChange(props.field, value)}
>
<Slider.Track>
<Slider.FilledTrack />
</Slider.Track>
<Slider.Thumb />
</Slider>
{/* <ResponseSlider /> */}
</View>
);
}
Loading
Loading