diff --git a/common/constants.js b/common/constants.js index 1ee50e52..8fc1cb4e 100644 --- a/common/constants.js +++ b/common/constants.js @@ -14,7 +14,7 @@ export const sizes = { export const system = { white: "#ffffff", - foreground: "#f7f7f7", + foreground: "#f8f8f8", gray: "#e0e0e0", border: "#d8d8d8", darkGray: "#b2b2b2", diff --git a/common/messages.js b/common/messages.js index 57a23ead..0581624f 100644 --- a/common/messages.js +++ b/common/messages.js @@ -1,9 +1,15 @@ export const error = { //Slate Create + SERVER_FIND_USER_CREATE_SLATE: "There seems to be an issue with your account", + SERVER_FIND_USER_CREATE_SLATE_USER_NOT_FOUND: "Login to create a Slate!", + SERVER_EXISTING_SLATE: + "A Slate with that name already exists. Please try another", + SERVER_CREATE_SLATE: "There was an error when creating the Slate", FIND_USER_CREATE_SLATE: "There seems to be an issue with your account", FIND_USER_CREATE_SLATE_USER_NOT_FOUND: "Login to create a Slate!", EXISTING_SLATE: "A Slate with that name already exists. Please try another", CREATE_SLATE: "There was an error when creating the Slate", + SERVER_SLATE_LIMIT: "You've reached the limit for number of slates!", //Slate Add URL ADD_TO_SLATE_USER_NOT_FOUND: "Login to add a Slate URL", @@ -16,6 +22,13 @@ export const error = { "Sorry, there was an error while trying to delete that slate. Please try again", DELETE_SLATES_FOR_USER_ID: "Sorry, we're having trouble deleting all your slates. Please try again later", + SERVER_DELETE_SLATE: + "We're having trouble deleting that at the moment. Please try again later", + SERVER_DELETE_SLATE_USER_NOT_FOUND: "Login to manage your slates!", + SERVER_DELETE_SLATE_SLATE_NOT_FOUND: + "We're having trouble deleting that at the moment. Please try again later", + SERVER_DELETE_SLATE: + "We're having trouble deleting that at the moment. Please try again later", //Slate Get GET_SLATE_BY_ID: @@ -24,14 +37,63 @@ export const error = { "We're having trouble retrieving information on that slate right now. Please try again later", GET_SLATES_BY_USER_ID: "We're having trouble retrieving that user's information. Please try again later", + SLATE_NOT_FOUND: + "We're having trouble retrieving that user's slates right now. Please try again", + SLATE_OWNER_NOT_FOUND: + "We're having trouble retrieving that slate's owner right now. Please try again", + SERVER_GET_SLATE_USER_NOT_FOUND: + "We're having trouble retrieving that slate's owner right now. Please try again", + SERVER_GET_SLATE: + "We're having trouble retrieving information on that slate right now. Please try again later", + SERVER_GET_SLATE_NOT_FOUND: + "We're having trouble retrieving information on that slate right now. Please try again later", //Slate Update UPDATE_SLATE_BY_ID: "We ran into an issue while saving your slate. Please try again", + SERVER_ADD_TO_SLATE_USER_NOT_FOUND: "Login to upload files!", + SERVER_FIND_USER_UPDATE_SLATE_USER_NOT_FOUND: "Login to upload files!", + SERVER_ADD_TO_SLATE_SLATE_NOT_FOUND: + "We ran into issues while uploading that file. Please try again", + SERVER_ADD_TO_SLATE_ERROR: + "We ran into issues while uploading that file. Please try again", + SERVER_FIND_USER_UPDATE_SLATE: + "We ran into issues while uploading that file. Please try again", + SERVER_UPDATE_SLATE_NOT_FOUND: + "We ran into issues while locating that slate. Please try again", + SERVER_UPDATE_SLATE_MUST_PROVIDE_DATA: + "The input cannot be blank. Please check your input", + SERVER_UPDATE_SLATE_MUST_PROVIDE_NAME: "Please provide a slate name", + SERVER_UPDATE_SLATE: + "We're having trouble updating that slate right now. Please try again later", + V1_SERVER_UPLOAD_SLATE_NOT_FOUND: + "We're having trouble locating that slate right now. Please try again later", + V1_SERVER_API_KEY_NOT_FOUND: + "We can't seem to find your API key right now. Please try again later", + V1_SERVER_API_UPLOAD_ERROR: + "We're having trouble uploading that right now. Please try again later", + V1_SERVER_UPLOAD_SLATE_NOT_FOUND: + "We're having trouble locating that slate right now", + V1_SERVER_UPLOAD_TO_SLATE_ERROR: + "We're ran into issues while adding that to the slate. Please try again", + V1_GET_SLATE_NOT_FOUND: + "We're having trouble locating that slate right now. Please try again later", + V1_GET_SLATE_USER_NOT_FOUND: + "We're having trouble locating the owner of that slate right now. Please try again later", + V1_GET_SLATE_SLATE_NOT_FOUND: + "We're having trouble locating that slate right now. Please try again later", + V1_GET_SLATES_NOT_FOUND: + "We're having trouble locating those slates right now. Please try again later", //Address Send - SEND_FILECOIN: "That user doesn't seem to exist. Please try another", + SERVER_SEND_FILECOIN_USER_NOT_FOUND: "Sorry, we couldn't find that user!", + SERVER_SEND_FILECOIN_NO_ID: + "That user doesn't seem to exist. Please try another", + SERVER_SEND_FILECOIN_ACTION_FAILURE: + "There was an error sending the transaction. We're looking into it", SEND_FILECOIN_USER_NOT_FOUND: "Sorry, we couldn't find that user!", + SEND_FILECOIN: + "There was an error sending the transaction. We're looking into it", SEND_FILECOIN_ACTION_FAILURE: "There was an error sending the transaction. We're looking into it", @@ -45,30 +107,70 @@ export const error = { UPLOAD_NOT_IMAGE_TYPE: "We are only accepting JPG and PNG files at this time. Try uploading a different file type!", BUCKETS_PUSH_ISSUE: "There was an error uploading the data", + SERVER_UPLOAD_ERROR: "We're having issues uploading that file right now", + SERVER_API_KEY_MISSING: + "We can't seem to find your API key right now. Please try again later", //Data CID Status NO_CIDS_TO_CHECK: "There are no CIDs to check", + //Data Get + SERVER_GET_BUCKET_DATA: + "We ran into an issue fetching that data. Please try again later", + + //Data Remove + SERVER_REMOVE_DATA_NO_CID: "We could not locate a file that matches that CID", + SERVER_REMOVE_DATA_NOT_ALLOWED: "You aren't authorized to remove that file", + SERVER_REMOVE_DATA_NO_LINK: + "We couldn't remove that data. Please try again later", + //Data Storage Deals + SERVER_STORAGE_DEAL_USER_NOT_FOUND: "Sorry, we couldn't find that user!", + SERVER_NO_CID: "IPFS CID is required", + SERVER_NO_IPFS: "There was a issue retriving data from IPFS", + SERVER_FILECOIN_STORAGE_DEAL_CID_ERROR: + "There was a issue making a storage deal", + SERVER_NO_JOB: "Sorry, this job doesn't exist!", STORAGE_DEAL_USER_NOT_FOUND: "Sorry, we couldn't find that user!", NO_CID: "IPFS CID is required", NO_IPFS: "There was a issue retriving data from IPFS", FILECOIN_STORAGE_DEAL_CID_ERROR: "There was a issue making a storage deal", NO_JOB: "Sorry, this job doesn't exist!", + //Archive Deal + SERVER_REMOVE_DATA_NOT_ALLOWED: "You aren't authorized to archive that deal", + SERVER_BUCKET_ARCHIVE_DEAL_USER_NOT_FOUND: + "Please login first to archive a deal!", + + //CID Status + SERVER_NO_CIDS_TO_CHECK: "No CIDs were entered, please check your input", + //Users Create + SERVER_EXISTING_USER_ALREADY: + "This username is already taken! Please try another one", EXISTING_USER_ALREADY: "This username is already taken! Please try another one", INVALID_USERNAME: "Invalid username. Please include only letters and numbers", + SERVER_INVALID_USERNAME: + "Invalid username. Please include only letters and numbers", INVALID_PASSWORD: "Password length must be more than 8 characters", - USER_CREATE_USER_NOT_FOUND: "Sorry, we couldn't find that user!", + SERVER_INVALID_PASSWORD: "Password length must be more than 8 characters", + USER_CREATE_USER_NOT_FOUND: + "Sorry we weren't able to create your account. Please try again", + SERVER_USER_CREATE_USER_NOT_FOUND: + "Sorry we weren't able to create your account. Please try again", CREATE_USER: "Sorry we weren't able to create your account. Please try again", //Users Delete USER_DELETE: "That user doesn't seem to exist. Please try another", + SERVER_USER_DELETE: "That user doesn't seem to exist. Please try another", USER_DELETE_USER_NOT_FOUND: "Sorry, we couldn't find that user!", + SERVER_USER_DELETE_USER_NOT_FOUND: "Sorry, we couldn't find that user!", DELETE_USER_BY_USERNAME: "We're having trouble deleting your account right now", + SERVER_USER_DELETE: "We're having trouble deleting your account right now", + USER_NOT_FOUND: "We weren't able to locate that user", + SLATES_NOT_FOUND: "We weren't able to locate the slates for that user", //Users Update USER_UPDATE: "That user doesn't seem to exist. Please try another", @@ -76,20 +178,31 @@ export const error = { UPDATE_USER_BY_ID: "We ran into an issue while updating your information. Please try again", USER_UPDATE_SETTINGS_CONFIG: "Error when updating user settings", + SERVER_USER_UPDATE: "Please make sure you are signed in first", + SERVER_USER_UPDATE_USER_NOT_FOUND: + "We're having trouble locating your information. Please try again", //Users Get GET_USER_BY_ID: "We weren't able to fetch information on that user. Please try again later", GET_USER_BY_USERNAME: - "We weren't able to fetch information on that user. Please try again later", + "We weren't able to fetch information on that user. Please check your input", + USER_NOT_FOUND: + "We aren't able to locate that user at the moment. Please try again", //Hydrate - HYDRATE_FAILURE: "That user doesn't seem to exist. Please try another", + HYDRATE_FAILURE: "Please make sure you're logged in", + SERVER_HYDRATE_FAILURE: "Please make sure you're logged in", + SERVER_VIEWER_DATA_ERROR: + "We're havign trouble fetching your information right now. Please try again", //Sign-in SIGN_IN: "Your username/password can't be blank", + SERVER_SIGN_IN: "Your username/password can't be blank", SIGN_IN_USER_NOT_FOUND: "Sorry, that user doesn't exist!", + SERVER_SIGN_IN_USER_NOT_FOUND: "Sorry, that user doesn't exist!", SIGN_IN_AUTH: "Incorrect password", + SERVER_SIGN_IN_AUTH: "Incorrect password", //Activity CREATE_ACTIVITY: @@ -102,11 +215,33 @@ export const error = { GET_ACTIVITY_FOR_USER_ID: "We weren't able to fetch that user's information. Please try again", - //Subscription + //Subscription Create CREATE_SUBSCRIPTION: "We weren't able to subscribe you. Please try again later", + SERVER_SUBSCRIBE: "Please login to subscribe", + SERVER_SUBSCRIBE_USER_NOT_FOUND: + "We're having trouble fetching your information. Please try again later", + SERVER_SUBSCRIBE_MUST_PROVIDE_SLATE_OR_USER: + "No user or slate was provided. Please check your input", + SERVER_SUBSCRIBE_CAN_NOT_SUBSCRIBE_TO_YOURSELF: + "You cannot subscribe to yourself", + SERVER_SUBSCRIBE_TARGET_USER_NOT_FOUND: "That user could not be found", + SERVER_SUBSCRIBE_TARGET_SLATE_NOT_FOUND: "That slate could not be found", + SERVER_SUBSCRIBE_SUBSCRIPTION_CHECK_ERROR: + "We weren't able to subscribe you. Please try again later", + SERVER_UNSUBSCRIBE_NOT_FOUND: + "We weren't able to unsubscribe you. Please try again", + SERVER_UNSUBSCRIBE_ERROR: + "We weren't able to unsubscribe you. Please try again", + SERVER_SUBSCRIBE_NOT_FOUND: + "We weren't able to subscribe you. Please try again", + SERVER_SUBSCRIBE_ERROR: "We weren't able to subscribe you. Please try again", + + //Subscription Delete DELETE_SUBSCRIPTION_BY_ID: "We weren't able to unsubscribe you. Please try again later", + + //Subscription Get GET_SUBSCRIBERS_BY_USER_ID: "We weren't able to retrieve that information. Please try again later", GET_SUBSCRIPTION_BY_ID: @@ -118,30 +253,100 @@ export const error = { GET_SUBSCRIPTIONS_TO_USER_ID: "We weren't able to retrieve that information. Please try again later", - //Trusted + //Trusted Create CREATE_TRUSTED_RELATIONSHIP: "We weren't able to add this user as trusted. Please try again later", + SERVER_TRUST: "Please make sure you are logged in", + SERVER_TRUSTED_RELATIONSHIP_USER_NOT_FOUND: + "We are having trouble retrieving your information right now", + SERVER_TRUSTED_RELATIONSHIP_MUST_PROVIDE_SOMEONE_TO_TRUST: + "No user was specified", + SERVER_TRUSTED_RELATIONSHIP_CAN_NOT_TRUST_YOURSELF: + "You cannot add yourself as trusted", + SERVER_TRUSTED_RELATIONSHIP_TARGET_USER_NOT_FOUND: + "We could not locate that user. Please try again later", + SERVER_TRUSTED_RELATIONSHIP_CHECK_ERROR: + "We're having trouble adding this person as your trusted right now", + SERVER_TRUSTED_RELATIONSHIP_INVERTED_CHECK_ERROR: + "You have already received a trust request from this person. Please accept it instead", + SERVER_DELETE_TRUSTED_RELATIONSHIP_NOT_FOUND: + "There is no trust relationshp to delete", + SERVER_DELETE_TRUSTED_RELATIONSHIP_ERROR: + "We're having trouble deleting this trust relationship right now", + SERVER_TRUSTED_RELATIONSHIP_NOT_FOUND: + "We're having trouble creating this trust relationship right now", + SERVER_TRUSTED_RELATIONSHIP_ERROR: + "We're having trouble creating this trust relationship right now", + + //Trusted Delete DELETE_TRUSTED_RELATIONSHIP_BY_ID: "We weren't able to remove this user from your trusted. Please try again later", + SERVER_TRUST_DELETE: "Please login to manage your trusted", + SERVER_TRUST_DELETE_USER_NOT_FOUND: + "We weren't able to locate this user. Please try again later", + SERVER_TRUST_DELETE_MUST_PROVIDE_ID: "Please check your input", + + //Trusted Get GET_TRUSTED_RELATIONSHIP_BY_ID: "We're having trouble retrieving that information right now. Please try again later", GET_TRUSTED_RELATIONSHIP_BY_IDS: "We're having trouble retrieving that information right now. Please try again later", GET_TRUSTED_RELATIONSHIPS_BY_USER_ID: "We're having trouble retrieving that information right now. Please try again later", + + //Trusted Update UPDATE_TRUSTED_RELATIONSHIP_BY_ID: "We ran into an issue while updating that information. Please try again later", + SERVER_TRUST_UPDATE: "Please login to mange your trusted", + SERVER_TRUST_UPDATE_USER_NOT_FOUND: + "We weren't able to locate your information. Please try again later", + SERVER_TRUST_UPDATE_MUST_PROVIDE_SOMEONE_TO_TRUST: + "Please check your input. No user was provided", + SERVER_TRUST_UPDATE_CAN_NOT_TRUST_YOURSELF: + "You cannot add yourself as a trusted peer", + SERVER_TRUST_UPDATE_TARGET_USER_NOT_FOUND: + "We weren't able to locate that user. Please try again later", + SERVER_TRUST_UPDATE_CHECK_ERROR: + "This person is already among your trusted peers", - //API + //API Key Create CREATE_API_KEY_FOR_USER_ID: "We're having trouble creating your API keys right now. Please try again", + SERVER_GENERATE_API_KEY_AUTH: "You aren't authorized to create that API key", + SERVER_GENERATE_API_KEY_USER_NOT_FOUND: + "We ran into issues finding your information while trying to generate that API key", + SERVER_GENERATE_API_KEY_TOO_MANY_KEYS: + "You have reached the limit for number of API keys", + SERVER_GENERATE_API_KEY_ERROR: + "We ran into issues while trying to generate that API key", + + //API Key Delete DELETE_API_KEY_BY_ID: "We're having trouble deleting that API key right now. Please try again later", DELETE_API_KEYS_FOR_USER_ID: "We're having trouble deleting your API keys right now. Please try again later", + SERVER_DELETE_API_KEY_AUTH: "You aren't authorized to delete that API key", + SERVER_DELETE_API_KEY_USER_NOT_FOUND: + "No matching API key was found for that user", + SERVER_DELETE_API_KEY_NOT_FOUND: + "No matching API key was found for that user", + SERVER_DELETE_API_KEY_ERROR: + "We ran into an issue while trying to delete that API key. Please try again", + + //API Key Get GET_API_KEY_BY_KEY: "We weren't able to fetch that API key. Please try again later", GET_API_KEY: "We weren't able to fetch that API key. Please try again later", GET_API_KEYS_BY_USER_ID: "We're having trouble retrieving your API keys right now. Please try again", + + //Query + SERVER_DEEPLINK: + "We ran into issues while trying to retrieve that information. Please try again", + SERVER_DEEPLINK_ERROR: + "We ran into issues while trying to retrieve that information. Please try again", + SERVER_SEARCH_NO_QUERY: + "No query was entered. Please enter a query and try again", + + //Add url }; diff --git a/components/core/Alert.js b/components/core/Alert.js index 2d089d08..47e4374c 100644 --- a/components/core/Alert.js +++ b/components/core/Alert.js @@ -32,13 +32,11 @@ export class Alert extends React.Component { componentDidMount = () => { window.addEventListener("create-alert", this._handleCreate); - window.addEventListener("delete-alert", this._handleDelete); window.addEventListener("click", this._handleDelete); }; componentWillUnmount = () => { window.removeEventListener("create-alert", this._handleCreate); - window.removeEventListener("delete-alert", this._handleDelete); window.removeEventListener("click", this._handleDelete); }; @@ -67,8 +65,10 @@ export class Alert extends React.Component { > {this.state.alert.message ? this.state.alert.message - : error[this.state.alert.decorator] || - "Whoops something went wrong! Please try again."} + : this.state.alert.decorator + ? error[this.state.alert.decorator] || + "Whoops something went wrong! Please try again." + : "Whoops something went wrong! Please try again."} ); } diff --git a/pages/api/addresses/send.js b/pages/api/addresses/send.js index cecc0ad9..f9b66d82 100644 --- a/pages/api/addresses/send.js +++ b/pages/api/addresses/send.js @@ -7,7 +7,7 @@ export default async (req, res) => { if (!id) { return res .status(500) - .send({ decorator: "SERVER_SEND_FILECOIN", error: true }); + .send({ decorator: "SERVER_SEND_FILECOIN_NO_ID", error: true }); } const user = await Data.getUserById({ diff --git a/pages/api/users/delete.js b/pages/api/users/delete.js index e8c919cf..aa7b1471 100644 --- a/pages/api/users/delete.js +++ b/pages/api/users/delete.js @@ -56,7 +56,7 @@ export default async (req, res) => { if (!deleted) { return res - .status(200) + .status(500) .send({ decorator: "SERVER_USER_DELETE", error: true }); }