Skip to content

Commit

Permalink
fix: Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Leticia-Arisa-K-Higa committed Dec 16, 2024
1 parent a994450 commit b9d6ea3
Show file tree
Hide file tree
Showing 24 changed files with 174 additions and 1,042 deletions.
2 changes: 1 addition & 1 deletion catavento/lib/constants.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const loginRoute = "/login/";
const homeRoute = "/home/";
const crudFuncionariosRoute = "/dashboard-admin-crud-funcionarios";
const crudFuncionariosRoute = "/dashboardEmployees";
const supabaseUrl = 'https://gfxmrqhwjqekfzrlurqr.supabase.co';
const supabaseKey = String.fromEnvironment('ANON_KEY');
const timeFormat = 'yyyy-MM-dd HH:mm:ss';
7 changes: 4 additions & 3 deletions catavento/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import 'package:catavento/bloc/demanda_bloc.dart';
import 'package:catavento/constants.dart';
import 'package:catavento/screens/dashboardAdmin/dashboard_admin.dart';
import 'package:catavento/views/login_view.dart';
import 'screens/DashboardAdmin/dashboard_admin.dart';
import 'package:catavento/screens/Login/login.dart';
import 'package:catavento/screens/employee-management.dart';
import 'package:catavento/screens/dashboardFuncionarios/employee-management.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:supabase_flutter/supabase_flutter.dart';
Expand All @@ -20,7 +21,7 @@ void main() {
),
home: const LoadView(),
routes: {
loginRoute: (context) => const Login(),
loginRoute: (context) => const LoginView(),
homeRoute: (context) => const DashBoardAdmin(),
crudFuncionariosRoute: (context) => EmployeeManagement(),
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:catavento/bloc/demanda_bloc.dart';
import 'package:catavento/shared/widgets/dialog.dart';
import 'package:catavento/screens/dashboardAdmin/components/infoCard.dart';
import 'infoCard.dart';
import 'package:catavento/shared/widgets/inputs.dart';
import 'package:catavento/shared/widgets/confirmDialog.dart';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:catavento/screens/dashboardAdmin/components/stage_demand.dart';
import 'package:catavento/screens/DashboardAdmin/components/stage_demand.dart';

class ShowCustomDialog extends StatelessWidget {
final String name;
Expand Down
1 change: 0 additions & 1 deletion catavento/lib/screens/Login/login.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'dart:js_interop';
import 'dart:developer';
import 'package:flutter/material.dart';
import 'components/input_purple.dart';
Expand Down
82 changes: 0 additions & 82 deletions catavento/lib/screens/dashboardAdmin/components/confirmDialog.dart

This file was deleted.

198 changes: 0 additions & 198 deletions catavento/lib/screens/dashboardAdmin/components/demandCard.dart

This file was deleted.

Loading

0 comments on commit b9d6ea3

Please sign in to comment.