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

Atualizaca do README e outras melhorias #851

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,7 @@ testem.log
# System Files
.DS_Store
Thumbs.db

# Virtual environments
.env
.venv
54 changes: 46 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,49 @@ https://www.lucidchart.com/invitations/accept/c08e9d10-8fa1-41e7-a148-c1b70f3cb0

# Instalação

1. Instalar o Angular.
2. Instalar as dependências Python do projeto: pip3 install --user Django==2.2.4 && pip3 install --user djangorestframework
&& pip3 install --user django-cors-headers && pip3 install --user pexpect && pip3 install --user python-decouple
3. Clonar o projeto
4. Acessar a pasta do projeto e instalar as dependências do projeto: npm install
5. Acessar a pasta src/app/model/firestore e digitar o comando: git submodule init && git submodule update
6. Rodar o projeto: ng serve
7. Acessar a pasta backend e executar o servidor Django: python manage.py runserver
## Angular e demais dependências Node

1. Clonar o projeto e acessar o diretório
2. Criar ambiente virtual para Node 14.21.2
```
nodeenv --node=14.21.2 .env
. .env/bin/activate
```
3. Instalar as dependências Node do projeto
```
npm install
```
4. Acessar a pasta `src/app/model/firestore` e configurar submodulos do git
```
cd src/app/model/firestore
git submodule init
git submodule update
cd -
```
5. Rodar o projeto
```
npm run ng serve
```

O comando acima deverá resultar em
```
** Angular Live Development Server is listening on localhost:4200, open your browser on http://localhost:4200/ **
```

## Backend com Django

0. Acessar o diretório `backend` (diretório não existe!)
1. Criar e ativar ambiente virtual
```
python -m venv .venv
source .venv/bin/activate
```
2. Instalar as dependências Python do projeto:
```
pip3 install Django==2.2.4 djangorestframework django-cors-headers
pip3 install pexpect python-decouple
```
3. Executar o servidor Django:
```
python manage.py runserver
```
4 changes: 1 addition & 3 deletions src/app/admin/exportar-dados/exportar-dados.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ import Query from 'src/app/model/firestore/query';
import Submissao from 'src/app/model/submissao';
import Turma from 'src/app/model/turma';
import { SelectItem } from 'primeng/api';
import pageTracks from '../../../../json/pageTracks.json';

import estudantesJson from '../../../../json/estudantes.json';
import Usuario from 'src/app/model/usuario';
import EstatisticaPageTrack from 'src/app/model/modelagem/estatisticaPageTrack';
import { Assunto } from '../../model/aprendizagem/questoes/assunto';

estudantesJson;

@Component({
selector: 'app-exportar-dados',
templateUrl: './exportar-dados.component.html',
Expand Down
3 changes: 2 additions & 1 deletion src/app/model/analytics/analyticsProgramacao.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import Submissao from '../submissao';
import { Util } from '../util';
import { EventosProgramacao } from './enum/eventosProgramacao';

import submissoesEstudantes from '../../../../json/submissoes_27_jan_v2.json';
//import submissoesEstudantes from '../../../../json/submissoes_27_jan_v2.json';
let submissoesEstudantes = {}

enum EstadosAlgoritmo{

Expand Down
4 changes: 3 additions & 1 deletion src/app/model/experimento/export.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Observable, forkJoin } from 'rxjs';
import Submissao from '../submissao';

import submissoesEstudantes from '../../../../json/submissoes_29_mai.json';
//import submissoesEstudantes from '../../../../json/submissoes_29_mai.json';
let submissoesEstudantes = {};

import ErroCompilacaoFactory from '../errors/analise-compilacao/erroCompilacaoFactory';
import NameError from '../errors/analise-compilacao/nameError';
import ErroSintaxeVariavel from '../errors/analise-pre-compilacao/erroSintaxeVariavel';
Expand Down