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

My changes #3

Open
wants to merge 59 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
f5836d3
Created a new Expo app
MatheusGraciki May 30, 2022
037462b
configure eslint
MatheusGraciki May 31, 2022
4bc9ee0
added : Api, SignUp screen and styles
MatheusGraciki Jun 2, 2022
b59d20c
added: Api, SignIn screen and styles
MatheusGraciki Jun 2, 2022
27b6771
fix import
MatheusGraciki Jun 3, 2022
8a68e74
Getting Bearer Token
MatheusGraciki Jun 6, 2022
2c8e892
Update styles.js
MatheusGraciki Jun 6, 2022
b86d341
Change dir
MatheusGraciki Jun 6, 2022
556f428
add Images
MatheusGraciki Jun 7, 2022
5ffedc5
setting routes
MatheusGraciki Jun 7, 2022
c19a70a
Getting the user role
MatheusGraciki Jun 7, 2022
a41642c
update styles.js
MatheusGraciki Jun 7, 2022
2bdc1f7
update styles.js
MatheusGraciki Jun 7, 2022
bd79f11
dependencies
MatheusGraciki Jun 7, 2022
329a733
Create TelaAulas
MatheusGraciki Jun 7, 2022
1bde212
Create TelaEditDelAulas
MatheusGraciki Jun 7, 2022
83c6385
changing the background Image
MatheusGraciki Jun 7, 2022
1d98be8
Update TelaCriarAulas
MatheusGraciki Jun 7, 2022
c68598f
Changin routes
MatheusGraciki Jun 8, 2022
78b91bb
Changing imagebackground
MatheusGraciki Jun 8, 2022
4ce27ab
dependencies
MatheusGraciki Jun 8, 2022
d0f5275
Create styles.js
MatheusGraciki Jun 8, 2022
4117555
Creating add categories, listing categories
MatheusGraciki Jun 8, 2022
6db8ae0
Added: automatic fetchdata and flatlist
MatheusGraciki Jun 10, 2022
0e1443e
update styles.js
MatheusGraciki Jun 10, 2022
72e1372
createCategory, featchData, deleteCategories, updateCategories
MatheusGraciki Jun 10, 2022
f07280c
fix url api
MatheusGraciki Jun 11, 2022
6351fe1
changing method of navigation
MatheusGraciki Jun 11, 2022
6f0381b
fetchData, deleteClass, uptdateClass
MatheusGraciki Jun 11, 2022
18049fa
Update styles.js
MatheusGraciki Jun 11, 2022
f6889e2
createGymClass, see classes and create classes buttons
MatheusGraciki Jun 11, 2022
9d2a578
Fonts and image
MatheusGraciki Jun 12, 2022
a43d67c
dependencies
MatheusGraciki Jun 12, 2022
4ad0bd8
send params
MatheusGraciki Jun 12, 2022
21f1da2
update styles.js
MatheusGraciki Jun 12, 2022
73f34e2
Getting datetime and duration
MatheusGraciki Jun 12, 2022
f154334
screen to show the classes for users
MatheusGraciki Jun 12, 2022
0ca9f02
getting time and updating updateClass
MatheusGraciki Jun 12, 2022
c9f8947
sendng props
MatheusGraciki Jun 12, 2022
cffef59
code refactoring, creating components
MatheusGraciki Jun 12, 2022
7fbbc7f
update styles.js
MatheusGraciki Jun 12, 2022
8f85643
changing names for better organization
MatheusGraciki Jun 12, 2022
949e8a6
Delete index.js
MatheusGraciki Jun 12, 2022
3652eaa
Refactoring code and using components
MatheusGraciki Jun 12, 2022
3f4d9c0
fix
MatheusGraciki Jun 13, 2022
dbbd022
passing params
MatheusGraciki Jun 13, 2022
987eb04
components
MatheusGraciki Jun 13, 2022
1bc2f08
Update.js
MatheusGraciki Jun 13, 2022
c7b6d06
dependencies
MatheusGraciki Jun 13, 2022
c2d6375
fixing
MatheusGraciki Jun 13, 2022
142ce9e
update styles.js
MatheusGraciki Jun 13, 2022
615ec52
adding clock icon and halter icon
MatheusGraciki Jun 13, 2022
39367f0
using component Modalnput
MatheusGraciki Jun 13, 2022
52eebc2
Merge branch 'SwitchDreams:main' into master
MatheusGraciki Jun 14, 2022
0c24ced
update SignUp Background image
MatheusGraciki Jul 10, 2022
148f1d0
update components styles
MatheusGraciki Jul 10, 2022
c2137d3
finished registration screen styles
MatheusGraciki Jul 10, 2022
7e35d0e
Merge branch 'master' of https://github.com/MatheusGraciki/front-end-…
MatheusGraciki Jul 10, 2022
a24fdd5
Redesing
MatheusGraciki Jul 24, 2022
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
19 changes: 19 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8

[*.js]
indent_style = space
indent_size = 4

[*.md]
trim_trailing_whitespace = false

[*.json]
indent_style = space
indent_size = 2

52 changes: 52 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"env": {
"browser": true,
"node": true,
"es6": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 8,
"sourceType": "module"
},
"plugins": [
"react",
"react-native"
],

