Skip to content

Commit dbe6ba9

Browse files
authored
Merge pull request #135 from CityOfPhiladelphia/fix/refactors-round-3
Fix/refactors round 3
2 parents 16eb2c4 + 0a5ec9c commit dbe6ba9

21 files changed

Lines changed: 442 additions & 774 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424

2525
- name: Install dependencies
2626
run: pnpm install --frozen-lockfile
27-
env:
28-
NPM_FONTAWESOME_SECRET: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
2927

3028
- name: Lint
3129
run: pnpm turbo lint
@@ -98,8 +96,6 @@ jobs:
9896

9997
- name: Install dependencies
10098
run: pnpm install --frozen-lockfile
101-
env:
102-
NPM_FONTAWESOME_SECRET: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
10399

104100
- name: Install city CLI
105101
run: npm install -g @phila/cli
@@ -144,8 +140,6 @@ jobs:
144140

145141
- name: Install dependencies
146142
run: pnpm install --frozen-lockfile
147-
env:
148-
NPM_FONTAWESOME_SECRET: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
149143

150144
- name: Install city CLI
151145
run: npm install -g @phila/cli
@@ -224,8 +218,6 @@ jobs:
224218

225219
- name: Install dependencies
226220
run: pnpm install --frozen-lockfile
227-
env:
228-
NPM_FONTAWESOME_SECRET: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
229221

230222
- name: Install city CLI
231223
run: npm install -g @phila/cli
@@ -270,8 +262,6 @@ jobs:
270262

271263
- name: Install dependencies
272264
run: pnpm install --frozen-lockfile
273-
env:
274-
NPM_FONTAWESOME_SECRET: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
275265

276266
- name: Install city CLI
277267
run: npm install -g @phila/cli

.npmrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
@fortawesome:registry=https://npm.fontawesome.com/
2-
//npm.fontawesome.com/:_authToken=${NPM_FONTAWESOME_SECRET}

