diff --git a/.gitignore b/.gitignore
index 9f0bb74..7843e0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,25 @@ amplify-gradle-config.json
 amplifytools.xcconfig
 .secret-*
 **.sample
-#amplify-do-not-edit-end
+#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
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 112d5d7..39fef6d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,16 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/activity_admin.xml" value="0.20416666666666666" />
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/activity_kids_clothes.xml" value="0.20416666666666666" />
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/activity_main.xml" value="0.20364583333333333" />
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/activity_men_clothes.xml" value="0.20416666666666666" />
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/activity_product_view.xml" value="0.20416666666666666" />
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/activity_profile.xml" value="0.20416666666666666" />
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/activity_watches.xml" value="0.20416666666666666" />
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/card_layout.xml" value="0.20364583333333333" />
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/fragment_main_menu.xml" value="0.20364583333333333" />
+        <entry key="..\:/Users/STUDENT/ASAC/project/thrifty/app/src/main/res/layout/fragment_product.xml" value="0.20364583333333333" />
         <entry key="..\:/Users/STUDENT/AndroidStudioProjects/Thrifty/app/src/main/res/drawable-v24/ic_arrow_left.xml" value="0.10989583333333333" />
         <entry key="..\:/Users/STUDENT/AndroidStudioProjects/Thrifty/app/src/main/res/drawable/ic_baseline_search_24.xml" value="0.10989583333333333" />
         <entry key="..\:/Users/STUDENT/AndroidStudioProjects/Thrifty/app/src/main/res/layout/activity_accessories.xml" value="0.1859375" />
