Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#210 - main page #237

Merged
merged 53 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
42e2a61
#198 - Laravel application boilerplate
krzysztofrewak Jan 5, 2024
c0661f3
#198 - Laravel application boilerplate
krzysztofrewak Jan 5, 2024
454a363
#198 - i18n routing
krzysztofrewak Jan 5, 2024
b386aa7
#198 - i18n routing
krzysztofrewak Jan 23, 2024
c5868d7
#198 - wip
krzysztofrewak Jan 23, 2024
9c38b3c
#198 - wip
krzysztofrewak Jan 25, 2024
79348bb
#198 - controllers wip
krzysztofrewak Jan 29, 2024
7c546a7
#198 - dashboard wip
krzysztofrewak Feb 13, 2024
0bb4cb6
#198 - dashboard wip
krzysztofrewak Feb 14, 2024
ead8c43
#198 - dashboard wip
krzysztofrewak Feb 14, 2024
dfde2e0
#198 - dashboard wip
krzysztofrewak Feb 14, 2024
2a7b97f
#198 - Laravel 11 upgrade
krzysztofrewak Mar 20, 2024
a096d29
#198 - rewiring middleware
krzysztofrewak Mar 27, 2024
0b6fb30
#198 - bumping PHP in GHA
krzysztofrewak Mar 27, 2024
3a8d9b3
#198 - testing
krzysztofrewak Mar 27, 2024
252cffb
#198 - testing (wip)
krzysztofrewak Mar 27, 2024
7fbb148
#198 - testing (wip)
krzysztofrewak Mar 27, 2024
11967bd
#198 - testing (wip)
krzysztofrewak Mar 27, 2024
6272be4
#198 - testing (wip)
krzysztofrewak Mar 27, 2024
3391fa0
#198 - testing (wip)
krzysztofrewak Mar 27, 2024
17bc96e
#198 - testing (wip)
krzysztofrewak Mar 27, 2024
cb0a43b
#198 - testing (wip)
krzysztofrewak Mar 27, 2024
cf01e65
#198 - testing (wip)
krzysztofrewak Mar 27, 2024
f421d07
#198 - test case class update
kamilpiech97 Mar 27, 2024
0819b20
Merge remote-tracking branch 'origin/#198-laravel' into #198-laravel
kamilpiech97 Mar 27, 2024
5718f15
nav and footer
AleksandraKozubal Mar 29, 2024
066c530
update home page
AleksandraKozubal Apr 4, 2024
2ddaac2
wip
AleksandraKozubal Apr 8, 2024
570e325
wip
AleksandraKozubal Apr 8, 2024
e0f0a35
wip
AleksandraKozubal Apr 11, 2024
02fad7f
Merge branch 'main' into #210-main-page
AleksandraKozubal Apr 11, 2024
76c5609
wip
AleksandraKozubal Apr 11, 2024
8dbde3c
hamburger menu, update case study section, nav and footer
AleksandraKozubal Apr 15, 2024
a8a94f0
update styles, footer and case study
AleksandraKozubal Apr 15, 2024
33e27f0
add colors on icons, fix testimonial
AleksandraKozubal Apr 15, 2024
9d26a68
wip
AleksandraKozubal Apr 26, 2024
83f5772
Merge branch 'main' into #210-main-page
AleksandraKozubal Apr 30, 2024
dd02b40
wip
AleksandraKozubal Apr 30, 2024
1fe5d33
Merge remote-tracking branch 'origin/#210-main-page' into #210-main-page
AleksandraKozubal Apr 30, 2024
0640382
fix
AleksandraKozubal Apr 30, 2024
789217e
fix padding, remove controllers and unnecessary files
AleksandraKozubal May 7, 2024
57e2212
cr changes
AleksandraKozubal May 7, 2024
202592d
cr changes
AleksandraKozubal May 8, 2024
060a1e1
tech icon changes
AleksandraKozubal May 8, 2024
9216d03
cr changes
AleksandraKozubal May 8, 2024
acaf7bb
cr changes
AleksandraKozubal May 9, 2024
fcf8f60
cr changes
AleksandraKozubal May 9, 2024
463f02d
bg gradient changes
AleksandraKozubal May 9, 2024
ec87e7a
update tech icons
AleksandraKozubal May 9, 2024
ebc3b94
remove z index
AleksandraKozubal May 9, 2024
bcfbd8d
update nav, remove css class
AleksandraKozubal May 9, 2024
83cb1d0
rollback nav
AleksandraKozubal May 9, 2024
72419fe
change padding,lang
AleksandraKozubal May 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions app/Http/Controllers/Dashboard/AuthenticationController.php
kamilpiech97 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

declare(strict_types=1);

namespace Blumilk\Website\Http\Controllers\Dashboard;

