Added timezone to registration

solidtime-io · Mar 19, 2024 · 492b11e · 492b11e
1 parent b76da91
commit 492b11e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
@@ -6,6 +6,7 @@
 
 use App\Models\Organization;
 use App\Models\User;
+use App\Service\TimezoneService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
@@ -48,11 +49,17 @@ public function create(array $input): User
             'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '',
         ])->validate();
 
-        return DB::transaction(function () use ($input) {
+        $timezone = 'UTC';
+        if (isset($input['timezone']) && is_string($input['timezone']) && app(TimezoneService::class)->isValid($input['timezone'])) {
+            $timezone = $input['timezone'];
+        }
+
+        return DB::transaction(function () use ($input, $timezone) {
             return tap(User::create([
                 'name' => $input['name'],
                 'email' => $input['email'],
                 'password' => Hash::make($input['password']),
+                'timezone' => $timezone,
             ]), function (User $user) {
                 $this->createTeam($user);
             });

diff --git a/app/Service/TimezoneService.php b/app/Service/TimezoneService.php
@@ -32,4 +32,9 @@ public function getSelectOptions(): array
 
         return $options;
     }
+
+    public function isValid(string $timezone): bool
+    {
+        return in_array($timezone, $this->getTimezones(), true);
+    }
 }
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -23,7 +23,7 @@ public function up(): void
             $table->boolean('is_placeholder')->default(false);
             $table->foreignUuid('current_team_id')->nullable();
             $table->string('profile_photo_path', 2048)->nullable();
-            $table->string('timezone')->nullable();
+            $table->string('timezone');
             $table->timestamps();
 
             $table->uniqueIndex('email')

diff --git a/playwright.config.ts b/playwright.config.ts
@@ -18,7 +18,7 @@ export default defineConfig({
     /* Retry on CI only */
     retries: process.env.CI ? 1 : 0,
     /* Opt out of parallel tests on CI. */
-    workers: process.env.CI ? 1 : undefined,
+    workers: process.env.CI ? 1 : 1,
     /* Reporter to use. See https://playwright.dev/docs/test-reporters */
     reporter: process.env.CI ? 'line' : 'html',
     /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */

diff --git a/resources/js/Pages/Auth/Register.vue b/resources/js/Pages/Auth/Register.vue
@@ -15,6 +15,7 @@ const form = useForm({
     password: '',
     password_confirmation: '',
     terms: false,
+    timezone: Intl.DateTimeFormat().resolvedOptions().timeZone ?? null,
 });
 
 const submit = () => {

diff --git a/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue b/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
@@ -203,8 +203,17 @@ const page = usePage<{
             <!-- Timezone -->
             <div class="col-span-6 sm:col-span-4">
                 <InputLabel for="timezone" value="Timezone" />
-                <select name="timezone" id="timezone" v-model="form.timezone" class="mt-1 block w-full border-input-border bg-input-background text-white focus:border-input-border-active rounded-md shadow-sm">
-                    <option v-for="timezone in $page.props.timezones" :value="timezone">
+                <select
+                    name="timezone"
+                    id="timezone"
+                    v-model="form.timezone"
+                    required
+                    class="mt-1 block w-full border-input-border bg-input-background text-white focus:border-input-border-active rounded-md shadow-sm">
+                    <option value="" disabled>Select a Timezone</option>
+                    <option
+                        v-for="timezone in $page.props.timezones"
+                        :key="timezone"
+                        :value="timezone">
                         {{ timezone }}
                     </option>
                 </select>