Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 1 addition & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ amplify/.config/local-*
amplify/logs
amplify/mock-data
amplify/backend/amplify-meta.json
amplify/backend/awscloudformation
amplify/backend/.temp
build/
dist/
Expand All @@ -34,25 +33,4 @@ amplify-gradle-config.json
amplifytools.xcconfig
.secret-*
**.sample
#amplify-do-not-edit-end

#amplify-do-not-edit-begin
amplify/\#current-cloud-backend
amplify/.config/local-*
amplify/logs
amplify/mock-data
amplify/backend/amplify-meta.json
amplify/backend/.temp
build/
dist/
node_modules/
aws-exports.js
awsconfiguration.json
amplifyconfiguration.json
amplifyconfiguration.dart
amplify-build-config.json
amplify-gradle-config.json
amplifytools.xcconfig
.secret-*
**.sample
#amplify-do-not-edit-end
#amplify-do-not-edit-end
3 changes: 3 additions & 0 deletions .idea/misc.xml

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

Empty file modified amplify/backend/analytics/ThriftyOWUjV/parameters.json
100644 → 100755
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion amplify/backend/api/thrifty/cli-inputs.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
},
"apiName": "thrifty",
"gqlSchemaPath": "/tmp/amplify-1fac80fc-70ea-4f02-9b3e-a61e0e82577b/amplify/backend/api/thrifty/schema.graphql",
"gqlSchemaPath": "/tmp/amplify-b38aed8f-cc0e-48c1-ab26-b93ee968bf10/amplify/backend/api/thrifty/schema.graphql",
"additionalAuthTypes": [
{
"mode": "API_KEY",
Expand Down
Empty file modified amplify/backend/api/thrifty/parameters.json
100644 → 100755
Empty file.
Empty file modified amplify/backend/api/thrifty/resolvers/README.md
100644 → 100755
Empty file.
17 changes: 17 additions & 0 deletions amplify/backend/api/thrifty/schema.graphql
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
type Favorite @model @auth(rules: [{allow: private}]) @key(name: "byUser", fields: ["userID"]) {
id: ID!
titleFav: String!
imageFav: String!
priceFav: String!
sizeFav: String!
categoryFav: String!
userID: ID
}

type User @model @auth(rules: [{allow: private}]) {
id: ID!
email: String!
Favorite: [Favorite] @connection(keyName: "byUser", fields: ["id"])
}

type Category @model @auth(rules: [{allow: private}]) {
id: ID!
name: String!
Expand All @@ -12,5 +28,6 @@ type Product @model @auth(rules: [{allow: private}]) @key(name: "byCategory", fi
size: String!
color: String!
categoryID: ID
image: String!
}

Empty file modified amplify/backend/api/thrifty/stacks/CustomResources.json
100644 → 100755
Empty file.
Empty file modified amplify/backend/api/thrifty/transform.conf.json
100644 → 100755
Empty file.
Empty file modified amplify/backend/auth/thrifty21f6c364/parameters.json
100644 → 100755
Empty file.
Empty file.
Empty file modified amplify/backend/backend-config.json
100644 → 100755
Empty file.
Empty file modified amplify/backend/storage/SSDStorage/parameters.json
100644 → 100755
Empty file.
Empty file.
Empty file modified amplify/backend/storage/SSDStorage/storage-params.json
100644 → 100755
Empty file.
Empty file modified amplify/backend/tags.json
100644 → 100755
Empty file.
Empty file modified amplify/cli.json
100644 → 100755
Empty file.
84 changes: 44 additions & 40 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,41 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.thrifty">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Thrifty">
<activity
android:name=".SearchActivity"
android:exported="false" />
<activity
android:name=".Admin"
android:exported="true" />
<activity
android:name=".MainActivity"
android:exported="false" />
<activity
android:name=".Signin"
android:exported="false" />
<activity
android:name=".ConfirmationPage"
android:exported="false" />
<activity
android:name=".Signup"
android:exported="false" />
<activity
android:name=".Splash"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.thrifty">
<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Thrifty">
<activity
android:name=".FavoriteActivity"
android:exported="false" />
<activity
android:name=".SearchActivity"
android:exported="false" />
<activity
android:name=".Admin"
android:exported="true" />
<activity
android:name=".MainActivity"
android:exported="false" />
<activity
android:name=".auth.Signin"
android:exported="false" />
<activity
android:name=".auth.ConfirmationPage"
android:exported="false" />
<activity
android:name=".auth.Signup"
android:exported="false" />
<activity
android:name=".Splash"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

public final class AmplifyModelProvider implements ModelProvider {
private static final String AMPLIFY_MODEL_VERSION = "fccdd8bbe737f1d4f95aa5a65535d183";
private static final String AMPLIFY_MODEL_VERSION = "1c29971a13d9fcd249685dddf076b501";
private static AmplifyModelProvider amplifyGeneratedModelInstance;
private AmplifyModelProvider() {

Expand All @@ -34,7 +34,7 @@ public static AmplifyModelProvider getInstance() {
@Override
public Set<Class<? extends Model>> models() {
final Set<Class<? extends Model>> modifiableSet = new HashSet<>(
Arrays.<Class<? extends Model>>asList(Category.class, Product.class)
Arrays.<Class<? extends Model>>asList(Favorite.class, User.class, Category.class, Product.class)
);

return Immutable.of(modifiableSet);
Expand Down
Loading