use Blumilk\Website\Http\Controllers\Controller;
use Illuminate\Auth\AuthManager;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Symfony\Component\HttpFoundation\RedirectResponse;

class AuthenticationController extends Controller
{
public function get(Factory $factory): View
{
return $factory->make("dashboard.login");
}

public function login(Request $request, AuthManager $auth, Redirector $redirect): RedirectResponse
{
$credentials = $request->only("email", "password");

if ($auth->attempt($credentials)) {
$request->session()->regenerate();

return $redirect->route("dashboard");
}

return $redirect->back()->withErrors([
"email" => "Niepoprawne dane logowania",
]);
}

public function logout(Request $request, AuthManager $auth, Redirector $redirect): RedirectResponse
{
$auth->logout();

$request->session()->invalidate();
$request->session()->regenerateToken();

return $redirect->route("home");
}
}
17 changes: 17 additions & 0 deletions app/Http/Controllers/Dashboard/DashboardController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

declare(strict_types=1);

namespace Blumilk\Website\Http\Controllers\Dashboard;

use Blumilk\Website\Http\Controllers\Controller;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;

class DashboardController extends Controller
{
public function __invoke(Factory $factory): View
{
return $factory->make("dashboard.dashboard");
}
}
36 changes: 36 additions & 0 deletions app/Http/Controllers/Dashboard/PasswordUpdateController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

declare(strict_types=1);

namespace Blumilk\Website\Http\Controllers\Dashboard;

use Blumilk\Website\Http\Controllers\Controller;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\Rules\Password;

class PasswordUpdateController extends Controller
{
public function edit(Factory $factory): View
{
return $factory->make("dashboard.password");
}

public function update(Request $request): RedirectResponse
{
$validated = $request->validate([
"current_password" => ["required", "current_password"],
"password" => ["required", Password::defaults(), "confirmed"],
]);
kamilpiech97 marked this conversation as resolved.
Show resolved Hide resolved

$request->user()->update([
"password" => Hash::make($validated["password"]),
kamilpiech97 marked this conversation as resolved.
Show resolved Hide resolved
]);

return redirect()->back()
->with("success", "Zaktualizowano hasło");
}
}
11 changes: 11 additions & 0 deletions lang/en/buttons.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

declare(strict_types=1);

return [
"lets_talk" => "Let's talk",
"text_us" => "Text us!",
"all_projects" => "See all projects",
"case_study" => "Go to case study",
"see_all" => "See all",
];
38 changes: 32 additions & 6 deletions lang/en/content.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,36 @@
declare(strict_types=1);

return [
"pages.home" => "home",
"pages.about" => "about",
"pages.case_study" => "case study",
"pages.partners" => "partners",
"pages.career" => "career",
"pages.contact" => "contact",
"pages.about" => "About",
"pages.case_study" => "Case Study",
"pages.partners" => "Partners",
"pages.career" => "Career",
"pages.contact" => "Contact",
"section_1.title_1" => "Software",
"section_1.title_2" => "tailored",
"section_1.title_3" => "to Your Needs",
EwelinaSkrzypacz marked this conversation as resolved.
Show resolved Hide resolved
"section_1.subtitle_1" => "We are passionate about creating web/mobile applications and advanced R&D projects.",
"section_1.subtitle_2" => "We turn concepts into working solutions.",
"section_2.title_1" => "Join the ranks of ",
"section_2.title_2" => "satisfied Blumilk customers",
"section_3.title_1" => "How Can We Help You?",
EwelinaSkrzypacz marked this conversation as resolved.
Show resolved Hide resolved
"section_3.subtitle_1" => "Research, development, code: shaping the future of software.",
"section_3.content_1" => "R&D Projects",
EwelinaSkrzypacz marked this conversation as resolved.
Show resolved Hide resolved
"section_3.content_2" => "IT Solutions Audits",
EwelinaSkrzypacz marked this conversation as resolved.
Show resolved Hide resolved
"section_3.content_3" => "Business and Process Digitization",
EwelinaSkrzypacz marked this conversation as resolved.
Show resolved Hide resolved
"section_3.content_4" => "Dedicated Mobile and Web Applications",
EwelinaSkrzypacz marked this conversation as resolved.
Show resolved Hide resolved
"section_3.title_2" => "We design solutions",
"section_3.subtitle_2" => "With a focus on hundred percent satisfaction of our clients and partners.",
"section_4.badge" => "see how we work",
"section_4.title_1" => "Case Study",
"section_4.subtitle_1" => "Learn how our implementations transformed clients' challenges into ",
"section_4.subtitle_2" => "effective solutions.",
"section_5.title_1" => "Tech Stack",
"section_5.subtitle_1" => "PHP and Laravel are our main tools. GitHub serves as our central platform, enabling code review and CI/CD through GitHub Actions. We build the frontend using Vue.js and utilize various database management systems, such as MySQL and PostgreSQL.",
"section_6.badge" => "reviews",
"section_6.title_1" => "What Others Say About Us",
"section_6.subtitle_1" => "Our clients' opinions are very important, ",
"section_6.subtitle_2" => "they attest to the quality of our services ",
"section_6.subtitle_3" => "and inspire us to constantly improve.",
"section_7.title_1" => "Our Activities",
EwelinaSkrzypacz marked this conversation as resolved.
Show resolved Hide resolved
];
14 changes: 14 additions & 0 deletions lang/en/footer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

