diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml new file mode 100644 index 00000000..b67190cb --- /dev/null +++ b/.github/workflows/pr-preview.yml @@ -0,0 +1,24 @@ +name: Generate Preview + +on: + issue_comment: + types: [created] + +jobs: + deploy_preview: + name: Deploy Preview of PR + runs-on: ubuntu-latest + steps: + - uses: actions/setup-node@v1 + - uses: actions/checkout@v2 + - run: npm install yaml -s + - run: echo "::set-env name=worker::$( node ./scripts/deploy-preview/verify.js ${{ github.event.comment.user.login }} "${{ github.event.comment.body }}" )" + - if: env.worker == 'true' + run: | + git fetch origin +refs/pull/${{ github.event.issue.number }}/merge + git checkout FETCH_HEAD + npm install -s + CI=false npm run build + mv ./build/index.html ./build/200.html + npm install randomstring surge @actions/github -s + node ./scripts/deploy-preview/deploy.js ${{ github.event.issue.number }} ${{ secrets.SURGE_TOKEN }} ${{ secrets.GITHUB_TOKEN }} ${{ github.event.comment.user.login }} diff --git a/public/images/about/avatar-bertha.png b/public/images/about/avatar-bertha.png deleted file mode 100644 index d97d53a5..00000000 Binary files a/public/images/about/avatar-bertha.png and /dev/null differ diff --git a/public/images/about/avatar-eugene.png b/public/images/about/avatar-eugene.png deleted file mode 100644 index 2fbebc44..00000000 Binary files a/public/images/about/avatar-eugene.png and /dev/null differ diff --git a/public/images/about/avatar-george.png b/public/images/about/avatar-george.png deleted file mode 100644 index f48749b9..00000000 Binary files a/public/images/about/avatar-george.png and /dev/null differ diff --git a/public/images/about/avatar-grant.png b/public/images/about/avatar-grant.png deleted file mode 100644 index c1455ac2..00000000 Binary files a/public/images/about/avatar-grant.png and /dev/null differ diff --git a/public/images/about/avatar-lauren.png b/public/images/about/avatar-lauren.png deleted file mode 100644 index 77eb23b3..00000000 Binary files a/public/images/about/avatar-lauren.png and /dev/null differ diff --git a/public/images/about/avatar-melanie.png b/public/images/about/avatar-melanie.png deleted file mode 100644 index 8e637eb9..00000000 Binary files a/public/images/about/avatar-melanie.png and /dev/null differ diff --git a/public/images/about/avatar-nelson.png b/public/images/about/avatar-nelson.png deleted file mode 100644 index 8e8f6102..00000000 Binary files a/public/images/about/avatar-nelson.png and /dev/null differ diff --git a/public/images/about/avatar-robert.png b/public/images/about/avatar-robert.png deleted file mode 100644 index cd31248c..00000000 Binary files a/public/images/about/avatar-robert.png and /dev/null differ diff --git a/scripts/deploy-preview/deploy.js b/scripts/deploy-preview/deploy.js new file mode 100644 index 00000000..7dedb6a2 --- /dev/null +++ b/scripts/deploy-preview/deploy.js @@ -0,0 +1,24 @@ +// eslint-disable-next-line import/no-unresolved +const randomstring = require('randomstring'); +const childProcess = require('child_process'); +const botComment = require('./utils'); + +const [, , issuNumber, SURGE_TOKEN, GITHUB_TOKEN, USER] = process.argv; + +const gen = randomstring.generate({ + length: 6, + charset: 'alphabetic', + capitalization: 'lowercase', +}); + +const domain = `http://ignitus-preview-${gen}.surge.sh`; + +childProcess.exec(`./node_modules/.bin/surge ./build ${domain} --token ${SURGE_TOKEN}`, (err) => { + if (err) { + botComment(GITHUB_TOKEN, issuNumber, `Sorry @${USER}, Deploy Error 😶.`, () => { + process.exit(1); + }); + } else { + botComment(GITHUB_TOKEN, issuNumber, `Yey @${USER}\n\n Live Preview is ready: ${domain}\n 🚀`); + } +}); diff --git a/scripts/deploy-preview/utils.js b/scripts/deploy-preview/utils.js new file mode 100644 index 00000000..85a9ee79 --- /dev/null +++ b/scripts/deploy-preview/utils.js @@ -0,0 +1,13 @@ +// eslint-disable-next-line import/no-unresolved +const github = require('@actions/github'); + +const botComment = (token, issueNumber, body, cb = () => { }) => { + const octokit = new github.GitHub(token); + octokit.issues.createComment({ + ...github.context.repo, + issue_number: issueNumber, + body, + }).then(cb); +}; + +module.exports = botComment; diff --git a/scripts/deploy-preview/verify.js b/scripts/deploy-preview/verify.js new file mode 100644 index 00000000..eaf624d4 --- /dev/null +++ b/scripts/deploy-preview/verify.js @@ -0,0 +1,23 @@ +const fs = require('fs'); +// eslint-disable-next-line import/no-extraneous-dependencies +const YAML = require('yaml'); + +const [,, user, command] = process.argv; + +const autoAssign = fs.readFileSync('./.github/auto_assign.yml', 'utf8'); +const authorizedUsers = YAML.parse(autoAssign).reviewers; + +if (user && command) { + const commandFormat = command.split(' ').join('').trim().toLocaleLowerCase(); + if (commandFormat === 'bottestthis') { + const isAuthorized = authorizedUsers.findIndex( + assignedUser => assignedUser === user, + ); + if (isAuthorized === -1) process.stdout.write('false'); + else { + process.stdout.write('true'); + } + } else process.stdout.write('false'); +} else { + process.stdout.write('false'); +} diff --git a/src/ignitus-AboutPage/ignitus-About/Components/About.tsx b/src/ignitus-AboutPage/ignitus-About/Components/About.tsx deleted file mode 100644 index 11c99d58..00000000 --- a/src/ignitus-AboutPage/ignitus-About/Components/About.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React, {Fragment} from 'react'; -import Team from '../../ignitus-Team'; -import CoreTeam from '../../ignitus-CoreTeam'; -import * as t from '../constants'; -import * as S from '../Styles'; -import {Paragraph} from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; -import {withErrorBoundary} from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; - -const About: React.FunctionComponent = () => ( - - - - - - - - - About Us - - {t.IgnitusIntro.map((x: any) => ( - {x.title} - ))} - - - - - - - - -); - -export default withErrorBoundary(About); diff --git a/src/ignitus-AboutPage/ignitus-About/Components/index.ts b/src/ignitus-AboutPage/ignitus-About/Components/index.ts deleted file mode 100644 index 493d67ca..00000000 --- a/src/ignitus-AboutPage/ignitus-About/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as About } from './About'; diff --git a/src/ignitus-AboutPage/ignitus-About/Components/index.tsx b/src/ignitus-AboutPage/ignitus-About/Components/index.tsx new file mode 100644 index 00000000..cc8f678e --- /dev/null +++ b/src/ignitus-AboutPage/ignitus-About/Components/index.tsx @@ -0,0 +1,33 @@ +import React, { Fragment } from 'react'; +import { IgnitusIntroduction, AboutImage } from '../constants'; +import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; + +import { CoreTeam } from '../../ignitus-CoreTeam/Components'; +import Team from '../../ignitus-Team'; +import * as S from '../styles'; + +const About: React.FunctionComponent = withErrorBoundary(() => ( + + + + + + + + + About Us + + {IgnitusIntroduction.map((x: any) => ( + {x.title} + ))} + + + + + + + + +)); + +export {About as default}; diff --git a/src/ignitus-AboutPage/ignitus-About/Containers/aboutContainer.ts b/src/ignitus-AboutPage/ignitus-About/Containers/aboutContainer.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-AboutPage/ignitus-About/Containers/aboutContainer.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-AboutPage/ignitus-About/Containers/index.ts b/src/ignitus-AboutPage/ignitus-About/Containers/index.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-AboutPage/ignitus-About/Containers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-AboutPage/ignitus-About/actionTypes.ts b/src/ignitus-AboutPage/ignitus-About/actionTypes.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-AboutPage/ignitus-About/actionTypes.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-AboutPage/ignitus-About/actions.ts b/src/ignitus-AboutPage/ignitus-About/actions.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-AboutPage/ignitus-About/actions.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-AboutPage/ignitus-About/constants.ts b/src/ignitus-AboutPage/ignitus-About/constants.ts index 2f299417..3cc80395 100644 --- a/src/ignitus-AboutPage/ignitus-About/constants.ts +++ b/src/ignitus-AboutPage/ignitus-About/constants.ts @@ -1,15 +1,11 @@ -/* eslint-disable eol-last */ // eslint-disable-next-line import/prefer-default-export -export const aboutImg: string = 'https://storage.googleapis.com/ignitus_assets/ig-assets/about.png'; -interface IntroObj { - title: string, -} +import { IntroductionType } from "./types"; -export const IgnitusIntro: IntroObj[] = [ - { title: 'Ignitus (A Non-Profit Organization for the welfare of student community) that helps students and professionals get handpicked top- quality global research and industrial internships, for free! The students participate in projects and training programs supervised by our experts.' }, - { title: 'Our only goal is Skyrocketing a students career by providing best global opportunities. The platform has got exponential growth after successful internship completion by the associated students with researchers from SAIL (Stanford AI Lab) and Oxford University.' }, - { title: 'Ignitus is working with a non-profit (GirlsScript Foundation), Woo-Tech which is committed to bringing together multiple such initiatives for a grand scale open-source project development program for women. We are honored to have among us more than admirable leaders in the fight for equal opportunities for women at Woo-Tech and GirlScript India and Program Manager of Systers, LEAN IN INDIA , MIT Media Lab.' }, - { title: 'Ignitus scholar consists of 200+ applicants who have worked at Deep Learning Divison Mercedes-Benz, Harvard Innovation Labs, UC Berkeley etc. Ignitus is made with love from Students, Researchers of Stanford, MIT, Princeton, Georgia Tech, SUNY, Harvard, Oxford, UCB, UCLA, USC etc.' }, - { title: 'Team Ignitus boasts of a dedicated workforce from Boston, Miami, Pittsburgh, Madrid, Houston, Munich, Princeton, Los Angeles, Vancouver and different parts of India.' } +export const AboutImage: string = 'https://storage.googleapis.com/ignitus_assets/ig-assets/about.png'; +export const IgnitusIntroduction: IntroductionType[] = [ + { title: 'Ignitus a non-profit organization that helps students and professionals get handpicked top quality global research and industrial internships, for free!' }, + { title: 'Our only goal is skyrocketing a students career by providing best global opportunities. The platform has got exponential growth after successful internship completion by the associated students with researchers from SAIL (Stanford AI Lab) and Oxford University.' }, + { title: 'Ignitus scholar consists of 200+ applicants who have worked at Mercedes-Benz, Harvard Innovation Labs, UC Berkeley etc. Ignitus is made with love from students, researchers & alumni of Stanford University, Massachusetts Institute of Technology, Princeton University, Georgia Tech University, Harvard University, Oxford University, University of California, Berkeley etc. 🎓' }, + { title: 'Team Ignitus boasts of a dedicated workforce from Pittsburgh, Barcelona, Munich, Berkeley etc.' } ]; \ No newline at end of file diff --git a/src/ignitus-AboutPage/ignitus-About/index.ts b/src/ignitus-AboutPage/ignitus-About/index.ts deleted file mode 100644 index 7ac6dd9a..00000000 --- a/src/ignitus-AboutPage/ignitus-About/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import * as components from './Components'; - -export default { - components, -}; diff --git a/src/ignitus-AboutPage/ignitus-About/reducers.ts b/src/ignitus-AboutPage/ignitus-About/reducers.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-AboutPage/ignitus-About/reducers.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-AboutPage/ignitus-About/sagas.ts b/src/ignitus-AboutPage/ignitus-About/sagas.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-AboutPage/ignitus-About/sagas.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-AboutPage/ignitus-About/selectors.ts b/src/ignitus-AboutPage/ignitus-About/selectors.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-AboutPage/ignitus-About/selectors.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-AboutPage/ignitus-About/Styles/index.ts b/src/ignitus-AboutPage/ignitus-About/styles.ts similarity index 61% rename from src/ignitus-AboutPage/ignitus-About/Styles/index.ts rename to src/ignitus-AboutPage/ignitus-About/styles.ts index 239babec..8d8f3f0c 100644 --- a/src/ignitus-AboutPage/ignitus-About/Styles/index.ts +++ b/src/ignitus-AboutPage/ignitus-About/styles.ts @@ -1,7 +1,12 @@ import styled from '@emotion/styled'; -import * as F from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; -import { minimumWidthQuery } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; -import { Heading3 } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import * as F from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; +import {minimumWidthQuery} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; +import { + Heading3, + Paragraph as P, +} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { White } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; +import { flexibleColDiv } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms'; export const AboutSection = styled.section` font-weight: ${F.Normal}; @@ -52,12 +57,12 @@ export const Img = styled.img` padding: 3rem; `; -export const ContentContainer = styled.section` +export const ContentContainer = styled(flexibleColDiv)` flex: 1; - border-radius: 16px; - margin-top: 30px; - background-color: #fff; - padding: 1.5rem; + border-radius: 1rem; + margin-top: 2rem; + background-color: ${White}; + padding: 0 1.5rem; `; export const Title = styled(Heading3)` @@ -65,3 +70,7 @@ export const Title = styled(Heading3)` `; export const ParagraphContainer = styled.div``; + +export const Paragraph = styled(P)` + margin-bottom: 0.7rem; +`; diff --git a/src/ignitus-AboutPage/ignitus-About/types.ts b/src/ignitus-AboutPage/ignitus-About/types.ts new file mode 100644 index 00000000..7fa3ce18 --- /dev/null +++ b/src/ignitus-AboutPage/ignitus-About/types.ts @@ -0,0 +1,3 @@ +export type IntroductionType = { + title: string; +}; diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/Components/index.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/Components/index.ts deleted file mode 100644 index 317d1f58..00000000 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/Components/index.ts +++ /dev/null @@ -1,3 +0,0 @@ - -// eslint-disable-next-line import/prefer-default-export -export { default as CoreTeam } from './team'; diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/Components/team.tsx b/src/ignitus-AboutPage/ignitus-CoreTeam/Components/index.tsx similarity index 79% rename from src/ignitus-AboutPage/ignitus-CoreTeam/Components/team.tsx rename to src/ignitus-AboutPage/ignitus-CoreTeam/Components/index.tsx index f34129a8..50e54565 100644 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/Components/team.tsx +++ b/src/ignitus-AboutPage/ignitus-CoreTeam/Components/index.tsx @@ -1,20 +1,23 @@ /* eslint-disable class-methods-use-this */ /* eslint-disable jsx-a11y/mouse-events-have-key-events */ import React from 'react'; -import {Data} from '../constants'; -import {withErrorBoundary} from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; -import * as S from '../Styles'; -import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared'; -import {Team, TeamItemProps} from '../types'; -import {AppIcon} from '../../../ignitus-Shared/types/iconsTypes/iconEnums'; + +import { Data } from '../constants'; +import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; +import { Team, TeamItemProps } from '../types'; +import { AppIcon } from '../../../ignitus-Shared/types/iconsTypes/iconEnums'; import { Paragraph } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import * as S from '../styles'; +import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared'; + const PureCoreTeam = ({team}: any) => ( Our Team {team} ); + const TeamItem = ({ item: {title, img, description, linkedin, angellist}, }: TeamItemProps) => { @@ -41,11 +44,10 @@ const TeamItem = ({ ); }; -const CoreTeam = () => { +export const CoreTeam = withErrorBoundary(() => { const team = Data.map((item: Team) => { return ; }); return ; -}; +}); -export default withErrorBoundary(CoreTeam); diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/Containers/TeamContainer.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/Containers/TeamContainer.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/Containers/TeamContainer.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/Containers/index.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/Containers/index.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/Containers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/actionTypes.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/actionTypes.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/actionTypes.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/actions.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/actions.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/actions.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/index.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/index.ts deleted file mode 100644 index 7ac6dd9a..00000000 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import * as components from './Components'; - -export default { - components, -}; diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/reducers.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/reducers.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/reducers.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/sagas.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/sagas.ts deleted file mode 100644 index 091f55ca..00000000 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/sagas.ts +++ /dev/null @@ -1,2 +0,0 @@ -export default function* sagas():IterableIterator {}; - diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/selectors.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/selectors.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/selectors.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-AboutPage/ignitus-CoreTeam/Styles/index.ts b/src/ignitus-AboutPage/ignitus-CoreTeam/styles.ts similarity index 82% rename from src/ignitus-AboutPage/ignitus-CoreTeam/Styles/index.ts rename to src/ignitus-AboutPage/ignitus-CoreTeam/styles.ts index 9e8d3da6..ea2554cd 100644 --- a/src/ignitus-AboutPage/ignitus-CoreTeam/Styles/index.ts +++ b/src/ignitus-AboutPage/ignitus-CoreTeam/styles.ts @@ -1,10 +1,12 @@ /* eslint-disable import/prefer-default-export */ import styled from '@emotion/styled'; -import * as C from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; -import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared'; -import Icon from '../../../ignitus-Shared/ignitus-Utilities/Components/icon'; -import {minimumWidthQuery} from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; -import {Heading6} from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; + +import { minimumWidthQuery } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; +import { Heading6 } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; + +import * as C from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; +import * as T from '../../ignitus-Shared/ignitus-DesignSystem/shared'; +import Icon from '../../ignitus-Shared/ignitus-Utilities/Components/icon'; type LinkWrapperProps = { toggle: boolean; diff --git a/src/ignitus-AboutPage/ignitus-Team/Components/index.ts b/src/ignitus-AboutPage/ignitus-Team/Components/index.ts deleted file mode 100644 index 3370d80a..00000000 --- a/src/ignitus-AboutPage/ignitus-Team/Components/index.ts +++ /dev/null @@ -1,3 +0,0 @@ - - -export { default as Team } from './Team'; diff --git a/src/ignitus-AboutPage/ignitus-Team/Components/Team.tsx b/src/ignitus-AboutPage/ignitus-Team/Components/index.tsx similarity index 94% rename from src/ignitus-AboutPage/ignitus-Team/Components/Team.tsx rename to src/ignitus-AboutPage/ignitus-Team/Components/index.tsx index 86255f65..040fe6a0 100644 --- a/src/ignitus-AboutPage/ignitus-Team/Components/Team.tsx +++ b/src/ignitus-AboutPage/ignitus-Team/Components/index.tsx @@ -27,12 +27,13 @@ const PureTeam = ({contributors}: any) => ( ); -const Team = ({ +export const Team = withErrorBoundary(({ getContributorsData, contributorsData: {presets, isFetching}, }: TeamPropType) => { useEffect(() => { getContributorsData(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); if (isFetching) { @@ -59,5 +60,4 @@ const Team = ({ )); return ; -}; -export default withErrorBoundary(Team); +}); diff --git a/src/ignitus-AboutPage/ignitus-Team/Containers/TeamContainer.ts b/src/ignitus-AboutPage/ignitus-Team/Containers/TeamContainer.ts deleted file mode 100644 index 23f9236e..00000000 --- a/src/ignitus-AboutPage/ignitus-Team/Containers/TeamContainer.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { connect } from 'react-redux'; -import { bindActionCreators } from 'redux'; -import { createStructuredSelector } from 'reselect'; -import { Team } from '../Components'; - -import { getContributorsData } from '../actions'; -import { makeSelectContributorsData } from '../selectors'; - -const mapStateToProps = createStructuredSelector({ - contributorsData: makeSelectContributorsData(), -}); - -const mapDispatchToProps = (dispatch: any) => bindActionCreators({ getContributorsData }, dispatch); -export default connect(mapStateToProps, mapDispatchToProps)(Team); diff --git a/src/ignitus-AboutPage/ignitus-Team/Containers/index.ts b/src/ignitus-AboutPage/ignitus-Team/Containers/index.ts index 7f182056..d2fb743c 100644 --- a/src/ignitus-AboutPage/ignitus-Team/Containers/index.ts +++ b/src/ignitus-AboutPage/ignitus-Team/Containers/index.ts @@ -1,2 +1,14 @@ +import { connect } from 'react-redux'; +import { bindActionCreators } from 'redux'; +import { createStructuredSelector } from 'reselect'; -export { default as TeamContainer } from './TeamContainer'; +import { getContributorsData } from '../actions'; +import { makeSelectContributorsData } from '../selectors'; +import { Team } from '../Components'; + +const mapStateToProps = createStructuredSelector({ + contributorsData: makeSelectContributorsData(), +}); + +const mapDispatchToProps = (dispatch: any) => bindActionCreators({ getContributorsData }, dispatch); +export const TeamContainer = connect(mapStateToProps, mapDispatchToProps)(Team); \ No newline at end of file diff --git a/src/ignitus-AboutPage/ignitus-Team/index.ts b/src/ignitus-AboutPage/ignitus-Team/index.ts index 0c73a732..6984a5f9 100644 --- a/src/ignitus-AboutPage/ignitus-Team/index.ts +++ b/src/ignitus-AboutPage/ignitus-Team/index.ts @@ -1,5 +1,4 @@ import * as actions from './actions'; -import * as components from './Components'; import * as constants from './constants'; import * as containers from './Containers'; import reducer from './reducers'; @@ -8,7 +7,6 @@ import * as selectors from './selectors'; export default { actions, - components, containers, selectors, constants, diff --git a/src/ignitus-Authentication/ignitus-StudentLogin/Components/Login.tsx b/src/ignitus-Authentication/ignitus-StudentLogin/Components/Login.tsx index 3342e596..48e441ad 100644 --- a/src/ignitus-Authentication/ignitus-StudentLogin/Components/Login.tsx +++ b/src/ignitus-Authentication/ignitus-StudentLogin/Components/Login.tsx @@ -8,17 +8,19 @@ import { } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Templates/ignitus-Authentication'; import { LogInProps } from '../types'; -const Login: FunctionComponent = ({ logInRequest, studentLoginData }) => { +const Login: FunctionComponent = ({ logInRequest, studentLoginData, clearPreviousLogin }) => { const [state, setState] = useState(LoginStatePayload); const { email, password } = state; const handleSubmit = (e) => { e.preventDefault(); + clearPreviousLogin(); if (isEmpty(email) || isEmpty(password)) { setState({ ...state, emptyMessage: true, + invalidEmail: false, }); return; } @@ -39,17 +41,13 @@ const Login: FunctionComponent = ({ logInRequest, studentLoginData } setState({ ...state, invalidEmail: true, + emptyMessage: false, }); return; } } logInRequest(email, password); - setState({ - ...state, - email: '', - password: '', - emptyMessage: false, - }); + setState(LoginStatePayload); }; return ( diff --git a/src/ignitus-Authentication/ignitus-StudentLogin/Containers/loginContainer.js b/src/ignitus-Authentication/ignitus-StudentLogin/Containers/loginContainer.js index 97bcaa3d..460af227 100644 --- a/src/ignitus-Authentication/ignitus-StudentLogin/Containers/loginContainer.js +++ b/src/ignitus-Authentication/ignitus-StudentLogin/Containers/loginContainer.js @@ -3,7 +3,7 @@ import { bindActionCreators } from 'redux'; import { createStructuredSelector } from 'reselect'; import { Login } from '../Components'; -import { logInRequest } from '../actions'; +import { logInRequest, clearPreviousLogin } from '../actions'; import { makeSelectStudentData } from '../selectors'; @@ -11,7 +11,11 @@ const mapStateToProps = createStructuredSelector({ studentLoginData: makeSelectStudentData(), }); -const mapDispatchToProps = dispatch => bindActionCreators({ logInRequest }, dispatch); +const mapDispatchToProps = dispatch => bindActionCreators( + { logInRequest, clearPreviousLogin }, + dispatch, +); + export default connect( mapStateToProps, mapDispatchToProps, diff --git a/src/ignitus-Authentication/ignitus-StudentLogin/actionTypes.js b/src/ignitus-Authentication/ignitus-StudentLogin/actionTypes.js index 5dc1a0ca..18423df0 100644 --- a/src/ignitus-Authentication/ignitus-StudentLogin/actionTypes.js +++ b/src/ignitus-Authentication/ignitus-StudentLogin/actionTypes.js @@ -1,5 +1,4 @@ - - -export const LOG_IN_REQUEST = 'LOG_IN_REQUEST'; +export const LOG_IN_REQUEST = 'LOG_IN_REQUEST'; export const LOG_IN_RESPONSE = 'LOG_IN_RESPONSE'; -export const LOG_USER_OUT = 'LOG_USER_OUT'; \ No newline at end of file +export const LOG_USER_OUT = 'LOG_USER_OUT'; +export const LOG_IN_CLEAR_PREVIOUS = 'LOG_IN_CLEAR_PREVIOUS'; diff --git a/src/ignitus-Authentication/ignitus-StudentLogin/actions.js b/src/ignitus-Authentication/ignitus-StudentLogin/actions.js index 142409a1..c1519e5b 100644 --- a/src/ignitus-Authentication/ignitus-StudentLogin/actions.js +++ b/src/ignitus-Authentication/ignitus-StudentLogin/actions.js @@ -16,3 +16,5 @@ export const logInResponse = (data) => { }; export const logUserOut = () => ({ type: t.LOG_USER_OUT }); + +export const clearPreviousLogin = () => ({ type: t.LOG_IN_CLEAR_PREVIOUS }); diff --git a/src/ignitus-Authentication/ignitus-StudentLogin/reducers.js b/src/ignitus-Authentication/ignitus-StudentLogin/reducers.js index b01e6247..4cfb706a 100644 --- a/src/ignitus-Authentication/ignitus-StudentLogin/reducers.js +++ b/src/ignitus-Authentication/ignitus-StudentLogin/reducers.js @@ -1,5 +1,11 @@ import * as t from './actionTypes'; +const RESET = { + isFetching: false, + message: '', + success: false, +}; + const studentLoginReducer = (state = { isFetching: false, message: '', success: false }, action) => { switch (action.type) { case t.LOG_IN_RESPONSE: @@ -8,8 +14,8 @@ const studentLoginReducer = (state = { isFetching: false, message: '', success: case t.LOG_IN_REQUEST: return Object.assign({}, state, { isFetching: true, message: 'Processing...', success: false }); - case t.LOG_USER_OUT: - return { isFetching: false, message: '', success: false }; + case t.LOG_USER_OUT: case t.LOG_IN_CLEAR_PREVIOUS: + return RESET; default: return state; diff --git a/src/ignitus-Authentication/ignitus-StudentLogin/types.ts b/src/ignitus-Authentication/ignitus-StudentLogin/types.ts index 20ae6218..c05d1f02 100644 --- a/src/ignitus-Authentication/ignitus-StudentLogin/types.ts +++ b/src/ignitus-Authentication/ignitus-StudentLogin/types.ts @@ -3,4 +3,5 @@ import {authData} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Templa export interface LogInProps { logInRequest: Function; studentLoginData: authData; + clearPreviousLogin: Function; }; diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Styles/style.ts b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Styles/style.ts index 11f84561..ab33d7ea 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Styles/style.ts +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Styles/style.ts @@ -1,5 +1,5 @@ import styled from '@emotion/styled'; -import {BottomRow} from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms'; +import { BottomRow } from '../../../../ignitus-Shared/ignitus-DesignSystem/shared'; export const NewsletterImage = styled.img``; diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Components/SignUp.tsx b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Components/SignUp.tsx index 2a4c7371..814dd81d 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Components/SignUp.tsx +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Components/SignUp.tsx @@ -10,17 +10,20 @@ import { } from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Templates/ignitus-Authentication/index'; import {Props} from '../types'; -const Signup: FunctionComponent = ({signUpRequest, studentSignUpData}) => { +const Signup: FunctionComponent = ({signUpRequest, studentSignUpData, clearPreviousSignUp}) => { const [state, setState] = useState(SignupStatePayload); const {email, password, confirmPassword} = state; const handleSubmit = e => { e.preventDefault(); + clearPreviousSignUp(); if (isEmpty(email) || isEmpty(password) || isEmpty(confirmPassword)) { setState({ ...state, emptyMessage: true, + invalidEmail: false, + equalmessage: false, }); return; } @@ -42,6 +45,7 @@ const Signup: FunctionComponent = ({signUpRequest, studentSignUpData}) => ...state, emptyMessage: false, invalidEmail: true, + equalmessage: false, }); return; } @@ -58,15 +62,7 @@ const Signup: FunctionComponent = ({signUpRequest, studentSignUpData}) => } signUpRequest(email, password); - setState({ - email: '', - password: '', - confirmPassword: '', - showPassword: false, - emptyMessage: false, - equalmessage: false, - invalidEmail: false, - }); + setState(SignupStatePayload); }; return ( diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Containers/studentContainer.js b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Containers/studentContainer.js index d734dfdc..27227d6a 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Containers/studentContainer.js +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Containers/studentContainer.js @@ -5,7 +5,7 @@ import { bindActionCreators } from 'redux'; import { createStructuredSelector } from 'reselect'; import { Signup } from '../Components'; -import { signUpRequest } from '../actions'; +import { signUpRequest, clearPreviousSignUp } from '../actions'; import { makeSelectStudentData } from '../selectors'; @@ -13,5 +13,9 @@ const mapStateToProps = createStructuredSelector({ studentSignUpData: makeSelectStudentData(), }); -const mapDispatchToProps = dispatch => bindActionCreators({ signUpRequest }, dispatch); +const mapDispatchToProps = dispatch => bindActionCreators( + { signUpRequest, clearPreviousSignUp }, + dispatch, +); + export default connect(mapStateToProps, mapDispatchToProps)(Signup); diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/actionTypes.ts b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/actionTypes.ts index 221a0eb7..12c5f689 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/actionTypes.ts +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/actionTypes.ts @@ -1,2 +1,3 @@ export const SIGN_UP_REQUEST: string = 'SIGN_UP_REQUEST'; export const SIGN_UP_RESPONSE: string = 'SIGN_UP_RESPONSE'; +export const CLEAR_PREVIOUS_SIGN_UP: string = 'CLEAR_PREVIOUS_SIGN_UP'; diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/actions.ts b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/actions.ts index b8fb4799..a5f95a49 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/actions.ts +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/actions.ts @@ -20,3 +20,5 @@ export const signUpResponse = (data) => { if (!isObject(data)) throw new Error(`data should be object: ${data}`); return { type: t.SIGN_UP_RESPONSE, data }; }; + +export const clearPreviousSignUp = () => ({ type: t.CLEAR_PREVIOUS_SIGN_UP }); diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/reducers.ts b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/reducers.ts index 4f303be5..e3a79ff9 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/reducers.ts +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/reducers.ts @@ -1,5 +1,3 @@ - - import * as t from './actionTypes'; const studentReducer = (state = {}, action) => { @@ -10,6 +8,9 @@ const studentReducer = (state = {}, action) => { case t.SIGN_UP_REQUEST: return Object.assign({}, state, { isFetching: true }); + case t.CLEAR_PREVIOUS_SIGN_UP: + return { isFetching: false, message: '', success: false }; + default: return state; } diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/types.ts b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/types.ts index 238beeb2..1d1a1e6a 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/types.ts +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/types.ts @@ -3,4 +3,5 @@ import {authData} from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Tem export interface Props { signUpRequest: Function; studentSignUpData: authData; + clearPreviousSignUp: Function; } diff --git a/src/ignitus-HomePage/ignitus-Contributors/Components/index.ts b/src/ignitus-HomePage/ignitus-Contributors/Components/index.ts deleted file mode 100644 index b09c6f89..00000000 --- a/src/ignitus-HomePage/ignitus-Contributors/Components/index.ts +++ /dev/null @@ -1,3 +0,0 @@ - -// eslint-disable-next-line import/prefer-default-export -export { default as Contributors } from './Contributors'; diff --git a/src/ignitus-HomePage/ignitus-Contributors/Components/index.tsx b/src/ignitus-HomePage/ignitus-Contributors/Components/index.tsx new file mode 100644 index 00000000..e1fb9433 --- /dev/null +++ b/src/ignitus-HomePage/ignitus-Contributors/Components/index.tsx @@ -0,0 +1,47 @@ +import React from 'react'; + +import * as S from '../styles'; +import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared'; + +import {Data} from '../constants'; +import {withErrorBoundary} from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; + +interface Props { + data: any; + type: string; + paragraph: string; +} + +export const PureContributors = ({data, type, paragraph}: Props) => ( +
+ + + {type} + + Supported with{' '} + + + {' '} + {paragraph} + + + + + {data.map((logo: string) => ( + + + + ))} + + + +
+); + +export const Contributors = withErrorBoundary(() => ( + +)); diff --git a/src/ignitus-HomePage/ignitus-Contributors/Containers/contributorContainer.ts b/src/ignitus-HomePage/ignitus-Contributors/Containers/contributorContainer.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Contributors/Containers/contributorContainer.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Contributors/Containers/index.ts b/src/ignitus-HomePage/ignitus-Contributors/Containers/index.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Contributors/Containers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Contributors/actionTypes.ts b/src/ignitus-HomePage/ignitus-Contributors/actionTypes.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Contributors/actionTypes.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Contributors/actions.ts b/src/ignitus-HomePage/ignitus-Contributors/actions.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Contributors/actions.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Contributors/index.ts b/src/ignitus-HomePage/ignitus-Contributors/index.ts deleted file mode 100644 index e6210d4f..00000000 --- a/src/ignitus-HomePage/ignitus-Contributors/index.ts +++ /dev/null @@ -1,6 +0,0 @@ - -import * as components from './Components'; - -export default { - components, -}; diff --git a/src/ignitus-HomePage/ignitus-Contributors/reducers.ts b/src/ignitus-HomePage/ignitus-Contributors/reducers.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Contributors/reducers.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Contributors/sagas.ts b/src/ignitus-HomePage/ignitus-Contributors/sagas.ts deleted file mode 100644 index 091f55ca..00000000 --- a/src/ignitus-HomePage/ignitus-Contributors/sagas.ts +++ /dev/null @@ -1,2 +0,0 @@ -export default function* sagas():IterableIterator {}; - diff --git a/src/ignitus-HomePage/ignitus-Contributors/selectors.ts b/src/ignitus-HomePage/ignitus-Contributors/selectors.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Contributors/selectors.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Contributors/Styles/index.ts b/src/ignitus-HomePage/ignitus-Contributors/styles.ts similarity index 53% rename from src/ignitus-HomePage/ignitus-Contributors/Styles/index.ts rename to src/ignitus-HomePage/ignitus-Contributors/styles.ts index dd4c64db..d7686a8d 100644 --- a/src/ignitus-HomePage/ignitus-Contributors/Styles/index.ts +++ b/src/ignitus-HomePage/ignitus-Contributors/styles.ts @@ -1,17 +1,19 @@ /* eslint-disable import/prefer-default-export */ import styled from '@emotion/styled'; -import * as C from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; -import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared'; -import HeartIcon from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/heartIcon/heartIcon'; -import { minimumWidthQuery } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; +import * as C from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; +import HeartIcon from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/heartIcon/heartIcon'; +import {minimumWidthQuery} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; +import {BottomRow as Row} from '../../ignitus-Shared/ignitus-DesignSystem/shared'; +import { Paragraph as P } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { Medium } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; export const Icon = styled.span` - i { color: ${C.Red};} + i { + color: ${C.Red}; + } `; -export const BottomRow = styled(T.BottomRow)` - justify-content: unset; -`; +export const BottomRow = styled(Row)``; export const Card = styled.div` flex: 0 0 100%; @@ -42,12 +44,16 @@ export const Card = styled.div` export const CardPicture = styled.img` max-width: 100%; - height: 75%; + height: 3.6rem; object-fit: contain; - padding: 0.3em; `; export const Heart = styled(HeartIcon)` height: 1rem; fill: ${C.Red}; `; + + +export const Paragraph = styled(P)` + font-weight: ${Medium} +`; diff --git a/src/ignitus-HomePage/ignitus-GetStarted/Components/GetStarted.tsx b/src/ignitus-HomePage/ignitus-GetStarted/Components/GetStarted.tsx deleted file mode 100644 index f336b383..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/Components/GetStarted.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; -import '../Styles/style.scss'; -import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; - -const GetStarted: React.FunctionComponent = () => ( -
-
- Get started for free - join thousands of students and researchers already - using Ignitus to share their knowledge, work together, and get amazing - opportunites. -
- - - -
-); - -export default withErrorBoundary(GetStarted); diff --git a/src/ignitus-HomePage/ignitus-GetStarted/Components/index.ts b/src/ignitus-HomePage/ignitus-GetStarted/Components/index.ts deleted file mode 100644 index 9a735947..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as GetStarted } from './GetStarted'; diff --git a/src/ignitus-HomePage/ignitus-GetStarted/Components/index.tsx b/src/ignitus-HomePage/ignitus-GetStarted/Components/index.tsx new file mode 100644 index 00000000..97fa8486 --- /dev/null +++ b/src/ignitus-HomePage/ignitus-GetStarted/Components/index.tsx @@ -0,0 +1,21 @@ +import React from 'react'; +import {Link} from 'react-router-dom'; +import {Container, Paragraph, TopSection, BottomSection, Button} from '../styles'; +import {withErrorBoundary} from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; + +export const GetStarted: React.FunctionComponent = withErrorBoundary(() => ( + + + + Get started for free - join thousands of students and researchers + already using Ignitus to share their knowledge, work together, and get + amazing opportunites. + + + + + + +)); diff --git a/src/ignitus-HomePage/ignitus-GetStarted/Containers/getstartedContainer.ts b/src/ignitus-HomePage/ignitus-GetStarted/Containers/getstartedContainer.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/Containers/getstartedContainer.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-GetStarted/Styles/style.scss b/src/ignitus-HomePage/ignitus-GetStarted/Styles/style.scss deleted file mode 100644 index f6c8d258..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/Styles/style.scss +++ /dev/null @@ -1,68 +0,0 @@ -// import ignitus token variables -@import './src/ignitus-Shared/styles/ignitus-tokens'; - -// rem units change based on 1rem:16px - -// rem units change based on 1rem:16px - -.content-container { - .content { - margin-bottom: 0; - } -} - -.started--container { - background-color: #006; - width: 100%; - height: 22rem; - margin-top: 6.5rem; - padding: 3rem 0 6rem; - display: flex; - flex-direction: column; - justify-content: space-around; - align-items: center; - - @media (max-width: 816px) { - & { - padding-bottom: 0; - } - } -} - -.started { - font-size: $ignite-font-size-md !important; - font-weight: $ignite-font-weight-normal; - color: $ignite-color-white; - text-align: center; - max-width: 61rem; - - @media (max-width: 816px) { - & { - padding: 0 1.5rem; - } - } - - @media (max-width: 462px) { - & { - font-size: $ignite-font-size-sm !important; - } - } -} - -.btn { - &.button-get-started { - background-color: $ignite-color-white; - border-radius: 1.5rem; - color: $ignite-color-blue-20; - font-weight: $ignite-font-weight-semibold; - margin: 3rem 0; - min-width: 9rem; - text-decoration: none; - - &:hover { - color: $ignite-color-blue-20 !important; - background-color: $ignite-color-yellow; - text-decoration: none; - } - } -} diff --git a/src/ignitus-HomePage/ignitus-GetStarted/actionTypes.ts b/src/ignitus-HomePage/ignitus-GetStarted/actionTypes.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/actionTypes.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-GetStarted/actions.ts b/src/ignitus-HomePage/ignitus-GetStarted/actions.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/actions.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-GetStarted/constants.ts b/src/ignitus-HomePage/ignitus-GetStarted/constants.ts deleted file mode 100644 index 8071886e..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/constants.ts +++ /dev/null @@ -1 +0,0 @@ -export const API_URL: string = 'https://ignitusrestapi.herokuapp.com/testimonials'; diff --git a/src/ignitus-HomePage/ignitus-GetStarted/getStarted.test.js b/src/ignitus-HomePage/ignitus-GetStarted/getStarted.test.js deleted file mode 100644 index d7398c17..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/getStarted.test.js +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; -import { shallow } from 'enzyme'; -import './Styles/style.scss'; -import Foo from './Components/GetStarted'; - -describe('GetStarted', () => { - test('Renders Sign Up button', () => { - const wrapper = shallow(); - expect(wrapper.find('.btn-md _button')).toBeDefined(); - }); -}); diff --git a/src/ignitus-HomePage/ignitus-GetStarted/index.ts b/src/ignitus-HomePage/ignitus-GetStarted/index.ts deleted file mode 100644 index e6210d4f..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/index.ts +++ /dev/null @@ -1,6 +0,0 @@ - -import * as components from './Components'; - -export default { - components, -}; diff --git a/src/ignitus-HomePage/ignitus-GetStarted/reducers.ts b/src/ignitus-HomePage/ignitus-GetStarted/reducers.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/reducers.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-GetStarted/sagas.ts b/src/ignitus-HomePage/ignitus-GetStarted/sagas.ts deleted file mode 100644 index adb26d67..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/sagas.ts +++ /dev/null @@ -1 +0,0 @@ -export default function* sagas() {} \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-GetStarted/selectors.ts b/src/ignitus-HomePage/ignitus-GetStarted/selectors.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-HomePage/ignitus-GetStarted/selectors.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-GetStarted/styles.ts b/src/ignitus-HomePage/ignitus-GetStarted/styles.ts new file mode 100644 index 00000000..418e29f2 --- /dev/null +++ b/src/ignitus-HomePage/ignitus-GetStarted/styles.ts @@ -0,0 +1,37 @@ +import styled from '@emotion/styled'; +import {Paragraph as P} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { + XL, + Normal, +} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; +import { + White, + IgnitusBlue, +} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; +import {flexibleColDiv} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms'; +import {Button as B} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/buttons'; + +export const Container = styled(flexibleColDiv)` + background-color: ${IgnitusBlue}; + margin-top: 6rem; + padding: 3rem 1.5rem; +`; + +export const Paragraph = styled(P)` + font-size: ${XL}; + font-weight: ${Normal}; + color: ${White}; + text-align: center; + max-width: 60rem; +`; + +export const Button = styled(B)` + border-radius: 2rem; +`; + +export const TopSection = styled.div` + margin: 1rem 0; +`; +export const BottomSection = styled.div` + margin: 1rem 0; +`; diff --git a/src/ignitus-HomePage/ignitus-Introduction/Components/Introduction.tsx b/src/ignitus-HomePage/ignitus-Introduction/Components/Introduction.tsx deleted file mode 100644 index 37e79830..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/Components/Introduction.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; -import {Link} from 'react-router-dom'; -import '../Styles/style.scss'; -import {withErrorBoundary} from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; -import * as t from '../constants'; - -const Introduction: React.FunctionComponent = () => ( -
- Ignitus Torch -

