Skip to content

Changed Backend Workout Configuration #1654

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

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
9824de3
test
ezouu May 8, 2025
2b67a39
converted code from react to native
ezouu May 8, 2025
dd44326
get started button for welcome screen
Andurdur May 13, 2025
8e6c496
signup.tsx
acashmoney777 May 19, 2025
d0699ba
Merge branch 'master' of github.com:KushK04/KonditionFastAPI
acashmoney777 May 19, 2025
767a29e
modified so that it takes u to signup page when appropriate
acashmoney777 May 19, 2025
7ce10e8
Moved signup.tsx out of (tabs), added signup2.tsx
acashmoney777 May 19, 2025
11f3a79
routing
acashmoney777 May 20, 2025
43f704b
home page made
Andurdur May 20, 2025
2e85c30
routing to home
acashmoney777 May 20, 2025
ca9cf6b
added image
Andurdur May 20, 2025
eff2910
bottom nav
acashmoney777 May 20, 2025
05f8b1e
Merge branch 'master' of github.com:KushK04/KonditionFastAPI
acashmoney777 May 20, 2025
e4fe973
package update
acashmoney777 May 20, 2025
5c81140
added home images
Andurdur May 20, 2025
7125625
fixed folder location for home pics
Andurdur May 20, 2025
f9fe71d
Merge branch 'master' of github.com:KushK04/KonditionFastAPI
acashmoney777 May 20, 2025
9de15cc
fixed location pngs
Andurdur May 20, 2025
24ca54f
name chagne
Andurdur May 20, 2025
56583cb
fix packages
Andurdur May 20, 2025
1612345
fixed package issues should work
Andurdur May 20, 2025
14830d7
added routing to home screen
Andurdur May 20, 2025
826c667
added header for navigation
Andurdur May 20, 2025
bebbad4
notification
shaynadas May 22, 2025
dadf376
Merge backend changes from other branch
jgmuende May 22, 2025
9520862
home page names
acashmoney777 May 23, 2025
8bbe3ea
packages and contexts
acashmoney777 May 23, 2025
4802060
register page fix
acashmoney777 May 23, 2025
99abbbb
signup 2 fixes, no bugs now
acashmoney777 May 23, 2025
6fcf2e8
profile page + signup validations
acashmoney777 May 23, 2025
2ec74e3
keeps track of age, weight, height of users
acashmoney777 May 23, 2025
72dd735
used router for code consistency
Andurdur May 23, 2025
4326390
Update KonditionExpo with unified navigation, blue/purple color schem…
ezouu May 25, 2025
d7addee
added pb backend logic, working on displaying errors
KushK04 May 27, 2025
2c403b5
Displayed Personal Bests Section, Working on Dynamically Updating it …
KushK04 May 28, 2025
6602cf3
Still working on reworking backend
KushK04 Jun 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
12 changes: 6 additions & 6 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ FRONTEND_HOST=http://localhost:5173
# Environment: local, staging, production
ENVIRONMENT=local

PROJECT_NAME="Full Stack FastAPI Project"
STACK_NAME=full-stack-fastapi-project
PROJECT_NAME="Kondition Fastapi"
STACK_NAME=kondition-fastapi

# Backend
BACKEND_CORS_ORIGINS="http://localhost,http://localhost:5173,https://localhost,https://localhost:5173,http://localhost.tiangolo.com"
SECRET_KEY=changethis
SECRET_KEY=S8T75_i6lcsZerDMe59A9tmyx0-AtFAzGY5bez_dsBw
FIRST_SUPERUSER=admin@example.com
FIRST_SUPERUSER_PASSWORD=changethis
FIRST_SUPERUSER_PASSWORD=VSOhm4DWGG8h1kOBAhlZYM0HqqL--r4CuAhZ-eXQX8Q

# Emails
SMTP_HOST=
Expand All @@ -34,9 +34,9 @@ SMTP_PORT=587
# Postgres
POSTGRES_SERVER=localhost
POSTGRES_PORT=5432
POSTGRES_DB=app
POSTGRES_DB=konditionDB
POSTGRES_USER=postgres
POSTGRES_PASSWORD=changethis
POSTGRES_PASSWORD=d0pFlN6jcym0Fui_lc4dShkzzRAYUL78ToQTMoALE1g

SENTRY_DSN=

Expand Down
15 changes: 15 additions & 0 deletions .expo/README.md
Original file line number Diff line number Diff line change
@@ -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.
8 changes: 8 additions & 0 deletions .expo/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"hostType": "lan",
"lanType": "ip",
"dev": true,
"minify": false,
"urlRandomness": null,
"https": false
}
39 changes: 39 additions & 0 deletions KonditionExpo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files

