Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: ifmd-49 #48

Merged
merged 2 commits into from
Aug 27, 2024
Merged

feat: ifmd-49 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d1db75
feat: ifmd-49
Aug 23, 2024
97578ec
feat: fix test
Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ios/Flutter/Default.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
FLUTTER_WEB_AUTO_DETECT=true
FLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/04817c99c9fd4956f27505204f7e344335810aed/
FLUTTER_APP_FLAVOR=beta
24 changes: 12 additions & 12 deletions lib/firebase_options.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;

class DefaultFirebaseOptions {
static const FirebaseOptions webStaging = FirebaseOptions(
apiKey: 'AIzaSyDnAB_UfQrBp_6RxBpn51s0BMfX3vV5a5U',
appId: '1:441627736227:web:c3f6f3ef5ec03f9ca66716',
messagingSenderId: '441627736227',
projectId: 'flutter-base-beta',
authDomain: 'flutter-base-beta.firebaseapp.com',
storageBucket: 'flutter-base-beta.appspot.com',
apiKey: 'AIzaSyD8-HkMTx3HhfSZ3mcfsIfwjwIU6bnhDeM',
authDomain: 'flutter-base-1e320.firebaseapp.com',
projectId: 'flutter-base-1e320',
storageBucket: 'flutter-base-1e320.appspot.com',
messagingSenderId: '426720039629',
appId: '1:426720039629:web:5f22b405b4923353fa0f84',
);

static const FirebaseOptions webProd = FirebaseOptions(
apiKey: 'AIzaSyDnAB_UfQrBp_6RxBpn51s0BMfX3vV5a5U',
appId: '1:441627736227:web:c3f6f3ef5ec03f9ca66716',
messagingSenderId: '441627736227',
projectId: 'flutter-base-beta',
authDomain: 'flutter-base-beta.firebaseapp.com',
storageBucket: 'flutter-base-beta.appspot.com',
apiKey: 'AIzaSyB_Pw-tffIISl8HSD0Fx_xmTz4FA7oFAqo',
authDomain: 'flutter-base-live.firebaseapp.com',
projectId: 'flutter-base-live',
storageBucket: 'flutter-base-live.appspot.com',
messagingSenderId: '795134483527',
appId: '1:795134483527:web:01d7f2ac638dcad5fa6562',
);
}
4 changes: 2 additions & 2 deletions lib/setup.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ void startApp({required FirebaseOptions? firebaseOptions}) async {
options.environment = GetIt.I.get<IEnvVars>().environment;
},
appRunner: () async {
final env = EnvVars().environment;
final WidgetsBinding widgetsBinding =
WidgetsFlutterBinding.ensureInitialized();
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
await EasyLocalization.ensureInitialized();
await Firebase.initializeApp();
await Firebase.initializeApp(options: firebaseOptions);

LicenseRegistry.addLicense(() async* {
final poppinsLicense =
await rootBundle.loadString('fonts/poppins_license.txt');
yield LicenseEntryWithLineBreaks(['google_fonts'], poppinsLicense);
});

final env = EnvVars().environment;
configureDependencies(env: env);

final providerContainer = GetIt.I.get<ProviderContainer>();
Expand Down
2 changes: 1 addition & 1 deletion test/src/auth/presentation/pages/change_password_page_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void main() {
await tester.tap(button);
await tester.pumpAndSettle();

expectSnackBarWithMessage('Invalid password');
expectSnackBar();
},
);

Expand Down
107 changes: 55 additions & 52 deletions web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<!--
<head>
<!--
If you are serving your web app in a path other than the root, change the
href value below to reflect the base path you are serving from.

Expand All @@ -14,60 +14,63 @@
This is a placeholder for base href that will be replaced by the value of
the `--base-href` argument provided to `flutter build`.
-->
<base href="$FLUTTER_BASE_HREF">
<base href="$FLUTTER_BASE_HREF" />

<meta charset="UTF-8">
<meta content="IE=Edge" http-equiv="X-UA-Compatible">
<meta name="description" content="A new Flutter project.">
<meta charset="UTF-8" />
<meta content="IE=Edge" http-equiv="X-UA-Compatible" />
<meta name="description" content="A new Flutter project." />

<!-- iOS meta tags & icons -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="tipead_clients">
<link rel="apple-touch-icon" href="icons/Icon-192.png">
<!-- iOS meta tags & icons -->
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta name="apple-mobile-web-app-title" content="tipead_clients" />
<link rel="apple-touch-icon" href="icons/Icon-192.png" />

<!-- Favicon -->
<link rel="icon" type="image/png" href="favicon.png"/>
<!-- Favicon -->
<link rel="icon" type="image/png" href="favicon.png" />

<title>tipead_clients</title>
<link rel="manifest" href="manifest.json">
<title>Flutter base</title>
<link rel="manifest" href="manifest.json" />

<script>
// The value below is injected by flutter build, do not touch.
var serviceWorkerVersion = null;
</script>
<!-- This script adds the flutter initialization JS code -->
<script src="flutter.js" defer></script>
<!-- This script adds the flutter splash -->
<link rel="stylesheet" type="text/css" href="splash/style.css" />
<script src="splash/splash.js"></script>
</head>
<body>
<!-- This script adds the flutter initialization JS code -->
<script src="flutter_bootstrap.js" defer></script>

<link rel="stylesheet" type="text/css" href="splash/style.css">
<script src="splash/splash.js"></script>
</head>
<body>
<script src="https://unpkg.com/@zxing/[email protected]"></script>
<script type="text/javascript" src="https://unpkg.com/@zxing/[email protected]/umd/index.min.js"></script>
<script src="https://unpkg.com/pica/dist/pica.min.js"></script>
<picture id="splash">
<source
srcset="splash/img/light-1x.png 1x, splash/img/light-2x.png 2x, splash/img/light-3x.png 3x, splash/img/light-4x.png 4x"
media="(prefers-color-scheme: light)">
<source
srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x"
media="(prefers-color-scheme: dark)">
<img class="center" aria-hidden="true" src="splash/img/light-1x.png" alt="">
</picture>
<script>
window.addEventListener('load', function(ev) {
// Download main.dart.js
_flutter.loader.loadEntrypoint({
serviceWorker: {
serviceWorkerVersion: serviceWorkerVersion,
}
}).then(function(engineInitializer) {
return engineInitializer.initializeEngine();
}).then(function(appRunner) {
return appRunner.runApp();
});
});
</script>
</body>
<script src="https://unpkg.com/@zxing/[email protected]"></script>
<script
type="text/javascript"
src="https://unpkg.com/@zxing/[email protected]/umd/index.min.js"
></script>
<script src="https://unpkg.com/pica/dist/pica.min.js"></script>
<picture id="splash">
<source
srcset="
splash/img/light-1x.png 1x,
splash/img/light-2x.png 2x,
splash/img/light-3x.png 3x,
splash/img/light-4x.png 4x
"
media="(prefers-color-scheme: light)"
/>
<source
srcset="
splash/img/dark-1x.png 1x,
splash/img/dark-2x.png 2x,
splash/img/dark-3x.png 3x,
splash/img/dark-4x.png 4x
"
media="(prefers-color-scheme: dark)"
/>
<img
class="center"
aria-hidden="true"
src="splash/img/light-1x.png"
alt=""
/>
</picture>
</body>
</html>
Loading