Skip to content

Commit

Permalink
Merge pull request #8 from crescware/release-1-0-0-beta-0
Browse files Browse the repository at this point in the history
Release 1 0 0 beta 0
  • Loading branch information
okunokentaro authored Jan 24, 2021
2 parents c15f6f8 + 7b4fd56 commit ac09132
Show file tree
Hide file tree
Showing 17 changed files with 1,010 additions and 30 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
'on':
"on":
push:
branches:
- main
Expand All @@ -14,8 +14,8 @@ jobs:
- run: npm ci && npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_WEB_MUSIC_QUIZ }}'
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_WEB_MUSIC_QUIZ }}"
channelId: live
projectId: web-music-quiz
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on PR
'on': pull_request
"on": pull_request
jobs:
build_and_preview:
runs-on: ubuntu-latest
Expand All @@ -11,8 +11,8 @@ jobs:
- run: npm ci && npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_WEB_MUSIC_QUIZ }}'
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_WEB_MUSIC_QUIZ }}"
projectId: web-music-quiz
env:
FIREBASE_CLI_PREVIEWS: hostingchannels
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# WebMusicQuiz
# Degree Master

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.1.7.

Expand Down
25 changes: 21 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web-music-quiz",
"version": "0.0.0",
"name": "degree-master",
"version": "1.0.0-beta.0",
"dependencies": {
"@angular/animations": "~11.0.9",
"@angular/common": "~11.0.9",
Expand All @@ -12,6 +12,7 @@
"@angular/router": "~11.0.9",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"ua-parser-js": "^0.7.23",
"zone.js": "~0.10.2"
},
"devDependencies": {
Expand All @@ -21,6 +22,8 @@
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"@types/ua-parser-js": "^0.7.35",
"@types/webmidi": "^2.0.4",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
Expand Down
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="stylesheet" href="styles.3ff695c00d717f2d2a11.css"></head>
<link rel="stylesheet" href="styles.css"></head>
<body>
<app-root></app-root>
<script src="runtime.0e49e2b53282f40c8925.js" defer></script><script src="polyfills.2e89f9530eab053a7df4.js" defer></script><script src="main.f8a813eec0cd24a780b4.js" defer></script></body>
<script src="runtime.js" defer></script><script src="polyfills.js" defer></script><script src="vendor.js" defer></script><script src="main.js" defer></script></body>
</html>
252 changes: 252 additions & 0 deletions src/app/app.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
.Background {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: linear-gradient(
0deg,
#303030 0%,
#404040 2%,
#505050 98%,
#777777 100%
);
}

.Frame_Left,
.Frame_Right {
position: absolute;
top: 0;
height: 100%;
width: 2vw;
max-width: 20px;
background: linear-gradient(
0deg,
#222222 0%,
#303030 3%,
#404040 97%,
#666666 100%
);
}

.Frame_Left {
left: 0;
border-right: 2px solid #232323;
}

.Frame_Right {
right: 0;
border-left: 2px solid #292929;
}

.Screen {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}

.LogoContainer {
display: flex;
width: 100%;
height: 100%;
flex-direction: column;
align-items: center;
justify-content: center;
}

.Logo {
margin: 0;
color: #fef14a;
font-weight: normal;
font-size: 7vw;
margin-bottom: 4vh;
}

.ButtonsContainer {
display: flex;
}

.Button_Start {
margin: 1vh;
width: 20vw;
min-width: 140px;
height: 10vh;
max-height: 100px;
font-size: max(18px, min(2.5vh, 32px));
line-height: 1;
-webkit-appearance: none;
-moz-appearance: none;
border: none;
border-radius: 8px;
background: #cccccc;
}

.Button_Start:active {
background: #fef14a;
}

.Midi {
color: #cccccc;
margin-top: 2vh;
}

.Connected {
display: inline-block;
margin-left: 0.5em;
}

.CopyrightContainer {
pointer-events: none;
position: absolute;
top: 0;
bottom: 0;
display: flex;
width: 100%;
height: 100%;
padding: 2vh;
font-size: 2vw;
flex-direction: column;
align-items: center;
justify-content: flex-end;
}

.Copyright {
color: #cccccc;
position: relative;
bottom: 0;
}

.ScoreContainer {
position: absolute;
top: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
}

.Score {
position: relative;
color: white;
background: black;
padding: 3vh 2vw;
font-size: 2vw;
width: 8vw;
min-width: 50px;
text-align: right;
border: 0.5vw #222222 solid;
}

.ScoreDecoration {
position: absolute;
top: 0;
left: 0;
display: inline-block;
background: linear-gradient(
180deg,
#ffffff11 0%,
#ffffff22 50%,
#00000044 51%
);
width: 100%;
height: 100%;
}

.SoundIndicator {
margin-left: 2vw;
width: 1.2vw;
height: 1.2vw; /* square */
min-width: 10px;
min-height: 10px;
background: #222222;
border-radius: 1000px;
}

.SoundIndicator.active {
background: #e5f4f3;
box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #001dec 0 -1px 9px,
#4c89f1 0 10px 20px;
}

.KeysContainer {
position: absolute;
top: 0;
left: 40px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: calc(100% - 80px);
height: 100%;
}

.Keys_Upper,
.Keys_Lower {
width: 100%;
display: flex;
justify-content: center;
}

.Key {
margin: 1.2%;
width: 8.6%;
height: 12vh;
-webkit-appearance: none;
-moz-appearance: none;
border: 2px #aaa solid;
border-radius: 8px;
background: #aaaaaa;
transition-duration: 0.2s;
transition-property: background-color, border-color;
font-size: 2vw;
text-align: left;
padding: 0.5em
}

.Keys_Upper .Key:nth-child(5n).active,
.Keys_Lower .Key:nth-child(5n + 3).active {
border: 2px #fff solid;
background: #dc6c2a;
transition-duration: 0.05s;
transition-property: background-color, border-color;
}

.Keys_Upper .Key:nth-child(5n + 1).active,
.Keys_Lower .Key:nth-child(5n + 4).active {
border: 2px #fff solid;
background: #fef14a;
transition-duration: 0.05s;
transition-property: background-color, border-color;
}

.Keys_Upper .Key:nth-child(5n + 2).active,
.Keys_Lower .Key:nth-child(5n).active {
border: 2px #fff solid;
background: #50aa7f;
transition-duration: 0.05s;
transition-property: background-color, border-color;
}

.Keys_Upper .Key:nth-child(5n + 3).active,
.Keys_Lower .Key:nth-child(5n + 1).active {
border: 2px #fff solid;
background: #3e69af;
transition-duration: 0.05s;
transition-property: background-color, border-color;
}

.Keys_Upper .Key:nth-child(5n + 4).active,
.Keys_Lower .Key:nth-child(5n + 2).active {
border: 2px #fff solid;
background: #80c6ef;
transition-duration: 0.05s;
transition-property: background-color, border-color;
}

.Key[disabled] {
border: 2px #ffffff03 solid;
background: #ffffff09;
}
Loading

0 comments on commit ac09132

Please sign in to comment.