Skip to content

Commit 50e51d9

Browse files
stevanpostevanpo
authored
Revert "Dev"
1 parent c5015f9 commit 50e51d9

39 files changed

Lines changed: 954 additions & 3429 deletions

‎app/Http/Controllers/AmbassadorController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function index(UserFilters $filters)
2525
return redirect('ambassadors?country_iso='.$country_iso);
2626
}
2727

28-
$ambassadors = User::role('ambassador')->filter($filters)->whereNotNull('avatar_path')->whereNotNull('bio')->get();
28+
$ambassadors = User::role('ambassador')->filter($filters)->whereNotNull('avatar_path')->whereNotNull('bio')->paginate(10);
2929

3030
return view('ambassadors')->with([
3131
'ambassadors' => $ambassadors,

‎app/Http/Controllers/CommunityController.php‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@ public function index(UserFilters $filters)
1717
return redirect('community?country_iso='.$country_iso);
1818
}
1919

20-
$ambassadors = User::role('ambassador')
21-
->filter($filters)
22-
->whereNotNull('avatar_path')
23-
->whereNotNull('bio')
24-
->whereNotNull('city_id') // Ensure city is set
25-
->with('city') // Load city details
26-
->get();
20+
$ambassadors = User::role('ambassador')->filter($filters)->whereNotNull('avatar_path')->whereNotNull('bio')->paginate(10);
2721

2822
$teachers = User::role('leading teacher')->where('approved', 1)->with('city')->get();
2923

‎app/Http/Controllers/HomeController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function index(Request $request): View
1313
[
1414
'title' => 'Girls in Digital',
1515
'description' => 'Explore and embrace digital opportunities—empowering a new generation of girls in digital!',
16-
'url' => 'https://codeweek.eu/girls-in-digital-week',
16+
'url' => 'https://codeweek.eu/blog/girls-in-digital-week/',
1717
'style_color' => 'background-image: linear-gradient(36.92deg, #1C4DA1 20.32%, #0040AE 28.24%);',
1818
'btn_lang' => 'home.get_involved',
1919
],

‎database/seeders/CountrySeeder.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace Database\Seeders;
44

55
use Illuminate\Database\Seeder;
6-
use Illuminate\Support\Facades\DB;
7-
use App\Country; // Ensure correct model namespace
86

97
class CountrySeeder extends Seeder
108
{
@@ -25,7 +23,11 @@ public function run(): void
2523
['iso' => 'EE', 'name' => 'Estonia', 'longitude' => '1.234', 'latitude' => '5.678'],
2624
['iso' => 'FI', 'name' => 'Finland', 'longitude' => '1.234', 'latitude' => '5.678'],
2725
['iso' => 'FR', 'name' => 'France', 'longitude' => '1.234', 'latitude' => '5.678'],
26+
['iso' => 'GF', 'name' => 'French Guiana', 'longitude' => '1.234', 'latitude' => '5.678'],
27+
['iso' => 'PF', 'name' => 'French Polynesia', 'longitude' => '1.234', 'latitude' => '5.678'],
28+
['iso' => 'TF', 'name' => 'French Southern Territories', 'longitude' => '1.234', 'latitude' => '5.678'],
2829
['iso' => 'DE', 'name' => 'Germany', 'longitude' => '1.234', 'latitude' => '5.678'],
30+
['iso' => 'GI', 'name' => 'Gibraltar', 'longitude' => '1.234', 'latitude' => '5.678'],
2931
['iso' => 'GR', 'name' => 'Greece', 'longitude' => '1.234', 'latitude' => '5.678'],
3032
['iso' => 'IE', 'name' => 'Ireland', 'longitude' => '1.234', 'latitude' => '5.678'],
3133
['iso' => 'IT', 'name' => 'Italy', 'longitude' => '1.234', 'latitude' => '5.678'],
@@ -38,13 +40,11 @@ public function run(): void
3840
['iso' => 'ES', 'name' => 'Spain', 'longitude' => '1.234', 'latitude' => '5.678'],
3941
];
4042

43+
//dd($countries[0]["iso"]);
44+
4145
foreach ($countries as $country) {
42-
Country::updateOrCreate(
43-
['iso' => $country['iso']], // Ensure uniqueness by ISO code
44-
$country
45-
);
46+
factory(App\Country::class)->create($country);
4647
}
4748

48-
$this->command->info("✅ Countries seeded successfully!");
4949
}
5050
}

