mirror of
https://github.com/SoPat712/RUSwipeShare.git
synced 2025-08-21 19:08:46 -04:00
Merge branch 'master' of https://github.com/SoPat712/RUSwipeShare
This commit is contained in:
@@ -1,9 +1,26 @@
|
||||
import 'package:firebase_auth/firebase_auth.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutterfire_ui/auth.dart';
|
||||
import 'package:firebase_database/firebase_database.dart';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
|
||||
import 'home.dart';
|
||||
|
||||
final FirebaseAuth auth = FirebaseAuth.instance;
|
||||
|
||||
Future<void> addUser(String? name, String uid) async {
|
||||
final CollectionReference users =
|
||||
FirebaseFirestore.instance.collection('users');
|
||||
return await users
|
||||
.add({
|
||||
'name': name,
|
||||
'uid': uid,
|
||||
'swipes': 0,
|
||||
})
|
||||
.then((value) => print(""))
|
||||
.catchError((error) => print("ERROR ADDING DATA: $error"));
|
||||
}
|
||||
|
||||
class AuthGate extends StatelessWidget {
|
||||
const AuthGate({super.key});
|
||||
|
||||
@@ -33,7 +50,9 @@ class AuthGate extends StatelessWidget {
|
||||
subtitleBuilder: (context, action) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 8.0),
|
||||
child: action == AuthAction.signIn ? const Text('Welcome to RUSwipeShare, please sign in!') : const Text('Welcome to RUSwipeShare, please sign up!'),
|
||||
child: action == AuthAction.signIn
|
||||
? const Text('Welcome to RUSwipeShare, please sign in!')
|
||||
: const Text('Welcome to RUSwipeShare, please sign up!'),
|
||||
);
|
||||
},
|
||||
footerBuilder: (context, action) {
|
||||
@@ -48,6 +67,20 @@ class AuthGate extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
User? user = auth.currentUser;
|
||||
|
||||
if (user != null) {
|
||||
bool isNewUser =
|
||||
user.metadata.creationTime == user.metadata.lastSignInTime;
|
||||
|
||||
if (isNewUser) {
|
||||
final name = user.displayName;
|
||||
final uid = user.uid;
|
||||
|
||||
addUser(name, uid);
|
||||
}
|
||||
}
|
||||
|
||||
return const HomeScreen();
|
||||
},
|
||||
);
|
||||
|
43
lib/buy.dart
Normal file
43
lib/buy.dart
Normal file
@@ -0,0 +1,43 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class BuyScreen extends StatefulWidget {
|
||||
const BuyScreen({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_BuyScreenState createState() => _BuyScreenState();
|
||||
}
|
||||
|
||||
class _BuyScreenState extends State<BuyScreen> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
TimeOfDay _time = TimeOfDay.now();
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text('Sell'),
|
||||
automaticallyImplyLeading: false,
|
||||
),
|
||||
body: OffersListView(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
final List<String> entries = <String>['A', 'B', 'C'];
|
||||
final List<int> colorCodes = <int>[600, 500, 100];
|
||||
|
||||
class OffersListView extends StatelessWidget {
|
||||
const OffersListView({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ListView.builder(
|
||||
padding: const EdgeInsets.all(8),
|
||||
itemCount: 30,
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
return Container(
|
||||
height: 80,
|
||||
color: Colors.amber[colorCodes[index % 3]],
|
||||
child: Center(child: Text('Entry ${entries[index % 3]}')),
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:persistent_bottom_nav_bar/persistent_tab_view.dart';
|
||||
import 'package:ruswipeshare/buy.dart';
|
||||
import 'package:ruswipeshare/sell.dart';
|
||||
import 'profile_screen_custom.dart';
|
||||
import 'main_screen.dart';
|
||||
@@ -20,7 +21,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
}
|
||||
|
||||
List<Widget> _buildScreens() => [
|
||||
const MainScreen(),
|
||||
const BuyScreen(),
|
||||
const SellScreen(),
|
||||
const ProfileScreenCustom(),
|
||||
const MainScreen(),
|
||||
|
@@ -1,7 +1,8 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'meetings.dart';
|
||||
|
||||
class MainScreen extends StatefulWidget {
|
||||
const MainScreen({ Key? key }) : super(key: key);
|
||||
const MainScreen({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_MainScreenState createState() => _MainScreenState();
|
||||
@@ -12,11 +13,11 @@ class _MainScreenState extends State<MainScreen> {
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text("Main Screen"),
|
||||
title: const Text("Main Beens"),
|
||||
),
|
||||
body: const Center(
|
||||
child: Text("Main Screen"),
|
||||
child: Text("Main Green"),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
47
lib/meetings.dart
Normal file
47
lib/meetings.dart
Normal file
@@ -0,0 +1,47 @@
|
||||
import 'dart:ffi';
|
||||
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
|
||||
class TimeRange {
|
||||
late DateTime startTime;
|
||||
late DateTime endTime;
|
||||
|
||||
TimeRange(this.startTime, this.endTime);
|
||||
}
|
||||
|
||||
class Seller {
|
||||
String name = "";
|
||||
String uid = "";
|
||||
String location = "";
|
||||
TimeRange availableTime;
|
||||
Int64 price;
|
||||
|
||||
Seller(this.name, this.uid, this.location, this.availableTime, this.price);
|
||||
}
|
||||
|
||||
class Filter {
|
||||
String? location;
|
||||
Int64? price;
|
||||
TimeRange? meetingTime;
|
||||
|
||||
Filter(this.location, this.price, this.meetingTime);
|
||||
}
|
||||
|
||||
Future<List<Seller>> getSellers(Filter filter) async {
|
||||
CollectionReference users = FirebaseFirestore.instance.collection('sellers');
|
||||
List<Seller> sellers = List.empty();
|
||||
|
||||
final Query query = users
|
||||
.where('location', isEqualTo: filter.location)
|
||||
.where('price', isEqualTo: filter.price)
|
||||
.where('start-time',
|
||||
isGreaterThanOrEqualTo: filter.meetingTime?.startTime)
|
||||
.where('end-time', isLessThanOrEqualTo: filter.meetingTime?.endTime);
|
||||
|
||||
final QuerySnapshot snapshot = await query.get();
|
||||
for (var doc in snapshot.docs) {
|
||||
sellers.add(Seller(doc["name"], doc["uid"], doc["location"],
|
||||
TimeRange(doc["start-time"], doc["end-time"]), doc["price"]));
|
||||
}
|
||||
return sellers;
|
||||
}
|
Reference in New Issue
Block a user