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

555: Update GraphQL Api #556

Merged
merged 7 commits into from
Sep 19, 2022
Merged

555: Update GraphQL Api #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
45eddd4
555: Use new GraphQL API and generate corresponding dart code
michael-markl Sep 19, 2022
f665cab
555: Fix parameter in graphql query
michael-markl Sep 19, 2022
75e5ebb
555: Add projectId to Configuration
michael-markl Sep 19, 2022
2225ec5
555: Remove useless .gitkeep
michael-markl Sep 19, 2022
70eda1b
555: Adjust graphQL queries to new versions and generate Dart code
michael-markl Sep 19, 2022
21cf6de
555: Insert projectId to query usages
michael-markl Sep 19, 2022
e3a55f7
555: Readd camera permission
michael-markl Sep 19, 2022
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: 1 addition & 1 deletion frontend/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

<!-- Remove some permissions which are unused right now -->
<uses-permission android:name="android.permission.CAMERA" tools:node="remove"/>
<!--<uses-permission android:name="android.permission.CAMERA" tools:node="remove"/>-->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove"/>
</manifest>
4 changes: 2 additions & 2 deletions frontend/graphql_queries/regions/get_regions.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query getRegions {
regions {
query getRegions($project: String!) {
regionsInProject(project: $project) {
id,
prefix,
name
Expand Down
4 changes: 2 additions & 2 deletions frontend/graphql_queries/regions/get_regions_by_id.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query getRegionsById($ids: [Int!]!) {
regionsById(params: $ids) {
query getRegionsById($project: String!, $ids: [Int!]!) {
regionsByIdInProject(project: $project, params: $ids) {
id,
prefix,
name
Expand Down
4 changes: 2 additions & 2 deletions frontend/graphql_queries/stores/accepting_store_by_id.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query AcceptingStoreById($ids: [Int!]!) {
physicalStoresById(params: $ids) {
query AcceptingStoreById($project: String!, $ids: [Int!]!) {
physicalStoresByIdInProject(project: $project, ids: $ids) {
id,
coordinates {
lat,
Expand Down
4 changes: 2 additions & 2 deletions frontend/graphql_queries/stores/accepting_store_summary_by_id.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query AcceptingStoreSummaryById($ids: [Int!]!) {
physicalStoresById(params: $ids) {
query AcceptingStoreSummaryById($project: String!, $ids: [Int!]!) {
physicalStoresByIdInProject(project: $project, ids: $ids) {
id,
store {
name
Expand Down
4 changes: 2 additions & 2 deletions frontend/graphql_queries/stores/accepting_stores_search.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query AcceptingStoresSearch($params: SearchParamsInput!) {
searchAcceptingStores(params: $params) {
query AcceptingStoresSearch($project: String!, $params: SearchParamsInput!) {
searchAcceptingStoresInProject(project: $project, params: $params) {
id
name
description
Expand Down
Empty file removed frontend/graphql_queries/verification/.gitkeep
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions frontend/graphql_queries/verification/card_verification_by_hash.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
query CardVerificationByHash($card: CardVerificationModelInput!) {
cardValid: verifyCard(card: $card)
query CardVerificationByHash($project: String!, $card: CardVerificationModelInput!) {
cardValid: verifyCardInProject(project: $project, card: $card)
}
3 changes: 3 additions & 0 deletions frontend/lib/configuration/configuration.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ import 'package:flutter/widgets.dart';
class Configuration extends InheritedWidget {
final String mapStyleUrl;
final String graphqlUrl;
final String projectId;
final bool showVerification;
final bool showDevSettings;

const Configuration({
super.key,
required this.mapStyleUrl,
required this.graphqlUrl,
required this.projectId,
required this.showVerification,
required this.showDevSettings,
required super.child,
Expand All @@ -19,6 +21,7 @@ class Configuration extends InheritedWidget {
bool updateShouldNotify(covariant Configuration oldWidget) =>
mapStyleUrl != oldWidget.mapStyleUrl ||
graphqlUrl != oldWidget.graphqlUrl ||
projectId != oldWidget.projectId ||
showVerification != oldWidget.showVerification ||
showDevSettings != oldWidget.showDevSettings;

Expand Down
Loading