-
-
Notifications
You must be signed in to change notification settings - Fork 118
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #654 from Ignitus/develop
Master > Develop Release 🚨.
- Loading branch information
Showing
119 changed files
with
1,526 additions
and
411 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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'; |
2 changes: 1 addition & 1 deletion
2
src/ignitus-Authentication/ignitus-ProfessorLogin/Components/loadable.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
src/ignitus-Authentication/ignitus-ProfessorLogin/Components/login.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
src/ignitus-Authentication/ignitus-ProfessorSignUp/Components/Signup.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
src/ignitus-Authentication/ignitus-StudentLogin/Components/Login.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
src/ignitus-Authentication/ignitus-StudentSignUp/Components/Signup.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 0 additions & 5 deletions
5
src/ignitus-Dashboard/ignitus-DashboardHeader/Components/dashBoardHeader.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 2 additions & 5 deletions
7
src/ignitus-Dashboard/ignitus-StudentDashboard/Components/Dashboard.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export {}; |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export {}; |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export {}; |
13 changes: 9 additions & 4 deletions
13
...us-HomePage/ignitus-WhatWeDo/constants.js → ...us-HomePage/ignitus-WhatWeDo/constants.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export {}; |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export {}; |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export {}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
export type WhatWeDo = { | ||
src: string; | ||
title: string; | ||
description: string; | ||
}; |
17 changes: 6 additions & 11 deletions
17
src/ignitus-Routes/protectedRoutes/index.js → ...-Routes/ignitus-DashboardRoutes/index.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.