diff --git a/amplify-backup/.config/project-config.json b/amplify-backup/.config/project-config.json
new file mode 100644
index 0000000..866fd39
--- /dev/null
+++ b/amplify-backup/.config/project-config.json
@@ -0,0 +1,13 @@
+{
+  "providers": [
+    "awscloudformation"
+  ],
+  "projectName": "Thrifty",
+  "version": "3.1",
+  "frontend": "android",
+  "android": {
+    "config": {
+      "ResDir": "app/src/main/res"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-backup/backend/analytics/ThriftyOWUjV/parameters.json b/amplify-backup/backend/analytics/ThriftyOWUjV/parameters.json
new file mode 100644
index 0000000..6ee94f9
--- /dev/null
+++ b/amplify-backup/backend/analytics/ThriftyOWUjV/parameters.json
@@ -0,0 +1,22 @@
+{
+    "appName": "ThriftyOWUjV",
+    "roleName": "pinpointLambdaRolee733af87",
+    "cloudformationPolicyName": "cloudformationPolicye733af87",
+    "cloudWatchPolicyName": "cloudWatchPolicye733af87",
+    "pinpointPolicyName": "pinpointPolicye733af87",
+    "authPolicyName": "pinpoint_amplify_e733af87",
+    "unauthPolicyName": "pinpoint_amplify_e733af87",
+    "authRoleName": {
+        "Ref": "AuthRoleName"
+    },
+    "unauthRoleName": {
+        "Ref": "UnauthRoleName"
+    },
+    "authRoleArn": {
+        "Fn::GetAtt": [
+            "AuthRole",
+            "Arn"
+        ]
+    },
+    "appId": "f06bd624184f4c90bc7556672ddd9619"
+}
\ No newline at end of file
diff --git a/amplify-backup/backend/analytics/ThriftyOWUjV/pinpoint-cloudformation-template.json b/amplify-backup/backend/analytics/ThriftyOWUjV/pinpoint-cloudformation-template.json
new file mode 100644
index 0000000..27ff3d0
--- /dev/null
+++ b/amplify-backup/backend/analytics/ThriftyOWUjV/pinpoint-cloudformation-template.json
@@ -0,0 +1,590 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "Pinpoint resource stack creation using Amplify CLI",
+  "Parameters": {
+    "appName": {
+      "Type": "String"
+    },
+    "appId": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "roleName": {
+      "Type": "String"
+    },
+    "cloudformationPolicyName": {
+      "Type": "String"
+    },
+    "cloudWatchPolicyName": {
+      "Type": "String"
+    },
+    "pinpointPolicyName": {
+      "Type": "String"
+    },
+    "authPolicyName": {
+      "Type": "String"
+    },
+    "unauthPolicyName": {
+      "Type": "String"
+    },
+    "authRoleName": {
+      "Type": "String"
+    },
+    "unauthRoleName": {
+      "Type": "String"
+    },
+    "authRoleArn": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    }
+  },
+  "Metadata": {
+    "AWS::CloudFormation::Interface": {
+      "ParameterGroups": [
+        {
+          "Label": {
+            "default": "Creating pinpoint app"
+          },
+          "Parameters": [
+            "appName"
+          ]
+        }
+      ]
+    }
+  },
+  "Conditions": {
+    "ShouldCreatePinpointApp": {
+      "Fn::Equals": [
+        {
+          "Ref": "appId"
+        },
+        "NONE"
+      ]
+    },
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "LambdaExecutionRole": {
+      "Condition": "ShouldCreatePinpointApp",
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "RoleName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "roleName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "roleName"
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Principal": {
+                "Service": [
+                  "lambda.amazonaws.com"
+                ]
+              },
+              "Action": [
+                "sts:AssumeRole"
+              ]
+            }
+          ]
+        },
+        "Policies": [
+          {
+            "PolicyName": {
+              "Ref": "cloudWatchPolicyName"
+            },
+            "PolicyDocument": {
+              "Version": "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "logs:CreateLogGroup",
+                    "logs:CreateLogStream",
+                    "logs:PutLogEvents"
+                  ],
+                  "Resource": "arn:aws:logs:*:*:*"
+                }
+              ]
+            }
+          },
+          {
+            "PolicyName": {
+              "Ref": "pinpointPolicyName"
+            },
+            "PolicyDocument": {
+              "Version": "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "mobileanalytics:*",
+                    "mobiletargeting:*"
+                  ],
+                  "Resource": "*"
+                }
+              ]
+            }
+          },
+          {
+            "PolicyName": {
+              "Ref": "cloudformationPolicyName"
+            },
+            "PolicyDocument": {
+              "Version": "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "cloudformation:*"
+                  ],
+                  "Resource": "*"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    },
+    "PinpointFunction": {
+      "Type": "AWS::Lambda::Function",
+      "Condition": "ShouldCreatePinpointApp",
+      "Properties": {
+        "Code": {
+          "ZipFile": {
+            "Fn::Join": [
+              "\n",
+              [
+                "const response = require('cfn-response');",
+                "const aws = require('aws-sdk');",
+                "exports.handler = function(event, context) {",
+                "    if (event.RequestType == 'Delete') {",
+                "      const stackID = event.StackId;",
+                "      const cloudFormationClient = new aws.CloudFormation({ apiVersion: '2016-12-01', region: event.ResourceProperties.region });",
+                "      cloudFormationClient.describeStacks({ StackName: stackID }).promise()",
+                "        .then(describeStacksOutput => {",
+                "          let appId;",
+                "          if (describeStacksOutput.Stacks && describeStacksOutput.Stacks.length > 0) {",
+                "            const { Outputs } = describeStacksOutput.Stacks[0];",
+                "            const appIdOutput = Outputs.find((output)=>{ return output.OutputKey === 'Id'});",
+                "            appId = appIdOutput ? appIdOutput.OutputValue : undefined;  ",
+                "          }",
+                "          return appId;",
+                "        })",
+                "        .then(appId => {",
+                "          if (appId) {",
+                "            const pinpointClient = new aws.Pinpoint({ apiVersion: '2016-12-01', region: event.ResourceProperties.pingPointRegion });",
+                "            const params = {",
+                "              ApplicationId: appId,",
+                "            };",
+                "            pinpointClient.deleteApp(params).promise();",
+                "          }",
+                "        })",
+                "        .then(()=>{",
+                "          response.send(event, context, response.SUCCESS, {'message': `Successfully deleted pinpoint project`});",
+                "        })",
+                "        .catch(e=>{",
+                "          response.send(event, context, response.FAILED, {'message': `Failed to deleted Pinpoint project`, 'exception': e});",
+                "        }); ",
+                "    }",
+                "    if (event.RequestType == 'Update') {",
+                "        response.send(event, context, response.SUCCESS);",
+                "        return;",
+                "    }",
+                "    if (event.RequestType == 'Create') {",
+                "       const appName = event.ResourceProperties.appName;",
+                "       let responseData = {};",
+                "       const params = {",
+                "           CreateApplicationRequest: {",
+                "               Name: appName",
+                "           }",
+                "       };",
+                "       const pinpoint = new aws.Pinpoint({ apiVersion: '2016-12-01', region: event.ResourceProperties.pingPointRegion });",
+                "       pinpoint.createApp(params).promise()",
+                "           .then((res) => {",
+                "               responseData = res.ApplicationResponse;",
+                "               response.send(event, context, response.SUCCESS, responseData);",
+                "           }).catch((err) => {",
+                "               console.log(err.stack);",
+                "               responseData = {Error: err};",
+                "               response.send(event, context, response.FAILED, responseData);",
+                "               throw err;",
+                "           });",
+                "    }",
+                "};"
+              ]
+            ]
+          }
+        },
+        "Handler": "index.handler",
+        "Runtime": "nodejs12.x",
+        "Timeout": 300,
+        "Role": {
+          "Fn::GetAtt": [
+            "LambdaExecutionRole",
+            "Arn"
+          ]
+        }
+      }
+    },
+    "PinpointFunctionOutputs": {
+      "Type": "Custom::LambdaCallout",
+      "Condition": "ShouldCreatePinpointApp",
+      "Properties": {
+        "ServiceToken": {
+          "Fn::GetAtt": [
+            "PinpointFunction",
+            "Arn"
+          ]
+        },
+        "region": {
+          "Ref": "AWS::Region"
+        },
+        "pingPointRegion": {
+          "Fn::FindInMap": [
+            "RegionMapping",
+            {
+              "Ref": "AWS::Region"
+            },
+            "pinpointRegion"
+          ]
+        },
+        "appName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "appName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "appName"
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      },
+      "DependsOn": "PinpointFunction"
+    },
+    "CognitoUnauthPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Condition": "ShouldCreatePinpointApp",
+      "Properties": {
+        "PolicyName": {
+          "Ref": "unauthPolicyName"
+        },
+        "Roles": [
+          {
+            "Ref": "unauthRoleName"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": [
+                "mobiletargeting:PutEvents",
+                "mobiletargeting:UpdateEndpoint"
+              ],
+              "Resource": [
+                {
+                  "Fn::If": [
+                    "ShouldCreatePinpointApp",
+                    {
+                      "Fn::Join": [
+                        "",
+                        [
+                          "arn:aws:mobiletargeting:*:",
+                          {
+                            "Fn::Select": [
+                              "4",
+                              {
+                                "Fn::Split": [
+                                  ":",
+                                  {
+                                    "Ref": "authRoleArn"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          ":apps/",
+                          {
+                            "Fn::GetAtt": [
+                              "PinpointFunctionOutputs",
+                              "Id"
+                            ]
+                          },
+                          "*"
+                        ]
+                      ]
+                    },
+                    {
+                      "Fn::Join": [
+                        "",
+                        [
+                          "arn:aws:mobiletargeting:*:",
+                          {
+                            "Fn::Select": [
+                              "4",
+                              {
+                                "Fn::Split": [
+                                  ":",
+                                  {
+                                    "Ref": "authRoleArn"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          ":apps/",
+                          {
+                            "Ref": "appId"
+                          },
+                          "*"
+                        ]
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "CognitoAuthPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Condition": "ShouldCreatePinpointApp",
+      "Properties": {
+        "PolicyName": {
+          "Ref": "authPolicyName"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": [
+                "mobiletargeting:PutEvents",
+                "mobiletargeting:UpdateEndpoint"
+              ],
+              "Resource": [
+                {
+                  "Fn::If": [
+                    "ShouldCreatePinpointApp",
+                    {
+                      "Fn::Join": [
+                        "",
+                        [
+                          "arn:aws:mobiletargeting:*:",
+                          {
+                            "Fn::Select": [
+                              "4",
+                              {
+                                "Fn::Split": [
+                                  ":",
+                                  {
+                                    "Ref": "authRoleArn"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          ":apps/",
+                          {
+                            "Fn::GetAtt": [
+                              "PinpointFunctionOutputs",
+                              "Id"
+                            ]
+                          },
+                          "*"
+                        ]
+                      ]
+                    },
+                    {
+                      "Fn::Join": [
+                        "",
+                        [
+                          "arn:aws:mobiletargeting:*:",
+                          {
+                            "Fn::Select": [
+                              "4",
+                              {
+                                "Fn::Split": [
+                                  ":",
+                                  {
+                                    "Ref": "authRoleArn"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          ":apps/",
+                          {
+                            "Ref": "appId"
+                          },
+                          "*"
+                        ]
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {
+    "Region": {
+      "Value": {
+        "Fn::FindInMap": [
+          "RegionMapping",
+          {
+            "Ref": "AWS::Region"
+          },
+          "pinpointRegion"
+        ]
+      }
+    },
+    "Id": {
+      "Value": {
+        "Fn::If": [
+          "ShouldCreatePinpointApp",
+          {
+            "Fn::GetAtt": [
+              "PinpointFunctionOutputs",
+              "Id"
+            ]
+          },
+          {
+            "Ref": "appId"
+          }
+        ]
+      }
+    },
+    "appName": {
+      "Value": {
+        "Fn::If": [
+          "ShouldCreatePinpointApp",
+          {
+            "Fn::GetAtt": [
+              "PinpointFunctionOutputs",
+              "Name"
+            ]
+          },
+          {
+            "Ref": "appName"
+          }
+        ]
+      }
+    }
+  },
+  "Mappings": {
+    "RegionMapping": {
+      "us-east-1": {
+        "pinpointRegion": "us-east-1"
+      },
+      "us-east-2": {
+        "pinpointRegion": "us-east-1"
+      },
+      "sa-east-1": {
+        "pinpointRegion": "us-east-1"
+      },
+      "ca-central-1": {
+        "pinpointRegion": "ca-central-1"
+      },
+      "us-west-1": {
+        "pinpointRegion": "us-west-2"
+      },
+      "us-west-2": {
+        "pinpointRegion": "us-west-2"
+      },
+      "cn-north-1": {
+        "pinpointRegion": "us-west-2"
+      },
+      "cn-northwest-1": {
+        "pinpointRegion": "us-west-2"
+      },
+      "ap-south-1": {
+        "pinpointRegion": "ap-south-1"
+      },
+      "ap-northeast-3": {
+        "pinpointRegion": "us-west-2"
+      },
+      "ap-northeast-2": {
+        "pinpointRegion": "ap-northeast-2"
+      },
+      "ap-southeast-1": {
+        "pinpointRegion": "ap-southeast-1"
+      },
+      "ap-southeast-2": {
+        "pinpointRegion": "ap-southeast-2"
+      },
+      "ap-northeast-1": {
+        "pinpointRegion": "ap-northeast-1"
+      },
+      "eu-central-1": {
+        "pinpointRegion": "eu-central-1"
+      },
+      "eu-north-1": {
+        "pinpointRegion": "eu-central-1"
+      },
+      "eu-west-1": {
+        "pinpointRegion": "eu-west-1"
+      },
+      "eu-west-2": {
+        "pinpointRegion": "eu-west-2"
+      },
+      "eu-west-3": {
+        "pinpointRegion": "eu-west-1"
+      },
+      "me-south-1": {
+        "pinpointRegion": "ap-south-1"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-backup/backend/api/thrifty/cli-inputs.json b/amplify-backup/backend/api/thrifty/cli-inputs.json
new file mode 100644
index 0000000..8619fe6
--- /dev/null
+++ b/amplify-backup/backend/api/thrifty/cli-inputs.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "serviceConfiguration": {
+    "serviceName": "AppSync",
+    "defaultAuthType": {
+      "mode": "AMAZON_COGNITO_USER_POOLS",
+      "cognitoUserPoolId": "auththrifty21f6c364"
+    },
+    "conflictResolution": {
+      "defaultResolutionStrategy": {
+        "type": "AUTOMERGE"
+      }
+    },
+    "apiName": "thrifty",
+    "gqlSchemaPath": "/tmp/amplify-b38aed8f-cc0e-48c1-ab26-b93ee968bf10/amplify/backend/api/thrifty/schema.graphql",
+    "additionalAuthTypes": [
+      {
+        "mode": "API_KEY",
+        "keyDescription": "api key description",
+        "expirationTime": 30
+      },
+      {
+        "mode": "AWS_IAM"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/amplify-backup/backend/api/thrifty/parameters.json b/amplify-backup/backend/api/thrifty/parameters.json
new file mode 100644
index 0000000..90e1080
--- /dev/null
+++ b/amplify-backup/backend/api/thrifty/parameters.json
@@ -0,0 +1,12 @@
+{
+  "AppSyncApiName": "thrifty",
+  "DynamoDBBillingMode": "PAY_PER_REQUEST",
+  "DynamoDBEnableServerSideEncryption": false,
+  "AuthCognitoUserPoolId": {
+    "Fn::GetAtt": [
+      "auththrifty21f6c364",
+      "Outputs.UserPoolId"
+    ]
+  },
+  "AuthModeLastUpdated": "2021-11-28T17:20:48.071Z"
+}
\ No newline at end of file
diff --git a/amplify-backup/backend/api/thrifty/resolvers/README.md b/amplify-backup/backend/api/thrifty/resolvers/README.md
new file mode 100644
index 0000000..89e564c
--- /dev/null
+++ b/amplify-backup/backend/api/thrifty/resolvers/README.md
@@ -0,0 +1,2 @@
+Any resolvers that you add in this directory will override the ones automatically generated by Amplify CLI and will be directly copied to the cloud. 
+For more information, visit [https://docs.amplify.aws/cli/graphql-transformer/resolvers](https://docs.amplify.aws/cli/graphql-transformer/resolvers)
\ No newline at end of file
diff --git a/amplify-backup/backend/api/thrifty/schema.graphql b/amplify-backup/backend/api/thrifty/schema.graphql
new file mode 100644
index 0000000..27ddccd
--- /dev/null
+++ b/amplify-backup/backend/api/thrifty/schema.graphql
@@ -0,0 +1,33 @@
+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!
+  Products: [Product] @connection(keyName: "byCategory", fields: ["id"])
+}
+
+type Product @model @auth(rules: [{allow: private}]) @key(name: "byCategory", fields: ["categoryID"]) {
+  id: ID!
+  title: String!
+  description: String!
+  price: String!
+  size: String!
+  color: String!
+  categoryID: ID
+  image: String!
+}
+ 
\ No newline at end of file
diff --git a/amplify-backup/backend/api/thrifty/stacks/CustomResources.json b/amplify-backup/backend/api/thrifty/stacks/CustomResources.json
new file mode 100644
index 0000000..f95feea
--- /dev/null
+++ b/amplify-backup/backend/api/thrifty/stacks/CustomResources.json
@@ -0,0 +1,58 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "An auto-generated nested stack.",
+  "Metadata": {},
+  "Parameters": {
+    "AppSyncApiId": {
+      "Type": "String",
+      "Description": "The id of the AppSync API associated with this project."
+    },
+    "AppSyncApiName": {
+      "Type": "String",
+      "Description": "The name of the AppSync API",
+      "Default": "AppSyncSimpleTransform"
+    },
+    "env": {
+      "Type": "String",
+      "Description": "The environment name. e.g. Dev, Test, or Production",
+      "Default": "NONE"
+    },
+    "S3DeploymentBucket": {
+      "Type": "String",
+      "Description": "The S3 bucket containing all deployment assets for the project."
+    },
+    "S3DeploymentRootKey": {
+      "Type": "String",
+      "Description": "An S3 key relative to the S3DeploymentBucket that points to the root\nof the deployment directory."
+    }
+  },
+  "Resources": {
+    "EmptyResource": {
+      "Type": "Custom::EmptyResource",
+      "Condition": "AlwaysFalse"
+    }
+  },
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "env"
+            },
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "AlwaysFalse": {
+      "Fn::Equals": ["true", "false"]
+    }
+  },
+  "Outputs": {
+    "EmptyOutput": {
+      "Description": "An empty output. You may delete this if you have at least one resource above.",
+      "Value": ""
+    }
+  }
+}
diff --git a/amplify-backup/backend/api/thrifty/transform.conf.json b/amplify-backup/backend/api/thrifty/transform.conf.json
new file mode 100644
index 0000000..1a748d4
--- /dev/null
+++ b/amplify-backup/backend/api/thrifty/transform.conf.json
@@ -0,0 +1,10 @@
+{
+    "Version": 5,
+    "ElasticsearchWarning": true,
+    "ResolverConfig": {
+        "project": {
+            "ConflictHandler": "AUTOMERGE",
+            "ConflictDetection": "VERSION"
+        }
+    }
+}
\ No newline at end of file
diff --git a/amplify-backup/backend/auth/thrifty21f6c364/parameters.json b/amplify-backup/backend/auth/thrifty21f6c364/parameters.json
new file mode 100644
index 0000000..93c33f4
--- /dev/null
+++ b/amplify-backup/backend/auth/thrifty21f6c364/parameters.json
@@ -0,0 +1,57 @@
+{
+    "identityPoolName": "thrifty21f6c364_identitypool_21f6c364",
+    "allowUnauthenticatedIdentities": true,
+    "resourceNameTruncated": "thrift21f6c364",
+    "userPoolName": "thrifty21f6c364_userpool_21f6c364",
+    "autoVerifiedAttributes": [
+        "email"
+    ],
+    "mfaConfiguration": "OFF",
+    "mfaTypes": [
+        "SMS Text Message"
+    ],
+    "smsAuthenticationMessage": "Your authentication code is {####}",
+    "smsVerificationMessage": "Your verification code is {####}",
+    "emailVerificationSubject": "Your verification code",
+    "emailVerificationMessage": "Your verification code is {####}",
+    "defaultPasswordPolicy": false,
+    "passwordPolicyMinLength": 8,
+    "passwordPolicyCharacters": [],
+    "requiredAttributes": [
+        "email"
+    ],
+    "aliasAttributes": [],
+    "userpoolClientGenerateSecret": false,
+    "userpoolClientRefreshTokenValidity": 30,
+    "userpoolClientWriteAttributes": [
+        "email"
+    ],
+    "userpoolClientReadAttributes": [
+        "email"
+    ],
+    "userpoolClientLambdaRole": "thrift21f6c364_userpoolclient_lambda_role",
+    "userpoolClientSetAttributes": false,
+    "sharedId": "21f6c364",
+    "resourceName": "thrifty21f6c364",
+    "authSelections": "identityPoolAndUserPool",
+    "authRoleArn": {
+        "Fn::GetAtt": [
+            "AuthRole",
+            "Arn"
+        ]
+    },
+    "unauthRoleArn": {
+        "Fn::GetAtt": [
+            "UnauthRole",
+            "Arn"
+        ]
+    },
+    "useDefault": "default",
+    "usernameAttributes": [
+        "email"
+    ],
+    "userPoolGroupList": [],
+    "serviceName": "Cognito",
+    "usernameCaseSensitive": false,
+    "dependsOn": []
+}
\ No newline at end of file
diff --git a/amplify-backup/backend/auth/thrifty21f6c364/thrifty21f6c364-cloudformation-template.yml b/amplify-backup/backend/auth/thrifty21f6c364/thrifty21f6c364-cloudformation-template.yml
new file mode 100644
index 0000000..950de39
--- /dev/null
+++ b/amplify-backup/backend/auth/thrifty21f6c364/thrifty21f6c364-cloudformation-template.yml
@@ -0,0 +1,432 @@
+
+AWSTemplateFormatVersion: 2010-09-09
+
+Parameters:
+  env:
+    Type: String
+  authRoleArn:
+    Type: String
+  unauthRoleArn:
+    Type: String
+
+  
+
+    
+  identityPoolName:
+    Type: String
+  
+            
+  
+  allowUnauthenticatedIdentities:
+    Type: String
+            
+  resourceNameTruncated:
+    Type: String
+  
+            
+  userPoolName:
+    Type: String
+  
+            
+        
+  autoVerifiedAttributes:
+    Type: CommaDelimitedList
+      
+  mfaConfiguration:
+    Type: String
+  
+            
+        
+  mfaTypes:
+    Type: CommaDelimitedList
+      
+  smsAuthenticationMessage:
+    Type: String
+  
+            
+  smsVerificationMessage:
+    Type: String
+  
+            
+  emailVerificationSubject:
+    Type: String
+  
+            
+  emailVerificationMessage:
+    Type: String
+  
+            
+  
+  defaultPasswordPolicy:
+    Type: String
+            
+    
+  passwordPolicyMinLength:
+    Type: Number
+          
+        
+  passwordPolicyCharacters:
+    Type: CommaDelimitedList
+      
+        
+  requiredAttributes:
+    Type: CommaDelimitedList
+      
+        
+  aliasAttributes:
+    Type: CommaDelimitedList
+      
+  
+  userpoolClientGenerateSecret:
+    Type: String
+            
+    
+  userpoolClientRefreshTokenValidity:
+    Type: Number
+          
+        
+  userpoolClientWriteAttributes:
+    Type: CommaDelimitedList
+      
+        
+  userpoolClientReadAttributes:
+    Type: CommaDelimitedList
+      
+  userpoolClientLambdaRole:
+    Type: String
+  
+            
+  
+  userpoolClientSetAttributes:
+    Type: String
+            
+  sharedId:
+    Type: String
+  
+            
+  resourceName:
+    Type: String
+  
+            
+  authSelections:
+    Type: String
+  
+            
+            
+            
+  useDefault:
+    Type: String
+  
+            
+        
+  usernameAttributes:
+    Type: CommaDelimitedList
+      
+        
+  userPoolGroupList:
+    Type: CommaDelimitedList
+      
+  serviceName:
+    Type: String
+  
+            
+  
+  usernameCaseSensitive:
+    Type: String
+            
+        
+  dependsOn:
+    Type: CommaDelimitedList
+      
+Conditions:
+  ShouldNotCreateEnvResources: !Equals [ !Ref env, NONE ]
+  
+  ShouldOutputAppClientSecrets: !Equals [!Ref userpoolClientGenerateSecret, true ]
+  
+
+Resources:
+  
+  
+  # BEGIN SNS ROLE RESOURCE
+  SNSRole:
+  # Created to allow the UserPool SMS Config to publish via the Simple Notification Service during MFA Process
+    Type: AWS::IAM::Role
+    Properties:
+      RoleName: !If [ShouldNotCreateEnvResources, 'thrift21f6c364_sns-role', !Join ['',[ 'sns', '21f6c364', !Select [3, !Split ['-', !Ref 'AWS::StackName']], '-', !Ref env]]]
+      AssumeRolePolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: ""
+            Effect: "Allow"
+            Principal:
+              Service: "cognito-idp.amazonaws.com"
+            Action:
+              - "sts:AssumeRole"
+            Condition:
+              StringEquals:
+                sts:ExternalId: thrift21f6c364_role_external_id
+      Policies:
+        -
+          PolicyName: thrift21f6c364-sns-policy
+          PolicyDocument:
+            Version: "2012-10-17"
+            Statement:
+              -
+                Effect: "Allow"
+                Action:
+                  - "sns:Publish"
+                Resource: "*"
+  # BEGIN USER POOL RESOURCES
+  UserPool:
+  # Created upon user selection
+  # Depends on SNS Role for Arn if MFA is enabled
+    Type: AWS::Cognito::UserPool
+    UpdateReplacePolicy: Retain
+    Properties:
+      UserPoolName: !If [ShouldNotCreateEnvResources, !Ref userPoolName, !Join ['',[!Ref userPoolName, '-', !Ref env]]]
+      
+      
+      UsernameConfiguration:
+        CaseSensitive: false
+      
+      Schema:
+        
+        -
+          Name: email
+          Required: true
+          Mutable: true
+        
+      
+      
+      
+      AutoVerifiedAttributes:
+      
+        - email
+      
+      
+      
+      EmailVerificationMessage: !Ref emailVerificationMessage
+      EmailVerificationSubject: !Ref emailVerificationSubject
+      
+      Policies:
+        PasswordPolicy:
+          MinimumLength: !Ref passwordPolicyMinLength
+          RequireLowercase: false
+          RequireNumbers: false
+          RequireSymbols: false
+          RequireUppercase: false
+      
+      UsernameAttributes: !Ref usernameAttributes
+      
+      
+      MfaConfiguration: !Ref mfaConfiguration
+      SmsVerificationMessage: !Ref smsVerificationMessage
+      SmsAuthenticationMessage: !Ref smsAuthenticationMessage
+      SmsConfiguration:
+        SnsCallerArn: !GetAtt SNSRole.Arn
+        ExternalId: thrift21f6c364_role_external_id
+    
+  
+  UserPoolClientWeb:
+  # Created provide application access to user pool
+  # Depends on UserPool for ID reference
+    Type: "AWS::Cognito::UserPoolClient"
+    Properties:
+      ClientName: thrift21f6c364_app_clientWeb
+      
+      RefreshTokenValidity: !Ref userpoolClientRefreshTokenValidity
+      UserPoolId: !Ref UserPool
+    DependsOn: UserPool
+  UserPoolClient:
+  # Created provide application access to user pool
+  # Depends on UserPool for ID reference
+    Type: "AWS::Cognito::UserPoolClient"
+    Properties:
+      ClientName: thrift21f6c364_app_client
+      
+      GenerateSecret: !Ref userpoolClientGenerateSecret
+      RefreshTokenValidity: !Ref userpoolClientRefreshTokenValidity
+      UserPoolId: !Ref UserPool
+    DependsOn: UserPool
+  # BEGIN USER POOL LAMBDA RESOURCES
+  UserPoolClientRole:
+  # Created to execute Lambda which gets userpool app client config values
+    Type: 'AWS::IAM::Role'
+    Properties:
+      RoleName: !If [ShouldNotCreateEnvResources, !Ref userpoolClientLambdaRole, !Join ['',['upClientLambdaRole', '21f6c364', !Select [3, !Split ['-', !Ref 'AWS::StackName']], '-', !Ref env]]]
+      AssumeRolePolicyDocument:
+        Version: '2012-10-17'
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service:
+                - lambda.amazonaws.com
+            Action:
+              - 'sts:AssumeRole'
+    DependsOn: UserPoolClient
+  UserPoolClientLambda:
+  # Lambda which gets userpool app client config values
+  # Depends on UserPool for id
+  # Depends on UserPoolClientRole for role ARN
+    Type: 'AWS::Lambda::Function'
+    Properties:
+      Code:
+        ZipFile: !Join
+          - |+
+          - - 'const response = require(''cfn-response'');'
+            - 'const aws = require(''aws-sdk'');'
+            - 'const identity = new aws.CognitoIdentityServiceProvider();'
+            - 'exports.handler = (event, context, callback) => {'
+            - ' if (event.RequestType == ''Delete'') { '
+            - '   response.send(event, context, response.SUCCESS, {})'
+            - ' }'
+            - ' if (event.RequestType == ''Update'' || event.RequestType == ''Create'') {'
+            - '   const params = {'
+            - '     ClientId: event.ResourceProperties.clientId,'
+            - '     UserPoolId: event.ResourceProperties.userpoolId'
+            - '   };'
+            - '   identity.describeUserPoolClient(params).promise()'
+            - '     .then((res) => {'
+            - '       response.send(event, context, response.SUCCESS, {''appSecret'': res.UserPoolClient.ClientSecret});'
+            - '     })'
+            - '     .catch((err) => {'
+            - '       response.send(event, context, response.FAILED, {err});'
+            - '     });'
+            - ' }'
+            - '};'
+      Handler: index.handler
+      Runtime: nodejs12.x
+      Timeout: 300
+      Role: !GetAtt
+        - UserPoolClientRole
+        - Arn
+    DependsOn: UserPoolClientRole
+  UserPoolClientLambdaPolicy:
+  # Sets userpool policy for the role that executes the Userpool Client Lambda
+  # Depends on UserPool for Arn
+  # Marked as depending on UserPoolClientRole for easier to understand CFN sequencing
+    Type: 'AWS::IAM::Policy'
+    Properties:
+      PolicyName: thrift21f6c364_userpoolclient_lambda_iam_policy
+      Roles:
+        - !Ref UserPoolClientRole
+      PolicyDocument:
+        Version: '2012-10-17'
+        Statement:
+          - Effect: Allow
+            Action:
+              - 'cognito-idp:DescribeUserPoolClient'
+            Resource: !GetAtt UserPool.Arn
+    DependsOn: UserPoolClientLambda
+  UserPoolClientLogPolicy:
+  # Sets log policy for the role that executes the Userpool Client Lambda
+  # Depends on UserPool for Arn
+  # Marked as depending on UserPoolClientLambdaPolicy for easier to understand CFN sequencing
+    Type: 'AWS::IAM::Policy'
+    Properties:
+      PolicyName: thrift21f6c364_userpoolclient_lambda_log_policy
+      Roles:
+        - !Ref UserPoolClientRole
+      PolicyDocument:
+        Version: 2012-10-17
+        Statement:
+          - Effect: Allow
+            Action:
+              - 'logs:CreateLogGroup'
+              - 'logs:CreateLogStream'
+              - 'logs:PutLogEvents'
+            Resource: !Sub
+              - arn:aws:logs:${region}:${account}:log-group:/aws/lambda/${lambda}:log-stream:*
+              - { region: !Ref "AWS::Region",  account: !Ref "AWS::AccountId", lambda: !Ref UserPoolClientLambda}
+    DependsOn: UserPoolClientLambdaPolicy
+  UserPoolClientInputs:
+  # Values passed to Userpool client Lambda
+  # Depends on UserPool for Id
+  # Depends on UserPoolClient for Id
+  # Marked as depending on UserPoolClientLambdaPolicy for easier to understand CFN sequencing
+    Type: 'Custom::LambdaCallout'
+    Properties:
+      ServiceToken: !GetAtt UserPoolClientLambda.Arn
+      clientId: !Ref UserPoolClient
+      userpoolId: !Ref UserPool
+    DependsOn: UserPoolClientLogPolicy
+  
+
+  
+  
+
+  
+    
+  # BEGIN IDENTITY POOL RESOURCES
+  
+
+  IdentityPool:
+  # Always created
+    Type: AWS::Cognito::IdentityPool
+    Properties:
+      IdentityPoolName: !If [ShouldNotCreateEnvResources, 'thrifty21f6c364_identitypool_21f6c364', !Join ['',['thrifty21f6c364_identitypool_21f6c364', '__', !Ref env]]]
+      
+      CognitoIdentityProviders:
+        - ClientId:  !Ref UserPoolClient
+          ProviderName: !Sub
+            - cognito-idp.${region}.amazonaws.com/${client}
+            - { region: !Ref "AWS::Region",  client: !Ref UserPool}
+        - ClientId:  !Ref UserPoolClientWeb
+          ProviderName: !Sub
+            - cognito-idp.${region}.amazonaws.com/${client}
+            - { region: !Ref "AWS::Region",  client: !Ref UserPool}
+            
+      AllowUnauthenticatedIdentities: !Ref allowUnauthenticatedIdentities
+      
+    
+    DependsOn: UserPoolClientInputs
+    
+
+  IdentityPoolRoleMap:
+  # Created to map Auth and Unauth roles to the identity pool
+  # Depends on Identity Pool for ID ref
+    Type: AWS::Cognito::IdentityPoolRoleAttachment
+    Properties:
+      IdentityPoolId: !Ref IdentityPool
+      Roles:
+          unauthenticated: !Ref unauthRoleArn
+          authenticated: !Ref authRoleArn
+    DependsOn: IdentityPool
+  
+
+Outputs :
+  
+  IdentityPoolId:
+    Value: !Ref 'IdentityPool'
+    Description:  Id for the identity pool
+  IdentityPoolName:
+    Value: !GetAtt IdentityPool.Name
+  
+  
+  
+  
+  UserPoolId:
+    Value: !Ref 'UserPool'
+    Description:  Id for the user pool
+  UserPoolArn:
+    Value: !GetAtt UserPool.Arn
+    Description:  Arn for the user pool
+  UserPoolName:
+    Value: !Ref userPoolName
+  AppClientIDWeb:
+    Value: !Ref 'UserPoolClientWeb'
+    Description: The user pool app client id for web
+  AppClientID:
+    Value: !Ref 'UserPoolClient'
+    Description: The user pool app client id
+  AppClientSecret:
+    Value: !GetAtt UserPoolClientInputs.appSecret
+    Condition: ShouldOutputAppClientSecrets
+  
+  
+  
+  
+  
+  
+  
+  
diff --git a/amplify-backup/backend/backend-config.json b/amplify-backup/backend/backend-config.json
new file mode 100644
index 0000000..27082ea
--- /dev/null
+++ b/amplify-backup/backend/backend-config.json
@@ -0,0 +1,77 @@
+{
+    "api": {
+        "thrifty": {
+            "service": "AppSync",
+            "providerPlugin": "awscloudformation",
+            "output": {
+                "authConfig": {
+                    "defaultAuthentication": {
+                        "authenticationType": "AMAZON_COGNITO_USER_POOLS",
+                        "userPoolConfig": {
+                            "userPoolId": "auththrifty21f6c364"
+                        }
+                    },
+                    "additionalAuthenticationProviders": [
+                        {
+                            "authenticationType": "API_KEY",
+                            "apiKeyConfig": {
+                                "apiKeyExpirationDays": 30,
+                                "description": "api key description"
+                            }
+                        },
+                        {
+                            "authenticationType": "AWS_IAM"
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    "auth": {
+        "thrifty21f6c364": {
+            "service": "Cognito",
+            "providerPlugin": "awscloudformation",
+            "dependsOn": [],
+            "customAuth": false,
+            "frontendAuthConfig": {
+                "loginMechanisms": [
+                    "EMAIL"
+                ],
+                "signupAttributes": [
+                    "EMAIL"
+                ],
+                "passwordProtectionSettings": {
+                    "passwordPolicyMinLength": 8,
+                    "passwordPolicyCharacters": []
+                },
+                "mfaConfiguration": "OFF",
+                "mfaTypes": [
+                    "SMS"
+                ],
+                "verificationMechanisms": [
+                    "EMAIL"
+                ]
+            }
+        }
+    },
+    "storage": {
+        "SSDStorage": {
+            "service": "S3",
+            "providerPlugin": "awscloudformation"
+        }
+    },
+    "notifications": {
+        "ThriftyOWUjV": {
+            "service": "Pinpoint",
+            "channels": [
+                "FCM"
+            ]
+        }
+    },
+    "analytics": {
+        "ThriftyOWUjV": {
+            "service": "Pinpoint",
+            "providerPlugin": "awscloudformation"
+        }
+    }
+}
\ No newline at end of file
diff --git a/amplify-backup/backend/storage/SSDStorage/parameters.json b/amplify-backup/backend/storage/SSDStorage/parameters.json
new file mode 100644
index 0000000..3ab7dad
--- /dev/null
+++ b/amplify-backup/backend/storage/SSDStorage/parameters.json
@@ -0,0 +1,35 @@
+{
+  "bucketName": "thrifty9ac428d5d3084fb499b8aaa6395680b8",
+  "authPolicyName": "s3_amplify_2b6f0a5b",
+  "unauthPolicyName": "s3_amplify_2b6f0a5b",
+  "authRoleName": {
+    "Ref": "AuthRoleName"
+  },
+  "unauthRoleName": {
+    "Ref": "UnauthRoleName"
+  },
+  "selectedGuestPermissions": [
+    "s3:GetObject",
+    "s3:ListBucket"
+  ],
+  "selectedAuthenticatedPermissions": [
+    "s3:PutObject",
+    "s3:GetObject",
+    "s3:ListBucket",
+    "s3:DeleteObject"
+  ],
+  "s3PermissionsAuthenticatedPublic": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+  "s3PublicPolicy": "Public_policy_0e1bbdf5",
+  "s3PermissionsAuthenticatedUploads": "s3:PutObject",
+  "s3UploadsPolicy": "Uploads_policy_0e1bbdf5",
+  "s3PermissionsAuthenticatedProtected": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+  "s3ProtectedPolicy": "Protected_policy_0e1bbdf5",
+  "s3PermissionsAuthenticatedPrivate": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+  "s3PrivatePolicy": "Private_policy_0e1bbdf5",
+  "AuthenticatedAllowList": "ALLOW",
+  "s3ReadPolicy": "read_policy_0e1bbdf5",
+  "s3PermissionsGuestPublic": "DISALLOW",
+  "s3PermissionsGuestUploads": "DISALLOW",
+  "GuestAllowList": "DISALLOW",
+  "triggerFunction": "NONE"
+}
\ No newline at end of file
diff --git a/amplify-backup/backend/storage/SSDStorage/s3-cloudformation-template.json b/amplify-backup/backend/storage/SSDStorage/s3-cloudformation-template.json
new file mode 100644
index 0000000..112e432
--- /dev/null
+++ b/amplify-backup/backend/storage/SSDStorage/s3-cloudformation-template.json
@@ -0,0 +1,657 @@
+{
+	"AWSTemplateFormatVersion": "2010-09-09",
+	"Description": "S3 resource stack creation using Amplify CLI",
+	"Parameters": {
+		"bucketName": {
+			"Type": "String"
+		},
+		"authPolicyName": {
+			"Type": "String"
+		},
+		"unauthPolicyName": {
+			"Type": "String"
+		},
+		"authRoleName": {
+			"Type": "String"
+		},
+		"unauthRoleName": {
+			"Type": "String"
+		},
+		"s3PublicPolicy": {
+			"Type": "String",
+			"Default" : "NONE"
+		},
+		"s3PrivatePolicy": {
+			"Type": "String",
+			"Default" : "NONE"
+		},
+		"s3ProtectedPolicy": {
+			"Type": "String",
+			"Default" : "NONE"
+		},
+		"s3UploadsPolicy": {
+			"Type": "String",
+			"Default" : "NONE"
+		},
+		"s3ReadPolicy": {
+			"Type": "String",
+			"Default" : "NONE"
+		},
+		"s3PermissionsAuthenticatedPublic": {
+			"Type": "String",
+			"Default" : "DISALLOW"
+		},
+		"s3PermissionsAuthenticatedProtected": {
+			"Type": "String",
+			"Default" : "DISALLOW"
+		},
+		"s3PermissionsAuthenticatedPrivate": {
+			"Type": "String",
+			"Default" : "DISALLOW"
+		},
+		"s3PermissionsAuthenticatedUploads": {
+			"Type": "String",
+			"Default" : "DISALLOW"
+		},
+		"s3PermissionsGuestPublic": {
+			"Type": "String",
+			"Default" : "DISALLOW"
+		},
+		"s3PermissionsGuestUploads": {
+			"Type": "String",
+			"Default" : "DISALLOW"		},
+		"AuthenticatedAllowList": {
+			"Type": "String",
+			"Default" : "DISALLOW"
+		},
+		"GuestAllowList": {
+			"Type": "String",
+			"Default" : "DISALLOW"
+		},
+		"selectedGuestPermissions": {
+			"Type": "CommaDelimitedList",
+			"Default" : "NONE"
+		},
+		"selectedAuthenticatedPermissions": {
+			"Type": "CommaDelimitedList",
+			"Default" : "NONE"
+		},
+		"env": {
+			"Type": "String"
+		},
+		"triggerFunction": {
+			"Type": "String"
+		}
+	
+
+	},
+	"Conditions": {
+		"ShouldNotCreateEnvResources": {
+			"Fn::Equals": [
+				{
+					"Ref": "env"
+				},
+				"NONE"
+			]
+		},
+		"CreateAuthPublic": {
+			"Fn::Not" : [{
+				"Fn::Equals" : [
+					 {"Ref" : "s3PermissionsAuthenticatedPublic"},
+					 "DISALLOW"
+				]
+		 }]
+		},
+		"CreateAuthProtected": {
+			"Fn::Not" : [{
+				"Fn::Equals" : [
+					 {"Ref" : "s3PermissionsAuthenticatedProtected"},
+					 "DISALLOW"
+				]
+		 }]
+		},
+		"CreateAuthPrivate": {
+			"Fn::Not" : [{
+				"Fn::Equals" : [
+					 {"Ref" : "s3PermissionsAuthenticatedPrivate"},
+					 "DISALLOW"
+				]
+		 }]
+		},
+		"CreateAuthUploads": {
+			"Fn::Not" : [{
+				"Fn::Equals" : [
+					 {"Ref" : "s3PermissionsAuthenticatedUploads"},
+					 "DISALLOW"
+				]
+		 }]
+		},
+		"CreateGuestPublic": {
+			"Fn::Not" : [{
+				"Fn::Equals" : [
+					 {"Ref" : "s3PermissionsGuestPublic"},
+					 "DISALLOW"
+				]
+		 }]
+		},
+		"CreateGuestUploads": {
+			"Fn::Not" : [{
+				"Fn::Equals" : [
+					 {"Ref" : "s3PermissionsGuestUploads"},
+					 "DISALLOW"
+				]
+		 }]
+		},
+		"AuthReadAndList": {
+			"Fn::Not" : [{
+				"Fn::Equals" : [
+					 {"Ref" : "AuthenticatedAllowList"},
+					 "DISALLOW"
+				]
+		 }]
+		},
+		"GuestReadAndList": {
+			"Fn::Not" : [{
+				"Fn::Equals" : [
+					 {"Ref" : "GuestAllowList"},
+					 "DISALLOW"
+				]
+		 }]
+		}
+	},
+	"Resources": {
+		"S3Bucket": {
+			"Type": "AWS::S3::Bucket",
+		    
+			"DeletionPolicy" : "Retain",
+			"Properties": {
+				"BucketName": {
+                    "Fn::If": [
+                        "ShouldNotCreateEnvResources",
+                        {
+                            "Ref": "bucketName"
+                        },
+                        {
+                            "Fn::Join": [
+                                "",
+                                [
+                                    {
+                                        "Ref": "bucketName"
+                                    },
+                                    {
+                                      "Fn::Select": [
+                                          3,
+                                          {
+                                              "Fn::Split": [
+                                                  "-",
+                                                  {
+                                                      "Ref": "AWS::StackName"
+                                                  }
+                                              ]
+                                          }
+                                      ]
+                                    },
+                                    "-",
+                                    {
+                                        "Ref": "env"
+                                    }
+                                ]
+                            ]
+                        }
+                    ]
+                },
+                
+				"CorsConfiguration": {
+					"CorsRules": [
+						{
+							"AllowedHeaders": [
+								"*"
+							],
+							"AllowedMethods": [
+								"GET",
+								"HEAD",
+								"PUT",
+								"POST",
+								"DELETE"
+							],
+							"AllowedOrigins": [
+								"*"
+							],
+							"ExposedHeaders": [
+								"x-amz-server-side-encryption",
+								"x-amz-request-id",
+								"x-amz-id-2",
+								"ETag"
+							],
+							"Id": "S3CORSRuleId1",
+							"MaxAge": "3000"
+						}
+					]
+				}
+			}
+		},
+      
+	    
+		"S3AuthPublicPolicy": {
+			"DependsOn": [
+				"S3Bucket"
+			],
+			"Condition": "CreateAuthPublic",
+			"Type": "AWS::IAM::Policy",
+			"Properties": {
+				"PolicyName": {
+					"Ref": "s3PublicPolicy"
+				},
+				"Roles": [
+					{
+						"Ref": "authRoleName"
+					}
+				],
+				"PolicyDocument": {
+					"Version": "2012-10-17",
+					"Statement": [
+						{
+							"Effect": "Allow",
+							"Action": {
+								"Fn::Split" : [ "," , {
+									"Ref": "s3PermissionsAuthenticatedPublic"
+								} ]
+							},
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											},
+											"/public/*"
+										]
+									]
+								}
+							]
+						}
+					]
+				}
+			}
+		},
+		"S3AuthProtectedPolicy": {
+			"DependsOn": [
+				"S3Bucket"
+			],
+			"Condition": "CreateAuthProtected",
+			"Type": "AWS::IAM::Policy",
+			"Properties": {
+				"PolicyName": {
+					"Ref": "s3ProtectedPolicy"
+				},
+				"Roles": [
+					{
+						"Ref": "authRoleName"
+					}
+				],
+				"PolicyDocument": {
+					"Version": "2012-10-17",
+					"Statement": [
+						{
+							"Effect": "Allow",
+							"Action": {
+								"Fn::Split" : [ "," , {
+									"Ref": "s3PermissionsAuthenticatedProtected"
+								} ]
+							},
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											},
+											"/protected/${cognito-identity.amazonaws.com:sub}/*"
+										]
+									]
+								}
+							]
+						}
+					]
+				}
+			}
+		},
+		"S3AuthPrivatePolicy": {
+			"DependsOn": [
+				"S3Bucket"
+			],
+			"Condition": "CreateAuthPrivate",
+			"Type": "AWS::IAM::Policy",
+			"Properties": {
+				"PolicyName": {
+					"Ref": "s3PrivatePolicy"
+				},
+				"Roles": [
+					{
+						"Ref": "authRoleName"
+					}
+				],
+				"PolicyDocument": {
+					"Version": "2012-10-17",
+					"Statement": [
+						{
+							"Effect": "Allow",
+							"Action": {
+								"Fn::Split" : [ "," , {
+									"Ref": "s3PermissionsAuthenticatedPrivate"
+								} ]
+							},
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											},
+											"/private/${cognito-identity.amazonaws.com:sub}/*"
+										]
+									]
+								}
+							]
+						}
+					]
+				}
+			}
+		},
+		"S3AuthUploadPolicy": {
+			"DependsOn": [
+				"S3Bucket"
+			],
+			"Condition": "CreateAuthUploads",
+			"Type": "AWS::IAM::Policy",
+			"Properties": {
+				"PolicyName": {
+					"Ref": "s3UploadsPolicy"
+				},
+				"Roles": [
+					{
+						"Ref": "authRoleName"
+					}
+				],
+				"PolicyDocument": {
+					"Version": "2012-10-17",
+					"Statement": [
+						{
+							"Effect": "Allow",
+							"Action": {
+								"Fn::Split" : [ "," , {
+									"Ref": "s3PermissionsAuthenticatedUploads"
+								} ]
+							},
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											},
+											"/uploads/*"
+										]
+									]
+								}
+							]
+						}
+					]
+				}
+			}
+		},
+		"S3AuthReadPolicy": {
+			"DependsOn": [
+				"S3Bucket"
+			],
+			"Condition": "AuthReadAndList",
+			"Type": "AWS::IAM::Policy",
+			"Properties": {
+				"PolicyName": {
+					"Ref": "s3ReadPolicy"
+				},
+				"Roles": [
+					{
+						"Ref": "authRoleName"
+					}
+				],
+				"PolicyDocument": {
+					"Version": "2012-10-17",
+					"Statement": [
+						{
+							"Effect": "Allow",
+							"Action": [
+								"s3:GetObject"
+							],
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											},
+											"/protected/*"
+										]
+									]
+								}
+							]
+						},
+						{
+							"Effect": "Allow",
+							"Action": [
+								"s3:ListBucket"
+							],
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											}
+										]
+									]
+								}
+							],
+							"Condition": {
+								"StringLike": {
+									"s3:prefix": [
+										"public/",
+										"public/*",
+										"protected/",
+										"protected/*",
+										"private/${cognito-identity.amazonaws.com:sub}/",
+										"private/${cognito-identity.amazonaws.com:sub}/*"
+									]
+								}
+							}
+						}
+					]
+				}
+			}
+		},
+		"S3GuestPublicPolicy": {
+			"DependsOn": [
+				"S3Bucket"
+			],
+			"Condition": "CreateGuestPublic",
+			"Type": "AWS::IAM::Policy",
+			"Properties": {
+				"PolicyName": {
+					"Ref": "s3PublicPolicy"
+				},
+				"Roles": [
+					{
+						"Ref": "unauthRoleName"
+					}
+				],
+				"PolicyDocument": {
+					"Version": "2012-10-17",
+					"Statement": [
+						{
+							"Effect": "Allow",
+							"Action": {
+								"Fn::Split" : [ "," , {
+									"Ref": "s3PermissionsGuestPublic"
+								} ]
+							},
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											},
+											"/public/*"
+										]
+									]
+								}
+							]
+						}
+					]
+				}
+			}
+		},
+		"S3GuestUploadPolicy": {
+			"DependsOn": [
+				"S3Bucket"
+			],
+			"Condition": "CreateGuestUploads",
+			"Type": "AWS::IAM::Policy",
+			"Properties": {
+				"PolicyName": {
+					"Ref": "s3UploadsPolicy"
+				},
+				"Roles": [
+					{
+						"Ref": "unauthRoleName"
+					}
+				],
+				"PolicyDocument": {
+					"Version": "2012-10-17",
+					"Statement": [
+						{
+							"Effect": "Allow",
+							"Action": {
+								"Fn::Split" : [ "," , {
+									"Ref": "s3PermissionsGuestUploads"
+								} ]
+							},
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											},
+											"/uploads/*"
+										]
+									]
+								}
+							]
+						}
+					]
+				}
+			}
+		},
+		"S3GuestReadPolicy": {
+			"DependsOn": [
+				"S3Bucket"
+			],
+			"Condition": "GuestReadAndList",
+			"Type": "AWS::IAM::Policy",
+			"Properties": {
+				"PolicyName": {
+					"Ref": "s3ReadPolicy"
+				},
+				"Roles": [
+					{
+						"Ref": "unauthRoleName"
+					}
+				],
+				"PolicyDocument": {
+					"Version": "2012-10-17",
+					"Statement": [
+						{
+							"Effect": "Allow",
+							"Action": [
+								"s3:GetObject"
+							],
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											},
+											"/protected/*"
+										]
+									]
+								}
+							]
+						},
+						{
+							"Effect": "Allow",
+							"Action": [
+								"s3:ListBucket"
+							],
+							"Resource": [
+								{
+									"Fn::Join": [
+										"",
+										[
+											"arn:aws:s3:::",
+											{
+												"Ref": "S3Bucket"
+											}
+										]
+									]
+								}
+							],
+							"Condition": {
+								"StringLike": {
+									"s3:prefix": [
+										"public/",
+										"public/*",
+										"protected/",
+										"protected/*"
+									]
+								}
+							}
+						}
+					]
+				}
+			}
+		}
+	},
+	"Outputs": {
+		"BucketName": {
+			"Value": {
+				"Ref": "S3Bucket"
+			},
+			"Description": "Bucket name for the S3 bucket"
+		},
+		"Region": {
+			"Value": {
+				"Ref": "AWS::Region"
+			}
+		}
+	}
+}
diff --git a/amplify-backup/backend/storage/SSDStorage/storage-params.json b/amplify-backup/backend/storage/SSDStorage/storage-params.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/amplify-backup/backend/storage/SSDStorage/storage-params.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/amplify-backup/backend/tags.json b/amplify-backup/backend/tags.json
new file mode 100644
index 0000000..b9321d7
--- /dev/null
+++ b/amplify-backup/backend/tags.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Key": "user:Stack",
+    "Value": "{project-env}"
+  },
+  {
+    "Key": "user:Application",
+    "Value": "{project-name}"
+  }
+]
\ No newline at end of file
diff --git a/amplify-backup/backend/types/amplify-dependent-resources-ref.d.ts b/amplify-backup/backend/types/amplify-dependent-resources-ref.d.ts
new file mode 100644
index 0000000..d1ed9b8
--- /dev/null
+++ b/amplify-backup/backend/types/amplify-dependent-resources-ref.d.ts
@@ -0,0 +1,32 @@
+export type AmplifyDependentResourcesAttributes = {
+    "api": {
+        "thrifty": {
+            "GraphQLAPIIdOutput": "string",
+            "GraphQLAPIEndpointOutput": "string"
+        }
+    },
+    "auth": {
+        "thrifty21f6c364": {
+            "IdentityPoolId": "string",
+            "IdentityPoolName": "string",
+            "UserPoolId": "string",
+            "UserPoolArn": "string",
+            "UserPoolName": "string",
+            "AppClientIDWeb": "string",
+            "AppClientID": "string"
+        }
+    },
+    "storage": {
+        "SSDStorage": {
+            "BucketName": "string",
+            "Region": "string"
+        }
+    },
+    "analytics": {
+        "ThriftyOWUjV": {
+            "Region": "string",
+            "Id": "string",
+            "appName": "string"
+        }
+    }
+}
\ No newline at end of file
diff --git a/amplify-backup/cli.json b/amplify-backup/cli.json
new file mode 100644
index 0000000..1b1a4f5
--- /dev/null
+++ b/amplify-backup/cli.json
@@ -0,0 +1,48 @@
+{
+    "features": {
+        "graphqltransformer": {
+            "addmissingownerfields": true,
+            "improvepluralization": false,
+            "validatetypenamereservedwords": true,
+            "useexperimentalpipelinedtransformer": false,
+            "enableiterativegsiupdates": true,
+            "secondarykeyasgsi": true,
+            "skipoverridemutationinputtypes": true
+        },
+        "frontend-ios": {
+            "enablexcodeintegration": true
+        },
+        "auth": {
+            "enablecaseinsensitivity": true,
+            "useinclusiveterminology": true,
+            "breakcirculardependency": true,
+            "forcealiasattributes": false
+        },
+        "codegen": {
+            "useappsyncmodelgenplugin": true,
+            "usedocsgeneratorplugin": true,
+            "usetypesgeneratorplugin": true,
+            "cleangeneratedmodelsdirectory": true,
+            "retaincasestyle": true,
+            "addtimestampfields": true,
+            "handlelistnullabilitytransparently": true,
+            "emitauthprovider": true,
+            "generateindexrules": true,
+            "enabledartnullsafety": true
+        },
+        "appsync": {
+            "generategraphqlpermissions": true
+        },
+        "latestregionsupport": {
+            "pinpoint": 1,
+            "translate": 1,
+            "transcribe": 1,
+            "rekognition": 1,
+            "textract": 1,
+            "comprehend": 1
+        },
+        "project": {
+            "overrides": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/amplify-backup/hooks/README.md b/amplify-backup/hooks/README.md
new file mode 100644
index 0000000..8fb601e
--- /dev/null
+++ b/amplify-backup/hooks/README.md
@@ -0,0 +1,7 @@
+# Command Hooks
+
+Command hooks can be used to run custom scripts upon Amplify CLI lifecycle events like pre-push, post-add-function, etc.
+
+To get started, add your script files based on the expected naming convention in this directory.
+
+Learn more about the script file naming convention, hook parameters, third party dependencies, and advanced configurations at https://docs.amplify.aws/cli/usage/command-hooks
diff --git a/amplify-backup/team-provider-info.json b/amplify-backup/team-provider-info.json
new file mode 100644
index 0000000..9d31790
--- /dev/null
+++ b/amplify-backup/team-provider-info.json
@@ -0,0 +1,27 @@
+{
+  "dev": {
+    "awscloudformation": {
+      "AuthRoleName": "amplify-thrifty-dev-144858-authRole",
+      "UnauthRoleArn": "arn:aws:iam::459760485083:role/amplify-thrifty-dev-144858-unauthRole",
+      "AuthRoleArn": "arn:aws:iam::459760485083:role/amplify-thrifty-dev-144858-authRole",
+      "Region": "eu-central-1",
+      "DeploymentBucketName": "amplify-thrifty-dev-144858-deployment",
+      "UnauthRoleName": "amplify-thrifty-dev-144858-unauthRole",
+      "StackName": "amplify-thrifty-dev-144858",
+      "StackId": "arn:aws:cloudformation:eu-central-1:459760485083:stack/amplify-thrifty-dev-144858/659b7da0-4f80-11ec-a95f-022ef605612a",
+      "AmplifyAppId": "d2xhz0mn88sj6z"
+    },
+    "categories": {
+      "notifications": {
+        "Pinpoint": {
+          "Name": "ThriftyOWUjV-dev",
+          "Id": "f06bd624184f4c90bc7556672ddd9619",
+          "Region": "eu-central-1"
+        }
+      },
+      "auth": {
+        "thrifty21f6c364": {}
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify/backend/api/thrifty/cli-inputs.json b/amplify/backend/api/thrifty/cli-inputs.json
index 8619fe6..5aa6e25 100755
--- a/amplify/backend/api/thrifty/cli-inputs.json
+++ b/amplify/backend/api/thrifty/cli-inputs.json
@@ -12,7 +12,7 @@
       }
     },
     "apiName": "thrifty",
-    "gqlSchemaPath": "/tmp/amplify-b38aed8f-cc0e-48c1-ab26-b93ee968bf10/amplify/backend/api/thrifty/schema.graphql",
+    "gqlSchemaPath": "/tmp/amplify-74fb24a4-6bf4-48c0-8949-e8d7be787187/amplify/backend/api/thrifty/schema.graphql",
     "additionalAuthTypes": [
       {
         "mode": "API_KEY",
diff --git a/amplify/backend/api/thrifty/schema.graphql b/amplify/backend/api/thrifty/schema.graphql
index 27ddccd..8c1df1a 100755
--- a/amplify/backend/api/thrifty/schema.graphql
+++ b/amplify/backend/api/thrifty/schema.graphql
@@ -29,5 +29,6 @@ type Product @model @auth(rules: [{allow: private}]) @key(name: "byCategory", fi
   color: String!
   categoryID: ID
   image: String!
+  tag: String!
 }
  
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 036fd14..fdd4209 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,5 +55,9 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
+
+
+    implementation 'com.github.onimur:handle-path-oz:1.0.7'
+    implementation 'com.squareup.picasso:picasso:2.71828'
 }
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0ae36f0..64a39e2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
             android:name=".KidsClothes"
             android:exported="false" />
         <activity
-            android:name=".MainActivity"
+            android:name=".Splash"
             android:exported="false" />
         <activity
             android:name=".WomenClothes"
@@ -49,16 +49,16 @@
             android:name=".Categories"
             android:exported="false" />
         <activity
-            android:name=".Splash"
+            android:name=".MainActivity"
             android:exported="false" />
         <activity
             android:name=".ConfirmationPage"
             android:exported="false" />
         <activity
-            android:name=".Signup"
+            android:name=".Signin"
             android:exported="false" />
         <activity
-            android:name=".Signin"
+            android:name=".Signup"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/amplifyframework/datastore/generated/model/AmplifyModelProvider.java b/app/src/main/java/com/amplifyframework/datastore/generated/model/AmplifyModelProvider.java
index c7a5842..dee022d 100644
--- a/app/src/main/java/com/amplifyframework/datastore/generated/model/AmplifyModelProvider.java
+++ b/app/src/main/java/com/amplifyframework/datastore/generated/model/AmplifyModelProvider.java
@@ -13,7 +13,7 @@
  */
 
 public final class AmplifyModelProvider implements ModelProvider {
-  private static final String AMPLIFY_MODEL_VERSION = "1c29971a13d9fcd249685dddf076b501";
+  private static final String AMPLIFY_MODEL_VERSION = "c2b880f959761c13a8f78be479fb1eb6";
   private static AmplifyModelProvider amplifyGeneratedModelInstance;
   private AmplifyModelProvider() {
     
diff --git a/app/src/main/java/com/amplifyframework/datastore/generated/model/Product.java b/app/src/main/java/com/amplifyframework/datastore/generated/model/Product.java
index 0cc6a03..900bd28 100644
--- a/app/src/main/java/com/amplifyframework/datastore/generated/model/Product.java
+++ b/app/src/main/java/com/amplifyframework/datastore/generated/model/Product.java
@@ -34,6 +34,7 @@ public final class Product implements Model {
   public static final QueryField COLOR = field("Product", "color");
   public static final QueryField CATEGORY_ID = field("Product", "categoryID");
   public static final QueryField IMAGE = field("Product", "image");
+  public static final QueryField TAG = field("Product", "tag");
   private final @ModelField(targetType="ID", isRequired = true) String id;
   private final @ModelField(targetType="String", isRequired = true) String title;
   private final @ModelField(targetType="String", isRequired = true) String description;
@@ -42,6 +43,7 @@ public final class Product implements Model {
   private final @ModelField(targetType="String", isRequired = true) String color;
   private final @ModelField(targetType="ID") String categoryID;
   private final @ModelField(targetType="String", isRequired = true) String image;
+  private final @ModelField(targetType="String", isRequired = true) String tag;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime createdAt;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime updatedAt;
   public String getId() {
@@ -76,6 +78,10 @@ public String getImage() {
       return image;
   }
   
+  public String getTag() {
+      return tag;
+  }
+  
   public Temporal.DateTime getCreatedAt() {
       return createdAt;
   }
@@ -84,7 +90,7 @@ public Temporal.DateTime getUpdatedAt() {
       return updatedAt;
   }
   
-  private Product(String id, String title, String description, String price, String size, String color, String categoryID, String image) {
+  private Product(String id, String title, String description, String price, String size, String color, String categoryID, String image, String tag) {
     this.id = id;
     this.title = title;
     this.description = description;
@@ -93,6 +99,7 @@ private Product(String id, String title, String description, String price, Strin
     this.color = color;
     this.categoryID = categoryID;
     this.image = image;
+    this.tag = tag;
   }
   
   @Override
@@ -111,6 +118,7 @@ public boolean equals(Object obj) {
               ObjectsCompat.equals(getColor(), product.getColor()) &&
               ObjectsCompat.equals(getCategoryId(), product.getCategoryId()) &&
               ObjectsCompat.equals(getImage(), product.getImage()) &&
+              ObjectsCompat.equals(getTag(), product.getTag()) &&
               ObjectsCompat.equals(getCreatedAt(), product.getCreatedAt()) &&
               ObjectsCompat.equals(getUpdatedAt(), product.getUpdatedAt());
       }
@@ -127,6 +135,7 @@ public int hashCode() {
       .append(getColor())
       .append(getCategoryId())
       .append(getImage())
+      .append(getTag())
       .append(getCreatedAt())
       .append(getUpdatedAt())
       .toString()
@@ -145,6 +154,7 @@ public String toString() {
       .append("color=" + String.valueOf(getColor()) + ", ")
       .append("categoryID=" + String.valueOf(getCategoryId()) + ", ")
       .append("image=" + String.valueOf(getImage()) + ", ")
+      .append("tag=" + String.valueOf(getTag()) + ", ")
       .append("createdAt=" + String.valueOf(getCreatedAt()) + ", ")
       .append("updatedAt=" + String.valueOf(getUpdatedAt()))
       .append("}")
@@ -172,6 +182,7 @@ public static Product justId(String id) {
       null,
       null,
       null,
+      null,
       null
     );
   }
@@ -184,7 +195,8 @@ public CopyOfBuilder copyOfBuilder() {
       size,
       color,
       categoryID,
-      image);
+      image,
+      tag);
   }
   public interface TitleStep {
     DescriptionStep title(String title);
@@ -212,7 +224,12 @@ public interface ColorStep {
   
 
   public interface ImageStep {
-    BuildStep image(String image);
+    TagStep image(String image);
+  }
+  
+
+  public interface TagStep {
+    BuildStep tag(String tag);
   }
   
 
@@ -223,7 +240,7 @@ public interface BuildStep {
   }
   
 
-  public static class Builder implements TitleStep, DescriptionStep, PriceStep, SizeStep, ColorStep, ImageStep, BuildStep {
+  public static class Builder implements TitleStep, DescriptionStep, PriceStep, SizeStep, ColorStep, ImageStep, TagStep, BuildStep {
     private String id;
     private String title;
     private String description;
@@ -231,6 +248,7 @@ public static class Builder implements TitleStep, DescriptionStep, PriceStep, Si
     private String size;
     private String color;
     private String image;
+    private String tag;
     private String categoryID;
     @Override
      public Product build() {
@@ -244,7 +262,8 @@ public Product build() {
           size,
           color,
           categoryID,
-          image);
+          image,
+          tag);
     }
     
     @Override
@@ -283,12 +302,19 @@ public ImageStep color(String color) {
     }
     
     @Override
-     public BuildStep image(String image) {
+     public TagStep image(String image) {
         Objects.requireNonNull(image);
         this.image = image;
         return this;
     }
     
+    @Override
+     public BuildStep tag(String tag) {
+        Objects.requireNonNull(tag);
+        this.tag = tag;
+        return this;
+    }
+    
     @Override
      public BuildStep categoryId(String categoryId) {
         this.categoryID = categoryId;
@@ -307,7 +333,7 @@ public BuildStep id(String id) {
   
 
   public final class CopyOfBuilder extends Builder {
-    private CopyOfBuilder(String id, String title, String description, String price, String size, String color, String categoryId, String image) {
+    private CopyOfBuilder(String id, String title, String description, String price, String size, String color, String categoryId, String image, String tag) {
       super.id(id);
       super.title(title)
         .description(description)
@@ -315,6 +341,7 @@ private CopyOfBuilder(String id, String title, String description, String price,
         .size(size)
         .color(color)
         .image(image)
+        .tag(tag)
         .categoryId(categoryId);
     }
     
@@ -348,6 +375,11 @@ public CopyOfBuilder image(String image) {
       return (CopyOfBuilder) super.image(image);
     }
     
+    @Override
+     public CopyOfBuilder tag(String tag) {
+      return (CopyOfBuilder) super.tag(tag);
+    }
+    
     @Override
      public CopyOfBuilder categoryId(String categoryId) {
       return (CopyOfBuilder) super.categoryId(categoryId);
diff --git a/app/src/main/java/com/example/thrifty/Accessories.java b/app/src/main/java/com/example/thrifty/Accessories.java
index 46d6e5a..49664ef 100644
--- a/app/src/main/java/com/example/thrifty/Accessories.java
+++ b/app/src/main/java/com/example/thrifty/Accessories.java
@@ -5,11 +5,14 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+import android.view.View;
+import android.widget.Toolbar;
 
 import com.amplifyframework.AmplifyException;
 import com.amplifyframework.analytics.pinpoint.AWSPinpointAnalyticsPlugin;
@@ -24,6 +27,8 @@
 import com.example.thrifty.adapters.BeltsAdapter;
 import com.example.thrifty.adapters.KidsClothesAdapter;
 import com.example.thrifty.adapters.WatchesAdapter;
+import com.google.android.material.bottomnavigation.BottomNavigationItemView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,7 +44,19 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_accessories);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_ios_new_24);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                Intent intent   = new Intent(Accessories.this, Categories.class);
+                startActivity(intent);
+            }
+        });
 
+
+        bottomNav();
         categorizedRecView = findViewById(R.id.categorizedRecView);
         categorizedRecView.setAdapter(accessoriesAdapter);
         categorizedRecView.setLayoutManager(new LinearLayoutManager(getApplicationContext(),RecyclerView.HORIZONTAL,false));
@@ -64,4 +81,33 @@ public boolean handleMessage(@NonNull Message msg) {
 
     }
 
+
+    public void bottomNav(){
+        BottomNavigationView bottomNavigationView = findViewById(R.id.bottomNavigationView);
+        BottomNavigationItemView homeNav = findViewById(R.id.homeNav);
+        BottomNavigationItemView search = findViewById(R.id.search);
+//        BottomNavigationItemView cart = findViewById(R.id.cart);
+//        BottomNavigationItemView wishlist = findViewById(R.id.wishlist);
+        BottomNavigationItemView profile = findViewById(R.id.profile);
+
+        search.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Categories.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        homeNav.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        profile.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Profile.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/thrifty/Admin.java b/app/src/main/java/com/example/thrifty/Admin.java
index 0e41ca6..f000ad1 100644
--- a/app/src/main/java/com/example/thrifty/Admin.java
+++ b/app/src/main/java/com/example/thrifty/Admin.java
@@ -1,9 +1,14 @@
 package com.example.thrifty;
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
@@ -22,25 +27,37 @@
 import com.amplifyframework.datastore.generated.model.Category;
 import com.amplifyframework.datastore.generated.model.Product;
 import com.amplifyframework.storage.s3.AWSS3StoragePlugin;
+import com.google.android.material.bottomnavigation.BottomNavigationItemView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class Admin extends AppCompatActivity {
-
+    String imageName = "";
+    public Uri uri;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_admin);
-
+        bottomNav();
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_ios_new_24);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
-                Intent intent   = new Intent(Admin.this, MainActivity.class);
+                Intent intent   = new Intent(Admin.this, Profile.class);
                 startActivity(intent);
             }
         });
-
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         try {
 //            Amplify.addPlugin(new AWSPinpointAnalyticsPlugin(getApplication()));
             Amplify.addPlugin(new AWSS3StoragePlugin());
@@ -54,6 +71,14 @@ public void onClick(View v) {
         }
 
 
+        Button uploadImg = findViewById(R.id.upload);
+        uploadImg.setOnClickListener(view -> {
+            fileChoose();
+            uploadInputStream();
+
+        });
+
+
         Spinner spinnerLanguages=findViewById(R.id.spinner);
         ArrayAdapter<CharSequence> adapter=ArrayAdapter.createFromResource(this, R.array.shop, android.R.layout.simple_spinner_item);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_item);
@@ -80,7 +105,7 @@ public void onClick(View v) {
             String setsize = size.getSelectedItem().toString();
             String setcolor = color.getText().toString();
             Log.i("category", setcategory );
-
+            String imageURl = sharedPreferences.getString("FileUrlForReal", "no files");
          Intent intent = new Intent(Admin.this,MainActivity.class);
          startActivity(intent);
 
@@ -92,7 +117,8 @@ public void onClick(View v) {
                     .price(setprice)
                     .size(setsize)
                     .color(setcolor)
-                    .image("")
+                    .image(imageURl)
+                    .tag("")
                     .categoryId(setcategory)
                     .build();
 
@@ -103,4 +129,97 @@ public void onClick(View v) {
             );
         });
     }
+
+
+    public void bottomNav(){
+        BottomNavigationView bottomNavigationView = findViewById(R.id.bottomNavigationView);
+        BottomNavigationItemView homeNav = findViewById(R.id.homeNav);
+        BottomNavigationItemView search = findViewById(R.id.search);
+//        BottomNavigationItemView cart = findViewById(R.id.cart);
+//        BottomNavigationItemView wishlist = findViewById(R.id.wishlist);
+        BottomNavigationItemView profile = findViewById(R.id.profile);
+
+        search.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Categories.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        homeNav.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        profile.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Profile.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        @SuppressLint("SimpleDateFormat") SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
+        String fileName = sdf.format(new Date());
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        File uploadFile = new File(getApplicationContext().getFilesDir(), fileName);
+        try {
+            InputStream exampleInputStream = getContentResolver().openInputStream(data.getData());
+            OutputStream outputStream = new FileOutputStream(uploadFile);
+            imageName = data.getData().toString();
+            byte[] buff = new byte[1024];
+            int length;
+            while ((length = exampleInputStream.read(buff)) > 0) {
+                outputStream.write(buff, 0, length);
+            }
+            exampleInputStream.close();
+            outputStream.close();
+            Amplify.Storage.uploadFile(
+                    fileName + ".jpg",
+                    uploadFile,
+                    result -> {
+                        Log.i("MyAmplifyAppUpload", "Successfully uploaded: " + result.getKey());
+                        Amplify.Storage.getUrl(result.getKey(), urlResult -> {
+                            sharedPreferences.edit().putString("FileUrlForReal", urlResult.getUrl().toString()).apply();
+                        }, urlError -> {
+                            Log.e("TAG", "onActivityResult: Error please dont be mad");
+                        });
+                    },
+                    storageFailure -> Log.e("MyAmplifyApp", "Upload failed", storageFailure)
+            );
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void uploadInputStream() {
+        if (uri != null) {
+            try {
+                InputStream exampleInputStream = getContentResolver().openInputStream(uri);
+
+                Amplify.Storage.uploadInputStream(
+                        imageName,
+                        exampleInputStream,
+                        result -> Log.i("MyAmplifyApp", "Successfully uploaded: " + result.getKey()),
+                        storageFailure -> Log.e("MyAmplifyApp", "Upload failed", storageFailure)
+                );
+            } catch (FileNotFoundException error) {
+                Log.e("MyAmplifyApp", "Could not find file to open for input stream.", error);
+            }
+        }
+    }
+
+
+    public void fileChoose() {
+        Intent fileChoose = new Intent(Intent.ACTION_GET_CONTENT);
+        fileChoose.setType("*/*");
+        fileChoose = Intent.createChooser(fileChoose, "choose file");
+        startActivityForResult(fileChoose, 1234);
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/thrifty/Belts.java b/app/src/main/java/com/example/thrifty/Belts.java
index 89b9c36..3aef5bd 100644
--- a/app/src/main/java/com/example/thrifty/Belts.java
+++ b/app/src/main/java/com/example/thrifty/Belts.java
@@ -5,11 +5,14 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+import android.view.View;
+import android.widget.Toolbar;
 
 import com.amplifyframework.AmplifyException;
 import com.amplifyframework.analytics.pinpoint.AWSPinpointAnalyticsPlugin;
@@ -23,6 +26,8 @@
 import com.example.thrifty.adapters.BeltsAdapter;
 import com.example.thrifty.adapters.KidsClothesAdapter;
 import com.example.thrifty.adapters.WatchesAdapter;
+import com.google.android.material.bottomnavigation.BottomNavigationItemView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,6 +43,21 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_belts);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_ios_new_24);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+//                Intent intent = new Intent(getApplicationContext(), Categories.class);
+//                intent.setFlags(Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
+//                startActivity(intent);
+                Intent intent   = new Intent(Belts.this, Categories.class);
+                startActivity(intent);
+            }
+        });
+
+
+        bottomNav();
         categorizedRecView = findViewById(R.id.categorizedRecView);
         categorizedRecView.setAdapter(beltsAdapter);
         categorizedRecView.setLayoutManager(new LinearLayoutManager(getApplicationContext(),RecyclerView.HORIZONTAL,false));
@@ -62,4 +82,33 @@ public boolean handleMessage(@NonNull Message msg) {
 
     }
 
+
+    public void bottomNav(){
+        BottomNavigationView bottomNavigationView = findViewById(R.id.bottomNavigationView);
+        BottomNavigationItemView homeNav = findViewById(R.id.homeNav);
+        BottomNavigationItemView search = findViewById(R.id.search);
+//        BottomNavigationItemView cart = findViewById(R.id.cart);
+//        BottomNavigationItemView wishlist = findViewById(R.id.wishlist);
+        BottomNavigationItemView profile = findViewById(R.id.profile);
+
+        search.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Categories.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        homeNav.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        profile.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Profile.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/thrifty/KidsClothes.java b/app/src/main/java/com/example/thrifty/KidsClothes.java
index 3e51c65..e3e67c9 100644
--- a/app/src/main/java/com/example/thrifty/KidsClothes.java
+++ b/app/src/main/java/com/example/thrifty/KidsClothes.java
@@ -5,11 +5,14 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+import android.view.View;
+import android.widget.Toolbar;
 
 import com.amplifyframework.AmplifyException;
 import com.amplifyframework.analytics.pinpoint.AWSPinpointAnalyticsPlugin;
@@ -21,6 +24,8 @@
 import com.amplifyframework.datastore.generated.model.Product;
 import com.amplifyframework.storage.s3.AWSS3StoragePlugin;
 import com.example.thrifty.adapters.KidsClothesAdapter;
+import com.google.android.material.bottomnavigation.BottomNavigationItemView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,6 +41,19 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_kids_clothes);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_ios_new_24);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                Intent intent   = new Intent(KidsClothes.this, Categories.class);
+                startActivity(intent);
+            }
+        });
+
+
+        bottomNav();
         categorizedRecView = findViewById(R.id.categorizedRecView);
         categorizedRecView.setAdapter(kidsClothesAdapter);
         categorizedRecView.setLayoutManager(new LinearLayoutManager(getApplicationContext(),RecyclerView.HORIZONTAL,false));
@@ -59,4 +77,33 @@ public boolean handleMessage(@NonNull Message msg) {
         );
 
     }
+
+
+    public void bottomNav(){
+        BottomNavigationView bottomNavigationView = findViewById(R.id.bottomNavigationView);
+        BottomNavigationItemView homeNav = findViewById(R.id.homeNav);
+        BottomNavigationItemView search = findViewById(R.id.search);
+//        BottomNavigationItemView cart = findViewById(R.id.cart);
+//        BottomNavigationItemView wishlist = findViewById(R.id.wishlist);
+        BottomNavigationItemView profile = findViewById(R.id.profile);
+
+        search.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Categories.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        homeNav.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        profile.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Profile.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/thrifty/MainActivity.java b/app/src/main/java/com/example/thrifty/MainActivity.java
index 391d655..d1546e1 100644
--- a/app/src/main/java/com/example/thrifty/MainActivity.java
+++ b/app/src/main/java/com/example/thrifty/MainActivity.java
@@ -23,6 +23,7 @@
 
 import android.util.Log;
 import android.widget.Button;
+import android.widget.ImageView;
 
 import com.amazonaws.mobile.client.AWSMobileClient;
 import com.amazonaws.mobile.client.Callback;
@@ -47,6 +48,7 @@
 import com.google.android.material.bottomnavigation.BottomNavigationItemView;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.firebase.messaging.FirebaseMessaging;
+import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -157,6 +159,7 @@ public boolean handleMessage(@NonNull Message message) {
                 popularRecView.getAdapter().notifyDataSetChanged();
                 return false;
             }
+
         });
 
         suggestedRecView.setAdapter(new NewItemsAdapter(suggestProducts , MainActivity.this));
diff --git a/app/src/main/java/com/example/thrifty/MenClothes.java b/app/src/main/java/com/example/thrifty/MenClothes.java
index ad229d1..a0a3edb 100644
--- a/app/src/main/java/com/example/thrifty/MenClothes.java
+++ b/app/src/main/java/com/example/thrifty/MenClothes.java
@@ -5,11 +5,14 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+import android.view.View;
+import android.widget.Toolbar;
 
 import com.amplifyframework.AmplifyException;
 import com.amplifyframework.analytics.pinpoint.AWSPinpointAnalyticsPlugin;
@@ -21,6 +24,8 @@
 import com.amplifyframework.datastore.generated.model.Product;
 import com.amplifyframework.storage.s3.AWSS3StoragePlugin;
 import com.example.thrifty.adapters.MenClothesAdapter;
+import com.google.android.material.bottomnavigation.BottomNavigationItemView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,6 +42,19 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_men_clothes);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_ios_new_24);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                Intent intent   = new Intent(MenClothes.this, Categories.class);
+                startActivity(intent);
+            }
+        });
+
+
+        bottomNav();
         categorizedRecView = findViewById(R.id.categorizedRecView);
         categorizedRecView.setAdapter(menClothesAdapter);
         categorizedRecView.setLayoutManager(new LinearLayoutManager(getApplicationContext(),RecyclerView.HORIZONTAL,false));
