Skip to content

Commit

Permalink
Revert "Merge pull request #65 from CityOfPhiladelphia/main"
Browse files Browse the repository at this point in the history
This reverts commit 9786aee, reversing
changes made to f3bd5aa.
  • Loading branch information
ajrothwell committed Jan 23, 2025
1 parent 9786aee commit 29d2f9e
Show file tree
Hide file tree
Showing 39 changed files with 18,233 additions and 6,846 deletions.
3 changes: 1 addition & 2 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
VITE_PUBLICPATH=/dev/ballot-drop-off/
VITE_DEBUG=false
VUE_APP_PUBLICPATH=/dev/ballot-drop-off/
1 change: 1 addition & 0 deletions .env.development2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VUE_APP_PUBLICPATH=/ballot-drop-off/
1 change: 1 addition & 0 deletions .env.development3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VUE_APP_PUBLICPATH=/ballot-drop-off/
3 changes: 1 addition & 2 deletions .env.production
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
VITE_PUBLICPATH=/ballot-drop-off/
VITE_DEBUG=false
VUE_APP_PUBLICPATH=/ballot-drop-off/
2 changes: 0 additions & 2 deletions .env.testing

This file was deleted.

43 changes: 43 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
module.exports = {
root: true,
env: {
node: true,
},
"extends": [
"eslint:recommended",
"plugin:vue/essential",
"plugin:vue/recommended",
],
rules: {
// Disabled only on development
"no-console": process.env.NODE_ENV === "production" ? "error" : "off",
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
"no-unused-vars": process.env.NODE_ENV === "production" ? "error" : "off",

// Eslint Rules
"brace-style": "error",
"nonblock-statement-body-position": [ "error", "below" ],
"curly": [ "error", "all" ],
"indent": [ "error", 2 ],
"no-else-return": "error",
"object-curly-spacing": [ "error", "always", {
arraysInObjects: false,
objectsInObjects: false,
}],
"array-bracket-spacing": [ "error", "always", {
objectsInArrays: false,
arraysInArrays: false,
}],
"comma-dangle": [ "error", "always-multiline" ],
"semi": [ "error", "always" ],

// Vue Rules
"vue/no-v-html": "off",
"vue/order-in-components": "error",
"vue/attributes-order": "error",
"vue/no-unused-components": "off",
},
parserOptions: {
parser: "babel-eslint",
},
};
40 changes: 40 additions & 0 deletions .github/workflows/dev2_push_to_s3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: dev2 Push to S3

on:
push:
branches:
- dev2

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Use Node.js 10.x
uses: actions/setup-node@v1
with:
node-version: '10.x'

- name: npm install, and build
run: |
printf "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}" >> ~/.npmrc
npm install
npm run build:development2
env:
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FA_AUTH_TOKEN }}
VUE_APP_GATEKEEPER_KEY: ${{ secrets.VUE_APP_GATEKEEPER_KEY }}

- name: Deploy to Prod s3, Set index headers, and Invalidate Cloudfront
env:
AWS_DEFAULT_REGION: 'us-east-1'
AWS_S3_BUCKET: prod-philavotes/ballot-drop-off
AWS_ACCESS_KEY_ID: ${{ secrets.PHILAVOTES_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.PHILAVOTES_AWS_SECRET_ACCESS_KEY }}
run: |
aws s3 sync dist s3://$AWS_S3_BUCKET --region us-east-1 --delete
aws s3 cp s3://$AWS_S3_BUCKET s3://$AWS_S3_BUCKET --recursive --exclude "*" --include "*.html" --metadata-directive REPLACE --acl public-read --cache-control max-age=0,no-cache,no-store,must-revalidate,proxy-revalidate,public --expires "0" --content-type "text/html; charset=utf-8"
40 changes: 40 additions & 0 deletions .github/workflows/dev3_push_to_s3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: dev3 Push to S3

