Merge pull request #820 from lsoaresesilva/#816

#816
lsoaresesilva · Aug 28, 2022 · 4cc44f8 · 4cc44f8
2 parents 30073cb + e344602
commit 4cc44f8
Show file tree

Hide file tree

Showing 152 changed files with 8,835 additions and 11,886 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,7 @@ speed-measure-plugin.json
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/angular.json b/angular.json
@@ -25,7 +25,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "aot": true,
             "outputPath": "dist/32bits",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -43,18 +42,22 @@
               "node_modules/primeng/resources/themes/nova/theme.css",
               "node_modules/primeng/resources/primeng.min.css",
               "node_modules/prismjs/themes/prism.css",
-              "node_modules/highlight.js/styles/github.css",
-              "node_modules/@nebular/theme/styles/prebuilt/default.css"
+              "node_modules/highlight.js/styles/github.css"
             ],
             "scripts": [
               "node_modules/prismjs/prism.js",
               "src/js/skulpt.min.js",
               "src/js/skulpt-stdlib.js",
               "src/js/ide.js",
               "src/js/visualizacaoConteudo.js",
-              "src/js/analyticsEstudante.js",
-              "./node_modules/chart.js/dist/Chart.js"
-            ]
+              "src/js/analyticsEstudante.js"
+            ],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -66,13 +69,9 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": true,
-              "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": false,
               "budgets": [
                 {
                   "type": "initial",
@@ -85,7 +84,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -121,18 +121,6 @@
               "src/assets"
             ]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -152,20 +140,10 @@
               "devServerTarget": "letscode:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
   },
-  "defaultProject": "letscode",
   "cli": {
     "analytics": "0930e193-c427-421a-9eee-db61e3896d86"
   }

diff --git a/e2e/src/cadastro-estudante/cadastro-estudante.e2e-spec.ts b/e2e/src/cadastro-estudante/cadastro-estudante.e2e-spec.ts
@@ -1,10 +1,5 @@
 import { CadastroEstudantePage } from './cadastro-estudante.po';
 import { browser, by, protractor } from 'protractor';
-import Usuario from '../../../src/app/model/usuario';
-import { AngularFirestore, AngularFirestoreModule } from '@angular/fire/firestore';
-import { TestBed, inject } from '@angular/core/testing';
-import { DocumentModule } from '../../../src/app/model/firestore/document.module';
-import { AngularFireModule, FirebaseApp } from '@angular/fire';
 import { FirebaseConfiguracao } from '../../../src/environments/firebase';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 import DocumentFirestoreTest from '../utility/document';
@@ -63,7 +58,7 @@ describe('Testes E2E de cadastro de estudante', () => {
       page.getInputNome().sendKeys("Teste com o Protractor");
       page.getInputSenha().sendKeys("12345");
       page.getButtonCadastrar().click().then(resultado => {
-        
+
         setTimeout(function () {
           browser.switchTo().alert().accept();
           firestore.count("usuarios").subscribe(contadorAtual => {
@@ -75,9 +70,9 @@ describe('Testes E2E de cadastro de estudante', () => {
             }else{
               expectedGroup = Groups.control;
             }
-            
+
             firestore.getLatest("usuarios").subscribe(latest => {
-              
+
               expect(latest["grupoExperimento"]).toBe(expectedGroup);
               expect(browser.getCurrentUrl()).toEqual("http://localhost:4200/");
               firestore.deleteLatest("usuarios").subscribe(res => {

diff --git a/executar.sh b/executar.sh
@@ -0,0 +1,2 @@
+export NODE_OPTIONS=--max_old_space_size=4096
+ng serve
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export NODE_OPTIONS=--max_old_space_size=4096
		ng serve