Skip to content
This repository has been archived by the owner on May 28, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into feat/add-mentors-list
Browse files Browse the repository at this point in the history
  • Loading branch information
fanny authored Oct 18, 2019
2 parents 7feb707 + f41cd12 commit 4a18bec
Show file tree
Hide file tree
Showing 15 changed files with 99 additions and 80 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,7 @@ $RECYCLE.BIN/
### env files
docs/

### vscode
.vscode/

# End of https://www.gitignore.io/api/node,linux,macos,windows,visualstudiocode
25 changes: 0 additions & 25 deletions .travis.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .vscode/settings.json

This file was deleted.

12 changes: 12 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ Para ajudar no desenvolvimento da nossa plataforma, você precisa ter `yarn` e `

Clone esse repositório, entre na pasta do `IssueAi` na sua linha de comando, e siga os passos:

### Adicione uma chave pessoal do github

Crie uma cópia do arquivo `.env.example` e a nomeie `.env`

Crie uma chave pessoal no github [seguindo esses passos até o 9](https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line). Só é necessária a permissão de leitura de repositórios - `public_repo`.

Copie e cole a chave gerada no seu novo arquivo `.env`:

```bash
GITHUB_TOKEN=suaTokenAqui
```

### Instalar dependêndencias

```sh
Expand Down
17 changes: 0 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

Sinta-se a vontade para discutir por meio de issues, aqui é um espaço aberto para compartilhar ideias sobre projetos open source da UFCG. Abra uma Issue e respeite o código de conduta.


## Objetivo

O Issue Ai tenta criar um espaço de visibilidade para os projetos open source criado por alunos da UFCG@Campus Campina Grande. Nossa promessa é de um espaço que promove a ajuda e colaboração de alunos para alunos. Procuramos também promover a cultura open source por meio desses projetos, valorizamos projetos que facilitem a contribuição e a chegada de iniciantes que procuram aprender, para isso orientamos que todo projeto tenha:
Expand Down Expand Up @@ -39,22 +38,6 @@ Incentivamos muito a comunicação por Issues, mas claro que não queremos abusa

- Seja legal :)

## Uso