‎database/seeders/DatabaseSeeder.php‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,17 @@ class DatabaseSeeder extends Seeder
1212
public function run(): void
1313
{
1414

15-
$this->call(CountriesTableSeeder::class);
16-
$this->call(CitiesTableSeeder::class);
17-
18-
// Roles, permissions, users
15+
//$this->call(CountriesTableSeeder::class);
16+
//$this->call(CitiesTableSeeder::class);
1917
$this->call(RolesAndPermissionsSeeder::class);
2018
$this->call(LeadingTeacherRoleSeeder::class);
2119
$this->call(UserSeeder::class);
22-
23-
// Additional data
2420
$this->call(AudienceTableSeeder::class);
2521
$this->call(ThemeTableSeeder::class);
26-
$this->call(EventSeeder::class);
27-
$this->call(OldSeeder::class);
28-
// ... and so on
29-
30-
// Resource seeders
31-
$this->call(ResourceEditorRoleSeeder::class);
32-
33-
$this->call(SchoolSeeder::class);
22+
//$this->call(ResourceSeeder::class);
3423

24+
//$this->call(OldSeeder::class);
25+
//$this->call(EventSeeder::class);
3526

3627
}
3728
}

‎database/seeders/LeadingTeacherExpertiseSeeder.php‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,46 @@ class LeadingTeacherExpertiseSeeder extends Seeder
1212
*/
1313
public function run(): void
1414
{
15-
// Ensure data is seeded only if it doesn't already exist
16-
$expertises = [
17-
['position' => 10, 'name' => 'Teacher Trainer'],
18-
['position' => 20, 'name' => 'Community Organiser'],
19-
['position' => 30, 'name' => 'Expert in unplugged programming'],
20-
['position' => 40, 'name' => 'Expert in Scratch'],
21-
['position' => 50, 'name' => 'Expert in Robotics'],
22-
['position' => 60, 'name' => 'Expert in programming (Python, C++, SQL, etc.)'],
23-
['position' => 70, 'name' => 'Expert in remote/hybrid teaching'],
24-
['position' => 80, 'name' => 'Expert in use of remote teaching platforms'],
25-
];
15+
create(LeadingTeacherExpertise::class, [
16+
'id' => 1,
17+
'position' => 10,
18+
'name' => 'Teacher Trainer',
19+
]);
20+
create(LeadingTeacherExpertise::class, [
21+
'id' => 2,
22+
'position' => 20,
23+
'name' => 'Community Organiser',
24+
]);
25+
create(LeadingTeacherExpertise::class, [
26+
'id' => 3,
27+
'position' => 30,
28+
'name' => 'Expert in unplugged programming',
29+
]);
30+
create(LeadingTeacherExpertise::class, [
31+
'id' => 4,
32+
'position' => 40,
33+
'name' => 'Expert in Scratch',
34+
]);
35+
create(LeadingTeacherExpertise::class, [
36+
'id' => 5,
37+
'position' => 50,
38+
'name' => 'Expert in Robotics',
39+
]);
40+
create(LeadingTeacherExpertise::class, [
41+
'id' => 6,
42+
'position' => 60,
43+
'name' => 'Expert in programming (Python, C++, SQL, etc.)',
44+
]);
45+
create(LeadingTeacherExpertise::class, [
46+
'id' => 7,
47+
'position' => 70,
48+
'name' => 'Expert in remote/hybrid teaching',
49+
]);
50+
create(LeadingTeacherExpertise::class, [
51+
'id' => 8,
52+
'position' => 80,
53+
'name' => 'Expert in use of remote teaching platforms',
54+
]);
2655

27-
foreach ($expertises as $expertise) {
28-
LeadingTeacherExpertise::updateOrCreate(
29-
['name' => $expertise['name']], // Check for existing entry by name
30-
['position' => $expertise['position']]
31-
);
32-
}
33-
34-
$this->command->info("✅ Leading teacher expertises seeded successfully!");
3556
}
3657
}

