Skip to content

Commit

Permalink
refactor: reorganize folders
Browse files Browse the repository at this point in the history
  • Loading branch information
69pmb committed May 5, 2021
1 parent 4e3965b commit b31a6cf
Show file tree
Hide file tree
Showing 18 changed files with 15 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { ActivatedRoute, Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { combineLatest, Subscription } from 'rxjs';
import { filter } from 'rxjs/operators';
import { Forecast } from '../../../../model/forecast';
import { ForecastDay } from '../../../../model/forecast-day';
import { Hour } from '../../../../model/hour';
import { Forecast } from '../../../../model/weather/forecast';
import { ForecastDay } from '../../../../model/weather/forecast-day';
import { Hour } from '../../../../model/weather/hour';
import { MenuService } from '../../../../shared/shared.module';
import { Utils } from '../../../../shared/utils';
import { slideInOutAnimation } from './slide-in-out';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { combineLatest, EMPTY, Observable, Observer, Subscription } from 'rxjs';
import { distinctUntilChanged, filter, map, mergeMap } from 'rxjs/operators';
import { Forecast } from '../../../../model/forecast';
import { Forecast } from '../../../../model/weather/forecast';
import {
AuthService,
MenuService,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../styles/styles';
@import '../../../../styles/styles';

.signin-content {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { AuthService } from '../../../shared/service/auth.service';
import { AuthService } from '../../../../shared/shared.module';

@Component({
selector: 'app-signin',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../styles/styles';
@import '../../../../styles/styles';

.signup-content {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { ToastService, AuthService } from '../../../shared/shared.module';
import { AuthService, ToastService } from '../../../../shared/shared.module';

@Component({
selector: 'app-signup',
Expand Down
9 changes: 4 additions & 5 deletions src/app/application-modules/user/user.module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { MatInputModule } from '@angular/material/input';
import { NgModule } from '@angular/core';
import { MatFormFieldModule } from '@angular/material/form-field';
import { Routes, RouterModule } from '@angular/router';

import { SignupComponent } from './signup/signup.component';
import { SigninComponent } from './signin/signin.component';
import { MatInputModule } from '@angular/material/input';
import { RouterModule, Routes } from '@angular/router';
import { SharedModule } from '../../shared/shared.module';
import { SigninComponent } from './components/signin/signin.component';
import { SignupComponent } from './components/signup/signup.component';

const childRoutes: Routes = [
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import { MatAutocompleteTrigger } from '@angular/material/autocomplete';
import { faLocationArrow, faTimes } from '@fortawesome/free-solid-svg-icons';
import { Observable, Observer } from 'rxjs';
import { Location } from '../../../model/location';
import { Location } from '../../../model/weather/location';
import { WeatherService } from '../../service/weather.service';

@Component({
Expand Down
4 changes: 2 additions & 2 deletions src/app/shared/service/weather.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { HttpClient, HttpParams } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { environment } from '../../../environments/environment';
import { Forecast } from '../../model/forecast';
import { Location } from '../../model/location';
import { Forecast } from '../../model/weather/forecast';
import { Location } from '../../model/weather/location';
import { ToastService } from './toast.service';
import { UtilsService } from './utils.service';

Expand Down

0 comments on commit b31a6cf

Please sign in to comment.