Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
garvitchittora committed Jul 1, 2021
2 parents d4d6b27 + 30be899 commit 420819e
Show file tree
Hide file tree
Showing 93 changed files with 14,092 additions and 13,672 deletions.
70 changes: 70 additions & 0 deletions inclusive-web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions inclusive-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"react-redux": "^7.2.2",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.1",
"react-share": "^4.4.0",
"react-spinners": "^0.10.6",
"react-swiper": "^0.1.5",
"react-virtualized": "^9.22.3",
Expand Down
11 changes: 11 additions & 0 deletions inclusive-web/src/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import { ProfileDetails } from './pages/Profile/ProfileDetails';
import { ProtectedRoute } from './ProtectedRoute';
import { userStatus } from './actions/authActions/userStatusActions';
import { useSelector, useDispatch } from 'react-redux'
// import CompanyJobs from './components/Company/CompanyJobs/CompanyJobs'
import CompanyListing from './components/Company/CompanyListing'
import Events from './components/Events/Events';

const ScholarshipDescription = loadable(() => import('./components/Description/ScholarshipDescription'));
const AddCompany = loadable(() => import('./components/Company/AddCompany'));
Expand All @@ -34,6 +36,9 @@ const BlogDescription = loadable(() => import('./components/Blogs/BlogDescriptio
const BlogListing = loadable(() => import('./components/Blogs/BlogListing'));
const VideoDescription = loadable(() => import('./components/Video/VideoDescription'));
const VideoListing = loadable(() => import('./components/Video/VideoListing'));
const CompanyJobs = loadable(() => import('./components/Company/CompanyJobs/CompanyJobs'));
const CompanyScholarships = loadable(() => import('./components/Company/CompanyScholarships/CompanyScholarships'));
const CompanyStories = loadable(() => import('./components/Company/CompanyStories/CompanyStories'));

const useStyle = makeStyles(theme => ({
bossContainer: props => ({
Expand Down Expand Up @@ -88,6 +93,9 @@ function Layout(props) {
<ProtectedRoute exact path="/home/company/add" component={AddCompany} />
<ProtectedRoute exact path="/home/company/:id" component={CompanyDescription} />
<ProtectedRoute exact path='/home/company/get/subscribed' component={Subscribed} />
<ProtectedRoute exact path='/home/company/:id/jobs' component={CompanyJobs} />
<ProtectedRoute exact path='/home/company/:id/scholarships' component={CompanyScholarships} />
<ProtectedRoute exact path='/home/company/:id/stories' component={CompanyStories} />

{/* Job Routes */}
<Route exact path="/home/job/list" component={JobList} />
Expand Down Expand Up @@ -115,6 +123,9 @@ function Layout(props) {

{/* Initiatives routes */}
<ProtectedRoute path="/home/company/:id/initiatives" component={InitiativesList} />

{/* Events */}
<ProtectedRoute path="/home/events" component={Events} />
</Switch>
</div> : <div>Loading...</div>
}
Expand Down
Binary file added inclusive-web/src/assets/Events/Demo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added inclusive-web/src/assets/Landing/HowItWorks4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions inclusive-web/src/assets/Legal/cookie_policy.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
# Cookie Policy

[["We" or "I", or Website or App name]] takes your privacy seriously. To better protect your privacy [["we" or "I"]] provide this privacy policy notice explaining the way your personal information is collected and used.
We takes your privacy seriously. To better protect your privacy we provide this privacy policy notice explaining the way your personal information is collected and used.


## Collection of Routine Information

This [["website" or "app"]] track basic information about their [["visitors" or "users"]]. This information includes, but is not limited to, IP addresses, [["browser" or "app"]] details, timestamps and referring pages. None of this information can personally identify specific [["visitors" or "user"]] to this [["website" or "app"]]. The information is tracked for routine administration and maintenance purposes.
This platform track basic information about their users. This information includes, but is not limited to, IP addresses, platform details, timestamps and referring pages. None of this information can personally identify specific users to this platform. The information is tracked for routine administration and maintenance purposes.


## Cookies

Where necessary, this [["website" or "app"]] uses cookies to store information about a visitor’s preferences and history in order to better serve the [["visitor" or "user"]] and/or present the [["visitor" or "user"]] with customized content.
Where necessary, this platform uses cookies to store information about a visitor’s preferences and history in order to better serve the users and/or present the users with customized content.


## Advertisement and Other Third Parties

Advertising partners and other third parties may use cookies, scripts and/or web beacons to track [["visitors" or "user"]] activities on this [["website" or "app"]] in order to display advertisements and other useful information. Such tracking is done directly by the third parties through their own servers and is subject to their own privacy policies. This [["website" or "app"]] has no access or control over these cookies, scripts and/or web beacons that may be used by third parties. Learn how to [opt out of Google’s cookie usage](http://www.google.com/privacy_ads.html).
Advertising partners and other third parties may use cookies, scripts and/or web beacons to track users activities on this platform in order to display advertisements and other useful information. Such tracking is done directly by the third parties through their own servers and is subject to their own privacy policies. This platform has no access or control over these cookies, scripts and/or web beacons that may be used by third parties. Learn how to [opt out of Google’s cookie usage](http://www.google.com/privacy_ads.html).


## Links to Third Party Websites

[["We" or "I"]] have included links on this [["website" or "app"]] for your use and reference. [["We" or "I"]] are not responsible for the privacy policies on these websites. You should be aware that the privacy policies of these websites may differ from [["our" or "my"]] own.
we have included links on this platform for your use and reference. we are not responsible for the privacy policies on these websites. You should be aware that the privacy policies of these websites may differ from our own.


## Security

The security of your personal information is important to [["us" or "me"]], but remember that no method of transmission over the Internet, or method of electronic storage, is 100% secure. While [["we" or "I"]] strive to use commercially acceptable means to protect your personal information, [["we" or "I"]] cannot guarantee its absolute security.
The security of your personal information is important to me, but remember that no method of transmission over the Internet, or method of electronic storage, is 100% secure. While we strive to use commercially acceptable means to protect your personal information, we cannot guarantee its absolute security.


## Changes To This Privacy Policy

This Privacy Policy is effective as of [[Date]] and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page.
This Privacy Policy is effective as of 01-06-2021 and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page.

[["We" or "I"]] reserve the right to update or change [["our" or "my"]] Privacy Policy at any time and you should check this Privacy Policy periodically. If [["we" or "I"]] make any material changes to this Privacy Policy, [["we" or "I"]] will notify you either through the email address you have provided [["us" or "me"]], or by placing a prominent notice on [["our" or "my"]] [["website" or "app"]].
we reserve the right to update or change our Privacy Policy at any time and you should check this Privacy Policy periodically. If we make any material changes to this Privacy Policy, we will notify you either through the email address you have provided me, or by placing a prominent notice on our platform.


## Contact Information

For any questions or concerns regarding the privacy policy, please send [["us" or "me"]] an email to [[Contact Email Address]].
For any questions or concerns regarding the privacy policy, please send me an email to [email protected].
18 changes: 9 additions & 9 deletions inclusive-web/src/assets/Legal/copyright_policy.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
# Copyright Policy

[["We" or "I", or Website or App name]] takes your privacy seriously. To better protect your privacy [["we" or "I"]] provide this privacy policy notice explaining the way your personal information is collected and used.
We takes your privacy seriously. To better protect your privacy we provide this privacy policy notice explaining the way your personal information is collected and used.


## Collection of Routine Information

This [["website" or "app"]] track basic information about their [["visitors" or "users"]]. This information includes, but is not limited to, IP addresses, [["browser" or "app"]] details, timestamps and referring pages. None of this information can personally identify specific [["visitors" or "user"]] to this [["website" or "app"]]. The information is tracked for routine administration and maintenance purposes.
This platform track basic information about their users. This information includes, but is not limited to, IP addresses, platform details, timestamps and referring pages. None of this information can personally identify specific users to this platform. The information is tracked for routine administration and maintenance purposes.


## Cookies

Where necessary, this [["website" or "app"]] uses cookies to store information about a visitor’s preferences and history in order to better serve the [["visitor" or "user"]] and/or present the [["visitor" or "user"]] with customized content.
Where necessary, this platform uses cookies to store information about a visitor’s preferences and history in order to better serve the users and/or present the users with customized content.


## Advertisement and Other Third Parties

Advertising partners and other third parties may use cookies, scripts and/or web beacons to track [["visitors" or "user"]] activities on this [["website" or "app"]] in order to display advertisements and other useful information. Such tracking is done directly by the third parties through their own servers and is subject to their own privacy policies. This [["website" or "app"]] has no access or control over these cookies, scripts and/or web beacons that may be used by third parties. Learn how to [opt out of Google’s cookie usage](http://www.google.com/privacy_ads.html).
Advertising partners and other third parties may use cookies, scripts and/or web beacons to track users activities on this platform in order to display advertisements and other useful information. Such tracking is done directly by the third parties through their own servers and is subject to their own privacy policies. This platform has no access or control over these cookies, scripts and/or web beacons that may be used by third parties. Learn how to [opt out of Google’s cookie usage](http://www.google.com/privacy_ads.html).


## Links to Third Party Websites

[["We" or "I"]] have included links on this [["website" or "app"]] for your use and reference. [["We" or "I"]] are not responsible for the privacy policies on these websites. You should be aware that the privacy policies of these websites may differ from [["our" or "my"]] own.
we have included links on this platform for your use and reference. we are not responsible for the privacy policies on these websites. You should be aware that the privacy policies of these websites may differ from our own.


## Security

The security of your personal information is important to [["us" or "me"]], but remember that no method of transmission over the Internet, or method of electronic storage, is 100% secure. While [["we" or "I"]] strive to use commercially acceptable means to protect your personal information, [["we" or "I"]] cannot guarantee its absolute security.
The security of your personal information is important to me, but remember that no method of transmission over the Internet, or method of electronic storage, is 100% secure. While we strive to use commercially acceptable means to protect your personal information, we cannot guarantee its absolute security.


## Changes To This Privacy Policy

This Privacy Policy is effective as of [[Date]] and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page.
This Privacy Policy is effective as of 01-06-2021 and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page.

[["We" or "I"]] reserve the right to update or change [["our" or "my"]] Privacy Policy at any time and you should check this Privacy Policy periodically. If [["we" or "I"]] make any material changes to this Privacy Policy, [["we" or "I"]] will notify you either through the email address you have provided [["us" or "me"]], or by placing a prominent notice on [["our" or "my"]] [["website" or "app"]].
we reserve the right to update or change our Privacy Policy at any time and you should check this Privacy Policy periodically. If we make any material changes to this Privacy Policy, we will notify you either through the email address you have provided me, or by placing a prominent notice on our platform.


## Contact Information

For any questions or concerns regarding the privacy policy, please send [["us" or "me"]] an email to [[Contact Email Address]].
For any questions or concerns regarding the privacy policy, please send me an email to [email protected].
Loading

0 comments on commit 420819e

Please sign in to comment.