Skip to content

Commit

Permalink
added welcome screen
Browse files Browse the repository at this point in the history
  • Loading branch information
RitaSensei committed Apr 12, 2024
1 parent 2965667 commit b53223a
Show file tree
Hide file tree
Showing 19 changed files with 1,168 additions and 73 deletions.
24 changes: 24 additions & 0 deletions careconnect/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,32 @@
module.exports = {
root: true,
extends: ["universe/native"],
ignorePatterns: [".eslintrc.js"],
env: {
node: true
},
rules: {
// Ensures props and state inside functions are always up-to-date
"react-hooks/exhaustive-deps": "warn",
"import/order": 0,
"react-native/no-inline-styles": 0,
"import/namespace": 0,
"no-duplicate-imports": "error",
"prettier/prettier": [
"error",
{
endOfLine: "auto",
},
],
"comma-dangle": [
"error",
{
arrays: "always-multiline",
objects: "always-multiline",
imports: "always-multiline",
exports: "always-multiline",
functions: "ignore",
},
],
},
};
7 changes: 7 additions & 0 deletions careconnect/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,10 @@ yarn-error.*

# typescript
*.tsbuildinfo

#Firebase
firebase/privateKey.json

#eslint
.eslintrc.js
.prettierrc
67 changes: 15 additions & 52 deletions careconnect/App.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
import { useFonts } from "expo-font";
import * as SplashScreen from "expo-splash-screen";
import { StatusBar } from "expo-status-bar";
// import { StatusBar } from "expo-status-bar";
import React, { useCallback, useEffect, useState } from "react";
import { StyleSheet, Text, View } from "react-native";
// import { Text, View } from "react-native";
import { SafeAreaProvider } from "react-native-safe-area-context";
import { NavigationContainer } from "@react-navigation/native";
import WelcomeStackNavigator from "./navigators/WelcomeStackNavigator";

import { fonts } from "./assets/index";
// import styles from "./styles";

SplashScreen.preventAutoHideAsync(); // Keep splash screen visible until we are ready to hide it