on:
push:
branches:
- dev3

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Use Node.js 10.x
uses: actions/setup-node@v1
with:
node-version: '10.x'

- name: npm install, and build
run: |
printf "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}" >> ~/.npmrc
npm install
npm run build:development3
env:
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FA_AUTH_TOKEN }}
VUE_APP_GATEKEEPER_KEY: ${{ secrets.VUE_APP_GATEKEEPER_KEY }}

- name: Deploy to Staging s3, Set index headers, and Invalidate Cloudfront
env:
AWS_DEFAULT_REGION: 'us-east-1'
AWS_S3_BUCKET: prod-philavotes-private/ballot-drop-off
AWS_ACCESS_KEY_ID: ${{ secrets.PHILAVOTES_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.PHILAVOTES_AWS_SECRET_ACCESS_KEY }}
run: |
aws s3 sync dist s3://$AWS_S3_BUCKET --region us-east-1 --delete
aws s3 cp s3://$AWS_S3_BUCKET s3://$AWS_S3_BUCKET --recursive --exclude "*" --include "*.html" --metadata-directive REPLACE --acl public-read --cache-control max-age=0,no-cache,no-store,must-revalidate,proxy-revalidate,public --expires "0" --content-type "text/html; charset=utf-8"
56 changes: 0 additions & 56 deletions .github/workflows/dev_cache_and_push_to_s3.yml

This file was deleted.

46 changes: 46 additions & 0 deletions .github/workflows/dev_push_to_s3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: dev Push to S3

on:
push:
branches:
- dev/gray-out-sites_x

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Use Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: '16.x'
cache: 'npm'

- name: install npm 6
run: |
npm install -g npm@6
- name: npm install, and build
run: |
printf "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}" >> ~/.npmrc
git config --global url."https://".insteadOf ssh://
npm ci
npm run build:development
env:
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FA_AUTH_TOKEN }}
VUE_APP_GATEKEEPER_KEY: ${{ secrets.VUE_APP_GATEKEEPER_KEY }}

- name: Deploy to Dev s3
run: |
aws s3 sync dist s3://$AWS_S3_BUCKET --region us-east-1 --delete
env:
AWS_DEFAULT_REGION: 'us-east-1'
AWS_S3_BUCKET: phila-resource-finder-v2/dev/ballot-drop-off/
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
55 changes: 0 additions & 55 deletions .github/workflows/prod_cache_and_push_to_s3.yml

This file was deleted.

47 changes: 47 additions & 0 deletions .github/workflows/prod_push_to_s3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: prod Push to S3

on:
push:
branches:
- production

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Use Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: '16.x'
cache: 'npm'

- name: install npm 6
run: |
npm install -g npm@6
- name: npm install, and build
run: |
printf "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}" >> ~/.npmrc
git config --global url."https://".insteadOf ssh://
npm ci
npm run build:production
env:
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FA_AUTH_TOKEN }}
VUE_APP_GATEKEEPER_KEY: ${{ secrets.VUE_APP_GATEKEEPER_KEY }}

- name: Deploy to Prod s3, Set index headers
env:
AWS_DEFAULT_REGION: 'us-east-1'
AWS_S3_BUCKET: prod-philavotes/ballot-drop-off
AWS_ACCESS_KEY_ID: ${{ secrets.PHILAVOTES_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.PHILAVOTES_AWS_SECRET_ACCESS_KEY }}
run: |
aws s3 sync dist s3://$AWS_S3_BUCKET --region us-east-1 --delete
aws s3 cp s3://$AWS_S3_BUCKET s3://$AWS_S3_BUCKET --recursive --exclude "*" --include "*.html" --metadata-directive REPLACE --acl public-read --cache-control max-age=0,no-cache,no-store,must-revalidate,proxy-revalidate,public --expires "0" --content-type "text/html; charset=utf-8"
Loading

0 comments on commit 29d2f9e

Please sign in to comment.