Skip to content

Commit

Permalink
Merge pull request #23 from SimonDamminga/test
Browse files Browse the repository at this point in the history 
test branch naar de release branch
  • Loading branch information
@SimonDamminga
SimonDamminga authored Nov 7, 2018
2 parents 85c360b + 68f620b commit fabfafe
Show file tree
Hide file tree
Showing 39 changed files with 860 additions and 347 deletions.
42 changes: 34 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
## Dev omgeving opzetten
# Dev omgeving opzetten

### v-host opzetten
1. Open kladblok als administrator
2. Ga naar open bestand
3. Open bestand C:/Windows/System32/drivers/etc/hosts
4. Voeg deze regel toe: 127.0.0.1 intro-tour.local
2. Open bestand ``C:/Windows/System32/drivers/etc/hosts``
3. Voeg deze regel toe: ``127.0.0.1 intro-tour.local``

### Apache v-hosts opzetten

Expand All @@ -18,18 +17,45 @@
ServerName "intro-tour.local"
</VirtualHost>
```
(``{project root}`` moet je wel zelf invullen)

3. Start apache opnieuw op

### Laravel Configureren

1. Maak ``.env`` bestand aan in de root folder van het project
2. Kopieer inhoud van ``.env.example`` in het nieuw aangemaakte ``.env`` bestand
3. Verander regel 5 naar ``APP_URL=http://intro-tour.local``
4. Run command ``php artisan key:generate``
3. Pas de informatie in het ``.env`` bestand aan aan jou instellingen
4. maak in dien nodig een database aan in [phpMyAdmin](http://localhost/phpmyadmin/index.php)
4. Verander regel 5 naar ``APP_URL=http://intro-tour.local``
5. Run command ``composer update``
6. Run command ``php artisan key:generate``
7. Run command ``php migrate:refresh --seed`` om de database te vullen met de test data

# Angular werkend krijgen
## Angular werkend krijgen

1. install node.js
2. run command ``npm install`` in intro-tour-client map (if this does not work load node installer and run repair)
3. run command ``npm start``
3. run command ``npm start`` of ``ng serve -o``

# Bugs aangeven
Wil je een bug melden? Volg dan de volgende stappen:
1. Ga naar [de issue pagina van onze repo](https://github.com/SimonDamminga/Intro-Tour/issues) om bugs te reporten
2. Klik op de groene **New Issue** knop
3. Klik op **Get Started**
4. Volg de instructies in het template
Dit moet wel in markdown: [cheatsheet MD](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet)
5. Klik op de **Submit new issue** knop

# Extra informatie

Wij adviseren bij het testen van de locaties om de *Chrome browser* te gebruiken
omdat Chrome de optie biedt om je geolocatie te manipuleren. Dit kan je doen door:
1. Open het ``f12`` menu
2. Klik op de drie puntjes rechts boven de pagina van het ``f12`` menu
3. Klik op **meer tools**
4. Zoek de optie **sensors**
5. Dit opent het sensors menu
6. Voer bij **geolocation** de gewenste locatie in door middel van:
* latitude
* longitude
281 changes: 152 additions & 129 deletions intro-tour-client/angular.json
View file
Original file line number Diff line number Diff line change
@@ -1,131 +1,154 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"intro-tour-client": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/intro-tour-client",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"./node_modules/semantic-ui-css/semantic.min.css",
"src/styles.css"
],
"scripts": [
"./node_modules/jquery/dist/jquery.min.js",
"./node_modules/semantic-ui-css/semantic.min.js"
]
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "intro-tour-client:build"
},
"configurations": {
"production": {
"browserTarget": "intro-tour-client:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "intro-tour-client:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.css"
],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"intro-tour-client-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "intro-tour-client:serve"
},
"configurations": {
"production": {
"devServerTarget": "intro-tour-client:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "intro-tour-client"
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"intro-tour-client": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/intro-tour-client",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"./node_modules/semantic-ui-css/semantic.min.css",
"src/styles.css"
],
"scripts": [
"./node_modules/jquery/dist/jquery.min.js",
"./node_modules/semantic-ui-css/semantic.min.js"
]
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
},
"test": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.test.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "intro-tour-client:build"
},
"configurations": {
"production": {
"browserTarget": "intro-tour-client:build:production"
},
"test": {
"browserTarget": "intro-tour-client:build:test"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "intro-tour-client:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.css"
],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"intro-tour-client-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "intro-tour-client:serve"
},
"configurations": {
"production": {
"devServerTarget": "intro-tour-client:serve:production"
},
"test": {
"devServerTarget": "intro-tour-client:serve:test"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "intro-tour-client"
}
19 changes: 11 additions & 8 deletions intro-tour-client/src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@ export class AppComponent {
teamName;
teamPin;

constructor (private teamService: TeamService, private localstorageService: LocalstorageService) {}
constructor (private teamService: TeamService, private localstorageService: LocalstorageService) {

}

ngOnInit(){
//teamname in header
if(this.localstorageService.getItem('team') == null){
this.teamService.currentTeamName.subscribe(name => this.teamName = name);
}else{
this.teamName = this.localstorageService.getItem('team').team_name;
}

setTimeout(() => {
if(this.localstorageService.getItem('team') == null){
this.teamService.teamName('INTRO TOUR');
this.teamService.currentTeamName.subscribe(name => this.teamName = name);
}else{
this.teamName = this.localstorageService.getItem('team').team_name;
}
}, 100);
}

}
Loading

0 comments on commit fabfafe

Please sign in to comment.