Skip to content

Commit 1a43e4b

Browse files
committed
progress towards more extensible codebase, add spring theme
1 parent 2a829de commit 1a43e4b

33 files changed

Lines changed: 286 additions & 3064 deletions

app/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import '@warp-drive/ember/install';
22
import Application from 'ember-strict-application-resolver';
33
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
44
// import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
5-
import { initializeTheme } from './core/site-theme';
5+
import { initializeTheme } from '@trail-run/core/device/site-theme';
66
import Router from './router';
77
import PageTitleService from 'ember-page-title/services/page-title';
88

app/components/layout/themed-page.gts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import {
1414
import { faGithub } from '@fortawesome/free-brands-svg-icons';
1515
import { on } from '@ember/modifier';
1616
import { scopedClass } from 'ember-scoped-css';
17-
import { getTheme } from '#app/core/site-theme.ts';
1817
import { fn } from '@ember/helper';
1918
import Component from '@glimmer/component';
2019
import { getDevicePreferences } from '#app/core/preferences.ts';
2120
import { service } from '@ember/service';
2221
import type RouterService from '@ember/routing/router-service';
22+
import { getTheme } from '@trail-run/core/device/site-theme';
2323

2424
function createScrollElement(): HTMLDivElement {
2525
const div = document.createElement('div');
@@ -28,6 +28,10 @@ function createScrollElement(): HTMLDivElement {
2828
}
2929

3030
class ThemedPage extends Component<{
31+
Element: HTMLDivElement;
32+
Args: {
33+
hideFoothills?: boolean;
34+
};
3135
Blocks: {
3236
header: [];
3337
default: [HTMLDivElement];
@@ -113,6 +117,7 @@ class ThemedPage extends Component<{
113117
</div>
114118
{{/in-element}}
115119

120+
{{#unless @hideFoothills}}
116121
<svg
117122
class="hill-svg back-hill"
118123
viewBox="0 0 1440 320"
@@ -144,6 +149,7 @@ class ThemedPage extends Component<{
144149
<div class="tree tree-right-3"></div>
145150
<div class="tree tree-right-4"></div>
146151
</div>
152+
{{/unless}}
147153
</div>
148154
</section>
149155
</template>

app/components/maps/-utils/map-state.ts

Lines changed: 0 additions & 67 deletions
This file was deleted.

app/components/maps/map-download-button.gts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import type MapTileCacheService from '#app/services/map-tile-cache.ts';
66
import DownloadButton from '#ui/download-button.gts';
77
import FaIcon from '#ui/fa-icon.gts';
88
import { faMap, faDownload, faCropSimple } from '@fortawesome/free-solid-svg-icons';
9-
import type { DownloadStatusType } from '#app/core/preferences.ts';
109
import { getDevicePreferences } from '#app/core/preferences.ts';
1110
import type { Map as MapLibreMap } from 'maplibre-gl';
1211
import type { PolygonPoint } from '#app/utils/tile-preloader.ts';
1312
import './map-download-button.css';
13+
import type { DownloadStatusType } from '@trail-run/core/device/preferences';
1414

1515
interface MapDownloadButtonSignature {
1616
Element: HTMLElement;

app/components/maps/maplibre-fullscreen-map.gts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { getDevicePreferences } from '#app/core/preferences.ts';
1616
import type { Map } from 'maplibre-gl';
1717
import type { StyleSpecification } from 'maplibre-gl';
1818
import type { PolygonPoint } from '#app/utils/tile-preloader.ts';
19-
import type { MapState } from './-utils/map-state';
19+
import type { MapState } from '@trail-run/core/maps/-utils/map-state';
2020

2121
interface MapLibreFullscreenMapSignature {
2222
Args: {

app/components/ui/download-button.gts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { IconDefinition } from '@fortawesome/fontawesome-svg-core';
66
import { eq, not } from '#app/utils/comparison.ts';
77
import { scopedClass } from 'ember-scoped-css';
88
import './download-button.css';
9-
import type { DownloadStatusType } from '#app/core/preferences.ts';
9+
import type { DownloadStatusType } from '@trail-run/core/device/preferences';
1010

1111
interface DownloadButtonSignature {
1212
Args: {

app/controllers/-qp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { QPController as default } from '../core/reactive/query-params/controller';
1+
export { QPController as default } from '@trail-run/core/reactive/query-param-route';

app/core/device.ts

Lines changed: 0 additions & 244 deletions
This file was deleted.

0 commit comments

Comments
 (0)