Skip to content

Commit

Permalink
Move firebase_helper.dart to cloud_firestore_helper (#1236)
Browse files Browse the repository at this point in the history
This PR moves the `firebase_helper.dart` to its own
`cloud_firestore_helper` package. The `cloud_firestore_helper` doesn't
have a dependency on `cloud_firestore`. This is required to use the
Sharezone Plus widgets on our website without the Firebase dependencies.
  • Loading branch information
nilsreichardt authored Jan 6, 2024
1 parent 7bd1e84 commit a029659
Show file tree
Hide file tree
Showing 41 changed files with 568 additions and 297 deletions.
2 changes: 1 addition & 1 deletion app/lib/blackboard/blackboard_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// SPDX-License-Identifier: EUPL-1.2

import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:sharezone_common/firebase_helper.dart';
import 'package:cloud_firestore_helper/cloud_firestore_helper.dart';

class BlackboardItem {
final String id;
Expand Down
2 changes: 1 addition & 1 deletion app/lib/changelog/change_database_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:sharezone/changelog/change.dart';
import 'package:sharezone_common/firebase_helper.dart';
import 'package:cloud_firestore_helper/cloud_firestore_helper.dart';

class ChangeDatabaseModel {
final String id;
Expand Down
2 changes: 1 addition & 1 deletion app/lib/comments/comment_data_models.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:sharezone/comments/comment.dart';
import 'package:sharezone_common/firebase_helper.dart';
import 'package:cloud_firestore_helper/cloud_firestore_helper.dart';

class CommentDataModel {
final String? id;
Expand Down
2 changes: 1 addition & 1 deletion app/lib/groups/group_join/models/group_join_result.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import 'package:group_domain_models/group_domain_models.dart';
import 'package:sharezone/groups/group_join/models/group_info_with_selection_state.dart';
import 'package:sharezone/groups/group_join/models/group_join_exception.dart';
import 'package:sharezone_common/firebase_helper.dart';
import 'package:cloud_firestore_helper/cloud_firestore_helper.dart';

abstract class GroupJoinResult {}

Expand Down
7 changes: 7 additions & 0 deletions app/pubspec.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ dependencies:
characters: ^1.0.0
clock: ^1.1.1
cloud_firestore: ^4.8.5
cloud_firestore_helper:
path: ../lib/cloud_firestore_helper
cloud_functions: ^4.4.0
collection: ^1.17.2
common_domain_models:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// SPDX-License-Identifier: EUPL-1.2

import 'package:authentification_qrcode/authentification_qrcode.dart';
import 'package:sharezone_common/firebase_helper.dart';
import 'package:cloud_firestore_helper/cloud_firestore_helper.dart';

class QrSignInDocument {
final String? qrId;
Expand All @@ -31,7 +31,7 @@ class QrSignInDocument {
encryptedCustomToken: data['encryptedCustomToken'],
encryptedKey: data['encryptedKey'],
iv: data['iv'],
created: dateTimeFromTimestamp(data['created']),
created: dateTimeFromTimestampOrNull(data['created']),
);
}

Expand Down
9 changes: 8 additions & 1 deletion lib/authentification/authentification_qrcode/pubspec.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib/authentification/authentification_qrcode/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ dependencies:
path: ../../bloc_base
crash_analytics:
path: ../../crash_analytics
sharezone_common:
path: ../../sharezone_common
cloud_firestore_helper:
path: ../../cloud_firestore_helper
platform_check:
path: ../../platform_check
util:
Expand Down
75 changes: 75 additions & 0 deletions lib/cloud_firestore_helper/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Miscellaneous
*.class
*.log
*.pyc
*.swp
.DS_Store
.atom/
.buildlog/
.history
.svn/

# IntelliJ related
*.iml
*.ipr
*.iws
.idea/

# The .vscode folder contains launch configuration and tasks you configure in
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
#.vscode/

# Flutter/Dart/Pub related
**/doc/api/
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.packages
.pub-cache/
.pub/
build/

# Android related
**/android/**/gradle-wrapper.jar
**/android/.gradle
**/android/captures/
**/android/gradlew
**/android/gradlew.bat
**/android/local.properties
**/android/**/GeneratedPluginRegistrant.java

# iOS/XCode related
**/ios/**/*.mode1v3
**/ios/**/*.mode2v3
**/ios/**/*.moved-aside
**/ios/**/*.pbxuser
**/ios/**/*.perspectivev3
**/ios/**/*sync/
**/ios/**/.sconsign.dblite
**/ios/**/.tags*
**/ios/**/.vagrant/
**/ios/**/DerivedData/
**/ios/**/Icon?
**/ios/**/Pods/
**/ios/**/.symlinks/
**/ios/**/profile
**/ios/**/xcuserdata
**/ios/.generated/
**/ios/Flutter/App.framework
**/ios/Flutter/Flutter.framework
**/ios/Flutter/Flutter.podspec
**/ios/Flutter/Generated.xcconfig
**/ios/Flutter/app.flx
**/ios/Flutter/app.zip
**/ios/Flutter/flutter_assets/
**/ios/Flutter/flutter_export_environment.sh
**/ios/ServiceDefinitions.json
**/ios/Runner/GeneratedPluginRegistrant.*

# Exceptions to above rules.
!**/ios/**/default.mode1v3
!**/ios/**/default.mode2v3
!**/ios/**/default.pbxuser
!**/ios/**/default.perspectivev3
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
9 changes: 9 additions & 0 deletions lib/cloud_firestore_helper/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copyright (c) 2023 Sharezone UG (haftungsbeschränkt)
# Licensed under the EUPL-1.2-or-later.
#
# You may obtain a copy of the Licence at:
# https://joinup.ec.europa.eu/software/page/eupl
#
# SPDX-License-Identifier: EUPL-1.2

include: package:sharezone_lints/analysis_options.yaml
9 changes: 9 additions & 0 deletions lib/cloud_firestore_helper/example/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copyright (c) 2023 Sharezone UG (haftungsbeschränkt)
# Licensed under the EUPL-1.2-or-later.
#
# You may obtain a copy of the Licence at:
# https://joinup.ec.europa.eu/software/page/eupl
#
# SPDX-License-Identifier: EUPL-1.2

include: package:sharezone_lints/analysis_options.yaml
Loading

0 comments on commit a029659

Please sign in to comment.