Skip to content

Commit

Permalink
Merge pull request #12 from singnet/master
Browse files Browse the repository at this point in the history
Pull from parent
  • Loading branch information
raamb authored Aug 18, 2019
2 parents 7c0f567 + 2cfe042 commit 2bc1e88
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 40 deletions.
8 changes: 3 additions & 5 deletions src/components/GetStarted/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ const GetStarted = ({ classes }) => {
<Grid container spacing={24} className={classes.GetStartedMainContaienr}>
<Grid item xs={12} sm={12} md={12} lg={12} className={classes.TopSection}>
<GetStartedDescription
title={"One Powerful AI Marketplace Solution"}
title={"One AI Marketplace For All"}
description={
"The AI Marketplace is a secure and distributed platform for using and building AI applications. This radically compresses time-to-deployment while also democratizing the use of AI throughout your organization."
"The SingularityNET AI Marketplace is a distributed platform created to democratize the use and development of AI applications. Built for you, powered by open collaboration."
}
/>
</Grid>
Expand All @@ -33,9 +33,7 @@ const GetStarted = ({ classes }) => {
<Grid item xs={12} sm={12} md={12} lg={12} className={classes.SignUpFree}>
<GetStartedDescription
title={"Get Started"}
description={
"We've made it fast and easy to experience the AI Marketplace. <br /> Start with our free account and start demoing our cateloge of AI services in matter of minutes."
}
description={"We’ve made the marketplace fast, secure, private and easy to use. Start with a free trial now!"}
button
btnType={"blue"}
btnText={"Sign up free"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import BulletPoint from "../../../common/BulletPoint";
import AlertBox, { alertTypes } from "../../../common/AlertBox";

const warningMessage = [
"Your wallet or any wallets you have used are always yours. We do not have any connection to your wallet and cannot help you recover wallet keys for you. ",
"Your remaining AGI tokens will remain in your wallet for you manage with your 3rd party wallet service.",
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. ermentum dictum placerat nec",
"Your wallet or any wallets you have used will remain in your possession. We do not have any access to your wallet and cannot help you recover wallet keys.",
"Any remaining AGI tokens on your SingularityNET account will remain yours. Your account balance is linked to your wallet and can thus be accessed directly via the third party wallet service you have been using.",
"All personal data associated with your account will be deleted from our records.",
];

const ConfirmDelete = ({ open, handleClose, handleSubmit, error }) => {
Expand All @@ -31,18 +31,18 @@ const ConfirmDelete = ({ open, handleClose, handleSubmit, error }) => {
<Card className={classes.card}>
<CardHeader
className={classes.CardHeader}
title="Delete User"
title="Deleting Your Account"
action={
<IconButton onClick={handleCancel}>
<CloseIcon />
</IconButton>
}
/>
<CardContent className={classes.CardContent}>
<h2>Are you sure?</h2>
<h2>We are sad to see you go</h2>
<p>
Deleting your account will go in affect immediately and you will not longer have access to your account
data.
You are about to delete your account forever. Are you sure that is what you want to do? Once you click on
DELETE MY ACCOUNT you will immediately loose access to all of your account data.
</p>
<div className={classes.BeforeYouGoContent}>
<h2>Before you go...</h2>
Expand Down
2 changes: 0 additions & 2 deletions src/components/common/UserProfileCard/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from "react";
import clsx from "clsx";
import { Link } from "react-router-dom";
import { withStyles } from "@material-ui/styles";
import Icon from "@material-ui/core/Icon";
import CloseIcon from "@material-ui/icons/Close";
Expand All @@ -13,7 +12,6 @@ const UserProfileCard = ({ classes, userName }) => {
<Icon className={clsx(classes.icon, "fas fa-user-circle")} />
<div>
<h4>{userName}</h4>
<Link to="/">change photo</Link>
</div>
<CloseIcon className={classes.closeIcon} />
</div>
Expand Down
34 changes: 10 additions & 24 deletions src/utility/constants/GetStarted.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ import DescriptionIcon from "@material-ui/icons/Description";
import PlayCircleFilledIcon from "@material-ui/icons/PlayCircleFilled";
import ThumbsUpDownIcon from "@material-ui/icons/ThumbsUpDown";
import SettingsIcon from "@material-ui/icons/Settings";
import MonetizationOnIcon from "@material-ui/icons/MonetizationOn";

import CheckCircleIcon from "@material-ui/icons/CheckCircle";

export const GetStartedCategoriesData = [
{
categoryIcon: SeacrhIcon,
categoryTitle: "Browsing AI Marketplace",
categoryTitle: "Browsing the marketplace",
categoryDescription:
"Exploring AI – Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
"Exploring AI - The SingularityNET AI Marketplace hosts a wide variety of AI services that range from Pneumonia Detection to Image Colorisation. You can view all of them by default as shown here but also search by name, organization and tags.",
categoryTabs: [
{ title: "List or Card views", media: { type: "gif", content: "" } },
{ title: "Change Filter options", media: { type: "gif", content: "content2" } },
Expand All @@ -23,9 +22,9 @@ export const GetStartedCategoriesData = [
},
{
categoryIcon: DescriptionIcon,
categoryTitle: "AI Profiles",
categoryTitle: "Choosing your AI",
categoryDescription:
"Exploring AI – Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
"AI Services - Each AI service on this platform is unique. Click on any service you would like to use to find out more about its required input, expected output, cost, usage, developer’s note and much more!",
categoryTabs: [
{ title: "About Details", media: { type: "video", content: "" } },
{ title: "Feature Label 2", media: { type: "gif", content: "content" } },
Expand All @@ -36,9 +35,9 @@ export const GetStartedCategoriesData = [
},
{
categoryIcon: PlayCircleFilledIcon,
categoryTitle: "Demo AI Services",
categoryTitle: "Rate, Review, Improve",
categoryDescription:
"Using your inputs – Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
"Feedback - Democratizing AI requires collaboration, and not just between developers. Ratings and reviews help developers improve their algorithms as well as the design of their AI service. It’s also an opportunity for new teams to be born. ",
categoryTabs: [
{ title: "Accessing the Demo", media: { type: "img", content: "" } },
{ title: "Change Filter options", media: { type: "gif", content: "content" } },
Expand All @@ -49,9 +48,9 @@ export const GetStartedCategoriesData = [
},
{
categoryIcon: ThumbsUpDownIcon,
categoryTitle: "Rate & Review",
categoryTitle: "Using AGI",
categoryDescription:
"Exploring AI – Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
"Own your funds - Whether you want to use services, delete your account or use your funds outside of the platform, you are the sole controller of your funds. Your wallet, your cryptographic key, your AGI. ",
categoryTabs: [
{ title: "About Details", media: { type: "video", content: "content" } },
{ title: "Tutorials", media: { type: "gif", content: "content" } },
Expand All @@ -62,9 +61,9 @@ export const GetStartedCategoriesData = [
},
{
categoryIcon: SettingsIcon,
categoryTitle: "Install & Run AI Services",
categoryTitle: "Make it your AI",
categoryDescription:
"Using your inputs – Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
"Install & run it - It has never been easier to find and integrate AI algorithms. You can now seamlessly integrate a service to your website, app or other product via the SingularityNET SDK. ",
categoryTabs: [
{ title: "Accessing the Demo", media: { type: "video", content: "content" } },
{ title: "Change Filter options", media: { type: "gif", content: "content" } },
Expand All @@ -73,19 +72,6 @@ export const GetStartedCategoriesData = [
{ title: "Feature Label 5", media: { type: "gif", content: "content" } },
],
},
{
categoryIcon: MonetizationOnIcon,
categoryTitle: "Use Credits or AGI tokens",
categoryDescription:
"Exploring AI – Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
categoryTabs: [
{ title: "Managing your credits", media: { type: "video", content: "content" } },
{ title: "Wallet Support", media: { type: "gif", content: "content" } },
{ title: "Reviews", media: { type: "gif", content: "content" } },
{ title: "Feature Label 4", media: { type: "gif", content: "content" } },
{ title: "Feature Label 5", media: { type: "gif", content: "content" } },
],
},
];

export const GetStartedFeaturesData = [
Expand Down
4 changes: 2 additions & 2 deletions src/utility/constants/LoaderContent.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export const LoaderContent = {
DELETE_USER: {
loaderHeader: "Deleting User profile",
loaderText: "User profile will be deleted completely and all the records will be removed",
loaderHeader: "Deleting your Account",
loaderText: "Your user profile will be deleted",
},
FORGOT_PASSWORD: {
loaderHeader: "Forgot Password",
Expand Down

0 comments on commit 2bc1e88

Please sign in to comment.