Skip to content
This repository was archived by the owner on Feb 23, 2022. It is now read-only.

Commit 23c7bf7

Browse files
mahrsbarmahrsbar
committed
Cleanup images and components
1 parent 46c84f5 commit 23c7bf7

20 files changed

+114
-3246
lines changed

‎package.json

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"scripts": {
66
"serve": "vue-cli-service serve",
77
"build": "vue-cli-service build",
8-
"lint": "vue-cli-service lint",
98
"start": "npm run serve"
109
},
1110
"dependencies": {
@@ -14,46 +13,36 @@
1413
"axios": "^0.21.1",
1514
"cli-plugin-eslint": "^0.1.0",
1615
"core-js": "^3.6.5",
16+
"eslint-plugin-vue": "^8.4.1",
1717
"register-service-worker": "^1.7.1",
1818
"vue": "^2.6.11",
1919
"vue-router": "^3.2.0",
20-
"vuetify": "^2.4.0",
20+
"vuetify": "^2.6.3",
2121
"vuex": "^3.4.0"
2222
},
2323
"devDependencies": {
24+
"@babel/eslint-parser": "^7.17.0",
2425
"@vue/cli-plugin-babel": "~4.5.0",
25-
"@vue/cli-plugin-eslint": "~4.5.0",
2626
"@vue/cli-plugin-pwa": "~4.5.0",
2727
"@vue/cli-plugin-router": "~4.5.0",
2828
"@vue/cli-plugin-vuex": "~4.5.0",
2929
"@vue/cli-service": "~4.5.0",
3030
"@vue/eslint-config-prettier": "^6.0.0",
3131
"babel-eslint": "^10.1.0",
3232
"eslint": "^6.8.0",
33-
"eslint-plugin-prettier": "^3.1.3",
33+
"eslint-config-prettier": "^8.3.0",
34+
"eslint-plugin-prettier": "^3.4.1",
3435
"eslint-plugin-vue": "^6.2.2",
3536
"less": "^3.0.4",
3637
"less-loader": "^5.0.0",
3738
"prettier": "^1.19.1",
39+
"sass": "^1.32.0",
40+
"sass-loader": "^10.0.0",
3841
"style-resources-loader": "^1.4.1",
3942
"vue-cli-plugin-style-resources-loader": "~0.1.5",
40-
"vue-cli-plugin-vuetify": "~2.1.0",
41-
"vue-template-compiler": "^2.6.11"
42-
},
43-
"eslintConfig": {
44-
"root": true,
45-
"env": {
46-
"node": true
47-
},
48-
"extends": [
49-
"plugin:vue/essential",
50-
"eslint:recommended",
51-
"@vue/prettier"
52-
],
53-
"parserOptions": {
54-
"parser": "babel-eslint"
55-
},
56-
"rules": {}
43+
"vue-eslint-parser": "^8.2.0",
44+
"vue-template-compiler": "^2.6.11",
45+
"vuetify-loader": "^1.7.0"
5746
},
5847
"prettier": {
5948
"tabWidth": 4,

‎public/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
rel="stylesheet"
2020
href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"
2121
/>
22+
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
23+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
2224
</head>
2325
<body>
2426
<noscript>

‎src/assets/amplify.png

-71.6 KB
Binary file not shown.

‎src/assets/breathe_act.svg

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

‎src/assets/education_for_all.svg

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

‎src/assets/images/StepsGraphic.png

38.3 KB
Loading

‎src/assets/reachout.jpeg renamed to ‎src/assets/images/cardimage.jpeg

File renamed without changes.

‎src/assets/jobs_for_all.svg

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

‎src/assets/logo.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/assets/vision_act.svg

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

‎src/components/AppHeader.vue

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<template>
22
<v-toolbar color="theme_darkBlue">
33
<v-app-bar-nav-icon>
4-
<img alt="Vue logo" src="../assets/logo/Amplify-Email.png" height="40" />
4+
<img
5+
alt="Vue logo"
6+
src="../assets/logo/Amplify-Email.png"
7+
height="40"
8+
/>
59
</v-app-bar-nav-icon>
610

7-
<v-toolbar-title class="white--text text-h6"
8-
>AMPLIFY</v-toolbar-title
9-
>
11+
<v-toolbar-title class="white--text text-h6">AMPLIFY</v-toolbar-title>
1012

1113
<v-spacer></v-spacer>
1214

@@ -20,7 +22,6 @@
2022
:to="item.path"
2123
>
2224
{{ item.title }}
23-
2425
</v-btn>
2526
</v-toolbar-items>
2627
</v-toolbar>
@@ -29,15 +30,15 @@
2930
<script>
3031
export default {
3132
name: 'NavBar',
32-
data () {
33+
data() {
3334
return {
3435
dialog: false,
3536
menuItems: [
3637
{ title: 'Home', path: '/' },
3738
{ title: 'About', path: '/about' }
3839
]
39-
}
40+
};
4041
}
41-
}
42+
};
4243
</script>
4344
<style lang="less"></style>

