This commit is contained in:
2024-11-29 19:05:15 -06:00
parent d9be33b52b
commit 3e08ffdfd7
10 changed files with 47 additions and 53 deletions
+1 -1
View File
@@ -12,4 +12,4 @@ updates:
- '@angular*' - '@angular*'
update-types: update-types:
- 'minor' - 'minor'
- 'patch' - 'patch'
+1 -1
View File
@@ -15,7 +15,7 @@ jobs:
- name: install dependencies - name: install dependencies
run: npm install run: npm install
- name: build - name: build
run: npm run build run: npm run build
+3 -10
View File
@@ -24,18 +24,11 @@
"base": "dist/itsfiveoclockwhere" "base": "dist/itsfiveoclockwhere"
}, },
"index": "src/index.html", "index": "src/index.html",
"polyfills": [ "polyfills": ["src/polyfills.ts"],
"src/polyfills.ts"
],
"tsConfig": "tsconfig.app.json", "tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss", "inlineStyleLanguage": "scss",
"assets": [ "assets": ["src/favicon.ico", "src/assets"],
"src/favicon.ico", "styles": ["src/styles.scss"],
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": [], "scripts": [],
"browser": "src/main.ts" "browser": "src/main.ts"
}, },
+1 -1
View File
@@ -32,4 +32,4 @@
"prettier": "^3.0.3", "prettier": "^3.0.3",
"typescript": "^5.6.3" "typescript": "^5.6.3"
} }
} }
+4 -4
View File
@@ -6,10 +6,10 @@ import { TimezoneService } from './timezone/services/timezone.service';
declare let gtag: Function; declare let gtag: Function;
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'], styleUrls: ['./app.component.scss'],
standalone: false standalone: false,
}) })
export class AppComponent { export class AppComponent {
fiveOclocks: Timezone[] = []; fiveOclocks: Timezone[] = [];
+3 -5
View File
@@ -3,14 +3,12 @@ import { Injectable } from '@angular/core';
declare let gtag: Function; declare let gtag: Function;
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root',
}) })
export class GoogleAnalyticsService { export class GoogleAnalyticsService {
constructor() {}
constructor() { }
public emitEvent(name: string, event: any) { public emitEvent(name: string, event: any) {
gtag('event', name, event) gtag('event', name, event);
} }
} }
@@ -3,22 +3,28 @@ import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/cor
import { Timezone } from '../../models/timezone.model'; import { Timezone } from '../../models/timezone.model';
@Component({ @Component({
selector: 'app-timezone-list', selector: 'app-timezone-list',
templateUrl: './timezone-list.component.html', templateUrl: './timezone-list.component.html',
styleUrls: ['./timezone-list.component.scss'], styleUrls: ['./timezone-list.component.scss'],
animations: [ animations: [
trigger('displayState', [ trigger('displayState', [
state('show', style({ state(
opacity: 1, 'show',
})), style({
state('hide', style({ opacity: 1,
opacity: 0, })
})), ),
transition('show=>hide', animate('450ms ease-out')), state(
transition('hide=>show', animate('450ms ease-in')), 'hide',
]), style({
], opacity: 0,
standalone: false })
),
transition('show=>hide', animate('450ms ease-out')),
transition('hide=>show', animate('450ms ease-in')),
]),
],
standalone: false,
}) })
export class TimezoneListComponent implements OnInit, OnChanges { export class TimezoneListComponent implements OnInit, OnChanges {
@Input() timezones: Timezone[] = []; @Input() timezones: Timezone[] = [];
+10 -13
View File
@@ -3,39 +3,36 @@ import { DateTime } from 'luxon';
import { Timezone, TimezoneCompare, TimezoneList } from '../models/timezone.model'; import { Timezone, TimezoneCompare, TimezoneList } from '../models/timezone.model';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root',
}) })
export class TimezoneService { export class TimezoneService {
constructor() {}
constructor() { } public getCurrentTimezone(): string | null {
return DateTime.now().zoneName;
public getCurrentTimezone() : string | null {
return DateTime.now().zoneName
} }
public getTimezones(): string[] { public getTimezones(): string[] {
return TimezoneList() return TimezoneList();
} }
public getCurrentTimeForTimezone(timezone: string): DateTime | null { public getCurrentTimeForTimezone(timezone: string): DateTime | null {
var dateTime = DateTime.local().setZone(timezone);
var dateTime = DateTime.local().setZone(timezone)
return dateTime.isValid ? dateTime : null; return dateTime.isValid ? dateTime : null;
} }
public getCurrentTimeInTimezones(timezones: string[]): Timezone[] { public getCurrentTimeInTimezones(timezones: string[]): Timezone[] {
var dates: Timezone[] = []; var dates: Timezone[] = [];
timezones.forEach(element => { timezones.forEach((element) => {
var date = this.getCurrentTimeForTimezone(element); var date = this.getCurrentTimeForTimezone(element);
if (date != null) { if (date != null) {
const timezone = { name: element, time: date } const timezone = { name: element, time: date };
dates.push(timezone) dates.push(timezone);
} }
}); });
return dates.sort(TimezoneCompare); return dates.sort(TimezoneCompare);
} }
} }
+1 -1
View File
@@ -1,3 +1,3 @@
export const environment = { export const environment = {
production: true production: true,
}; };
+1 -1
View File
@@ -3,7 +3,7 @@
// The list of file replacements can be found in `angular.json`. // The list of file replacements can be found in `angular.json`.
export const environment = { export const environment = {
production: false production: false,
}; };
/* /*