Bläddra i källkod

Merge branch 'develop' of http://209.50.56.224/git/ITTEC/PlataformaEducativaWeb2 into develop

FREDY 3 månader sedan
förälder
incheckning
64c223c8df

+ 4 - 1
Front/src/app/app-routing.module.ts

@@ -22,7 +22,10 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes,
+
+    {useHash: true,}
+  )],
   exports: [RouterModule]
 })
 export class AppRoutingModule { }

+ 2 - 2
Front/src/app/modules/Administrador/pages/grados-educativos/grados-educativos.component.ts

@@ -206,7 +206,7 @@ export class GradosEducativosComponent {
   }
 
 exportPage(tabla: string, pagina: number) {
-  const url = `http://localhost:8000/api/exportar-excel?tabla=${tabla}&pagina=${pagina}`;
+  const url = `https://qa.plataforma-educativa.com.mx/back/public/api/exportar-excel?tabla=${tabla}&pagina=${pagina}`;
 
   this.http.get(url, { responseType: 'blob', withCredentials: true }).subscribe({
     next: (blob) => {
@@ -256,7 +256,7 @@ exportPage(tabla: string, pagina: number) {
 //   });
 // }
 exportAll(tabla: string) {
-  const url = `http://localhost:8000/api/exportar-excel?tabla=${tabla}`;
+  const url = `https://qa.plataforma-educativa.com.mx/back/public/api/exportar-excel?tabla=${tabla}`;
 
   this.http.get(url, { responseType: 'blob', withCredentials: true }).subscribe({
     next: (blob) => {

+ 3 - 1
Front/src/environments/environments.ts

@@ -1,4 +1,6 @@
 export const environments = {
     // baseUrl:'http://192.168.200.2:8000/api'
-    baseUrl:'http://127.0.0.1:8000/api'
+    // baseUrl:'http://127.0.0.1:8000/api'
+    baseUrl:'https://qa.plataforma-educativa.com.mx/back/public/api'
+
 }

+ 17 - 0
Front/src/web.config

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="Angular Routes" stopProcessing="true">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>