Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release to Master ☘️ #604

Merged
merged 73 commits into from
Mar 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
8c9f395
Job Description page - design
ashishnagpal2498 Mar 6, 2020
ad679d3
Job description page design completed
ashishnagpal2498 Mar 6, 2020
bf78651
Job description page design completed Code Cleaned
ashishnagpal2498 Mar 6, 2020
61b58be
Conflit resolve from Codecov and other
ashishnagpal2498 Mar 6, 2020
9f8ba5e
Job description page design completed Code Cleaned - Codacy
ashishnagpal2498 Mar 6, 2020
4746b50
Codacy errors resolved
ashishnagpal2498 Mar 6, 2020
c0aaf76
Codacy error to be resolved-
ashishnagpal2498 Mar 7, 2020
eddcf3d
Indentation Fix with eslint command
ashishnagpal2498 Mar 7, 2020
64b0258
Indentation of sass changed from tab to spaces
ashishnagpal2498 Mar 7, 2020
c524390
dashboard ui:navigator added
tanisha03 Mar 7, 2020
239533b
Reddit button added - responsive links and Student login userInfo to …
ashishnagpal2498 Mar 7, 2020
ef685c9
Codacy - Indentation Reddit button
ashishnagpal2498 Mar 7, 2020
198d785
alignment in responsive corrected
ashishnagpal2498 Mar 8, 2020
6039304
UI Fixes 🔨
divyanshu-rawat Mar 8, 2020
67d0a34
Minor fixes 🔨
divyanshu-rawat Mar 8, 2020
04d742b
Merge pull request #589 from ashishnagpal2498/feature/jobConfirmation…
divyanshu-rawat Mar 8, 2020
43a9d1d
refactor: Update repo clone link and folder name
steric85 Mar 2, 2020
5a0dbe4
Stylesheet code clean from px to rem #footer
abhushanaj Mar 4, 2020
9bcdc78
Stylesheet code clean from px to rem #introduction
abhushanaj Mar 4, 2020
2ae5d69
Stylesheet code clean from px to rem #getStarted
abhushanaj Mar 4, 2020
e0d7d70
Updated rem to px for media queries and rounded off rem to .0, .5 or …
abhushanaj Mar 5, 2020
88f17fa
Update CONTRIBUTION.md
divyanshu-rawat Mar 5, 2020
2c25119
Update CONTRIBUTION.md
divyanshu-rawat Mar 5, 2020
ded6d9a
Added TypeScript support with Hound
abhushanaj Mar 6, 2020
32e0a13
Indentation fix
abhushanaj Mar 6, 2020
172cd6f
Restrict Contributors to 14 value and show all on github link
ashishnagpal2498 Mar 7, 2020
6e9f8a5
Codacy - indentation corrected
ashishnagpal2498 Mar 7, 2020
9ce70dc
Contributors Title changed and restrict C- logic updated
ashishnagpal2498 Mar 8, 2020
18b817c
Contributors Title changed and restrict C- logic updated Hound errors…
ashishnagpal2498 Mar 8, 2020
3192aaa
Import removed- Code quality corrected
ashishnagpal2498 Mar 8, 2020
2c2767d
Update Team.tsx
divyanshu-rawat Mar 8, 2020
b19f740
feat: Migrate common-auth-student-prof files to TS
steric85 Mar 1, 2020
4edcbe7
refactor: Revert the import statement change
steric85 Mar 1, 2020
395099a
refactor: Merge login and signup into single component
steric85 Mar 2, 2020
2861935
refactor: Resolve comments
steric85 Mar 8, 2020
ebbf9a3
Merge branch 'master' of git://github.com/Ignitus/Ignitus-client into…
tanisha03 Mar 9, 2020
d80064f
added
tanisha03 Mar 9, 2020
760903f
refactor: Rename file + import
steric85 Mar 10, 2020
e0dc26f
folder structure refactor
Xtremilicious Mar 10, 2020
b8868a2
changes
tanisha03 Mar 10, 2020
982aeb2
Some re-work fixes. 🔨
divyanshu-rawat Mar 10, 2020
021d6c1
Merge branch 'develop' into folder-structure-refactor
divyanshu-rawat Mar 10, 2020
d85787d
Casing refactoring-fixes 🔨
divyanshu-rawat Mar 10, 2020
efc5df1
Hound fixes 🔨
divyanshu-rawat Mar 10, 2020
01b6500
Hound fixes 🔨
divyanshu-rawat Mar 10, 2020
6357e05
Hounds fixes 🚀
divyanshu-rawat Mar 10, 2020
1b6befe
Hound fixes 🔨
divyanshu-rawat Mar 10, 2020
db6d47a
Deployment review test 🔨
divyanshu-rawat Mar 10, 2020
09e4d82
Deployment fixes 🔨
divyanshu-rawat Mar 10, 2020
c680da1
Merge pull request #602 from Xtremilicious/folder-structure-refactor
divyanshu-rawat Mar 10, 2020
0f784dc
Manual Casing fixes git 🔨
divyanshu-rawat Mar 10, 2020
94ae8ae
Import fix 🔨
divyanshu-rawat Mar 10, 2020
043dae0
Import bug fix for all files. 🔨
divyanshu-rawat Mar 10, 2020
d57b50b
Hound fixes ☘️
divyanshu-rawat Mar 10, 2020
547aef8
Deployment fixes ☘️
divyanshu-rawat Mar 10, 2020
717144b
Downgraded react-script to fix service worker 🔨
divyanshu-rawat Mar 10, 2020
6051e23
TS Fixes 🔨
divyanshu-rawat Mar 10, 2020
fe11d00
feat: Migrate common-auth-student-prof files to TS
steric85 Mar 1, 2020
7377159
refactor: Revert the import statement change
steric85 Mar 1, 2020
6ba602b
refactor: Merge login and signup into single component
steric85 Mar 2, 2020
9f21d2c
refactor: Resolve comments
steric85 Mar 8, 2020
727d8e2
TS version degradation 🔨
divyanshu-rawat Mar 10, 2020
6f66b1e
TS Version fixes 🔨
divyanshu-rawat Mar 10, 2020
af50f60
Merge branch 'develop' into feature/ts-common-auth-student-prof
divyanshu-rawat Mar 10, 2020
29bf5b9
Merge pull request #548 from steric85/feature/ts-common-auth-student-…
divyanshu-rawat Mar 10, 2020
1218896
Migrated login/registration to ignitus-Authentication
divyanshu-rawat Mar 11, 2020
bf158a3
Minor build fix. 🔨
divyanshu-rawat Mar 11, 2020
74ef20f
Code refactoring 🔨
divyanshu-rawat Mar 11, 2020
60d5f9f
Resolved merge conflicts. 🔨
divyanshu-rawat Mar 11, 2020
34ab97e
Merge pull request #593 from tanisha03/dashboard-ui
divyanshu-rawat Mar 11, 2020
1f7e1f7
issue #578 Error message UI fix (#598)
shreyakapoor08 Mar 11, 2020
91cc000
Contributors fetching url updates.
divyanshu-rawat Mar 11, 2020
50f89ed
Updated release number ★
divyanshu-rawat Mar 11, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/CONTRIBUTION/CONTRIBUTION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### Contributing.

