Updated via schema editor on 2025-09-02 18:42

2025-09-02 18:43:13 +00:00 · 2025-09-02 18:43:13 +00:00 · 4e4e6063a0
commit 4e4e6063a0
parent c850aaacbd
23 changed files with 147 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,8 @@
 node_modules/
 */node_modules/
 */build/
+
+**/node_modules/
+**/build/
+.DS_Store
+.env
--- a/app-shell/src/_schema.json
+++ b/app-shell/src/_schema.json
--- a/backend/src/db/api/users.js
+++ b/backend/src/db/api/users.js
@ -34,6 +34,7 @@ module.exports = class UsersDBApi {
        passwordResetTokenExpiresAt:
          data.data.passwordResetTokenExpiresAt || null,
        provider: data.data.provider || null,
+        teams: data.data.teams || null,
        importHash: data.data.importHash || null,
        createdById: currentUser.id,
        updatedById: currentUser.id,
@ -100,6 +101,7 @@ module.exports = class UsersDBApi {
      passwordResetToken: item.passwordResetToken || null,
      passwordResetTokenExpiresAt: item.passwordResetTokenExpiresAt || null,
      provider: item.provider || null,
+      teams: item.teams || null,
      importHash: item.importHash || null,
      createdById: currentUser.id,
      updatedById: currentUser.id,
@ -182,6 +184,8 @@ module.exports = class UsersDBApi {

    if (data.provider !== undefined) updatePayload.provider = data.provider;

+    if (data.teams !== undefined) updatePayload.teams = data.teams;
+
    updatePayload.updatedById = currentUser.id;

    await users.update(updatePayload, { transaction });
@ -445,6 +449,13 @@ module.exports = class UsersDBApi {
        };
      }

+      if (filter.teams) {
+        where = {
+          ...where,
+          [Op.and]: Utils.ilike('users', 'teams', filter.teams),
+        };
+      }
+
      if (filter.emailVerificationTokenExpiresAtRange) {
        const [start, end] = filter.emailVerificationTokenExpiresAtRange;

--- a/backend/src/db/migrations/1756837709519.js
+++ b/backend/src/db/migrations/1756837709519.js
@ -0,0 +1,47 @@
+module.exports = {
+  /**
+   * @param {QueryInterface} queryInterface
+   * @param {Sequelize} Sequelize
+   * @returns {Promise<void>}
+   */
+  async up(queryInterface, Sequelize) {
+    /**
+     * @type {Transaction}
+     */
+    const transaction = await queryInterface.sequelize.transaction();
+    try {
+      await queryInterface.addColumn(
+        'users',
+        'teams',
+        {
+          type: Sequelize.DataTypes.TEXT,
+        },
+        { transaction },
+      );
+
+      await transaction.commit();
+    } catch (err) {
+      await transaction.rollback();
+      throw err;
+    }
+  },
+  /**
+   * @param {QueryInterface} queryInterface
+   * @param {Sequelize} Sequelize
+   * @returns {Promise<void>}
+   */
+  async down(queryInterface, Sequelize) {
+    /**
+     * @type {Transaction}
+     */
+    const transaction = await queryInterface.sequelize.transaction();
+    try {
+      await queryInterface.removeColumn('users', 'teams', { transaction });
+
+      await transaction.commit();
+    } catch (err) {
+      await transaction.rollback();
+      throw err;
+    }
+  },
+};
--- a/backend/src/db/models/users.js
+++ b/backend/src/db/models/users.js
@ -68,6 +68,10 @@ module.exports = function (sequelize, DataTypes) {
        type: DataTypes.TEXT,
      },

+      teams: {
+        type: DataTypes.TEXT,
+      },
+
      importHash: {
        type: DataTypes.STRING(255),
        allowNull: true,
--- a/backend/src/routes/users.js
+++ b/backend/src/routes/users.js
@ -34,6 +34,9 @@ router.use(checkCrudPermissions('users'));
 *          email:
 *            type: string
 *            default: email
+ *          teams:
+ *            type: string
+ *            default: teams

 */

@ -314,7 +317,14 @@ router.get(
      currentUser,
    });
    if (filetype && filetype === 'csv') {
-      const fields = ['id', 'firstName', 'lastName', 'phoneNumber', 'email'];
+      const fields = [
+        'id',
+        'firstName',
+        'lastName',
+        'phoneNumber',
+        'email',
+        'teams',
+      ];
      const opts = { fields };
      try {
        const csv = parse(payload.rows, opts);
--- a/backend/src/services/search.js
+++ b/backend/src/services/search.js
@ -41,7 +41,7 @@ module.exports = class SearchService {
        throw new ValidationError('iam.errors.searchQueryRequired');
      }
      const tableColumns = {
-        users: ['firstName', 'lastName', 'phoneNumber', 'email'],
+        users: ['firstName', 'lastName', 'phoneNumber', 'email', 'teams'],

        players: ['first_name', 'last_name'],

--- a/frontend/json/runtimeError.json
+++ b/frontend/json/runtimeError.json
@ -0,0 +1 @@
+{}
--- a/frontend/src/components/Users/CardUsers.tsx
+++ b/frontend/src/components/Users/CardUsers.tsx
@ -184,6 +184,13 @@ const CardUsers = ({
                    </div>
                  </dd>
                </div>
+
+                <div className='flex justify-between gap-x-4 py-3'>
+                  <dt className='  text-gray-500  dark:text-dark-600'>Teams</dt>
+                  <dd className='flex items-start gap-x-2'>
+                    <div className='font-medium line-clamp-4'>{item.teams}</div>
+                  </dd>
+                </div>
              </dl>
            </li>
          ))}
--- a/frontend/src/components/Users/ListUsers.tsx
+++ b/frontend/src/components/Users/ListUsers.tsx
@ -120,6 +120,11 @@ const ListUsers = ({
                        {dataFormatter.leaguesOneListFormatter(item.leagues)}
                      </p>
                    </div>
+
+                    <div className={'flex-1 px-3'}>
+                      <p className={'text-xs   text-gray-500 '}>Teams</p>
+                      <p className={'line-clamp-2'}>{item.teams}</p>
+                    </div>
                  </Link>
                  <ListActionsPopover
                    onDelete={onDelete}
--- a/frontend/src/components/Users/configureUsersCols.tsx
+++ b/frontend/src/components/Users/configureUsersCols.tsx
@ -179,6 +179,18 @@ export const loadColumns = async (
        params?.value?.id ?? params?.value,
    },

+    {
+      field: 'teams',
+      headerName: 'Teams',
+      flex: 1,
+      minWidth: 120,
+      filterable: false,
+      headerClassName: 'datagrid--header',
+      cellClassName: 'datagrid--cell',
+
+      editable: hasUpdatePermission,
+    },
+
    {
      field: 'actions',
      type: 'actions',
--- a/frontend/src/components/WebPageComponents/Footer.tsx
+++ b/frontend/src/components/WebPageComponents/Footer.tsx
@ -19,7 +19,7 @@ export default function WebSiteFooter({ projectName }: WebSiteFooterProps) {

  const style = FooterStyle.WITH_PROJECT_NAME;

-  const design = FooterDesigns.DEFAULT_DESIGN;
+  const design = FooterDesigns.DESIGN_DIVERSITY;

  return (
    <div
--- a/frontend/src/components/WebPageComponents/Header.tsx
+++ b/frontend/src/components/WebPageComponents/Header.tsx
@ -17,7 +17,7 @@ export default function WebSiteHeader({ projectName }: WebSiteHeaderProps) {
  const websiteHeder = useAppSelector((state) => state.style.websiteHeder);
  const borders = useAppSelector((state) => state.style.borders);

-  const style = HeaderStyle.PAGES_LEFT;
+  const style = HeaderStyle.PAGES_RIGHT;

  const design = HeaderDesigns.DEFAULT_DESIGN;
  return (
--- a/frontend/src/pages/index.tsx
+++ b/frontend/src/pages/index.tsx
@ -143,7 +143,7 @@ export default function WebSite() {
        <FeaturesSection
          projectName={'LeagueMule'}
          image={['Icons representing league features']}
-          withBg={1}
+          withBg={0}
          features={features_points}
          mainText={`Unleash the Power of ${projectName}`}
          subTitle={`Explore the innovative features of ${projectName} that make league management a breeze. Simplify your tasks and enhance your league experience.`}
--- a/frontend/src/pages/leagues/leagues-view.tsx
+++ b/frontend/src/pages/leagues/leagues-view.tsx
@ -82,6 +82,8 @@ const LeaguesView = () => {
                      <th>E-Mail</th>

                      <th>Disabled</th>
+
+                      <th>Teams</th>
                    </tr>
                  </thead>
                  <tbody>
@ -105,6 +107,8 @@ const LeaguesView = () => {
                          <td data-label='disabled'>
                            {dataFormatter.booleanFormatter(item.disabled)}
                          </td>
+
+                          <td data-label='teams'>{item.teams}</td>
                        </tr>
                      ))}
                  </tbody>
--- a/frontend/src/pages/roles/roles-view.tsx
+++ b/frontend/src/pages/roles/roles-view.tsx
@ -127,6 +127,8 @@ const RolesView = () => {
                      <th>E-Mail</th>

                      <th>Disabled</th>
+
+                      <th>Teams</th>
                    </tr>
                  </thead>
                  <tbody>
@ -150,6 +152,8 @@ const RolesView = () => {
                          <td data-label='disabled'>
                            {dataFormatter.booleanFormatter(item.disabled)}
                          </td>
+
+                          <td data-label='teams'>{item.teams}</td>
                        </tr>
                      ))}
                  </tbody>
--- a/frontend/src/pages/teams/teams-view.tsx
+++ b/frontend/src/pages/teams/teams-view.tsx
@ -95,6 +95,8 @@ const TeamsView = () => {

                      <th>Disabled</th>

+                      <th>Teams</th>
+
                      <th>FirstName</th>

                      <th>LastName</th>
@ -126,6 +128,8 @@ const TeamsView = () => {
                            {dataFormatter.booleanFormatter(item.disabled)}
                          </td>

+                          <td data-label='teams'>{item.teams}</td>
+
                          <td data-label='first_name'>{item.first_name}</td>

                          <td data-label='last_name'>{item.last_name}</td>
--- a/frontend/src/pages/users/[usersId].tsx
+++ b/frontend/src/pages/users/[usersId].tsx
@ -56,6 +56,8 @@ const EditUsers = () => {

    leagues: null,

+    teams: '',
+
    password: '',
  };
  const [initialValues, setInitialValues] = useState(initVals);
@ -187,6 +189,10 @@ const EditUsers = () => {
                ></Field>
              </FormField>

+              <FormField label='Teams'>
+                <Field name='teams' placeholder='Teams' />
+              </FormField>
+
              <FormField label='Password'>
                <Field name='password' placeholder='password' />
              </FormField>
--- a/frontend/src/pages/users/users-edit.tsx
+++ b/frontend/src/pages/users/users-edit.tsx
@ -56,6 +56,8 @@ const EditUsersPage = () => {

    leagues: null,

+    teams: '',
+
    password: '',
  };
  const [initialValues, setInitialValues] = useState(initVals);
@ -185,6 +187,10 @@ const EditUsersPage = () => {
                ></Field>
              </FormField>

+              <FormField label='Teams'>
+                <Field name='teams' placeholder='Teams' />
+              </FormField>
+
              <FormField label='Password'>
                <Field name='password' placeholder='password' />
              </FormField>
--- a/frontend/src/pages/users/users-list.tsx
+++ b/frontend/src/pages/users/users-list.tsx
@ -33,6 +33,7 @@ const UsersTablesPage = () => {
    { label: 'Last Name', title: 'lastName' },
    { label: 'Phone Number', title: 'phoneNumber' },
    { label: 'E-Mail', title: 'email' },
+    { label: 'Teams', title: 'teams' },

    { label: 'App Role', title: 'app_role' },

--- a/frontend/src/pages/users/users-new.tsx
+++ b/frontend/src/pages/users/users-new.tsx
@ -50,6 +50,8 @@ const initialValues = {
  custom_permissions: [],

  leagues: '',
+
+  teams: '',
 };

 const UsersNew = () => {
@ -152,6 +154,10 @@ const UsersNew = () => {
                ></Field>
              </FormField>

+              <FormField label='Teams'>
+                <Field name='teams' placeholder='Teams' />
+              </FormField>
+
              <BaseDivider />
              <BaseButtons>
                <BaseButton type='submit' color='info' label='Submit' />
--- a/frontend/src/pages/users/users-table.tsx
+++ b/frontend/src/pages/users/users-table.tsx
@ -33,6 +33,7 @@ const UsersTablesPage = () => {
    { label: 'Last Name', title: 'lastName' },
    { label: 'Phone Number', title: 'phoneNumber' },
    { label: 'E-Mail', title: 'email' },
+    { label: 'Teams', title: 'teams' },

    { label: 'App Role', title: 'app_role' },

--- a/frontend/src/pages/users/users-view.tsx
+++ b/frontend/src/pages/users/users-view.tsx
@ -148,6 +148,11 @@ const UsersView = () => {
            <p>{users?.leagues?.name ?? 'No data'}</p>
          </div>

+          <div className={'mb-4'}>
+            <p className={'block font-bold mb-2'}>Teams</p>
+            <p>{users?.teams}</p>
+          </div>
+
          <>
            <p className={'block font-bold mb-2'}>Teams Captain</p>
            <CardBox