Welcome to Ignitus

- -
-
- Get handpicked top-quality global research
- and industrial internships, for free! -
- -
-
-

- Ignite your resume and get the{' '} - - best global
- opportunities - {' '} - and Skyrocketing your career -

- - - -
- resume -
-
-
-); - -export default withErrorBoundary(Introduction); diff --git a/src/ignitus-HomePage/ignitus-Introduction/Components/index.ts b/src/ignitus-HomePage/ignitus-Introduction/Components/index.ts deleted file mode 100644 index 5c1d5f62..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/Components/index.ts +++ /dev/null @@ -1,3 +0,0 @@ - -// eslint-disable-next-line import/prefer-default-export -export { default as Introduction } from './Introduction'; diff --git a/src/ignitus-HomePage/ignitus-Introduction/Components/index.tsx b/src/ignitus-HomePage/ignitus-Introduction/Components/index.tsx new file mode 100644 index 00000000..08ce047a --- /dev/null +++ b/src/ignitus-HomePage/ignitus-Introduction/Components/index.tsx @@ -0,0 +1,32 @@ +import React from 'react'; + +import * as T from '../constants'; +import * as I from '../styles'; + +import {withErrorBoundary} from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; + +export const Introduction: React.FunctionComponent = withErrorBoundary(() => ( + + + + Welcome to Ignitus + + + + Get handpicked top-quality global research and industrial internships, + for free! + + + Ignite your resume and get the best global opportunities + and Skyrocketing your career + + + SIGN UP + + + + + + + +)); diff --git a/src/ignitus-HomePage/ignitus-Introduction/Containers/introductionContainer.ts b/src/ignitus-HomePage/ignitus-Introduction/Containers/introductionContainer.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/Containers/introductionContainer.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Introduction/Styles/style.scss b/src/ignitus-HomePage/ignitus-Introduction/Styles/style.scss deleted file mode 100644 index 10ad351c..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/Styles/style.scss +++ /dev/null @@ -1,219 +0,0 @@ -// import ignitus token variables -@import './src/ignitus-Shared/styles/ignitus-tokens'; - -// rem units change based on 1rem:16px - -// rem units change based on 1rem:16px - -.content-container { - margin-top: 0 !important; -} - -.ignitus { - font-size: $ignite-font-size-xxl; - font-weight: $ignite-font-weight-bold; - margin-top: 1rem; - color: $ignite-text-color-brand; -} - -.tagline { - font-size: $ignite-font-size-lg; - font-weight: $ignite-font-weight-normal; - margin-bottom: 2.5rem; - margin-top: 1.5rem; -} -.content { - font-size: $ignite-font-size-md; - font-weight: $ignite-font-weight-light; - margin-bottom: 3rem; -} - -.intro__wrapper { - background: url('https://storage.googleapis.com/ignitus_assets/ig-assets/splitBlueBackground.png') no-repeat; - background-size: 70%; - background-position: top right; - height: 67.5rem; - position: relative; - z-index: 0; - - @media (max-width: 945px){ - & { - height: 75rem; - } - } - - @media (max-width: 751px) { - & { - height: 100%; - } - } - - @media (max-width: 568px) { - & { - margin-bottom: 0; - } - } -} - -.intro { - background: -webkit-linear-gradient(45deg, $ignite-color-blue-20 38.75%, $ignite-color-white 38.75% 100%); - -webkit-background-clip: text; - background-clip: text; - font-size: $ignite-font-size-xxl + 18px; - font-weight: $ignite-font-weight-medium; - letter-spacing: 4px; - margin-top: 4rem; - padding-top: 10%; - position: relative; - -webkit-text-fill-color: transparent; - z-index: 3; - - @media (min-width: 992px) { - margin-top: 0; - } - - @media (max-width: 1145px) { - & { - background: -webkit-linear-gradient(45deg, $ignite-color-blue-20 40%, $ignite-color-white 40% 100%); - -webkit-background-clip: text; - background-clip: text; - -webkit-text-fill-color: transparent; - } - } - - @media (max-width: 892px) { - & { - background: -webkit-linear-gradient(45deg, $ignite-color-blue-20 41%, $ignite-color-white 41% 100%); - -webkit-background-clip: text; - background-clip: text; - -webkit-text-fill-color: transparent; - } - } - - @media (max-width: 800px) { - & { - background: -webkit-linear-gradient(45deg, $ignite-color-blue-20 46.5%, $ignite-color-white 46.5% 100%); - -webkit-background-clip: text; - background-clip: text; - -webkit-text-fill-color: transparent; - } - } - - @media (max-width: 682px) { - & { - background: -webkit-linear-gradient(42deg, $ignite-color-blue-20 49%, $ignite-color-white 49% 100%); - -webkit-background-clip: text; - background-clip: text; - -webkit-text-fill-color: transparent; - } - } - - @media (max-width: 568px) { - & { - background: -webkit-linear-gradient(42deg, $ignite-color-blue-20 51%, $ignite-color-white 51% 100%); - -webkit-background-clip: text; - background-clip: text; - -webkit-text-fill-color: transparent; - } - } -} - -.intro__torch { - position: absolute; - top: 7%; - right: 3%; - height: auto; - width: 22%; - z-index: 1; -} - -.intro__content { - display: flex; - flex-direction: column; - margin-top: 3rem; -} - -.intro__content--upper { - font-size: $ignite-font-size-md + 8px; - max-width: 60%; - padding: 7rem 5.5rem 3rem; - - - @media (max-width: 751px) { - & { - font-size: $ignite-font-size-md; - max-width: 100%; - padding: inherit 0 inherit 0; - } - } -} - -.intro__content--lower { - display: flex; - justify-content: center; - font-size: $ignite-font-size-md; - - @media (max-width: 945px) { - & { - flex-direction: column; - align-items: center; - max-width: 90%; - text-align: center; - margin-left: 1rem; - - img { - margin-top: 1.5rem; - } - } - - @media (max-width: 751px) { - & { - flex-direction: column-reverse; - img { - margin: 0 auto; - display: block; - } - } - } - - @media (max-width: 568px) { - & { - img { - display: none; - } - } - } - } - - img { - margin-left: 12.5rem; - } -} - -.content--lower__signup { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - - a button { - background-color: $ignite-text-color-brand !important; - color: $ignite-color-white !important; - margin-top: 2rem; - padding: 0.5rem 1rem; - width: 100%; - - &:hover { - background-color: #F9BF64 !important; - } - } -} - -.bold-txt { - font-weight: $ignite-font-weight-bold; -} - -.border { - border: $ignite-border-default; -} - diff --git a/src/ignitus-HomePage/ignitus-Introduction/actionTypes.ts b/src/ignitus-HomePage/ignitus-Introduction/actionTypes.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/actionTypes.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Introduction/actions.ts b/src/ignitus-HomePage/ignitus-Introduction/actions.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/actions.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Introduction/constants.ts b/src/ignitus-HomePage/ignitus-Introduction/constants.ts index 8d3af818..3b64e1bd 100644 --- a/src/ignitus-HomePage/ignitus-Introduction/constants.ts +++ b/src/ignitus-HomePage/ignitus-Introduction/constants.ts @@ -1,2 +1,2 @@ export const RESUME: string = 'https://storage.googleapis.com/ignitus_assets/ig-assets/resume.svg'; -export const TORCH: string = 'https://storage.googleapis.com/ignitus_assets/ig-assets/flame.svg'; +export const TORCH: string = 'https://storage.googleapis.com/ignitus_assets/ig-assets/flame.svg'; diff --git a/src/ignitus-HomePage/ignitus-Introduction/index.ts b/src/ignitus-HomePage/ignitus-Introduction/index.ts deleted file mode 100644 index e6210d4f..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/index.ts +++ /dev/null @@ -1,6 +0,0 @@ - -import * as components from './Components'; - -export default { - components, -}; diff --git a/src/ignitus-HomePage/ignitus-Introduction/reducers.ts b/src/ignitus-HomePage/ignitus-Introduction/reducers.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/reducers.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Introduction/sagas.ts b/src/ignitus-HomePage/ignitus-Introduction/sagas.ts deleted file mode 100644 index adb26d67..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/sagas.ts +++ /dev/null @@ -1 +0,0 @@ -export default function* sagas() {} \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-Introduction/selectors.ts b/src/ignitus-HomePage/ignitus-Introduction/selectors.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Introduction/selectors.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Introduction/styles.ts b/src/ignitus-HomePage/ignitus-Introduction/styles.ts new file mode 100644 index 00000000..20d765da --- /dev/null +++ b/src/ignitus-HomePage/ignitus-Introduction/styles.ts @@ -0,0 +1,97 @@ +import styled from '@emotion/styled'; +import * as C from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; +import { + XL, + LG, + Normal, +} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; +import {minimumWidthQuery} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; +import {Button as B} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/buttons'; + +const ContainerBackground: string = + 'https://storage.googleapis.com/ignitus_assets/ig-assets/splitBlueBackground.png'; + +export const Container = styled.div` + display: flex; + flex-direction: row; + background: url(${ContainerBackground}) no-repeat; + background-size: 54%; + background-position: top right; + padding: 9rem 6rem; + + ${minimumWidthQuery[0]} { + flex-direction: column; + background: none; + } + ${minimumWidthQuery[1]} { + flex-direction: column; + background: none; + } + ${minimumWidthQuery[2]} { + flex-direction: row; + background: url(${ContainerBackground}) no-repeat; + background-size: 54%; + background-position: top right; + } +`; + +export const TitleImage = styled.div` + display: flex; + flex-direction: row; +`; + +export const Title = styled.h1` + color: ${C.IgnitusBlue}; + font-size: 56px; + font-weight: 500; + letter-spacing: 2px; + margin: 1rem 0; +`; + +export const PrimaryText = styled.p` + color: ${C.Black}; + font-size: ${XL}; + font-weight: ${Normal}; + margin: 1rem 0; +`; + +export const SecondaryText = styled.p` + color: ${C.Black}; + font-size: ${LG}; + font-weight: ${Normal}; + margin: 1rem 0; +`; + +export const LeftSection = styled.div` + display: flex; + flex-direction: column; + flex: 4; +`; + +export const RightSection = styled.div` + flex: 4; + display: flex; + justify-content: center; +`; + +export const Torch = styled.img` + height: 6rem; + margin-left: 2rem; +`; + +export const Button = styled(B)` + border-radius: 2rem; + width: 10rem; +`; + +export const Resume = styled.img` + ${minimumWidthQuery[0]} { + width: 14rem; + } + ${minimumWidthQuery[1]} { + width: 16rem; + } + ${minimumWidthQuery[2]} { + width: 18rem; + } +`; diff --git a/src/ignitus-HomePage/ignitus-Partners/Components/Partners.tsx b/src/ignitus-HomePage/ignitus-Partners/Components/Partners.tsx deleted file mode 100644 index d4fc288d..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/Components/Partners.tsx +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable import/no-unresolved */ -import React from 'react'; -import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; -import { Data } from '../constants'; -import { PureContributors } from '../../ignitus-Contributors/Components/Contributors'; - -const Partner: React.FunctionComponent = () => ( - -); - -export default withErrorBoundary(Partner); diff --git a/src/ignitus-HomePage/ignitus-Partners/Components/index.ts b/src/ignitus-HomePage/ignitus-Partners/Components/index.ts deleted file mode 100644 index 6a74b561..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -// eslint-disable-next-line import/prefer-default-export -export { default as Partner } from './Partners'; diff --git a/src/ignitus-HomePage/ignitus-Partners/Containers/PartnersContainer.ts b/src/ignitus-HomePage/ignitus-Partners/Containers/PartnersContainer.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/Containers/PartnersContainer.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-Partners/Containers/index.ts b/src/ignitus-HomePage/ignitus-Partners/Containers/index.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/Containers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-Partners/Styles/index.ts b/src/ignitus-HomePage/ignitus-Partners/Styles/index.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/Styles/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-Partners/actionTypes.ts b/src/ignitus-HomePage/ignitus-Partners/actionTypes.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/actionTypes.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Partners/actions.ts b/src/ignitus-HomePage/ignitus-Partners/actions.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/actions.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Partners/index.ts b/src/ignitus-HomePage/ignitus-Partners/index.ts deleted file mode 100644 index e6210d4f..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/index.ts +++ /dev/null @@ -1,6 +0,0 @@ - -import * as components from './Components'; - -export default { - components, -}; diff --git a/src/ignitus-HomePage/ignitus-Partners/reducers.ts b/src/ignitus-HomePage/ignitus-Partners/reducers.ts deleted file mode 100644 index 8cec2e9c..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/reducers.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; \ No newline at end of file diff --git a/src/ignitus-HomePage/ignitus-Partners/sagas.ts b/src/ignitus-HomePage/ignitus-Partners/sagas.ts deleted file mode 100644 index 091f55ca..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/sagas.ts +++ /dev/null @@ -1,2 +0,0 @@ -export default function* sagas():IterableIterator {}; - diff --git a/src/ignitus-HomePage/ignitus-Partners/selectors.ts b/src/ignitus-HomePage/ignitus-Partners/selectors.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-Partners/selectors.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-Contributors/Components/Contributors.tsx b/src/ignitus-HomePage/ignitus-SupportedBy/Components/index.tsx similarity index 56% rename from src/ignitus-HomePage/ignitus-Contributors/Components/Contributors.tsx rename to src/ignitus-HomePage/ignitus-SupportedBy/Components/index.tsx index dc23ba2c..e633f09d 100644 --- a/src/ignitus-HomePage/ignitus-Contributors/Components/Contributors.tsx +++ b/src/ignitus-HomePage/ignitus-SupportedBy/Components/index.tsx @@ -1,28 +1,23 @@ +/* eslint-disable import/no-unresolved */ import React from 'react'; -import { Data } from '../constants'; import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; -import * as S from '../Styles'; -import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared'; -import { Paragraph } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { Data } from '../constants'; +import { Props } from '../types'; -interface Props { - data: any; - type: string, - paragraph: string, -} +import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared'; +import * as S from '../styles'; -export const PureContributors = ({ data, type, paragraph }: Props) => ( -
- +const PureSupportedBy = ({ data, type, paragraph }: Props) => ( + { type } - + Supported with {' '} {' '} {paragraph} - + @@ -34,11 +29,9 @@ export const PureContributors = ({ data, type, paragraph }: Props) => ( -
); -const Contributors = () => ( - -); +export const SupportedBy: React.FunctionComponent = withErrorBoundary(() => ( + +)); -export default withErrorBoundary(Contributors); diff --git a/src/ignitus-HomePage/ignitus-Partners/constants.ts b/src/ignitus-HomePage/ignitus-SupportedBy/constants.ts similarity index 57% rename from src/ignitus-HomePage/ignitus-Partners/constants.ts rename to src/ignitus-HomePage/ignitus-SupportedBy/constants.ts index fd9fe793..10d282fc 100644 --- a/src/ignitus-HomePage/ignitus-Partners/constants.ts +++ b/src/ignitus-HomePage/ignitus-SupportedBy/constants.ts @@ -1,8 +1,8 @@ -export const WOOTECH: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/wooTech.png'; -export const SUGARLABS: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/sugarLabs.png'; +export const WOOTECH: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/WooTech.svg'; +export const SUGARLABS: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/sugarlabs.png'; export const SYSTERS: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/railsGirlsSummerOfCode.png'; -export const PROGATE: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/progate.png'; -export const LEANIN: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/leanInIndia.png'; -export const GIRLSCRIPT: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/girlScript.png'; +export const NETLIFY: string = 'https://www.netlify.com/img/global/badges/netlify-color-accent.svg'; +export const GIRLSCRIPT: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/girlScriptLogo.png'; +export const PROGATE: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/progateLogo.png'; -export const Data: string[] = [WOOTECH, SUGARLABS, SYSTERS, PROGATE, LEANIN, GIRLSCRIPT]; +export const Data: string[] = [WOOTECH, SUGARLABS, SYSTERS, PROGATE, NETLIFY, GIRLSCRIPT]; diff --git a/src/ignitus-HomePage/ignitus-SupportedBy/styles.ts b/src/ignitus-HomePage/ignitus-SupportedBy/styles.ts new file mode 100644 index 00000000..89727d1e --- /dev/null +++ b/src/ignitus-HomePage/ignitus-SupportedBy/styles.ts @@ -0,0 +1,58 @@ +/* eslint-disable import/prefer-default-export */ +import styled from '@emotion/styled'; +import * as C from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; +import HeartIcon from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/heartIcon/heartIcon'; +import {minimumWidthQuery} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; +import {BottomRow as Row} from '../../ignitus-Shared/ignitus-DesignSystem/shared'; +import {Paragraph as P} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import {SemiNormal} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; + +export const Icon = styled.span` + i { + color: ${C.Red}; + } +`; + +export const BottomRow = styled(Row)``; + +export const Card = styled.div` + flex: 0 0 100%; + max-width: 100%; + margin: 0.5em; + padding: 0.3em; + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); + border-radius: 15px; + height: 100px; + display: flex; + justify-content: center; + align-items: center; + background: ${C.White}; + + ${minimumWidthQuery[0]} { + flex: 0 0 43%; + max-width: 43%; + } + ${minimumWidthQuery[1]} { + flex: 0 0 28.33333%; + max-width: 28.33333%; + } + ${minimumWidthQuery[2]} { + flex: 0 0 30.33333%; + max-width: 30.33333%; + } +`; + +export const CardPicture = styled.img` + max-width: 100%; + height: 3.6rem; + object-fit: contain; +`; + +export const Heart = styled(HeartIcon)` + height: 1rem; + fill: ${C.Red}; +`; + +export const Paragraph = styled(P)` + font-weight: ${SemiNormal}; +`; diff --git a/src/ignitus-HomePage/ignitus-SupportedBy/types.ts b/src/ignitus-HomePage/ignitus-SupportedBy/types.ts new file mode 100644 index 00000000..f8f62d85 --- /dev/null +++ b/src/ignitus-HomePage/ignitus-SupportedBy/types.ts @@ -0,0 +1,5 @@ +export type Props = { + data: any; + type: string, + paragraph: string, +} diff --git a/src/ignitus-HomePage/ignitus-Testimonial/Components/Testimonial.tsx b/src/ignitus-HomePage/ignitus-Testimonial/Components/Testimonial.tsx deleted file mode 100644 index b8a41609..00000000 --- a/src/ignitus-HomePage/ignitus-Testimonial/Components/Testimonial.tsx +++ /dev/null @@ -1,71 +0,0 @@ -/* eslint-disable default-case */ -/* eslint-disable react/prop-types */ -/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */ -/* eslint-disable jsx-a11y/alt-text */ -/* eslint-disable jsx-a11y/click-events-have-key-events */ -/* eslint-disable jsx-a11y/no-static-element-interactions */ - -import React, { useState, useEffect } from 'react'; -import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; -import '../Styles/style.scss'; -import { Avatars } from '../constants'; -import { Props } from '../types'; - -const Testimonial: React.FC = ({ testimonialData, getTestimonialData }) => { - const [currentIndex, setCurrentIndex] = useState(0); - const handleClick = (event) => { - const { target: { id } } = event; - - switch (id) { - case '1': - setCurrentIndex(0); - break; - - case '2': - setCurrentIndex(1); - break; - - case '3': - setCurrentIndex(2); - break; - - case '4': - setCurrentIndex(3); - break; - } - }; - - useEffect(() => { - getTestimonialData(); - }, []); - - return ( -
-
Testimonials
-
- {testimonialData.length > 0 && ( -
-
-

{testimonialData[currentIndex].description}

-
-
- -
-

{testimonialData[currentIndex].author}

-

- {testimonialData[currentIndex].authorDesignation} -

-
- )} -
- - - - -
-
-
- ); -}; - -export default withErrorBoundary(Testimonial); diff --git a/src/ignitus-HomePage/ignitus-Testimonial/Components/index.js b/src/ignitus-HomePage/ignitus-Testimonial/Components/index.js deleted file mode 100644 index 931d2b3c..00000000 --- a/src/ignitus-HomePage/ignitus-Testimonial/Components/index.js +++ /dev/null @@ -1,3 +0,0 @@ -/* eslint-disable import/prefer-default-export */ - -export { default as Testimonial } from './Testimonial'; diff --git a/src/ignitus-HomePage/ignitus-Testimonial/Components/index.tsx b/src/ignitus-HomePage/ignitus-Testimonial/Components/index.tsx new file mode 100644 index 00000000..58aaa1c2 --- /dev/null +++ b/src/ignitus-HomePage/ignitus-Testimonial/Components/index.tsx @@ -0,0 +1,68 @@ +import React, {useState, useEffect} from 'react'; +import * as T from '../style'; + +import { Avatars } from '../constants'; +import { Props } from '../types'; +import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; + +export const Testimonial: React.FC = withErrorBoundary( + ({testimonialData, getTestimonialData}) => { + const [currentIndex, setCurrentIndex] = useState(0); + const handleClick = event => { + const { + target: {id}, + } = event; + + switch (id) { + case '1': + setCurrentIndex(0); + break; + + case '2': + setCurrentIndex(1); + break; + + case '3': + setCurrentIndex(2); + break; + + case '4': + setCurrentIndex(3); + break; + } + }; + + useEffect(() => { + getTestimonialData(); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + + return ( + + Testimonials + + {testimonialData.length > 0 && ( + + +

{testimonialData[currentIndex].description}

+ + + {''}/ + + {testimonialData[currentIndex].author} + + {testimonialData[currentIndex].authorDesignation} + + + )} + + + + + + + + + ); + }, +); diff --git a/src/ignitus-HomePage/ignitus-Testimonial/Containers/index.js b/src/ignitus-HomePage/ignitus-Testimonial/Containers/index.js deleted file mode 100644 index 3bff4128..00000000 --- a/src/ignitus-HomePage/ignitus-Testimonial/Containers/index.js +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as TestimonialContainer } from './TestimonialContainer'; diff --git a/src/ignitus-HomePage/ignitus-Testimonial/Containers/TestimonialContainer.js b/src/ignitus-HomePage/ignitus-Testimonial/Containers/index.ts similarity index 85% rename from src/ignitus-HomePage/ignitus-Testimonial/Containers/TestimonialContainer.js rename to src/ignitus-HomePage/ignitus-Testimonial/Containers/index.ts index 1cfeca81..7852d6dd 100644 --- a/src/ignitus-HomePage/ignitus-Testimonial/Containers/TestimonialContainer.js +++ b/src/ignitus-HomePage/ignitus-Testimonial/Containers/index.ts @@ -1,3 +1,4 @@ +/* eslint-disable import/prefer-default-export */ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { createStructuredSelector } from 'reselect'; @@ -11,7 +12,7 @@ const mapStateToProps = createStructuredSelector({ }); const mapDispatchToProps = dispatch => bindActionCreators({ getTestimonialData }, dispatch); -export default connect( +export const TestimonialContainer = connect( mapStateToProps, mapDispatchToProps, )(Testimonial); diff --git a/src/ignitus-HomePage/ignitus-Testimonial/Styles/style.scss b/src/ignitus-HomePage/ignitus-Testimonial/Styles/style.scss deleted file mode 100644 index a65d866c..00000000 --- a/src/ignitus-HomePage/ignitus-Testimonial/Styles/style.scss +++ /dev/null @@ -1,102 +0,0 @@ -@import './src/ignitus-Shared/styles/ignitus-tokens'; -@import './src/ignitus-Shared/styles/ignitus-mixins'; -$ignite-font-family-default: 'Raleway', sans-serif; -$ignite-color-blue-24: #192b65; -$ignite-font-weight-semibold: 600; -$ignite-font-size-sm: 16px; - -.testimonial { - .testimonials-title { - font-family: $ignite-font-family-default; - text-align: center; - font-weight: 600; - font-size: 22px; - color: #000066; - color: #000066; - } - - .testimonial-wrapper { - align-items: center; - display: flex; - margin: 0; - flex-direction: column; - justify-content: center; - } - - .carousel-content { - padding: 1em; - text-align: center; - width: auto; - } - - .text-box p { - display: inline-block; - font-size: 18px; - font-style: italic; - font-weight: 500; - margin-left: 0.5em; - margin-right: 0.5em; - text-align: center; - } - - - .text-box::before { - color: $ignite-color-blue-24; - content: "\f10d"; - display: inline-block; - font-family: "FontAwesome"; - vertical-align: top; - } - - .text-box::after { - color: $ignite-color-blue-24; - content: "\f10e"; - display: inline-block; - font-family: "FontAwesome"; - vertical-align: bottom; - } - - .avatar { - margin-bottom: 0.5em; - - img { - border-radius: 100%; - height: 15.5vh; - } - } - - .name { - font-size: 18px; - font-weight: $ignite-font-weight-semibold; - margin-bottom: 0; - text-align: center; - } - - .designation { - font-size: $ignite-font-size-sm; - text-align: center; - } - - .nav-avatar { - align-items: center; - display: flex; - justify-content: center; - min-height: 5.5vh; - - img { - border-radius: 100%; - height: 3.5vh; - margin-right: 0.3em; - } - - img:hover { - border: 1px solid #192b65; - height: 5vh; - transition: ease 0.5s; - } - } - - @media only screen and (max-width: 596px) { - display: none; - } -} diff --git a/src/ignitus-HomePage/ignitus-Testimonial/actionTypes.js b/src/ignitus-HomePage/ignitus-Testimonial/actionTypes.js deleted file mode 100644 index e0b36987..00000000 --- a/src/ignitus-HomePage/ignitus-Testimonial/actionTypes.js +++ /dev/null @@ -1,3 +0,0 @@ - -export const SET_TESTIMONIAL_DATA = 'SET_TESTIMONIAL_DATA'; -export const GET_TESTIMONIAL_DATA = 'GET_TESTIMONIAL_DATA'; diff --git a/src/ignitus-HomePage/ignitus-Testimonial/actionTypes.ts b/src/ignitus-HomePage/ignitus-Testimonial/actionTypes.ts new file mode 100644 index 00000000..21a65640 --- /dev/null +++ b/src/ignitus-HomePage/ignitus-Testimonial/actionTypes.ts @@ -0,0 +1,3 @@ + +export const SET_TESTIMONIAL_DATA: string = 'SET_TESTIMONIAL_DATA'; +export const GET_TESTIMONIAL_DATA: string = 'GET_TESTIMONIAL_DATA'; diff --git a/src/ignitus-HomePage/ignitus-Testimonial/actions.js b/src/ignitus-HomePage/ignitus-Testimonial/actions.ts similarity index 99% rename from src/ignitus-HomePage/ignitus-Testimonial/actions.js rename to src/ignitus-HomePage/ignitus-Testimonial/actions.ts index c3a525e3..4e0dd230 100644 --- a/src/ignitus-HomePage/ignitus-Testimonial/actions.js +++ b/src/ignitus-HomePage/ignitus-Testimonial/actions.ts @@ -1,4 +1,3 @@ import * as t from './actionTypes'; - export const getTestimonialData = () => ({ type: t.GET_TESTIMONIAL_DATA }); diff --git a/src/ignitus-HomePage/ignitus-Testimonial/constants.js b/src/ignitus-HomePage/ignitus-Testimonial/constants.ts similarity index 80% rename from src/ignitus-HomePage/ignitus-Testimonial/constants.js rename to src/ignitus-HomePage/ignitus-Testimonial/constants.ts index d9c30e47..0716504d 100644 --- a/src/ignitus-HomePage/ignitus-Testimonial/constants.js +++ b/src/ignitus-HomePage/ignitus-Testimonial/constants.ts @@ -1,6 +1,6 @@ // eslint-disable-next-line import/prefer-default-export -export const NAME = 'testimonialReducer'; -export const Avatars = [ +export const NAME: string = 'testimonialReducer'; +export const Avatars: string[] = [ 'https://storage.googleapis.com/ignitus_assets/ig-avatars/grant.png', 'https://storage.googleapis.com/ignitus_assets/ig-avatars/melanie.png', 'https://storage.googleapis.com/ignitus_assets/ig-avatars/george.png', diff --git a/src/ignitus-HomePage/ignitus-Testimonial/index.js b/src/ignitus-HomePage/ignitus-Testimonial/index.ts similarity index 100% rename from src/ignitus-HomePage/ignitus-Testimonial/index.js rename to src/ignitus-HomePage/ignitus-Testimonial/index.ts diff --git a/src/ignitus-HomePage/ignitus-Testimonial/reducers.js b/src/ignitus-HomePage/ignitus-Testimonial/reducers.ts similarity index 99% rename from src/ignitus-HomePage/ignitus-Testimonial/reducers.js rename to src/ignitus-HomePage/ignitus-Testimonial/reducers.ts index 54ea6f71..e10031e2 100644 --- a/src/ignitus-HomePage/ignitus-Testimonial/reducers.js +++ b/src/ignitus-HomePage/ignitus-Testimonial/reducers.ts @@ -1,4 +1,3 @@ - import * as t from './actionTypes'; const testimonialReducer = (state = [], action) => { diff --git a/src/ignitus-HomePage/ignitus-Testimonial/sagas.js b/src/ignitus-HomePage/ignitus-Testimonial/sagas.ts similarity index 60% rename from src/ignitus-HomePage/ignitus-Testimonial/sagas.js rename to src/ignitus-HomePage/ignitus-Testimonial/sagas.ts index 1a235f2c..10fb83a4 100644 --- a/src/ignitus-HomePage/ignitus-Testimonial/sagas.js +++ b/src/ignitus-HomePage/ignitus-Testimonial/sagas.ts @@ -1,18 +1,16 @@ - -import { effects } from 'redux-saga'; +import {effects} from 'redux-saga'; import * as t from './actionTypes'; import * as api from '../../ignitus-Api'; -const { - call, put, takeLatest, all, -} = effects; +const {call, put, takeLatest, all} = effects; function* getTestimonialData() { try { const data = yield call(api.getTestimonialData); - yield put({ type: t.SET_TESTIMONIAL_DATA, data }); + yield put({type: t.SET_TESTIMONIAL_DATA, data}); } catch (e) { - // console.log(e.message); + console.error(e); + throw e; } } @@ -21,7 +19,5 @@ function* actionWatcher() { } export default function* sagas() { - yield all([ - actionWatcher(), - ]); + yield all([actionWatcher()]); } diff --git a/src/ignitus-HomePage/ignitus-Testimonial/selectors.js b/src/ignitus-HomePage/ignitus-Testimonial/selectors.js deleted file mode 100644 index db33686c..00000000 --- a/src/ignitus-HomePage/ignitus-Testimonial/selectors.js +++ /dev/null @@ -1,11 +0,0 @@ -import { createSelector } from 'reselect'; - -export const selectTestimonialState = state => state.testimonialReducer; - -export const makeSelectTestimonialData = () => createSelector(selectTestimonialState, (substate) => { - if (substate && substate.length > 0) { - return substate; - } - return []; -}); - diff --git a/src/ignitus-HomePage/ignitus-Testimonial/selectors.test.js b/src/ignitus-HomePage/ignitus-Testimonial/selectors.test.js index 26a1f117..89a3c049 100644 --- a/src/ignitus-HomePage/ignitus-Testimonial/selectors.test.js +++ b/src/ignitus-HomePage/ignitus-Testimonial/selectors.test.js @@ -1,7 +1,7 @@ import { selectTestimonialState, makeSelectTestimonialData, -} from './selectors'; +} from './selectors.ts'; describe('Testimonial Selectors', () => { describe('selectTestimonialState', () => { diff --git a/src/ignitus-HomePage/ignitus-Testimonial/selectors.ts b/src/ignitus-HomePage/ignitus-Testimonial/selectors.ts new file mode 100644 index 00000000..7fd5f4ce --- /dev/null +++ b/src/ignitus-HomePage/ignitus-Testimonial/selectors.ts @@ -0,0 +1,14 @@ +import {createSelector} from 'reselect'; + +export const selectTestimonialState = state => state.testimonialReducer; + +export const makeSelectTestimonialData = () => + createSelector( + selectTestimonialState, + substate => { + if (substate && substate.length > 0) { + return substate; + } + return []; + }, + ); diff --git a/src/ignitus-HomePage/ignitus-Testimonial/style.ts b/src/ignitus-HomePage/ignitus-Testimonial/style.ts new file mode 100644 index 00000000..a1fdb56f --- /dev/null +++ b/src/ignitus-HomePage/ignitus-Testimonial/style.ts @@ -0,0 +1,93 @@ +import styled from '@emotion/styled'; +import {maximumWidthQuery} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; +import {Heading2} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import {IgnitusBlue} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; +import {flexibleColDiv} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms'; +import {flexibleRowDiv} from '../../ignitus-Shared/ignitus-DesignSystem/shared'; +import { + MD, + SemiBold, + SM, + Normal, +} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; + +export const Container = styled.div` + ${maximumWidthQuery[0]} { + display: none; + } +`; + +export const Title = styled(Heading2)` + color: ${IgnitusBlue}; + text-align: center; +`; + +export const Testimonial = styled(flexibleColDiv)``; +export const Carousel = styled(flexibleColDiv)` + padding: 1em; + text-align: center; +`; + +export const Text = styled.div` + &::before { + color: ${IgnitusBlue}; + content: '\f10d'; + display: inline-block; + font-family: 'FontAwesome'; + vertical-align: top; + } + ::after { + color: ${IgnitusBlue}; + content: '\f10e'; + display: inline-block; + font-family: 'FontAwesome'; + vertical-align: bottom; + } + + p { + display: inline-block; + font-size: ${MD}; + font-style: italic; + font-weight: 500; + margin: 0 0.6rem; + text-align: center; + } +`; + +export const Avatar = styled(flexibleColDiv)` + margin: 1rem 0; + img { + border-radius: 100%; + height: 15.5vh; + } +`; + +export const Name = styled.p` + font-size: ${MD}; + font-weight: ${SemiBold}; + margin-bottom: 0; + text-align: center; +`; + +export const Designation = styled.p` + font-size: ${SM}; + font-weight: ${Normal}; + margin-bottom: 0; + text-align: center; +`; + +export const Navigation = styled(flexibleRowDiv)` + min-height: 5.5vh; + + img { + border-radius: 100%; + height: 3.5vh; + margin-right: 0.3em; + + &:hover { + border: 1px solid #192b65; + height: 5vh; + transition: ease 0.5s; + } + } +`; diff --git a/src/ignitus-HomePage/ignitus-Testimonial/types.ts b/src/ignitus-HomePage/ignitus-Testimonial/types.ts index 4d31d791..c7ffdf01 100644 --- a/src/ignitus-HomePage/ignitus-Testimonial/types.ts +++ b/src/ignitus-HomePage/ignitus-Testimonial/types.ts @@ -1,8 +1,8 @@ -export interface Props { +export type Props = { getTestimonialData: Function; testimonialData: Array<{ author: string; description: string; authorDesignation: string; }>; -} +}; diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/Components/index.ts b/src/ignitus-HomePage/ignitus-WhatWeDo/Components/index.ts deleted file mode 100644 index 0a6af91a..00000000 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -/* eslint-disable import/prefer-default-export */ -export { default as WhatWeDo } from './WhatWeDo'; diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/Components/WhatWeDo.tsx b/src/ignitus-HomePage/ignitus-WhatWeDo/Components/index.tsx similarity index 66% rename from src/ignitus-HomePage/ignitus-WhatWeDo/Components/WhatWeDo.tsx rename to src/ignitus-HomePage/ignitus-WhatWeDo/Components/index.tsx index 3ae9b869..821d5ee3 100644 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/Components/WhatWeDo.tsx +++ b/src/ignitus-HomePage/ignitus-WhatWeDo/Components/index.tsx @@ -1,24 +1,18 @@ import React from 'react'; -import * as S from '../Styles'; +import * as S from '../styles'; import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared'; import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary'; import { data } from '../constants'; import { Paragraph } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; -const WhatWeDo: React.FunctionComponent = () => ( +export const WhatWeDo: React.FunctionComponent = withErrorBoundary(() => ( What we Do? - - Guidance   - {' '} - - - - {' '} -   in well researched and goal-oriented courses, getting Internships + + Guidance 🎓 in well researched and goal-oriented courses, Internships etc. - + @@ -31,6 +25,4 @@ const WhatWeDo: React.FunctionComponent = () => ( -); - -export default withErrorBoundary(WhatWeDo); +)); diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/Containers/WhatWeDo.ts b/src/ignitus-HomePage/ignitus-WhatWeDo/Containers/WhatWeDo.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/Containers/WhatWeDo.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/actionTypes.ts b/src/ignitus-HomePage/ignitus-WhatWeDo/actionTypes.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/actionTypes.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/actions.ts b/src/ignitus-HomePage/ignitus-WhatWeDo/actions.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/actions.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/index.ts b/src/ignitus-HomePage/ignitus-WhatWeDo/index.ts deleted file mode 100644 index e6210d4f..00000000 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/index.ts +++ /dev/null @@ -1,6 +0,0 @@ - -import * as components from './Components'; - -export default { - components, -}; diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/reducers.ts b/src/ignitus-HomePage/ignitus-WhatWeDo/reducers.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/reducers.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/sagas.ts b/src/ignitus-HomePage/ignitus-WhatWeDo/sagas.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/sagas.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/selectors.ts b/src/ignitus-HomePage/ignitus-WhatWeDo/selectors.ts deleted file mode 100644 index cb0ff5c3..00000000 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/selectors.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/ignitus-HomePage/ignitus-WhatWeDo/Styles/index.ts b/src/ignitus-HomePage/ignitus-WhatWeDo/styles.ts similarity index 61% rename from src/ignitus-HomePage/ignitus-WhatWeDo/Styles/index.ts rename to src/ignitus-HomePage/ignitus-WhatWeDo/styles.ts index a5c990b6..2ff34fc2 100644 --- a/src/ignitus-HomePage/ignitus-WhatWeDo/Styles/index.ts +++ b/src/ignitus-HomePage/ignitus-WhatWeDo/styles.ts @@ -1,11 +1,18 @@ /* eslint-disable import/prefer-default-export */ import styled from '@emotion/styled'; -import * as C from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; -import * as F from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; -import { minimumWidthQuery } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; +import * as C from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; +import * as F from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; +import {minimumWidthQuery} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; +import {Paragraph as P} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; export const Icon = styled.span` - i { color: ${C.IgnitusBlue};} + i { + color: ${C.IgnitusBlue}; + } +`; + +export const Paragraph = styled(P)` + font-weight: ${F.SemiNormal}; `; export const Card = styled.div` @@ -18,7 +25,7 @@ export const Card = styled.div` box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); border-radius: 15px; flex-direction: column; - background: ${C.White};; + background: ${C.White}; ${minimumWidthQuery[0]} { flex: 0 0 85%; diff --git a/src/ignitus-Routes/ignitus-PublicRoutes/index.tsx b/src/ignitus-Routes/ignitus-PublicRoutes/index.tsx index 67fbb347..c15c21c4 100644 --- a/src/ignitus-Routes/ignitus-PublicRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-PublicRoutes/index.tsx @@ -1,14 +1,9 @@ -import React from 'react'; +import React, { Fragment } from 'react'; import {Switch, Route} from 'react-router-dom'; import Navigation from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation'; import Footer from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Footer'; -import Contributors from '../../ignitus-HomePage/ignitus-Contributors'; -import GetStarted from '../../ignitus-HomePage/ignitus-GetStarted'; -import Introduction from '../../ignitus-HomePage/ignitus-Introduction'; import Testimonial from '../../ignitus-HomePage/ignitus-Testimonial'; -import WhatWeDo from '../../ignitus-HomePage/ignitus-WhatWeDo'; -import Partner from '../../ignitus-HomePage/ignitus-Partners'; // We will seperate these routes to seperate files in upcoming days. import LoginProfessor from '../../ignitus-Authentication/ignitus-ProfessorLogin'; @@ -20,15 +15,22 @@ import { CommonSignUpUI, } from '../../ignitus-Authentication/ignitus-CommonAuthenticationInterface/Components'; -import {InterestFlow} from '../../ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-InterestFlow/Components/index'; -import {EmailFlow} from '../../ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Components'; -import {WelcomeFlow} from '../../ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Components'; -import {EmailConfirmationFlow} from '../../ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Components'; +import { InterestFlow } from '../../ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-InterestFlow/Components/index'; +import { EmailFlow } from '../../ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Components'; +import { WelcomeFlow } from '../../ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Components'; +import { EmailConfirmationFlow } from '../../ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Components'; +import { SupportedBy } from '../../ignitus-HomePage/ignitus-SupportedBy/Components'; +import { WhatWeDo } from '../../ignitus-HomePage/ignitus-WhatWeDo/Components'; +import { Introduction } from '../../ignitus-HomePage/ignitus-Introduction/Components'; +import { GetStarted } from '../../ignitus-HomePage/ignitus-GetStarted/Components'; +import { Notfound } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components'; +import JobConfirmation from '../../ignitus-Careers/ignitus-JobConfirmation'; import loader from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Logos/ignitusLoader.gif'; import Loadable from 'react-loadable'; -import {Notfound} from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components'; -import JobConfirmation from '../../ignitus-Careers/ignitus-JobConfirmation'; + + + // RouteBased CodeSplitting. @@ -42,27 +44,37 @@ const Loading: React.FunctionComponent = () => ( const AboutUs = Loadable({ loader: () => - import('../../ignitus-AboutPage/ignitus-About/Components/About'), + import('../../ignitus-AboutPage/ignitus-About/Components'), loading: Loading, }); export const PublicRoutes: React.FunctionComponent = () => { return ( - + + } + /> + + ( -
- - - - + + + + - -
+ + )} /> @@ -88,7 +100,6 @@ export const PublicRoutes: React.FunctionComponent = () => { path="/jobConfirmation" component={JobConfirmation.components.JobConfirmation} /> - ( component={interfaceDashBoardFooter} /> + + + + diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/bookmarkIcon/bookmarkIcon.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/bookmarkIcon/bookmarkIcon.tsx new file mode 100644 index 00000000..aa5c061d --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/bookmarkIcon/bookmarkIcon.tsx @@ -0,0 +1,21 @@ +import React from 'react'; +import {HTMLAttributes} from 'react'; +type Props = HTMLAttributes; + +const BookmarkIcon = ({title = 'Bookmark Icon', ...rest}: Props) => { + return ( + + {title} + + + ) +}; + +export default BookmarkIcon; + +/* SVG credits goes to https://material.io/resources/icons/ */ diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/bookmarkIcon/index.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/bookmarkIcon/index.ts new file mode 100644 index 00000000..eb378e6d --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/bookmarkIcon/index.ts @@ -0,0 +1 @@ +export { default } from './bookmarkIcon'; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/fileIcon/fileIcon.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/fileIcon/fileIcon.tsx new file mode 100644 index 00000000..6c9f8386 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/fileIcon/fileIcon.tsx @@ -0,0 +1,22 @@ +import React from 'react'; +import {HTMLAttributes} from 'react'; +type Props = HTMLAttributes; + +const FileIcon = ({title = 'File Icon', ...rest}: Props) => { + return ( + + {title} + + + + ); +}; + +export default FileIcon; + +/* SVG credits goes to https://material.io/resources/icons/ */ diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/fileIcon/index.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/fileIcon/index.ts new file mode 100644 index 00000000..cab5a1f3 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/fileIcon/index.ts @@ -0,0 +1 @@ +export { default } from './fileIcon'; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/githubIcon/githubIcon.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/githubIcon/githubIcon.tsx index d3dc7721..e59f60a0 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/githubIcon/githubIcon.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/githubIcon/githubIcon.tsx @@ -6,14 +6,19 @@ type Props = HTMLAttributes; const GithubIcon = ({title = 'Github Icon', ...rest}: Props) => { return ( ); }; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/ignitusFullLogo/ignitusFullLogo.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/ignitusFullLogo/ignitusFullLogo.tsx index 60ca6cf0..470e87c0 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/ignitusFullLogo/ignitusFullLogo.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/ignitusFullLogo/ignitusFullLogo.tsx @@ -3,7 +3,6 @@ import {HTMLAttributes} from 'react'; type Props = HTMLAttributes; const IgnitusFullLogo = ({title = 'KeyBoardArrowDown', ...rest}: Props) => { - console.log('dd', {...rest}); return ( ; + +const MapMarkerIcon = ({title = 'Map Marker Icon', ...rest}: Props) => { + return ( + + {title} + + + ); +}; + +export default MapMarkerIcon; + +/* SVG credits goes to https://material.io/resources/icons/ */ diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms.ts index d36504e2..e13160fe 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms.ts @@ -55,13 +55,6 @@ export const BottomSection = styled.section` } `; -export const BottomRow = styled.div` - margin: 16px 90px; - justify-content: center; - display: flex; - flex-wrap: wrap; -`; - // We plan to use Container as parent element of in lot of components. export const Container = styled.div` ${minimumWidthQuery[0]} { diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/buttons.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/buttons.ts index e314d4d8..7ae3ec6b 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/buttons.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/buttons.ts @@ -46,7 +46,7 @@ export const Button = styled(ParentButton)` border: ${props => getBorder(props)}; a { - color: ${C.White}; + color: ${props => getColor(props)}; } &:hover, diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts.ts index 7fdecab1..b75eb934 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts.ts @@ -4,6 +4,7 @@ export const SecondaryFamily: string = 'Open Sans, sans-serif'; /* Font Weights */ export const Light: number = 300; export const Normal: number = 400; +export const SemiNormal: number = 500; export const Medium: number = 600; export const SemiBold: number = 700; export const Bold: number = 800; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components/defaultButtonWithIcon.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components/defaultButtonWithIcon.tsx index 21e20079..c21d5bea 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components/defaultButtonWithIcon.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components/defaultButtonWithIcon.tsx @@ -3,7 +3,13 @@ import {Button} from '../../buttons'; import {StyledIcon} from '../styles'; import {BtnProps} from '../types'; -const DefaultButtonWithIcon = ({size, category, name, content, ...rest}: BtnProps) => ( +const DefaultButtonWithIcon = ({ + size, + category, + name, + content, + ...rest +}: BtnProps) => ( diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/Components/defaultMultiMediaInput.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/Components/defaultMultiMediaInput.tsx index 7819182e..8881083f 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/Components/defaultMultiMediaInput.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/Components/defaultMultiMediaInput.tsx @@ -1,39 +1,67 @@ import React from 'react'; -import {InputTypes} from '../types'; -import {AppIcon} from '../../../../types/iconsTypes/iconEnums'; +import { InputTypes } from '../types'; +import { AppIcon } from '../../../../types/iconsTypes/iconEnums'; import * as I from '../styles'; -const DefaultMultiMediaInput = ({placeholder, name}: InputTypes) => ( - - - - - - - - - - - - - - - - - - - - - - - - - {' '} - Post +const DefaultMultiMediaInput = ({ placeholder, name, maxHeightOfInput = 200, initialHeight }: InputTypes) => { + + let overflowVisible = false; + + const setOverflowVisible = e => { + e.target.style.overflow = 'visible'; + overflowVisible = true; + } + + const setOverflowHidden = e => { + e.target.style.overflow = 'hidden'; + overflowVisible = false; + }; + + const setHeight = e => { + if (e.target.scrollHeight > maxHeightOfInput) { + if (!overflowVisible) { + setOverflowVisible(e); + e.target.style.height = `${maxHeightOfInput}px`; + } + } else { + e.target.style.height = 'auto'; + if (overflowVisible) setOverflowHidden(e); + e.target.style.height = `${e.target.scrollHeight}px`; + } + }; + + return ( + + + + + + + + + + + + + + + + + + + + + + + + + {' '} + Post - - - -); + + + + ) +}; export default DefaultMultiMediaInput; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/styles.ts index 0b7cab25..fcfd0993 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/styles.ts @@ -27,12 +27,13 @@ export const BottomContainer = styled.div` margin-top: 0.5rem; `; -export const Input = styled.textarea` +export const Input = styled.textarea<{ initialHeight?: string }>` flex: 1; border: none; outline: none; overflow: hidden; font-size: ${SM}; + height: ${ props => props.initialHeight ? props.initialHeight : 'auto' }; resize: none; &::placeholder { color: ${C.GreyOne}; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/types.ts index 8280b8b4..90c42e09 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/types.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/types.ts @@ -1,4 +1,6 @@ export type InputTypes = { placeholder: string; name: string; + maxHeightOfInput?: number; + initialHeight?: string; }; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components/index.tsx index e8739fda..f38e2407 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components/index.tsx @@ -13,7 +13,7 @@ export const Notfound = () => ( Looks like you're lost! - The page you are looking for is not available! 🔨 + The page you are looking for is not available! 🔨 diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-UnderContruction/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-UnderContruction/Components/index.tsx index 7680418d..3cadd70b 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-UnderContruction/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-UnderContruction/Components/index.tsx @@ -12,10 +12,10 @@ export const WebsiteUnderConstruction = () => ( Our site is under maintenance - We are working on making better experiences for you. 🔨 + We are working on making better experiences for you. 🔨 - We should be back shortly, Thank you for the patience. ☘️ + We should be back shortly, Thank you for the patience. ☘️ diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Footer/Components/Footer.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Footer/Components/Footer.tsx index 1f52e78b..40e14186 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Footer/Components/Footer.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Footer/Components/Footer.tsx @@ -36,8 +36,8 @@ const PureFooter: React.FunctionComponent = ({
  • Personal
  • Partners
    • -
  • Ignitus Woo-Tech
    • -
  • Ignitus Scholar
    • +
  • Ignitus Woo-Tech
    • +
  • Ignitus Scholar
    • @@ -49,9 +49,9 @@ const PureFooter: React.FunctionComponent = ({ Company -
  • About
    • -
  • Careers
    • -
  • Blog
    • +
  • About
    • +
  • Careers
    • +
  • Blog
    • @@ -70,14 +70,14 @@ const PureFooter: React.FunctionComponent = ({ -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • © 2018 Copyright Ignitus diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/Navigation.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/Navigation.tsx index 50a4995a..ed293648 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/Navigation.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/Navigation.tsx @@ -5,8 +5,8 @@ import { Link } from 'react-router-dom'; import { HashLink } from 'react-router-hash-link'; import logo from '../../../ignitus-Assets/ignitus-Logos/logo-Svg/ignitusBlueLogo.svg'; import blackLogo from '../../../ignitus-Assets/ignitus-Logos/logo-Svg/ignitusBlackLogo.svg'; +import { PureNavigationProps, displayClassTypes, NavigationProps } from '../types'; import '../Styles/style.scss'; -import { PureNavigationProps, displayClassTypes } from '../types'; const handleSmallerScreen = () => { const navlinks = document.querySelector('.navlinks'); @@ -17,7 +17,7 @@ const handleSmallerScreen = () => { navlinks?.classList.toggle('mobile'); }; -const PureNavigation: React.FunctionComponent = ({ displayClass, dynamicLogo }) => ( +const PureNavigation: React.FC = ({ displayClass, dynamicLogo }) => ( ); - const Navigation: React.FunctionComponent = () => { + const [navScrolled, setNavScrolled] = useState(false); const [displayClass, setDisplayClass] = useState('transparent'); const [dynamicLogo, setDynamicLogo] = useState(blackLogo); @@ -98,4 +98,9 @@ const Navigation: React.FunctionComponent = () => { return ; }; -export default React.memo(Navigation); +const OptionalNavigations: React.FC = ({ dynamicNavigation = false }) => { + if (!dynamicNavigation) return ; + return +}; + +export default React.memo(OptionalNavigations); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Styles/style.scss b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Styles/style.scss index 692ec03f..9431b62e 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Styles/style.scss +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Styles/style.scss @@ -1,3 +1,6 @@ +$base-color: #000e8c; +$hover-color: #f9bf64; + .navbar { align-items: center; display:flex; @@ -24,10 +27,11 @@ .navlink{ color: #fff; - font-weight: 700; font-size: 14px; + font-weight: 700; + &:hover { - color: #F9BF64; + color: $hover-color; } } @@ -43,7 +47,7 @@ .line{ display:block; - background-color:#000e8c; + background-color: $base-color; padding:0.1rem 0.8rem; width:0.1rem; margin:0.3rem; @@ -54,16 +58,20 @@ .navbar.whitenav{ background-color:#fff; .navlink{ - color:#000e8c; + color: $base-color; + + &:hover { + color: $hover-color; + } } } -.line.mobile:first-child{ +.line.mobile:first-of-type{ transform: rotateZ(46deg) translateY(0.3rem) translateX(1px); } .line.mobile:last-child{ - transform: rotateZ(-43deg) translateY(-0.3rem) + transform: rotateZ(-43deg) translateY(-0.3rem); } .line.mobile:nth-child(2){ @@ -84,7 +92,7 @@ .navlinks.mobile{ display:none; - } + } .navlinks{ flex-direction: column; @@ -104,8 +112,7 @@ } .navlink{ - color:#000e8c; + color: $base-color; } } - \ No newline at end of file diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/types.ts index c017c452..f0b8252b 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/types.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/types.ts @@ -4,3 +4,7 @@ export interface PureNavigationProps { displayClass: displayClassTypes; dynamicLogo: any; }; + +export interface NavigationProps { + dynamicNavigation?: boolean; +}; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/Components/OppurtunityList.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/Components/OppurtunityList.tsx index d1d3b798..efc37ec6 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/Components/OppurtunityList.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/Components/OppurtunityList.tsx @@ -19,7 +19,7 @@ export const Opportunity: React.FunctionComponent = () => ( - Full Time | Munich, Germany 🇩🇪 + Full Time | Munich, Germany 🇩🇪 diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/styles.ts index d1902ef4..f48ce67a 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/styles.ts @@ -1,24 +1,17 @@ import styled from '@emotion/styled'; import * as T from '../../ignitus-Atoms/typography'; import * as C from '../../ignitus-Atoms/colors'; -import { - flexibleColDiv, - flexibleRowDiv, - } from '../../shared'; -import { Normal, MD} from '../../ignitus-Atoms/fonts'; +import {flexibleColDiv, flexibleRowDiv} from '../../shared'; +import {Normal, MD} from '../../ignitus-Atoms/fonts'; import ApplyIcon from '../../ignitus-Assets/ignitus-Icons/applyIcon/applyIcon'; -import { Paragraph } from '../../shared'; +import {Paragraph} from '../../shared'; - -export const OpportunityList = styled(flexibleColDiv)` - padding: 2rem; -`; +export const OpportunityList = styled(flexibleColDiv)``; export const OpportunityContainer = styled(flexibleRowDiv)` border-radius: 4px; box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.05); background-color: ${C.White}; - margin: 0.5rem; padding: 1rem; width: 100%; `; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/Components/index.tsx new file mode 100644 index 00000000..2dcfa2e1 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/Components/index.tsx @@ -0,0 +1,71 @@ +/* eslint-disable import/extensions */ +/* eslint-disable jsx-a11y/accessible-emoji */ +import React from 'react'; +import * as S from '../styles'; +import { withErrorBoundary } from '../../../../ignitus-ErrorHandlingComponents/errorBoundary'; +import { AppIcon } from '../../../../types/iconsTypes/iconEnums'; +import { Props } from '../types'; + +export const UserProfileCard = withErrorBoundary(() => ( + + + Track Sophi progress + + + + + +
    + +
    + + Sophia Carter + Literature Student + + + +     + + + + + + + + + + + + + + + + + + + + + +     +     +)); + +const DropDownButton = () => ( + + + More ... + + Ask For Recommendation + Share Profile + Block + + + +); + +const IconContent = ({ content, name }: Props) => ( + + + {content} + +); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/styles.ts new file mode 100644 index 00000000..cbfb9f38 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/styles.ts @@ -0,0 +1,175 @@ +import styled from '@emotion/styled'; +import * as C from '../../ignitus-Atoms/colors'; + +import { + flexibleColDiv, + flexibleRowDiv, + Link as L, + Paragraph as P, +} from '../../shared'; +import {Heading1, Heading4} from '../../ignitus-Atoms/typography'; +import {XXXL, SemiBold, Normal} from '../../ignitus-Atoms/fonts'; + +import {default as I} from '../../../ignitus-Utilities/Components/icon'; +import {ParagraphProps} from './types'; + +export const Container = styled.div` + display: flex; + width: 60rem; + flex-direction: column; + padding: 1rem 2rem; + border-radius: 1rem; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1); + background-color: ${C.White}; + color: ${C.IgnitusBlue}; +`; + +export const TopSection = styled.div` + text-align: end; +`; + +export const BottomSection = styled.div` + display: flex; + flex-direction: row; + padding: 1rem; +`; + +export const LeftRow = styled.div` + display: flex; + flex-direction: row; + flex: 2; + justify-content: flex-start; +`; + +export const Avatar = styled.img` + width: 10rem; + border-radius: 1rem; +`; + +export const MiddleRow = styled.div` + display: flex; + flex-direction: column; +`; + +export const ImageContainer = styled(flexibleRowDiv)` + width: 200px; + height: 190px; + img { + width: 100%; + height: 100%; + border-radius: 15px; + } +`; + +export const Paragraph = styled(P)` + color: ${props => (props.primary ? C.IgnitusBlue : C.GreySecondaryText)}; + font-weight: ${Normal}; + display: inline; + margin: ${props => props.margin}; +`; + +export const Name = styled(Heading1)` + font-size: ${XXXL}; + font-weight: ${SemiBold}; +`; + +export const Designation = styled(Heading4)` + margin-bottom: 1rem; + margin-top: 1rem; +`; + +export const ProfileInformationContainer = styled.div` + margin-left: 4rem; +`; + +export const RightRow = styled(flexibleColDiv)` + flex: 1; + align-items: flex-start; +`; + +export const Contact = styled.div` + display: flex; + flex-direction: column; + width: 100%; +`; + +export const Icons = styled(flexibleRowDiv)` + margin-bottom: 2rem; +`; + +export const Link = styled(L)` + margin-right: 2rem; + display: inline-block; +`; + +export const Icon = styled(I)` + width: 1.5rem; + fill: ${C.IgnitusBlue}; + path { + } +`; + +export const Wrapper = styled.div` + display: flex; + margin: 0.6rem 0; + flex-direction: row; +`; + +export const DropDownBtnContainer = styled.div` + position: relative; + margin-top: 1rem; +`; + +export const DropDownBtn = styled.div` + font-weight: bold; + color: ${C.GreyOne}; + cursor: pointer; + display: inline-block; + padding-bottom: 10px; + transition: all 0.4s; + width: fit-content; + + &:hover { + ul { + display: block; + } + } +`; + +export const DropDownMenu = styled.ul` + z-index: 3; + position: absolute; + top: 30px; + left: 0; + border-radius: 10px 0 10px 10px; + box-shadow: 0 0 4px 4px rgba(0, 0, 0, 0.1); + background-color: ${C.White}; + color: ${C.IgnitusBlue}; + display: none; + font-weight: 400; + + &:hover { + display: block; + } +`; + +export const DropDownMenuListItem = styled.li` + padding: 0.5em 1em; + font-size: 14px; + width: 200px; + + &:first-of-type { + border-top-left-radius: 10px; + } + + &:last-child { + border-bottom-left-radius: 10px; + border-bottom-right-radius: 10px; + } + + &:hover { + color: ${C.White}; + background-color: ${C.IgnitusBlue}; + cursor: pointer; + } +`; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/types.ts new file mode 100644 index 00000000..669c4aff --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/types.ts @@ -0,0 +1,10 @@ +import {AppIcon} from '../../../types/iconsTypes/iconEnums'; +export type Props = { + content: string; + name: AppIcon; +}; + +export type ParagraphProps = { + margin: string; + primary?: boolean; +}; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Templates/ignitus-Authentication/Components/SplittedComponents/SideWrapperComponent/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Templates/ignitus-Authentication/Components/SplittedComponents/SideWrapperComponent/index.tsx index 79f81b03..c1529101 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Templates/ignitus-Authentication/Components/SplittedComponents/SideWrapperComponent/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Templates/ignitus-Authentication/Components/SplittedComponents/SideWrapperComponent/index.tsx @@ -17,7 +17,7 @@ export const SideWrapper: FunctionComponent = ({

    Let's get started

    -

    Skyrocket your career with best global opportunities. 🎓

    +

    Skyrocket your career with best global opportunities. 🎓

    { case AppIcon.MentorsIcon: return ; + case AppIcon.FileIcon: + return ; + + case AppIcon.MapMarkerIcon: + return ; + + case AppIcon.BookmarkIcon: + return ; + case AppIcon.KeyBoardArrowDown: return ; @@ -116,7 +128,7 @@ const Icon = ({name, ...rest}: Props) => { return ; case AppIcon.VideoLibIcon: - return + return ; case AppIcon.GithubIcon: return ; @@ -134,7 +146,7 @@ const Icon = ({name, ...rest}: Props) => { return ; case AppIcon.PollIcon: - return ; + return ; case AppIcon.LibraryBooksIcon: return ; @@ -149,7 +161,7 @@ const Icon = ({name, ...rest}: Props) => { return ; case AppIcon.CameraIcon: - return + return ; } }; diff --git a/src/ignitus-Shared/ignitus-Utilities/HelperFunctions/emotionHelpers.ts b/src/ignitus-Shared/ignitus-Utilities/HelperFunctions/emotionHelpers.ts index df6e28ce..15ce2b7b 100644 --- a/src/ignitus-Shared/ignitus-Utilities/HelperFunctions/emotionHelpers.ts +++ b/src/ignitus-Shared/ignitus-Utilities/HelperFunctions/emotionHelpers.ts @@ -84,7 +84,7 @@ export const getColor = ({category}: ButtonProperties) => { return White; case CategoryEnums.Orange: - return White; + return IgnitusBlue; case CategoryEnums.Yellow: return GreySecondaryText; diff --git a/src/ignitus-Shared/styles/ignitus-utilities.scss b/src/ignitus-Shared/styles/ignitus-utilities.scss index 993971d9..b0f7e937 100644 --- a/src/ignitus-Shared/styles/ignitus-utilities.scss +++ b/src/ignitus-Shared/styles/ignitus-utilities.scss @@ -2,14 +2,10 @@ .bg-triangle { background: url('/images/splitBlueBackground.png') no-repeat; - background-size: 70%; + background-size: 54%; background-position: top right; } -.content-container { - margin-top: 4rem; -} - .title { font-weight: $ignite-font-weight-normal; font-size: $ignite-font-size-lg; diff --git a/src/ignitus-Shared/types/iconsTypes/iconEnums.ts b/src/ignitus-Shared/types/iconsTypes/iconEnums.ts index d2197691..6065ec95 100644 --- a/src/ignitus-Shared/types/iconsTypes/iconEnums.ts +++ b/src/ignitus-Shared/types/iconsTypes/iconEnums.ts @@ -34,5 +34,8 @@ export enum AppIcon { GraduationCapIcon = 'GraduationCapIcon', AccountCircleIcon = 'AccountCircleIcon', NotificationIcon = 'NotificationIcon', - VideoLibIcon = 'VideoLibrary', + FileIcon = 'FileIcon', + BookmarkIcon = 'BookmarkIcon', + MapMarkerIcon = 'MapMarkerIcon', + VideoLibIcon = 'VideoLibrary' } diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components/index.ts deleted file mode 100644 index eeb74f9c..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as interfaceButttons} from './interfaceButtons'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components/interfaceButtons.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components/index.tsx similarity index 85% rename from src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components/interfaceButtons.tsx rename to src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components/index.tsx index 9fbbdee6..a49d2e4f 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components/interfaceButtons.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components/index.tsx @@ -1,17 +1,17 @@ import React from 'react'; -import {ButtonsContainer} from '../style'; - import * as B from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/buttons'; -import {StyledHeading2, StyledHeading6} from '../../../../styles'; -import {DefaultButtonWithIcon} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components'; -import {AppIcon} from '../../../../../ignitus-Shared/types/iconsTypes/iconEnums'; + +import { DefaultButtonWithIcon } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components'; +import { AppIcon } from '../../../../../ignitus-Shared/types/iconsTypes/iconEnums'; +import { Heading2, Heading6 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { Interface } from '../../../../styles'; { /* https://miro.medium.com/max/2800/1*rPFTtW01pNiPF7nwuJER5Q.png */ } -const interfaceButttons: React.FC = () => ( - - Buttons +export const interfaceButttons: React.FC = () => ( + + Buttons {' '} Primary Button{' '} @@ -68,7 +68,7 @@ const interfaceButttons: React.FC = () => ( />

    - Medium Size Buttons + Medium Size Buttons {' '} Primary Button{' '} @@ -125,7 +125,7 @@ const interfaceButttons: React.FC = () => ( />
    - Small Size Buttons + Small Size Buttons {' '} Primary Button{' '} @@ -182,7 +182,7 @@ const interfaceButttons: React.FC = () => ( />
    - Text Button + Text Button {' '} Text Button{' '} @@ -197,7 +197,7 @@ const interfaceButttons: React.FC = () => (
    - Styled Buttons + Styled Buttons {' '} @@ -224,7 +224,7 @@ const interfaceButttons: React.FC = () => ( Button Top Left{' '} - Medium Size Buttons + Medium Size Buttons {' '} @@ -246,7 +246,7 @@ const interfaceButttons: React.FC = () => ( Button Bottom Right{' '} - Small Size Buttons + Small Size Buttons {' '} @@ -273,7 +273,7 @@ const interfaceButttons: React.FC = () => ( Button Top Left{' '}
    - Rounded Button + Rounded Button {' '} Rounded Button{' '} @@ -299,7 +299,7 @@ const interfaceButttons: React.FC = () => ( Rounded Button{' '} - Medium Size Buttons + Medium Size Buttons {' '} @@ -327,12 +327,10 @@ const interfaceButttons: React.FC = () => (
    - Social Buttons - Button with Icons - Floating Action Button - Icon with text link - Icon Button - + Social Buttons + Button with Icons + Floating Action Button + Icon with text link + Icon Button + ); - -export default interfaceButttons; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/style.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/style.ts deleted file mode 100644 index bb902f9d..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/style.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const ButtonsContainer = styled.div` - padding: 3rem; -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components/index.ts deleted file mode 100644 index 49c448cb..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as interfaceCards } from './interfaceCards'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components/index.tsx new file mode 100644 index 00000000..e368dc70 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components/index.tsx @@ -0,0 +1,12 @@ +import React from 'react'; +import { Interface } from '../../../../styles'; +import { Card } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; + +export const interfaceCards: React.FC = () => ( + + Cards +
    + Card +     +); diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components/interfaceCards.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components/interfaceCards.tsx deleted file mode 100644 index dba24efc..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components/interfaceCards.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import {StyledHeading2} from '../../../../styles'; -import {CardsContainer} from '../styles'; -import {Card} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/atoms'; - -const interfaceCards: React.FC = () => ( - - Cards -
    - Card -     -); - -export default interfaceCards; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/styles.ts deleted file mode 100644 index 9bd819c2..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/styles.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const CardsContainer = styled.nav` - padding: 2rem; -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/Components/index.ts deleted file mode 100644 index f74d048a..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as interfaceCheckBox} from './interfaceCheckBox'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/Components/index.tsx new file mode 100644 index 00000000..20ef96ea --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/Components/index.tsx @@ -0,0 +1,12 @@ +import React from 'react'; +import { DefaultCheckbox } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components'; +import { Interface } from '../../../../styles'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; + +export const interfaceCheckBox: React.FC = () => ( + + Check Box +
    + +     +); diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/Components/interfaceCheckBox.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/Components/interfaceCheckBox.tsx deleted file mode 100644 index 94cafaa9..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/Components/interfaceCheckBox.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import * as C from '../styles'; -import {DefaultCheckbox} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components'; -import { StyledHeading2 } from '../../../../styles'; - -const interfaceCheckBox: React.FC = () => ( - - Check Box -
    - -     -); - -export default interfaceCheckBox; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/styles.ts deleted file mode 100644 index 53158f35..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceCheckBox/styles.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const CheckBoxContainer = styled.div` - padding: 3rem; -`; \ No newline at end of file diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceColors/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceColors/Components/index.ts deleted file mode 100644 index 53cd95ba..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceColors/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as interfaceColors} from './interfaceColors'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceColors/Components/interfaceColors.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceColors/Components/index.tsx similarity index 58% rename from src/ignitus-UserInterfaceBook/Components/Atoms/interfaceColors/Components/interfaceColors.tsx rename to src/ignitus-UserInterfaceBook/Components/Atoms/interfaceColors/Components/index.tsx index ce70990b..ff7b3d41 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceColors/Components/interfaceColors.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceColors/Components/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; import * as C from '../styles'; -import {StyledHeading2} from '../../../../styles'; +import { Interface } from '../../../../styles'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; import { PrimaryColors, GreyShades, @@ -8,24 +9,23 @@ import { SocialPlatformColors, } from '../constants'; -const interfaceColors: React.FC = () => ( - - Primary Colors + +export const interfaceColors: React.FC = () => ( + + Primary Colors
    - Grey Shades + Grey Shades
    - Basic Colors + Basic Colors
    - Social Platforms Colors + Social Platforms Colors
    -     + ); const ColorsMapper: Function = ({colors}: {colors: string[]}): JSX.Element[] => colors.map((color: string) => {color} ); - -export default interfaceColors; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/Components/index.ts deleted file mode 100644 index 74687a69..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as interfaceDropDown} from './interfaceDropDown'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/Components/interfaceDropDown.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/Components/index.tsx similarity index 72% rename from src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/Components/interfaceDropDown.tsx rename to src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/Components/index.tsx index 3c930600..f6069352 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/Components/interfaceDropDown.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/Components/index.tsx @@ -1,16 +1,17 @@ import React from 'react'; -import * as D from '../styles'; + import DefaultDropdown from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultDropdown/Components/defaultDropdown'; + import {cars} from '../constants'; +import { Interface } from '../../../../styles'; import { - Heading3, + Heading2, Heading5, } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; -const interfaceDropDown: React.FC = () => ( - - DropDowns -
    +export const interfaceDropDown: React.FC = () => ( + + DropDowns
    Inline Block @@ -18,7 +19,5 @@ const interfaceDropDown: React.FC = () => (
    Block -     + ); - -export default interfaceDropDown; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/styles.ts deleted file mode 100644 index bb4a1a93..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceDropDown/styles.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const DropDownContainer = styled.div` - padding: 3rem; -`; \ No newline at end of file diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/Components/index.ts deleted file mode 100644 index 64bd3eb8..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as interfaceIconInput } from './interfaceIconInput'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/Components/interfaceIconInput.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/Components/index.tsx similarity index 64% rename from src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/Components/interfaceIconInput.tsx rename to src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/Components/index.tsx index 3f7b6caa..93ee0f5f 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/Components/interfaceIconInput.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/Components/index.tsx @@ -1,18 +1,20 @@ import React from 'react'; -import {InputContainer} from '../styles'; + import { - Heading3, + Heading2, Heading4, } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; -import {DefaultIconInput} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components'; -import {AppIcon} from '../../../../../ignitus-Shared/types/iconsTypes/iconEnums'; + +import { DefaultIconInput } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components'; +import { AppIcon } from '../../../../../ignitus-Shared/types/iconsTypes/iconEnums'; +import { Interface } from '../../../../styles'; const copy = value => console.log('copied: ', value); const handleChange = value => console.log('change: ', value); -const interfaceIconInput = () => ( - - Input with Icon +export const interfaceIconInput = () => ( + + Input with Icon
    Direct link ( handleChange={handleChange} position="row-reverse" /> -     + ); - -export default interfaceIconInput; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/styles.ts deleted file mode 100644 index fcc75a06..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIconInput/styles.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const InputContainer = styled.div` - padding: 1rem; -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components/index.ts deleted file mode 100644 index 1a73c064..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as interfaceIcons} from './interfaceIcons'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components/interfaceIcons.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components/index.tsx similarity index 59% rename from src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components/interfaceIcons.tsx rename to src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components/index.tsx index 9443bf46..f6b81c12 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components/interfaceIcons.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components/index.tsx @@ -1,34 +1,32 @@ import React from 'react'; import * as I from '../styles'; -import {StyledHeading2} from '../../../../styles'; import {AppIcon} from '../../../../../ignitus-Shared/types/iconsTypes/iconEnums'; -import { Heading4 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { Heading4, Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; import { SocialIcons, DashboardIcons, GeneralIcons, IgnitusLogos, } from '../constants'; +import { Interface } from '../../../../styles'; -const interfaceIcons: React.FC = () => ( - +export const interfaceIcons: React.FC = () => ( + We are mainly using the Material Rounded Icon Library and some other icons from Flaticon and Fa-Fa icons. - Social Icons 🎨 + Social Icons 🎨
    - Dashboard Icons + Dashboard Icons
    - General Icons + General Icons
    - Ignitus Logos + Ignitus Logos -     + ); const IconsMapper: Function = ({icons}: {icons: AppIcon[]}): JSX.Element[] => icons.map((icon: AppIcon) => ); - -export default interfaceIcons; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/styles.ts index 6e534dc1..6e109079 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/styles.ts +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/styles.ts @@ -1,10 +1,6 @@ import styled from '@emotion/styled'; import Icon from '../../../../ignitus-Shared/ignitus-Utilities/Components/icon'; -export const IconsContainer = styled.div` - padding: 3rem; -`; - export const StyledIcon = styled(Icon)` height: 2rem; margin: 1rem; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components/index.ts deleted file mode 100644 index 52fa8c53..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as interfaceInput} from './interfaceInput'; \ No newline at end of file diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components/interfaceInput.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components/index.tsx similarity index 62% rename from src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components/interfaceInput.tsx rename to src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components/index.tsx index 6cd303d9..9d2dc951 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components/interfaceInput.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components/index.tsx @@ -1,16 +1,16 @@ import React from 'react'; -import { InputContainer } from '../styles'; + import { DefaultInput } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultInput/Components'; + import { - Heading3, + Heading2, } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { Interface } from '../../../../styles'; -const interfaceInput: React.FC = () => ( - - Input Fields +export const interfaceInput: React.FC = () => ( + + Input Fields
    -     + ); - -export default interfaceInput; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/styles.ts deleted file mode 100644 index 57e08ea1..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/styles.ts +++ /dev/null @@ -1,6 +0,0 @@ -import styled from '@emotion/styled'; - -export const InputContainer = styled.div` - padding: 1rem; - -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/Components/index.ts deleted file mode 100644 index 5d22dcbf..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as interfaceMultiMediaInput } from './interfaceMultiMediaInput'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/Components/index.tsx new file mode 100644 index 00000000..1c4c0326 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/Components/index.tsx @@ -0,0 +1,19 @@ +import React from 'react'; + +import { DefaultMultiMediaInput } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/Components'; +import { Interface } from '../../../../styles'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; + +export const interfaceMultiMediaInput = () => ( + + Multimedia Text Input +
    + + +     +); diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/Components/interfaceMultiMediaInput.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/Components/interfaceMultiMediaInput.tsx deleted file mode 100644 index 533b4ee4..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/Components/interfaceMultiMediaInput.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import React from 'react'; -import {MultiMediaInputContainer} from '../styles'; -import {DefaultMultiMediaInput} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultMulti/Components'; -import {StyledHeading2} from '../../../../styles'; - -const interfaceMultiMediaInput = () => ( - - Multimedia Text Input -
    - - -     -); - -export default interfaceMultiMediaInput; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/styles.ts deleted file mode 100644 index 4e034a26..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceMulti/styles.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const MultiMediaInputContainer = styled.nav` - padding: 2rem; -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components/index.ts deleted file mode 100644 index e3c31efe..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as interfaceSearchInput } from './interfaceSearchInput'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components/interfaceSearchInput.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components/index.tsx similarity index 50% rename from src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components/interfaceSearchInput.tsx rename to src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components/index.tsx index 56e302f9..c344fcb8 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components/interfaceSearchInput.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components/index.tsx @@ -1,11 +1,12 @@ import React from 'react'; -import {SearchInputContainer} from '../styles'; + import {DefaultSearchInput} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultSearchInput/Components'; -import { StyledHeading2 } from '../../../../styles'; +import { Interface } from '../../../../styles'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; -const interfaceSearchInput: React.FC = () => ( - - Search Input +export const interfaceSearchInput: React.FC = () => ( + + Search Input
    ( type={'text'} name={'name'} /> -     + ); - -export default interfaceSearchInput; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/styles.ts deleted file mode 100644 index e3ed0a00..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/styles.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const SearchInputContainer = styled.nav` - padding: 2rem; -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components/index.ts deleted file mode 100644 index 5bb8d7ed..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as interfaceSeparator } from './interfaceSeparator'; \ No newline at end of file diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components/index.tsx new file mode 100644 index 00000000..b0717149 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components/index.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import {SeparatorContainer, Separator} from '../styles'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; + +export const interfaceSeparator: React.FC = () => ( + + Separator +
    + +     +); diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components/interfaceSeparator.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components/interfaceSeparator.tsx deleted file mode 100644 index 574975e6..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components/interfaceSeparator.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react'; -import {StyledHeading2} from '../../../../styles'; -import {SeparatorContainer, Separator} from '../styles'; - -const interfaceSeparator: React.FC = () => ( - - Separator -
    - -     -); - -export default interfaceSeparator; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components/index.ts deleted file mode 100644 index 742afe8a..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as interfaceTypography } from './interfaceTypography'; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components/interfaceTypography.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components/index.tsx similarity index 64% rename from src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components/interfaceTypography.tsx rename to src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components/index.tsx index 17f7bb6b..aaeede4b 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components/interfaceTypography.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components/index.tsx @@ -1,6 +1,5 @@ import React from 'react'; -import {StyledHeading2} from '../../../../styles'; -import {TypographyContainer} from '../styles'; + import { Heading1, Heading2, @@ -11,10 +10,11 @@ import { Paragraph, TextLink, } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { Interface } from '../../../../styles'; -const interfaceTypography: React.FC = () => ( - - Typography ★ +export const interfaceTypography: React.FC = () => ( + + Typography
    Heading 1 Heading 2 @@ -24,7 +24,5 @@ const interfaceTypography: React.FC = () => ( Heading 6 Paragraph Text Link -     + ); - -export default interfaceTypography; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/styles.ts deleted file mode 100644 index cc5a1aa4..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/styles.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const TypographyContainer = styled.nav` - padding: 2rem; -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components/index.ts deleted file mode 100644 index 8a33649c..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as interfaceNotFound } from './interfaceNotFound'; diff --git a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components/interfaceNotFound.tsx b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components/index.tsx similarity index 62% rename from src/ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components/interfaceNotFound.tsx rename to src/ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components/index.tsx index ad478c2e..b98fc9b1 100644 --- a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components/interfaceNotFound.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components/index.tsx @@ -1,16 +1,15 @@ import React from 'react'; -import {StyledHeading2} from '../../../../styles'; + import {Notfound} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components/index'; import {NotFoundContainer, Container} from '../style'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; -const interfaceNotFound: React.FC = () => ( +export const interfaceNotFound: React.FC = () => ( - Not Found + Not Found
    ); - -export default interfaceNotFound; diff --git a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components/index.ts deleted file mode 100644 index ec9fddf4..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as interfaceSavedOpportunity } from './interfaceSavedOpportunity'; \ No newline at end of file diff --git a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components/interfaceSavedOpportunity.tsx b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components/index.tsx similarity index 54% rename from src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components/interfaceSavedOpportunity.tsx rename to src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components/index.tsx index fc36223b..2b0ed3f1 100644 --- a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components/interfaceSavedOpportunity.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components/index.tsx @@ -1,13 +1,15 @@ import React from 'react'; -import {StyledHeading2} from '../../../../styles'; -import {Container, Grid} from '../style'; -import {List} from '../constants'; -import {Opportunity} from '../types'; + +import { Grid } from '../style'; +import { List } from '../constants'; +import { Opportunity } from '../types'; import DashBoardOpportunity from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-DashBoardOpportunity/Components/DashBoardOpportunity'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { Interface } from '../../../../styles'; -const interfaceSavedOpportunity: React.FC = () => ( - - Opportunities Saved Layout ★ +export const interfaceSavedOpportunity: React.FC = () => ( + + Opportunities Saved Layout
    {List.map(({title, description, subtitle, src}: Opportunity) => ( @@ -20,7 +22,5 @@ const interfaceSavedOpportunity: React.FC = () => ( /> ))} -     + ); - -export default interfaceSavedOpportunity; diff --git a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/style.ts b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/style.ts index 07a4f23c..af128d55 100644 --- a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/style.ts +++ b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/style.ts @@ -1,9 +1,5 @@ import styled from '@emotion/styled'; -export const Container = styled.div` - padding: 2rem; -`; - export const Grid = styled.div` display: grid; grid-template-columns: repeat(2, 4fr); diff --git a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/Components/index.ts deleted file mode 100644 index 2652e17f..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as interfaceUnderConstruction } from './interfaceUnderConstruction'; diff --git a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/Components/index.tsx new file mode 100644 index 00000000..a2655fc8 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/Components/index.tsx @@ -0,0 +1,16 @@ +import React from 'react'; + +import { UnderConstructionContainer } from '../style'; +import { WebsiteUnderConstruction } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-UnderContruction/Components/index'; +import { Interface } from '../../../../styles'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; + +export const interfaceUnderConstruction: React.FC = () => ( + + UnderConstruction +
    + + + +     +); diff --git a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/Components/interfaceUnderConstruction.tsx b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/Components/interfaceUnderConstruction.tsx deleted file mode 100644 index 3752a820..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/Components/interfaceUnderConstruction.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import {StyledHeading2} from '../../../../styles'; -import {UnderConstructionContainer, Container} from '../style'; -import {WebsiteUnderConstruction} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-UnderContruction/Components/index'; - -const interfaceUnderConstruction: React.FC = () => ( - - UnderConstruction ★ -
    - - - -     -); - -export default interfaceUnderConstruction; diff --git a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/style.ts b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/style.ts index 3135ea01..8a0a2797 100644 --- a/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/style.ts +++ b/src/ignitus-UserInterfaceBook/Components/Layouts/interfaceUnderConstruction/style.ts @@ -3,8 +3,4 @@ import styled from '@emotion/styled'; export const UnderConstructionContainer = styled.div` display: flex; flex-direction: column; -`; - -export const Container = styled.div` - padding: 2rem; -`; +`; \ No newline at end of file diff --git a/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/Components/index.ts deleted file mode 100644 index 1f8d6b21..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as interfaceOverlay } from './interfaceOverlay'; diff --git a/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/Components/interfaceOverlay.tsx b/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/Components/index.tsx similarity index 58% rename from src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/Components/interfaceOverlay.tsx rename to src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/Components/index.tsx index d4206fb1..742e4571 100644 --- a/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/Components/interfaceOverlay.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/Components/index.tsx @@ -1,11 +1,11 @@ import React from 'react'; import Overlay from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components'; -import {OverlayContainer} from '../styles'; -import {StyledHeading2} from '../../../../styles'; +import { Interface } from '../../../../styles'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; -const interfaceOverlay = () => ( - - Overlay +export const interfaceOverlay = () => ( + + Overlay
    ( buttonText="Go Back" title="Hooray!" /> -     + ); - -export default interfaceOverlay; diff --git a/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/styles.ts b/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/styles.ts deleted file mode 100644 index 612f484f..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Molecules/interfaceOverlay/styles.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const OverlayContainer = styled.nav` - padding: 2rem; -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components/index.ts deleted file mode 100644 index e459c039..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as interfaceDashBoardFooter} from './interfaceDashBoardFooter'; \ No newline at end of file diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components/index.tsx new file mode 100644 index 00000000..b2baad8e --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components/index.tsx @@ -0,0 +1,14 @@ +import React from 'react'; + +import DashboardFooter from '../../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-DashboardFooter/Components'; + +import { Heading2 } from '../../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { Interface } from '../../../../../styles'; + +export const interfaceDashBoardFooter = () => ( + + Footer +
    + +     +); diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components/interfaceDashBoardFooter.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components/interfaceDashBoardFooter.tsx deleted file mode 100644 index 62ea0053..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components/interfaceDashBoardFooter.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react'; -import {DashBoardFooterContainer} from '../style'; -import {Heading3} from '../../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; -import DashboardFooter from '../../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-DashboardFooter/Components'; - -const interfaceDashBoardFooter = () => ( - - Footer -
    -
    - -     -); - -export default interfaceDashBoardFooter; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/style.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/style.ts deleted file mode 100644 index 1a562609..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/style.ts +++ /dev/null @@ -1,5 +0,0 @@ -import styled from '@emotion/styled'; - -export const DashBoardFooterContainer = styled.div` - padding: 3rem; -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components/index.ts deleted file mode 100644 index b35d4e9c..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as interfaceNavigation} from './interfaceNavigation'; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components/interfaceNavigation.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components/index.tsx similarity index 69% rename from src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components/interfaceNavigation.tsx rename to src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components/index.tsx index 1a036adb..dea8e4c6 100644 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components/interfaceNavigation.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components/index.tsx @@ -1,20 +1,21 @@ import React from 'react'; + import UserSettingsSideNavigation from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/Components'; import MessageSideNavigation from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-MessageSideNavigation/Components'; -import {NavigationContainer, Container} from '../style'; import DashboardNavigation from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-DashboardSideNavigation/Components/index'; -import {StyledHeading2} from '../../../../styles'; -const interfaceNavigation: React.FC = () => ( - - Navigation +import { NavigationContainer } from '../style'; +import { Heading2 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import { Interface } from '../../../../styles'; + +export const interfaceNavigation: React.FC = () => ( + + Navigation
    -     + ); - -export default interfaceNavigation; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/style.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/style.ts index 6e883e17..6fabded9 100644 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/style.ts +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/style.ts @@ -1,10 +1,5 @@ import styled from '@emotion/styled'; -export const Container = styled.div` - padding: 2rem; - flex: 1; -`; - export const NavigationContainer = styled.div` display: flex; flex-direction: row; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/Components/index.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/Components/index.ts deleted file mode 100644 index a8dd6dd7..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as interfaceOpportunity } from './interfaceOpportunity'; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/Components/index.tsx new file mode 100644 index 00000000..ac686b1d --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/Components/index.tsx @@ -0,0 +1,13 @@ +import React from 'react'; + +import Opportunity from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/Components/OppurtunityList'; +import {Heading2} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import {Interface} from '../../../../styles'; + +export const interfaceOpportunity: React.FC = () => ( + + Opportunity +
    + +     +); diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/Components/interfaceOpportunity.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/Components/interfaceOpportunity.tsx deleted file mode 100644 index 0107fee2..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/Components/interfaceOpportunity.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import {StyledHeading2} from '../../../../styles'; -import {CardLayoutContainer} from '../style'; -import Opportunity from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OppurtunityList/Components/OppurtunityList'; -import OpportunityFilters from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Templates/ignitus-filterComponents/OpportunityFilters/OpportunityFilters'; - -const interfaceOpportunity: React.FC = () => ( - - Card Layout ★ -
    - - -     -); - -export default interfaceOpportunity; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/style.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/style.ts deleted file mode 100644 index 7e87eda2..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunity/style.ts +++ /dev/null @@ -1,10 +0,0 @@ -import styled from '@emotion/styled'; -import { flexibleColDiv } from '../../../../ignitus-Shared/ignitus-DesignSystem/shared'; - -export const CardLayoutContainer = styled(flexibleColDiv)` - padding: 2rem; -`; - -export const OpportunitySaved = styled(flexibleColDiv)` - width: 50%; -`; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceUserProfile/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceUserProfile/Components/index.tsx new file mode 100644 index 00000000..f0c65138 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceUserProfile/Components/index.tsx @@ -0,0 +1,12 @@ +import React from 'react'; +import {Heading2} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import {Interface} from '../../../../styles'; +import {UserProfileCard} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/Components/index'; + +export const interfaceUserProfile: React.FC = () => ( + + User Profile +
    + +     +); diff --git a/src/ignitus-UserInterfaceBook/Components/Templates/interfaceFilters/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Templates/interfaceFilters/Components/index.tsx new file mode 100644 index 00000000..f44ff48a --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Templates/interfaceFilters/Components/index.tsx @@ -0,0 +1,12 @@ +import React from 'react'; +import {Heading2} from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; +import {Interface} from '../../../../styles'; +import OpportunityFilters from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Templates/ignitus-filterComponents/OpportunityFilters/OpportunityFilters'; + +export const interfaceFilters: React.FC = () => ( + + Filters +
    + +     +); diff --git a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/Components/index.ts b/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/Components/index.ts deleted file mode 100644 index e93940c1..00000000 --- a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/Components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { default as InterfaceSideNavigation } from './interfaceSideNavigation'; diff --git a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/Components/interfaceSideNavigation.tsx b/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/Components/index.tsx similarity index 94% rename from src/ignitus-UserInterfaceBook/InterfaceSideNavigation/Components/interfaceSideNavigation.tsx rename to src/ignitus-UserInterfaceBook/InterfaceSideNavigation/Components/index.tsx index 1e3a383a..d3aeac3a 100644 --- a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/Components/interfaceSideNavigation.tsx +++ b/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/Components/index.tsx @@ -6,7 +6,7 @@ import useToggle from '../../../ignitus-Shared/ignitus-Utilities/reactHooks/toog import {edges} from '../constants'; import {NavigationLayerProps} from '../types'; -const InterfaceSideNavigation = () => { +export const InterfaceSideNavigation = () => { return ( @@ -29,7 +29,7 @@ const Layers = ({edge, nesting, level}: any) => { const [isexpanded, toogleisexpanded] = useToggle(true); return ( - {edge.route == undefined && ( + {edge.route === undefined && ( {' '} {edge.title}{' '} @@ -62,5 +62,3 @@ const Extension = ({isexpanded, edge, nesting, level}) => { ) ); }; - -export default InterfaceSideNavigation; diff --git a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts b/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts index 262e2eef..60f8104c 100644 --- a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts +++ b/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts @@ -58,7 +58,7 @@ export const edges: Edges[] = [ children: [ { title: 'Checkboxes', - route: '/interface/checkboxes', + route: '/interface/defaultCheckbox', }, { title: 'Radio Buttons', diff --git a/src/ignitus-UserInterfaceBook/styles.ts b/src/ignitus-UserInterfaceBook/styles.ts index a2e1a191..9b902ffa 100644 --- a/src/ignitus-UserInterfaceBook/styles.ts +++ b/src/ignitus-UserInterfaceBook/styles.ts @@ -1,28 +1,5 @@ import styled from '@emotion/styled'; -import * as A from '../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; -import {GreyText} from '../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; -import {Medium} from '../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts'; -export const StyledHeading1 = styled(A.Heading1)` - text-align: center; -`; - -export const StyledHeading2 = styled(A.Heading2)` - margin: 20px 0; - font-weight: ${Medium}; -`; - -export const StyledHeading4 = styled(A.Heading4)` - margin: 20px 0; - color: ${GreyText}; -`; - -export const StyledHeading6 = styled(A.Heading6)` - margin: 10px 0; - color: ${GreyText}; -`; - -export const NavigationWrapper = styled.div` - display: grid; - grid-template-columns: 1fr 1fr 1fr; +export const Interface = styled.div` + padding: 3rem; `;