Quiz

.editorconfig

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+# Editor configuration, see https://editorconfig.org
+=======
 # Editor configuration, see http://editorconfig.org
+>>>>>>> 931316b1596d118e9d78dcb00fc326c6e4d3166c
 root = true
 
 [*]
@@ -8,6 +12,12 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+<<<<<<< HEAD
+[*.ts]
+quote_type = single
+
+=======
+>>>>>>> 931316b1596d118e9d78dcb00fc326c6e4d3166c
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false

.gitignore

@@ -4,10 +4,22 @@
 /dist
 /tmp
 /out-tsc
+<<<<<<< HEAD
+# Only exists if Bazel was run
+/bazel-out
+
+# dependencies
+/node_modules
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+=======
 
 # dependencies
 /node_modules
 yarn.lock
+>>>>>>> 931316b1596d118e9d78dcb00fc326c6e4d3166c
 
 # IDEs and editors
 /.idea
@@ -24,11 +36,26 @@ yarn.lock
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+<<<<<<< HEAD
+.history/*
+=======
+>>>>>>> 931316b1596d118e9d78dcb00fc326c6e4d3166c
 
 # misc
 /.sass-cache
 /connect.lock
 /coverage
+<<<<<<< HEAD
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+=======
 /typings
 .firebase
 *.log
@@ -47,3 +74,4 @@ yarn.lock
 ehthumbs.db
 Thumbs.db
 
+>>>>>>> 931316b1596d118e9d78dcb00fc326c6e4d3166c

README.md

@@ -1,49 +1,27 @@
-[![Join our Slack, #codelab channel](https://img.shields.io/badge/slack-%23codelab-yellowgreen)](https://nycjsorg.now.sh) [![Check out the demo](https://img.shields.io/badge/see%20the-Demo-brightgreen)](https://codelab.fun)
+# Quiz
 
-# Angular Codelab - [codelab.fun](https://codelab.fun)
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.7.
 
-Angular Codelab is a self-paced interactive Angular course:
+## Development server
 
-<img alt="interactive exercises" src="https://user-images.githubusercontent.com/2545357/66274607-4d17a880-e84e-11e9-8ed0-a1ae678988a5.gif"  width="600">
-
-- 🔥 Everything in the browser - **no setup needed**
-- 🔥 **Interactive code samples** - Change the code and see the result immediately!
-- 🔥 Hands-on **Exercises** to solidify your knowledge
-- 🔥 **Free** - Made for Angular enthusiasts by Angular enthusiasts  
-- 🔥 Written in Angular and **open source**
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
-Try it out yourself at [codelab.fun](https://codelab.fun)
+## Code scaffolding
 
-## Help us make Codelab.fun better
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
 
-- [Contribute to the codebase](#contribute-to-the-codebase)
-- [Host a live Angular Codelab event in your city](#host-a-live-angular-codelab-event-in-your-city)
-- [Translate Codelab to your language](#translate-codelab-to-your-language)
+## Build
 
-### Contribute to the codebase
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
 
-Codelab.fun is an Angular app!
+## Running unit tests
 
-It uses [angular-cli](https://cli.angular.io/) with [nx](https://nx.dev) and all materials are in a form of Angular components.
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
 
-![image](https://user-images.githubusercontent.com/2545357/66277059-0edab300-e867-11e9-863e-340e6d888ea5.png)
+## Running end-to-end tests
 
-See what [Good first issues](https://github.com/codelab-fun/codelab/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-issue) are available.
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
 
-See [CONTRIBUTING.md](./docs/CONTRIBUTING.md) for detailed instructions.
+## Further help
 
-### Host a live Angular Codelab event in your city
-
-We have hosted multiple live codelab events in 10+ cities, and you can help us host one in yours!
-
-See how in [HOSTING.md](./docs/HOSTING.md)
-
-<img alt="People learning angular" src="https://user-images.githubusercontent.com/2545357/66275179-1fcdf900-e854-11e9-8c44-69e4368ba6c1.png"  width="600">
-
-### Translate Codelab to your language
-
-Currently codelab.fun is availble in English and Russian.
-
-See [TRANSLATING.md](./docs/TRANSLATING.md) for how you can help us translate the codelab into your language.
-
-Thanks to amazing [PoEditor](https://poeditor.com) for providing us with an open source licence
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).