Skip to content
Binary file added assets/icons/art.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/icons/book.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/icons/chat.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/icons/etc.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/icons/guitar.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/icons/keyboard.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/icons/login.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/icons/oven.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/icons/startup.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/icons/travel.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/icons/volunteer.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/images/road_bottom.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/images/stage_road.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion lib/core/user_model.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:componentss/features/study/data/group_model.dart';
import 'package:componentss/features/study/data/tempGroup.dart';

class User {
final String username;
Expand Down
1 change: 0 additions & 1 deletion lib/core/user_provider.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'dart:convert';

import 'package:componentss/features/study/data/group_model.dart';
import 'package:componentss/features/study/data/tempGroup.dart';
import 'package:http/http.dart' as http;
import 'package:flutter/material.dart';
import 'user_model.dart';
Expand Down
8 changes: 4 additions & 4 deletions lib/core/widgets/customBottomNavigationBar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ class _CustomBottomNavigationBarState extends State<CustomBottomNavigationBar> {
BottomNavigationBarItem(
icon: Padding(
padding: EdgeInsets.only(bottom: 4),
child: Icon(CustomIcon.study),
child: Icon(CustomIcon.baking),
),
label: '스터디',
label: '베이킹',
),
BottomNavigationBarItem(
icon: Padding(
padding: EdgeInsets.only(bottom: 4),
child: Icon(CustomIcon.baking),
child: Icon(CustomIcon.study),
),
label: '베이킹',
label: '스터디',
),
BottomNavigationBarItem(
icon: Padding(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/auth/login_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class _LoginScreenState extends State<LoginScreen> {
),
),
Text(
'|',
'',
style: TextStyle(
color: const Color(0xFF6B6B6B) /* dark-gray */,
fontSize: 40.sp,
Expand Down
12 changes: 11 additions & 1 deletion lib/features/auth/onboarding_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,17 @@ class OnboardingScreen extends StatelessWidget {
return Scaffold(
body: Column(
children: [
SizedBox(height: 1844.h),
SizedBox(height: 250.h),
Positioned(
left: 44.w,
top: 342.h,
child: Image.asset(
'assets/icons/login.png',
width: 992.w,
height: 1360.h,
),
),
SizedBox(height: 200.h),
GestureDetector(
onTap: () {
Navigator.push(
Expand Down
Loading