Skip to content

Commit

Permalink
casi lista
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrile15
adrile15 committed Jun 27, 2024
1 parent b3caecf commit 4ff1a17
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 41 deletions.
4 changes: 2 additions & 2 deletions front/src/routes/+layout.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import Header from './Header.svelte';
</script>
<svelte:head>
<title>SOS2324-17 Project</title>
<title>SOS2324-jul-ala Project</title>
</svelte:head>
<main>
<Header/>
<h1>SOS2324-17 Project</h1>
<h1>SOS2324-jul-ala Project</h1>
<slot></slot>
<Footer/>
</main>
19 changes: 0 additions & 19 deletions front/src/routes/Header.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@
<DropdownMenu>
<DropdownItem class="menu-item" href = "{API}/trimestralpib_stats">trimestralpib_stats [v1] (Adrian León)</DropdownItem>
<DropdownItem class="menu-item" href = "{API_v2}/trimestralpib_stats">trimestralpib_stats [v2] (Adrian León)</DropdownItem>
<DropdownItem class="menu-item" href = "{API}/manofthematch">manofthematch [v1] (Antonio Rumí)</DropdownItem>
<DropdownItem class="menu-item" href = "{API_v2}/manofthematch">manofthematch [v2] (Antonio Rumí)</DropdownItem>
<DropdownItem class="menu-item" href = "{API}/economicfreedom_stats">economicfreedom_stats [v1] (Ahmed Amine Fraj)</DropdownItem>
<DropdownItem class="menu-item" href = "{API_v2}/economicfreedom_stats">economicfreedom_stats [v2] (Ahmed Amine Fraj)</DropdownItem>
</DropdownMenu>
</Dropdown>
<Dropdown nav autoClose={true}>
Expand All @@ -49,8 +45,6 @@
</DropdownToggle>
<DropdownMenu>
<DropdownItem class="menu-item" href = "https://github.com/adrile15">adrile15</DropdownItem>
<DropdownItem class="menu-item" href = "https://github.com/antrummor">antrummor</DropdownItem>
<DropdownItem class="menu-item" href = "https://github.com/ahmfra">ahmfra</DropdownItem>
</DropdownMenu>
</Dropdown>
<Dropdown nav autoClose={true}>
Expand All @@ -59,19 +53,14 @@
</DropdownToggle>
<DropdownMenu>
<DropdownItem class="menu-item" href = "/trimestralpib_stats">trimestralpib_stats (Adrian León)</DropdownItem>
<DropdownItem class="menu-item" href = "/manofthematch">manofthematch (Antonio Rumí)</DropdownItem>
<DropdownItem class="menu-item" href = "/economicfreedom_stats">economicfreedom_stats (Ahmed Fraj)</DropdownItem>
</DropdownMenu>
</Dropdown>
<Dropdown nav autoClose={true}>
<DropdownToggle nav class="nav-link" caret>
Views
</DropdownToggle>
<DropdownMenu>
<DropdownItem class="menu-item" href = "/analytics">gráfica grupal</DropdownItem>
<DropdownItem class="menu-item" href = "/trimestralpib_stats/views">trimestralpib_stats</DropdownItem>
<DropdownItem class="menu-item" href = "/economicfreedom_stats/views">economicfreedom_stats</DropdownItem>
<DropdownItem class="menu-item" href = "/manofthematch/views">manofthematch</DropdownItem>
</DropdownMenu>
</Dropdown>
<Dropdown nav autoClose={true}>
Expand All @@ -81,10 +70,6 @@
<DropdownMenu>
<DropdownItem class="menu-item" href = "{API}/trimestralpib_stats/docs">trimestralpib_stats [v1] (Adrian)</DropdownItem>
<DropdownItem class="menu-item" href = "{API_v2}/trimestralpib_stats/docs">trimestralpib_stats [v2] (Adrian)</DropdownItem>
<DropdownItem class="menu-item" href = "{API}/manofthematch/docs">manofthematch [v1] (Antonio)</DropdownItem>
<DropdownItem class="menu-item" href = "{API_v2}/manofthematch/docs">manofthematch [v2] (Antonio)</DropdownItem>
<DropdownItem class="menu-item" href = "{API}/economicfreedom_stats/docs">economicfreedom_stats [v1](Ahmed)</DropdownItem>
<DropdownItem class="menu-item" href = "{API_v2}/economicfreedom_stats/docs">economicfreedom_stats [v2] (Ahmed)</DropdownItem>
</DropdownMenu>
</Dropdown>
<Dropdown nav autoClose={true}>
Expand All @@ -93,8 +78,6 @@
</DropdownToggle>
<DropdownMenu>
<DropdownItem class="menu-item" href = "/integrations/trimestralpib_stats/">integrations trimestralpib_stats</DropdownItem>
<DropdownItem class="menu-item" href = "/integrations/manofthematch/">integrations manofthematch</DropdownItem>
<DropdownItem class="menu-item" href = "/integrations/">Integrations economicfreedom_stats</DropdownItem>
</DropdownMenu>
</Dropdown>
<Dropdown nav autoClose={true}>
Expand All @@ -103,8 +86,6 @@
</DropdownToggle>
<DropdownMenu>
<DropdownItem class="menu-item" href = "https://www.youtube.com/watch?v=GMbB93tYeWk">Video trimestralpib_stats </DropdownItem>
<DropdownItem class="menu-item" href = "https://www.youtube.com/watch?v=rQKNkHhZzTU">Video manofthematch </DropdownItem>
<DropdownItem class="menu-item" href = "https://www.youtube.com/watch?v=W0WeY6NindU">Video Economicfreedom_stats </DropdownItem>
</DropdownMenu>