export default function App() {
const [appIsReady, setAppIsReady] = useState(false);
const [fontsLoaded] = useFonts({
FiraSansMedium: require("./assets/fonts/FiraSans-Medium.ttf"),
FiraSansMediumItalic: require("./assets/fonts/FiraSans-MediumItalic.ttf"),
FiraSansRegular: require("./assets/fonts/FiraSans-Regular.ttf"),
FiraSansSemiBold: require("./assets/fonts/FiraSans-SemiBold.ttf"),
FiraSansSemiBoldItalic: require("./assets/fonts/FiraSans-SemiBoldItalic.ttf"),
FiraSansThin: require("./assets/fonts/FiraSans-Thin.ttf"),
FiraSansThinItalic: require("./assets/fonts/FiraSans-ThinItalic.ttf"),
});
const [fontsLoaded] = useFonts(fonts);

useEffect(() => {
async function prepare() {
Expand Down Expand Up @@ -45,47 +42,13 @@ export default function App() {

return (
<SafeAreaProvider>
<View style={styles.container} onLayout={onLayoutRootView}>
<Text style={styles.FiraSansSemiBold}>We are readyyyyyyy</Text>
<StatusBar style="auto" />
</View>
<NavigationContainer
onReady={() => {
onLayoutRootView();
}}
>
<WelcomeStackNavigator />
</NavigationContainer>
</SafeAreaProvider>
);
}

const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: "#B272A4",
alignItems: "center",
justifyContent: "center",
},
FiraSansMedium: {
fontFamily: "FiraSansMedium",
fontSize: 20,
},
FiraSansMediumItalic: {
fontFamily: "FiraSansMediumItalic",
fontSize: 20,
},
FiraSansRegular: {
fontFamily: "FiraSansRegular",
fontSize: 20,
},
FiraSansSemiBold: {
fontFamily: "FiraSansSemiBold",
fontSize: 20,
},
FiraSansSemiBoldItalic: {
fontFamily: "FiraSansSemiBoldItalic",
fontSize: 20,
},
FiraSansThin: {
fontFamily: "FiraSansThin",
fontSize: 20,
},
FiraSansThinItalic: {
fontFamily: "FiraSansThinItalic",
fontSize: 20,
},
});
14 changes: 14 additions & 0 deletions careconnect/app.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export default {
backgroundColor: "#B272A4",
},
assetBundlePatterns: ["**/*"],
scheme: "careconnect",
ios: {
supportsTablet: true,
},
Expand All @@ -26,15 +27,28 @@ export default {
},
web: {
favicon: "./assets/icons/app-icon-main.png",
bundler: "metro",
},
updates: {
fallbackToCacheTimeout: 0,
},
plugins: [
["expo-router"],
[
"expo-font",
{
fonts: [
"./assets/fonts/FiraSans-Black.ttf",
"./assets/fonts/FiraSans-BlackItalic.ttf",
"./assets/fonts/FiraSans-Bold.ttf",
"./assets/fonts/FiraSans-BoldItalic.ttf",
"./assets/fonts/FiraSans-ExtraBold.ttf",
"./assets/fonts/FiraSans-ExtraBoldItalic.ttf",
"./assets/fonts/FiraSans-ExtraLight.ttf",
"./assets/fonts/FiraSans-ExtraLightItalic.ttf",
"./assets/fonts/FiraSans-Italic.ttf",
"./assets/fonts/FiraSans-Light.ttf",
"./assets/fonts/FiraSans-LightItalic.ttf",
"./assets/fonts/FiraSans-Medium.ttf",
"./assets/fonts/FiraSans-MediumItalic.ttf",
"./assets/fonts/FiraSans-Regular.ttf",
Expand Down
Binary file added careconnect/assets/images/welcome-page-pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions careconnect/assets/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
export const fonts = {
FiraSansBlack: require("./fonts/FiraSans-Black.ttf"),
FiraSansBlackItalic: require("./fonts/FiraSans-BlackItalic.ttf"),
FiraSansBold: require("./fonts/FiraSans-Bold.ttf"),
FiraSansBoldItalic: require("./fonts/FiraSans-BoldItalic.ttf"),
FiraSansExtraBold: require("./fonts/FiraSans-ExtraBold.ttf"),
FiraSansExtraBoldItalic: require("./fonts/FiraSans-ExtraBoldItalic.ttf"),
FiraSansExtraLight: require("./fonts/FiraSans-ExtraLight.ttf"),
FiraSansExtraLightItalic: require("./fonts/FiraSans-ExtraLightItalic.ttf"),
FiraSansItalic: require("./fonts/FiraSans-Italic.ttf"),
FiraSansLight: require("./fonts/FiraSans-Light.ttf"),
FiraSansLightItalic: require("./fonts/FiraSans-LightItalic.ttf"),
FiraSansMedium: require("./fonts/FiraSans-Medium.ttf"),
FiraSansMediumItalic: require("./fonts/FiraSans-MediumItalic.ttf"),
FiraSansRegular: require("./fonts/FiraSans-Regular.ttf"),
FiraSansSemiBold: require("./fonts/FiraSans-SemiBold.ttf"),
FiraSansSemiBoldItalic: require("./fonts/FiraSans-SemiBoldItalic.ttf"),
FiraSansThin: require("./fonts/FiraSans-Thin.ttf"),
FiraSansThinItalic: require("./fonts/FiraSans-ThinItalic.ttf"),
};
1 change: 0 additions & 1 deletion careconnect/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
module.exports = function (api) {
api.cache(true);
return {
Expand Down
24 changes: 13 additions & 11 deletions careconnect/firebase/firebaseConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@
// Import the functions you need from the SDKs you need
import Constants from 'expo-constants';
import { initializeApp } from "firebase/app";
import { getAuth } from "firebase/auth";
import { getFirestore } from "firebase/firestore";

// TODO: Add SDKs for Firebase products that you want to use
// https://firebase.google.com/docs/web/setup#available-libraries

// Your web app's Firebase configuration
// Initialize the web app's Firebase configuration
const firebaseConfig = {
apiKey: Constants.manifest?.extra?.firebaseApiKey,
authDomain: Constants.manifest?.extra?.firebaseAuthDomain,
projectId: Constants.manifest?.extra?.firebaseProjectId,
storageBucket: Constants.manifest?.extra?.firebaseStorageBucket,
messagingSenderId: Constants.manifest?.extra?.firebaseMessagingSenderId,
appId: Constants.manifest?.extra?.firebaseAppId,
apiKey: Constants.expoConfig.extra.apiKey,
authDomain: Constants.expoConfig.extra.firebaseAuthDomain,
projectId: Constants.expoConfig.extra.firebaseProjectId,
storageBucket: Constants.expoConfig.extra.firebaseStorageBucket,
messagingSenderId: Constants.expoConfig.extra.firebaseMessagingSenderId,
appId: Constants.expoConfig.extra.firebaseAppId,
};

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

export default app;
// Initialize Firebase, Firestore and authentication module
export const FIREBASE_APP = initializeApp(firebaseConfig);
export const FIRESTORE_DB = getFirestore(FIREBASE_APP);
export const FIREBASE_AUTH = getAuth(FIREBASE_APP);
1 change: 0 additions & 1 deletion careconnect/metro.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
const { getDefaultConfig } = require("expo/metro-config");

const config = getDefaultConfig(__dirname);
Expand Down
19 changes: 19 additions & 0 deletions careconnect/navigators/WelcomeStackNavigator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from "react";
import { createStackNavigator } from "@react-navigation/stack";
import WelcomeScreen from "../screens/welcome/WelcomeScreen";

const WelcomeStack = createStackNavigator();
const WelcomeStackNavigator = () => {
return (
<WelcomeStack.Navigator
screenOptions={{
headerShown: false,
}}
initialRouteName="Welcome"
>
<WelcomeStack.Screen name="Welcome" component={WelcomeScreen} />
</WelcomeStack.Navigator>
);
};

export default WelcomeStackNavigator;
Loading

0 comments on commit b53223a

Please sign in to comment.