Skip to content

Commit

Permalink
Feat: Cal-ITP redesign (#120)
Browse files Browse the repository at this point in the history
  • Loading branch information
thekaveman authored Aug 4, 2023
2 parents 976c7c6 + bc70133 commit bed2f59
Show file tree
Hide file tree
Showing 87 changed files with 1,674 additions and 1,255 deletions.
3 changes: 0 additions & 3 deletions .devcontainer/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@ services:
context: ..
dockerfile: .devcontainer/Dockerfile
command: sleep infinity
ports:
- "4000"
- "35729:35729"
volumes:
- ..:/usr/src/calitp
34 changes: 19 additions & 15 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,24 @@
"service": "site",
"workspaceFolder": "/usr/src/calitp",
"postAttachCommand": ["/bin/bash", ".devcontainer/postAttach.sh"],
"settings": {
"terminal.integrated.defaultProfile.linux": "bash",
"terminal.integrated.profiles.linux": {
"bash": {
"path": "/bin/bash"
}
"customizations": {
"vscode": {
"settings": {
"terminal.integrated.defaultProfile.linux": "bash",
"terminal.integrated.profiles.linux": {
"bash": {
"path": "/bin/bash"
}
}
},
"extensions": [
"bungcip.better-toml",
"eamodio.gitlens",
"esbenp.prettier-vscode",
"mhutchie.git-graph",
"redhat.vscode-xml",
"sissel.shopify-liquid"
]
}
},
"extensions": [
"bungcip.better-toml",
"eamodio.gitlens",
"esbenp.prettier-vscode",
"mhutchie.git-graph",
"redhat.vscode-xml",
"sissel.shopify-liquid"
]
}
}
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# default to web-admin team
* @cal-itp/web-admin
27 changes: 27 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "bundler" # See documentation for possible values
directory: "/" # Location of Gemfile
schedule:
interval: "daily"
commit-message:
prefix: "chore"
include: "scope"
labels:
- "dependencies"
- package-ecosystem: "github-actions"
# Workflow files stored in the
# default location of `.github/workflows`
directory: "/"
schedule:
interval: "daily"
commit-message:
prefix: "chore"
include: "scope"
labels:
- "dependencies"
10 changes: 5 additions & 5 deletions .github/workflows/dependabot-differ.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
if: contains(github.event.pull_request.labels.*.name, 'dependencies') # See https://git.io/JsVv1
steps:
- name: Checkout Pull Request Branch
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
submodules: true

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 3.1
bundler-cache: true

- name: Build Pull Request Version of Website
Expand All @@ -31,9 +31,9 @@ jobs:
mv _site _site-pr
- name: Checkout Default Branch
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: core
ref: staging
clean: false
submodules: true

Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
echo "::set-output name=pr-comment::$PR_COMMENT"
- name: Comment on the Pull Request
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v3
with:
issue-number: ${{ github.event.pull_request.number }}
body: ${{ steps.site-diff.outputs.pr-comment }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.bundle
.netlify
_site
.DS_Store
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ default_stages:

repos:
- repo: https://github.com/compilerla/conventional-pre-commit
rev: v2.2.0
rev: v2.3.0
hooks:
- id: conventional-pre-commit
stages: [commit-msg]
Expand Down
11 changes: 3 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"[javascript]": {
"editor.tabSize": 2
},
"[json]": {
"editor.tabSize": 2
},
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.tabSize": 2,
"files.associations": {
"*.html": "liquid"
}
}
133 changes: 0 additions & 133 deletions CONDUCT.md

This file was deleted.

9 changes: 4 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
source "https://rubygems.org"

gem "jekyll", "~> 4.2.0"
gem "rubyzip", "~> 2.3"
gem "webrick", "~> 1.7"
source "https://rubygems.org"

gem "jekyll", "~> 4.3.2"
gem "rubyzip", "~> 2.3"
Loading

0 comments on commit bed2f59

Please sign in to comment.