"rules": {
"no-console": "off",
"guard-for-in": "error",
"semi": [
"error",
"always"
],
"no-loop-func": "error",
"no-sync": "error",
"no-template-curly-in-string": "error",
"block-scoped-var": "error",
"dot-notation": "error",
"curly": [
"error",
"multi-line",
"consistent"
],
"indent": 2,
"react/prop-types": [
"error",
{
"ignore": [
"navigation",
"route"
]
}
]
}
}
4 changes: 4 additions & 0 deletions .expo-shared/assets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"12bb71342c6255bbf50437ec8f4441c083f47cdb74bd89160c15e4f43e52a1cb": true,
"40b842e832070c58deac6aa9e08fa459302ee3f9da492c7e77d93d2fbf4a56fd": true
}
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
node_modules/
.expo/
dist/
npm-debug.*
*.jks
*.p8
*.p12
*.key
*.mobileprovision
*.orig.*
web-build/

# macOS
.DS_Store
106 changes: 106 additions & 0 deletions App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import React from 'react';
import { NavigationContainer } from '@react-navigation/native';
import { createStackNavigator } from '@react-navigation/stack';
import { createDrawerNavigator } from '@react-navigation/drawer';
import 'react-native-gesture-handler';


// importing screens
import TelaCadastro from './src/screens/TelaCadastro/index';
import TelaLogin from './src/screens/TelaLogin/index';
import TelaAulas from './src/screens/CategoriesScreens/TelaCategoriasAlunos';
import { setStatusBarHidden } from 'expo-status-bar';
import TelaCriarCategoriasProfessores from './src/screens/CategoriesScreens/TelaCriarCategoriasProfessores/index';
import TelaCriarAulas from './src/screens/GymClassesScreen/TelaCriarAulas/index';
import TelaCategoriasAlunos from './src/screens/CategoriesScreens/TelaCategoriasAlunos';
import TelaAulasAlunos from './src/screens/GymClassesScreen/TelaAulas';

const Stack = createStackNavigator();
const Drawer = createDrawerNavigator();

function TelaCategoriaProfesor(){

return(

<Drawer.Navigator>

{/* Displayed for teachers or adims */}

<Drawer.Screen
name='Criar Categorias'
component={TelaCriarCategoriasProfessores}
options={{headerShown: false}}
/>

<Drawer.Screen
name='Aulas Disponiveis'
component={TelaCriarAulas}
/>





</Drawer.Navigator>
);
}


export default function App() {

return (

<NavigationContainer>

<Stack.Navigator>


{/* Displayed for all users */}
<Stack.Screen
name='Cadastro'
component={TelaCadastro}
options={{
headerShown: false
}}
/>
{/* Displayed for all users */}
<Stack.Screen
name='Login'
component={TelaLogin}
options={{
headerShown: false,
setStatusBarHidden
}}
/>
{/*Displayed categories for teachers or admins */}

<Stack.Screen
name='CriarCategoriasProfessores'
component={TelaCategoriaProfesor}
options={{
headerShown: false
}}
/>
{/*Displayed categories for customers */}

<Stack.Screen
name='Categorias'
component={TelaCategoriasAlunos}
/>

{/*Displayed classess for customers */}

<Stack.Screen
name='Aulas'
component={TelaAulasAlunos}
options={{
headerShown: false,
setStatusBarHidden
}}
/>
</Stack.Navigator>

</NavigationContainer>

);
}
33 changes: 33 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"expo": {
"name": "front-end-challenge",
"slug": "front-end-challenge",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/icon.png",
"userInterfaceStyle": "light",
"splash": {
"image": "./assets/splash.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
"updates": {
"fallbackToCacheTimeout": 0
},
"assetBundlePatterns": [
"**/*"
],
"ios": {
"supportsTablet": true
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#FFFFFF"
}
},
"web": {
"favicon": "./assets/favicon.png"
}
}
}
Binary file added assets/adaptive-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/Lexend_Deca/LexendDeca-Black.ttf
Binary file not shown.
Binary file added assets/fonts/Lexend_Deca/LexendDeca-Bold.ttf
Binary file not shown.
Binary file added assets/fonts/Lexend_Deca/LexendDeca-ExtraBold.ttf
Binary file not shown.
Binary file not shown.
Binary file added assets/fonts/Lexend_Deca/LexendDeca-Light.ttf
Binary file not shown.
Binary file added assets/fonts/Lexend_Deca/LexendDeca-Medium.ttf
Binary file not shown.
Binary file added assets/fonts/Lexend_Deca/LexendDeca-Regular.ttf
Binary file not shown.
Binary file added assets/fonts/Lexend_Deca/LexendDeca-SemiBold.ttf
Binary file not shown.
Binary file added assets/fonts/Lexend_Deca/LexendDeca-Thin.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-Black.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-BlackItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-Bold.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-BoldItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-ExtraBold.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-ExtraBoldItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-ExtraLight.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-ExtraLightItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-Italic.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-Light.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-LightItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-Medium.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-MediumItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-Regular.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-SemiBold.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-SemiBoldItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-Thin.ttf
Binary file not shown.
Binary file added assets/fonts/Poppins-ThinItalic.ttf
Binary file not shown.
Binary file added assets/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/imgs/BackgroundImageAulas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/imgs/BackgroundImageAulas1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/imgs/FitDreams2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/imgs/ImgSignUp.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/imgs/crossfit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = function(api) {
api.cache(true);
return {
presets: ['babel-preset-expo'],
plugins: ['react-native-reanimated/plugin'],

};
};
Loading