declare(strict_types=1);

return [
"contact.title" => "Contact",
"contact.subtitle" => "If you are looking for a solution tailored to your unique needs, we are here for you! We are waiting for your message!",
"form.email" => "E-mail",
"form.title" => "Message title",
"form.message" => "Message",
"form.policy" => "Privacy policy",
"contactTo.job" => "Development manager",
"contactTo.description" => "Hi, I'm Kasia! I will be happy to talk about the development of your business. Write me an email or call me, and we will definitely find the right solution.",
];
11 changes: 11 additions & 0 deletions lang/pl/buttons.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

declare(strict_types=1);

return [
"lets_talk" => "Porozmawiajmy",
"text_us" => "Napisz do nas!",
"all_projects" => "Zobacz wszystkie projekty",
"case_study" => "Przejdź do case study",
"see_all" => "Zobacz wszystkie",
];
11 changes: 11 additions & 0 deletions lang/pl/case_studies.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

declare(strict_types=1);

return [
"Project" => "Projekt",
"Client" => "Klient",
"Goal" => "Cel",
"Scope" => "Zakres",
"Technologies" => "Technologie",
];
38 changes: 32 additions & 6 deletions lang/pl/content.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,36 @@
declare(strict_types=1);

return [
"pages.home" => "strona główna",
"pages.about" => "o firmie",
"pages.case_study" => "case study",
"pages.partners" => "partnerzy",
"pages.career" => "kariera",
"pages.contact" => "kontakt",
"pages.about" => "o Firmie",
EwelinaSkrzypacz marked this conversation as resolved.
Show resolved Hide resolved
"pages.case_study" => "Case Study",
"pages.partners" => "Partnerzy",
"pages.career" => "Kariera",
"pages.contact" => "Kontakt",
"section_1.title_1" => "Oprogramowanie",
"section_1.title_2" => "dopasowane",
"section_1.title_3" => "do Twoich potrzeb",
"section_1.subtitle_1" => "Jesteśmy pasjonatami tworzenia aplikacji web/mobile oraz zaawansowanych projektów B+R.",
"section_1.subtitle_2" => "Zmieniamy koncepcje w działające rozwiązania.",
"section_2.title_1" => "Dołącz do grona ",
"section_2.title_2" => "zadowolonych klientów Blumilk",
"section_3.title_1" => "Jak możemy Ci pomóc?",
"section_3.subtitle_1" => "Badania, rozwój, kod: kształtujemy przyszłość oprogramowania. ",
"section_3.content_1" => "Projekty B+R",
"section_3.content_2" => "Audyty rozwiązań IT",
"section_3.content_3" => "Cyfryzacja biznesu i procesów",
"section_3.content_4" => "Dedykowane aplikacje mobilne i webowe",
"section_3.title_2" => "Projektujemy rozwiązania",
"section_3.subtitle_2" => "W trosce o stuprocentowe zadowolenie naszych klientów i partnerów.",
"section_4.badge" => "zobacz jak działamy",
"section_4.title_1" => "Case study",
"section_4.subtitle_1" => "Dowiedz się jak nasze realizacje przekształciły wyzwania klientów w ",
"section_4.subtitle_2" => "skuteczne rozwiązania.",
"section_5.title_1" => "Tech stack",
"section_5.subtitle_1" => "PHP i Laravel to nasze główne narzędzie pracy. GitHub stanowi naszą centralną platformę, umożliwiającą code review oraz CI/CD za pomocą GitHub Actions. Frontend budujemy z użyciem Vue.js, a także korzystamy z różnych systemów zarządzania bazami danych, tj. MySQL i PostgreSQL.",
"section_6.badge" => "opinie",
"section_6.title_1" => "Co mówią o nas inni",
"section_6.subtitle_1" => "Opinie naszych klientów są bardzo ważne, ",
"section_6.subtitle_2" => "świadczą o jakości naszych usług ",
"section_6.subtitle_3" => "i inspirują nas do nieustannego doskonalenia.",
"section_7.title_1" => "Nasze aktywności",
];
14 changes: 14 additions & 0 deletions lang/pl/footer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

