Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ajustes de nome da app, removendo sprints e ajustes de agenda #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Python Brasil 13 Mobile App
# Python Sudeste 2018 - Mobile App

## How to contribute

Expand Down
4 changes: 2 additions & 2 deletions config.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="br.org.pythonbrasil.pybr13" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Python Brasil 13</name>
<description>Aplicativo do evento Python Brasil 13</description>
<name>Python Sudeste 2018</name>
<description>Aplicativo do evento Python Sudeste 2018</description>
<author email="[email protected]" href="https://github.com/ervilis">Ervilis Viana de Souza</author>
<content src="index.html" />
<access origin="*" />
Expand Down
2 changes: 1 addition & 1 deletion ionic.config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "python-brasil-13",
"name": "python-sudeste-2018",
"app_id": "e3a720e8",
"type": "ionic-angular",
"integrations": {
Expand Down
3 changes: 0 additions & 3 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { MyApp } from './app.component';

import { PresentationsPage } from '../pages/presentations/presentations';
import { TutorialsPage } from '../pages/tutorials/tutorials';
import { SprintsPage } from '../pages/sprints/sprints';
import { HomePage } from '../pages/home/home';
import { TabsPage } from '../pages/tabs/tabs';

Expand All @@ -20,7 +19,6 @@ import { DataService } from './data.service';
MyApp,
PresentationsPage,
TutorialsPage,
SprintsPage,
HomePage,
TabsPage
],
Expand All @@ -34,7 +32,6 @@ import { DataService } from './data.service';
MyApp,
PresentationsPage,
TutorialsPage,
SprintsPage,
HomePage,
TabsPage
],
Expand Down
986 changes: 531 additions & 455 deletions src/app/data.service.ts

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en" dir="ltr">
<head>
<meta charset="UTF-8">
<title>Python Brasil 13</title>
<title>Python Sudeste 2018</title>
<meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
Expand Down
30 changes: 4 additions & 26 deletions src/pages/home/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ion-navbar>
<ion-title>
<img width="24" height="24" src="assets/img/logo.png" />
Python Brasil 13
Python Sudeste 2018
</ion-title>
</ion-navbar>
</ion-header>
Expand All @@ -21,34 +21,12 @@
</div>
<ion-item>
<ion-icon color="subtle" large item-start name='pin'></ion-icon>
<h2>Dayrell Hotel</h2>
<p>R. Espírito Santo, 901 - Centro</p>
<h2>BandTec Digital School</h2>
<p>Rua Haddock Lobo, 595 - Cerqueira César, São Paulo-SP</p>
</ion-item>
<ion-item>
<ion-icon color="subtle" large item-start name='calendar'></ion-icon>
<h2>6, 7 e 8 de Outubro</h2>
</ion-item>
</ion-card>

<ion-card class="adv-map">
<div style="position: relative">
<img src="assets/img/una.png">
<ion-fab right top>
<a href="https://goo.gl/maps/82tiKzTvMzC2" target="_blank">
<button ion-fab color="danger" class="fab-map">
<ion-icon name='pin'></ion-icon>
</button>
</a>
</ion-fab>
</div>
<ion-item>
<ion-icon color="subtle" large item-start name='pin'></ion-icon>
<h2>UNA - Campus Barro Preto</h2>
<p>Rua dos Goitacazes, 1159 - Barro Preto</p>
</ion-item>
<ion-item>
<ion-icon color="subtle" large item-start name='calendar'></ion-icon>
<h2>9, 10 e 11 de Outubro</h2>
<h2>30 de Março a 1 de Abril</h2>
</ion-item>
</ion-card>
</ion-content>
4 changes: 2 additions & 2 deletions src/pages/presentations/presentations.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ion-navbar no-border-bottom>
<ion-title>
<img width="24" height="24" src="assets/img/logo.png" />
Python Brasil 13
Python Sudeste 2018
</ion-title>
</ion-navbar>
<ion-toolbar no-border-top>
Expand All @@ -28,4 +28,4 @@ <h2>{{subitem.title}}</h2>
</ion-list>
</div>
</div>
</ion-content>
</ion-content>
13 changes: 0 additions & 13 deletions src/pages/sprints/sprints.html

This file was deleted.

3 changes: 0 additions & 3 deletions src/pages/sprints/sprints.scss

This file was deleted.

15 changes: 0 additions & 15 deletions src/pages/sprints/sprints.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/pages/tabs/tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<ion-tab [root]="tab1Root" tabTitle="Local" tabIcon="pin"></ion-tab>
<ion-tab [root]="tab2Root" tabTitle="Palestras" tabIcon="md-clipboard"></ion-tab>
<ion-tab [root]="tab3Root" tabTitle="Tutorias" tabIcon="md-code"></ion-tab>
<ion-tab [root]="tab4Root" tabTitle="Sprints" tabIcon="md-git-merge"></ion-tab>
</ion-tabs>
2 changes: 0 additions & 2 deletions src/pages/tabs/tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { Component } from '@angular/core';
import { PresentationsPage } from '../presentations/presentations';
import { TutorialsPage } from '../tutorials/tutorials';
import { HomePage } from '../home/home';
import { SprintsPage } from '../sprints/sprints';

@Component({
templateUrl: 'tabs.html'
Expand All @@ -13,7 +12,6 @@ export class TabsPage {
tab1Root = HomePage;
tab2Root = PresentationsPage;
tab3Root = TutorialsPage;
tab4Root = SprintsPage;

constructor() {

Expand Down
4 changes: 2 additions & 2 deletions src/pages/tutorials/tutorials.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ion-navbar no-border-bottom>
<ion-title>
<img width="24" height="24" src="assets/img/logo.png" />
Python Brasil 13
Python Sudeste 2018
</ion-title>
</ion-navbar>
<ion-toolbar no-border-top>
Expand All @@ -28,4 +28,4 @@ <h2>{{subitem.title}}</h2>
</ion-list>
</div>
</div>
</ion-content>
</ion-content>