Skip to content

Commit d6003c1

Browse files
shawnwildermuthshawnwildermuth
committed
Update labels to clarify for new family plan entries
1 parent 09c1ce2 commit d6003c1

8 files changed

Lines changed: 110 additions & 77 deletions

File tree

‎2wr-app/package-lock.json‎

Lines changed: 22 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎2wr-app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"eslint-plugin-vue": "^6.2.2",
4343
"npm-run-all": "^4.1.5",
4444
"sass": "^1.32.4",
45-
"sass-loader": "^8.0.0",
45+
"sass-loader": "^8.0.2",
4646
"vue-cli-plugin-vuetify": "^2.0.9",
4747
"vue-template-compiler": "^2.6.11",
4848
"vuetify-loader": "^1.3.0"

‎2wr-app/src/assets/app.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.pseudo-text-block-label {
2+
margin-left: .5rem;
3+
position: absolute;
4+
margin-top: -.3rem;
5+
font-size: 12px
6+
}

‎2wr-app/src/assets/logo.png‎

-6.69 KB
Binary file not shown.

‎2wr-app/src/components/common/EditableTextBlock.vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<template>
22
<div>
33
<v-card v-if="!isEditing">
4+
<div class="pseudo-text-block-label">{{ label }}</div>
45
<v-flex class="d-flex justify-space-between px-2 py-2">
56
<v-card-title v-if="isTitle">{{ theText }}</v-card-title>
67
<v-card-text v-if="!isTitle">{{ theText }}</v-card-text>
@@ -87,3 +88,4 @@ export default defineComponent({
8788
},
8889
});
8990
</script>
91+

‎2wr-app/src/components/prepare/family-plans/address-view.vue‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template>
22
<div>
33
<v-card v-if="address">
4+
<div class="pseudo-text-block-label">{{ title }}</div>
45
<v-card-subtitle>
5-
<v-row class="pl-3 justify-space-between">
6-
<strong>{{ title }}</strong>
6+
<v-row class="pl-3 justify-end">
77
<v-icon class="pr-2" @click="dialogOpen = true">mdi-pencil</v-icon>
88
</v-row>
99
</v-card-subtitle>
@@ -17,7 +17,10 @@
1717
<v-card-title>Edit Address</v-card-title>
1818
<v-container>
1919
<v-form ref="theForm">
20-
<AddressEditor v-model="address" ref="addressEditor"></AddressEditor>
20+
<AddressEditor
21+
v-model="address"
22+
ref="addressEditor"
23+
></AddressEditor>
2124
</v-form>
2225
</v-container>
2326
<v-card-actions>
@@ -40,7 +43,7 @@ export default defineComponent({
4043
},
4144
props: {
4245
value: {},
43-
title: {},
46+
title: {}
4447
},
4548
setup(props, { emit, refs }) {
4649
const dialogOpen = ref(false);
@@ -79,8 +82,8 @@ export default defineComponent({
7982
formattedAddress,
8083
dialogOpen,
8184
save,
82-
cancel,
85+
cancel
8386
};
84-
},
87+
}
8588
});
8689
</script>

‎2wr-app/src/main.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import store from './store';
77
import { Auth0Plugin } from "./auth";
88
import VueCompositionAPI from '@vue/composition-api';
99
import globalComponents from "@/components/common/globalComponents";
10+
import './assets/app.scss';
1011

1112
Vue.config.productionTip = false
1213

‎2wr-app/vue.config.js‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
const Dotenv = require('dotenv-webpack');
1+
const Dotenv = require("dotenv-webpack");
22