@@ -61,4 +79,33 @@ public boolean handleMessage(@NonNull Message msg) {
         );
 
     }
+
+
+    public void bottomNav(){
+        BottomNavigationView bottomNavigationView = findViewById(R.id.bottomNavigationView);
+        BottomNavigationItemView homeNav = findViewById(R.id.homeNav);
+        BottomNavigationItemView search = findViewById(R.id.search);
+//        BottomNavigationItemView cart = findViewById(R.id.cart);
+//        BottomNavigationItemView wishlist = findViewById(R.id.wishlist);
+        BottomNavigationItemView profile = findViewById(R.id.profile);
+
+        search.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Categories.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        homeNav.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        profile.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Profile.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/thrifty/ProductView.java b/app/src/main/java/com/example/thrifty/ProductView.java
index 3b99aaf..d17c984 100644
--- a/app/src/main/java/com/example/thrifty/ProductView.java
+++ b/app/src/main/java/com/example/thrifty/ProductView.java
@@ -6,6 +6,7 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toolbar;
 
@@ -16,6 +17,7 @@
 import com.amplifyframework.core.Amplify;
 import com.amplifyframework.datastore.AWSDataStorePlugin;
 import com.amplifyframework.storage.s3.AWSS3StoragePlugin;
+import com.squareup.picasso.Picasso;
 
 public class ProductView extends AppCompatActivity {
 
@@ -47,6 +49,7 @@ protected void onCreate(Bundle savedInstanceState) {
         String price = intent.getStringExtra("price");
         String category = intent.getStringExtra("category");
 
+
         TextView textView = findViewById(R.id.txtTitle);
         TextView priceTxt = findViewById(R.id.txtPrice);
         TextView categoryTxt = findViewById(R.id.category);
@@ -56,5 +59,8 @@ protected void onCreate(Bundle savedInstanceState) {
         categoryTxt.setText(category);
 
 
+        String url = intent.getExtras().getString("image");
+        ImageView image = findViewById(R.id.itemImage);
+        Picasso.get().load(url).into(image);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/thrifty/Profile.java b/app/src/main/java/com/example/thrifty/Profile.java
index 9263091..68e1b0e 100644
--- a/app/src/main/java/com/example/thrifty/Profile.java
+++ b/app/src/main/java/com/example/thrifty/Profile.java
@@ -7,13 +7,16 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.Toolbar;
 
+import com.amplifyframework.core.Amplify;
 import com.google.android.material.bottomnavigation.BottomNavigationItemView;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
@@ -44,6 +47,21 @@ public void onClick(View v) {
             }
         });
 
+        ImageView logout = findViewById(R.id.logout);
+        logout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Amplify.Auth.signOut(
+                        () -> Log.i("AuthQuickstart", "Signed out successfully"),
+                        error -> Log.e("not complemte", error.toString())
+                );
+                Toast.makeText(getApplicationContext(), "you logged out successfully", Toast.LENGTH_SHORT).show();
+                Intent intent = new Intent(Profile.this, Signin.class);
+                startActivity(intent);
+            }
+        });
+
+
         ImageView imageView = findViewById(R.id.fav);
         imageView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -53,6 +71,16 @@ public void onClick(View view) {
             }
         });
 
