Skip to content

Commit

Permalink
Merge pull request #654 from Ignitus/develop
Browse files Browse the repository at this point in the history
Master > Develop Release 🚨.
  • Loading branch information
divyanshu-rawat authored Mar 21, 2020
2 parents 50666da + b7a8950 commit 5d0407c
Show file tree
Hide file tree
Showing 119 changed files with 1,526 additions and 411 deletions.
9 changes: 6 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
import React from 'react';
import { Switch, Route } from 'react-router-dom';
import { withErrorBoundary } from './ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary';
import { ProtectedRoutes } from './ignitus-Routes/protectedRoutes';
import { DashboardRoutes } from './ignitus-Routes/ignitus-DashboardRoutes';
// eslint-disable-next-line import/named
import { PublicRoutes } from './ignitus-Routes/publicRoutes';
import { PublicRoutes } from './ignitus-Routes/ignitus-PublicRoutes';
import './App.scss';
import UserInterfaceKitRoutes from './ignitus-Routes/ignitus-UserInterfaceKitRoutes';


const App = () => (
<div className="content-container">
<Switch>
<Route path="/dashboard" component={ProtectedRoutes} />
<Route path="/dashboard" component={DashboardRoutes} />
<Route path="/interface" component={UserInterfaceKitRoutes} />
<Route path="/" component={PublicRoutes} />
</Switch>
</div>
Expand Down
4 changes: 1 addition & 3 deletions src/ignitus-AboutPage/ignitus-About/Styles/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import styled from '@emotion/styled';
import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared';
import * as F from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts';

const breakpoints: number[] = [576, 768, 992, 1200];
const mq: string[] = breakpoints.map(bp => `@media (min-width: ${bp}px)`);
import { mq } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media';

export const AboutSection = styled.section`
font-weight: ${F.Normal};
Expand Down
4 changes: 2 additions & 2 deletions src/ignitus-AboutPage/ignitus-CoreTeam/Components/team.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {Data} from '../constants';
import {withErrorBoundary} from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary';
import * as S from '../Styles';
import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared';
import {coreTeam, TeamItemProps} from '../types';
import {Team, TeamItemProps} from '../types';
import {AppIcon} from '../../../ignitus-Shared/types/iconsTypes/enums';

const PureCoreTeam = ({team}: any) => (
Expand Down Expand Up @@ -42,7 +42,7 @@ const TeamItem = ({
};

const CoreTeam = () => {
const team = Data.map((item: coreTeam) => {
const team = Data.map((item: Team) => {
return <TeamItem key={item.title} item={item} />;
});
return <PureCoreTeam team={team} />;
Expand Down
6 changes: 2 additions & 4 deletions src/ignitus-AboutPage/ignitus-CoreTeam/Styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import styled from '@emotion/styled';
import * as C from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors';
import * as F from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts';
import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared';
import Icon from "../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/icon";
import Icon from "../../../ignitus-Shared/ignitus-Utilities/Components/icon";
import { mq } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media';

type LinkWrapperProps = {
toggle: boolean;
Expand All @@ -12,9 +13,6 @@ type TeamItemTitleProps = {
color: string;
};

const breakpoints = [576, 768, 992, 1200];
const mq = breakpoints.map(bp => `@media (min-width: ${bp}px)`);

export const TeamItemTitle = styled.h6`
margin-top: 1rem;
font-weight: ${F.Normal};
Expand Down
4 changes: 2 additions & 2 deletions src/ignitus-AboutPage/ignitus-CoreTeam/constants.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// eslint-disable-next-line import/prefer-default-export
import { coreTeam } from "./types";
export const Data: coreTeam[] = [
import { Team } from "./types";
export const Data: Team[] = [
{
title: 'Ayush Pareek',
img:
Expand Down
4 changes: 2 additions & 2 deletions src/ignitus-AboutPage/ignitus-CoreTeam/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export type coreTeam = {
export type Team = {
title: string;
img: string;
description: string;
Expand All @@ -8,5 +8,5 @@ export type coreTeam = {

export type TeamItemProps = {
key: string;
item: coreTeam;
item: Team;
}
21 changes: 11 additions & 10 deletions src/ignitus-Api/constants.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
export const BASE_URL: string = 'https://ignitusrestapi.herokuapp.com';
export const TESTIMONIAL_URL: string = `${BASE_URL}/testimonials`;
export const STUDENT_SIGN_UP: string = `${BASE_URL}/register`;
export const STUDENT_SIGN_IN: string = `${BASE_URL}/login`;

export const BASE_URL = 'https://ignitusrestapi.herokuapp.com';
export const TESTIMONIAL_URL = `${BASE_URL}/testimonials`;
export const STUDENT_SIGN_UP = `${BASE_URL}/register`;
export const STUDENT_SIGN_IN = `${BASE_URL}/login`;
export const FRONTEND_CONTRIBUTOR_API: string =
'https://api.github.com/repos/Ignitus/Ignitus-Client-Side-Development/contributors?per_page=7';

export const FRONTEND_CONTRIBUTOR_API = 'https://api.github.com/repos/Ignitus/Ignitus-Client-Side-Development/contributors?per_page=7';
export const BACKEND_CONTRIBUTOR_API: string =
'https://api.github.com/repos/Ignitus/Ignitus-rest-api/contributors?per_page=7';

export const BACKEND_CONTRIBUTOR_API = 'https://api.github.com/repos/Ignitus/Ignitus-rest-api/contributors?per_page=7';

export const CONTRIBUTORS_STORE = 'contributors';
export const TESTIMONIALS_STORE = 'testimonials';
export const COND_HEADERS_STORE = 'cond-headers';
export const CONTRIBUTORS_STORE: string = 'contributors';
export const TESTIMONIALS_STORE: string = 'testimonials';
export const COND_HEADERS_STORE: string = 'cond-headers';
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import Loadable from 'react-loadable';
import Loadable from '../../../ignitus-Routes/ignitus-PublicRoutes/node_modules/react-loadable';
import loader from '../../ignitus-Assets/Images/loader.gif';

// [@INFO] Loading component can put in global UI component
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* eslint-disable react/jsx-filename-extension */
/* eslint-disable jsx-a11y/no-static-element-interactions */
/* eslint-disable jsx-a11y/click-events-have-key-events */

import React, { useState } from 'react';
import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* eslint-disable react/jsx-filename-extension */
/* eslint-disable jsx-a11y/no-static-element-interactions */
/* eslint-disable jsx-a11y/click-events-have-key-events */
import React from 'react';
import { Link } from 'react-router-dom';
import * as t from './Constants';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* eslint-disable react/jsx-filename-extension */
/* eslint-disable jsx-a11y/no-static-element-interactions */
/* eslint-disable jsx-a11y/click-events-have-key-events */
import React, { useState } from 'react';
import isEmpty from 'lodash/isEmpty';
import PropTypes from 'prop-types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* eslint-disable react/jsx-filename-extension */
/* eslint-disable jsx-a11y/click-events-have-key-events */
/* eslint-disable jsx-a11y/no-static-element-interactions */
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { Link } from 'react-router-dom';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/* eslint-disable react/prop-types */
/* eslint-disable jsx-a11y/anchor-is-valid */
/* eslint-disable react/jsx-filename-extension */
/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
/* eslint-disable jsx-a11y/click-events-have-key-events */
import React from 'react';
import { Redirect, Link } from 'react-router-dom';
import { HashLink } from 'react-router-hash-link';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/* eslint-disable no-unused-expressions */
/* eslint-disable jsx-a11y/accessible-emoji */
/* eslint-disable react/jsx-filename-extension */
import React from 'react';
import '../Styles/style.scss';
import {withErrorBoundary} from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary';
import {WebsiteUnderConstruction} from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-UnderContruction/Components';
import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary';
import { WebsiteUnderConstruction } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-UnderContruction/Components';

const Dashboard = () => (
<div className="container marginTop dashboard-container">
Expand Down
4 changes: 1 addition & 3 deletions src/ignitus-HomePage/ignitus-Contributors/Styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import styled from '@emotion/styled';
import * as C from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors';
import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared';
import HeartIcon from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Assets/ignitus-Icons/heartIcon/heartIcon';

const breakpoints: number[] = [576, 768, 992, 1200];
const mq: string[] = breakpoints.map(bp => `@media (min-width: ${bp}px)`);
import { mq } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media';

export const Icon = styled.span`
i { color: ${C.Red};}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as T from '../../../ignitus-Shared/ignitus-DesignSystem/shared';
import { withErrorBoundary } from '../../../ignitus-Shared/ignitus-ErrorHandlingComponents/errorBoundary';
import { data } from '../constants';

const WhatWeProvide = () => (
const WhatWeDo = () => (
<T.Wrapper id="what-we-do">
<T.TopSection>
<T.Title>What we provide?</T.Title>
Expand Down Expand Up @@ -32,4 +32,4 @@ const WhatWeProvide = () => (
</T.Wrapper>
);

export default withErrorBoundary(WhatWeProvide);
export default withErrorBoundary(WhatWeDo);
2 changes: 0 additions & 2 deletions src/ignitus-HomePage/ignitus-WhatWeDo/Components/index.js

This file was deleted.

2 changes: 2 additions & 0 deletions src/ignitus-HomePage/ignitus-WhatWeDo/Components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* eslint-disable import/prefer-default-export */
export { default as WhatWeDo } from './WhatWeDo';
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {};
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
import styled from '@emotion/styled';
import * as C from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/colors';
import * as F from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/fonts';

const breakpoints = [576, 768, 992, 1200];
const mq = breakpoints.map(bp => `@media (min-width: ${bp}px)`);
import { mq } from '../../../ignitus-Shared/ignitus-DesignSystem/ignitus-Atoms/media';

export const Icon = styled.span`
i { color: ${C.IgnitusBlue};}
Expand Down
Empty file.
1 change: 1 addition & 0 deletions src/ignitus-HomePage/ignitus-WhatWeDo/actionTypes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {};
Empty file.
1 change: 1 addition & 0 deletions src/ignitus-HomePage/ignitus-WhatWeDo/actions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {};
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
import {WhatWeDo} from './types';

/* eslint-disable import/prefer-default-export */
export const data = [
export const data: WhatWeDo[] = [
{
src: 'https://storage.googleapis.com/ignitus_assets/ig-section/Section_internship.png',
src:
'https://storage.googleapis.com/ignitus_assets/ig-section/Section_internship.png',
title: 'Internships',
description:
"Top quality 'Ignitus-Exclusive' internships and freelance work with professors, researchers, companies and professionals from selected destinations.",
},
{
src: 'https://storage.googleapis.com/ignitus_assets/ig-section/Section_courses.png',
src:
'https://storage.googleapis.com/ignitus_assets/ig-section/Section_courses.png',
title: 'Courses',
description:
'Unique, well researched and goal-oriented courses designed to boost relevant skill acquisition with minimal effort and time.',
},
{
src: 'https://storage.googleapis.com/ignitus_assets/ig-section/Section_community.png',
src:
'https://storage.googleapis.com/ignitus_assets/ig-section/Section_community.png',
title: 'Experts Community',
description:
'Guidance from an unparalleled network of professors,experts and industry professionals supervising internal projects with selected students',
Expand Down
Empty file.
1 change: 1 addition & 0 deletions src/ignitus-HomePage/ignitus-WhatWeDo/reducers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {};
Empty file.
1 change: 1 addition & 0 deletions src/ignitus-HomePage/ignitus-WhatWeDo/sagas.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {};
Empty file.
1 change: 1 addition & 0 deletions src/ignitus-HomePage/ignitus-WhatWeDo/selectors.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {};
5 changes: 5 additions & 0 deletions src/ignitus-HomePage/ignitus-WhatWeDo/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export type WhatWeDo = {
src: string;
title: string;
description: string;
};
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
/* eslint-disable react/jsx-filename-extension */

import React from 'react';
import { Switch, Route } from 'react-router-dom';

import { Notfound } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components';
import PrivateRoute from '../privateRoutes';
import PrivateRoute from '../ignitus-PrivateRoutes';
import Dashboard from '../../ignitus-Dashboard/ignitus-StudentDashboard';
import dashBoardHeader from '../../ignitus-Dashboard/ignitus-DashboardHeader';
import { Notfound } from '../../ignitus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components';

// eslint-disable-next-line import/prefer-default-export
export const ProtectedRoutes = () => (
<div>
export const DashboardRoutes = () => (
<React.Fragment>
<dashBoardHeader.containers.dashboardHeaderContainer />
<Switch>
<Route
exact
path="/"
render={() => (
<div className="content">
<Notfound />
</div>
<Notfound />
)}
/>
<PrivateRoute path="/dashboard" Component={Dashboard.components.Dashboard} />
</Switch>
</div>
</React.Fragment>
);
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/* eslint-disable react/jsx-filename-extension */
/* eslint-disable react/destructuring-assignment */
/* eslint-disable react/prop-types */

import React from 'react';
import { Redirect, Route } from 'react-router-dom';
import PropTypes from 'prop-types';

// eslint-disable-next-line react/prefer-stateless-function

const PrivateRoute = ({ Component }) => (
<Route
Expand All @@ -16,9 +13,4 @@ const PrivateRoute = ({ Component }) => (
}
/>
);

PrivateRoute.propTypes = {
Component: PropTypes.func.isRequired,
};

export default PrivateRoute;
Loading

0 comments on commit 5d0407c

Please sign in to comment.