Merge pull request #14 from naveenjujaray/Dev

Dev
naveenjujaray · Nov 5, 2020 · 6fc70cd · 6fc70cd
2 parents 9cb96b4 + 6448e9e
commit 6fc70cd
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# DeveloperFolio  ![flutter](https://badgen.net/pub/flutter-platform/xml) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-green.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Stars](https://img.shields.io/github/stars/naveenjujaray/DeveloperFolio?style=flat)](https://github.com/naveenjujaray/DeveloperFolio/stargazers) ![Forks](https://img.shields.io/github/forks/naveenjujaray/DeveloperFolio?style=flat) [![website](https://img.shields.io/website?url=https%3A%2F%2Fdeveloperfolio.web.app%2F)](https://developerfolio.web.app/)
+# DeveloperFolio  ![flutter](https://badgen.net/pub/flutter-platform/xml) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-green.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Stars](https://img.shields.io/github/stars/naveenjujaray/DeveloperFolio?style=flat)](https://github.com/naveenjujaray/DeveloperFolio/stargazers) ![Forks](https://img.shields.io/github/forks/naveenjujaray/DeveloperFolio?style=flat) [![website](https://img.shields.io/website?url=https%3A%2F%2Fdeveloperfolio.web.app%2F)](https://developerfolio.web.app/) [![Buy me coffee](https://img.shields.io/badge/Buy%20me%20a%20coffee-donate-orange)](https://www.buymeacoffee.com/naveenjujaray)
 
 A clean, beautiful and responsive portfolio template with `Dark Mode` enabled for Developers!
 

diff --git a/lib/configure/githubapi.dart b/lib/configure/githubapi.dart
diff --git a/lib/configure/routing.dart b/lib/configure/routing.dart
@@ -1,5 +1,6 @@
 import 'package:DeveloperFolio/configure/centeredview.dart';
 import 'package:DeveloperFolio/include/CenteringOfPages/ContactCenter.dart';
+import 'package:DeveloperFolio/include/CenteringOfPages/Education.dart';
 import 'package:DeveloperFolio/include/Rows/contactpagemain.dart';
 import 'package:DeveloperFolio/pages/achievementspage.dart';
 import 'package:DeveloperFolio/pages/blogpage.dart';
@@ -13,7 +14,7 @@ import 'package:responsive_builder/responsive_builder.dart';
 
 const String SkillsRoute = 'skills';
 const String ProjectsRoute = 'projects';
-const String ProficiencyRoute = 'proficiency';
+const String EducationRoute = 'education';
 const String AchievementsRoute = 'achievements';
 const String ContactRoute = 'contact';
 const String BlogRoute = 'blogs';
@@ -36,12 +37,12 @@ Route<dynamic> generateRoute(RouteSettings settings) {
       tablet: CenteredViewTab(child: BlogPage(),),
       mobile: CenteredViewMob(child: BlogPage(),),
       ), settings.name);
-    case ProficiencyRoute:
+    case EducationRoute:
       return _getPageRoute(
         ScreenTypeLayout(
-      desktop: CenteredViewDesk(child: ProgressPage(),),
-      tablet: CenteredViewTab(child: ProgressPage(),),
-      mobile: CenteredViewMob(child: ProgressPage(),),
+      desktop: CenteredViewDesk(child: EducationDesk(),),
+      tablet: CenteredViewTab(child: EducationTab(),),
+      mobile: CenteredViewMob(child: EducationMob(),),
       ), settings.name);
     case AchievementsRoute:
       return _getPageRoute(

diff --git a/lib/include/navbar/drawer/drawernav.dart b/lib/include/navbar/drawer/drawernav.dart
@@ -18,7 +18,7 @@ class NavigationDrawer extends StatelessWidget {
           children: <Widget>[
             DrawerItem('Home', FontAwesomeIcons.home, HomeRoute),
             DrawerItem('Skills', FontAwesomeIcons.tasks, SkillsRoute),
-            DrawerItem('Proficiency', FontAwesomeIcons.chartBar, ProficiencyRoute),
+            DrawerItem('Education', FontAwesomeIcons.graduationCap, EducationRoute),
             DrawerItem('Open Source', FontAwesomeIcons.folderOpen, ProjectsRoute),
             DrawerItem('Achievements',FontAwesomeIcons.trophy, AchievementsRoute),
             DrawerItem('Blogs',FontAwesomeIcons.bloggerB, BlogRoute),

diff --git a/lib/include/navbar/logo/navbarlogo.dart b/lib/include/navbar/logo/navbarlogo.dart
@@ -1,3 +1,5 @@
+import 'package:DeveloperFolio/configure/routing.dart';
+import 'package:DeveloperFolio/pages/homepage.dart';
 import 'package:flutter/material.dart';
 import 'package:responsive_builder/responsive_builder.dart';
 
@@ -40,13 +42,13 @@ class NavbarLogoDesk extends StatelessWidget {
       height: 80,
       width: 500,
       child: Row(
-        children: [
-          Text('<', style: TextStyle(fontSize: 30),),
-          Text('Naveen Jujaray', style: TextStyle(color: Colors.blueAccent,fontSize: 30, fontFamily: 'Agustina'),),
-          Text('/', style: TextStyle(color: Colors.grey,fontSize: 40),),
-          Text('>', style: TextStyle(fontSize: 30),)
-        ],
-      )
+          children: [
+            Text('<', style: TextStyle(fontSize: 30),),
+            Text('Naveen Jujaray', style: TextStyle(color: Colors.blueAccent,fontSize: 30, fontFamily: 'Agustina'),),
+            Text('/', style: TextStyle(color: Colors.grey,fontSize: 40),),
+            Text('>', style: TextStyle(fontSize: 30),)
+          ],
+        )
       //Image.asset('assets/images/logo.png'),
     );
   }

diff --git a/lib/include/navbar/navigationbar.dart b/lib/include/navbar/navigationbar.dart
@@ -1,6 +1,9 @@
 import 'package:DeveloperFolio/configure/centeredview.dart';
 import 'package:DeveloperFolio/configure/navigation_service.dart';
 import 'package:DeveloperFolio/configure/routing.dart';
+import 'dart:js' as js;
+import 'dart:html' as html;
+
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -47,7 +50,9 @@ class NavbarTbDt extends StatelessWidget {
         child: Row(
     mainAxisAlignment: MainAxisAlignment.spaceBetween,
     children: <Widget>[
-      NavbarLogo(),
+      GestureDetector(
+       onTap: (){html.window.location.reload();},
+        child: NavbarLogo()),
       SingleChildScrollView(
         scrollDirection: Axis.horizontal,
               child: Container(
@@ -62,7 +67,7 @@ class NavbarTbDt extends StatelessWidget {
                   SizedBox(
                     width: 30,
                   ),
-                  NavbarItem('Proficiency', ProficiencyRoute),
+                  NavbarItem('Education', EducationRoute),
                   SizedBox(
                     width: 30,
                   ),
@@ -104,7 +109,9 @@ class NavbarMob extends StatelessWidget {
         mainAxisSize: MainAxisSize.max,
         mainAxisAlignment: MainAxisAlignment.start,
         children: <Widget>[
-          NavbarLogo(),
+          GestureDetector(
+            onTap: (){html.window.location.reload();},
+            child: NavbarLogo()),
           Expanded(child: Container(
             width: 100,
           )),