Para rodar o projeto você precisa ter o [node](https://nodejs.org/en/) e o [yarn](https://yarnpkg.com/en/docs/install) instalado.

Para instalar todas as dependências, use:

```bash
yarn
```

Após isso, para rodar o ambiente de desenvolvimento use:

```bash
yarn start
```

## Para Adicionar um Projeto

Deseja adicionar o seu repositório Open Source? Os dados dos repositórios que usamos são recuperados na API do [Laguinho](https://github.com/OpenDevUFCG/laguinho-api), caso queira ver seu repositório no IssueAi, confira [aqui](https://github.com/OpenDevUFCG/laguinho-api/blob/master/docs/REPOSITORIES.md#como-contribuir-adicionando-mais-reposit%C3%B3rios) como adicionar!
Expand Down
11 changes: 0 additions & 11 deletions app.yaml

This file was deleted.

10 changes: 10 additions & 0 deletions data/repositories.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,16 @@
"imgUrl": "https://github.com/Rickecr.png"
}
]
},
{
"name": "matheusps/clssx",
"difficulty": "iniciante",
"mentors": [
{
"name": "Matheusps",
"imgUrl": "https://github.com/matheusps.png"
}
]
}
]
}
Binary file removed gae/client-secret.json.enc
Binary file not shown.
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"license": "MIT",
"scripts": {
"test": "yarn flow",
"build": "webpack",
"start": "webpack-dev-server --progress --colors --inline --hot --host 0.0.0.0",
"build": "webpack --config ./webpack/webpack.prod.js",
"start": "webpack-dev-server --config ./webpack/webpack.dev.js --progress --colors --inline --hot --host 0.0.0.0",
"lint": "eslint .",
"flow": "flow"
},
Expand All @@ -26,6 +26,7 @@
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.4",
"css-loader": "^1.0.1",
"dotenv-webpack": "^1.7.0",
"eslint": "^5.8.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^3.1.0",
Expand All @@ -46,7 +47,8 @@
"url-loader": "^2.2.0",
"webpack": "^4.24.0",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.11"
"webpack-dev-server": "^3.1.11",
"webpack-merge": "^4.2.2"
},
"dependencies": {
"axios": "^0.18.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react';
import type { MemberProps } from './member';
import './teamPage.css';

const Member = ({ name, urlGithub }: MemberProps) => (
const TeamMember = ({ name, urlGithub }: MemberProps) => (
<div className="member">
<a href={urlGithub}>
<img
Expand All @@ -17,4 +17,4 @@ const Member = ({ name, urlGithub }: MemberProps) => (
</div>
);

export default Member;
export default TeamMember;
4 changes: 2 additions & 2 deletions src/components/team/TeamPage.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// @flow

import React from 'react';
import Member from './Member';
import TeamMember from './TeamMember';
import members from '../../../data/equipe.json';
import './teamPage.css';

const renderMembers = () =>
members.map(member => (
<li>
<Member {...member} />
<TeamMember {...member} />
</li>
));

Expand Down
19 changes: 9 additions & 10 deletions webpack.config.js → webpack/webpack.common.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
const webpack = require('webpack');
const path = require('path');
const Dotenv = require('dotenv-webpack');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');

const parentDir = path.join(__dirname, '../');

const config = {
mode: 'development',
entry: ['react-dev-utils/webpackHotDevClient', './src/index.js'],
devServer: {
port: 8000,
contentBase: __dirname + '/public',
historyApiFallback: true,
},
entry: [`${parentDir}src/index.js`],
output: {
path: path.resolve(__dirname, 'public'),
path: `${parentDir}public/`,
filename: 'bundle.[hash].js',
},
module: {
Expand Down Expand Up @@ -48,13 +46,14 @@ const config = {
plugins: [
new HtmlWebpackPlugin({
filename: 'index.html',
template: __dirname + '/src/index.html',
hash: true,
template: `${parentDir}src/index.html`,
}),
new MiniCssExtractPlugin({
filename: 'style.[contenthash].css',
}),
new webpack.EnvironmentPlugin({ ...process.env }),
new Dotenv({
systemvars: true,
}),
],
};

Expand Down
17 changes: 17 additions & 0 deletions webpack/webpack.dev.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const webpack = require('webpack');
const merge = require('webpack-merge');
const path = require('path');
const common = require('./webpack.common');

const parentDir = path.join(__dirname, '../');

module.exports = merge(common, {
entry: ['react-dev-utils/webpackHotDevClient'],
devServer: {
port: 8000,
contentBase: `${parentDir}public`,
historyApiFallback: true,
},

mode: 'development',
});
7 changes: 7 additions & 0 deletions webpack/webpack.prod.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const webpack = require('webpack');
const merge = require('webpack-merge');
const common = require('./webpack.common');

module.exports = merge(common, {
mode: 'production',
});
36 changes: 32 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2023,6 +2023,25 @@ domutils@^2.0.0:
domelementtype "^2.0.1"
domhandler "^3.0.0"

dotenv-defaults@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-1.0.2.tgz#441cf5f067653fca4bbdce9dd3b803f6f84c585d"
integrity sha512-iXFvHtXl/hZPiFj++1hBg4lbKwGM+t/GlvELDnRtOFdjXyWP7mubkVr+eZGWG62kdsbulXAef6v/j6kiWc/xGA==
dependencies:
dotenv "^6.2.0"

dotenv-webpack@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz#4384d8c57ee6f405c296278c14a9f9167856d3a1"
integrity sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==
dependencies:
dotenv-defaults "^1.0.2"

dotenv@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==

duplexer@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
Expand Down Expand Up @@ -2230,14 +2249,16 @@ eslint-scope@^4.0.3:
estraverse "^4.1.1"

eslint-utils@^1.3.1:
version "1.4.0"
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.0.tgz#e2c3c8dba768425f897cf0f9e51fe2e241485d4c"
version "1.4.2"
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
dependencies:
eslint-visitor-keys "^1.0.0"

eslint-visitor-keys@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
version "1.1.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==

eslint@^5.8.0:
version "5.16.0"
Expand Down Expand Up @@ -6011,6 +6032,13 @@ webpack-log@^2.0.0:
ansi-colors "^3.0.0"
uuid "^3.3.2"

webpack-merge@^4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
dependencies:
lodash "^4.17.15"

webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
version "1.4.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
Expand Down

0 comments on commit 4a18bec

Please sign in to comment.