gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert: release rdbms to production (#45347)

Browse Source
This commit is contained in:
Tom
2022-03-04 08:15:20 -06:00
committed by GitHub
parent 84c305ab08
commit e24c8abc7f
28 changed files with 115 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/client-only-routes/show-settings.tsx
View File

@@ -27,7 +27,7 @@ import {
import { User } from '../redux/prop-types';
import { submitNewAbout, updateUserFlag, verifyCert } from '../redux/settings';
const { apiLocation } = envData;
const { apiLocation, deploymentEnv } = envData;
// TODO: update types for actions
interface ShowSettingsProps {
@@ -202,8 +202,8 @@ export function ShowSettings(props: ShowSettingsProps): JSX.Element {
username={username}
verifyCert={verifyCert}
/>
<Spacer />
<WebhookToken />
{deploymentEnv == 'staging' && <Spacer />}
{deploymentEnv == 'staging' && <WebhookToken />}
<Spacer />
<DangerZone />
</main>

7
client/src/components/settings/webhook-token.tsx
View File

@@ -74,7 +74,7 @@ class WebhookToken extends Component<WebhookTokenProps, WebhookTokenState> {
return isChallengePage ? (
<>
{!webhookToken && (
<div className='alert alert-info' data-cy='webhook-challenge-page'>
<div className='alert alert-info'>
<p>{t('webhook-token.create-p1')}</p>
<Spacer />
<Button
@@ -89,10 +89,7 @@ class WebhookToken extends Component<WebhookTokenProps, WebhookTokenState> {
)}
</>
) : (
<div
className='webhook-token text-center'
data-cy='webhook-settings-page'
>
<div className='webhook-token text-center'>
<FullWidthRow>
<Panel className='webhook-panel'>
<Panel.Heading>{t('webhook-token.title')}</Panel.Heading>

85
client/src/resources/cert-and-project-map.ts
View File

@@ -1,7 +1,7 @@
import { SuperBlocks } from '../../../config/certification-settings';
import envData from '../../../config/env.json';
const { showNewCurriculum, showUpcomingChanges } = envData;
const { deploymentEnv, showNewCurriculum, showUpcomingChanges } = envData;
const responsiveWebBase =
'/learn/responsive-web-design/responsive-web-design-projects';
@@ -455,6 +455,44 @@ const certMap = [
}
]
},
{
id: '606243f50267e718b1e755f4',
title: 'Relational Database',
certSlug: 'relational-database-v8',
flag: 'isRelationalDatabaseCertV8',
projects: [
{
id: '5f1a4ef5d5d6b5ab580fc6ae',
title: 'Celestial Bodies Database',
link: `${relationalDatabaseBase}/build-a-celestial-bodies-database-project/build-a-celestial-bodies-database`,
certSlug: 'relational-database-v8'
},
{
id: '5f9771307d4d22b9d2b75a94',
title: 'World Cup Database',
link: `${relationalDatabaseBase}/build-a-world-cup-database-project/build-a-world-cup-database`,
certSlug: 'relational-database-v8'
},
{
id: '5f87ac112ae598023a42df1a',
title: 'Salon Appointment Scheduler',
link: `${relationalDatabaseBase}/build-a-salon-appointment-scheduler-project/build-a-salon-appointment-scheduler`,
certSlug: 'relational-database-v8'
},
{
id: '602d9ff222201c65d2a019f2',
title: 'Periodic Table Database',
link: `${relationalDatabaseBase}/build-a-periodic-table-database-project/build-a-periodic-table-database`,
certSlug: 'relational-database-v8'
},
{
id: '602da04c22201c65d2a019f4',
title: 'Number Guessing Game',
link: `${relationalDatabaseBase}/build-a-number-guessing-game-project/build-a-number-guessing-game`,
certSlug: 'relational-database-v8'
}
]
},
{
id: '561add10cb82ac38a17523bc',
title: 'Back End Development and APIs',
@@ -683,44 +721,6 @@ const certMap = [
certSlug: 'machine-learning-with-python-v7'
}
]
},
{
id: '606243f50267e718b1e755f4',
title: 'Relational Database',
certSlug: 'relational-database-v8',
flag: 'isRelationalDatabaseCertV8',
projects: [
{
id: '5f1a4ef5d5d6b5ab580fc6ae',
title: 'Celestial Bodies Database',
link: `${relationalDatabaseBase}/build-a-celestial-bodies-database-project/build-a-celestial-bodies-database`,
certSlug: 'relational-database-v8'
},
{
id: '5f9771307d4d22b9d2b75a94',
title: 'World Cup Database',
link: `${relationalDatabaseBase}/build-a-world-cup-database-project/build-a-world-cup-database`,
certSlug: 'relational-database-v8'
},
{
id: '5f87ac112ae598023a42df1a',
title: 'Salon Appointment Scheduler',
link: `${relationalDatabaseBase}/build-a-salon-appointment-scheduler-project/build-a-salon-appointment-scheduler`,
certSlug: 'relational-database-v8'
},
{
id: '602d9ff222201c65d2a019f2',
title: 'Periodic Table Database',
link: `${relationalDatabaseBase}/build-a-periodic-table-database-project/build-a-periodic-table-database`,
certSlug: 'relational-database-v8'
},
{
id: '602da04c22201c65d2a019f4',
title: 'Number Guessing Game',
link: `${relationalDatabaseBase}/build-a-number-guessing-game-project/build-a-number-guessing-game`,
certSlug: 'relational-database-v8'
}
]
}
] as const;
@@ -745,7 +745,12 @@ certMap.forEach(cert => {
if (cert.title !== 'Legacy Full Stack') {
if (cert.title.startsWith('Legacy')) {
legacyProjectMap[cert.title] = cert.projects;
} else {
} else if (
cert.title.startsWith('Relational') &&
deploymentEnv == 'staging'
) {
projectMap[cert.title] = cert.projects;
} else if (!cert.title.startsWith('Relational')) {
projectMap[cert.title] = cert.projects;
}
}

2
client/src/templates/Challenges/codeally/show.tsx
View File

@@ -257,7 +257,7 @@ class ShowCodeAlly extends Component<ShowCodeAllyProps, ShowCodeAllyState> {
<div className='ca-description'>
<Trans i18nKey='learn.github-required'>
<a
href='https://github.com/join'
href='https://github.com'
rel='noopener noreferrer'
target='_blank'
title={t('learn.github-link')}

9
client/src/templates/Challenges/projects/solution-form.tsx
View File

@@ -6,8 +6,7 @@ import {
backend,
backEndProject,
frontEndProject,
pythonProject,
codeAllyCert
pythonProject
} from '../../../../utils/challenge-types';
import { Form, ValidatedValues } from '../../../components/formHelpers';
@@ -102,12 +101,6 @@ export class SolutionForm extends Component<FormProps> {
: 'https://replit.com/@camperbot/hello');
break;
case codeAllyCert:
formFields = solutionField;
options.isEditorLinkAllowed = true;
solutionLink = solutionLink + 'https://your-git-repo.url/files';
break;
default:
formFields = solutionField;
solutionLink =