‎src/components/CampaignCards.vue

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
<v-row>
44
<v-col v-for="campaign in campaigns" :key="campaign.id">
55
<v-card class="mx-auto" max-width="344">
6-
<v-img src="../assets/reachout.jpeg" height="200px"></v-img>
6+
<v-img
7+
:src="require('@/assets/images/cardimage.jpeg')"
8+
height="200px"
9+
></v-img>
710

811
<v-card-title v-text="campaign.name"></v-card-title>
912

@@ -34,21 +37,17 @@
3437
</v-card>
3538
</v-col>
3639
</v-row>
37-
<Campaign :test="test"></Campaign>
38-
3940
</v-container>
4041
</template>
4142

4243
<script>
4344
import axios from 'axios';
44-
import Campaign from '@/views/Campaign.vue'
4545
4646
export default {
4747
name: 'CampaignCards',
4848
data() {
4949
return {
50-
campaigns: [],
51-
test:"ABC"
50+
campaigns: []
5251
};
5352
},
5453
async created() {

‎src/components/LetterDisplay.vue

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

‎src/components/LoginButton.vue

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<template>
2-
<button
3-
class="btn btn-primary btn-block"
4-
v-if="!$auth.isAuthenticated"
5-
@click="login"
6-
>
7-
LOG IN TO SEND
8-
</button>
2+
<v-row>
3+
<v-btn color="primary" v-if="!$auth.isAuthenticated" @click="login">
4+
LOG IN TO SEND
5+
</v-btn>
6+
</v-row>
97
</template>
108

119
<script>

‎src/components/SearchReps.vue

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<v-subheader class="pa-0">
88
Where do you live?
99
</v-subheader>
10+
1011
<v-form ref="form">
1112
<v-text-field
1213
label="Postal Code"
@@ -15,6 +16,7 @@
1516
v-model="postalCode"
1617
></v-text-field>
1718
</v-form>
19+
1820
<v-btn
1921
:to="{
2022
name: 'Reps',
@@ -34,7 +36,7 @@
3436
:key="member.name"
3537
>
3638
<representative-card
37-
@handleRepSelected="handleRepSelected"
39+
@handleRepSelected="handleRepSelected"
3840
:member="member"
3941
></representative-card>
4042
<v-divider></v-divider>
@@ -44,44 +46,44 @@
4446
</v-col>
4547
<v-divider vertical></v-divider>
4648
<v-col>
47-
<div v-if="$auth.isAuthenticated">
48-
<take-action :letterBody="letterBody" :selectedRep="selectedRep"
49-
>
50-
</take-action>
49+
<div v-if="!listVisible">
50+
<div>
51+
<img
52+
alt="Vue logo"
53+
src="../assets/images/StepsGraphic.png"
54+
width="70%"
55+
/>
56+
</div>
57+
<p class="text-h6 pa-10">
58+
The bill establishes an interim goal to reduce
59+
greenhouse gas emissions to at least 50% below 2005
60+
levels by 2030 as well as a national goal to achieve
61+
net-zero greenhouse gas emissions by 2050.
62+
</p>
63+
<p></p>
5164
</div>
65+
5266
<div v-else>
53-
<letter-display
54-
v-if="shouldRender"
55-
:is-step1="isStep1"
56-
:is-step2="isStep2"
57-
:is-step3="isStep3"
58-
></letter-display>
59-
<letter-load
60-
v-else
67+
<take-action
6168
:letterBody="letterBody"
6269
:selectedRep="selectedRep"
63-
>
64-
</letter-load>
70+
></take-action>
6571
</div>
6672
</v-col>
6773
</v-row>
6874
</section>
6975
</template>
7076

7177
<script lang="js">
72-
import LetterDisplay from '@/components/LetterDisplay.vue'
7378
import RepresentativeCard from '@/components/RepresentativeCard.vue'
74-
import LetterLoad from '@/components/LetterLoad.vue'
75-
import takeAction from '@/components/takeAction.vue'
79+
import TakeAction from '@/components/TakeAction.vue'
7680
import axios from 'axios'
7781
7882
export default {
7983
name: 'SearchReps',
8084
components: {
81-
LetterDisplay,
8285
RepresentativeCard,
83-
LetterLoad,
84-
takeAction
86+
TakeAction
8587
},
8688
8789
data () {
@@ -91,10 +93,7 @@ export default {
9193
congressMembers: [],
9294
hasContent: true,
9395
postalCode: this.$route.params.postalCode || '',
94-
shouldRender: false,
95-
isStep1: Boolean,
96-
isStep2: Boolean,
97-
isStep3: Boolean
96+
listVisible: false,
9897
}
9998
},
10099
methods: {
@@ -118,9 +117,8 @@ export default {
118117
this.congressMembers = res.data
119118
this.hasContent = true
120119
console.log(res.data)
121-
122-
this.isStep1 = true
123-
} catch (e) {
120+
this.listVisible=true
121+
} catch (e) {
124122
console.error(e)
125123
}
126124
}

0 commit comments

Comments
 (0)