Skip to content

Commit bb5852e

Browse files
adriandarianadriandarian
authored
Merge pull request #45 from UCMercedACM/develop
v1.0.2
2 parents 43a242f + 9cc1933 commit bb5852e

15 files changed

Lines changed: 1776 additions & 108 deletions

File tree

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name: Bug report
33
about: Create a report to help us improve
44
title: bug/
5-
labels: bug, help wanted
6-
assignees: adriandarian
5+
labels: bug
6+
assignees: [adriandarian, rperrine]
77

88
---
99

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: feat/
4+
title: feature/
55
labels: enhancement
6-
assignees: adriandarian
6+
assignees: [adriandarian, rperrine]
77

88
---
99

10-
**Is your feature request related to a problem? Please describe.**
11-
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
10+
# Feature Request
1211

13-
**Describe the solution you'd like**
14-
<!-- A clear and concise description of what you want to happen. -->
12+
---
13+
14+
## Please describe what aspect of the project are you addressing
15+
16+
## Describe the requirements of the solution
1517

16-
**Describe alternatives you've considered**
17-
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
18+
## Describe how the new feature will flow with the current site
1819

19-
**Additional context**
20+
## Additional context
2021
<!-- Add any other context or screenshots about the feature request here. -->

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
pull_request:
55
branches:
66
- develop
7-
- master
87

98
jobs:
109
build:

‎.github/workflows/greetings.yml‎

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

‎.github/workflows/release.yml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: Deploy and Update Release Notes
2+
3+
on:
4+
push:
5+
branches:
6+
- master # Successful Merge on master branch
7+
8+
jobs:
9+
deploy:
10+
name: Deploy Angular Application
11+
runs-on: ${{ matrix.os }}
12+
13+
strategy:
14+
matrix:
15+
node-version: [12.x]
16+
os: [ubuntu-latest]
17+
18+
steps:
19+
- name: Checkout to current branch
20+
uses: actions/checkout@v2
21+
with:
22+
persist-credentials: false
23+
24+
- name: Configure Node.js ${{ matrix.node-version }}
25+
uses: actions/setup-node@v1
26+
with:
27+
node-version: ${{ matrix.node-version }}
28+
29+
- name: Install Dependencies
30+
run: |
31+
echo 'Running Setup...'
32+
yarn install
33+
npm install -g @angular/cli
34+
35+
- name: Building Production Environment
36+
run: |
37+
echo 'Building and Compiling...'
38+
rm -rf dist
39+
yarn build
40+
echo ${{ secrets. ACCESS_TOKEN }}
41+
42+
- name: Angular Deploy gh-pages Actions
43+
uses: JamesIves/github-pages-deploy-action@releases/v3
44+
with:
45+
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} # see the Configuration section for how you can create secrets
46+
COMMIT_MESSAGE: Release ${{ github.event.pull_request.head.ref }}
47+
BRANCH: gh-pages # The branch the action should deploy to.
48+
BASE_BRANCH: master
49+
FOLDER: dist
50+
51+
- name: Tag Deployment
52+
run: |
53+
echo 'Tagging Deployment...'
54+
git tag -l ${{ github.event.pull_request.head.ref }}
55+
56+
release:
57+
name: Update Release notes and Changelog
58+
runs-on: ${{ matrix.os }}
59+
needs: deploy
60+
61+
strategy:
62+
matrix:
63+
node-version: [12.x]
64+
os: [ubuntu-latest]
65+
66+
steps:
67+
- name: Checkout to current branch
68+
uses: actions/checkout@v2
69+
with:
70+
persist-credentials: false
71+
72+
- name: Configure Node.js ${{ matrix.node-version }}
73+
uses: actions/setup-node@v1
74+
with:
75+
node-version: ${{ matrix.node-version }}
76+
77+
- name: Install Dependencies
78+
run: |
79+
echo 'Running Setup...'
80+
yarn install
81+
82+
- name: Update Release notes
83+
run: |
84+
echo 'Update Release Notes...'
85+
npm run gren:release -- --token=${{ secrets.GREN_GITHUB_TOKEN }}
86+
87+
- name: Update Release notes
88+
run: |
89+
echo 'Update Changelog...'
90+
npm run gren:release -- --token=${{ secrets.GREN_GITHUB_TOKEN }}

‎.grenrc.js‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
module.exports = {
2+
dataSource: "prs",
3+
prefix: "Release ",
4+
ignoreLabels: [
5+
"actions",
6+
"angular",
7+
"dependencies",
8+
"documentation",
9+
"duplicate",
10+
"help wanted",
11+
"invalid",
12+
"question",
13+
"test",
14+
"wontfix",
15+
"workflows"
16+
],
17+
template: {
18+
commit: ({ message, url, author, name }) =>
19+
`- [${message}](${url}) - ${author ? `@${author}` : name}`,
20+
issue: "- {{labels}} {{name}} [{{text}}]({{url}})",
21+
label: "[**{{label}}**]",
22+
noLabel: "closed",
23+
group: "\n#### {{heading}}\n",
24+
changelogTitle: "# Changelog\n\n",
25+
release: function(placeholders, body) {
26+
var fDate = new Date(placeholders.date);
27+
return `## ${placeholders.release} ${fDate}\n${placeholders.body}`;
28+
},
29+
releaseSeparator: "\n---\n\n"
30+
},
31+
onlyMilestones: false,
32+
groupBy: {
33+
"Features:": ["enhancement"],
34+
"Bug Fixes:": ["bug"]
35+
},
36+
changelogFilename: "CHANGELOG.md"
37+
};

