-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Open Summer of Code final demo version (#62)
Misc styling changes, fake YouTube embeds (to be removed), story delete function, questions updates, basic FR/EN translations. * FIxed login, fixed youtube and sin-up. * Fixed youtube image * Fixed image id * Albums style fixes * Fixed iFrame * Can delete and logout * Begin popover * Story option further * Fixes, youtube, fakestories, logout, swipe etc... * Some cleanup * Somemore cleanup * Small changes * Fixed string * Many fixes * Fixed update stories and details. * Fixex , improvements and clean-ups. * Many fixes/changes * Question updates * Question shuffle & cycle * Added translation * En trans * Fixed * Package json updates & translation hotfix * Translated most things and added it in the menu * Albums & album detail header redesign * Youtube icon centered * Translation completed + fixes * Text backdrop
- Loading branch information
1 parent
d586322
commit c51af15
Showing
52 changed files
with
940 additions
and
1,235 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,42 @@ | ||
| import {Component} from "@angular/core"; | ||
| import {Platform} from "ionic-angular"; | ||
| import {Component, ViewChild} from "@angular/core"; | ||
| import {MenuController, Nav, Platform} from "ionic-angular"; | ||
| import {StatusBar} from "@ionic-native/status-bar"; | ||
| import {SplashScreen} from "@ionic-native/splash-screen"; | ||
|
|
||
| import {TutorialPage} from "../pages/tutorial/tutorial"; | ||
| import {PatientService} from "../providers/back-end/user.service"; | ||
| import {env} from "./environment"; | ||
| import {User} from "../dto/user"; | ||
| import { AlbumsPage } from "../pages/albums/albums"; | ||
| import {LoginPage} from "../pages/login/login"; | ||
| import {AuthService} from "../providers/auth-service/auth-service"; | ||
| import {TranslatorService} from "../providers/translator.service"; | ||
| import {TranslateService} from "@ngx-translate/core"; | ||
|
|
||
| @Component({ | ||
| templateUrl: 'app.html' | ||
| }) | ||
| export class MyApp { | ||
| private translate: TranslateService; | ||
| private translator:TranslatorService; | ||
|
|
||
| @ViewChild(Nav) nav: Nav; | ||
| rootPage: any = LoginPage; | ||
|
|
||
| constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen, public patientService: PatientService) { | ||
| constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen, | ||
| public patientService: PatientService, public translatorService: TranslatorService,public authService: AuthService, public menu: MenuController) { | ||
| //localStorage.clear(); | ||
| translatorService.refresh(); | ||
| this.translate = translatorService.translate; | ||
| this.translator = translatorService; | ||
| platform.ready().then(() => { | ||
| // Okay, so the platform is ready and our plugins are available. | ||
| // Here you can do any higher level native things you might need. | ||
| statusBar.styleDefault(); | ||
| splashScreen.hide(); | ||
| }); | ||
| } | ||
|
|
||
| logout() { | ||
| console.log("login out"); | ||
| this.menu.close(); | ||
| this.authService.logout(); | ||
| this.nav.setRoot(LoginPage); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,35 @@ | ||
| <ion-nav [root]="rootPage"></ion-nav> | ||
| <ion-menu [content]="content"> | ||
|
|
||
| <ion-toolbar color="general"> | ||
| <ion-title>Menu</ion-title> | ||
| </ion-toolbar> | ||
|
|
||
| <ion-content> | ||
| <ion-list> | ||
| <button ion-item> | ||
| <ion-icon name="log-out"></ion-icon> | ||
| Logout | ||
| </button> | ||
| <button ion-item (click)="logout()" style="font-size: 20px;"> | ||
| <ion-icon name="log-out"></ion-icon> | ||
| {{'Afmelden' | translate}} | ||
| </button> | ||
| <ion-item> | ||
| <ion-row style="text-align: center"> | ||
| <ion-col *ngIf="translator.lang.indexOf('en') < 0"> | ||
| <button ion-button color="general" clear (click)="translator.switchLang('en')">EN</button> | ||
| </ion-col> | ||
| <ion-col *ngIf="translator.lang.indexOf('fr') < 0"> | ||
| <button ion-button color="general" clear (click)="translator.switchLang('fr')">FR</button> | ||
| </ion-col> | ||
| <ion-col *ngIf="translator.lang.indexOf('nl') < 0"> | ||
| <button ion-button color="general" clear (click)="translator.switchLang('nl')">NL</button> | ||
| </ion-col> | ||
| </ion-row> | ||
| </ion-item> | ||
| </ion-list> | ||
| </ion-content> | ||
|
|
||
| </ion-menu> | ||
|
|
||
| <ion-nav id="nav" #content [root]="rootPage" swipeBackEnabled="false"></ion-nav> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "Paswoord": "Paswoord", | ||
| "Aanmelden" : "Log in", | ||
| "Registreer" : "Register", | ||
| "Of heb je nog geen account" : "Do you have an account", | ||
| "Voornaam" : "First name", | ||
| "Achternaam" : "Last name", | ||
| "Annuleer" : "Cancel", | ||
| "Afmelden" : "Log out", | ||
| "Waarover babbelen we vandaag" : "What are we talking about today", | ||
| "Voeg album toe" : "Add an album", | ||
| "Voeg verhaal toe" : "Add a story", | ||
| "Tekst schrijven" : "Write some text", | ||
| "Maak foto" : "Take a photo", | ||
| "Kies foto van camerarol" : "Choose a photo from the library", | ||
| "Opslaan" : "Save", | ||
| "Vul het verhaal aan" : "Edit the story", | ||
| "Voeg een foto toe" :"Add a picture", | ||
| "Schrijf het verhaal.\nHoe meer details hoe beter." : "Write a story\nThe more details the better", | ||
| "Nieuw verhaal" : "New story", | ||
| "Voeg toe" : "Add" | ||
|
|
||
| } |
Oops, something went wrong.