Commit c98b09dc authored by Dennis Willers's avatar Dennis Willers
Browse files

Merge remote-tracking branch 'origin/master'

parents e5288479 e316e2af

angular.json

+7 −2
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ 
              "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",

              "src/styles.scss"

            ],

            "scripts": []

            "scripts": [

              "./src/assets/JavaScript/Timer.js"

            ]

          },

          "configurations": {

            "production": {
@@ -129,5 +131,8 @@ 
      }

    }

  },

  "defaultProject": "Tabu"

  "defaultProject": "Tabu",

  "cli": {

    "analytics": "7407060e-d956-49fb-9b06-019fa3c10d74"

  }

}

src/app/app-routing.module.ts

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import {OverviewComponent} from './overview/overview.component'; 
import {SelectGameComponent} from './select-game/select-game.component';

import {ErrorComponent} from './error/error.component';

import {GameComponent} from './game/game.component';

import {GuesserComponent} from './guesser/guesser.component';



const routes: Routes = [

  {
@@ -24,7 +25,7 @@ const routes: Routes = [ 
  },

  {

    path: ':sessionName/:team/guesser',

    component: GameComponent,

    component: GuesserComponent,

  },

  {

    path: '',

src/app/app.module.ts

+7 −1
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ import { ErrorComponent } from './error/error.component'; 
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';

import { FormsModule } from '@angular/forms';

import { GameComponent } from './game/game.component';

import { GuesserComponent } from './guesser/guesser.component';

import {MatSlideToggleModule} from '@angular/material/slide-toggle';

import {MatIconModule} from '@angular/material/icon';



@NgModule({

  declarations: [
@@ -29,6 +32,7 @@ import { GameComponent } from './game/game.component'; 
    OverviewComponent,

    ErrorComponent,

    GameComponent,

    GuesserComponent,

  ],

  imports: [

    HttpClientModule,
@@ -42,7 +46,9 @@ import { GameComponent } from './game/game.component'; 
    MatInputModule,

    MatCardModule,

    MatProgressSpinnerModule,

    FormsModule

    FormsModule,

    MatSlideToggleModule,

    MatIconModule

  ],

  providers: [],

  bootstrap: [AppComponent]

src/app/game/game.component.html

+1 −0
Original line number Diff line number Diff line 
<div style="text-align: center; margin-left: 15em; margin-right: 15em; margin-top: 5em;">

  <p>Punktestand: {{points}}</p>

  <div id="app"></div>

  <mat-card>

    <h1>

      {{cardInfo.solution}}

src/app/game/game.component.scss

+62 −0
Original line number Diff line number Diff line 




body {

  font-family: sans-serif;

  display: grid;

  height: 100vh;

  place-items: center;

}



.base-timer {

  position: relative;

  width: 300px;

  height: 300px;

}



.base-timer__svg {

  transform: scaleX(-1);

}



.base-timer__circle {

  fill: none;

  stroke: none;

}



.base-timer__path-elapsed {

  stroke-width: 7px;

  stroke: grey;

}



.base-timer__path-remaining {

  stroke-width: 7px;

  stroke-linecap: round;

  transform: rotate(90deg);

  transform-origin: center;

  transition: 1s linear all;

  fill-rule: nonzero;

  stroke: currentColor;

}



.base-timer__path-remaining.green {

  color: rgb(65, 184, 131);

}



.base-timer__path-remaining.orange {

  color: orange;

}



.base-timer__path-remaining.red {

  color: red;

}



.base-timer__label {

  position: absolute;

  width: 300px;

  height: 300px;

  top: 0;

  display: flex;

  align-items: center;

  justify-content: center;

  font-size: 48px;

}