Desktop Página O que é e-lixo

mobile/app/src/main/res/layout/activity_main.xml

@@ -25,9 +25,11 @@
         android:layout_height="match_parent"
         app:defaultNavHost="true"
         app:layout_constraintBottom_toTopOf="@id/nav_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0"
         app:navGraph="@navigation/mobile_navigation" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

mobile/app/src/main/res/menu/bottom_nav_menu.xml

@@ -2,18 +2,23 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:id="@+id/navigation_home"
+        android:id="@+id/navigation_eWaste"
         android:icon="@drawable/ic_home_black_24dp"
-        android:title="@string/title_home" />
+        android:title="@string/title_eWaste" />
 
     <item
-        android:id="@+id/navigation_dashboard"
+        android:id="@+id/navigation_searchEcopoints"
         android:icon="@drawable/ic_dashboard_black_24dp"
-        android:title="@string/title_dashboard" />
+        android:title="@string/title_searchEcopoints" />
 
     <item
-        android:id="@+id/navigation_notifications"
+        android:id="@+id/navigation_donateElectronic"
         android:icon="@drawable/ic_notifications_black_24dp"
-        android:title="@string/title_notifications" />
+        android:title="@string/title_donateElectronic" />
+
+    <item
+        android:id="@+id/navigation_viewStatistics"
+        android:icon="@drawable/ic_notifications_black_24dp"
+        android:title="@string/title_viewStatistics" />
 
 </menu>

mobile/app/src/main/res/navigation/mobile_navigation.xml

@@ -8,18 +8,18 @@
     <fragment
         android:id="@+id/navigation_home"
         android:name="com.example.mobile.ui.home.HomeFragment"
-        android:label="@string/title_home"
+        android:label="@string/title_eWaste"
         tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/navigation_dashboard"
         android:name="com.example.mobile.ui.dashboard.DashboardFragment"
-        android:label="@string/title_dashboard"
+        android:label="@string/title_searchEcopoints"
         tools:layout="@layout/fragment_dashboard" />
 
     <fragment
         android:id="@+id/navigation_notifications"
         android:name="com.example.mobile.ui.notifications.NotificationsFragment"
-        android:label="@string/title_notifications"
+        android:label="@string/title_donateElectronic"
         tools:layout="@layout/fragment_notifications" />
 </navigation>

mobile/app/src/main/res/values/strings.xml

@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">Mobile</string>
-    <string name="title_home">Home</string>
-    <string name="title_dashboard">Dashboard</string>
-    <string name="title_notifications">Notifications</string>
+    <string name="title_eWaste">O que é e-Lixo</string>
+    <string name="title_searchEcopoints">Buscar Ecopontos</string>
+    <string name="title_donateElectronic">Doar Eletrônicos</string>
+    <string name="title_viewStatistics">Viualizar Estatísticas</string>
 </resources>

web/src/app/app-routing.module.ts

@@ -1,7 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { AppComponent } from './app.component';
+import { OqueEElixoComponent } from './pages/oque-e-elixo/oque-e-elixo.component';
 
-const routes: Routes = [];
+const routes: Routes = [
+  { path: "", redirectTo: "/oqueeelixo", pathMatch: 'full' },
+  { path: "oqueeelixo", component: OqueEElixoComponent }
+];
 
 @NgModule({
   imports: [RouterModule.forRoot(routes)],

web/src/app/app.component.html

@@ -1,5 +1 @@
-<h1>Menu</h1>
-<h1>Davi Lindo!</h1>
-<app-ecopoint title="01 - Centro"></app-ecopoint>
-<app-ecopoint></app-ecopoint>
-<app-ecopoint></app-ecopoint>
+<router-outlet></router-outlet>

web/src/app/app.module.ts

@@ -1,10 +1,11 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-
 import { AppRoutingModule } from './app-routing.module';
+
 import { AppComponent } from './app.component';
 import { MenuComponent } from './components/menu/menu.component';
 import { EcopointComponent } from './components/ecopoint/ecopoint.component';
+import { OqueEElixoComponent } from './pages/oque-e-elixo/oque-e-elixo.component';
 import { HeaderComponent } from './components/header/header.component';
 
 
@@ -13,6 +14,7 @@ import { HeaderComponent } from './components/header/header.component';
     AppComponent,
     MenuComponent,
     EcopointComponent,
+    OqueEElixoComponent,
     HeaderComponent
   ],
   imports: [

web/src/app/components/header/header.component.css

@@ -70,16 +70,16 @@ nav{
 }
 
 .iconTv{
-    list-style-image: url(/web/src/assets/img/menu_iconsTv.svg);
+    list-style-image: url("/web/src/assets/img/menu_iconsTv.svg");
 }
 
 .iconLocation{
-    list-style-image: url(/web/src/assets/img/menu_iconsLocation.svg);
+    list-style-image: url("/web/src/assets/img/menu_iconsLocation.svg");
 }
 
 .iconGraph{
-    list-style-image: url(/web/src/assets/img/menu_iconsGraph.svg);
+    list-style-image: url("/web/src/assets/img/menu_iconsGraph.svg");
 }
 .iconDonate{
-    list-style-image: url(/web/src/assets/img/menu_logoDonation.svg);
+    list-style-image: url("/assets/img/Davi.jpg");
 }

web/src/app/components/header/header.component.html

@@ -11,15 +11,15 @@
 
         <div class="profile">
             <p class="avatar">
-                <img src="/web/src/assets/img/Davi.jpg" alt="Avatar do usuário">            
+                <img src="assets/img/Davi.jpg" alt="Avatar do usuário">            
             </p>
             <p class="profile_name">Davi Mendes</p>
         </div>
 
 
         <nav>                       
             <div class="logo">
-                <a href="header.component.html"><img src="/web/src/assets/img/menu_logoName.svg" alt="Nome da empresa" width="660" height="100"></a>
+                <a href="header.component.html"><img src="assets/img/menu_logoName.svg" alt="Nome da empresa" width="660" height="100"></a>
             </div>
             <ul class="nav_list">
                 <li class="iconTv"><a href="#">O que é e-lixo</a></li>

web/src/app/pages/oque-e-elixo/oque-e-elixo.component.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="pt-BR">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Document</title>
+</head>
+<body>
+  <app-header></app-header>
+  <router-outlet></router-outlet>
+</body>
+</html>

web/src/app/pages/oque-e-elixo/oque-e-elixo.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { OqueEElixoComponent } from './oque-e-elixo.component';
+
+describe('OqueEElixoComponent', () => {
+  let component: OqueEElixoComponent;
+  let fixture: ComponentFixture<OqueEElixoComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OqueEElixoComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OqueEElixoComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

web/src/app/pages/oque-e-elixo/oque-e-elixo.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-oque-e-elixo',
+  templateUrl: './oque-e-elixo.component.html',
+  styleUrls: ['./oque-e-elixo.component.css']
+})
+export class OqueEElixoComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}