# dependencies
node_modules/

# Expo
.expo/
dist/
web-build/
expo-env.d.ts

# Native
.kotlin/
*.orig.*
*.jks
*.p8
*.p12
*.key
*.mobileprovision

# Metro
.metro-health-check*

# debug
npm-debug.*
yarn-debug.*
yarn-error.*

# macOS
.DS_Store
*.pem

# local env files
.env*.local

# typescript
*.tsbuildinfo

app-example
50 changes: 50 additions & 0 deletions KonditionExpo/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Welcome to your Expo app 👋

This is an [Expo](https://expo.dev) project created with [`create-expo-app`](https://www.npmjs.com/package/create-expo-app).

## Get started

1. Install dependencies

```bash
npm install
```

2. Start the app

```bash
npx expo start
```

In the output, you'll find options to open the app in a

- [development build](https://docs.expo.dev/develop/development-builds/introduction/)
- [Android emulator](https://docs.expo.dev/workflow/android-studio-emulator/)
- [iOS simulator](https://docs.expo.dev/workflow/ios-simulator/)
- [Expo Go](https://expo.dev/go), a limited sandbox for trying out app development with Expo

You can start developing by editing the files inside the **app** directory. This project uses [file-based routing](https://docs.expo.dev/router/introduction).

## Get a fresh project

When you're ready, run:

```bash
npm run reset-project
```

This command will move the starter code to the **app-example** directory and create a blank **app** directory where you can start developing.

## Learn more

To learn more about developing your project with Expo, look at the following resources:

- [Expo documentation](https://docs.expo.dev/): Learn fundamentals, or go into advanced topics with our [guides](https://docs.expo.dev/guides).
- [Learn Expo tutorial](https://docs.expo.dev/tutorial/introduction/): Follow a step-by-step tutorial where you'll create a project that runs on Android, iOS, and the web.

## Join the community

Join our community of developers creating universal apps.

- [Expo on GitHub](https://github.com/expo/expo): View our open source platform and contribute.
- [Discord community](https://chat.expo.dev): Chat with Expo users and ask questions.
42 changes: 42 additions & 0 deletions KonditionExpo/app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"expo": {
"name": "KonditionExpo",
"slug": "KonditionExpo",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/images/icon.png",
"scheme": "konditionexpo",
"userInterfaceStyle": "automatic",
"newArchEnabled": true,
"ios": {
"supportsTablet": true
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/images/adaptive-icon.png",
"backgroundColor": "#ffffff"
},
"edgeToEdgeEnabled": true
},
"web": {
"bundler": "metro",
"output": "static",
"favicon": "./assets/images/favicon.png"
},
"plugins": [
"expo-router",
[
"expo-splash-screen",
{
"image": "./assets/images/splash-icon.png",
"imageWidth": 200,
"resizeMode": "contain",
"backgroundColor": "#ffffff"
}
]
],
"experiments": {
"typedRoutes": true
}
}
}
67 changes: 67 additions & 0 deletions KonditionExpo/app/(tabs)/_layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// app/(tabs)/_layout.tsx
import { Tabs, Redirect } from 'expo-router';
import { useEffect } from 'react';
import { ActivityIndicator, View } from 'react-native';
import { Platform } from 'react-native';

import { useAuth } from '@/contexts/AuthContext';
import { Colors } from '@/constants/Colors';
import { useColorScheme } from '@/hooks/useColorScheme';
import { HapticTab } from '@/components/HapticTab';
import { IconSymbol } from '@/components/ui/IconSymbol';
import TabBarBackground from '@/components/ui/TabBarBackground';

export default function TabLayout() {
const { token, loading } = useAuth();
const colorScheme = useColorScheme();

if (loading) {
return (
<View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
<ActivityIndicator size="large" />
</View>
);
}

if (!token) {
return <Redirect href="/login" />;
}

return (
<Tabs
screenOptions={{
tabBarActiveTintColor: Colors[colorScheme ?? 'light'].tint,
headerShown: false,
tabBarButton: HapticTab,
tabBarBackground: TabBarBackground,
tabBarStyle: Platform.select({
ios: {
position: 'absolute',
},
default: {},
}),
}}>
<Tabs.Screen
name="index"
options={{
title: 'Home',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="house.fill" color={color} />,
}}
/>
<Tabs.Screen
name="progress"
options={{
title: 'Progress',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="chart.line.uptrend.xyaxis" color={color} />,
}}
/>
<Tabs.Screen
name="profile"
options={{
title: 'Profile',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.fill" color={color} />,
}}
/>
</Tabs>
);
}
Loading
Loading