Skip to content

Commit

Permalink
f
Browse files Browse the repository at this point in the history
  • Loading branch information
MinChoi0129 committed Sep 29, 2024
1 parent 782cda4 commit c6653ab
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 67 deletions.
5 changes: 2 additions & 3 deletions backend/routers/friger.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,13 @@ class Config:
# TO DO : 2. 내가 포함된 Friger List 조회


# 1. Friger 생성
@router.post("/frigers/")
# async def create_friger(name : str, unique_code: int, db: Session = Depends(get_db), current_user: User = Depends(authenticate)):
async def create_friger(name: str, unique_code: int, db: Session = Depends(get_db)):
async def create_friger(unique_code: int, db: Session = Depends(get_db)):
db_user = db.query(User).filter(User.id == 1).first()
# 임시
new_friger = Friger(
name=name,
name=db_user.nickname,
unique_code=unique_code,
owner_id=1,
user_id=1,
Expand Down
57 changes: 0 additions & 57 deletions backend/routers/kakao_auth.py

This file was deleted.

3 changes: 2 additions & 1 deletion frontend/lib/Pages/login/google_auth.dart
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ class SignInPage extends StatelessWidget {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SignupPage1(username: username, email: email),
builder: (context) =>
SignupPage1(username: username, email: email, cameras: cameras),
),
);
} else {
Expand Down
7 changes: 5 additions & 2 deletions frontend/lib/Pages/login/signup.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'dart:async';
import 'dart:convert';

import 'package:camera/camera.dart';
import 'package:flutter/material.dart';
import 'package:frontend/Pages/login/signup_complete.dart';
import 'package:frontend/widgets/login/signup_inputForm.dart';
Expand All @@ -12,11 +13,13 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
class SignupPage1 extends StatefulWidget {
final String username;
final String email;
final List<CameraDescription> cameras;

const SignupPage1({
super.key,
required this.username,
required this.email,
required this.cameras,
});

@override
Expand Down Expand Up @@ -590,8 +593,8 @@ class _SignupPage1 extends State<SignupPage1> {
Navigator.pushReplacement(
context,
MaterialPageRoute(
builder: (context) => const SignupComplete(
cameras: [],
builder: (context) => SignupComplete(
cameras: widget.cameras,
),
),
);
Expand Down
4 changes: 2 additions & 2 deletions frontend/lib/Pages/share/ingrediant/IngredientDetailPage.dart
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ class _IngredientDetailPageState extends State<IngredientDetailPage> {
// 프로필 이미지 추가
const CircleAvatar(
radius: 20,
backgroundImage:
AssetImage('assets/images/profile.png'), // 기본 유저 이미지 경로
backgroundImage: AssetImage(
'assets/images/profile.png'), // 기본 유저 이미지 경로
),
const SizedBox(width: 10),
Expanded(
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/Pages/share/ingrediant/share_ingredient.dart
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,4 @@ class ShareIngredient extends StatelessWidget {
),
);
}
}
}
2 changes: 1 addition & 1 deletion frontend/lib/Pages/share/tips/tip_detail.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ReceipeDetailPage extends StatefulWidget {
class _ReceipeDetailPageState extends State<ReceipeDetailPage> {
bool isLiked = false;
bool isScrapped = false;
final int userId = 0; // 현재 유저 아이디(0으로 고정)
final int userId = 1;

@override
void initState() {
Expand Down

0 comments on commit c6653ab

Please sign in to comment.