Skip to content

Commit

Permalink
Sass implementation (instead of CSS)
Browse files Browse the repository at this point in the history
  • Loading branch information
Educg550 committed Apr 25, 2021
1 parent a5d03d3 commit 465de74
Show file tree
Hide file tree
Showing 22 changed files with 54 additions and 330 deletions.
37 changes: 13 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"react-dom": "^17.0.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"sass": "^1.32.11",
"typescript": "^4.1.3",
"web-vitals": "^0.2.4",
"workbox-background-sync": "^5.1.4",
Expand Down
8 changes: 0 additions & 8 deletions src/App.test.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import "@ionic/react/css/flex-utils.css";
import "@ionic/react/css/display.css";

/* Theme variables */
import "./theme/variables.css";
import "./theme/variables.scss";

const App: React.FC = () => (
<IonApp>
Expand Down
3 changes: 2 additions & 1 deletion src/components/Toolbar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Colocar isso no App.tsx mais pra frente, coloquei no componente separado para trabalhar nas telas de cadastro e login por enquanto
// Colocar isso no App.tsx mais pra frente, coloquei no componente separado para
// trabalhar nas telas de cadastro e login por enquanto

import {
IonIcon,
Expand Down
12 changes: 0 additions & 12 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
import * as serviceWorkerRegistration from './serviceWorkerRegistration';
import reportWebVitals from './reportWebVitals';

ReactDOM.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById('root')
);

// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://cra.link/PWA
serviceWorkerRegistration.unregister();

// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();
File renamed without changes.
4 changes: 2 additions & 2 deletions src/pages/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import {
IonImg,
IonLabel,
} from "@ionic/react";
import "./Home.css";
import "./Home.scss";

const Home: React.FC = () => {
return (
<IonPage className="page">
<IonContent fullscreen>
<IonContent fullscreen className="gg">
<IonImg src={"assets/icon/icon.svg"} className="img" />

<IonTitle className="title" color="primary">
Expand Down
File renamed without changes.
56 changes: 32 additions & 24 deletions src/pages/Tabs/Register1_NameMail.tsx
Original file line number Diff line number Diff line change
@@ -1,42 +1,50 @@
import React, { useState } from 'react';
import {
IonContent,
IonPage,
IonTitle,
IonInput,
IonButton,
IonItem } from '@ionic/react';
import "./Register1_NameMail.css";
import React, { useState } from "react";
import {
IonContent,
IonPage,
IonTitle,
IonInput,
IonButton,
IonItem,
} from "@ionic/react";
import "./Register1_NameMail.scss";

const Register1_NameMail: React.FC = () => {

const [mail, setMail] = useState<string>();
const [username, setUsername] = useState<string>();

return (
<IonPage>

<IonContent>

<IonTitle className="title">
{" "}
Escolha seu< br/> Username email{" "}
{" "}
Escolha seu
<br /> Username email{" "}
</IonTitle>

<IonItem className="input-mail">
<IonInput value={mail} placeholder="[email protected]" onIonChange={e => setMail(e.detail.value!)} clearInput></IonInput>
</IonItem>
<IonItem className="input-username">
<IonInput value={username} placeholder="a" onIonChange={e => setUsername(e.detail.value!)} clearInput></IonInput>
</IonItem>

<IonButton color="primary" className="button">
<IonItem className="input-mail">
<IonInput
value={mail}
placeholder="[email protected]"
onIonChange={(e) => setMail(e.detail.value!)}
clearInput
></IonInput>
</IonItem>
<IonItem className="input-username">
<IonInput
value={username}
placeholder="username"
onIonChange={(e) => setUsername(e.detail.value!)}
clearInput
></IonInput>
</IonItem>

<IonButton color="primary" className="button">
Confirmar
</IonButton>

</IonContent>
</IonPage>
);
};

export default Register1_NameMail;
export default Register1_NameMail;
File renamed without changes.
2 changes: 1 addition & 1 deletion src/pages/Tabs/Tab1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
IonTitle,
IonToolbar,
} from "@ionic/react";
import "./Tab1.css";
import "./Tab1.scss";

const Tab1: React.FC = () => {
return (
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/pages/Tabs/Tab2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
IonLabel,
IonButton,
} from "@ionic/react";
import "./Tab2.css";
import "./Tab2.scss";
import { pin, wifi, wine, warning, walk } from "ionicons/icons";

const Tab2: React.FC = () => {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/pages/Tabs/Tab3.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar } from '@ionic/react';
import './Tab3.css';
import './Tab3.scss';

const Tab3: React.FC = () => {
return (
Expand Down
1 change: 0 additions & 1 deletion src/react-app-env.d.ts

This file was deleted.

15 changes: 0 additions & 15 deletions src/reportWebVitals.ts

This file was deleted.

Loading

0 comments on commit 465de74

Please sign in to comment.