+
+
+        Button addproduct = findViewById(R.id.admin1);
+        addproduct.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(Profile.this,Admin.class);
+                startActivity(intent);
+            }
+        });
     }
 
 
diff --git a/app/src/main/java/com/example/thrifty/Signin.java b/app/src/main/java/com/example/thrifty/Signin.java
index 8754dfc..56005a3 100644
--- a/app/src/main/java/com/example/thrifty/Signin.java
+++ b/app/src/main/java/com/example/thrifty/Signin.java
@@ -59,7 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent   = new Intent(Signin.this, MainActivity.class);
+                Intent intent   = new Intent(Signin.this, Signup.class);
                 startActivity(intent);
             }
         });
diff --git a/app/src/main/java/com/example/thrifty/Signup.java b/app/src/main/java/com/example/thrifty/Signup.java
index e49cfb9..71fbce6 100644
--- a/app/src/main/java/com/example/thrifty/Signup.java
+++ b/app/src/main/java/com/example/thrifty/Signup.java
@@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onClick(View v) {
 
-                Intent intent   = new Intent(Signup.this, MainActivity.class);
+                Intent intent   = new Intent(Signup.this, Splash.class);
                 startActivity(intent);
             }
         });
diff --git a/app/src/main/java/com/example/thrifty/Watches.java b/app/src/main/java/com/example/thrifty/Watches.java
index 7d1d7b1..9d33cd0 100644
--- a/app/src/main/java/com/example/thrifty/Watches.java
+++ b/app/src/main/java/com/example/thrifty/Watches.java
@@ -5,11 +5,14 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+import android.view.View;
+import android.widget.Toolbar;
 
 import com.amplifyframework.AmplifyException;
 import com.amplifyframework.analytics.pinpoint.AWSPinpointAnalyticsPlugin;
