Skip to content

Commit

Permalink
[Add] Empty technology section
Browse files Browse the repository at this point in the history
  • Loading branch information
fredhii committed Jun 4, 2020
1 parent d3e9f12 commit 49fb370
Show file tree
Hide file tree
Showing 17 changed files with 187 additions and 53 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<br /><br />
<a href="https://github.com/CerberusData/landing/issues">Report Bug</a>
·
<a href="https://github.com/fredhii/CerberusData/landing/issues">Request Feature</a>
<a href="https://github.com/CerberusData/landing/issues">Request Feature</a>
</p>
</p>

Expand Down
Binary file modified assets/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/old_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions lib/constants/app_colors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ import 'package:flutter/material.dart';
/* ============================================================== */
/* Main Colors */
/* ============================================================== */
const Color primaryColor = Color.fromRGBO(210, 227, 252, 1.0); /* White */
/* const Color primaryColor = Color.fromRGBO(210, 227, 252, 1.0); /* White */
const Color secondaryColor = Color.fromRGBO(66, 133, 244, 1.0); /* Blue */
const Color ternaryColor = Color.fromRGBO(255, 166, 92, 1.0); /* Orange */

const Color ternaryColor = Color.fromRGBO(255, 166, 92, 1.0); /* Orange */ */
const Color primaryColor = Color(0xFFb2ebf2);
const Color secondaryColor = Color(0xFF00bcd4);
const Color ternaryColor = Color(0xFFff5722);



Expand Down
49 changes: 49 additions & 0 deletions lib/constants/theme.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import 'package:flutter/material.dart';

darkTheme(context)
{
return ThemeData(
fontFamily: 'GoogleSansRegular',
primarySwatch: Colors.blue,
primaryColor: Colors.black,
accentColor: Colors.blue,
disabledColor: Colors.grey,
cardColor: Color(0xff1f2124),
canvasColor: Colors.black,
brightness: Brightness.dark,
buttonTheme: Theme.of(context).buttonTheme.copyWith(
colorScheme: ColorScheme.dark(),
buttonColor: Colors.blue,
splashColor: Colors.black),
appBarTheme: AppBarTheme(
elevation: 0.0,
),
);
}
lightTheme(context)
{
return ThemeData(
fontFamily: 'GoogleSansRegular',
primarySwatch: Colors.blue,
primaryColor: Colors.white,
accentColor: Colors.blue,
disabledColor: Colors.grey,
cardColor: Colors.white,
canvasColor: Colors.white,
brightness: Brightness.light,
buttonTheme: Theme.of(context).buttonTheme.copyWith(
colorScheme: ColorScheme.light(),
buttonColor: Colors.blue,
splashColor: Colors.white),
appBarTheme: AppBarTheme(
elevation: 0.0,
),
);
}

