diff --git a/.gitignore b/.gitignore index 7cf3668..7bf6c41 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ # http://git-scm.com/docs/gitignore *.apk +!INSTALL.apk *.jks *~ *.sw[mnpcod] diff --git a/INSTALL.apk b/INSTALL.apk new file mode 100644 index 0000000..809c744 Binary files /dev/null and b/INSTALL.apk differ diff --git a/README.md b/README.md index dfd8836..7c131c1 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ College Friend App seeks to create an active community of people who share infor **Category:** Social Networking -**App Platfrom:** Android, iOS, Web +**App Platfrom:** Android 100%, iOS 60%, Web 0% **Referance:** Social media, Facebook @@ -69,12 +69,18 @@ Active member of IEEE and president of IEEE Student Branch of the Technological # Installation `npm install` +`ionic cordova platform add android` + +`ionic cordova platform add ios` + `ionic cordova run android` + +`ionic cordova run ios` # Language - - Español - - English - - Português - - Francais + - Español 90% + - English 84% + - Português 0% + - Francais 0% # Contributing # Credits @@ -100,4 +106,4 @@ Version 3, 29 June 2007** ### Keywords: -College, Student, School, Social, Network, Graduate, Friend, Inbox, Share, Picture, Ranking, Firebase, Ionic, Android, iOS. \ No newline at end of file +College, Student, School, Social, Network, Graduate, Friend, Inbox, Share, Picture, Ranking, Firebase, Ionic, Android. \ No newline at end of file diff --git a/config.xml b/config.xml index 01f7fde..bb2cc75 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + College Friend App An amazing application to talk about public and private universities. Said Llamas diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 9cfec69..366beab 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -67,7 +67,18 @@ }, "Errores": { "Error": "An error has occurred", - "Mensaje": "… our programmers are working to solve it" + "Mensaje": "… our programmers are working to solve it", + "EmailVacio": "Please enter an email address", + "EmailInvalido": "Please enter a valid email address", + "ContraseñaVacio": "Please enter a password", + "Min": "Minimum 7 characters", + "Max": "Maximum 30 characters", + "ContraseñaInv": "Please enter a valid password", + "UserVacio": "Please enter your name", + "UserInv": "Just use the character of the alphabet", + "PhoneVacio": "Please enter your phone number", + "Max10": "Maximum 10 characters", + "PhoneInv": "Enter a valid phone number" }, "Login": { "Nombre": "Full Name", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 383924b..7a6613b 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -67,7 +67,18 @@ }, "Errores": { "Error": "Se ha producido un error", - "Mensaje": "… nuestros programadores están trabajando para resolverlo." + "Mensaje": "… nuestros programadores están trabajando para resolverlo.", + "EmailVacio": "Por favor ingrese una dirección de correo electrónico", + "EmailInvalido": "Por favor ingrese una dirección de correo electrónico valida", + "ContraseñaVacio": "Por favor ingrese una contraseña", + "Min": "Mínimo 7 caracteres", + "Max": "Máximo 30 caracteres", + "ContraseñaInv": "Por favor ingrese una contraseña valida", + "UserVacio": "Por favor ingrese su nombre", + "UserInv": "Solo usa el cáracter del alfabeto", + "PhoneVacio": "Por favor ingrese su número de teléfono", + "Max10": "Máximo 10 caracteres", + "PhoneInv": "Ingrese un número de teléfono valido" }, "Login": { "Nombre": "Nombre completo", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 0c30149..366beab 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1,44 +1,135 @@ { + "Slides": { + "Inicio": "Inicio", + "Creado": "Powered by", + "Como": "How Does It", + "Trabaja": "Work", + "Que": "Welcome to", + "ContentOne": "Looking for a university? Get to the right application, enter and know your next university.", + "ContentTwo": "With the help of people like you and me, if you know a university, register it! and let the world know what you think of her." + }, "Tabs": { - "Inicio": " ", - "Opiniones": " ", - "Guardado": " ", - "Chat": " ", - "Perfil": " " + "Inicio": "Home", + "Opiniones": "Opinions", + "Guardado": "Saved", + "Chat": "Chat", + "Perfil": "Profile" }, "Inicio": { - "buscar_universidad": " ", - "universidades_destacadas": " ", - "universidades_cercanas": " ", - "universidades_evaluadas": " ", - "inicio_proximo": " " - }, - "Semana": { - "Lunes": " ", - "Martes": " ", - "Miercoles": " ", - "Jueves": " ", - "Viernes": " ", - "Sabado": " ", - "Domingo": " " + "buscar_universidad": "Search Universities", + "universidades_destacadas": "Featured Universities", + "universidades_cercanas": "Universities in", + "universidades_evaluadas": "Most Valued Universities", + "inicio_proximo": "Start of courses soon", + "Resultados": "Results", + "Ver": "Show", + "Crear": "Create", + "TituloResEnd": "Here the results end…", + "ContenidoResEnd": "If it was not what you were looking for help us to register it", + "ContenidoResNo": "Help us see this university next time", + "TituloResNo": "Without result" }, "Perfil": { - "user_name": " ", - "user_phone": " ", - "user_email": " ", + "user_name": "Name", + "user_phone": "Phone number", + "user_email": "Email address", + "user_pass": "Password", "Ajustes": { - "Ajustes": " ", - "Miembro": " ", - "Notificaciones": " " + "Ajustes": "Settings", + "Miembro": "looking for university", + "Notificaciones": "receive notifications", + "Guardar": "Save" } }, "Universidad": { - "Sitio_web": " ", - "Telefono": " ", - "Mapa": " ", - "Opinar": " " + "Sitioweb": "Website", + "Telefono": "Phone", + "Mapa": "Map", + "Opinar": "write review", + "Ubicacion": "Location", + "Buscar": "Search", + "Guardar": "Save", + "CreadoPor": "Created by", + "Global": "Global score", + "Carreras": "university careers", + "Inicio": "Start of courses", + "Costo": "Registration cost", + "Puntajes": "Scores", + "Opiniones": "Reviews", + "General": "General", + "AñadirCarrera": "add university career", + "EditarMeses": "Edit months", + "Dia": "at" }, "Opiniones": { - "Opiniones": " " + "Opiniones": "Opinions", + "Actualizar": "Update review a" + }, + "Errores": { + "Error": "An error has occurred", + "Mensaje": "… our programmers are working to solve it", + "EmailVacio": "Please enter an email address", + "EmailInvalido": "Please enter a valid email address", + "ContraseñaVacio": "Please enter a password", + "Min": "Minimum 7 characters", + "Max": "Maximum 30 characters", + "ContraseñaInv": "Please enter a valid password", + "UserVacio": "Please enter your name", + "UserInv": "Just use the character of the alphabet", + "PhoneVacio": "Please enter your phone number", + "Max10": "Maximum 10 characters", + "PhoneInv": "Enter a valid phone number" + }, + "Login": { + "Nombre": "Full Name", + "Telefono": "Phone Number", + "Login": "Login", + "Registro": "Register", + "Email": "Email Address", + "Password": "Password" + }, + "Chat": { + "Conversaciones": "Conversations", + "Mensajes": "Messages", + "Solicitudes": "Requests" + }, + "InboxSingle": { + "MensajeAqui": "Message here" + }, + "Escribir": { + "Para": "Write opinion for", + "Guardar": "add comment", + "Actualizar": "update comment" + }, + "Meses": { + "Enero": "January", + "Febrero": "February", + "Marzo": "March", + "Abril": "April", + "Mayo": "May", + "Junio": "June", + "Julio": "July", + "Agosto": "August", + "Septiembre": "September", + "Octubre": "October", + "Noviembre": "November", + "Diciembre": "December" + }, + "Ratings": { + "Instalaciones": "Facilities and infrastructure", + "Profesores": "Teachers", + "Ubicacion": "Location", + "Actividades": "Extracurricular activities", + "Becas": "Scholarships and supports" + }, + "Tips": { + "Tip1": "It is not possible to update your email if you created your account from a social network.", + "Tip2": "If you want to update your name and you used the login with social networks it is necessary that you update it from the social network with which you started session.", + "Tip3": "To update your profile picture it is necessary that you go to gravatar.com and register the same mail that you use in this application.", + "Tip4": "If you can imagine it can be programmed", + "Tip5": "Powered by DamVeloper Team" + }, + "Favoritos": { + "misFavs": "My favourites" } } \ No newline at end of file diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 0c30149..366beab 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1,44 +1,135 @@ { + "Slides": { + "Inicio": "Inicio", + "Creado": "Powered by", + "Como": "How Does It", + "Trabaja": "Work", + "Que": "Welcome to", + "ContentOne": "Looking for a university? Get to the right application, enter and know your next university.", + "ContentTwo": "With the help of people like you and me, if you know a university, register it! and let the world know what you think of her." + }, "Tabs": { - "Inicio": " ", - "Opiniones": " ", - "Guardado": " ", - "Chat": " ", - "Perfil": " " + "Inicio": "Home", + "Opiniones": "Opinions", + "Guardado": "Saved", + "Chat": "Chat", + "Perfil": "Profile" }, "Inicio": { - "buscar_universidad": " ", - "universidades_destacadas": " ", - "universidades_cercanas": " ", - "universidades_evaluadas": " ", - "inicio_proximo": " " - }, - "Semana": { - "Lunes": " ", - "Martes": " ", - "Miercoles": " ", - "Jueves": " ", - "Viernes": " ", - "Sabado": " ", - "Domingo": " " + "buscar_universidad": "Search Universities", + "universidades_destacadas": "Featured Universities", + "universidades_cercanas": "Universities in", + "universidades_evaluadas": "Most Valued Universities", + "inicio_proximo": "Start of courses soon", + "Resultados": "Results", + "Ver": "Show", + "Crear": "Create", + "TituloResEnd": "Here the results end…", + "ContenidoResEnd": "If it was not what you were looking for help us to register it", + "ContenidoResNo": "Help us see this university next time", + "TituloResNo": "Without result" }, "Perfil": { - "user_name": " ", - "user_phone": " ", - "user_email": " ", + "user_name": "Name", + "user_phone": "Phone number", + "user_email": "Email address", + "user_pass": "Password", "Ajustes": { - "Ajustes": " ", - "Miembro": " ", - "Notificaciones": " " + "Ajustes": "Settings", + "Miembro": "looking for university", + "Notificaciones": "receive notifications", + "Guardar": "Save" } }, "Universidad": { - "Sitio_web": " ", - "Telefono": " ", - "Mapa": " ", - "Opinar": " " + "Sitioweb": "Website", + "Telefono": "Phone", + "Mapa": "Map", + "Opinar": "write review", + "Ubicacion": "Location", + "Buscar": "Search", + "Guardar": "Save", + "CreadoPor": "Created by", + "Global": "Global score", + "Carreras": "university careers", + "Inicio": "Start of courses", + "Costo": "Registration cost", + "Puntajes": "Scores", + "Opiniones": "Reviews", + "General": "General", + "AñadirCarrera": "add university career", + "EditarMeses": "Edit months", + "Dia": "at" }, "Opiniones": { - "Opiniones": " " + "Opiniones": "Opinions", + "Actualizar": "Update review a" + }, + "Errores": { + "Error": "An error has occurred", + "Mensaje": "… our programmers are working to solve it", + "EmailVacio": "Please enter an email address", + "EmailInvalido": "Please enter a valid email address", + "ContraseñaVacio": "Please enter a password", + "Min": "Minimum 7 characters", + "Max": "Maximum 30 characters", + "ContraseñaInv": "Please enter a valid password", + "UserVacio": "Please enter your name", + "UserInv": "Just use the character of the alphabet", + "PhoneVacio": "Please enter your phone number", + "Max10": "Maximum 10 characters", + "PhoneInv": "Enter a valid phone number" + }, + "Login": { + "Nombre": "Full Name", + "Telefono": "Phone Number", + "Login": "Login", + "Registro": "Register", + "Email": "Email Address", + "Password": "Password" + }, + "Chat": { + "Conversaciones": "Conversations", + "Mensajes": "Messages", + "Solicitudes": "Requests" + }, + "InboxSingle": { + "MensajeAqui": "Message here" + }, + "Escribir": { + "Para": "Write opinion for", + "Guardar": "add comment", + "Actualizar": "update comment" + }, + "Meses": { + "Enero": "January", + "Febrero": "February", + "Marzo": "March", + "Abril": "April", + "Mayo": "May", + "Junio": "June", + "Julio": "July", + "Agosto": "August", + "Septiembre": "September", + "Octubre": "October", + "Noviembre": "November", + "Diciembre": "December" + }, + "Ratings": { + "Instalaciones": "Facilities and infrastructure", + "Profesores": "Teachers", + "Ubicacion": "Location", + "Actividades": "Extracurricular activities", + "Becas": "Scholarships and supports" + }, + "Tips": { + "Tip1": "It is not possible to update your email if you created your account from a social network.", + "Tip2": "If you want to update your name and you used the login with social networks it is necessary that you update it from the social network with which you started session.", + "Tip3": "To update your profile picture it is necessary that you go to gravatar.com and register the same mail that you use in this application.", + "Tip4": "If you can imagine it can be programmed", + "Tip5": "Powered by DamVeloper Team" + }, + "Favoritos": { + "misFavs": "My favourites" } } \ No newline at end of file diff --git a/src/pages/inbox-single/inbox-single.ts b/src/pages/inbox-single/inbox-single.ts index 325025d..7a751ae 100644 --- a/src/pages/inbox-single/inbox-single.ts +++ b/src/pages/inbox-single/inbox-single.ts @@ -222,7 +222,6 @@ export class InboxSinglePage { this.newChatInit = true; }else{ - alert('chat iniciado anteriormente'); let msj = { uiduser: user.uid, contenido: this.editorMsg, diff --git a/src/pages/login/login.html b/src/pages/login/login.html index fc1b908..59d8079 100644 --- a/src/pages/login/login.html +++ b/src/pages/login/login.html @@ -19,22 +19,22 @@
- * Please input your email address + * {{"Errores.EmailVacio" | translate}}
- * Ingrese una direccion de corrio valida + * {{"Errores.EmailInvalido" | translate}}