@@ -22,6 +25,8 @@
 import com.amplifyframework.storage.s3.AWSS3StoragePlugin;
 import com.example.thrifty.adapters.KidsClothesAdapter;
 import com.example.thrifty.adapters.WatchesAdapter;
+import com.google.android.material.bottomnavigation.BottomNavigationItemView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,6 +42,20 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_watches);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_ios_new_24);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                Intent intent   = new Intent(Watches.this, Categories.class);
+                startActivity(intent);
+            }
+        });
+
+
+
+        bottomNav();
         categorizedRecView = findViewById(R.id.categorizedRecView);
         categorizedRecView.setAdapter(watchesAdapter);
         categorizedRecView.setLayoutManager(new LinearLayoutManager(getApplicationContext(),RecyclerView.HORIZONTAL,false));
@@ -60,4 +79,33 @@ public boolean handleMessage(@NonNull Message msg) {
         );
 
     }
+
+
+    public void bottomNav(){
+        BottomNavigationView bottomNavigationView = findViewById(R.id.bottomNavigationView);
+        BottomNavigationItemView homeNav = findViewById(R.id.homeNav);
+        BottomNavigationItemView search = findViewById(R.id.search);
+//        BottomNavigationItemView cart = findViewById(R.id.cart);
+//        BottomNavigationItemView wishlist = findViewById(R.id.wishlist);
+        BottomNavigationItemView profile = findViewById(R.id.profile);
+
+        search.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Categories.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        homeNav.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        profile.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Profile.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/thrifty/WomenClothes.java b/app/src/main/java/com/example/thrifty/WomenClothes.java
index 2cfb8c4..a0cfc52 100644
--- a/app/src/main/java/com/example/thrifty/WomenClothes.java
+++ b/app/src/main/java/com/example/thrifty/WomenClothes.java
@@ -5,11 +5,14 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+import android.view.View;
+import android.widget.Toolbar;
 
 import com.amplifyframework.AmplifyException;
 import com.amplifyframework.analytics.pinpoint.AWSPinpointAnalyticsPlugin;
@@ -21,6 +24,8 @@
 import com.amplifyframework.datastore.generated.model.Product;
 import com.amplifyframework.storage.s3.AWSS3StoragePlugin;
 import com.example.thrifty.adapters.WomenClothesAdapter;
+import com.google.android.material.bottomnavigation.BottomNavigationItemView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,6 +42,19 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_women_clothes);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_ios_new_24);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                Intent intent   = new Intent(WomenClothes.this, Categories.class);
+                startActivity(intent);
+            }
+        });
+
+
+        bottomNav();
         categorizedRecView = findViewById(R.id.categorizedRecView);
         categorizedRecView.setAdapter(womenClothesAdapter);
         categorizedRecView.setLayoutManager(new LinearLayoutManager(getApplicationContext(),RecyclerView.HORIZONTAL,false));
