Skip to content

Commit

Permalink
SPA off
Browse files Browse the repository at this point in the history
  • Loading branch information
BrunoSalgadoti committed Jun 7, 2023
1 parent 59da2e3 commit 236803c
Show file tree
Hide file tree
Showing 12 changed files with 168 additions and 162 deletions.
31 changes: 0 additions & 31 deletions .firebase/hosting.YnVpbGRcd2Vi.cache

This file was deleted.

5 changes: 0 additions & 5 deletions .firebaserc

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_LOJAVIRTUAL_BRNINFODEV }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_LOJAVIRTUAL_BRN_INFODEV }}'
channelId: live
projectId: lojavirtual-brninfodev
projectId: lojavirtual-brn-infodev
2 changes: 1 addition & 1 deletion .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: 'n'
- run: npm ci && npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@ app.*.map.json
/lib/services/*
/lib/services/cepaberto_service.dart
/ios/firebase_app_id_file.json
/functions/
/pubspec.lock
4 changes: 3 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ flutter {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation platform('com.google.firebase:firebase-bom:31.1.1')
implementation platform('com.google.firebase:firebase-bom:32.0.0')
implementation 'com.google.firebase:firebase-auth'
implementation 'com.google.firebase:firebase-analytics-ktx'
implementation 'com.google.android.gms:play-services-auth:20.5.0'
implementation("androidx.multidex:multidex:2.0.1")
}
16 changes: 8 additions & 8 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{
"project_info": {
"project_number": "168585183359",
"project_id": "lojavirtual-brninfodev",
"storage_bucket": "lojavirtual-brninfodev.appspot.com"
"project_number": "465193736932",
"project_id": "lojavirtual-brn-infodev",
"storage_bucket": "lojavirtual-brn-infodev.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:168585183359:android:9b55316ebcce1c88457f4a",
"mobilesdk_app_id": "1:465193736932:android:ef94f026a024a5d5b7eaf1",
"android_client_info": {
"package_name": "br.com.brninfodev.ecommerce"
}
},
"oauth_client": [
{
"client_id": "168585183359-b7nliefjrj00p5ca042630l2to2jl2n0.apps.googleusercontent.com",
"client_id": "465193736932-kd80fbtjgb7is16ic3tofrtu5suk7vk7.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyBF7q_eKA2uIqSYt7UUHc0oy0t7STbk8Xs"
"current_key": "AIzaSyBO1eXlY4wv5sflN_IRrup-Dv8tPeRqcxI"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "168585183359-b7nliefjrj00p5ca042630l2to2jl2n0.apps.googleusercontent.com",
"client_id": "465193736932-kd80fbtjgb7is16ic3tofrtu5suk7vk7.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "168585183359-3jvoqr4fapvsniisod6t8m5nocoag17j.apps.googleusercontent.com",
"client_id": "465193736932-u1nq8ic5m9820lu6405m383dh62mobgl.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "br.com.brninfodev.ecommerce"
Expand Down
14 changes: 7 additions & 7 deletions ios/Runner/GoogleService-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>168585183359-3jvoqr4fapvsniisod6t8m5nocoag17j.apps.googleusercontent.com</string>
<string>465193736932-u1nq8ic5m9820lu6405m383dh62mobgl.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.168585183359-3jvoqr4fapvsniisod6t8m5nocoag17j</string>
<string>com.googleusercontent.apps.465193736932-u1nq8ic5m9820lu6405m383dh62mobgl</string>
<key>API_KEY</key>
<string>AIzaSyDMzYZohWAV4G_HV-KsajunkAaSZMxK_V8</string>
<string>AIzaSyCNMhBdjDMhElSgIhZeWy1juWIAg-WucQ8</string>
<key>GCM_SENDER_ID</key>
<string>168585183359</string>
<string>465193736932</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>br.com.brninfodev.ecommerce</string>
<key>PROJECT_ID</key>
<string>lojavirtual-brninfodev</string>
<string>lojavirtual-brn-infodev</string>
<key>STORAGE_BUCKET</key>
<string>lojavirtual-brninfodev.appspot.com</string>
<string>lojavirtual-brn-infodev.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
Expand All @@ -29,6 +29,6 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:168585183359:ios:e96796ed31d69410457f4a</string>
<string>1:465193736932:ios:8d23ef4d0d6f808db7eaf1</string>
</dict>
</plist>
4 changes: 3 additions & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ import 'package:ecommerce/models/product.dart';
import 'package:ecommerce/models/product_manager.dart';
import 'package:ecommerce/models/users.dart';
import 'package:ecommerce/models/users_manager.dart';
import 'package:ecommerce/services/db_api/firebase_options.dart';
import 'dart:core';
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

import 'services/db_api/firebase_options.dart';


final ThemeData temaPadrao = ThemeData(
primaryColor: const Color.fromARGB(255, 4, 125, 141),
Expand All @@ -34,6 +35,7 @@ import 'services/db_api/firebase_options.dart';
options: DefaultFirebaseOptions.currentPlatform,
);


runApp(MultiProvider(
providers: [
ChangeNotifierProvider(
Expand Down
Loading

0 comments on commit 236803c

Please sign in to comment.