- * Please input your password + * {{"Errores.ContraseñaVacio" | translate}}
- * Minimum 7 characters + * {{"Errores.Min" | translate}}
- * Ingrese una contraseña valida + * {{"Errores.ContraseñaInv" | translate}}

@@ -53,46 +53,46 @@
- * Please input your name + * {{"Errores.UserVacio" | translate}}
- * Minimum 7 characters + * {{"Errores.Min" | translate}}
- * Maximum 30 characters + * {{"Errores.Max" | translate}}
- * Just use alphabet character + * {{"Errores.UserInv" | translate}}

- * Please input your phone number + * {{"Errores.PhoneVacio" | translate}}
- * Maximum 10 characters + * {{"Errores.Max10" | translate}}
- * Ingrese un numero de telefono valido + * {{"Errores.PhoneInv" | translate}}

- * Please input your email address + * {{"Errores.EmailVacio" | translate}}
- * Ingrese una direccion de corrio valida + * {{"Errores.EmailInvalido" | translate}}

- * Please input your password + * {{"Errores.ContraseñaVacio" | translate}}
- * Ingrese una contraseña valida + * {{"Errores.ContraseñaInv" | translate}}

diff --git a/src/pages/profile/profile.scss b/src/pages/profile/profile.scss index 0dfd2c8..a3df770 100644 --- a/src/pages/profile/profile.scss +++ b/src/pages/profile/profile.scss @@ -71,6 +71,6 @@ page-profile { border: 1px solid map-get($colors, secondary); } label.slide { - font-size: 10px; + font-size: 12px; } } \ No newline at end of file diff --git a/src/pages/single-university/single-university.ts b/src/pages/single-university/single-university.ts index ec48d74..e9b1219 100644 --- a/src/pages/single-university/single-university.ts +++ b/src/pages/single-university/single-university.ts @@ -262,8 +262,6 @@ export class SingleUniversityPage { //VALIDATEHERE this.afAuth.authState.subscribe(user => { if(user.uid != id){ - alert(user.uid); - alert(id); this.navCtrl.push(InboxSinglePage, {id_user : id}); }else{ this.toastCtrl.create({