@@ -61,4 +79,33 @@ public boolean handleMessage(@NonNull Message msg) {
         );
 
     }
+
+
+    public void bottomNav(){
+        BottomNavigationView bottomNavigationView = findViewById(R.id.bottomNavigationView);
+        BottomNavigationItemView homeNav = findViewById(R.id.homeNav);
+        BottomNavigationItemView search = findViewById(R.id.search);
+//        BottomNavigationItemView cart = findViewById(R.id.cart);
+//        BottomNavigationItemView wishlist = findViewById(R.id.wishlist);
+        BottomNavigationItemView profile = findViewById(R.id.profile);
+
+        search.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Categories.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        homeNav.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+        profile.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), Profile.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK| Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/thrifty/adapters/NewItemsAdapter.java b/app/src/main/java/com/example/thrifty/adapters/NewItemsAdapter.java
index 7b70297..81e6133 100644
--- a/app/src/main/java/com/example/thrifty/adapters/NewItemsAdapter.java
+++ b/app/src/main/java/com/example/thrifty/adapters/NewItemsAdapter.java
@@ -10,6 +10,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -27,8 +28,7 @@
 import com.example.thrifty.MainActivity;
 import com.example.thrifty.ProductView;
 import com.example.thrifty.R;
-
-
+import com.squareup.picasso.Picasso;
 
 
 public class NewItemsAdapter extends RecyclerView.Adapter<NewItemsAdapter.NewItemsHolder> {
@@ -52,6 +52,7 @@ public void onBindViewHolder(@NonNull NewItemsHolder holder, @SuppressLint("Recy
         TextView title = holder.itemView.findViewById(R.id.titlefrag1);
         TextView category = holder.itemView.findViewById(R.id.categoryfrag);
         TextView price = holder.itemView.findViewById(R.id.price);
+        ImageView image = holder.itemView.findViewById(R.id.idIVCourseImage);
                 //        TextView email = holder.itemView.findViewById(R.id.editTextTextPersonName6);
 
         Button btn = holder.itemView.findViewById(R.id.button2);
@@ -61,11 +62,11 @@ public void onClick(View view) {
                 Toast.makeText(view.getContext(), "fav Button Clicked", Toast.LENGTH_LONG).show();
                 String name = title.getText().toString();
                 String cat = category.getText().toString();
-//                String emailText = email.getText().toString();
+                String price1 = price.getText().toString();
                 Favorite favorite = new Favorite.Builder()
                         .titleFav(name)
                         .imageFav("categoryFav")
-                        .priceFav("15")
+                        .priceFav(price1)
                         .sizeFav("15")
                         .categoryFav(cat)
                         .userId("emailText")
@@ -74,14 +75,15 @@ public void onClick(View view) {
                         ModelMutation.create(favorite),
                         response -> Log.i("MyAmplifyApp", "Added Todo with id: " + response.getData().getId()),
                         error -> Log.e("MyAmplifyApp", "Create failed", error)
-
                 );
             }
         });
 
+
         title.setText(holder.product.getTitle());
         category.setText(holder.product.getCategoryId());
         price.setText(holder.product.getPrice());
+        Picasso.get().load(holder.product.getImage()).into(image);
 
 
         holder.itemView.findViewById(R.id.card).setOnClickListener(new View.OnClickListener() {
@@ -91,7 +93,7 @@ public void onClick(View view) {
                 goToDetails.putExtra("Title",products.get(position).getTitle());
                 goToDetails.putExtra("category",products.get(position).getCategoryId());
                 goToDetails.putExtra("price", products.get(position).getPrice());
-
+                goToDetails.putExtra("image",products.get(position).getImage());
                 view.getContext().startActivity(goToDetails);
             }
         });
diff --git a/app/src/main/java/com/example/thrifty/fragments/ProductFragment.java b/app/src/main/java/com/example/thrifty/fragments/ProductFragment.java
index f6c13eb..870d95b 100644
--- a/app/src/main/java/com/example/thrifty/fragments/ProductFragment.java
+++ b/app/src/main/java/com/example/thrifty/fragments/ProductFragment.java
@@ -21,10 +21,13 @@ public class ProductFragment extends Fragment {
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
     private static final String ARG_PARAM1 = "title";
     private static final String ARG_PARAM2 = "categoryID";
+    private static final String ARG_PARAM3 = "image";
 
     // TODO: Rename and change types of parameters
     private String Title;
     private String CategoryID;
+    private String Image;
+
 
     public ProductFragment() {
         // Required empty public constructor
@@ -36,14 +39,17 @@ public ProductFragment() {
      *
      * @param Title Parameter 1.
      * @param CategoryID Parameter 2.
+     * @param Image Parameter 3.
      * @return A new instance of fragment ProductFragment.
      */
     // TODO: Rename and change types and number of parameters
-    public static ProductFragment newInstance(String Title, String CategoryID) {
+    public static ProductFragment newInstance(String Title, String CategoryID, String Image) {
         ProductFragment fragment = new ProductFragment();
         Bundle args = new Bundle();
         args.putString(ARG_PARAM1, Title);
         args.putString(ARG_PARAM2, CategoryID);
+        args.putString(ARG_PARAM3, Image);
+
         fragment.setArguments(args);
         return fragment;
     }
@@ -54,6 +60,7 @@ public void onCreate(Bundle savedInstanceState) {
         if (getArguments() != null) {
             Title = getArguments().getString(ARG_PARAM1);
             CategoryID = getArguments().getString(ARG_PARAM2);
+            Image = getArguments().getString(ARG_PARAM3);
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_baseline_exit_to_app_24.xml b/app/src/main/res/drawable/ic_baseline_exit_to_app_24.xml
new file mode 100644
index 0000000..2535dfb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_exit_to_app_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#C40A0A"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_admin.xml b/app/src/main/res/layout/activity_admin.xml
index ab1a936..7457e0e 100644
--- a/app/src/main/res/layout/activity_admin.xml
+++ b/app/src/main/res/layout/activity_admin.xml
@@ -23,10 +23,10 @@
         android:text="add products"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.887"
+        app:layout_constraintHorizontal_bias="0.881"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/toolbar"
-        app:layout_constraintVertical_bias="0.926" />
+        app:layout_constraintVertical_bias="0.822" />
 
     <TextView
         android:id="@+id/productname"
@@ -38,7 +38,7 @@
         app:layout_constraintHorizontal_bias="0.237"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.148" />
+        app:layout_constraintVertical_bias="0.113" />
 
     <TextView
         android:id="@+id/description"
@@ -52,6 +52,7 @@
         app:layout_constraintTop_toBottomOf="@+id/productname"
         app:layout_constraintVertical_bias="0.118" />
 
+
     <TextView
         android:id="@+id/price"
         android:layout_width="wrap_content"
@@ -62,8 +63,7 @@
         app:layout_constraintHorizontal_bias="0.202"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/description"
-        app:layout_constraintVertical_bias="0.158" />
-
+        app:layout_constraintVertical_bias="0.113" />
 
     <TextView
         android:id="@+id/category"
@@ -75,7 +75,7 @@
         app:layout_constraintHorizontal_bias="0.216"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/description"
-        app:layout_constraintVertical_bias="0.348" />
+        app:layout_constraintVertical_bias="0.27" />
 
     <EditText
         android:id="@+id/nametext"
@@ -89,7 +89,7 @@
         app:layout_constraintHorizontal_bias="0.383"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        app:layout_constraintVertical_bias="0.129" />
+        app:layout_constraintVertical_bias="0.08" />
 
     <EditText
         android:id="@+id/descriptiontext"
@@ -105,6 +105,7 @@
         app:layout_constraintTop_toBottomOf="@+id/nametext"
         app:layout_constraintVertical_bias="0.102" />
 
+
     <EditText
         android:id="@+id/pricetext"
         android:layout_width="wrap_content"
@@ -117,8 +118,7 @@
         app:layout_constraintHorizontal_bias="0.383"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/descriptiontext"
-        app:layout_constraintVertical_bias="0.166" />
-
+        app:layout_constraintVertical_bias="0.098" />
 
     <Spinner
         android:id="@+id/spinner"
@@ -130,7 +130,7 @@
         app:layout_constraintHorizontal_bias="0.383"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        app:layout_constraintVertical_bias="0.543" />
+        app:layout_constraintVertical_bias="0.456" />
 
     <TextView
         android:id="@+id/size"
@@ -142,7 +142,7 @@
         app:layout_constraintHorizontal_bias="0.199"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/description"
-        app:layout_constraintVertical_bias="0.492" />
+        app:layout_constraintVertical_bias="0.414" />
 
     <Spinner
         android:id="@+id/sizespinner"
@@ -154,7 +154,7 @@
         app:layout_constraintHorizontal_bias="0.383"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        app:layout_constraintVertical_bias="0.67" />
+        app:layout_constraintVertical_bias="0.574" />
 
     <TextView
         android:id="@+id/color"
@@ -163,24 +163,46 @@
         android:text="color"
         app:layout_constraintBottom_toTopOf="@+id/addproduct"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.218"
+        app:layout_constraintHorizontal_bias="0.203"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/sizespinner"
-        app:layout_constraintVertical_bias="0.294" />
+        app:layout_constraintVertical_bias="0.108" />
+
 
     <EditText
         android:id="@+id/colortext"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
         android:hint="color"
+        android:inputType="textPersonName"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.383"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/sizespinner"
-        app:layout_constraintVertical_bias="0.281" />
+        app:layout_constraintVertical_bias="0.157" />
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottomNavigationView"
+        android:layout_width="match_parent"
+        android:layout_height="75dp"
+        android:layout_alignParentBottom="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:menu="@menu/bottom_nav_menu"
+        tools:ignore="MissingConstraints" />
+
+    <Button
+        android:id="@+id/upload"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="upload image"
+        app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
+        app:layout_constraintEnd_toStartOf="@+id/addproduct"
+        app:layout_constraintHorizontal_bias="0.514"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/colortext"
+        app:layout_constraintVertical_bias="0.342" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_product_view.xml b/app/src/main/res/layout/activity_product_view.xml
index 7a42762..73f932e 100644
--- a/app/src/main/res/layout/activity_product_view.xml
+++ b/app/src/main/res/layout/activity_product_view.xml
@@ -183,4 +183,7 @@
                 android:text="Some text" />
         </RelativeLayout>
     </androidx.core.widget.NestedScrollView>
+
+
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 4286d52..c850f1a 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -15,7 +15,14 @@
         android:background="@color/graylight"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" >
+       <ImageView
+            android:id="@+id/logout"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+           android:layout_gravity="end"
+            android:src="@drawable/ic_baseline_exit_to_app_24"/>
+    </Toolbar>
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -27,6 +34,14 @@
             android:background="@color/lapis_lazuli"
             android:orientation="vertical">
 
+<!--            <ImageView-->
+<!--                android:id="@+id/logout"-->
+<!--                android:layout_marginTop="10dp"-->
+<!--                android:layout_marginLeft="360dp"-->
+<!--                android:layout_width="36dp"-->
+<!--                android:layout_height="36dp"-->
+<!--                android:src="@drawable/ic_baseline_exit_to_app_24"/>-->
+
             <ImageView
                 android:layout_width="150dp"
                 android:layout_height="150dp"
diff --git a/app/src/main/res/layout/card_layout.xml b/app/src/main/res/layout/card_layout.xml
index a6861d2..38f5749 100644
--- a/app/src/main/res/layout/card_layout.xml
+++ b/app/src/main/res/layout/card_layout.xml
@@ -21,7 +21,6 @@
 
         <ImageView
             android:id="@+id/idIVCourseImage"
-            android:scaleType="fitXY"
             android:layout_width="165dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -30,6 +29,7 @@
             android:layout_marginBottom="10dp"
             android:contentDescription="@string/app_name"
             android:padding="5dp"
+            android:scaleType="fitXY"
             android:src="@drawable/ic_launcher_background" />