From 8b2ccc96a68be77fc47aa86c930b51deaab75ea3 Mon Sep 17 00:00:00 2001 From: Meghana Date: Sat, 16 May 2020 01:04:49 +0530 Subject: [PATCH 01/51] added Page --- .../Components/index.tsx | 103 ++++++++++++++++++ src/ignitus-OpportunityDetailsPage/styles.ts | 39 +++++++ .../ignitus-PublicRoutes/index.tsx | 5 + .../img-Png/UniversityOfMelbourne.png | Bin 0 -> 33381 bytes .../Components/index.tsx | 44 ++++++++ .../ingitus-OpportunityDetailsCard/styles.ts | 85 +++++++++++++++ .../ingitus-OpportunityDetailsCard/types.ts | 7 ++ 7 files changed, 283 insertions(+) create mode 100644 src/ignitus-OpportunityDetailsPage/Components/index.tsx create mode 100644 src/ignitus-OpportunityDetailsPage/styles.ts create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/UniversityOfMelbourne.png create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index.tsx create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/types.ts diff --git a/src/ignitus-OpportunityDetailsPage/Components/index.tsx b/src/ignitus-OpportunityDetailsPage/Components/index.tsx new file mode 100644 index 00000000..3f23bf51 --- /dev/null +++ b/src/ignitus-OpportunityDetailsPage/Components/index.tsx @@ -0,0 +1,103 @@ +import React from 'react'; +import OpportunityDetailsCard from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index'; +import { Container } from '../../ignitus-Shared/ignitus-DesignSystem/shared'; +import UniversityOfMelbourne from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/UniversityOfMelbourne.png'; +import { Heading1, Paragraph } from '../../ignitus-Shared'; +import * as C from '../styles'; + +export const OpportunityDetailsPage = () => ( + + + + + Project Description + + + + Project Description This project will advance our understanding of the + operation of the law, and of legal specialists, in Scotland from the + late fifteenth to the early seventeenth century. Aberdeen and the + North-East present a rich source-base with which to pursue this theme. + Manuscript sources held in the University’s Special Collections Centre + and in the Aberdeen City & Aberdeenshire Archives are ripe for the + investigation of the range of law courts which functioned in the + region, at franchise, burgh, sheriffdom, and church levels. The era of + the Reformation brought significant change to the nature of church + courts, and the dynamism of the Scottish legal system in this period + promoted the emergence and development of a recognisable legal + profession. Aberdeen and its region allow for an examination of how + the law courts, and lawyers, inter-related and interacted, and from a + ‘provincial’ perspective rather than that of the governmental and + legal hub of Edinburgh. + + + + + This legal history project builds on research recently completed and + underway by Dr Armstrong and Dr Wilson. This includes “Spalding’s + Practicks and the Aberdeen Commissary Court in the Seventeenth + Century“ ( see + + https://www.abdn.ac.uk/giving/hunter-caldwell-awards-2013-440.php + + ), and as such this project is part of a group of topics building on + research funded by the Aberdeen Humanities Fund. It also connects with + the wider Aberdeen Burgh Records Project in RIISS( + + https://www.abdn.ac.uk/riiss/about/aberdeen-burgh-records-project-97.php + + ) and on-going work on Aberdeenshire’s barony courts. + + + + + Candidates should apply for a PhD place in the normal way, stating: + +
    +
  • + + ○ ‘Elphinstone PhD Scholarship’ in the Intended Source of + section + +
    • +
  • + + ○ The name of the lead supervisor in the Name of Proposed + section + +
    • +
  • + + ○The title of the specific research project (subject to any + agreed modifications in discussion with the lead supervisor) in + Outline Summary section + +
    • +
+ + + Funding Notes + + + + This project is funded by a University of Aberdeen Elphinstone + Scholarship. An Elphinstone Scholarship covers the cost of tuition + fees, + + + + + Selection will be made on the basis of academic merit. + + + + +); + +export default OpportunityDetailsPage; diff --git a/src/ignitus-OpportunityDetailsPage/styles.ts b/src/ignitus-OpportunityDetailsPage/styles.ts new file mode 100644 index 00000000..73115618 --- /dev/null +++ b/src/ignitus-OpportunityDetailsPage/styles.ts @@ -0,0 +1,39 @@ +import styled from '@emotion/styled'; +import { + White, + boxShadowColor, +} from '../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; +import { minimumWidthQuery } from '../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; + +export const Container = styled.div` + box-shadow: 0 0.5rem 1rem 0 ${boxShadowColor}; + background-color: ${White}; + border-radius: 20px; + display: flex; + flex-direction: column; + overflow: hidden; + ${minimumWidthQuery[0]} { + margin: 4rem 1rem 1rem 1rem; + width: 100%; + } + ${minimumWidthQuery[2]} { + margin: 4rem 3rem 1rem 3rem; + width: 100%; + } + ${minimumWidthQuery[3]} { + margin: 4rem 1.5rem 1rem 1.5rem; + width: 100%; + } + ${minimumWidthQuery[4]} { + margin: 4rem 2rem 1rem 2rem; + max-width: 100%; + } + ${minimumWidthQuery[5]} { + margin: 5rem 5rem 1rem 5rem; + max-width: 55rem; + } +`; + +export const Content = styled.div` + margin: 1rem; +`; diff --git a/src/ignitus-Routes/ignitus-PublicRoutes/index.tsx b/src/ignitus-Routes/ignitus-PublicRoutes/index.tsx index 6db2d8dc..d94f0b04 100644 --- a/src/ignitus-Routes/ignitus-PublicRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-PublicRoutes/index.tsx @@ -8,6 +8,7 @@ import { AuthenticationRoutes } from '../ignitus-AuthenticationRoutes'; import { LazyLoader } from '../../ignitus-Shared/ignitus-DesignSystem/shared'; import { StudentProfile } from '../../ignitus-Profile/ignitus-StudentProfile/Components'; import { CareersPage } from '../../ignitus-CareersPage/Components'; +import { OpportunityDetailsPage } from '../../ignitus-OpportunityDetailsPage/Components/index'; /** * Route-based code splitting. @@ -49,6 +50,10 @@ export const PublicRoutes: React.FunctionComponent = () => { /> + diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/UniversityOfMelbourne.png b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/UniversityOfMelbourne.png new file mode 100644 index 0000000000000000000000000000000000000000..7cac39975484ce67509ada7384f79b24267c330e GIT binary patch literal 33381 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 literal 0 HcmV?d00001 diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index.tsx new file mode 100644 index 00000000..8a4835c9 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index.tsx @@ -0,0 +1,44 @@ +import React from 'react'; +import { Opportunity } from '../types'; +import * as S from '../styles'; +import { Heading1, Heading6 } from '../../../ignitus-Atoms/typography'; + +const OpportunityDetailsCard = ({ + title, + subtitle, + description, + fund, + src, +}: Opportunity) => ( + +); + +const Card = ({ title, description, subtitle, src, fund }: Opportunity) => ( + + + {title} + + + + {title} + + + {subtitle} + + + {description} + + + $ {fund} funded + + + +); + +export default OpportunityDetailsCard; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts new file mode 100644 index 00000000..ff438e3d --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts @@ -0,0 +1,85 @@ +import styled from '@emotion/styled'; +import { Black, White, boxShadowColor } from '../../ignitus-Atoms/colors'; +import { Normal, XS, XL, SemiBold } from '../../ignitus-Atoms/fonts'; +import { Paragraph, Heading6 } from '../../ignitus-Atoms/typography'; +import { minimumWidthQuery } from '../../ignitus-Atoms/media'; + +export const Container = styled.div` + box-shadow: 0 0.5rem 1rem 0 ${boxShadowColor}; + background-color: ${White}; + border-radius: 1rem; + display: flex; + overflow: hidden; + align-items: center; + ${minimumWidthQuery[0]} { + flex-direction: column; + margin: 4rem 1rem 1rem 1rem; + width: 100%; + } + ${minimumWidthQuery[2]} { + flex-direction: row; + margin: 4rem 3rem 1rem 3rem; + width: 100%; + } + ${minimumWidthQuery[3]} { + flex-direction: row; + margin: 4rem 1.5rem 1rem 1.5rem; + width: 100%; + } + ${minimumWidthQuery[4]} { + flex-direction: row; + margin: 4rem 2rem 1rem 2rem; + max-width: 100%; + } + ${minimumWidthQuery[5]} { + flex-direction: row; + margin: 5rem 5rem 1rem 5rem; + max-width: 55rem; + } +`; +export const LeftRow = styled.div` + img { + max-width: 15rem; + max-height: 15rem; + margin: 1rem; + border-radius: 1rem; + } +`; + +export const RightRow = styled.div` + display: flex; + flex-direction: column; + ${minimumWidthQuery[0]} { + margin-left: 1rem; + align-items: center; + } + ${minimumWidthQuery[2]} { + margin-left: 1rem; + align-items: flex-start; + } + ${minimumWidthQuery[4]} { + margin-left: 0.5rem; + } + ${minimumWidthQuery[5]} { + margin-left: 0.5rem; + } +`; + +export const Description = styled(Paragraph)` + font-size: ${XL}; +`; + +export const SubTitle = styled.p` + font-weight: ${SemiBold}; + color: ${Black}; + font-size: ${XS}; +`; + +export const Fund = styled(Heading6)` + font-weight: ${Normal}; + font-size: ${XS}; +`; + +export const Wrapper = styled.div` + margin: ${(props: { marginProp?: string }) => props.marginProp}; +`; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/types.ts new file mode 100644 index 00000000..588784e8 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/types.ts @@ -0,0 +1,7 @@ +export type Opportunity = { + title: string; + description: string; + subtitle: string; + src: string; + fund: string; +}; From 8bdab8f5e2da6920d67b4c3836b8b4a7a65ff42a Mon Sep 17 00:00:00 2001 From: Meghana Date: Sun, 17 May 2020 16:11:34 +0530 Subject: [PATCH 02/51] added the Opportunity Details Card in UI Book /interface/opportunityDetailsCard --- .../ignitus-UserInterfaceBookRoutes/index.tsx | 5 +++++ .../ingitus-OpportunityDetailsCard/styles.ts | 1 + .../Components/index.tsx | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunityDetailsCard/Components/index.tsx diff --git a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx index 6ee25985..c961c865 100644 --- a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx @@ -31,6 +31,7 @@ import { interfaceSideProfile } from '../../ignitus-UserInterfaceBook/Components import { InterfaceProgress } from '../../ignitus-UserInterfaceBook/Components/Molecules/interfaceProgress/index'; import { interfaceSecondaryDropDown } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceSecondaryDropdown/Components'; import { interfaceToggleButtons } from '../../ignitus-UserInterfaceBook/Components/Molecules/interfaceToggleButtons/Components'; +import { interfaceOpportunityDetailsCard } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunityDetailsCard/Components'; const Container = styled.div` display: flex; @@ -108,6 +109,10 @@ export const UserInterfaceBookRoutes: React.FunctionComponent = () => ( path="/interface/opportunitySaved" component={interfaceSavedOpportunity} /> + ( + + + +); + +// export default interfaceOpportunityDetailsCard; From bdaa5fa536dbd966bdb985d513b253ac509ceb96 Mon Sep 17 00:00:00 2001 From: Meghana Date: Sun, 17 May 2020 18:16:05 +0530 Subject: [PATCH 03/51] added Opportunity Side Card /interface/opportunitySideCard --- .../ignitus-UserInterfaceBookRoutes/index.tsx | 5 ++ .../ignitus-Images/img-Png/share.png | Bin 0 -> 415 bytes .../Components/index.tsx | 38 +++++++++++++++ .../ignitus-OpportunitySideCard/styles.ts | 44 ++++++++++++++++++ .../ignitus-OpportunitySideCard/types.ts | 9 ++++ .../Components/index.tsx | 6 +++ 6 files changed, 102 insertions(+) create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/share.png create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/types.ts create mode 100644 src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components/index.tsx diff --git a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx index c961c865..41ecdbb5 100644 --- a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx @@ -32,6 +32,7 @@ import { InterfaceProgress } from '../../ignitus-UserInterfaceBook/Components/Mo import { interfaceSecondaryDropDown } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceSecondaryDropdown/Components'; import { interfaceToggleButtons } from '../../ignitus-UserInterfaceBook/Components/Molecules/interfaceToggleButtons/Components'; import { interfaceOpportunityDetailsCard } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunityDetailsCard/Components'; +import { interfaceOpportunitySideCard } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components'; const Container = styled.div` display: flex; @@ -113,6 +114,10 @@ export const UserInterfaceBookRoutes: React.FunctionComponent = () => ( path="/interface/opportunityDetailsCard" component={interfaceOpportunityDetailsCard} /> + Ni(lnvORsZ_WE6CfslBML}l1U7&XGD1e+%mMSBO@IX3u@v|Z zi5>s>^4{}{+i0Z!AK;7b*}l5cLL&(Ybhbb&9}L!#Hh2RtmjS;nxBvz!fHDS>xfu?6 zbeS30opRvN1=2hKtp0#yO3}PiRBL+B^ZN}vx=xZ$x0h4oRIO1~#ojck_vuJOp(Mqv zHwxIi7gs%9P^$4Vs{!|8GRFv(;Qh#WR09^1@?7ocG6jwl)$51Z*vlG?lT9&;{LvOA zV4x!4YFF{xK)G|S@_@zA)J&(har?N(%TNzk|3TCZ?QdX_!>Kp=;CyfVk-W{wQDZi> zx_&52L(lCfWQkyZp;}9yIwM%x@e!w+RZjyKrI3NAT(F)N@d+3SOg2fQqRIdO002ov JPDHLkV1o5&tv~<( literal 0 HcmV?d00001 diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx new file mode 100644 index 00000000..b189a96d --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx @@ -0,0 +1,38 @@ +import React from 'react'; +import * as S from '../styles'; +import { Opportunity, Cardtypes } from '../types'; +import { Paragraph } from '../../../ignitus-Atoms/typography'; +import ShareIcon from '../../../ignitus-Assets/ignitus-Images/img-Png/share.png'; + +export const InfoCard = ({ location, commitment }: Cardtypes) => ( + + + + + + {' '} + Apply{' '} + + + {' '} + Save{' '} + + + Share icon{' '} + Share{' '} + + + +); + +const Card = ({ title, description }: Opportunity) => ( + + {title} +
+ {description} + +); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts new file mode 100644 index 00000000..4603fd46 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts @@ -0,0 +1,44 @@ +import styled from '@emotion/styled'; +import { White, GreyBackground } from '../../ignitus-Atoms/colors'; +import { SemiBold } from '../../ignitus-Atoms/fonts'; +import { Heading5 } from '../../ignitus-Atoms/typography'; +import { RoundedButton } from '../../ignitus-Atoms/buttons'; + +export const Container = styled.div` + border-radius: 1rem; + width: 20rem; + margin: 2rem; + background-color: ${White}; + display: flex; + flex-direction: column; + align-items: center; + overflow: hidden; +`; + +export const Wrapper = styled.div` + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + width: 20rem; + padding: 1rem; + border-bottom: 0.2rem solid ${GreyBackground}; + overflow: hidden; +`; + +export const ButtonsWrapper = styled.div` + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + width: 20rem; + padding: 2rem; +`; + +export const Heading = styled(Heading5)` + font-weight: ${SemiBold}; +`; + +export const Button = styled(RoundedButton)` + width: 8rem; +`; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/types.ts new file mode 100644 index 00000000..6e9e0e59 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/types.ts @@ -0,0 +1,9 @@ +export type Opportunity = { + title: string; + description: string; +}; + +export type Cardtypes = { + location: string; + commitment: string; +}; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components/index.tsx new file mode 100644 index 00000000..14e2f9c0 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components/index.tsx @@ -0,0 +1,6 @@ +import React from 'react'; +import { InfoCard } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components'; + +export const interfaceOpportunitySideCard = () => ( + +); From 728ef589c0bde965950f49e7c5be9fc7f37a8cf7 Mon Sep 17 00:00:00 2001 From: Meghana Date: Tue, 19 May 2020 01:01:03 +0530 Subject: [PATCH 04/51] UI fixes in desktop view --- .../Components/index.tsx | 185 +++++++++--------- src/ignitus-OpportunityDetailsPage/styles.ts | 38 ++-- .../Components/index.tsx | 2 +- .../ignitus-OpportunitySideCard/styles.ts | 16 +- .../ingitus-OpportunityDetailsCard/styles.ts | 32 +-- 5 files changed, 128 insertions(+), 145 deletions(-) diff --git a/src/ignitus-OpportunityDetailsPage/Components/index.tsx b/src/ignitus-OpportunityDetailsPage/Components/index.tsx index 3f23bf51..04cede4c 100644 --- a/src/ignitus-OpportunityDetailsPage/Components/index.tsx +++ b/src/ignitus-OpportunityDetailsPage/Components/index.tsx @@ -1,103 +1,100 @@ import React from 'react'; import OpportunityDetailsCard from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index'; -import { Container } from '../../ignitus-Shared/ignitus-DesignSystem/shared'; import UniversityOfMelbourne from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/UniversityOfMelbourne.png'; import { Heading1, Paragraph } from '../../ignitus-Shared'; -import * as C from '../styles'; +import * as S from '../styles'; +import { InfoCard } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components'; export const OpportunityDetailsPage = () => ( - - - - + + + + Project Description - - - - Project Description This project will advance our understanding of the - operation of the law, and of legal specialists, in Scotland from the - late fifteenth to the early seventeenth century. Aberdeen and the - North-East present a rich source-base with which to pursue this theme. - Manuscript sources held in the University’s Special Collections Centre - and in the Aberdeen City & Aberdeenshire Archives are ripe for the - investigation of the range of law courts which functioned in the - region, at franchise, burgh, sheriffdom, and church levels. The era of - the Reformation brought significant change to the nature of church - courts, and the dynamism of the Scottish legal system in this period - promoted the emergence and development of a recognisable legal - profession. Aberdeen and its region allow for an examination of how - the law courts, and lawyers, inter-related and interacted, and from a - ‘provincial’ perspective rather than that of the governmental and - legal hub of Edinburgh. - - - - - This legal history project builds on research recently completed and - underway by Dr Armstrong and Dr Wilson. This includes “Spalding’s - Practicks and the Aberdeen Commissary Court in the Seventeenth - Century“ ( see - - https://www.abdn.ac.uk/giving/hunter-caldwell-awards-2013-440.php - - ), and as such this project is part of a group of topics building on - research funded by the Aberdeen Humanities Fund. It also connects with - the wider Aberdeen Burgh Records Project in RIISS( - - https://www.abdn.ac.uk/riiss/about/aberdeen-burgh-records-project-97.php - - ) and on-going work on Aberdeenshire’s barony courts. - - - - - Candidates should apply for a PhD place in the normal way, stating: - -
    -
  • - - ○ ‘Elphinstone PhD Scholarship’ in the Intended Source of - section - -
    • -
  • - - ○ The name of the lead supervisor in the Name of Proposed - section - -
    • -
  • - - ○The title of the specific research project (subject to any - agreed modifications in discussion with the lead supervisor) in - Outline Summary section - -
    • -
- - + + + Project Description This project will advance our understanding of + the operation of the law, and of legal specialists, in Scotland from + the late fifteenth to the early seventeenth century. Aberdeen and + the North-East present a rich source-base with which to pursue this + theme. Manuscript sources held in the University’s Special + Collections Centre and in the Aberdeen City & Aberdeenshire Archives + are ripe for the investigation of the range of law courts which + functioned in the region, at franchise, burgh, sheriffdom, and + church levels. The era of the Reformation brought significant change + to the nature of church courts, and the dynamism of the Scottish + legal system in this period promoted the emergence and development + of a recognisable legal profession. Aberdeen and its region allow + for an examination of how the law courts, and lawyers, inter-related + and interacted, and from a ‘provincial’ perspective rather than that + of the governmental and legal hub of Edinburgh. + + + + + This legal history project builds on research recently completed and + underway by Dr Armstrong and Dr Wilson. This includes “Spalding’s + Practicks and the Aberdeen Commissary Court in the Seventeenth + Century“ ( see + + https://www.abdn.aS.uk/giving/hunter-caldwell-awards-2013-440.php + + ), and as such this project is part of a group of topics building on + research funded by the Aberdeen Humanities Fund. It also connects + with the wider Aberdeen Burgh Records Project in RIISS( + + https://www.abdn.aS.uk/riiss/about/aberdeen-burgh-records-project-97.php + + ) and on-going work on Aberdeenshire’s barony courts. + + + + + Candidates should apply for a PhD place in the normal way, stating: + +
    +
  • + + ○ ‘Elphinstone PhD Scholarship’ in the Intended Source of + section + +
    • +
  • + + ○ The name of the lead supervisor in the Name of Proposed + section + +
    • +
  • + + ○The title of the specific research project (subject to + any agreed modifications in discussion with the lead supervisor) + in Outline Summary section + +
    • +
+ Funding Notes - - - - This project is funded by a University of Aberdeen Elphinstone - Scholarship. An Elphinstone Scholarship covers the cost of tuition - fees, - - - - - Selection will be made on the basis of academic merit. - - - - + + + This project is funded by a University of Aberdeen Elphinstone + Scholarship. An Elphinstone Scholarship covers the cost of tuition + fees, + + + + + Selection will be made on the basis of academic merit. + + + + + + ); - -export default OpportunityDetailsPage; diff --git a/src/ignitus-OpportunityDetailsPage/styles.ts b/src/ignitus-OpportunityDetailsPage/styles.ts index 73115618..edda809a 100644 --- a/src/ignitus-OpportunityDetailsPage/styles.ts +++ b/src/ignitus-OpportunityDetailsPage/styles.ts @@ -8,32 +8,40 @@ import { minimumWidthQuery } from '../ignitus-Shared/ignitus-DesignSystem/ignitu export const Container = styled.div` box-shadow: 0 0.5rem 1rem 0 ${boxShadowColor}; background-color: ${White}; - border-radius: 20px; + border-radius: 1rem; display: flex; flex-direction: column; + justify-content: space-evenly; overflow: hidden; - ${minimumWidthQuery[0]} { - margin: 4rem 1rem 1rem 1rem; - width: 100%; - } - ${minimumWidthQuery[2]} { - margin: 4rem 3rem 1rem 3rem; - width: 100%; - } + padding: 2rem; + margin-top: 1rem; ${minimumWidthQuery[3]} { - margin: 4rem 1.5rem 1rem 1.5rem; - width: 100%; + width: 55rem; } ${minimumWidthQuery[4]} { - margin: 4rem 2rem 1rem 2rem; - max-width: 100%; + max-width: 55rem; } ${minimumWidthQuery[5]} { - margin: 5rem 5rem 1rem 5rem; max-width: 55rem; } `; export const Content = styled.div` - margin: 1rem; + padding: 1rem 1rem; +`; + +export const ParentContainer = styled.div` + display: flex; + flex-direction: row; + margin: 3rem 2rem; + padding: 2rem; + justify-content: flex-start; + align-items: flex-start; +`; + +export const Column = styled.div` + margin-right: 1.5rem; + dislay: flex; + flex-direction: column; + justify-content: space-between; `; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx index b189a96d..5601fa14 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx @@ -23,7 +23,7 @@ export const InfoCard = ({ location, commitment }: Cardtypes) => ( alt="Share icon" style={{ marginRight: '0.7rem' }} />{' '} - Share{' '} + Share Link{' '} diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts index 4603fd46..5e576d56 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts @@ -1,27 +1,27 @@ import styled from '@emotion/styled'; import { White, GreyBackground } from '../../ignitus-Atoms/colors'; import { SemiBold } from '../../ignitus-Atoms/fonts'; -import { Heading5 } from '../../ignitus-Atoms/typography'; +import { Heading4 } from '../../ignitus-Atoms/typography'; import { RoundedButton } from '../../ignitus-Atoms/buttons'; export const Container = styled.div` border-radius: 1rem; - width: 20rem; - margin: 2rem; + width: 28rem; background-color: ${White}; display: flex; flex-direction: column; align-items: center; overflow: hidden; + max-height: 33rem; `; export const Wrapper = styled.div` display: flex; flex-direction: column; - justify-content: flex-start; + justify-content: center; align-items: center; width: 20rem; - padding: 1rem; + padding: 2.5rem; border-bottom: 0.2rem solid ${GreyBackground}; overflow: hidden; `; @@ -31,14 +31,14 @@ export const ButtonsWrapper = styled.div` flex-direction: column; justify-content: flex-start; align-items: center; - width: 20rem; + width: 25rem; padding: 2rem; `; -export const Heading = styled(Heading5)` +export const Heading = styled(Heading4)` font-weight: ${SemiBold}; `; export const Button = styled(RoundedButton)` - width: 8rem; + width: 12rem; `; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts index 2c84cfdf..fde9613b 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts @@ -11,38 +11,16 @@ export const Container = styled.div` display: flex; overflow: hidden; align-items: center; - padding: 0.5rem; - ${minimumWidthQuery[0]} { - flex-direction: column; - margin: 4rem 1rem 1rem 1rem; - width: 100%; - } - ${minimumWidthQuery[2]} { - flex-direction: row; - margin: 4rem 3rem 1rem 3rem; - width: 100%; - } - ${minimumWidthQuery[3]} { - flex-direction: row; - margin: 4rem 1.5rem 1rem 1.5rem; - width: 100%; - } - ${minimumWidthQuery[4]} { - flex-direction: row; - margin: 4rem 2rem 1rem 2rem; - max-width: 100%; - } - ${minimumWidthQuery[5]} { - flex-direction: row; - margin: 5rem 5rem 1rem 5rem; - max-width: 55rem; - } + padding: 1rem 2rem; + flex-direction: row; + max-width: 55rem; `; + export const LeftRow = styled.div` img { max-width: 15rem; max-height: 15rem; - margin: 1rem; + margin: 0.5rem; border-radius: 1rem; } `; From 73bee1e0076f9ecbe820baf6612440bc9d580ae0 Mon Sep 17 00:00:00 2001 From: Meghana Date: Tue, 19 May 2020 16:47:52 +0530 Subject: [PATCH 05/51] UI fixes --- src/ignitus-OpportunityDetailsPage/styles.ts | 11 +---------- .../ingitus-OpportunityDetailsCard/styles.ts | 17 ++--------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/ignitus-OpportunityDetailsPage/styles.ts b/src/ignitus-OpportunityDetailsPage/styles.ts index edda809a..0692847d 100644 --- a/src/ignitus-OpportunityDetailsPage/styles.ts +++ b/src/ignitus-OpportunityDetailsPage/styles.ts @@ -3,7 +3,6 @@ import { White, boxShadowColor, } from '../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors'; -import { minimumWidthQuery } from '../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media'; export const Container = styled.div` box-shadow: 0 0.5rem 1rem 0 ${boxShadowColor}; @@ -15,15 +14,7 @@ export const Container = styled.div` overflow: hidden; padding: 2rem; margin-top: 1rem; - ${minimumWidthQuery[3]} { - width: 55rem; - } - ${minimumWidthQuery[4]} { - max-width: 55rem; - } - ${minimumWidthQuery[5]} { - max-width: 55rem; - } + max-width: 55rem; `; export const Content = styled.div` diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts index fde9613b..9154e4c2 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts @@ -2,7 +2,6 @@ import styled from '@emotion/styled'; import { Black, White, boxShadowColor } from '../../ignitus-Atoms/colors'; import { Normal, XS, XL, SemiBold } from '../../ignitus-Atoms/fonts'; import { Paragraph, Heading6 } from '../../ignitus-Atoms/typography'; -import { minimumWidthQuery } from '../../ignitus-Atoms/media'; export const Container = styled.div` box-shadow: 0 0.5rem 1rem 0 ${boxShadowColor}; @@ -28,20 +27,8 @@ export const LeftRow = styled.div` export const RightRow = styled.div` display: flex; flex-direction: column; - ${minimumWidthQuery[0]} { - margin-left: 1rem; - align-items: center; - } - ${minimumWidthQuery[2]} { - margin-left: 1rem; - align-items: flex-start; - } - ${minimumWidthQuery[4]} { - margin-left: 0.5rem; - } - ${minimumWidthQuery[5]} { - margin-left: 0.5rem; - } + align-items: flex-start; + margin-left: 0.5rem; `; export const Description = styled(Paragraph)` From 4d9e9ce060a0ccbd8bb3a169acb57ba27ed29299 Mon Sep 17 00:00:00 2001 From: Meghana Date: Tue, 26 May 2020 23:41:37 +0530 Subject: [PATCH 06/51] added Icons, removed details card and UI fixes --- .../Components/index.tsx | 95 ++++--------------- .../constants.ts | 18 ++++ src/ignitus-OpportunityDetailsPage/styles.ts | 4 +- src/ignitus-OpportunityDetailsPage/types.ts | 10 ++ .../ignitus-Icons/checkIcon/index.tsx | 18 ++++ .../ignitus-Icons/shareIcon/index.tsx | 18 ++++ .../Components/index.tsx | 56 ++++++----- .../ignitus-OpportunitySideCard/styles.ts | 15 ++- .../ignitus-OpportunitySideCard/types.ts | 1 + .../Components/index.tsx | 44 --------- .../ingitus-OpportunityDetailsCard/styles.ts | 51 ---------- .../ingitus-OpportunityDetailsCard/types.ts | 7 -- .../ignitus-Utilities/Components/icon.tsx | 8 ++ .../types/iconsTypes/iconEnums.ts | 2 + .../Components/index.tsx | 18 ---- .../Components/index.tsx | 2 +- 16 files changed, 140 insertions(+), 227 deletions(-) create mode 100644 src/ignitus-OpportunityDetailsPage/constants.ts create mode 100644 src/ignitus-OpportunityDetailsPage/types.ts create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/checkIcon/index.tsx create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/shareIcon/index.tsx delete mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index.tsx delete mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts delete mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/types.ts delete mode 100644 src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunityDetailsCard/Components/index.tsx diff --git a/src/ignitus-OpportunityDetailsPage/Components/index.tsx b/src/ignitus-OpportunityDetailsPage/Components/index.tsx index 04cede4c..bb265117 100644 --- a/src/ignitus-OpportunityDetailsPage/Components/index.tsx +++ b/src/ignitus-OpportunityDetailsPage/Components/index.tsx @@ -4,97 +4,42 @@ import UniversityOfMelbourne from '../../ignitus-Shared/ignitus-DesignSystem/ign import { Heading1, Paragraph } from '../../ignitus-Shared'; import * as S from '../styles'; import { InfoCard } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components'; +import { ProjectDescription, Funding, DetailsRequired } from '../constants'; +import { DashBoardOpportunity } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-DashBoardOpportunity/Components/DashBoardOpportunity'; export const OpportunityDetailsPage = () => ( - + Project Description - - Project Description This project will advance our understanding of - the operation of the law, and of legal specialists, in Scotland from - the late fifteenth to the early seventeenth century. Aberdeen and - the North-East present a rich source-base with which to pursue this - theme. Manuscript sources held in the University’s Special - Collections Centre and in the Aberdeen City & Aberdeenshire Archives - are ripe for the investigation of the range of law courts which - functioned in the region, at franchise, burgh, sheriffdom, and - church levels. The era of the Reformation brought significant change - to the nature of church courts, and the dynamism of the Scottish - legal system in this period promoted the emergence and development - of a recognisable legal profession. Aberdeen and its region allow - for an examination of how the law courts, and lawyers, inter-related - and interacted, and from a ‘provincial’ perspective rather than that - of the governmental and legal hub of Edinburgh. - - - - - This legal history project builds on research recently completed and - underway by Dr Armstrong and Dr Wilson. This includes “Spalding’s - Practicks and the Aberdeen Commissary Court in the Seventeenth - Century“ ( see - - https://www.abdn.aS.uk/giving/hunter-caldwell-awards-2013-440.php - - ), and as such this project is part of a group of topics building on - research funded by the Aberdeen Humanities Fund. It also connects - with the wider Aberdeen Burgh Records Project in RIISS( - - https://www.abdn.aS.uk/riiss/about/aberdeen-burgh-records-project-97.php - - ) and on-going work on Aberdeenshire’s barony courts. - - - + {ProjectDescription.map(content => ( + + {content} + + ))} Candidates should apply for a PhD place in the normal way, stating: -
    -
  • - - ○ ‘Elphinstone PhD Scholarship’ in the Intended Source of - section - -
    • -
  • - - ○ The name of the lead supervisor in the Name of Proposed - section - -
    • -
  • - - ○The title of the specific research project (subject to - any agreed modifications in discussion with the lead supervisor) - in Outline Summary section - -
    • -
+ {DetailsRequired.map(content => ( + ○{content} + ))} Funding Notes - - - This project is funded by a University of Aberdeen Elphinstone - Scholarship. An Elphinstone Scholarship covers the cost of tuition - fees, - - - - - Selection will be made on the basis of academic merit. - - + {Funding.map(content => ( + + {content} + + ))} - + ); diff --git a/src/ignitus-OpportunityDetailsPage/constants.ts b/src/ignitus-OpportunityDetailsPage/constants.ts new file mode 100644 index 00000000..178e4c55 --- /dev/null +++ b/src/ignitus-OpportunityDetailsPage/constants.ts @@ -0,0 +1,18 @@ +import { Props } from './types'; + +export const ProjectDescription = [ + 'Project Description This project will advance our understanding of the operation of the law, and of legal specialists, in Scotland from the late fifteenth to the early seventeenth century. Aberdeen and the North-East present a rich source-base with which to pursue this theme. Manuscript sources held in the University’s Special Collections Centre and in the Aberdeen City & Aberdeenshire Archives are ripe for the investigation of the range of law courts which functioned in the region, at franchise, burgh, sheriffdom, and church levels. The era of the Reformation brought significant change to the nature of church courts, and the dynamism of the Scottish legal system in this period promoted the emergence and development of a recognisable legal profession. Aberdeen and its region allow for an examination of how the law courts, and lawyers, inter-related and interacted, and from a ‘provincial’ perspective rather than that of the governmental and legal hub of Edinburgh.', + 'This legal history project builds on research recently completed and underway by Dr Armstrong and Dr Wilson. This includes “Spalding’s Practicks and the Aberdeen Commissary Court in the Seventeenth Century“ ( see https://www.abdn.ac.uk/giving/hunter-caldwell-awards-2013-440.php), and as such this project is part of a group of topics building on research funded by the Aberdeen Humanities Fund. It also connects with the wider Aberdeen Burgh Records Project in RIISS (https://www.abdn.ac.uk/riiss/about/aberdeen-burgh-records-project-97.php) and on-going work on Aberdeenshire’s barony courts.', +]; + +export const DetailsRequired = [ + 'Elphinstone PhD Scholarship’ in the Intended Source of section', + 'The name of the lead supervisor in the Name of Proposed section', + 'The title of the specific research project (subject to any agreed modifications in discussion with the lead supervisor) in Outline Summary section', +]; +export const Funding = [ + 'This project is funded by a University of Aberdeen Elphinstone Scholarship. An Elphinstone Scholarship covers the cost of tuition fees,', + 'Selection will be made on the basis of academic merit.', +]; + +export const InfoCard = ['']; diff --git a/src/ignitus-OpportunityDetailsPage/styles.ts b/src/ignitus-OpportunityDetailsPage/styles.ts index 0692847d..daac8dcf 100644 --- a/src/ignitus-OpportunityDetailsPage/styles.ts +++ b/src/ignitus-OpportunityDetailsPage/styles.ts @@ -12,13 +12,13 @@ export const Container = styled.div` flex-direction: column; justify-content: space-evenly; overflow: hidden; - padding: 2rem; + padding: 2rem 3rem; margin-top: 1rem; max-width: 55rem; `; export const Content = styled.div` - padding: 1rem 1rem; + padding: 1rem 0rem; `; export const ParentContainer = styled.div` diff --git a/src/ignitus-OpportunityDetailsPage/types.ts b/src/ignitus-OpportunityDetailsPage/types.ts new file mode 100644 index 00000000..256d7972 --- /dev/null +++ b/src/ignitus-OpportunityDetailsPage/types.ts @@ -0,0 +1,10 @@ +export type Props = { + content: string; +}; + +export type InfoCard = { + location: string; + isFunded: boolean; + amount?: string; + commitment: string; +}; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/checkIcon/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/checkIcon/index.tsx new file mode 100644 index 00000000..006e0635 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/checkIcon/index.tsx @@ -0,0 +1,18 @@ +import React, { HTMLAttributes } from 'react'; + +type Props = HTMLAttributes; + +export const CheckIcon = ({ title = 'Check Icon', ...rest }: Props) => ( + + + +); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/shareIcon/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/shareIcon/index.tsx new file mode 100644 index 00000000..11da2c10 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/shareIcon/index.tsx @@ -0,0 +1,18 @@ +import React, { HTMLAttributes } from 'react'; + +type Props = HTMLAttributes; + +export const ShareIcon = ({ title = 'ShareIcon', ...rest }: Props) => ( + + + +); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx index 5601fa14..50ef380b 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx @@ -2,32 +2,38 @@ import React from 'react'; import * as S from '../styles'; import { Opportunity, Cardtypes } from '../types'; import { Paragraph } from '../../../ignitus-Atoms/typography'; -import ShareIcon from '../../../ignitus-Assets/ignitus-Images/img-Png/share.png'; +import { AppIcon } from '../../../../types/iconsTypes/iconEnums'; -export const InfoCard = ({ location, commitment }: Cardtypes) => ( - - - - - - {' '} - Apply{' '} - - - {' '} - Save{' '} - - - Share icon{' '} - Share Link{' '} - - - -); +export const InfoCard = ({ location, commitment, salary }: Cardtypes) => { + const [buttonText, setButtonText] = React.useState(
Apply
); + const handleClick = e => { + setButtonText( +
+ Applied +
, + ); + }; + return ( + + + + + + + {' '} + {buttonText}{' '} + + + {' '} + Save{' '} + + + Share Link{' '} + + + + ); +}; const Card = ({ title, description }: Opportunity) => ( diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts index 5e576d56..dc29dc20 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts @@ -1,18 +1,19 @@ import styled from '@emotion/styled'; -import { White, GreyBackground } from '../../ignitus-Atoms/colors'; +import { White, GreyBackground, IgnitusBlue } from '../../ignitus-Atoms/colors'; import { SemiBold } from '../../ignitus-Atoms/fonts'; import { Heading4 } from '../../ignitus-Atoms/typography'; import { RoundedButton } from '../../ignitus-Atoms/buttons'; +import I from '../../../ignitus-Utilities/Components/icon'; export const Container = styled.div` border-radius: 1rem; - width: 28rem; + width: 26rem; background-color: ${White}; display: flex; flex-direction: column; align-items: center; overflow: hidden; - max-height: 33rem; + max-height: 35rem; `; export const Wrapper = styled.div` @@ -21,7 +22,7 @@ export const Wrapper = styled.div` justify-content: center; align-items: center; width: 20rem; - padding: 2.5rem; + padding: 3rem; border-bottom: 0.2rem solid ${GreyBackground}; overflow: hidden; `; @@ -42,3 +43,9 @@ export const Heading = styled(Heading4)` export const Button = styled(RoundedButton)` width: 12rem; `; + +export const Icon = styled(I)` + fill: ${IgnitusBlue}; + // height: 1rem; + // width: 1rem; +`; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/types.ts index 6e9e0e59..acf0a40f 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/types.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/types.ts @@ -6,4 +6,5 @@ export type Opportunity = { export type Cardtypes = { location: string; commitment: string; + salary: string; }; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index.tsx deleted file mode 100644 index 8a4835c9..00000000 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; -import { Opportunity } from '../types'; -import * as S from '../styles'; -import { Heading1, Heading6 } from '../../../ignitus-Atoms/typography'; - -const OpportunityDetailsCard = ({ - title, - subtitle, - description, - fund, - src, -}: Opportunity) => ( - -); - -const Card = ({ title, description, subtitle, src, fund }: Opportunity) => ( - - - {title} - - - - {title} - - - {subtitle} - - - {description} - - - $ {fund} funded - - - -); - -export default OpportunityDetailsCard; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts deleted file mode 100644 index 9154e4c2..00000000 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/styles.ts +++ /dev/null @@ -1,51 +0,0 @@ -import styled from '@emotion/styled'; -import { Black, White, boxShadowColor } from '../../ignitus-Atoms/colors'; -import { Normal, XS, XL, SemiBold } from '../../ignitus-Atoms/fonts'; -import { Paragraph, Heading6 } from '../../ignitus-Atoms/typography'; - -export const Container = styled.div` - box-shadow: 0 0.5rem 1rem 0 ${boxShadowColor}; - background-color: ${White}; - border-radius: 1rem; - display: flex; - overflow: hidden; - align-items: center; - padding: 1rem 2rem; - flex-direction: row; - max-width: 55rem; -`; - -export const LeftRow = styled.div` - img { - max-width: 15rem; - max-height: 15rem; - margin: 0.5rem; - border-radius: 1rem; - } -`; - -export const RightRow = styled.div` - display: flex; - flex-direction: column; - align-items: flex-start; - margin-left: 0.5rem; -`; - -export const Description = styled(Paragraph)` - font-size: ${XL}; -`; - -export const SubTitle = styled.p` - font-weight: ${SemiBold}; - color: ${Black}; - font-size: ${XS}; -`; - -export const Fund = styled(Heading6)` - font-weight: ${Normal}; - font-size: ${XS}; -`; - -export const Wrapper = styled.div` - margin: ${(props: { marginProp?: string }) => props.marginProp}; -`; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/types.ts deleted file mode 100644 index 588784e8..00000000 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/types.ts +++ /dev/null @@ -1,7 +0,0 @@ -export type Opportunity = { - title: string; - description: string; - subtitle: string; - src: string; - fund: string; -}; diff --git a/src/ignitus-Shared/ignitus-Utilities/Components/icon.tsx b/src/ignitus-Shared/ignitus-Utilities/Components/icon.tsx index 1d820ac1..1ef316a5 100644 --- a/src/ignitus-Shared/ignitus-Utilities/Components/icon.tsx +++ b/src/ignitus-Shared/ignitus-Utilities/Components/icon.tsx @@ -48,6 +48,8 @@ import StarCircleIcon from '../../ignitus-DesignSystem/ignitus-Assets/ignitus-Ic import BarsIcon from '../../ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/barsIcon'; import GridIcon from '../../ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/gridIcon'; import SearchIcon from '../../ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/SearchIcon/index'; +import { CheckIcon } from '../../ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/checkIcon/index'; +import { ShareIcon } from '../../ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/shareIcon/index'; type Props = { name: AppIcon; @@ -82,6 +84,9 @@ const Icon = ({ name, ...rest }: Props) => { case AppIcon.CrossIcon: return ; + case AppIcon.CheckIcon: + return ; + case AppIcon.SearchIcon: return ; @@ -179,6 +184,9 @@ const Icon = ({ name, ...rest }: Props) => { case AppIcon.SlackIcon: return ; + case AppIcon.ShareIcon: + return ; + case AppIcon.MediumIcon: return ; diff --git a/src/ignitus-Shared/types/iconsTypes/iconEnums.ts b/src/ignitus-Shared/types/iconsTypes/iconEnums.ts index 23ed2d3b..f073e833 100644 --- a/src/ignitus-Shared/types/iconsTypes/iconEnums.ts +++ b/src/ignitus-Shared/types/iconsTypes/iconEnums.ts @@ -6,6 +6,7 @@ export enum AppIcon { CopyIcon = 'CopyIcon', ContributionIcon = 'ContributionIcon', CameraIcon = 'CameraIcon', + CheckIcon = 'CheckIcon', LinkedInIcon = 'LinkedInIcon', PlusIcon = 'PlusIcon', HeartIcon = 'HeartIcon', @@ -16,6 +17,7 @@ export enum AppIcon { SearchIcon = 'SearchIcon', SaveIcon = 'SaveIcon', StarCircleIcon = 'StarCircle', + ShareIcon = 'ShareIcon', MessageIcon = 'MessageIcon', NetworkIcon = 'NetworkIcon', MentorsIcon = 'MentorsIcon', diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunityDetailsCard/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunityDetailsCard/Components/index.tsx deleted file mode 100644 index 522626ef..00000000 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunityDetailsCard/Components/index.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import OpportunityDetailsCard from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components'; -import UniversityOfMelbourne from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/UniversityOfMelbourne.png'; -import { Container } from '../../../../../ignitus-Shared/ignitus-DesignSystem/shared'; - -export const interfaceOpportunityDetailsCard = () => ( - - - -); - -// export default interfaceOpportunityDetailsCard; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components/index.tsx index 14e2f9c0..f72cbcc7 100644 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components/index.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components/index.tsx @@ -2,5 +2,5 @@ import React from 'react'; import { InfoCard } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components'; export const interfaceOpportunitySideCard = () => ( - + ); From 78f1ba2e5a9bdee9c059ce2cbe4b81a1f47c866f Mon Sep 17 00:00:00 2001 From: Meghana Date: Wed, 27 May 2020 00:13:05 +0530 Subject: [PATCH 07/51] removed margin of opportunity card --- .../ignitus-Organisms/ignitus-DashBoardOpportunity/style.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-DashBoardOpportunity/style.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-DashBoardOpportunity/style.ts index e28e8060..b59feda2 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-DashBoardOpportunity/style.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-DashBoardOpportunity/style.ts @@ -9,7 +9,6 @@ export const Container = styled.div` background-color: ${C.White}; border-radius: 20px; display: flex; - margin: 0.5rem; `; export const Row = styled(flexibleRowDiv)``; From a7411d97a5bc42101ce9ac4a863a9639629af820 Mon Sep 17 00:00:00 2001 From: Meghana Date: Wed, 27 May 2020 13:07:12 +0530 Subject: [PATCH 08/51] added props and some fixes --- .../Components/index.tsx | 29 ++++++++++++------- .../constants.ts | 21 ++++++++++++-- src/ignitus-OpportunityDetailsPage/types.ts | 10 ------- .../ignitus-UserInterfaceBookRoutes/index.tsx | 5 ---- .../Components/index.tsx | 2 +- .../ignitus-OpportunitySideCard/styles.ts | 4 +-- 6 files changed, 38 insertions(+), 33 deletions(-) delete mode 100644 src/ignitus-OpportunityDetailsPage/types.ts diff --git a/src/ignitus-OpportunityDetailsPage/Components/index.tsx b/src/ignitus-OpportunityDetailsPage/Components/index.tsx index bb265117..e5983fbe 100644 --- a/src/ignitus-OpportunityDetailsPage/Components/index.tsx +++ b/src/ignitus-OpportunityDetailsPage/Components/index.tsx @@ -1,22 +1,27 @@ import React from 'react'; -import OpportunityDetailsCard from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ingitus-OpportunityDetailsCard/Components/index'; -import UniversityOfMelbourne from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/UniversityOfMelbourne.png'; import { Heading1, Paragraph } from '../../ignitus-Shared'; import * as S from '../styles'; import { InfoCard } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components'; -import { ProjectDescription, Funding, DetailsRequired } from '../constants'; +import { + ProjectDescription, + Funding, + DetailsRequired, + InfoCardDetails, + OpportunityCardDetails, +} from '../constants'; import { DashBoardOpportunity } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-DashBoardOpportunity/Components/DashBoardOpportunity'; export const OpportunityDetailsPage = () => ( - - + {OpportunityCardDetails.map(({ title, description, subtitle, src }) => ( + + ))} Project Description @@ -40,6 +45,8 @@ export const OpportunityDetailsPage = () => ( ))} - + {InfoCardDetails.map(({ location, commitment, salary }) => ( + + ))} ); diff --git a/src/ignitus-OpportunityDetailsPage/constants.ts b/src/ignitus-OpportunityDetailsPage/constants.ts index 178e4c55..16608353 100644 --- a/src/ignitus-OpportunityDetailsPage/constants.ts +++ b/src/ignitus-OpportunityDetailsPage/constants.ts @@ -1,5 +1,3 @@ -import { Props } from './types'; - export const ProjectDescription = [ 'Project Description This project will advance our understanding of the operation of the law, and of legal specialists, in Scotland from the late fifteenth to the early seventeenth century. Aberdeen and the North-East present a rich source-base with which to pursue this theme. Manuscript sources held in the University’s Special Collections Centre and in the Aberdeen City & Aberdeenshire Archives are ripe for the investigation of the range of law courts which functioned in the region, at franchise, burgh, sheriffdom, and church levels. The era of the Reformation brought significant change to the nature of church courts, and the dynamism of the Scottish legal system in this period promoted the emergence and development of a recognisable legal profession. Aberdeen and its region allow for an examination of how the law courts, and lawyers, inter-related and interacted, and from a ‘provincial’ perspective rather than that of the governmental and legal hub of Edinburgh.', 'This legal history project builds on research recently completed and underway by Dr Armstrong and Dr Wilson. This includes “Spalding’s Practicks and the Aberdeen Commissary Court in the Seventeenth Century“ ( see https://www.abdn.ac.uk/giving/hunter-caldwell-awards-2013-440.php), and as such this project is part of a group of topics building on research funded by the Aberdeen Humanities Fund. It also connects with the wider Aberdeen Burgh Records Project in RIISS (https://www.abdn.ac.uk/riiss/about/aberdeen-burgh-records-project-97.php) and on-going work on Aberdeenshire’s barony courts.', @@ -15,4 +13,21 @@ export const Funding = [ 'Selection will be made on the basis of academic merit.', ]; -export const InfoCard = ['']; +export const InfoCardDetails = [ + { + location: 'Australia', + commitment: 'Full-Time', + salary: 'funded | ¢10/hr', + }, +]; + +export const OpportunityCardDetails = [ + { + title: 'PhD Project', + description: + 'Church and civil courts in late medieval and early modern Scotland.', + subtitle: 'By The University of Melbourne', + src: + 'https://storage.googleapis.com/ignitus_assets/ig-opportunities/universityOfMelbourne.png', + }, +]; diff --git a/src/ignitus-OpportunityDetailsPage/types.ts b/src/ignitus-OpportunityDetailsPage/types.ts deleted file mode 100644 index 256d7972..00000000 --- a/src/ignitus-OpportunityDetailsPage/types.ts +++ /dev/null @@ -1,10 +0,0 @@ -export type Props = { - content: string; -}; - -export type InfoCard = { - location: string; - isFunded: boolean; - amount?: string; - commitment: string; -}; diff --git a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx index 605ea812..907714ae 100644 --- a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx @@ -32,7 +32,6 @@ import { InterfaceProgress } from '../../ignitus-UserInterfaceBook/Components/Mo import { interfaceSecondaryDropDown } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceSecondaryDropdown/Components'; import { interfaceScrollBar } from '../../ignitus-UserInterfaceBook/Components/Molecules/interfaceScrollBar/Components'; import { interfaceToggleButtons } from '../../ignitus-UserInterfaceBook/Components/Molecules/interfaceToggleButtons/Components'; -import { interfaceOpportunityDetailsCard } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunityDetailsCard/Components'; import { interfaceOpportunitySideCard } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunitySideCard/Components'; const Container = styled.div` @@ -111,10 +110,6 @@ export const UserInterfaceBookRoutes: React.FunctionComponent = () => ( path="/interface/opportunitySaved" component={interfaceSavedOpportunity} /> - { Save{' '} - Share Link{' '} + Share Link diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts index dc29dc20..a97c1046 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/styles.ts @@ -41,11 +41,9 @@ export const Heading = styled(Heading4)` `; export const Button = styled(RoundedButton)` - width: 12rem; + width: 11rem; `; export const Icon = styled(I)` fill: ${IgnitusBlue}; - // height: 1rem; - // width: 1rem; `; From fcdb0a6476540b3d7c4e0c8129de51302e053819 Mon Sep 17 00:00:00 2001 From: Meghana Date: Wed, 27 May 2020 13:15:21 +0530 Subject: [PATCH 09/51] deepscan fixes --- .../Components/index.tsx | 16 +++++++++++----- src/ignitus-OpportunityDetailsPage/constants.ts | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/ignitus-OpportunityDetailsPage/Components/index.tsx b/src/ignitus-OpportunityDetailsPage/Components/index.tsx index e5983fbe..f0c7fbf3 100644 --- a/src/ignitus-OpportunityDetailsPage/Components/index.tsx +++ b/src/ignitus-OpportunityDetailsPage/Components/index.tsx @@ -16,6 +16,7 @@ export const OpportunityDetailsPage = () => ( {OpportunityCardDetails.map(({ title, description, subtitle, src }) => ( ( Project Description {ProjectDescription.map(content => ( - + {content} ))} @@ -34,19 +35,24 @@ export const OpportunityDetailsPage = () => ( Candidates should apply for a PhD place in the normal way, stating: {DetailsRequired.map(content => ( - ○{content} + ○{content} ))} Funding Notes {Funding.map(content => ( - + {content} ))} - {InfoCardDetails.map(({ location, commitment, salary }) => ( - + {InfoCardDetails.map(({ index, location, commitment, salary }) => ( + ))} ); diff --git a/src/ignitus-OpportunityDetailsPage/constants.ts b/src/ignitus-OpportunityDetailsPage/constants.ts index 16608353..565edbe0 100644 --- a/src/ignitus-OpportunityDetailsPage/constants.ts +++ b/src/ignitus-OpportunityDetailsPage/constants.ts @@ -15,6 +15,7 @@ export const Funding = [ export const InfoCardDetails = [ { + index: 1, location: 'Australia', commitment: 'Full-Time', salary: 'funded | ¢10/hr', From 67e61cefb19dda179df0f0f7a257b360b63e9610 Mon Sep 17 00:00:00 2001 From: Meghana Date: Wed, 27 May 2020 14:54:55 +0530 Subject: [PATCH 10/51] fixes --- .../ignitus-Assets/ignitus-Icons/checkIcon/index.tsx | 3 +++ .../ignitus-Assets/ignitus-Icons/shareIcon/index.tsx | 3 +++ .../__snapshots__/DashBoardOpportunity.test.tsx.snap | 1 - .../ignitus-OpportunitySideCard/Components/index.tsx | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/checkIcon/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/checkIcon/index.tsx index 006e0635..43ca3572 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/checkIcon/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/checkIcon/index.tsx @@ -9,7 +9,10 @@ export const CheckIcon = ({ title = 'Check Icon', ...rest }: Props) => ( height="17" fill="none" viewBox="0 0 23 17" + aria-label={title} + {...rest} > + {title} ( height="20" fill="none" viewBox="0 0 22 20" + aria-label={title} + {...rest} > + {title} should render 1`] = ` display: -webkit-flex; display: -ms-flexbox; display: flex; - margin: 0.5rem; } .emotion-5 { diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx index 3b3a39ac..ff871920 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-OpportunitySideCard/Components/index.tsx @@ -6,7 +6,7 @@ import { AppIcon } from '../../../../types/iconsTypes/iconEnums'; export const InfoCard = ({ location, commitment, salary }: Cardtypes) => { const [buttonText, setButtonText] = React.useState(
Apply
); - const handleClick = e => { + const handleClick = () => { setButtonText(
Applied From e5c41322376e507fb4f5c3ba5725c6e2a50f236a Mon Sep 17 00:00:00 2001 From: Meghana Date: Wed, 10 Jun 2020 00:12:11 +0530 Subject: [PATCH 11/51] nav dropdown --- .../ignitus-UserInterfaceBookRoutes/index.tsx | 2 ++ .../ignitus-navDropdown/Components/index.tsx | 18 +++++++++++++++ .../ignitus-navDropdown/styles.ts | 22 +++++++++++++++++++ .../ignitus-navDropdown/types.ts | 3 +++ .../interfaceNavDropdown/Components/index.tsx | 18 +++++++++++++++ .../Atoms/interfaceNavDropdown/constants.ts | 4 ++++ .../Atoms/interfaceNavDropdown/styles.ts | 9 ++++++++ 7 files changed, 76 insertions(+) create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/types.ts create mode 100644 src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx create mode 100644 src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts create mode 100644 src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/styles.ts diff --git a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx index 4fc45ea6..70aae1be 100644 --- a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx @@ -34,6 +34,7 @@ import { InterfaceProgress } from '../../ignitus-UserInterfaceBook/Components/Mo import { interfaceSecondaryDropDown } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceSecondaryDropdown/Components'; import { interfaceScrollBar } from '../../ignitus-UserInterfaceBook/Components/Molecules/interfaceScrollBar/Components'; import { interfaceToggleButtons } from '../../ignitus-UserInterfaceBook/Components/Molecules/interfaceToggleButtons/Components'; +import { interfaceNavDropdown } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components'; const Container = styled.div` display: flex; @@ -138,6 +139,7 @@ export const UserInterfaceBookRoutes: React.FunctionComponent = () => ( path="/interface/toggleButtons" component={interfaceToggleButtons} /> + diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx new file mode 100644 index 00000000..52788569 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx @@ -0,0 +1,18 @@ +import React from 'react'; +import * as S from '../styles'; +import { Props } from '../types'; +import { Heading5 } from '../../typography'; + +export const NavDropdown = ({ options }: Props) => { + return ( + + + {options.map(details => ( + + {details} + + ))} + + + ); +}; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts new file mode 100644 index 00000000..c05d10ae --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts @@ -0,0 +1,22 @@ +import styled from '@emotion/styled'; +import { White, IgnitusBlue, GreyBackground } from '../colors'; + +export const Container = styled.div` + background-color: ${White}; + width: 10rem; + border-radius: 1rem; + overflow: hidden; +`; + +export const Option = styled.div` + border-bottom: 0.2rem solid ${GreyBackground}; + height: 2.5rem; + display: flex; + justify-content: center; + align-items: center; + overflow: hidden; + &:hover { + background-color: ${IgnitusBlue}; + color: ${White}; + } +`; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/types.ts new file mode 100644 index 00000000..2078933d --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/types.ts @@ -0,0 +1,3 @@ +export type Props = { + options: string[]; +}; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx new file mode 100644 index 00000000..bd177fb7 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx @@ -0,0 +1,18 @@ +import React from 'react'; +import * as S from '../styles'; +import { NavDropdown } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components'; +import { Options } from '../constants'; +import { Heading1 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; + +export const interfaceNavDropdown = () => ( + + Dashboard Nav DropDown +
+ + + + +); diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts new file mode 100644 index 00000000..e2856119 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts @@ -0,0 +1,4 @@ +export const Options = { + buttonTitle: 'Sophia', + options: ['Dashboard', 'Profile', 'Settings', 'Privacy Policy', 'Log out'], +}; diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/styles.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/styles.ts new file mode 100644 index 00000000..ecb6dab4 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/styles.ts @@ -0,0 +1,9 @@ +import styled from '@emotion/styled'; + +export const Container = styled.div` + margin: 5rem; + width: 50rem; +`; +export const Component = styled.div` + margin: 2rem; +`; From f621ce166b14b823ec30ab432211d686cbb56f7d Mon Sep 17 00:00:00 2001 From: Meghana Date: Wed, 10 Jun 2020 00:14:17 +0530 Subject: [PATCH 12/51] removed button content fixes --- .../Atoms/interfaceNavDropdown/Components/index.tsx | 5 +---- .../Components/Atoms/interfaceNavDropdown/constants.ts | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx index bd177fb7..3835430d 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx @@ -9,10 +9,7 @@ export const interfaceNavDropdown = () => ( Dashboard Nav DropDown
- + ); diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts index e2856119..4d0dd43a 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts @@ -1,4 +1,3 @@ export const Options = { - buttonTitle: 'Sophia', options: ['Dashboard', 'Profile', 'Settings', 'Privacy Policy', 'Log out'], }; From b9539452af8d51c68f4d84870e7bfbe819a40811 Mon Sep 17 00:00:00 2001 From: Meghana Date: Wed, 10 Jun 2020 00:14:17 +0530 Subject: [PATCH 13/51] removed button content --- .../Atoms/interfaceNavDropdown/Components/index.tsx | 5 +---- .../Components/Atoms/interfaceNavDropdown/constants.ts | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx index bd177fb7..3835430d 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx @@ -9,10 +9,7 @@ export const interfaceNavDropdown = () => ( Dashboard Nav DropDown
- + ); diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts index e2856119..4d0dd43a 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts @@ -1,4 +1,3 @@ export const Options = { - buttonTitle: 'Sophia', options: ['Dashboard', 'Profile', 'Settings', 'Privacy Policy', 'Log out'], }; From 445b3768aeacaa2c7ae1968b2dba2e98ce628b56 Mon Sep 17 00:00:00 2001 From: Meghana Date: Wed, 10 Jun 2020 00:20:37 +0530 Subject: [PATCH 14/51] deepscan fixes --- .../ignitus-Atoms/ignitus-navDropdown/Components/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx index 52788569..286694e5 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx @@ -8,8 +8,8 @@ export const NavDropdown = ({ options }: Props) => { {options.map(details => ( - - {details} + + {details} ))} From b63457039c4beca24f49cfe206c63ef13e434f86 Mon Sep 17 00:00:00 2001 From: LilianaCaetano Date: Wed, 10 Jun 2020 17:52:29 +0100 Subject: [PATCH 15/51] display overlay --- .../Components/index.tsx | 36 +++++++++++++++---- .../ignitus-Navigation/styles.ts | 8 +++++ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/ignitus-Dashboard/ignitus-DashboardHeader/Components/index.tsx b/src/ignitus-Dashboard/ignitus-DashboardHeader/Components/index.tsx index 3543bc86..d2bd868d 100644 --- a/src/ignitus-Dashboard/ignitus-DashboardHeader/Components/index.tsx +++ b/src/ignitus-Dashboard/ignitus-DashboardHeader/Components/index.tsx @@ -1,19 +1,32 @@ /* eslint-disable jsx-a11y/anchor-is-valid */ -import React from 'react'; +import React, { useState } from 'react'; -import { Redirect } from 'react-router-dom'; +import { withRouter } from 'react-router-dom'; import { withErrorBoundary, AppIcon, useToggle } from '../../../ignitus-Shared'; import * as N from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/styles'; +import { Overlay } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components'; + +const OVERLAY_DURATION = 600; export const DashBoardNavigation: React.FC = withErrorBoundary( - ({ logUserOut }: any) => { + withRouter(({ logUserOut, history }: any) => { + const [visibleLogoutOverlay, setVisibleLogoutOverlay] = useState(false); + const [isExpanded, toogleIsExpanded] = useToggle(false); + const logout = () => { logUserOut(); localStorage.clear(); - return ; + history.push('/'); + }; + + const onClickLogout = () => { + setVisibleLogoutOverlay(true); + + setTimeout(() => { + logout(); + }, OVERLAY_DURATION); }; - const [isExpanded, toogleIsExpanded] = useToggle(false); const userInformation: string | null = localStorage.getItem('data'); let userEmail: string = ''; let userType: string = ''; @@ -47,11 +60,20 @@ export const DashBoardNavigation: React.FC = withErrorBoundary( {userEmail} - + Logout + {visibleLogoutOverlay && ( + + + + )} + ); - }, + }), ); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/styles.ts index 21e9d5b2..0ada8961 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/styles.ts @@ -122,3 +122,11 @@ export const Burger = styled(Icon, { shouldForwardProp: isValidProps })< top: 1.2rem; } `; + +export const Fullscreen = styled.div` + position: fixed; + top: 0; + left: 0; + height: 100vh; + width: 100vw; +`; From d61261d930081db669845792e8f77b5bb59ef5a8 Mon Sep 17 00:00:00 2001 From: Meghana Date: Thu, 11 Jun 2020 15:40:44 +0530 Subject: [PATCH 16/51] added functionality --- .../ignitus-navDropdown/Components/index.tsx | 50 +++++++++++++++---- .../ignitus-navDropdown/styles.ts | 32 ++++++++---- .../ignitus-navDropdown/types.ts | 8 ++- .../Common/__snapshots__/Layer.test.tsx.snap | 18 ++++++- .../ignitus-SideNavigation/Common/styles.ts | 12 +++-- .../ignitus-SideNavigation/Common/types.ts | 7 ++- .../ignitus-DashboardSideNavigation/style.ts | 2 + .../ignitus-MessageSideNavigation/style.ts | 1 + .../Components/index.tsx | 4 +- .../style.ts | 3 +- .../interfaceNavDropdown/Components/index.tsx | 4 +- .../Atoms/interfaceNavDropdown/constants.ts | 24 +++++++-- 12 files changed, 128 insertions(+), 37 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx index 286694e5..a148716c 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components/index.tsx @@ -1,18 +1,50 @@ import React from 'react'; +import { Layer } from '../../../ignitus-Organisms/ignitus-SideNavigation/Common/styles'; import * as S from '../styles'; import { Props } from '../types'; -import { Heading5 } from '../../typography'; +import { AppIcon } from '../../../../types/iconsTypes/iconEnums'; -export const NavDropdown = ({ options }: Props) => { +export const NavDropdown = ({ options, name }: Props) => { + const [content, setContent] = React.useState(false); return ( - - {options.map(details => ( - - {details} - - ))} - + setContent(!content)}> + + {name} + + + {content ? ( + + {options.map(({ details, isLast }: any) => ( +
+ {isLast === true ? ( + + {' '} +
{details}
+ + ) : ( + + {' '} +
{details}
{' '} + + )} +
+ ))} + + ) : null} ); }; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts index c05d10ae..3b396dfb 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts @@ -1,22 +1,32 @@ import styled from '@emotion/styled'; -import { White, IgnitusBlue, GreyBackground } from '../colors'; +import { White, IgnitusBlue } from '../colors'; +import { Icon } from '../../../ignitus-Utilities/Components/icon'; +import { StyleProps } from './types'; +import { MD } from '../fonts'; export const Container = styled.div` background-color: ${White}; - width: 10rem; + width: 12rem; border-radius: 1rem; overflow: hidden; + left: 0rem; + margin-top: 1rem; `; -export const Option = styled.div` - border-bottom: 0.2rem solid ${GreyBackground}; - height: 2.5rem; +export const NavItem = styled.div` display: flex; - justify-content: center; + justify-content: flex-end; align-items: center; - overflow: hidden; - &:hover { - background-color: ${IgnitusBlue}; - color: ${White}; - } + color: ${IgnitusBlue}; + cursor: pointer; + font-size: ${MD}; + width: 12rem; +`; + +export const StyledIcon = styled(Icon)` + height: 1.5rem; + width: 1.5rem; + fill: ${IgnitusBlue}; + margin-left: ${props => (props.marginLeft ? '0.5rem' : '')}; + margin-right: ${props => (props.marginRight ? '0.5rem' : '')}; `; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/types.ts index 2078933d..0a97b53c 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/types.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/types.ts @@ -1,3 +1,9 @@ export type Props = { - options: string[]; + options: object[]; + name: string; +}; + +export type StyleProps = { + marginLeft?: boolean; + marginRight?: boolean; }; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/__snapshots__/Layer.test.tsx.snap b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/__snapshots__/Layer.test.tsx.snap index 1ccf1870..7666e2d3 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/__snapshots__/Layer.test.tsx.snap +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/__snapshots__/Layer.test.tsx.snap @@ -7,14 +7,28 @@ exports[` should render 1`] = ` cursor: pointer; font-size: 18px; font-weight: 400; - margin-top: none; - margin-bottom: none; padding: 1rem 0; width: 100%; } +.emotion-1 .NavDropdown { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; +} + .emotion-1:hover { background-color: #000066; + color: #ffffff; } .emotion-1:hover p { diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/styles.ts index 61935bec..68368264 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/styles.ts @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; import { White, IgnitusBlue, GreyLight } from '../../../ignitus-Atoms/colors'; -import { MD, Normal } from '../../../ignitus-Atoms/fonts'; +import { MD, SemiBold, Normal } from '../../../ignitus-Atoms/fonts'; import { StyledLayerProps } from './types'; export const Layer = styled.div` @@ -9,13 +9,17 @@ export const Layer = styled.div` color: ${IgnitusBlue}; cursor: pointer; font-size: ${MD}; - font-weight: ${Normal}; - margin-top: ${props => (props.marginTop ? '0.5rem' : 'none')}; - margin-bottom: ${props => (props.marginBottom ? '0.5rem' : 'none')}; + font-weight: ${props => (props.semiBold ? `${SemiBold}` : `${Normal}`)}; padding: 1rem 0; width: 100%; + .NavDropdown { + display: flex; + align-items: center; + justify-content: center; + } &:hover { background-color: ${IgnitusBlue}; + color: ${White}; p { color: ${White}; } diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/types.ts index e6f5b584..888ffea9 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/types.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/types.ts @@ -3,6 +3,7 @@ export interface LayerProps { border?: boolean; marginTop?: boolean; marginBottom?: boolean; + semiBold?: boolean; prepend?: React.ReactNode; append?: React.ReactNode; [rest: string]: any; @@ -10,7 +11,9 @@ export interface LayerProps { export type StyledLayerProps = { border: boolean; - marginTop: boolean; - marginBottom: boolean; + marginTop?: boolean; + marginBottom?: boolean; containIcon?: boolean; + alignCenter?: boolean; + semiBold?: boolean; }; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-DashboardSideNavigation/style.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-DashboardSideNavigation/style.ts index 383c5900..8469e59f 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-DashboardSideNavigation/style.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-DashboardSideNavigation/style.ts @@ -14,6 +14,7 @@ export const SettingsContainer = styled(flexibleColDiv)` border-radius: 16px; box-shadow: 0 2px 4px 0 ${boxShadowColor}; width: 14rem; + overflow: hidden; `; export const Layer = styled(CommonLayer)` @@ -21,6 +22,7 @@ export const Layer = styled(CommonLayer)` align-items: center; justify-content: flex-start; flex-direction: row; + height: 100%; `; export const SideNavIcon = styled(Icon)` diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-MessageSideNavigation/style.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-MessageSideNavigation/style.ts index f774ba77..8e2247e3 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-MessageSideNavigation/style.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-MessageSideNavigation/style.ts @@ -10,6 +10,7 @@ export const MessageContainer = styled(flexibleColDiv)` box-shadow: 0 2px 4px 0 ${boxShadowColor}; width: 14rem; height: 16rem; + overflow: hidden; `; export const Layer = styled(CommonLayer)` diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/Components/index.tsx index 38f7f06c..3c1b47b9 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/Components/index.tsx @@ -5,12 +5,12 @@ import * as S from '../style'; export const UserSettingsSideNavigation = () => { return ( - + - + ); }; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/style.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/style.ts index 95c10df2..7a453642 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/style.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/style.ts @@ -8,7 +8,8 @@ export const SettingsContainer = styled(flexibleColDiv)` border-radius: 16px; box-shadow: 0 2px 4px 0 ${boxShadowColor}; width: 14rem; - height: 22rem; + height: 19.5rem; + overflow: hidden; `; export const Layer = styled(CommonLayer)` diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx index 3835430d..67d4992e 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/Components/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import * as S from '../styles'; import { NavDropdown } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/Components'; -import { Options } from '../constants'; +import { options, name } from '../constants'; import { Heading1 } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/typography'; export const interfaceNavDropdown = () => ( @@ -9,7 +9,7 @@ export const interfaceNavDropdown = () => ( Dashboard Nav DropDown
- + ); diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts index 4d0dd43a..38fb9a1a 100644 --- a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceNavDropdown/constants.ts @@ -1,3 +1,21 @@ -export const Options = { - options: ['Dashboard', 'Profile', 'Settings', 'Privacy Policy', 'Log out'], -}; +export const options = [ + { + details: 'Dashboard', + isLast: false, + }, + { + details: 'Profile', + isLast: false, + }, + { + details: 'Settings', + isLast: false, + }, + { details: 'Privacy Policy', isLast: false }, + { + details: 'Log out', + isLast: true, + }, +]; + +export const name = 'Sophia'; From 973c8d1f6c40f8876d709f079000c9259bcdb295 Mon Sep 17 00:00:00 2001 From: Meghana Date: Thu, 11 Jun 2020 15:47:38 +0530 Subject: [PATCH 17/51] minor UI fix --- .../ignitus-Atoms/ignitus-navDropdown/styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts index 3b396dfb..9f6d7393 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-navDropdown/styles.ts @@ -7,7 +7,7 @@ import { MD } from '../fonts'; export const Container = styled.div` background-color: ${White}; width: 12rem; - border-radius: 1rem; + border-radius: 1rem 0rem 1rem 1rem; overflow: hidden; left: 0rem; margin-top: 1rem; From 09552203c05c1e3f9835cd15f91a5301c09976f4 Mon Sep 17 00:00:00 2001 From: Meghana Date: Thu, 11 Jun 2020 22:37:17 +0530 Subject: [PATCH 18/51] fixes --- .../Common/__snapshots__/Layer.test.tsx.snap | 2 ++ .../ignitus-Organisms/ignitus-SideNavigation/Common/styles.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/__snapshots__/Layer.test.tsx.snap b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/__snapshots__/Layer.test.tsx.snap index 7666e2d3..a82d6b25 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/__snapshots__/Layer.test.tsx.snap +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/__snapshots__/Layer.test.tsx.snap @@ -9,6 +9,8 @@ exports[` should render 1`] = ` font-weight: 400; padding: 1rem 0; width: 100%; + margin-top: none; + margin-bottom: none; } .emotion-1 .NavDropdown { diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/styles.ts index 68368264..d280bb4d 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/Common/styles.ts @@ -12,6 +12,8 @@ export const Layer = styled.div` font-weight: ${props => (props.semiBold ? `${SemiBold}` : `${Normal}`)}; padding: 1rem 0; width: 100%; + margin-top: ${props => (props.marginTop ? '0.5rem' : 'none')}; + margin-bottom: ${props => (props.marginBottom ? '0.5rem' : 'none')}; .NavDropdown { display: flex; align-items: center; From 2d3f6544f8ef816936cff889a05c4a6f3886f545 Mon Sep 17 00:00:00 2001 From: LilianaCaetano Date: Mon, 15 Jun 2020 17:32:26 +0100 Subject: [PATCH 19/51] add message card to interface --- .../ignitus-UserInterfaceBookRoutes/index.tsx | 2 ++ .../ignitus-MessageCard/Components/index.tsx | 28 ++++++++++++++++ .../ignitus-MessageCard/styles.ts | 32 +++++++++++++++++++ src/ignitus-Shared/index.ts | 4 +++ .../interfaceMessageCard/Components/index.tsx | 23 +++++++++++++ .../interfaceMessageCard/constants.ts | 20 ++++++++++++ .../Organisms/interfaceMessageCard/types.ts | 7 ++++ .../InterfaceSideNavigation/constants.ts | 4 +++ 8 files changed, 120 insertions(+) create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts create mode 100644 src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx create mode 100644 src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/constants.ts create mode 100644 src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/types.ts diff --git a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx index 4fc45ea6..80f8efec 100644 --- a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx @@ -17,6 +17,7 @@ import { interfaceCheckBox } from '../../ignitus-UserInterfaceBook/Components/At import { interfaceInput } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceInput/Components'; import { interfaceOpportunityList } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceOpportunityList/Components'; import { interfaceSavedOpportunity } from '../../ignitus-UserInterfaceBook/Components/Layouts/interfaceSavedOpportunity/Components'; +import { interfaceMessageCard } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components'; import { interfaceSearchInput } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceSearchInput/Components'; import { interfaceSeparator } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceSeparator/Components'; import { interfaceDashBoardFooter } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceFooter/interfaceDashBoardFooter/Components'; @@ -141,6 +142,7 @@ export const UserInterfaceBookRoutes: React.FunctionComponent = () => ( + diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx new file mode 100644 index 00000000..5c994e23 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import * as S from '../styles'; +import { + Heading5, + Heading6, + Paragraph, +} from '../../../ignitus-Atoms/typography'; +import { withErrorBoundary } from '../../../../ignitus-ErrorHandlingComponents/errorBoundary'; + +export const MessageCard = withErrorBoundary( + ({ name, position, numberMessages, dateSent, avatar }) => ( + + + avatar + + + + {name} + {position} + + + + {numberMessages} + {dateSent} + + + ), +); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts new file mode 100644 index 00000000..86c36a0c --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts @@ -0,0 +1,32 @@ +import styled from '@emotion/styled'; +import * as C from '../../ignitus-Atoms/colors'; +import * as T from '../../ignitus-Atoms/typography'; +import { flexibleRowDiv } from '../../shared'; +import { Normal } from '../../ignitus-Atoms/fonts'; + +export const MessageContainer = styled(flexibleRowDiv)` + border-radius: 4px; + box-shadow: 0 2px 4px 0 ${C.boxShadowColor}; + background-color: ${C.White}; + padding: 0.1rem; + width: 50%; +`; + +export const ImageContainer = styled(flexibleRowDiv)` + padding: 0.3rem; + img { + border-radius: 50%; + width: 56px; + max-width: 100%; + max-height: 100%; + } +`; + +export const MessageSubTitle = styled(T.Paragraph)` + font-weight: ${Normal}; + color: ${C.GreyOne}; +`; + +export const MessageDateTitle = styled.div` + color: ${C.GreyOne}; +`; diff --git a/src/ignitus-Shared/index.ts b/src/ignitus-Shared/index.ts index 5dea2c27..050160ab 100644 --- a/src/ignitus-Shared/index.ts +++ b/src/ignitus-Shared/index.ts @@ -117,6 +117,10 @@ export { UserProfileCard, } from './ignitus-DesignSystem/ignitus-Organisms/ignitus-ProfileCard/Components'; +export { + MessageCard, +} from './ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components'; + export { DashboardNavigation, } from './ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-DashboardSideNavigation/Components'; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx new file mode 100644 index 00000000..18e43364 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx @@ -0,0 +1,23 @@ +import React from 'react'; +import styled from '@emotion/styled'; +import { MessageCard, Heading2 } from '../../../../../ignitus-Shared'; +import { Interface } from '../../../../styles'; +import { flexibleColDiv } from '../../../../../ignitus-Shared/ignitus-DesignSystem/shared'; +import { MessageData } from '../constants'; + +export const MessageList = styled(flexibleColDiv)``; + +export const interfaceMessageCard: React.FC = () => ( + + Message Card +
+ + {MessageData.map(({ name, ...rest }) => ( + + +
+ + ))} + + +); diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/constants.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/constants.ts new file mode 100644 index 00000000..ed758700 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/constants.ts @@ -0,0 +1,20 @@ +import { MessageCardData } from './types'; + +export const MessageData: MessageCardData[] = [ + { + name: 'Donald Kunkel', + position: 'Professor', + numberMessages: '8 Messages', + dateSent: 'Thu, 8:23AM', + avatar: + 'https://storage.googleapis.com/ignitus_assets/ig-avatars/eugene.png', + }, + { + name: 'Victoria Hopper', + position: 'Professor', + numberMessages: '2 Messages', + dateSent: 'Wed, 12:02AM', + avatar: + 'https://storage.googleapis.com/ignitus_assets/ig-avatars/melanie.png', + }, +]; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/types.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/types.ts new file mode 100644 index 00000000..48aef2e0 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/types.ts @@ -0,0 +1,7 @@ +export type MessageCardData = { + name: string; + position: string; + numberMessages: string; + dateSent: string; + avatar: string; +}; diff --git a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts b/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts index 4e0e8074..49576122 100644 --- a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts +++ b/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts @@ -197,6 +197,10 @@ export const allEdges: Edges[] = [ title: 'Side Profile', route: '/interface/sideProfile', }, + { + title: 'Message Card', + route: '/interface/messageCard', + }, ], }, { From 50e46785ef2531546ef510557dd8a0308474e1b6 Mon Sep 17 00:00:00 2001 From: LilianaCaetano Date: Tue, 16 Jun 2020 10:41:39 +0100 Subject: [PATCH 20/51] add status icon to avatar --- .../ignitus-MessageCard/Components/index.tsx | 3 +++ .../ignitus-MessageCard/styles.ts | 14 +++++++++++--- .../interfaceMessageCard/Components/index.tsx | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx index 5c994e23..65c1fd12 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx @@ -12,6 +12,9 @@ export const MessageCard = withErrorBoundary( avatar + + + diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts index 86c36a0c..bf0d8bae 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts @@ -8,25 +8,33 @@ export const MessageContainer = styled(flexibleRowDiv)` border-radius: 4px; box-shadow: 0 2px 4px 0 ${C.boxShadowColor}; background-color: ${C.White}; - padding: 0.1rem; + padding: 1rem; width: 50%; `; export const ImageContainer = styled(flexibleRowDiv)` - padding: 0.3rem; + padding-right: 1rem; img { + position: relative; border-radius: 50%; width: 56px; max-width: 100%; max-height: 100%; } + svg { + color: #219653; + position: absolute; + stroke: white; + fill: #219653; + } `; export const MessageSubTitle = styled(T.Paragraph)` + padding-right: 1rem; font-weight: ${Normal}; color: ${C.GreyOne}; `; export const MessageDateTitle = styled.div` - color: ${C.GreyOne}; + text-align: right; `; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx index 18e43364..711d83a2 100644 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx @@ -14,7 +14,7 @@ export const interfaceMessageCard: React.FC = () => ( {MessageData.map(({ name, ...rest }) => ( - +
))} From e09c25153214e07cc9852f2ae506eab4ecf7b967 Mon Sep 17 00:00:00 2001 From: LilianaCaetano Date: Tue, 16 Jun 2020 13:58:37 +0100 Subject: [PATCH 21/51] online and offline status --- .../ignitus-Organisms/ignitus-MessageCard/Components/index.tsx | 3 ++- .../ignitus-Organisms/ignitus-MessageCard/styles.ts | 3 ++- .../Components/Organisms/interfaceMessageCard/constants.ts | 2 ++ .../Components/Organisms/interfaceMessageCard/types.ts | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx index 65c1fd12..f35c992e 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx @@ -8,12 +8,13 @@ import { import { withErrorBoundary } from '../../../../ignitus-ErrorHandlingComponents/errorBoundary'; export const MessageCard = withErrorBoundary( - ({ name, position, numberMessages, dateSent, avatar }) => ( + ({ name, position, numberMessages, dateSent, avatar, online }) => ( avatar + {!online && } diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts index bf0d8bae..fc05d5fb 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts @@ -10,6 +10,7 @@ export const MessageContainer = styled(flexibleRowDiv)` background-color: ${C.White}; padding: 1rem; width: 50%; + display: space-be; `; export const ImageContainer = styled(flexibleRowDiv)` @@ -22,8 +23,8 @@ export const ImageContainer = styled(flexibleRowDiv)` max-height: 100%; } svg { - color: #219653; position: absolute; + padding: 10px; stroke: white; fill: #219653; } diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/constants.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/constants.ts index ed758700..7826058c 100644 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/constants.ts +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/constants.ts @@ -8,6 +8,7 @@ export const MessageData: MessageCardData[] = [ dateSent: 'Thu, 8:23AM', avatar: 'https://storage.googleapis.com/ignitus_assets/ig-avatars/eugene.png', + online: true, }, { name: 'Victoria Hopper', @@ -16,5 +17,6 @@ export const MessageData: MessageCardData[] = [ dateSent: 'Wed, 12:02AM', avatar: 'https://storage.googleapis.com/ignitus_assets/ig-avatars/melanie.png', + online: false, }, ]; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/types.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/types.ts index 48aef2e0..55d564ad 100644 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/types.ts +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/types.ts @@ -4,4 +4,5 @@ export type MessageCardData = { numberMessages: string; dateSent: string; avatar: string; + online: boolean; }; From 8c535fe51871ff8951c2580fab9a1f0b79185dfb Mon Sep 17 00:00:00 2001 From: LilianaCaetano Date: Tue, 16 Jun 2020 15:59:51 +0100 Subject: [PATCH 22/51] fix styles --- .../ignitus-MessageCard/Components/index.tsx | 13 ++----- .../ignitus-MessageCard/styles.ts | 37 +++++++++++++++---- .../interfaceMessageCard/Components/index.tsx | 23 ++++++++---- 3 files changed, 48 insertions(+), 25 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx index f35c992e..12732842 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx @@ -1,10 +1,5 @@ import React from 'react'; import * as S from '../styles'; -import { - Heading5, - Heading6, - Paragraph, -} from '../../../ignitus-Atoms/typography'; import { withErrorBoundary } from '../../../../ignitus-ErrorHandlingComponents/errorBoundary'; export const MessageCard = withErrorBoundary( @@ -19,13 +14,13 @@ export const MessageCard = withErrorBoundary( - {name} - {position} + {name} + {position} - {numberMessages} - {dateSent} + {numberMessages} + {dateSent} ), diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts index fc05d5fb..8081ed24 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts @@ -1,20 +1,20 @@ import styled from '@emotion/styled'; import * as C from '../../ignitus-Atoms/colors'; import * as T from '../../ignitus-Atoms/typography'; +import * as F from '../../ignitus-Atoms/fonts'; import { flexibleRowDiv } from '../../shared'; -import { Normal } from '../../ignitus-Atoms/fonts'; export const MessageContainer = styled(flexibleRowDiv)` - border-radius: 4px; + border-radius: 16px; box-shadow: 0 2px 4px 0 ${C.boxShadowColor}; background-color: ${C.White}; padding: 1rem; - width: 50%; - display: space-be; + width: 100%; + display: flex; + justify-content: flex-start; `; export const ImageContainer = styled(flexibleRowDiv)` - padding-right: 1rem; img { position: relative; border-radius: 50%; @@ -31,11 +31,32 @@ export const ImageContainer = styled(flexibleRowDiv)` `; export const MessageSubTitle = styled(T.Paragraph)` - padding-right: 1rem; - font-weight: ${Normal}; - color: ${C.GreyOne}; + margin-left: 1rem; +`; + +export const Sender = styled(T.Paragraph)` + font-weight: ${F.Bold}; + font-size: ${F.MD}; + color: ${C.IgnitusBlue}; + margin-bottom: 0.5rem; +`; + +export const SenderPosition = styled(T.Paragraph)` + font-weight: ${F.Normal}; + font-size: ${F.SM}; + color: ${C.IgnitusBlue}; + margin-bottom: 0.5rem; `; export const MessageDateTitle = styled.div` text-align: right; + margin-left: auto; +`; + +export const Details = styled(T.Paragraph)` + font-family: Open Sans; + font-weight: ${F.Normal}; + font-size: ${F.SM}; + color: ${C.GreyOne}; + margin-bottom: 0.5rem; `; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx index 711d83a2..bf2fb5db 100644 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx @@ -11,13 +11,20 @@ export const interfaceMessageCard: React.FC = () => ( Message Card
- - {MessageData.map(({ name, ...rest }) => ( - - -
- - ))} - +
+ + {MessageData.map(({ name, ...rest }) => ( + + +
+ + ))} + +
); From 8c96a374b464c4733f9fb8b1726820e57707769f Mon Sep 17 00:00:00 2001 From: LilianaCaetano Date: Tue, 16 Jun 2020 16:36:37 +0100 Subject: [PATCH 23/51] fix status styles --- .../ignitus-MessageCard/Components/index.tsx | 8 ++++---- .../ignitus-MessageCard/styles.ts | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx index 12732842..e9e4c648 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx @@ -6,11 +6,11 @@ export const MessageCard = withErrorBoundary( ({ name, position, numberMessages, dateSent, avatar, online }) => ( - avatar - - - {!online && } + + + {!online && } + avatar diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts index 8081ed24..b852b6a5 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts @@ -10,23 +10,27 @@ export const MessageContainer = styled(flexibleRowDiv)` background-color: ${C.White}; padding: 1rem; width: 100%; - display: flex; - justify-content: flex-start; `; export const ImageContainer = styled(flexibleRowDiv)` + position: relative; + padding: 0.5rem; + img { - position: relative; border-radius: 50%; - width: 56px; + width: 4rem; max-width: 100%; max-height: 100%; } + svg { position: absolute; - padding: 10px; + bottom: 0; + right: 0; stroke: white; fill: #219653; + height: 2rem; + width: 2rem; } `; From 72025f4ab3bedb349cf49933a10a08ba89267659 Mon Sep 17 00:00:00 2001 From: LilianaCaetano Date: Tue, 16 Jun 2020 17:33:56 +0100 Subject: [PATCH 24/51] fix box sizes --- .../ignitus-MessageCard/Components/index.tsx | 3 ++- .../ignitus-Organisms/ignitus-MessageCard/styles.ts | 8 +++++--- .../interfaceMessageCard/Components/index.tsx | 11 ++--------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx index e9e4c648..32c0873d 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/Components/index.tsx @@ -1,5 +1,6 @@ import React from 'react'; import * as S from '../styles'; +import * as C from '../../../ignitus-Atoms/colors'; import { withErrorBoundary } from '../../../../ignitus-ErrorHandlingComponents/errorBoundary'; export const MessageCard = withErrorBoundary( @@ -8,7 +9,7 @@ export const MessageCard = withErrorBoundary( - {!online && } + {!online && } avatar diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts index b852b6a5..ea225cb3 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-MessageCard/styles.ts @@ -5,14 +5,16 @@ import * as F from '../../ignitus-Atoms/fonts'; import { flexibleRowDiv } from '../../shared'; export const MessageContainer = styled(flexibleRowDiv)` - border-radius: 16px; + border-radius: 1rem; box-shadow: 0 2px 4px 0 ${C.boxShadowColor}; background-color: ${C.White}; + box-sizing: border-box; padding: 1rem; width: 100%; + margin-bottom: 1rem; `; -export const ImageContainer = styled(flexibleRowDiv)` +export const ImageContainer = styled.div` position: relative; padding: 0.5rem; @@ -27,7 +29,7 @@ export const ImageContainer = styled(flexibleRowDiv)` position: absolute; bottom: 0; right: 0; - stroke: white; + stroke: ${C.White}; fill: #219653; height: 2rem; width: 2rem; diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx index bf2fb5db..d016bece 100644 --- a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceMessageCard/Components/index.tsx @@ -1,27 +1,20 @@ import React from 'react'; -import styled from '@emotion/styled'; import { MessageCard, Heading2 } from '../../../../../ignitus-Shared'; import { Interface } from '../../../../styles'; import { flexibleColDiv } from '../../../../../ignitus-Shared/ignitus-DesignSystem/shared'; import { MessageData } from '../constants'; -export const MessageList = styled(flexibleColDiv)``; +export const MessageList = flexibleColDiv; export const interfaceMessageCard: React.FC = () => ( Message Card
-
+
{MessageData.map(({ name, ...rest }) => ( -
))} From a8bdc9609665f4aae97b9d6dbde90bb035dc1104 Mon Sep 17 00:00:00 2001 From: Dishebh Bhayana Date: Sat, 27 Jun 2020 13:53:44 +0530 Subject: [PATCH 25/51] added notifications route --- .../ignitus-UserInterfaceBookRoutes/index.tsx | 2 + .../Components/index.tsx | 79 ++++++++ .../ignitus-Notifications/styles.ts | 175 ++++++++++++++++++ .../ignitus-Notifications/types.ts | 11 ++ src/ignitus-Shared/index.ts | 3 + .../Components/index.tsx | 12 ++ .../Organisms/interfaceNotifications/style.ts | 8 + 7 files changed, 290 insertions(+) create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components/index.tsx create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/styles.ts create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/types.ts create mode 100644 src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/Components/index.tsx create mode 100644 src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/style.ts diff --git a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx index 4fc45ea6..5ce967fd 100644 --- a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx @@ -28,6 +28,7 @@ import { interfaceOverlay } from '../../ignitus-UserInterfaceBook/Components/Mol import { interfaceTags } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceTags/Components'; import { interfaceFilters } from '../../ignitus-UserInterfaceBook/Components/Templates/interfaceFilters/Components/index'; import { interfaceUserProfile } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceUserProfile/Components'; +import { interfaceNotifications } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/Components'; import { InterfaceAvatar } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceAvatar/Components'; import { interfaceSideProfile } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceSideProfile/Components/index'; import { InterfaceProgress } from '../../ignitus-UserInterfaceBook/Components/Molecules/interfaceProgress/index'; @@ -139,6 +140,7 @@ export const UserInterfaceBookRoutes: React.FunctionComponent = () => ( component={interfaceToggleButtons} /> + diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components/index.tsx new file mode 100644 index 00000000..1f82dcea --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components/index.tsx @@ -0,0 +1,79 @@ +/* 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + +)); + +export const DropDownButton = () => ( + + + More ... + + Ask For Recommendation + Share Profile + Block + + + +); + +export const IconContent = ({ content, name }: Props) => ( + + + + {content} + + +); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/styles.ts new file mode 100644 index 00000000..e72142c7 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/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 { Icon 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 ${C.boxShadowColor}; + 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 2px 4px 0 ${C.boxShadowColor}; + 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-Notifications/types.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/types.ts new file mode 100644 index 00000000..fc5b6f6a --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/types.ts @@ -0,0 +1,11 @@ +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/index.ts b/src/ignitus-Shared/index.ts index 5dea2c27..2a44d01e 100644 --- a/src/ignitus-Shared/index.ts +++ b/src/ignitus-Shared/index.ts @@ -129,6 +129,9 @@ export { UserSettingsSideNavigation, } from './ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/Components'; +export { + Notifications, +} from './ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components'; /** * ignitus-Templates */ diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/Components/index.tsx new file mode 100644 index 00000000..9c405c73 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/Components/index.tsx @@ -0,0 +1,12 @@ +import React from 'react'; + +import { Heading2 } from '../../../../../ignitus-Shared'; + +import { Interface } from '../../../../styles'; + +export const interfaceNavigation: React.FC = () => ( + + Navigation +
+ +); diff --git a/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/style.ts b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/style.ts new file mode 100644 index 00000000..6fabded9 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/style.ts @@ -0,0 +1,8 @@ +import styled from '@emotion/styled'; + +export const NavigationContainer = styled.div` + display: flex; + flex-direction: row; + justify-content: space-evenly; + flex: 1; +`; From 0a1ca87b6ede10af61daa41cd274fb376b559893 Mon Sep 17 00:00:00 2001 From: Dishebh Bhayana Date: Sat, 27 Jun 2020 13:56:32 +0530 Subject: [PATCH 26/51] added notifications route --- .../ignitus-UserInterfaceBookRoutes/index.tsx | 4 ++-- .../ignitus-Notifications/Components/index.tsx | 2 +- src/ignitus-Shared/index.ts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx index 5ce967fd..a0007955 100644 --- a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx @@ -28,7 +28,7 @@ import { interfaceOverlay } from '../../ignitus-UserInterfaceBook/Components/Mol import { interfaceTags } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceTags/Components'; import { interfaceFilters } from '../../ignitus-UserInterfaceBook/Components/Templates/interfaceFilters/Components/index'; import { interfaceUserProfile } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceUserProfile/Components'; -import { interfaceNotifications } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/Components'; +// import { interfaceNotifications } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceNotifications/Components'; import { InterfaceAvatar } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceAvatar/Components'; import { interfaceSideProfile } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceSideProfile/Components/index'; import { InterfaceProgress } from '../../ignitus-UserInterfaceBook/Components/Molecules/interfaceProgress/index'; @@ -140,7 +140,7 @@ export const UserInterfaceBookRoutes: React.FunctionComponent = () => ( component={interfaceToggleButtons} /> - + {/* */} diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components/index.tsx index 1f82dcea..8cb63405 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components/index.tsx @@ -6,7 +6,7 @@ import { withErrorBoundary } from '../../../../ignitus-ErrorHandlingComponents/e import { AppIcon } from '../../../../types/iconsTypes/iconEnums'; import { Props } from '../types'; -export const UserProfileCard = withErrorBoundary(() => ( +export const Notifications = withErrorBoundary(() => ( Track Sophi progress diff --git a/src/ignitus-Shared/index.ts b/src/ignitus-Shared/index.ts index 2a44d01e..38cfc51c 100644 --- a/src/ignitus-Shared/index.ts +++ b/src/ignitus-Shared/index.ts @@ -129,9 +129,9 @@ export { UserSettingsSideNavigation, } from './ignitus-DesignSystem/ignitus-Organisms/ignitus-SideNavigation/ignitus-UserSettingsSideNavigation/Components'; -export { - Notifications, -} from './ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components'; +// export { +// Notifications, +// } from './ignitus-DesignSystem/ignitus-Organisms/ignitus-Notifications/Components'; /** * ignitus-Templates */ From 915192e3f190da45d2bda5dd792c1c4b3e7ab167 Mon Sep 17 00:00:00 2001 From: Daniel Davis Date: Sat, 27 Jun 2020 16:31:20 +0100 Subject: [PATCH 27/51] Adding digital ocean to supporters --- .../ignitus-SupportedBy/constants.ts | 3 +++ .../ignitus-Logos/digitalOceanLogo.png | Bin 0 -> 6943 bytes 2 files changed, 3 insertions(+) create mode 100755 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Logos/digitalOceanLogo.png diff --git a/src/ignitus-HomePage/ignitus-SupportedBy/constants.ts b/src/ignitus-HomePage/ignitus-SupportedBy/constants.ts index b577bb4f..7d1a2577 100644 --- a/src/ignitus-HomePage/ignitus-SupportedBy/constants.ts +++ b/src/ignitus-HomePage/ignitus-SupportedBy/constants.ts @@ -1,5 +1,6 @@ import gitbookLogo from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Logos/gitbookLogo.png'; import atlassianLogo from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Logos/atlassianLogo.png'; +import digitalOceanLogo from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Logos/digitalOceanLogo.png'; export const WOOTECH: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/WooTech.svg'; @@ -15,6 +16,7 @@ export const PROGATE: string = 'https://storage.googleapis.com/ignitus_assets/ig-partners-logo/progateLogo.png'; export const GITBOOK: string = gitbookLogo; export const ATLASSIAN: string = atlassianLogo; +export const DIGITALOCEAN: string = digitalOceanLogo; export const Data: string[] = [ WOOTECH, @@ -25,4 +27,5 @@ export const Data: string[] = [ GIRLSCRIPT, GITBOOK, ATLASSIAN, + DIGITALOCEAN, ]; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Logos/digitalOceanLogo.png b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Logos/digitalOceanLogo.png new file mode 100755 index 0000000000000000000000000000000000000000..ee98b493e025cb7cc805158e1b69dfd83bfcd202 GIT binary patch literal 6943 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 Zz~=yVOt|#aoK5Q^qN?-`RIO+p{(ph>O8o!; literal 0 HcmV?d00001 From 31b564dec2323dac76c1e8ea37bf01c48f390f9a Mon Sep 17 00:00:00 2001 From: Dishebh Bhayana Date: Sun, 28 Jun 2020 17:56:50 +0530 Subject: [PATCH 28/51] fixed inline-checkbox --- .../ignitus-defaultCheckbox/Components/index.tsx | 6 +++--- .../ignitus-Atoms/ignitus-defaultCheckbox/styles.ts | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components/index.tsx index 0f5810bd..ed12fbe7 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components/index.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { CheckBoxType } from '../types'; -import { CheckBox, Label, StyledParagraph } from '../styles'; +import { CheckBox, Label, StyledParagraph, Container } from '../styles'; export const DefaultCheckbox = ({ label, value }: CheckBoxType) => ( - + - + ); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/styles.ts index d3aa20f7..4cca0b0e 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/styles.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/styles.ts @@ -14,3 +14,7 @@ export const Label = styled.label` export const StyledParagraph = styled(Paragraph)` font-size: ${MD}; `; + +export const Container = styled.div` + display: inline-flex; +`; From 827aaae754816eb49824d0c7d64254404fae040d Mon Sep 17 00:00:00 2001 From: Dishebh Bhayana Date: Sun, 28 Jun 2020 18:04:02 +0530 Subject: [PATCH 29/51] updated test --- .../Components/__snapshots__/index.test.tsx.snap | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components/__snapshots__/index.test.tsx.snap b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components/__snapshots__/index.test.tsx.snap index cbc5d0bf..3f504f9e 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components/__snapshots__/index.test.tsx.snap +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultCheckbox/Components/__snapshots__/index.test.tsx.snap @@ -1,14 +1,16 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[` should render 1`] = ` -Array [ +
, + /> , -] + +
`; From d8535c0f2e01fff239510865e596ce50b35d2a57 Mon Sep 17 00:00:00 2001 From: Dishebh Bhayana Date: Mon, 29 Jun 2020 23:24:22 +0530 Subject: [PATCH 30/51] replaced signup progress image with component --- .../Components/index.tsx | 4 -- .../ignitus-EmailFlow/Components/index.tsx | 19 ------ .../ignitus-InterestFlow/Components/index.tsx | 15 ----- .../ignitus-WelcomeFlow/Components/index.tsx | 15 ----- .../ignitus-WelcomeFlow/Styles/style.ts | 4 -- .../ignitus-StudentSignUpFlow/index.tsx | 65 +++++++++++++++++++ .../ignitus-StudentSignUpFlow/style.ts | 19 ++++++ .../ignitus-AuthenticationRoutes/index.tsx | 13 +--- 8 files changed, 86 insertions(+), 68 deletions(-) create mode 100644 src/ignitus-Authentication/ignitus-StudentSignUpFlow/index.tsx create mode 100644 src/ignitus-Authentication/ignitus-StudentSignUpFlow/style.ts diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Components/index.tsx b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Components/index.tsx index 1f21c734..31fdd314 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Components/index.tsx +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailConfirmationFlow/Components/index.tsx @@ -18,10 +18,6 @@ export const EmailConfirmationFlow: FunctionComponent = withErrorBoundary( () => ( - Your email has been confirmed. diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Components/index.tsx b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Components/index.tsx index 2b569c5e..38aa295a 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Components/index.tsx +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-EmailFlow/Components/index.tsx @@ -2,13 +2,11 @@ /* eslint-disable jsx-a11y/click-events-have-key-events */ /* eslint-disable jsx-a11y/no-static-element-interactions */ import React, { FunctionComponent } from 'react'; -import { Link } from 'react-router-dom'; import newsletter from '../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Images/img-Png/newsletterIcon.png'; import { Paragraph, Heading2, withErrorBoundary, - Button, } from '../../../../ignitus-Shared'; import * as T from '../../ignitus-WelcomeFlow/Styles/style'; import * as C from '../Styles/style'; @@ -16,10 +14,6 @@ import * as C from '../Styles/style'; export const EmailFlow: FunctionComponent = withErrorBoundary(() => ( - Let’s confirm your email. @@ -31,18 +25,5 @@ export const EmailFlow: FunctionComponent = withErrorBoundary(() => ( Click the link we sent to sofia.carter@gmail.com to confirm you email. - - - - - - - I don’t want to confirm my email yet. - - )); diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-InterestFlow/Components/index.tsx b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-InterestFlow/Components/index.tsx index 572dcf3e..c41c2b46 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-InterestFlow/Components/index.tsx +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-InterestFlow/Components/index.tsx @@ -3,11 +3,9 @@ /* eslint-disable jsx-a11y/click-events-have-key-events */ /* eslint-disable jsx-a11y/no-static-element-interactions */ import React, { FunctionComponent } from 'react'; -import { Link } from 'react-router-dom'; import { Paragraph, Heading1, - RoundedButton, DefaultCheckbox, withErrorBoundary, } from '../../../../ignitus-Shared'; @@ -17,10 +15,6 @@ import * as C from '../Styles/style'; export const InterestFlow: FunctionComponent = withErrorBoundary(() => ( - What are you interested in? This will customize your experience. @@ -52,14 +46,5 @@ export const InterestFlow: FunctionComponent = withErrorBoundary(() => ( /> - - - Save & Continue - - - Skip for now - {' >> '} - - )); diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Components/index.tsx b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Components/index.tsx index 2fdbf7e6..e17b7acd 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Components/index.tsx +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Components/index.tsx @@ -1,10 +1,8 @@ /* eslint-disable import/extensions */ import React, { FunctionComponent } from 'react'; -import { Link } from 'react-router-dom'; import { Paragraph, Heading1, - RoundedButton, DefaultDropdown, withErrorBoundary, } from '../../../../ignitus-Shared'; @@ -13,10 +11,6 @@ import * as T from '../Styles/style'; export const WelcomeFlow: FunctionComponent = withErrorBoundary(() => ( - Welcome, Sophia Let’s start with your profile. This will get you successful on Ignitus @@ -59,14 +53,5 @@ export const WelcomeFlow: FunctionComponent = withErrorBoundary(() => ( /> - - - Save & Continue - - - Skip for now - {' >> '} - - )); diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Styles/style.ts b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Styles/style.ts index f94f6bbd..e6a632f7 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Styles/style.ts +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-WelcomeFlow/Styles/style.ts @@ -28,10 +28,6 @@ export const MiddleSection = styled.div` flex-wrap: wrap; `; -export const BottomSection = styled(flexibleColDiv)` - margin-top: 2rem; -`; - export const LeftSection = styled(flexibleColDiv)` ${minimumWidthQuery[2]} { margin-right: none; diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/index.tsx b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/index.tsx new file mode 100644 index 00000000..4de2a827 --- /dev/null +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/index.tsx @@ -0,0 +1,65 @@ +/* eslint-disable import/extensions */ +import React, { FunctionComponent, useState } from 'react'; +import { Link } from 'react-router-dom'; + +import { InterestFlow } from './ignitus-InterestFlow/Components'; +import { WelcomeFlow } from './ignitus-WelcomeFlow/Components'; +import { EmailFlow } from './ignitus-EmailFlow/Components'; +import { EmailConfirmationFlow } from './ignitus-EmailConfirmationFlow/Components'; +import { + withErrorBoundary, + RoundedButton, + Paragraph, + Button, +} from '../../ignitus-Shared'; +import { Progress } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Progress/Components/Progress'; + +import * as T from './style'; + +export const StudentSignUpFlow: FunctionComponent = withErrorBoundary(() => { + const [current, updateCurrent] = useState(1); + const steps = 4; + + const next = () => + current === steps + 1 ? null : updateCurrent(current + 1); + + return ( + + + + {current && current === 1 && } + {current && current === 2 && } + {current && current === 3 && ( + + + + + + + + + I don’t want to confirm my email yet. + + + + )} + {current && current === 4 && } + + {current !== 3 && current !== 4 && ( + + + Save & Continue + + + Skip for now + {' >> '} + + + )} + + ); +}); diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/style.ts b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/style.ts new file mode 100644 index 00000000..3e813160 --- /dev/null +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/style.ts @@ -0,0 +1,19 @@ +import styled from '@emotion/styled'; +import { + flexibleColDiv, + BottomRow, +} from '../../ignitus-Shared/ignitus-DesignSystem/shared'; + +export const Container = styled(flexibleColDiv)` + background: white; + margin-top: 4rem; + padding: 2rem; +`; + +export const BottomSection = styled(flexibleColDiv)` + margin-top: 2rem; +`; + +export const NewsletterImage = styled.img``; + +export const ButtonContainer = styled(BottomRow)``; diff --git a/src/ignitus-Routes/ignitus-AuthenticationRoutes/index.tsx b/src/ignitus-Routes/ignitus-AuthenticationRoutes/index.tsx index c7501553..16158deb 100644 --- a/src/ignitus-Routes/ignitus-AuthenticationRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-AuthenticationRoutes/index.tsx @@ -2,10 +2,7 @@ import React, { Suspense, Fragment, lazy } from 'react'; import { Switch, Route } from 'react-router-dom'; -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 { StudentSignUpFlow } from '../../ignitus-Authentication/ignitus-StudentSignUpFlow'; import { LazyLoader } from '../../ignitus-Shared/ignitus-DesignSystem/shared'; import { @@ -53,13 +50,7 @@ export const AuthenticationRoutes: React.FunctionComponent = () => ( - - - - + From 2155a4c1cd943273e5cd6685a98362cee77364f1 Mon Sep 17 00:00:00 2001 From: Dishebh Date: Fri, 3 Jul 2020 18:28:40 +0530 Subject: [PATCH 31/51] fixed join link --- .../ignitus-Navigation/Components/index.tsx | 13 ++++++++++++- .../ignitus-Navigation/constants.ts | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/index.tsx index 37f1d442..2f4464f7 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/index.tsx @@ -29,7 +29,18 @@ const PureNavigation: React.FC = ({ key={title} transparentNavigation={transparentNavigation} > - {title} + {title !== 'Join' && ( + {title} + )} + {title === 'Join' && ( + + {title} + + )} ))} diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/constants.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/constants.ts index 97302d10..b0ad98eb 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/constants.ts +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/constants.ts @@ -13,7 +13,7 @@ export const NonAuthenticatedNavigationItemsList: NavigationItems[] = [ { title: 'Join', - route: 'https://bit.ly/2SaYXMO', + route: 'https://bit.ly/JoinIgnitusSlack', }, { @@ -40,7 +40,7 @@ export const AuthenticatedNavigationItemsList: NavigationItems[] = [ { title: 'Join', - route: 'https://bit.ly/2SaYXMO', + route: 'https://bit.ly/JoinIgnitusSlack', }, { From 87ebf053f041b5d96847a9fc39537144eea35168 Mon Sep 17 00:00:00 2001 From: Dishebh Date: Sat, 4 Jul 2020 13:58:40 +0530 Subject: [PATCH 32/51] added unit test for Overlay component --- .../__snapshots__/index.test.tsx.snap | 142 ++++++++++++++++++ .../ignitus-Overlay/Components/index.test.tsx | 38 +++++ 2 files changed, 180 insertions(+) create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components/__snapshots__/index.test.tsx.snap create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components/index.test.tsx diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components/__snapshots__/index.test.tsx.snap b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components/__snapshots__/index.test.tsx.snap new file mode 100644 index 00000000..cda246c4 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components/__snapshots__/index.test.tsx.snap @@ -0,0 +1,142 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[` should render 1`] = ` +.emotion-4 { + position: relative; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; + background-color: rgba(0,0,102,0.89); + -webkit-backdrop-filter: blur(10px); + backdrop-filter: blur(10px); + width: 100%; + height: 100%; +} + +.emotion-3 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; +} + +.emotion-0 { + margin-bottom: 4rem; + height: 7.5rem; +} + +.emotion-0 path { + fill: white; +} + +.emotion-1 { + font-weight: 500; + font-size: 32px; + color: #ffffff; + margin-bottom: 1.5rem; +} + +.emotion-2 { + font-size: 16px; + font-weight: 400; + color: #ffffff; + margin: 0; +} + +
+
+ +

+ primary text +

+

+ secondary text +

+
+
+`; diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components/index.test.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components/index.test.tsx new file mode 100644 index 00000000..1fb92188 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-Overlay/Components/index.test.tsx @@ -0,0 +1,38 @@ +import React from 'react'; +import { mount, render } from 'enzyme'; +import emotionSerializer, { matchers } from 'jest-emotion'; +import { Overlay } from './index'; +import * as O from '../styles'; +import { Paragraph } from '../../../..'; + +const props = { + primaryText: 'primary text', + secondaryText: 'secondary text', +}; + +let wrapper; + +expect.addSnapshotSerializer(emotionSerializer); +expect.extend(matchers); + +describe('', () => { + beforeEach(() => { + wrapper = mount(); + }); + + it('should render', () => { + wrapper = render(); + expect(wrapper).toMatchSnapshot(); + }); + + it('should render logo, heading, paragraph', () => { + expect(wrapper.find(O.Logo).length).toBe(1); + expect(wrapper.find(O.Heading).length).toBe(1); + expect(wrapper.find(Paragraph).length).toBe(1); + }); + + it('should render heading, paragraph as passed in props', () => { + expect(wrapper.find(O.Heading).text()).toBe(props.primaryText); + expect(wrapper.find(Paragraph).text()).toBe(props.secondaryText); + }); +}); From 7ab899af96cc9ea10fb200e1bdee98cd8573d277 Mon Sep 17 00:00:00 2001 From: LilianaCaetano Date: Sat, 4 Jul 2020 19:19:01 +0100 Subject: [PATCH 33/51] logo with spin --- .../ignitus-UserInterfaceBookRoutes/index.tsx | 2 + .../ignitus-Loader/Components/index.tsx | 9 ++++ .../ignitus-Atoms/ignitus-Loader/styles.ts | 41 +++++++++++++++++++ src/ignitus-Shared/index.ts | 4 ++ .../interfaceLoader/Components/index.tsx | 11 +++++ .../InterfaceSideNavigation/constants.ts | 4 ++ 6 files changed, 71 insertions(+) create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-Loader/Components/index.tsx create mode 100644 src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-Loader/styles.ts create mode 100644 src/ignitus-UserInterfaceBook/Components/Atoms/interfaceLoader/Components/index.tsx diff --git a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx index 80f8efec..210e6d38 100644 --- a/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx +++ b/src/ignitus-Routes/ignitus-UserInterfaceBookRoutes/index.tsx @@ -6,6 +6,7 @@ import { Notfound } from '../../ignitus-Shared'; import { interfaceButttons } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceButtons/Components'; import { interfaceNavigation } from '../../ignitus-UserInterfaceBook/Components/Organisms/interfaceNavigation/Components'; import { interfaceIcons } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceIcons/Components'; +import { interfaceLoader } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceLoader/Components'; import { interfaceTypography } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceTypography/Components'; import { interfaceCards } from '../../ignitus-UserInterfaceBook/Components/Atoms/interfaceCards/Components'; import { interfaceNotFound } from '../../ignitus-UserInterfaceBook/Components/Layouts/interfaceNotFound/Components'; @@ -83,6 +84,7 @@ export const UserInterfaceBookRoutes: React.FunctionComponent = () => ( component={interfaceNavigation} /> + ( + + + + +); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-Loader/styles.ts b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-Loader/styles.ts new file mode 100644 index 00000000..20805894 --- /dev/null +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-Loader/styles.ts @@ -0,0 +1,41 @@ +import styled from '@emotion/styled'; +import { IgnitusLogo } from '../../ignitus-Assets/ignitus-Icons/ignitusLogo'; + +export const Spinner = styled.div` + position: absolute; + top: 0; + left: 0; + + margin: auto; + border: 1rem solid #f3f3f3; + border-radius: 50%; + border-top: 1rem solid #000066; + height: calc(100% - 2rem); + width: calc(100% - 2rem); + -webkit-animation: spin 2.5s linear infinite; + animation: spin 3s linear infinite; + + @keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } + } +`; + +export const Logo = styled(IgnitusLogo)` + height: 65%; + fill: #000066; +`; + +export const Container = styled.div` + position: relative; + display: flex; + justify-content: center; + align-items: center; + margin: auto; + width: 10rem; + height: 10rem; +`; diff --git a/src/ignitus-Shared/index.ts b/src/ignitus-Shared/index.ts index 050160ab..90b51fd8 100644 --- a/src/ignitus-Shared/index.ts +++ b/src/ignitus-Shared/index.ts @@ -53,6 +53,10 @@ export { export { SecondaryDropDown, } from './ignitus-DesignSystem/ignitus-Atoms/ignitus-secondaryDropDown/Components'; + +export { + Loader, +} from './ignitus-DesignSystem/ignitus-Atoms/ignitus-Loader/Components'; /** * ignitus-Layout */ diff --git a/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceLoader/Components/index.tsx b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceLoader/Components/index.tsx new file mode 100644 index 00000000..e42fbaf7 --- /dev/null +++ b/src/ignitus-UserInterfaceBook/Components/Atoms/interfaceLoader/Components/index.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import { Interface } from '../../../../styles'; +import { Heading2 } from '../../../../../ignitus-Shared'; +import { Loader } from '../../../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-Loader/Components'; + +export const interfaceLoader: React.FC = () => ( + + Loaders + + +); diff --git a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts b/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts index 49576122..5fad335f 100644 --- a/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts +++ b/src/ignitus-UserInterfaceBook/InterfaceSideNavigation/constants.ts @@ -92,6 +92,10 @@ export const allEdges: Edges[] = [ }, ], }, + { + title: 'Loader', + route: '/interface/loader', + }, ], }, { From 2f51c4cd19ab6584f013bf41e922e288d43a34e1 Mon Sep 17 00:00:00 2001 From: Dishebh Date: Sun, 5 Jul 2020 14:29:56 +0530 Subject: [PATCH 34/51] removed all useEffect warnings --- src/ignitus-AboutPage/ignitus-Team/Components/index.tsx | 2 +- .../ignitus-ProfessorSignUp/Components/index.tsx | 2 +- .../ignitus-StudentSignUp/Components/index.tsx | 2 +- .../Components/defaultIconInput/index.tsx | 2 +- .../Components/defaultPasswordInput/index.tsx | 2 +- .../ignitus-secondaryDropDown/Components/index.tsx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ignitus-AboutPage/ignitus-Team/Components/index.tsx b/src/ignitus-AboutPage/ignitus-Team/Components/index.tsx index 2bcd38a1..6b18736a 100644 --- a/src/ignitus-AboutPage/ignitus-Team/Components/index.tsx +++ b/src/ignitus-AboutPage/ignitus-Team/Components/index.tsx @@ -33,7 +33,7 @@ export const Team = withErrorBoundary( }: TeamPropType) => { useEffect(() => { getContributorsData(); - }, []); + }, [getContributorsData]); if (isFetching) { return ; diff --git a/src/ignitus-Authentication/ignitus-ProfessorSignUp/Components/index.tsx b/src/ignitus-Authentication/ignitus-ProfessorSignUp/Components/index.tsx index 47ac4633..b9010a65 100644 --- a/src/ignitus-Authentication/ignitus-ProfessorSignUp/Components/index.tsx +++ b/src/ignitus-Authentication/ignitus-ProfessorSignUp/Components/index.tsx @@ -14,7 +14,7 @@ export const SignUp: React.FC = withErrorBoundary( const { email, password, confirmPassword } = state; - useEffect(() => () => clearPreviousSignUp(), []); + useEffect(() => () => clearPreviousSignUp(), [clearPreviousSignUp]); const handleSubmit = e => { e.preventDefault(); diff --git a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Components/index.tsx b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Components/index.tsx index 7995556e..1d563d02 100644 --- a/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Components/index.tsx +++ b/src/ignitus-Authentication/ignitus-StudentSignUpFlow/ignitus-StudentSignUp/Components/index.tsx @@ -13,7 +13,7 @@ export const Signup: FunctionComponent = withErrorBoundary( const [state, setState] = useState(SignupStatePayload); const { email, password, confirmPassword } = state; - useEffect(() => () => clearPreviousSignUp(), []); + useEffect(() => () => clearPreviousSignUp(), [clearPreviousSignUp]); const handleSubmit = e => { e.preventDefault(); diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components/defaultIconInput/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components/defaultIconInput/index.tsx index 1fbccc6b..93b755f1 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components/defaultIconInput/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components/defaultIconInput/index.tsx @@ -15,7 +15,7 @@ export const DefaultIconInput = ({ useEffect(() => { handleChange(value); - }, [value]); + }, [handleChange, value]); return ( diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components/defaultPasswordInput/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components/defaultPasswordInput/index.tsx index 8a6a807a..11a97f1c 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components/defaultPasswordInput/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultIconInput/Components/defaultPasswordInput/index.tsx @@ -27,7 +27,7 @@ export const DefaultPasswordInput = ({ useEffect(() => { handleChange(value); - }, [value]); + }, [handleChange, value]); return ( diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-secondaryDropDown/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-secondaryDropDown/Components/index.tsx index 6c8a24d0..ba79fcb1 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-secondaryDropDown/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-secondaryDropDown/Components/index.tsx @@ -24,7 +24,7 @@ export const SecondaryDropDown = ({ data }) => { } else { setShowOptions(false); } - }, [searchTerm]); + }, [searchTerm, data]); return ( From 0eccc1d91c50aef26b92910044989f99e53207d8 Mon Sep 17 00:00:00 2001 From: Dishebh Date: Sun, 5 Jul 2020 16:07:10 +0530 Subject: [PATCH 35/51] fix navbar issue --- .../ignitus-Navigation/Components/index.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/index.tsx b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/index.tsx index 37f1d442..8d9232a6 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/index.tsx +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Organisms/ignitus-Navigation/Components/index.tsx @@ -18,6 +18,7 @@ const PureNavigation: React.FC = ({ ? AuthenticatedNavigationItemsList : NonAuthenticatedNavigationItemsList; const [isExpanded, toogleIsExpanded] = useToggle(true); + return ( @@ -29,7 +30,9 @@ const PureNavigation: React.FC = ({ key={title} transparentNavigation={transparentNavigation} > - {title} + + {title} + ))} From 02b78e87c1ddb93e98945fbcbd8203a9f9f1597d Mon Sep 17 00:00:00 2001 From: Dishebh Date: Sun, 5 Jul 2020 17:16:59 +0530 Subject: [PATCH 36/51] updated unit tests for ignitus-Atom --- .../__snapshots__/index.test.tsx.snap | 2 +- .../Components/index.test.tsx | 12 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Components/index.test.tsx | 12 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Components/index.test.tsx | 12 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../defaultIconInput/index.test.tsx | 14 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../defaultPasswordInput/index.test.tsx | 16 ++--- .../__snapshots__/index.test.tsx.snap | 2 +- .../Components/index.test.tsx | 12 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Components/index.test.tsx | 12 ++-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Components/index.test.tsx | 12 ++-- .../__snapshots__/defaultTag.test.tsx.snap | 64 +++++++++---------- .../Components/defaultTag.test.tsx | 10 +-- .../__snapshots__/index.test.tsx.snap | 2 +- .../Components/index.test.tsx | 13 ++-- 20 files changed, 103 insertions(+), 104 deletions(-) diff --git a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components/__snapshots__/index.test.tsx.snap b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components/__snapshots__/index.test.tsx.snap index 2dab096d..c8c8aa52 100644 --- a/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components/__snapshots__/index.test.tsx.snap +++ b/src/ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/ignitus-defaultButtonWithIcon/Components/__snapshots__/index.test.tsx.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[` should rendered 1`] = ` +exports[`should rendered 1`] = `