diff --git a/.expo/README.md b/.expo/README.md new file mode 100644 index 0000000..fd146b4 --- /dev/null +++ b/.expo/README.md @@ -0,0 +1,15 @@ +> Why do I have a folder named ".expo" in my project? + +The ".expo" folder is created when an Expo project is started using "expo start" command. + +> What do the files contain? + +- "devices.json": contains information about devices that have recently opened this project. This is used to populate the "Development sessions" list in your development builds. +- "packager-info.json": contains port numbers and process PIDs that are used to serve the application to the mobile device/simulator. +- "settings.json": contains the server configuration that is used to serve the application manifest. + +> Should I commit the ".expo" folder? + +No, you should not share the ".expo" folder. It does not contain any information that is relevant for other developers working on the project, it is specific to your machine. + +Upon project creation, the ".expo" folder is already added to your ".gitignore" file. diff --git a/.expo/settings.json b/.expo/settings.json new file mode 100644 index 0000000..92bc513 --- /dev/null +++ b/.expo/settings.json @@ -0,0 +1,8 @@ +{ + "hostType": "lan", + "lanType": "ip", + "dev": true, + "minify": false, + "urlRandomness": null, + "https": false +} diff --git a/README.md b/README.md index e00ad09..275d1f5 100644 --- a/README.md +++ b/README.md @@ -71,11 +71,9 @@ SCAR, **S**mart **C**ontract **A**cademic **R**egistry is a multiplatform applic - [![Node][Node.js]][Node-url] - [![React Native][ReactNative.js]][ReactNative-url] - [![Expo React Native][Expo.js]][Expo-url] -- [![FireBase][FireBase.js]][FireBase-url] - [![Smart Contract][Solidity.sol]][Solidity-url] - [![Hardhat][Hardhat.js]][Hardhat-url] - [![Ethereum][Ethereum.js]][Ethereum-url] -- [![TypeScript][TypeScript.ts]][TypeScript-url]

(back to top)

@@ -83,8 +81,8 @@ SCAR, **S**mart **C**ontract **A**cademic **R**egistry is a multiplatform applic ## Getting Started -This is an example of how you may give instructions on setting up your project locally. -To get a local copy up and running follow these simple example steps. +We need to install the DiGo Certify app on your device. +The following instructions will guide you through the installation process. ### Prerequisites @@ -100,28 +98,29 @@ This is an example of how to list things you need to use the software and how to 1. Get a free API Key at [https://example.com](https://example.com) 2. Clone the repo ```sh - git clone https://github.com/github_username/repo_name.git + git clone https://github.com/DiGo-Certify/DiGo-certify-app.git ``` 3. Install NPM packages ```sh + cd code npm install ``` -4. Enter your API in `config.js` - ```js - const API_KEY = "ENTER YOUR API"; - ``` +4. Run the app + ```sh + npx expo start + ```

(back to top)

-## Usage + @@ -147,11 +146,11 @@ Distributed under the GNU GENERAL PUBLIC LICENSE License. See `LICENSE.txt` for -## Acknowledgments +

(back to top)

diff --git a/code/app/(auth)/sign-in.jsx b/code/app/(auth)/sign-in.jsx index 216d1de..7fac4d7 100644 --- a/code/app/(auth)/sign-in.jsx +++ b/code/app/(auth)/sign-in.jsx @@ -29,7 +29,7 @@ const SignIn = () => { // setUser(result); // setIsLogged(true); - router.push('/profile'); + router.replace('/profile'); } catch (error) { Alert.alert('Error', error.message); } finally { diff --git a/code/app/(auth)/sign-up.jsx b/code/app/(auth)/sign-up.jsx index 5c11383..5c9627f 100644 --- a/code/app/(auth)/sign-up.jsx +++ b/code/app/(auth)/sign-up.jsx @@ -34,7 +34,7 @@ function SignUp() { // setUser(result); // setIsLogged(true); - router.push('/profile'); + router.replace('/profile'); } catch (error) { Alert.alert('Error', error.message); } finally { diff --git a/code/app/(tabs)/profile.jsx b/code/app/(tabs)/profile.jsx index f848307..182716c 100644 --- a/code/app/(tabs)/profile.jsx +++ b/code/app/(tabs)/profile.jsx @@ -5,6 +5,7 @@ import Images from '@/constants/images'; import { SafeAreaView } from 'react-native-safe-area-context'; import Colors from '@/constants/colors'; import { List } from 'react-native-paper'; +import { router } from 'expo-router'; const Profile = () => { // Mockup profile @@ -18,7 +19,13 @@ const Profile = () => { // Handle wallet connect with metamask const handleWalletConnect = async () => { - console.log('Wallet connect'); + router.push('/initial-screen/initial-screen') + + }; + + // Handle logout + const handleLogout = () => { + router.push('/sign-in'); }; return ( @@ -39,7 +46,7 @@ const Profile = () => { icon={Icons.send} /> console.log('Settings')} icon={Icons.settings} /> - console.log('Log out')} icon={Icons.logOut} /> + ); diff --git a/code/app/index.jsx b/code/app/index.jsx index 2a553d0..7cf6627 100644 --- a/code/app/index.jsx +++ b/code/app/index.jsx @@ -3,6 +3,7 @@ import React, { useState, useEffect } from 'react'; import * as SecureStore from 'expo-secure-store'; import SignIn from './(auth)/sign-in'; import Profile from './(tabs)/profile'; +import InitialScreen from './initial-screen/initial-screen'; // A possibility of the decision to decide what the first screen should be function App() { diff --git a/code/app/initial-screen/initial-screen.jsx b/code/app/initial-screen/initial-screen.jsx index 2e8f902..4dc57a3 100644 --- a/code/app/initial-screen/initial-screen.jsx +++ b/code/app/initial-screen/initial-screen.jsx @@ -34,7 +34,7 @@ function InitialScreen() { > Create Wallet - router.replace('/sign-in')}> + router.replace('/profile')}> Already have a wallet diff --git a/code/constants/Colors.js b/code/constants/Colors.js index d5e568d..ddbd688 100644 --- a/code/constants/Colors.js +++ b/code/constants/Colors.js @@ -11,5 +11,5 @@ export default { black, white, grey, - sonicSilver + sonicSilver, };