‎CHANGELOG.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Changelog
2+
3+
## Release v0.1.0 Tue Feb 04 2020 00:00:00 GMT-0800 (Pacific Standard Time)
4+
5+
#### Features:
6+
7+
- [**enhancement**] Features/workshops [#33](https://github.com/UCMercedACM/Chapter-Website/pull/33)
8+
- [**enhancement**] Projects Page implemented [#31](https://github.com/UCMercedACM/Chapter-Website/pull/31)
9+
- [**enhancement**] v1.0 Release [#43](https://github.com/UCMercedACM/Chapter-Website/pull/43)
10+
- [**enhancement**] Login Authentication [#42](https://github.com/UCMercedACM/Chapter-Website/pull/42)
11+
- [**enhancement**] v0.5.0 Release [#34](https://github.com/UCMercedACM/Chapter-Website/pull/34)
12+
- [**enhancement**] Events Page [#41](https://github.com/UCMercedACM/Chapter-Website/pull/41)
13+
- [**enhancement**] Terminal Component [#39](https://github.com/UCMercedACM/Chapter-Website/pull/39)
14+
- [**enhancement**] Initial Coffee and Code Page [#37](https://github.com/UCMercedACM/Chapter-Website/pull/37)
15+
- [**enhancement**] Login Page [#36](https://github.com/UCMercedACM/Chapter-Website/pull/36)
16+
- [**enhancement**] Footer complete [#35](https://github.com/UCMercedACM/Chapter-Website/pull/35)
17+
- [**enhancement**] Added Dockerfile and updated the development environment [#32](https://github.com/UCMercedACM/Chapter-Website/pull/32)
18+
- [**enhancement**] Working Tailwindcss [#29](https://github.com/UCMercedACM/Chapter-Website/pull/29)
19+
- [**enhancement**] CI Automation update [#27](https://github.com/UCMercedACM/Chapter-Website/pull/27)
20+
- [**enhancement**] Develop [#25](https://github.com/UCMercedACM/Chapter-Website/pull/25)
21+
- [**enhancement**] Separated Header and Footer into their own folders+jsx files [#15](https://github.com/UCMercedACM/Chapter-Website/pull/15)
22+
- [**enhancement**] Feat/components [#12](https://github.com/UCMercedACM/Chapter-Website/pull/12)
23+
24+
#### Bug Fixes:
25+
26+
- [**bug**] Got members to load into the console in a component [#26](https://github.com/UCMercedACM/Chapter-Website/pull/26)
27+
- [**bug**] Merge pull request #24 from UCMercedACM/develop [#24](https://github.com/UCMercedACM/Chapter-Website/pull/24)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Association for Computing Machinery's UC Merced Chapter
22

3-
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors)
3+
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors) [![Automated Release Notes by gren](https://img.shields.io/badge/%F0%9F%A4%96-release%20notes-00B2EE.svg)](https://github-tools.github.io/github-release-notes/)
44

55
## Client
66

‎browserslist‎

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

‎package.json‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,38 @@
22
"name": "chapter-website",
33
"version": "0.5.0",
44
"private": true,
5+
"contributors": [
6+
"Adrian Darian",
7+
"Dan Tran",
8+
"Robert Perrine"
9+
],
510
"scripts": {
6-
"deploy": "yarn build && ngh --branch=gh-pages",
711
"build": "ngtw build && ng build --prod --base-href=https://ucmercedacm.github.io/Chapter-Website/",
812
"clean": "rm -rf node_modules/ yarn.lock package-lock.json",
13+
"deploy": "yarn build && ngh --branch=gh-pages --no-silent",
14+
"docker": "ng serve --host 0.0.0.0 --port 4200 & ngtw watch",
915
"e2e": "ng e2e",
16+
"gren:changelog": "gren changelog --generate --override --tags=all --config=.grenrc.js",
17+
"gren:release": "gren release --override --tags=all --config=.grenrc.js",
1018
"lint": "ng lint",
1119
"ng": "ng",
1220
"prestart": "ngtw build",
13-
"docker": "ng serve --host 0.0.0.0 --port 4200 & ngtw watch",
1421
"start": "ng serve & ngtw watch",
1522
"store": "ng g module --flat false --module root-store/root-store.module.ts",
1623
"test": "ng test"
1724
},
25+
"browserslist": {
26+
"production": [
27+
">0.2%",
28+
"not dead",
29+
"not op_mini all"
30+
],
31+
"development": [
32+
"last 1 chrome version",
33+
"last 1 firefox version",
34+
"last 1 safari version"
35+
]
36+
},
1837
"resolutions": {
1938
"@babel/preset-env": "7.5.5"
2039
},
@@ -38,6 +57,7 @@
3857
"@ngrx/store-devtools": "~8.5.2",
3958
"@popperjs/core": "~2.0.4",
4059
"angular-cli-ghpages": "~0.6.2",
60+
"github-release-notes": "^0.17.1",
4161
"jwt-decode": "~2.2.0",
4262
"rxjs": "~6.5.3",
4363
"tslib": "~1.10.0",

0 commit comments

Comments
 (0)