**IMP:** Please create a new branch from ```develop``` not from ```master```, and also create a pull request to ```develop``` not to ```master```.

1. Create your **branch**: ```git checkout -b my-new-feature```

2. **Commit** your changes: ```git commit -m 'Add some feature'```
Expand Down Expand Up @@ -44,3 +46,6 @@ A pluggable and configurable linter tool for identifying and reporting on patter
``` npm run lint ```

``` npm run lint:fix ```


**IMP:** Please don't commit your ```package-lock.json``` until & unless you are not adding a new package.
15 changes: 15 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module.exports = {
jest: {
verbose: true,
transform: {
'^.+\\.js$': 'babel-jest',
'^.+\\.(css|scss|less)$': 'jest-css-modules',
},
transformIgnorePatterns: ['/node_modules/'],
globals: {
NODE_ENV: 'test',
},
moduleFileExtensions: ['js', 'jsx'],
moduleDirectories: ['src'],
},
};
34,855 changes: 13,111 additions & 21,744 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ignitus-client-side-development",
"version": "3.0.0",
"version": "5.0.0",
"private": true,
"engines": {
"node": "8.16.2"
Expand All @@ -16,6 +16,7 @@
"@emotion/core": "^10.0.22",
"@emotion/styled": "^10.0.23",
"@sentry/browser": "^5.10.1",
"@types/react": "16.9.23",
"axios": "^0.18.0",
"bootstrap": "^4.3.1",
"codecov": "^3.3.0",
Expand All @@ -33,12 +34,12 @@
"react-redux": "^7.0.2",
"react-router-dom": "^4.4.0-beta.6",
"react-router-hash-link": "^1.2.0",
"react-scripts": "^3.3.0",
"react-scripts": "^3.2.0",
"redux": "^4.0.1",
"redux-logger": "^3.0.6",
"redux-saga": "^0.16.0",
"reselect": "^4.0.0",
"typescript": "^3.8.2"
"typescript": "^3.1.6"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -55,8 +56,7 @@
"@types/jest": "^25.1.3",
"@types/lodash": "^4.14.149",
"@types/node": "^13.7.4",
"@types/react": "^16.9.22",
"@types/react-dom": "^16.9.5",
"@types/react-dom": "^16.8.2",
"@types/react-redux": "^7.1.7",
"@types/react-router-dom": "5.1.3",
"@types/redux-logger": "3.0.7",
Expand Down
3 changes: 1 addition & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

import React from 'react';
import { Switch, Route } from 'react-router-dom';
import { withErrorBoundary } from './ignitus-Internals';
import { withErrorBoundary } from './ignitus-Shared/Components/errorBoundary';
import { ProtectedRoutes } from './ignitus-Routes/protectedRoutes';
// eslint-disable-next-line import/named
import { PublicRoutes } from './ignitus-Routes/publicRoutes';
Expand Down
4 changes: 2 additions & 2 deletions src/ignitus-About/Components/About.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, {Fragment} from 'react';
import Team from '../../ignitus-Team';
import CoreTeam from '../../ignitus-CoreTeam';
import {withErrorBoundary} from '../../ignitus-Internals';
import {withErrorBoundary} from '../../ignitus-Shared/Components/errorBoundary';
import * as t from '../constants';
import * as S from '../Styles';
import * as T from '../../ignitus-Helpers/emotion-Styles/shared';
import * as T from '../../ignitus-Shared/Components/emotionStyles/shared';

const About = () => (
<Fragment>
Expand Down
4 changes: 2 additions & 2 deletions src/ignitus-About/Styles/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';
import * as T from '../../ignitus-Helpers/emotion-Styles/shared';
import * as F from '../../ignitus-Helpers/emotion-Styles/font';
import * as T from '../../ignitus-Shared/Components/emotionStyles/shared';
import * as F from '../../ignitus-Shared/Components/emotionStyles/font';

const breakpoints: number[] = [576, 768, 992, 1200];
const mq: string[] = breakpoints.map(bp => `@media (min-width: ${bp}px)`);
Expand Down
4 changes: 2 additions & 2 deletions src/ignitus-Api/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ export const TESTIMONIAL_URL = `${BASE_URL}/testimonials`;
export const STUDENT_SIGN_UP = `${BASE_URL}/register/student`;
export const STUDENT_SIGN_IN = `${BASE_URL}/login`;

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

export const BACKEND_CONTRIBUTOR_API = 'https://api.github.com/repos/Ignitus/Ignitus-rest-api/contributors';
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';
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { withErrorBoundary } from '../../../ignitus-Shared/Components/errorBoundary';
import * as t from './constants';
import '../Styles/style.scss';

interface Props {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parsing error: The keyword 'interface' is reserved

title: string;
studentRoute: string;
professorRoute: string;
}

function commonLoginRegister(props: Props): React.ComponentType {
const {title, studentRoute, professorRoute} = props;

const SignInPage = () => (
<div className="col-lg-12 col-sm-12 col-md-12 col-12 container-bg">
<div className="p-0 p-sm-5 pt-5">
<div className="col-lg-7 col-md-8 col-sm-12 col-12 mt-5 box-container">
<div className="login-signup m-top">
<h3>{title}</h3>
<p> Who are you? </p>
</div>
<div className="row mt-5">
<div className="col-lg-5 col-md-5 ml-lg-5 ml-md-4 col-sm-5 col p-0 h-50 common-auth-ui-css">
<p className="mb-5 text-center common-ui-text">Student</p>
<Link to={studentRoute}>
<img
alt="Student auth"
className="img-fluid"
src={t.studentAuth}
/>
</Link>
</div>
<div className="col-lg-5 col-md-5 ml-lg-4 ml-md-4 col-sm-5 ml-sm-4 col p-0 common-auth-ui-css">
<p className="mb-5 text-center common-ui-text">Professor</p>
<Link to={professorRoute}>
<img
alt="Professor auth"
className="img-fluid"
src={t.professorAuth}
/>
</Link>
</div>
</div>
</div>
</div>
</div>
);

return withErrorBoundary(SignInPage);
}

export const CommonLoginUI = commonLoginRegister({
title: 'Sign In',
studentRoute: '/login/student',
professorRoute: '/login/professor',
});

export const CommonSignUpUI = commonLoginRegister({
title: 'Sign Up',
studentRoute: '/signup/student',
professorRoute: '/signup/professor',
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const studentAuth: string = 'https://storage.googleapis.com/ignitus_assets/ig-assets/Assets_studentAuth.svg';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parsing error: Unexpected token :

export const professorAuth: string = 'https://storage.googleapis.com/ignitus_assets/ig-assets/Assets_professorAuth.svg';
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { withErrorBoundary } from '../../../ignitus-Shared/Components/errorBoundary';
import * as t from './constants';
import '../Styles/style.scss';

interface Props {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parsing error: The keyword 'interface' is reserved

title: string;
studentRoute: string;
professorRoute: string;
}

function commonLoginRegister(props: Props): React.ComponentType {
const {title, studentRoute, professorRoute} = props;

const SignInPage = () => (
<div className="col-lg-12 col-sm-12 col-md-12 col-12 container-bg">
<div className="p-5">
<div className="col-lg-7 col-md-8 col-sm-12 col-8 box-container">
<div className="login-signup m-top">
<h3>{title}</h3>
<p> Who are you? </p>
</div>
<div className="row mt-4">
<div className=" col-lg-5 col-md-5 ml-lg-5 ml-md-4 col-sm-5 p-0 common-auth-ui-css">
<p className="mb-5 text-center common-ui-text">Student</p>
<Link to={studentRoute}>
<img
alt="Student auth"
className="img-fluid"
src={t.studentAuth}
/>
</Link>
</div>
<div className="col-lg-5 col-md-5 ml-lg-4 ml-md-4 col-sm-5 ml-sm-4 p-0 common-auth-ui-css">
<p className="mb-5 text-center common-ui-text">Professor</p>
<Link to={professorRoute}>
<img
alt="Professor auth"
className="img-fluid"
src={t.professorAuth}
/>
</Link>
</div>
</div>
</div>
</div>
</div>
);

return withErrorBoundary(SignInPage);
}

export const CommonLoginUI = commonLoginRegister({
title: 'Sign In',
studentRoute: '/login/student',
professorRoute: '/login/professor',
});

export const CommonSignUpUI = commonLoginRegister({
title: 'Sign Up',
studentRoute: '/signup/student',
professorRoute: '/signup/professor',
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// import ignitus token variables
@import "./src/shared/styles/ignitus-components-common";
@import "./src/ignitus-Shared/styles/ignitus-components-common";

$background-color: #fac76f;
$white-color: #ffffff;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
/* 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-Internals';
import { statePayload } from '../../shared/Components/Login/Constants';
import SharedLogin from '../../shared/Components/Login/Login';
import { withErrorBoundary } from '../../../ignitus-Shared/Components/errorBoundary';
import { statePayload } from '../../../ignitus-Shared/Components/Login/Constants';
import SharedLogin from '../../../ignitus-Shared/Components/Login/Login';

const Login = ({ logInRequest, professorLogInData }) => {
// dummy values
logInRequest = () => {};
professorLogInData = {
const Login = () => {
// Dummy Implementation.
const professorLogInData = {
isFetching: false,
message: '',
success: false,
};
// remove above dummy values once implemented

const [state, setState] = useState(statePayload);

const handleSubmit = (e) => {
e.preventDefault();
// professor login logic here
};

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// import ignitus token variables
@import './src/ignitus-Shared/styles/ignitus-components-common';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings


Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/* 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';
import { withErrorBoundary } from '../../ignitus-Internals';
import { withErrorBoundary } from '../../../ignitus-Shared/Components/errorBoundary';
import '../Styles/style.scss';

class Signup extends React.Component {
Expand All @@ -26,7 +27,7 @@ class Signup extends React.Component {
<p>Help providing opportunities for your students</p>
<p>
<Link to="/signup/student" className="text-center linkform">
{' '}
{' '}
I am a Student
</Link>
</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// import ignitus token variables
@import './src/ignitus-Shared/styles/ignitus-components-common';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings


Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import React, { useState } from 'react';
import isEmpty from 'lodash/isEmpty';
import PropTypes from 'prop-types';
import { withErrorBoundary } from '../../ignitus-Internals';
import SharedLogin from '../../shared/Components/Login/Login';
import { statePayload } from '../../shared/Components/Login/Constants';
import { withErrorBoundary } from '../../../ignitus-Shared/Components/errorBoundary';
import SharedLogin from '../../../ignitus-Shared/Components/Login/Login';
import { statePayload } from '../../../ignitus-Shared/Components/Login/Constants';

const Login = ({ logInRequest, studentLoginData }) => {
const [state, setState] = useState(statePayload);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// import ignitus token variables
@import './src/ignitus-Shared/styles/ignitus-components-common';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Files should end with a trailing newline
Prefer double-quoted strings

2 changes: 2 additions & 0 deletions src/ignitus-Authentication/ignitus-StudentLogin/constants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* eslint-disable import/prefer-default-export */
export const NAME = 'studentLoginReducer';
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { effects } from 'redux-saga';
import * as t from './actionTypes';
import * as a from './actions';
import * as api from '../ignitus-Api';
import * as api from '../../ignitus-Api';

const {
call, put, takeLatest, all,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import PropTypes from 'prop-types';
import { Link } from 'react-router-dom';
import isEmpty from 'lodash/isEmpty';
import isEqual from 'lodash/isEqual';
import loader from '../../ignitus-Assets/Images/loader2.gif';
import loader from '../../../ignitus-Assets/Images/loader2.gif';
import * as t from './Constants';
import { withErrorBoundary } from '../../ignitus-Internals';
import { withErrorBoundary } from '../../../ignitus-Shared/Components/errorBoundary';

import '../Styles/style.scss';

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import './src/ignitus-Shared/styles/ignitus-components-common';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings


2 changes: 2 additions & 0 deletions src/ignitus-Authentication/ignitus-StudentSignUp/constants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* eslint-disable import/prefer-default-export */
export const NAME = 'studentSignUpReducer';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Newline required at end of file but not found eol-last

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { effects } from 'redux-saga';
import * as t from './actionTypes';
import * as a from './actions';
import * as api from '../ignitus-Api';
import * as api from '../../ignitus-Api';

const {
call, put, takeLatest, all,
Expand Down
Empty file.
Loading