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.

Sign up for GitHub

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

Jump to bottom

[TECH] Mettre les fichiers css et test au même endroit que les fichiers de composants (PIX-13307) #9454

Closed
wants to merge 1 commit into from
Closed

[TECH] Mettre les fichiers css et test au même endroit que les fichiers de composants (PIX-13307) #9454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions certif/app/components/sessions/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.session-list-page {
display: flex;
flex-direction: column;
width: 100%;
}
4 changes: 2 additions & 2 deletions ...ration/components/sessions/index_test.gjs → .../components/sessions/index_integ_test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { render } from '@1024pix/ember-testing-library';
import Service from '@ember/service';
import Sessions from 'pix-certif/components/sessions/index';
import setupIntlRenderingTest from 'pix-certif/tests/helpers/setup-intl-rendering';
import { module, test } from 'qunit';

import setupIntlRenderingTest from '../../../helpers/setup-intl-rendering';
import Sessions from './index';

module('Integration | Component | Sessions | index', function (hooks) {
setupIntlRenderingTest(hooks);
Expand Down
3 changes: 1 addition & 2 deletions ...s/unit/components/sessions/index_test.gjs → ...p/components/sessions/index_unit_test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { setupTest } from 'ember-qunit';
import createGlimmerComponent from 'pix-certif/tests/helpers/create-glimmer-component';
import { module, test } from 'qunit';

import createGlimmerComponent from '../../../helpers/create-glimmer-component';

module('Unit | Component | sessions | index ', function (hooks) {
setupTest(hooks);

Expand Down
3 changes: 3 additions & 0 deletions certif/app/components/sessions/no-session-panel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import NoSessionPanel from './no-session-panel';

export default NoSessionPanel;
0 .../components/sessions/no-session-panel.gjs → ...ons/no-session-panel/no-session-panel.gjs
View file
Open in desktop
File renamed without changes.
0 ...henticated/sessions/no-session-panel.scss → ...ns/no-session-panel/no-session-panel.scss
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...onents/sessions/no-session-panel_test.gjs → ...ion-panel/no-session-panel_integ_test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { render } from '@1024pix/ember-testing-library';
import Service from '@ember/service';
import NoSessionPanel from 'pix-certif/components/sessions/no-session-panel';
import setupIntlRenderingTest from 'pix-certif/tests/helpers/setup-intl-rendering';
import { module, test } from 'qunit';

import setupIntlRenderingTest from '../../../helpers/setup-intl-rendering';
import NoSessionPanel from './no-session-panel';

module('Integration | Component | Sessions | no-session-panel', function (hooks) {
module('Integration | Component | Sessions | no-session-panel | index', function (hooks) {
setupIntlRenderingTest(hooks);

test('it renders buttons links to create sessions', async function (assert) {
Expand Down
5 changes: 2 additions & 3 deletions ...onents/sessions/no-session-panel_test.gjs → ...sion-panel/no-session-panel_unit_test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import Service from '@ember/service';
import { setupTest } from 'ember-qunit';
import createGlimmerComponent from 'pix-certif/tests/helpers/create-glimmer-component';
import { module, test } from 'qunit';
import sinon from 'sinon';

import createGlimmerComponent from '../../../helpers/create-glimmer-component';

module('Unit | Component | no-session-panel', function (hooks) {
module('Unit | Component | Sessions | no-session-panel | index', function (hooks) {
setupTest(hooks);

let component;
Expand Down
0 .../app/components/sessions/panel-header.gjs → ...omponents/sessions/panel-header/index.gjs
View file
Open in desktop
File renamed without changes.
17 changes: 17 additions & 0 deletions certif/app/components/sessions/panel-header/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.session-list {
display: flex;
flex-direction: column;
}

.session-list {
&__header {
display: flex;
justify-content: space-between;
align-items: center;
}
}

.session-list-header__actions {
display: flex;
gap: $pix-spacing-xs;
}
5 changes: 2 additions & 3 deletions ...components/sessions/panel-header_test.gjs → ...essions/panel-header/integration_test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { render } from '@1024pix/ember-testing-library';
import Service from '@ember/service';
import PanelHeader from 'pix-certif/components/sessions/panel-header';
import setupIntlRenderingTest from 'pix-certif/tests/helpers/setup-intl-rendering';
import { module, test } from 'qunit';

import setupIntlRenderingTest from '../../../helpers/setup-intl-rendering';

module('Integration | Component | panel-header', function (hooks) {
module('Integration | Component | Sessions | panel-header', function (hooks) {
setupIntlRenderingTest(hooks);

test('it renders a link to the new session creation page', async function (assert) {
Expand Down
3 changes: 1 addition & 2 deletions ...components/sessions/panel-header_test.gjs → ...nents/sessions/panel-header/unit_test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import Service from '@ember/service';
import { setupTest } from 'ember-qunit';
import createGlimmerComponent from 'pix-certif/tests/helpers/create-glimmer-component';
import { module, test } from 'qunit';
import sinon from 'sinon';

import createGlimmerComponent from '../../../helpers/create-glimmer-component';

module('Unit | Component | sessions | panel-header', function (hooks) {
setupTest(hooks);

Expand Down
0 ...ponents/session-delete-confirm-modal.scss → ...essions/session-delete-confirm-modal.scss
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...ons/session-delete-confirm-modal_test.gjs → ...ssion-delete-confirm-modal_integ_test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { render } from '@1024pix/ember-testing-library';
import { click } from '@ember/test-helpers';
import SessionDeleteConfirmModal from 'pix-certif/components/sessions/session-delete-confirm-modal';
import setupIntlRenderingTest from 'pix-certif/tests/helpers/setup-intl-rendering';
import { module, test } from 'qunit';
import sinon from 'sinon';

import setupIntlRenderingTest from '../../../helpers/setup-intl-rendering';

module('Integration | Component | Sessions | session-delete-confirm-modal', function (hooks) {
setupIntlRenderingTest(hooks);

Expand Down
8 changes: 6 additions & 2 deletions certif/app/styles/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ $navbar-height: 60px;
@import 'pages/authenticated/sessions/details';
@import 'pages/authenticated/sessions/import';
@import 'pages/authenticated/sessions/list-items';
@import 'pages/authenticated/sessions/no-session-panel';
@import 'pages/authenticated/sessions/details/certification-candidates';
@import 'pages/authenticated/sessions/details/certification-candidates-sco';
@import 'pages/authenticated/team';
Expand All @@ -45,7 +44,6 @@ $navbar-height: 60px;
@import 'components/register-form';
@import 'components/select-referer-modal';
@import 'components/session-finalization-step-container';
@import 'components/session-delete-confirm-modal';
@import 'components/session-finalization/reports-information-step';
@import 'components/session-finalization/complementary-information-step';
@import 'components/session-supervising/header';
Expand All @@ -59,6 +57,12 @@ $navbar-height: 60px;
@import 'components/user-logged-menu';
@import 'flatpickr';

/* App/Components */
@import 'sessions';
@import 'sessions/no-session-panel/no-session-panel';
@import 'sessions/panel-header';
@import 'sessions/session-delete-confirm-modal';

body,
html {
min-height: 100%;
Expand Down
16 changes: 0 additions & 16 deletions certif/app/styles/pages/authenticated/sessions/list-items.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
.session-list-page {
display: flex;
flex-direction: column;
width: 100%;

footer {
padding: 18px 24px;
}
}

.session-list {

&__header {
display: flex;
justify-content: space-between;
align-items: center;
}

&-content__update-button {
padding: 6px;
}
}

.session-list-header__actions {
display: flex;
gap: $pix-spacing-xs;
}

.new-session-icon {
font-weight: 900;
margin-left: 4px;
Expand Down
2 changes: 1 addition & 1 deletion certif/ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const sourceMapConfig = {
module.exports = function (defaults) {
const app = new EmberApp(defaults, {
sassOptions: {
includePaths: ['node_modules/@1024pix/pix-ui/addon/styles', 'node_modules/flatpickr/dist'],
includePaths: ['node_modules/@1024pix/pix-ui/addon/styles', 'node_modules/flatpickr/dist', 'app/components'],
},
babel: {
plugins: [require.resolve('ember-auto-import/babel-plugin')],
Expand Down
2 changes: 1 addition & 1 deletion certif/tests/integration/components/sessions/session-summary-list_test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import sinon from 'sinon';
import setupIntlRenderingTest from '../../../helpers/setup-intl-rendering';
import { waitForDialogClose } from '../../../helpers/wait-for';

module('Integration | Component | session-summary-list', function (hooks) {
module('Integration | Component | Sessions | session-summary-list', function (hooks) {
setupIntlRenderingTest(hooks);

test('it should display an header', async function (assert) {
Expand Down