diff --git a/assets/buh.png b/assets/buh.png new file mode 100644 index 0000000..8682be9 Binary files /dev/null and b/assets/buh.png differ diff --git a/assets/callcenter.png b/assets/callcenter.png new file mode 100644 index 0000000..1eef934 Binary files /dev/null and b/assets/callcenter.png differ diff --git a/assets/it_jobs.json b/assets/it_jobs.json index 1adf85e..07f3e29 100644 --- a/assets/it_jobs.json +++ b/assets/it_jobs.json @@ -34,7 +34,7 @@ "description": "Специалист обладает знаниями и навыками эффективного продвижения бренда в сети, медиапланирования, создания креативных концепций, мобильных продуктов и e-commerce. Выпускник программы – востребованный специалист с перспективой работы на позиции директора.", "salary": "от 40 тыс руб до 80 тыс руб", "image": "5.png", - "link_text": "ПРОГРАММА DIGITAL КОММУНИКАЦИИ", + "link_text": "DIGITAL.COM", "links": [ "https://macs.school/departments/digital-communications/interactive-communications/" ] diff --git a/assets/rekruter.png b/assets/rekruter.png new file mode 100644 index 0000000..d23b07c Binary files /dev/null and b/assets/rekruter.png differ diff --git a/assets/routin_jobs.json b/assets/routin_jobs.json index 8b18fa0..4809953 100644 --- a/assets/routin_jobs.json +++ b/assets/routin_jobs.json @@ -1,6 +1,7 @@ [ { "name": "Бухгалтер", + "image": "buh.png", "predictions": [ { "name": "Аналитик big data", @@ -18,6 +19,7 @@ }, { "name": "Оператор call cetner", + "image": "callcenter.png", "predictions": [ { "name": "Менджер digital коммуникациям", @@ -35,6 +37,7 @@ }, { "name": "специалист по закупкам", + "image": "zakupki.png", "predictions": [ { "name": "Сетевой юрист", diff --git a/assets/snabzenie.png b/assets/snabzenie.png new file mode 100644 index 0000000..e8be7e5 Binary files /dev/null and b/assets/snabzenie.png differ diff --git a/assets/zakupki.png b/assets/zakupki.png new file mode 100644 index 0000000..c4bbd44 Binary files /dev/null and b/assets/zakupki.png differ diff --git a/lib/hellopage.dart b/lib/hellopage.dart index f09a81a..ffb7440 100644 --- a/lib/hellopage.dart +++ b/lib/hellopage.dart @@ -29,7 +29,7 @@ class _HelloPageState extends State { children: [ Container( padding: EdgeInsets.fromLTRB(10, 0, 16, 0), - child: Image.asset('assets/auth_page_image.png'), + child: Image.asset('assets/' + job.image), ), Container( alignment: Alignment(0.0, 0.0), diff --git a/lib/repository.dart b/lib/repository.dart index 163d008..085939b 100644 --- a/lib/repository.dart +++ b/lib/repository.dart @@ -80,15 +80,17 @@ class Prediction{ class RoutineJob { final String name; + final String image; final List predictions; - RoutineJob({this.name, this.predictions}); + RoutineJob({this.name, this.predictions, this.image}); factory RoutineJob.fromJson(Map json) { var predictionsJson = json['predictions']; var mapped = predictionsJson.map((j) => new Prediction.fromJson(j)).toList(); return new RoutineJob( name: json['name'] as String, + image: json['image'] as String, predictions: mapped, ); } diff --git a/lib/resultpage.dart b/lib/resultpage.dart index 745ba8a..6ca582e 100644 --- a/lib/resultpage.dart +++ b/lib/resultpage.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_web_browser/flutter_web_browser.dart'; +import 'package:istart/quizpage.dart'; import 'Repository.dart'; import 'util.dart'; @@ -53,15 +54,18 @@ class _ResultPageState extends State { child: Image.asset("assets/back.png"))), Container( padding: EdgeInsets.fromLTRB(16, 10, 16, 0), - height: 110, + height: 130, child: Column( children: [ - Text( - "Вот, что тебе подходит", - style: TextStyle( - fontSize: 30, - fontWeight: FontWeight.bold, - color: CustomColors.TextHeader), + Container( + margin: EdgeInsets.fromLTRB(0, 0, 0, 8), + child: Text( + "Вот, что тебе подходит", + style: TextStyle( + fontSize: 30, + fontWeight: FontWeight.bold, + color: CustomColors.TextHeader), + ), ), Text( 'Освой новую профессию', @@ -82,13 +86,13 @@ class _ResultPageState extends State { SizedBox( height: 27, ), - ], ); - if (selectedItJob != null){ + if (selectedItJob != null) { column.children.add(_buildJobDescription()); - }else{ - var filler = SizedBox(height: MediaQuery.of(context).size.height - 80 - 110 - 27 - 120); + } else { + var filler = SizedBox( + height: MediaQuery.of(context).size.height - 80 - 110 - 27 - 120); column.children.add(filler); } return Scaffold( @@ -114,7 +118,7 @@ class _ResultPageState extends State { Widget _buildNotMyButton() { return Container( width: MediaQuery.of(context).size.width / 1.2, - margin: EdgeInsets.fromLTRB(0, 18, 0, 50), + margin: EdgeInsets.fromLTRB(0, 36, 0, 50), height: 58, decoration: const BoxDecoration( gradient: LinearGradient( @@ -135,11 +139,18 @@ class _ResultPageState extends State { ), ], ), - child: Center( - child: const Text( - 'РАССКАЗАТЬ О СЕБЕ БОЛЬШЕ', - style: TextStyle( - color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold), + child: InkWell( + onTap: () => { + Navigator.of(context).pushReplacement(MaterialPageRoute( + builder: (context) => QuizPage(), + )) + }, + child: Center( + child: const Text( + 'РАССКАЗАТЬ О СЕБЕ БОЛЬШЕ', + style: TextStyle( + color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold), + ), ), ), ); @@ -184,6 +195,7 @@ class _ResultPageState extends State { height: 1.6, color: CustomColors.TextHeader))), Container( + padding: EdgeInsets.all(8), width: MediaQuery.of(context).size.width, margin: EdgeInsets.fromLTRB(22, 0, 22, 0), child: Text( @@ -261,7 +273,7 @@ class PredictionsList extends StatelessWidget { Widget _buildProductItem(BuildContext context, int index) { if (index == 0) { - return SizedBox(width: 48); + return SizedBox(width: 44); } var itJob = predictionItJobs[index - 1]; return Container(