declare(strict_types=1);

return [
"contact.title" => "Kontakt",
"contact.subtitle" => "Jeśli szukasz rozwiązania dostosowanego do Twoich unikalnych potrzeb, jesteśmy dla Ciebie! Czekamy na Twoją wiadomość!",
"form.email" => "E-mail",
"form.title" => "Tytuł wiadomości",
"form.message" => "Wiadomość",
"form.policy" => "Polityka prywatności",
"contactTo.job" => "Menedżer ds. rozwoju",
"contactTo.description" => "Cześć, jestem Kasia! Z przyjemnością porozmawiam o rozwoju Twojego biznesu. Napisz do mnie e-mail lub zadzwoń, a na pewno znajdziemy odpowiednie rozwiązanie.",
];
8 changes: 7 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"@tailwindcss/typography": "^0.5.10",
"alpinejs": "^3.13.5",
"laravel-vite-plugin": "^1.0.2",
"tailwindcss": "^3.3.5"
"tailwindcss": "^3.3.5",
"taos": "^1.0.5"
},
"devDependencies": {
"@blumilksoftware/eslint-config": "^2.0.0",
Expand Down
34 changes: 34 additions & 0 deletions public/articles.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[
{
"imageSrc": "https://images.unsplash.com/photo-1496128858413-b36217c2ce36?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3603&q=80",
"date": "2020-03-16",
"dateFormatted": "16/03 2020",
"firstText": "Cyberbezpieczeństwo - wywiad dla",
"secondText": "Radio złote przeboje",
"articleRoute": "case-studies"
},
{
"imageSrc": "https://images.unsplash.com/photo-1547586696-ea22b4d4235d?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3270&q=80",
"date": "2020-01-01",
"dateFormatted": "01/01 2020",
"firstText": "Inna tematyka",
"secondText": "Inna treść",
"articleRoute": "case-studies"
},
{
"imageSrc": "https://images.unsplash.com/photo-1492724441997-5dc865305da7?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3270&q=80",
"date": "2020-01-01",
"dateFormatted": "01/01 2020",
"firstText": "Inna tematyka",
"secondText": "Inna treść",
"articleRoute": "case-studies"
},
{
"imageSrc": "https://images.unsplash.com/photo-1496128858413-b36217c2ce36?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3603&q=80",
"date": "2020-03-16",
"dateFormatted": "16/03 2020",
"firstText": "Cyberbezpieczeństwo - wywiad dla",
"secondText": "Radio złote przeboje",
"articleRoute": "case-studies"
}
]
23 changes: 23 additions & 0 deletions public/case_studies.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[
{
"Projekt": "Aplikacja e-commerce",
"Klient": "Firma XYZ",
"Cel": "Zwiększenie sprzedaży online o 30% w ciągu roku",
"Zakres": "Rozwój nowej platformy e-commerce z intuicyjnym interfejsem, integracja z systemami płatności, optymalizacja dla urządzeń mobilnych",
"Technologie": "Node.js, React, MongoDB, Stripe API"
},
{
"Projekt": "System zarządzania relacjami z klientami (CRM)",
"Klient": "Firma ABC",
"Cel": "Automatyzacja procesów sprzedaży i obsługi klienta, poprawa wydajności działu sprzedaży",
"Zakres": "Rozwój spersonalizowanego systemu CRM umożliwiającego zarządzanie kontaktami, śledzenie potencjalnych klientów, analizę danych sprzedażowych",
"Technologie": "Salesforce, Java, MySQL, Angular"
},
{
"Projekt": "Aplikacja mobilna do zdalnego zarządzania flotą",
"Klient": "Firma transportowa XYZ",
"Cel": "Optymalizacja logistyki, zwiększenie efektywności zarządzania flotą",
"Zakres": "Rozwój aplikacji mobilnej do monitorowania pojazdów, śledzenia trasy, zarządzania kierowcami i zamówieniami",
"Technologie": "Swift, Firebase, Google Maps API, Kotlin"
}
]
Binary file added public/fonts/Sora-VariableFont_wght.ttf
Binary file not shown.
Binary file added public/gifs/book.gif
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 public/gifs/calendar.gif
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 public/gifs/deadlift.gif
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 public/gifs/diamond.gif
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 public/gifs/english_language.gif
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 public/gifs/graduate.gif
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 public/gifs/hold_on.gif
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 public/gifs/idea.gif
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 public/gifs/innovation.gif
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 public/gifs/love.gif
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 public/gifs/medicine.gif
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 public/gifs/quote.gif
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 public/gifs/society.gif
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 public/gifs/tropical_fruit.gif
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 public/gifs/verified.gif
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 public/gifs/video_conference.gif
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 public/graphics/binary.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading