Selaa lähdekoodia

Router fully functional

Alex Ortiz 2 vuotta sitten
vanhempi
commit
b81be4905f
3 muutettua tiedostoa jossa 19 lisäystä ja 26 poistoa
  1. 7
    7
      src/pages/Biography.tsx
  2. 6
    8
      src/pages/ListBiographies.tsx
  3. 6
    11
      src/pages/Questions.tsx

+ 7
- 7
src/pages/Biography.tsx Näytä tiedosto

5
     IonTitle,
5
     IonTitle,
6
     IonToolbar,
6
     IonToolbar,
7
     IonFooter,
7
     IonFooter,
8
-    IonNavLink,
9
-    IonButton,
10
     IonImg,
8
     IonImg,
11
     IonGrid,
9
     IonGrid,
12
     IonRow,
10
     IonRow,
13
     IonCol,
11
     IonCol,
14
     IonButtons,
12
     IonButtons,
15
     IonBackButton,
13
     IonBackButton,
16
-    useIonViewWillEnter
14
+    useIonViewWillEnter,
15
+    IonItem,
16
+    IonIcon
17
 } from '@ionic/react';
17
 } from '@ionic/react';
18
 import { useParams } from 'react-router';
18
 import { useParams } from 'react-router';
19
 import React, { useState } from 'react';
19
 import React, { useState } from 'react';
20
 import { BioInfo, getMessage } from '../data/BioInfo';
20
 import { BioInfo, getMessage } from '../data/BioInfo';
21
 import './Biography.css';
21
 import './Biography.css';
22
-import Questions from './Questions';
23
 import EnciclopediaPR from '../assets/EnciclopediaPR.png';
22
 import EnciclopediaPR from '../assets/EnciclopediaPR.png';
24
 import RobertoClemente from '../assets/RobertoClemente.jpg';
23
 import RobertoClemente from '../assets/RobertoClemente.jpg';
24
+import { square } from 'ionicons/icons';
25
 
25
 
26
 const Biography: React.FC = () => {
26
 const Biography: React.FC = () => {
27
     const [bioinfo, setMessage] = useState<BioInfo>();
27
     const [bioinfo, setMessage] = useState<BioInfo>();
57
                         <p>{bioinfo.tags}</p>
57
                         <p>{bioinfo.tags}</p>
58
                         <p>{bioinfo.Text1}</p>
58
                         <p>{bioinfo.Text1}</p>
59
                         <p>{bioinfo.Text2}</p>
59
                         <p>{bioinfo.Text2}</p>
60
-                        <IonNavLink routerDirection="forward" component={() => <Questions />}>
61
-                            <IonButton>Tomar quiz</IonButton>
62
-                        </IonNavLink>
60
+                        <IonItem routerLink={`/Question`} detail={true}>
61
+                            <IonIcon icon={square} />Tomar quiz
62
+                        </IonItem>
63
                     </>
63
                     </>
64
                 ) : (
64
                 ) : (
65
                     <div>Message not found</div>
65
                     <div>Message not found</div>

+ 6
- 8
src/pages/ListBiographies.tsx Näytä tiedosto

11
   IonPage,
11
   IonPage,
12
   IonTitle,
12
   IonTitle,
13
   IonToolbar,
13
   IonToolbar,
14
-  IonButton,
15
-  IonNavLink,
16
   IonFooter,
14
   IonFooter,
17
   IonGrid,
15
   IonGrid,
18
   IonRow,
16
   IonRow,
19
   IonCol,
17
   IonCol,
20
   IonButtons,
18
   IonButtons,
21
   IonBackButton,
19
   IonBackButton,
22
-  IonItem
20
+  IonItem,
21
+  IonIcon
23
 } from '@ionic/react';
22
 } from '@ionic/react';
24
 import './ListBiographies.css';
23
 import './ListBiographies.css';
25
-import Questions from './Questions';
24
+import { square } from 'ionicons/icons';
26
 import EnciclopediaPR from '../assets/EnciclopediaPR.png';
25
 import EnciclopediaPR from '../assets/EnciclopediaPR.png';
27
 import RobertoClemente from '../assets/RobertoClemente.jpg';
26
 import RobertoClemente from '../assets/RobertoClemente.jpg';
28
 import ListBio from '../data/Biograph.json';
27
 import ListBio from '../data/Biograph.json';
60
                     </IonCardHeader><IonCardContent>
59
                     </IonCardHeader><IonCardContent>
61
                       {listbio.content}
60
                       {listbio.content}
62
                     </IonCardContent>
61
                     </IonCardContent>
63
-
64
-                    <IonNavLink routerDirection="forward" component={() => <Questions />}>
65
-                      <IonButton>Tomar quiz</IonButton>
66
-                    </IonNavLink>
67
                   </IonCard>
62
                   </IonCard>
68
                 </IonItem>
63
                 </IonItem>
64
+                <IonItem routerLink={`/Question`} detail={true}>
65
+                  <IonIcon icon={square} />Tomar quiz
66
+                </IonItem>
69
               </>
67
               </>
70
             )
68
             )
71
           })
69
           })

+ 6
- 11
src/pages/Questions.tsx Näytä tiedosto

5
     IonTitle,
5
     IonTitle,
6
     IonToolbar,
6
     IonToolbar,
7
     IonFooter,
7
     IonFooter,
8
-    IonNavLink,
9
-    IonTabButton,
10
-    IonIcon,
11
     IonImg,
8
     IonImg,
12
     IonItem,
9
     IonItem,
13
     IonLabel,
10
     IonLabel,
21
     IonButton,
18
     IonButton,
22
     IonGrid,
19
     IonGrid,
23
     IonRow,
20
     IonRow,
24
-    IonCol
21
+    IonCol,
22
+    IonButtons,
23
+    IonBackButton
25
 } from '@ionic/react';
24
 } from '@ionic/react';
26
-import { arrowBack } from 'ionicons/icons';
27
 import React from 'react';
25
 import React from 'react';
28
 import './Questions.css';
26
 import './Questions.css';
29
-import Biography from './Biography';
30
 import EnciclopediaPR from '../assets/EnciclopediaPR.png';
27
 import EnciclopediaPR from '../assets/EnciclopediaPR.png';
31
 import RobertoClemente from '../assets/RobertoClemente.jpg';
28
 import RobertoClemente from '../assets/RobertoClemente.jpg';
32
 
29
 
180
 
177
 
181
             <IonFooter>
178
             <IonFooter>
182
                 <IonToolbar>
179
                 <IonToolbar>
183
-                    <IonNavLink routerDirection="forward" component={() => <Biography />}>
184
-                        <IonTabButton tab="Biography" href="/Biography">
185
-                            <IonIcon icon={arrowBack} />
186
-                        </IonTabButton>
187
-                    </IonNavLink>
180
+                    <IonButtons slot="start">
181
+                        <IonBackButton defaultHref="/ListBiographie"></IonBackButton>
182
+                    </IonButtons>
188
                 </IonToolbar>
183
                 </IonToolbar>
189
             </IonFooter>
184
             </IonFooter>
190
         </IonPage>
185
         </IonPage>