Skip to content
This repository was archived by the owner on Mar 9, 2021. It is now read-only.

Commit a9853d1

Browse files
vinaypuppalvinaypuppal
authored
Merge pull request #534 from krushiraj/issue-529-add
Issue 529 add
2 parents 5503281 + 0c26990 commit a9853d1

File tree

10 files changed

+2015
-3269
lines changed

10 files changed

+2015
-3269
lines changed

Diff for: ‎.all-contributorsrc

+11-1
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,19 @@
270270
"contributions": [
271271
"code"
272272
]
273+
},
274+
{
275+
"login": "krushiraj",
276+
"name": "Krushi Raj Tula",
277+
"avatar_url": "https://avatars0.githubusercontent.com/u/19507241?v=4",
278+
"profile": "http://krushiraj.github.io",
279+
"contributions": [
280+
"code"
281+
]
273282
}
274283
],
275284
"repoType": "github",
276285
"repoHost": "https://github.com",
277-
"contributorsPerLine": 7
286+
"contributorsPerLine": 7,
287+
"commitConvention": "none"
278288
}

Diff for: ‎README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Coderplex Website
22

3-
[![Build Status](https://travis-ci.org/coderplex/coderplex.svg?branch=master)](https://travis-ci.org/coderplex/coderplex) [![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo) ![coderplex](https://david-dm.org/coderplex/coderplex.svg) [![All Contributors](https://img.shields.io/badge/all_contributors-27-orange.svg?style=flat-square)](#contributors) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/coderplex/coderplex/blob/master/LICENSE)
3+
[![Build Status](https://travis-ci.org/coderplex/coderplex.svg?branch=master)](https://travis-ci.org/coderplex/coderplex) [![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo) ![coderplex](https://david-dm.org/coderplex/coderplex.svg) [![All Contributors](https://img.shields.io/badge/all_contributors-28-orange.svg?style=flat-square)](#contributors-) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/coderplex/coderplex/blob/master/LICENSE)
44

55
## Follow our community here at [https://www.coderplex.org](https://www.coderplex.org)
66

@@ -23,7 +23,8 @@ We welcome pull requests from beginners and seasoned javaScript developers alike
2323
Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):
2424

2525
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
26-
<!-- prettier-ignore -->
26+
<!-- prettier-ignore-start -->
27+
<!-- markdownlint-disable -->
2728
<table>
2829
<tr>
2930
<td align="center"><a href="https://www.vinaypuppal.com/"><img src="https://avatars1.githubusercontent.com/u/8843216?v=4" width="100px;" alt="Vinay Puppal"/><br /><sub><b>Vinay Puppal</b></sub></a><br /><a href="https://github.com/coderplex/coderplex/issues?q=author%3Avinaypuppal" title="Bug reports">🐛</a> <a href="https://github.com/coderplex/coderplex/commits?author=vinaypuppal" title="Code">💻</a> <a href="#ideas-vinaypuppal" title="Ideas, Planning, & Feedback">🤔</a> <a href="#review-vinaypuppal" title="Reviewed Pull Requests">👀</a></td>
@@ -59,7 +60,10 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
5960
<td align="center"><a href="https://shahednasser.herokuapp.com"><img src="https://avatars1.githubusercontent.com/u/27354907?v=4" width="100px;" alt="Shahed Nasser"/><br /><sub><b>Shahed Nasser</b></sub></a><br /><a href="https://github.com/coderplex/coderplex/commits?author=shahednasser" title="Code">💻</a></td>
6061
<td align="center"><a href="https://github.com/addictd"><img src="https://avatars2.githubusercontent.com/u/23260049?v=4" width="100px;" alt="deep"/><br /><sub><b>deep</b></sub></a><br /><a href="https://github.com/coderplex/coderplex/commits?author=addictd" title="Code">💻</a> <a href="https://github.com/coderplex/coderplex/commits?author=addictd" title="Documentation">📖</a></td>
6162
<td align="center"><a href="https://github.com/VickyAbishek"><img src="https://avatars3.githubusercontent.com/u/9305700?v=4" width="100px;" alt="VickyAbishek"/><br /><sub><b>VickyAbishek</b></sub></a><br /><a href="https://github.com/coderplex/coderplex/commits?author=VickyAbishek" title="Code">💻</a></td>
63+
<td align="center"><a href="http://krushiraj.github.io"><img src="https://avatars0.githubusercontent.com/u/19507241?v=4" width="100px;" alt="Krushi Raj Tula"/><br /><sub><b>Krushi Raj Tula</b></sub></a><br /><a href="https://github.com/coderplex/coderplex/commits?author=krushiraj" title="Code">💻</a></td>
6264
</tr>
6365
</table>
6466

67+
<!-- markdownlint-enable -->
68+
<!-- prettier-ignore-end -->
6569
<!-- ALL-CONTRIBUTORS-LIST:END -->

Diff for: ‎components/common/airtable-form.js

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import React from 'react';
2+
import Head from 'next/head';
3+
import styled from 'react-emotion';
4+
5+
import Layout from './layout';
6+
7+
export default ({ formId, height }) => {
8+
return (
9+
<Layout>
10+
<Head>
11+
<script src="https://static.airtable.com/js/embed/embed_snippet_v1.js" />
12+
</Head>
13+
<IframeContainer>
14+
<iframe
15+
className="airtable-embed airtable-dynamic-height"
16+
src={`https://airtable.com/embed/${formId}?backgroundColor=green`}
17+
frameBorder="0"
18+
onmousewheel=""
19+
width="100%"
20+
height={height}
21+
style={{ background: `transparent`, border: `1px solid #ccc` }}
22+
/>
23+
</IframeContainer>
24+
</Layout>
25+
);
26+
};
27+
28+
const IframeContainer = styled.div`
29+
background-image: url('https://res.cloudinary.com/vinaypuppal/image/upload/c_scale,w_102/v1528992906/Spinner-1s-200px_wnlnc6.gif');
30+
background-position: center top;
31+
background-repeat: no-repeat;
32+
`;

Diff for: ‎components/common/header/index.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ class NavBar extends React.Component {
5151
title: 'Join',
5252
path: '/join',
5353
},
54+
{
55+
title: 'Feedback',
56+
path: '/feedback',
57+
},
5458
{
5559
title: 'Blog',
5660
path: 'https://coderplex.org/blog',
@@ -88,6 +92,7 @@ class NavBar extends React.Component {
8892
this.props.router.query.subject.slice(1)} | Coderplex`
8993
: metaData.title;
9094
const { description, image } = metaData;
95+
const navCollapseStyle = { top: `-${(this.state.navItems.length - 1) * 100}%` };
9196
return (
9297
<Headroom>
9398
<Header>
@@ -105,7 +110,9 @@ class NavBar extends React.Component {
105110
/>
106111
</Link>
107112
</NavLogo>
108-
<NavLinks className={this.state.menuOpen ? 'open' : ''}>
113+
<NavLinks
114+
className={this.state.menuOpen ? 'open' : ''}
115+
style={this.state.menuOpen ? {} : navCollapseStyle}>
109116
{this.state.navItems
110117
.filter(item => !item.external)
111118
.map(item => (

Diff for: ‎components/common/header/index.styles.js

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export const NavLinks = styled.ul`
4848
width: 100%;
4949
position: fixed;
5050
z-index: -1;
51-
top: -600%;
5251
left: 0;
5352
background: #fbfbfb;
5453
border-bottom: 1px solid #eee;

Diff for: ‎config/meta-info.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
},
77
"learn": {
88
"title": "Free and Open Source Learning Guides | Coderplex",
9-
"description":
10-
"Curated guides with crowd-sourced recommendations of the best free online resources to learn various modern technologies",
9+
"description": "Curated guides with crowd-sourced recommendations of the best free online resources to learn various modern technologies",
1110
"image": ""
1211
},
1312
"space": {
1413
"title": "Offline Co-learning Spaces | Coderplex",
15-
"description":
16-
"A network of off-learning spaces for autodidacts to come and engage in peer-learning and collaboration",
14+
"description": "A network of off-learning spaces for autodidacts to come and engage in peer-learning and collaboration",
1715
"image": ""
1816
},
1917
"events": {
@@ -26,21 +24,24 @@
2624
"description": "Join the biggest and most active developer community in Hyderabad!",
2725
"image": ""
2826
},
27+
"feedback": {
28+
"title": "Coderplex - Feedback",
29+
"description": "Help in shaping Coderplex to it's best by providing your views and thoughts with us.",
30+
"image": ""
31+
},
2932
"members": {
3033
"title": "Our community member | Coderplex",
3134
"description": "List of all our community members",
3235
"image": ""
3336
},
3437
"privacy": {
3538
"title": "Privacy Policy of Coderplex Foundation",
36-
"description":
37-
"This page is used to inform website visitors regarding our policies with the collection, use, and disclosure of Personal Information if anyone decided to use our Service, the Coderplex website.",
39+
"description": "This page is used to inform website visitors regarding our policies with the collection, use, and disclosure of Personal Information if anyone decided to use our Service, the Coderplex website.",
3840
"image": ""
3941
},
4042
"terms": {
4143
"title": "Privacy Policy of Coderplex Foundation",
42-
"description":
43-
"This page is used to inform website visitors regarding our terms and conditions which outline the rules and regulations for the use of Coderplex Foundation's Website.",
44+
"description": "This page is used to inform website visitors regarding our terms and conditions which outline the rules and regulations for the use of Coderplex Foundation's Website.",
4445
"image": ""
4546
}
4647
}

Diff for: ‎next.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ module.exports = {
3232
'/learn': { page: '/learn' },
3333
'/space': { page: '/space' },
3434
'/join': { page: '/join' },
35+
'/feedback': { page: '/feedback' },
3536
'/terms': { page: '/terms' },
3637
'/privacy': { page: '/privacy' },
3738
};

Diff for: ‎pages/feedback.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import React from 'react';
2+
3+
import Form from '../components/common/airtable-form';
4+
5+
export default () => {
6+
return <Form formId="shrhz9WWHYRzNhJNl" height="2190" />;
7+
};

Diff for: ‎pages/join.js

+2-27
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,7 @@
11
import React from 'react';
2-
import Head from 'next/head';
3-
import styled from 'react-emotion';
42

5-
import Layout from '../components/common/layout';
3+
import Form from '../components/common/airtable-form';
64

75
export default () => {
8-
return (
9-
<Layout>
10-
<Head>
11-
<script src="https://static.airtable.com/js/embed/embed_snippet_v1.js" />
12-
</Head>
13-
<IframeContainer>
14-
<iframe
15-
className="airtable-embed airtable-dynamic-height"
16-
src="https://airtable.com/embed/shrY3VfShFqerCJmX?backgroundColor=green"
17-
frameBorder="0"
18-
onmousewheel=""
19-
width="100%"
20-
height="1881"
21-
style={{ background: `transparent`, border: `1px solid #ccc` }}
22-
/>
23-
</IframeContainer>
24-
</Layout>
25-
);
6+
return <Form formId="shrY3VfShFqerCJmX" height="1881" />;
267
};
27-
28-
const IframeContainer = styled.div`
29-
background-image: url('https://res.cloudinary.com/vinaypuppal/image/upload/c_scale,w_102/v1528992906/Spinner-1s-200px_wnlnc6.gif');
30-
background-position: center top;
31-
background-repeat: no-repeat;
32-
`;

0 commit comments

Comments
 (0)