Merge branch 'main' of github.com:solidtime-io/solidtime

resources/js/Components/OrganizationSwitcher.vue

@@ -90,16 +90,14 @@ const switchToTeam = (team: Organization) => {
 
                 <DropdownLink
                     v-if="isBillingActivated()"
-                    href="
-                        /billing
-                    ">
+                    href="/billing">
                     Billing
                 </DropdownLink>
 
                 <DropdownLink
                     v-if="page.props.jetstream.canCreateTeams"
                     :href="route('teams.create')">
-                    Create New Team
+                    Create new organization
                 </DropdownLink>
 
                 <!-- Organization Switcher -->
@@ -107,7 +105,7 @@ const switchToTeam = (team: Organization) => {
                     <div class="border-t border-card-background-separator" />
 
                     <div class="block px-4 py-2 text-xs text-muted">
-                        Switch Teams
+                        Switch Organizations
                     </div>
 
                     <template

resources/js/Pages/Teams/Partials/CreateTeamForm.vue

@@ -29,7 +29,7 @@ const page = usePage<{
         <template #title> Organization Details</template>
 
         <template #description>
-            Create a new team to collaborate with others on projects.
+            Create a new organization to collaborate with others on projects.
         </template>
 
         <template #form>

resources/js/Pages/Teams/Partials/DeleteTeamForm.vue

@@ -26,21 +26,21 @@ const deleteTeam = () => {
 
 <template>
     <ActionSection>
-        <template #title> Delete Team </template>
+        <template #title> Delete Organization </template>
 
-        <template #description> Permanently delete this team. </template>
+        <template #description> Permanently delete this organization. </template>
 
         <template #content>
             <div class="max-w-xl text-sm text-muted">
-                Once a team is deleted, all of its resources and data will be
-                permanently deleted. Before deleting this team, please download
-                any data or information regarding this team that you wish to
+                Once a organization is deleted, all of its resources and data will be
+                permanently deleted. Before deleting this organization, please download
+                any data or information regarding this organization that you wish to
                 retain.
             </div>
 
             <div class="mt-5">
                 <DangerButton @click="confirmTeamDeletion">
-                    Delete Team
+                    Delete Organization
                 </DangerButton>
             </div>
 
@@ -48,7 +48,7 @@ const deleteTeam = () => {
             <ConfirmationModal
                 :show="confirmingTeamDeletion"
                 @close="confirmingTeamDeletion = false">
-                <template #title> Delete Team </template>
+                <template #title> Delete Organization </template>
 
                 <template #content>
                     Are you sure you want to delete this team? Once a team is
@@ -66,7 +66,7 @@ const deleteTeam = () => {
                         :class="{ 'opacity-25': form.processing }"
                         :disabled="form.processing"
                         @click="deleteTeam">
-                        Delete Team
+                        Delete Organization
                     </DangerButton>
                 </template>
             </ConfirmationModal>

resources/js/Pages/Teams/Partials/TeamMemberManager.vue

@@ -130,10 +130,10 @@ const displayableRole = (role: string) => {
 
             <!-- Add Organization Member -->
             <FormSection @submitted="addTeamMember">
-                <template #title> Add Team Member</template>
+                <template #title> Add Organization Member</template>
 
                 <template #description>
-                    Add a new team member to your team, allowing them to
+                    Add a new member to your organization, allowing them to
                     collaborate with you.
                 </template>
 
@@ -141,7 +141,7 @@ const displayableRole = (role: string) => {
                     <div class="col-span-6">
                         <div class="max-w-xl text-sm text-muted">
                             Please provide the email address of the person you
-                            would like to add to this team.
+                            would like to add to this organization.
                         </div>
                     </div>
 
@@ -257,8 +257,8 @@ const displayableRole = (role: string) => {
                 <template #title> Pending Team Invitations</template>
 
                 <template #description>
-                    These people have been invited to your team and have been
-                    sent an invitation email. They may join the team by
+                    These people have been invited to your organization and have been
+                    sent an invitation email. They may join the organization by
                     accepting the email invitation.
                 </template>
 
@@ -293,10 +293,10 @@ const displayableRole = (role: string) => {
 
             <!-- Manage Organization Members -->
             <ActionSection class="mt-10 sm:mt-0">
-                <template #title> Team Members</template>
+                <template #title> Organization Members</template>
 
                 <template #description>
-                    All of the people that are part of this team.
+                    All of the people that are part of this organization.
                 </template>
 
                 <!-- Organization Member List -->
@@ -443,10 +443,10 @@ const displayableRole = (role: string) => {
         <ConfirmationModal
             :show="confirmingLeavingTeam"
             @close="confirmingLeavingTeam = false">
-            <template #title> Leave Team</template>
+            <template #title> Leave Organization</template>
 
             <template #content>
-                Are you sure you would like to leave this team?
+                Are you sure you would like to leave this organization?
             </template>
 
             <template #footer>
@@ -471,7 +471,7 @@ const displayableRole = (role: string) => {
             <template #title> Remove Team Member</template>
 
             <template #content>
-                Are you sure you would like to remove this person from the team?
+                Are you sure you would like to remove this person from the organization?
             </template>
 
             <template #footer>

resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue

@@ -34,14 +34,14 @@ const updateTeamName = () => {
         <template #title> Organization Name</template>
 
         <template #description>
-            The team's name and owner information.
+            The organization's name and owner information.
         </template>
 
         <template #form>
             <!-- Organization Owner Information -->
             <div class="col-span-6 flex items-center justify-between">
                 <div class="">
-                    <InputLabel value="Team Owner" />
+                    <InputLabel value="Organization Owner" />
 
                     <div class="flex items-center mt-2">
                         <img

resources/views/app.blade.php

@@ -17,9 +17,9 @@
         <link rel="manifest" href="/favicons/site.webmanifest">
         <link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#000000">
         <link rel="shortcut icon" href="/favicons/favicon.ico">
-        <meta name="msapplication-TileColor" content="#da532c">
+        <meta name="msapplication-TileColor" content="#000000">
         <meta name="msapplication-config" content="/favicons/browserconfig.xml">
-        <meta name="theme-color" content="#ffffff">
+        <meta name="theme-color" content="#000000">
 
         <!-- Scripts -->
         @routes