‎database/seeders/LeadingTeacherRoleSeeder.php‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@ public function run(): void
1616
// Reset cached roles and permissions
1717
app()['cache']->forget('spatie.permission.cache');
1818

19-
// Check if permission already exists before creating
20-
$permission = Permission::firstOrCreate(['name' => 'submit resource']);
19+
// create permissions
20+
Permission::create(['name' => 'submit resource']);
2121

22-
// Check if role already exists before creating
23-
$leadingTeacherRole = Role::firstOrCreate(['name' => 'leading teacher']);
24-
if (!$leadingTeacherRole->hasPermissionTo($permission)) {
25-
$leadingTeacherRole->givePermissionTo($permission);
26-
}
22+
// create roles and assign created permissions
23+
$leadingTeacherRole = Role::create(['name' => 'leading teacher']);
24+
$leadingTeacherRole->givePermissionTo(['submit resource']);
2725

28-
Role::firstOrCreate(['name' => 'leading teacher admin']);
26+
$leadingTeacherAdminRole = Role::create(['name' => 'leading teacher admin']);
2927

30-
$this->command->info("✅ Leading Teacher roles and permissions seeded successfully!");
3128
}
3229
}

‎database/seeders/LeadingTeacherSeeder.php‎

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
namespace Database\Seeders;
44

55
use Illuminate\Database\Seeder;
6-
use App\User;
7-
use Spatie\Permission\Models\Role;
8-
use Illuminate\Support\Facades\File;
96

107
class LeadingTeacherSeeder extends Seeder
118
{
@@ -14,63 +11,10 @@ class LeadingTeacherSeeder extends Seeder
1411
*/
1512
public function run(): void
1613
{
17-
// Call related seeders first
14+
1815
$this->call(LeadingTeacherRoleSeeder::class);
1916
$this->call(CitiesTableSeeder::class);
2017
$this->call(LeadingTeacherExpertiseSeeder::class);
2118

22-
// Load JSON File
23-
$jsonPath = storage_path('app/leading_teachers.json');
24-
25-
if (!File::exists($jsonPath)) {
26-
$this->command->error("❌ JSON file not found: $jsonPath");
27-
return;
28-
}
29-
30-
// Decode JSON
31-
$jsonData = File::get($jsonPath);
32-
$teachers = json_decode($jsonData, true);
33-
34-
if (!$teachers) {
35-
$this->command->error("❌ Invalid JSON structure.");
36-
return;
37-
}
38-
39-
// Get the "leading teacher" role
40-
$role = Role::where('name', 'leading teacher')->first();
41-
if (!$role) {
42-
$this->command->error("❌ Role 'leading teacher' does not exist!");
43-
return;
44-
}
45-
46-
// Insert Data
47-
$count = 0;
48-
foreach ($teachers as $teacherData) {
49-
// Create or update user
50-
$user = User::updateOrCreate(
51-
['email' => $teacherData['email']], // Ensure uniqueness by email
52-
[
53-
'firstname' => $teacherData['firstname'] ?? '',
54-
'lastname' => $teacherData['lastname'] ?? '',
55-
'email' => $teacherData['email'],
56-
'country_iso' => $teacherData['country_iso'] ?? null,
57-
'twitter' => $teacherData['twitter'] ?? null,
58-
'website' => $teacherData['website'] ?? null,
59-
'bio' => $teacherData['bio'] ?? null,
60-
'avatar_path' => $teacherData['avatar_path'] ?? '/images/default-avatar.png',
61-
'city_id' => $teacherData['city_id'] ?? null,
62-
'email_verified_at' => $teacherData['email_verified_at'] ?? now(),
63-
]
64-
);
65-
66-
// Assign role if not already assigned
67-
if (!$user->hasRole('leading teacher')) {
68-
$user->assignRole($role);
69-
}
70-
71-
$count++;
72-
}
73-
74-
$this->command->info("✅ Imported $count leading teachers successfully!");
7519
}
7620
}

0 commit comments

Comments
 (0)