/*
Black #000000
Gray #a3a3a3
White #FFFFFF
Purple #800080
*/
1 change: 1 addition & 0 deletions lib/router/route_names.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const String HomeRoute = '/home';
const String AboutRoute = '/about';
const String TechnologyRoute = '/technology';
const String SolutionsRoute = '/solutions';
3 changes: 3 additions & 0 deletions lib/router/router.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:cerberus/views/technology_view/tech_view.dart';
import 'package:flutter/material.dart';
import 'package:cerberus/views/about_view/about_view.dart';
import 'package:cerberus/views/home_view/home_view.dart';
Expand All @@ -10,6 +11,8 @@ Route<dynamic> generateRoute(RouteSettings settings) {
return _getPageRoute(HomeView(), settings);
case AboutRoute:
return _getPageRoute(AboutView(), settings);
case TechnologyRoute:
return _getPageRoute(TechnologyView(), settings);
case SolutionsRoute:
return _getPageRoute(SolutionsView(), settings);
default:
Expand Down
2 changes: 1 addition & 1 deletion lib/views/home_view/content/sectionOne/paragraph_one.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ParagraphOne extends StatelessWidget {
Text(
'Cerberus',
textAlign: textAlignment,
style: TextStyle(fontWeight: FontWeight.w500, fontSize: titleSize)
style: TextStyle(fontWeight: FontWeight.w500,fontSize: titleSize)
),
SizedBox(height: 20),
Text(
Expand Down
16 changes: 16 additions & 0 deletions lib/views/technology_view/tech_view.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import 'package:cerberus/views/technology_view/tech_view_mobile.dart';
import 'package:cerberus/views/technology_view/tech_view_tablet_desktop.dart';
import 'package:flutter/material.dart';
import 'package:responsive_builder/responsive_builder.dart';

class TechnologyView extends StatelessWidget {
const TechnologyView({Key key}) : super(key: key);

@override
Widget build(BuildContext context) {
return ScreenTypeLayout(
mobile: TechnologyViewMobile(),
desktop: TechnologyViewTabletDesktop(),
);
}
}
31 changes: 31 additions & 0 deletions lib/views/technology_view/tech_view_mobile.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import 'package:cerberus/widgets/footer/footer_main.dart';
import 'package:cerberus/widgets/navigation_bar/navbar_main.dart';
import 'package:flutter/material.dart';

import 'package:cerberus/views/technology_view/tech_view_tablet_desktop.dart';


class TechnologyViewMobile extends StatelessWidget {
const TechnologyViewMobile({Key key}) : super(key: key);

@override
Widget build(BuildContext context) {
return ListView( /* View list to enable scroll */
children: <Widget>[
NavBarMain(),

/* ============================= */
/* Insert your components here */
/* EXAMPLE: */

SizedBox(height: 100),
Center(child: CustomButton(text: 'Try it on Browser')),
SizedBox(height: 100),

/* ============================= */

FooterMain()
],
);
}
}
63 changes: 63 additions & 0 deletions lib/views/technology_view/tech_view_tablet_desktop.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import 'package:cerberus/constants/app_colors.dart';
import 'package:cerberus/widgets/footer/footer_main.dart';
import 'package:cerberus/widgets/navigation_bar/navbar_main.dart';
import 'package:flutter/material.dart';
import 'package:responsive_builder/responsive_builder.dart';
import 'package:cerberus/widgets/animations/hover/hover_extensions.dart';

class TechnologyViewTabletDesktop extends StatelessWidget {
const TechnologyViewTabletDesktop({Key key}) : super(key: key);

@override
Widget build(BuildContext context) {
return ListView( /* View list to enable scroll */
children: <Widget>[
NavBarMain(),

/* ============================= */
/* Insert your components here */
/* EXAMPLE: */

SizedBox(height: 100),
Center(child: CustomButton(text: 'Try it on Browser')),
SizedBox(height: 100),

/* ============================= */

FooterMain()
],
);
}
}



/* ============================================================ */
/* (Fredhii): If Correct button design move it as a widget */
/* ============================================================ */
class CustomButton extends StatelessWidget {
final String text;
/* final String command; */
/* const CustomButton({Key key, this.text, this.command}) : super(key: key); */
const CustomButton({Key key, this.text}) : super(key: key);

@override
Widget build(BuildContext context) {
return ResponsiveBuilder(builder: (context, sizingInformation) {
double sizeText = sizingInformation.isMobile ? 12 : 16;

return RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16.0)
),
color: secondaryColor,
textColor: Colors.white,
onPressed: () {},
/* onPressed: () { launch(command) }, Posible open tab using launch command from url_launcher library */
child: Text(
text, style: TextStyle(fontSize: sizeText),
),
).showCursorOnHover.moveUpOnHover;
});
}
}
5 changes: 3 additions & 2 deletions lib/widgets/navigation_bar/navbar_drawer/navbar_drawer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ class NavBarDrawer extends StatelessWidget {
children: <Widget>[
NavBarDrawerHeader(),
NavBarItem('Home', HomeRoute, icon: Icons.home),
NavBarItem('About', AboutRoute, icon: Icons.edit_attributes),
NavBarItem('Solutions', SolutionsRoute, icon: Icons.widgets),
NavBarItem('About', AboutRoute, icon: Icons.account_box),
NavBarItem('Technology', TechnologyRoute, icon: Icons.all_inclusive),
/* NavBarItem('Solutions', SolutionsRoute, icon: Icons.widgets), */
],
),
);
Expand Down
6 changes: 1 addition & 5 deletions lib/widgets/navigation_bar/navbar_logo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ class NavBarLogo extends StatelessWidget {
return Container(
height: 80,
width: 80,
decoration: BoxDecoration(
color: Colors.white,
shape: BoxShape.circle
),
child: Image.asset('assets/images/logo.png'),
);
}
}
}
10 changes: 6 additions & 4 deletions lib/widgets/navigation_bar/navbar_tablet_desktop.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ class TabletDesktopNavBar extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
NavBarItem('Home', HomeRoute),
SizedBox(width: 30,),
SizedBox(width: 30),
NavBarItem('About', AboutRoute),
SizedBox(width: 30,),
NavBarItem('Solutions', SolutionsRoute),
SizedBox(width: 30,),
SizedBox(width: 30),
NavBarItem('Technology', TechnologyRoute),
SizedBox(width: 30),
/* NavBarItem('Solutions', SolutionsRoute),
SizedBox(width: 30), */
RaisedButton(
color: secondaryColor,
shape:StadiumBorder(),
Expand Down
12 changes: 6 additions & 6 deletions lib/widgets/send_email/send_email.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:responsive_builder/responsive_builder.dart';
import 'package:cerberus/widgets/animations/hover/hover_extensions.dart';
import 'package:url_launcher/url_launcher.dart';

class SendEmail extends StatelessWidget {
@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -73,7 +73,7 @@ class SendEmail extends StatelessWidget {
child: InkWell(
onTap: () {
customLaunch(context,
'mailto:[email protected]?subject=test&body=$emailController.text');
'mailto:[email protected]?subject=Get%20Demo&body=$emailController.text');
},
child: Center(
child: Row(
Expand Down Expand Up @@ -133,13 +133,13 @@ void customLaunch(context, command) async {
/*
void customLaunch(context, mailaddress) async {
print('OK');
String username = '[email protected]';
final smtpServer = gmail(username, PASSWORD);
String username = '[email protected]';
final smtpServer = gmail(username, `PASSWORD`);
final message = Message()
..from = Address(username)
..recipients.add('[email protected]')
..subject = 'TEST'
..recipients.add('[email protected]')
..subject = 'Request Demo'
..text = mailaddress;
try {
Expand Down
30 changes: 1 addition & 29 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.1"
auto_size_text:
dependency: transitive
description:
name: auto_size_text
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
boolean_selector:
dependency: transitive
description:
Expand Down Expand Up @@ -86,20 +79,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.2"
http:
dependency: "direct main"
description:
name: http
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.1"
http_parser:
dependency: transitive
description:
name: http_parser
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.4"
intl:
dependency: transitive
description:
Expand Down Expand Up @@ -244,7 +223,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.15"
version: "0.2.16"
typed_data:
dependency: transitive
description:
Expand Down Expand Up @@ -287,13 +266,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.8"
velocity_x:
dependency: "direct main"
description:
name: velocity_x
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.4"
sdks:
dart: ">=2.7.0 <3.0.0"
flutter: ">=1.12.13+hotfix.5 <2.0.0"
2 changes: 0 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@ dependencies:
get_it:
provider_architecture:
provider: ^3.1.0
http: ^0.12.0+2
font_awesome_flutter: ^8.8.1
url_launcher: ^5.4.10
mailer: ^3.0.4
velocity_x: ^0.3.4


dev_dependencies:
Expand Down

0 comments on commit 49fb370

Please sign in to comment.