33
module.exports = {
4-
pwa: {
5-
workboxPluginMode: "InjectManifest",
6-
workboxOptions: {
7-
swSrc: "public/service-worker.js"
8-
},
9-
manifestOptions: {
10-
name: "Two Weeks Ready",
11-
short_name: "Two Weeks Ready",
12-
description: "Support preparedness and alerting related to emergency situations.",
13-
start_url: "/index.html",
14-
background_color: "#F7F1C7",
15-
theme_color: "#D75727",
16-
"icons": [
4+
css: {
5+
sourceMap: true
6+
},
7+
pwa: {
8+
workboxPluginMode: "InjectManifest",
9+
workboxOptions: {
10+
swSrc: "public/service-worker.js"
11+
},
12+
manifestOptions: {
13+
name: "Two Weeks Ready",
14+
short_name: "Two Weeks Ready",
15+
description:
16+
"Support preparedness and alerting related to emergency situations.",
17+
start_url: "/index.html",
18+
background_color: "#F7F1C7",
19+
theme_color: "#D75727",
20+
icons: [
1721
{
18-
"src": "./img/icons/android-chrome-192x192.png",
19-
"sizes": "192x192",
20-
"type": "image/png"
22+
src: "./img/icons/android-chrome-192x192.png",
23+
sizes: "192x192",
24+
type: "image/png"
2125
},
2226
{
23-
"src": "./img/icons/android-chrome-512x512.png",
24-
"sizes": "512x512",
25-
"type": "image/png"
27+
src: "./img/icons/android-chrome-512x512.png",
28+
sizes: "512x512",
29+
type: "image/png"
2630
},
2731
{
28-
"src": "./img/icons/android-chrome-maskable-192x192.png",
29-
"sizes": "192x192",
30-
"type": "image/png",
31-
"purpose": "maskable"
32+
src: "./img/icons/android-chrome-maskable-192x192.png",
33+
sizes: "192x192",
34+
type: "image/png",
35+
purpose: "maskable"
3236
},
3337
{
34-
"src": "./img/icons/android-chrome-maskable-512x512.png",
35-
"sizes": "512x512",
36-
"type": "image/png",
37-
"purpose": "maskable"
38+
src: "./img/icons/android-chrome-maskable-512x512.png",
39+
sizes: "512x512",
40+
type: "image/png",
41+
purpose: "maskable"
3842
},
3943
{
40-
"src": "./img/icons/apple-touch-icon-60x60.png",
41-
"sizes": "60x60",
42-
"type": "image/png"
44+
src: "./img/icons/apple-touch-icon-60x60.png",
45+
sizes: "60x60",
46+
type: "image/png"
4347
},
4448
{
45-
"src": "./img/icons/apple-touch-icon-76x76.png",
46-
"sizes": "76x76",
47-
"type": "image/png"
49+
src: "./img/icons/apple-touch-icon-76x76.png",
50+
sizes: "76x76",
51+
type: "image/png"
4852
},
4953
{
50-
"src": "./img/icons/apple-touch-icon-120x120.png",
51-
"sizes": "120x120",
52-
"type": "image/png"
54+
src: "./img/icons/apple-touch-icon-120x120.png",
55+
sizes: "120x120",
56+
type: "image/png"
5357
},
5458
{
55-
"src": "./img/icons/apple-touch-icon-152x152.png",
56-
"sizes": "152x152",
57-
"type": "image/png"
59+
src: "./img/icons/apple-touch-icon-152x152.png",
60+
sizes: "152x152",
61+
type: "image/png"
5862
},
5963
{
60-
"src": "./img/icons/apple-touch-icon-180x180.png",
61-
"sizes": "180x180",
62-
"type": "image/png"
64+
src: "./img/icons/apple-touch-icon-180x180.png",
65+
sizes: "180x180",
66+
type: "image/png"
6367
},
6468
{
65-
"src": "./img/icons/apple-touch-icon.png",
66-
"sizes": "180x180",
67-
"type": "image/png"
69+
src: "./img/icons/apple-touch-icon.png",
70+
sizes: "180x180",
71+
type: "image/png"
6872
},
6973
{
70-
"src": "./img/icons/favicon-16x16.png",
71-
"sizes": "16x16",
72-
"type": "image/png"
74+
src: "./img/icons/favicon-16x16.png",
75+
sizes: "16x16",
76+
type: "image/png"
7377
},
7478
{
75-
"src": "./img/icons/favicon-32x32.png",
76-
"sizes": "32x32",
77-
"type": "image/png"
79+
src: "./img/icons/favicon-32x32.png",
80+
sizes: "32x32",
81+
type: "image/png"
7882
},
7983
{
80-
"src": "./img/icons/msapplication-icon-144x144.png",
81-
"sizes": "144x144",
82-
"type": "image/png"
84+
src: "./img/icons/msapplication-icon-144x144.png",
85+
sizes: "144x144",
86+
type: "image/png"
8387
},
8488
{
85-
"src": "./img/icons/mstile-150x150.png",
86-
"sizes": "150x150",
87-
"type": "image/png"
89+
src: "./img/icons/mstile-150x150.png",
90+
sizes: "150x150",
91+
type: "image/png"
8892
}
89-
],
90-
}
91-
},
92-
configureWebpack: {
93-
plugins: [
94-
new Dotenv()
95-
]
93+
]
94+
}
95+
},
96+
configureWebpack: {
97+
plugins: [new Dotenv()]
9698
},
97-
"transpileDependencies": [
98-
"vuetify"
99-
]
100-
}
99+
transpileDependencies: ["vuetify"]
100+
};

0 commit comments

Comments
 (0)