</Dropdown>
Expand Down
2 changes: 1 addition & 1 deletion front/src/routes/about/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@
<h1>Videos</h1>

<ul>
<li><a href="youtube.com">Video Ahmed</a></li>
<li><a href="https://www.youtube.com/watch?v=GMbB93tYeWk">Video Adrian</a></li>
</ul>
</Container>
11 changes: 3 additions & 8 deletions front/src/routes/integrations/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,10 @@
</style>

<Container>
<h1>Integraciones Grupo 17</h1>
<h1>Integraciones</h1>

<h6>Usos/Integraciones Ahmed</h6>
<h6>Usos/Integraciones Adrian</h6>
<ul>
<li><a href="integrations/usesAAF/chineseRecipesAAF">Uso Textual API Externa 1 (Chinese Recipes): sin proxy</a></li>
<li><a href="integrations/usesAAF/golfDataAAF">Uso Widget API Externa 2(Golf Players): sin proxy</a></li>
<li><a href="integrations/usesAAF/cricketProxyAAF">Uso Widget API Externa 3 (Cricket Rankings): con proxy</a></li>

<li><a href="integrations/integrationCovidAAF">Integración 1: Datos EconomicFreedom y API de covid (Highcharts)</a></li>
<li><a href="integrations/integrationInflationAAF/">Integración 2: Datos EconomicFreedom y API de inflation (Highcharts)</a></li>
<li><a href="integrations/trimestralpib_stats">Accede a usos/integraciones</a></li>
</ul>
</Container>
14 changes: 5 additions & 9 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,19 @@
<title>Project Information</title>
</head>
<body>
<h1>SOS2324-17</h1>
<h1>SOS2324-jul-ala</h1>
<h2>Team</h2>
<ul>
<li><a href="https://github.com/ahmfra">Ahmed Amine Fraj</a></li>
<li><a href="https://github.com/adrile15">Adrian Leon Arjona</a></li>
<li><a href="https://github.com/antrummor">Antonio Rumi Moreno</a></li>
</ul>
<h2>Project description</h2>
<p>Our work consists on comparing the GDB (Gross Domestic Product) of each country with the economical freedom of its citizens.</p>
<h2>Repository</h2>
<p><a href="https://github.com/gti-sos/SOS2324-17">gti-sos/SOS2324-17</a></p>
<p><a href="https://github.com/gti-sos/sos2324-jul-ala">gti-sos/sos2324-jul-ala</a></p>
<h2>URL</h2>
<p><a href="https://sos2324-17.appspot.com">sos2324-17.appspot.com</a></p>
<p><a href="https://sos2324-jul-ala.ew.r.appspot.com/">sos2324-jul-ala.ew.r.appspot.com</a></p>
<h2>APIs</h2>
<p><a href="https://sos2324-17.appspot.com/api/v1/trimestralpib_stats/docs">https://sos2324-17.appspot.com/api/v1/trimestralpib_stats/docs</a></p>(developed by Adrián León Arjona)</p>
<p><a href="https://sos2324-17.appspot.com/api/v1/manofthematch/docs">https://sos2324-17.appspot.com/api/v1/manofthematch/docs</a></p> <p>developed by Antonio Rumi Moreno</p>
<p><a href="https://sos2324-17.appspot.com/api/v1/economicfreedom_stats/docs">https://sos2324-17.appspot.com/api/v1/economicfreedom_stats/docs</a></p> <p>developed by Ahmed Amine Fraj</p>

<p><a href="https://sos2324-jul-ala.ew.r.appspot.com/api/v1/trimestralpib_stats/docs">https://sos2324-jul-ala.ew.r.appspot.com/api/v1/trimestralpib_stats/docs</a></p>(developed by Adrián León Arjona)</p>

</body>
</html>
4 changes: 2 additions & 2 deletions tests/e2e/trimestralpib_stats.spec.cjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ afterEach(async () => {
// Limpieza después de cada prueba si es necesario
});

test('has title SOS2324-17 Project', async () => {
test('has title SOS2324-jul-ala Project', async () => {
test.setTimeout(60000);
await page.goto('http://localhost:20000');
await expect(page).toHaveTitle(/SOS2324-17 Project/);
await expect(page).toHaveTitle(/SOS2324-jul-ala Project/);
});

test('load and list economic freedom stats', async () => {
Expand Down

0 comments on commit 4ff1a17

Please sign in to comment.