README.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@ You also need to rebuild `packages/ui` whenever you change its source code:
5050
cd packages/ui && pnpm build
5151
```
5252

53-
### FontAwesome Pro
54-
55-
Some dependencies require FontAwesome Pro icons. You need a `.npmrc` file (at the repo root or in your home directory) with your FA Pro auth token:
56-
57-
```
58-
@fortawesome:registry=https://npm.fontawesome.com/
59-
//npm.fontawesome.com/:_authToken=YOUR_TOKEN_HERE
60-
```
61-
6253
Do not commit this file — it is gitignored.
6354

6455
## Branch strategy

apps/oem-flood-finder/frontend/src/components/LocationDetail.vue

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ const lastUpdatedDate = computed(() => {
137137
flex-shrink: 0;
138138
}
139139
140-
.detail-header h2,
141140
.detail-header h4 {
142141
margin: 0;
143142
flex: 1;
@@ -159,30 +158,4 @@ const lastUpdatedDate = computed(() => {
159158
flex-direction: column;
160159
gap: 0.5rem;
161160
}
162-
163-
table {
164-
width: 100%;
165-
border-collapse: collapse;
166-
margin: 1rem 0;
167-
}
168-
169-
th,
170-
td {
171-
border: 1px solid #ddd;
172-
padding: 0.75rem;
173-
text-align: left;
174-
}
175-
176-
th {
177-
background-color: #f5f5f5;
178-
font-weight: 600;
179-
}
180-
181-
tr:nth-child(even) {
182-
background-color: #f9f9f9;
183-
}
184-
185-
tr:hover {
186-
background-color: #f0f0f0;
187-
}
188161
</style>

apps/oem-flood-finder/frontend/src/views/FinderView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const {
6666
const locationSortMode = ref<PinboardTypes.SortMode>(
6767
['located', 'watching'].includes(userLocationState.value) ? 'DistAsc' : '',
6868
)
69-
const isMobile = inject(IS_MOBILE_KEY, ref(false))
69+
const isMobile = inject(IS_MOBILE_KEY, ref(true))
7070
7171
// computed refs
7272
const currentLocations = computed(() => {

apps/oem-flood-finder/frontend/src/views/ResourcesView.vue

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { IconChevronLeft } from '@phila/phila-ui-core/icons'
66
import { IS_MOBILE_KEY } from '@pinboard/ui'
77
import { inject, ref } from 'vue'
88
9-
const isMobile = inject(IS_MOBILE_KEY, ref(false))
9+
const isMobile = inject(IS_MOBILE_KEY, ref(true))
1010
const router = useRouter()
1111
</script>
1212

@@ -144,7 +144,7 @@ const router = useRouter()
144144
</div>
145145
</template>
146146

147-
<style>
147+
<style scoped>
148148
.layout {
149149
display: flex;
150150
justify-content: center;
@@ -167,10 +167,6 @@ const router = useRouter()
167167
align-items: center;
168168
}
169169
170-
.content-area.mobile {
171-
padding: 1.5rem 1rem 0 1rem;
172-
}
173-
174170
.section {
175171
display: flex;
176172
width: 100%;
@@ -181,11 +177,6 @@ const router = useRouter()
181177
gap: var(--spacing-4xl, 4rem);
182178
}
183179
184-
.section.mobile {
185-
gap: var(--spacing-2xl, 2rem);
186-
padding-bottom: var(--spacing-2xl, 2rem);
187-
}
188-
189180
.intro-text-container {
190181
display: flex;
191182
flex-direction: column;

apps/primary-care-finder/frontend/src/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const feedbackHref =
1010
<template>
1111
<PinboardShell
1212
:title="t('app.name')"
13-
info-title="About this tool"
13+
:info-title="t('app.aboutTitle')"
1414
:info-label="t('app.aboutTitle')"
1515
:info-message="t('callout.message')"
1616
:info-link-text="t('callout.linkText')"

apps/primary-care-finder/frontend/src/views/FinderView.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ const defaultFilterState: PrimaryCareFilters = {
7373
},
7474
}
7575
76-
const isMobile = inject(IS_MOBILE_KEY, ref(false))
76+
const isMobile = inject(IS_MOBILE_KEY, ref(true))
7777
const { t } = useI18n()
7878
const { locations, languages, isLoading, errorMessage, geojson } = useLocations()
7979
const { filterChipDefinitions } = useFilterChipDefinitions(languages)
@@ -316,6 +316,7 @@ function getMapCardProps(location: PrimaryCareLocation): MapCardProps {
316316
}
317317
318318
.locations-callout :deep(.callout-title) {
319+
font-family: var(--Body-Default-font-body-default-family);
319320
font-size: var(--scale-200);
320321
text-align: left;
321322
}

apps/primary-care-finder/frontend/src/views/InfoView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n'
44
import { IS_MOBILE_KEY, PinboardInfoPage } from '@pinboard/ui'
55
66
const { t } = useI18n()
7-
const isMobile = inject(IS_MOBILE_KEY, ref(false))
7+
const isMobile = inject(IS_MOBILE_KEY, ref(true))
88
99
const sections = computed(() => [
1010
{ id: 'insurance', title: t('introPage.section2Title') },

package.json

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,43 +27,13 @@
2727
"eslint-plugin-vue": "catalog:",
2828
"globals": "catalog:",
2929
"prettier": "catalog:",
30-
"turbo": "^2.10.6",
30+
"turbo": "^2.10.7",
3131
"typescript": "catalog:",
3232
"vue-tsc": "catalog:"
3333
},
3434
"pnpm": {
3535
"overrides": {
36-
"minimatch@<3.1.3": ">=3.1.3",
37-
"minimatch@>=9.0.0 <9.0.6": ">=9.0.6",
38-
"minimatch@>=10.0.0 <10.2.1": ">=10.2.1",
39-
"rollup@>=4.0.0 <4.59.0": ">=4.59.0",
40-
"minimatch@>=9.0.0 <9.0.7": ">=9.0.7",
41-
"minimatch@>=10.0.0 <10.2.3": ">=10.2.3",
42-
"minimatch@<3.1.4": ">=3.1.4",
43-
"ajv@>=7.0.0-alpha.0 <8.18.0": ">=8.18.0",
44-
"flatted@<3.4.0": ">=3.4.0",
45-
"flatted@<=3.4.1": ">=3.4.2",
46-
"brace-expansion@<1.1.13": ">=1.1.13",
47-
"brace-expansion@>=2.0.0 <2.0.3": ">=2.0.3",
48-
"picomatch@<2.3.2": ">=2.3.2",
49-
"picomatch@>=4.0.0 <4.0.4": ">=4.0.4",
50-
"yaml@>=2.0.0 <2.8.3": ">=2.8.3",
51-
"lodash@>=4.0.0 <=4.17.23": ">=4.18.0",
52-
"lodash@<=4.17.23": ">=4.18.0",
53-
"vite@<=6.4.1": ">=6.4.2 <8",
54-
"vite@>=7.0.0 <=7.3.1": ">=7.3.2",
55-
"vite@>=7.1.0 <=7.3.1": ">=7.3.2",
56-
"vite@>=6.0.0 <=6.4.1": ">=6.4.2",
57-
"vue-router": "5.0.6",
58-
"protocol-buffers-schema@<3.6.1": ">=3.6.1",
59-
"postcss@<8.5.10": ">=8.5.10",
60-
"fast-uri@<=3.1.0": ">=3.1.1",
61-
"fast-uri@<=3.1.1": ">=3.1.2",
62-
"brace-expansion@>=5.0.0 <5.0.6": ">=5.0.6",
63-
"turbo@<=2.9.13": ">=2.9.14",
64-
"turbo@>=1.1.0 <2.9.14": ">=2.9.14",
65-
"shell-quote@>=1.1.0 <=1.8.3": ">=1.8.4",
66-
"@babel/core@<=7.29.0": ">=7.29.6"
36+
"vue-router": "5.0.6"
6737
}
6838
}
6939
}

0 commit comments

Comments
 (0)