diff --git a/README.md b/README.md index 92eb535f2..86d5cadc7 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,7 @@ visais reikalingais failais ir įrankiais darbui: - Paprastas pavyzdys (Controller, Template, CSS) - Įdiegtas bootstrap - Asset'ų buildinimas (encore, yarn, sass) -- Travis CI template - +- GitHub actions (CI) pavyzdys # Paleidimo instrukcija diff --git a/assets/css/app.scss b/assets/css/app.scss index f955fad8f..d28649877 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -1,5 +1,6 @@ // customize some Bootstrap variables $primary: darken(#428bca, 20%); +$body-bg: #ff6b00; // the ~ allows you to reference things in node_modules @import "~bootstrap/scss/bootstrap"; diff --git a/composer.json b/composer.json index 5e4c82c5e..b8402c545 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,8 @@ "symfony/orm-pack": "^1.0", "symfony/twig-pack": "^1.0", "symfony/webpack-encore-bundle": "^1.7", - "symfony/yaml": "4.3.*" + "symfony/yaml": "4.3.*", + "ext-json": "*" }, "require-dev": { "squizlabs/php_codesniffer": "^3.5", diff --git a/public/students.json b/public/students.json new file mode 100644 index 000000000..c06cff4d5 --- /dev/null +++ b/public/students.json @@ -0,0 +1,181 @@ +{ + "team1": { + "name": "Team1", + "mentors": [ + "Mantas" + ], + "students": [ + "Tadas", + "Gytis", + "Ričardas" + ] + }, + "baltichalatai": { + "name": "BaltiChalatai", + "mentors": [ + "Lukas" + ], + "students": [ + "Vytas", + "Lukas", + "Diana" + ] + }, + "nnizer": { + "name": "ePacientas", + "mentors": [ + "Tadas" + ], + "students": [ + "Kornelijus", + "Dominykas", + "Miglė" + ] + }, + "activegen": { + "name": "ActiveGen", + "mentors": [ + "Arnoldas" + ], + "students": [ + "Andrius", + "Nojus", + "Martynas", + "Edvinas" + ] + }, + "mms": { + "name": "Membership-management-system", + "mentors": [ + "Mindaugas" + ], + "students": [ + "Erika", + "Rokas", + "Valentinas", + "Eligijus" + ] + }, + "pamainos": { + "name": "NFQ pamainu sistema", + "mentors": [ + "Paulius" + ], + "students": [ + "Liudas", + "Justina", + "Andrius" + ] + }, + "receptai": { + "name": "Receptai", + "mentors": [ + "Mantas" + ], + "students": [ + "Arnoldas", + "Arentas", + "Tautvydas" + ] + }, + "pulse": { + "name": "NFQ pulse", + "mentors": [ + "Lorenas" + ], + "students": [ + "Arvydas", + "Titas", + "Kristijonas", + "Andrius" + ] + }, + "lita": { + "name": "NFQ Petro atrankos problema akademijai", + "mentors": [ + "Paulius" + ], + "students": [ + "Kristina", + "Indrė", + "Dmitri" + ] + }, + "myfleet": { + "name": "MyFleet", + "mentors": [ + "Laurynas" + ], + "students": [ + "Artūras", + "Ignas", + "Jonas" + ] + }, + "career": { + "name": "NFQ Career Criteria Assessment", + "mentors": [ + "Erikas" + ], + "students": [ + "Matas", + "Andrius", + "Ainis" + ] + }, + "carparking": { + "name": "NFQ Car parking", + "mentors": [ + "Andrejus" + ], + "students": [ + "Kęstas", + "Lukas", + "Lukas" + ] + }, + "podcast": { + "name": "Krepšinio podcastai", + "mentors": [ + "Eligijus" + ], + "students": [ + "Edvardas", + "Nerijus", + "Kazimieras" + ] + }, + "Barakas": { + "name": "barakas", + "mentors": [ + "Armandas" + ], + "students": [ + "Raimondas", + "Mantas", + "Tomas" + ] + }, + "devcollab": { + "name": "Education sharing platform", + "mentors": [ + "Viktoras" + ], + "students": [ + "Karolis", + "Arnas", + "Evaldas", + "Algirdas" + ] + }, + "hacker'is po .mySubdomain &project=123": { + "name": "' OR 1 -- DROP DATABASE", + "mentors": [ + "Ponas Programišius" + ], + "students": [ + "Aurelijus", + "Ir jo \"geras\" draug'as" + ] + } +} \ No newline at end of file diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php index 90484f11f..21ff8c375 100644 --- a/src/Controller/HomeController.php +++ b/src/Controller/HomeController.php @@ -3,6 +3,7 @@ namespace App\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpKernel\KernelInterface; use Symfony\Component\Routing\Annotation\Route; class HomeController extends AbstractController @@ -10,10 +11,20 @@ class HomeController extends AbstractController /** * @Route("/", name="home") */ - public function index() + public function index(KernelInterface $kernel) { + $projects = json_decode(file_get_contents($kernel->getProjectDir().'/public/students.json'), true); + + $result=[]; + foreach ($projects as $projectName => $project) { + foreach ($project['students'] as $student) { + $result[] = ['student' => $student, 'project' => $projectName, 'mentors' => $project['mentors']]; + } + } + return $this->render('home/index.html.twig', [ - 'someVariable' => 'NFQ Akademija', + 'studentData' => $result, + 'projects' => $projects ]); } } diff --git a/src/Controller/StudentController.php b/src/Controller/StudentController.php new file mode 100644 index 000000000..9e297c00d --- /dev/null +++ b/src/Controller/StudentController.php @@ -0,0 +1,40 @@ +get('name', 'nenurodyta'); + $project=$request->get('project', 'nenurodyta'); + + + return $this->render('student/index.html.twig', [ + 'name' => $name, + 'project' => $project, + ]); + } + + /** + * @Route("/student/json", name="students-json") + * @param KernelInterface $kernel + * @return Response + */ + public function studentsjson(KernelInterface $kernel) + { + $students = json_decode(file_get_contents($kernel->getProjectDir().'/public/students.json'), true); + return $this->json($students); + } +} diff --git a/templates/base.html.twig b/templates/base.html.twig index e06313d52..e84ca0f06 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,5 +1,5 @@ - + diff --git a/templates/home/index.html.twig b/templates/home/index.html.twig index b1bd0115c..ff1a8bcc9 100644 --- a/templates/home/index.html.twig +++ b/templates/home/index.html.twig @@ -1,7 +1,57 @@ {% extends 'base.html.twig' %} -{% block title %}{{ someVariable }}{% endblock %} +{% block title %}Projektai{% endblock %} {% block body %} -
{{ someVariable }}
+ + +
+
+
+ +
+
+ +
+ +
+
+ + + + +
+ Duomenų failas +
+ {% endblock %} diff --git a/templates/student/index.html.twig b/templates/student/index.html.twig new file mode 100644 index 000000000..9c41ee2e2 --- /dev/null +++ b/templates/student/index.html.twig @@ -0,0 +1,33 @@ +{% extends 'base.html.twig' %} + +{% block title %}Hello StudentController!{% endblock %} + +{% block body %} +
+ + + + + + + + + + + +
ProjektasStudentas
{{ project }}{{ name}}
+ {% if name == 'Ričardas' %} + + {% else %} + + {% endif %} +
+ +
+ Visi studentai +
+{% endblock %} \ No newline at end of file