Skip to content
Snippets Groups Projects
Commit d366e0e3 authored by Etienne LOUPIAS's avatar Etienne LOUPIAS
Browse files

Merge branch '475-remove-v3-in-components' into 'dev'

refactor: remove v3 in components names

See merge request !723
parents 74cfcdd3 4c7962dd
No related branches found
No related tags found
3 merge requests!783V3.0.0,!741making onboarding-infos-covid-2 up to date,!723refactor: remove v3 in components names
Showing
with 18 additions and 18 deletions
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { SpriteFolderType } from '../../../svg-icon/SpriteFolder.type';
import { ButtonTypeV3 } from '../button.component';
import { SpriteFolderType } from '../../svg-icon/SpriteFolder.type';
import { ButtonType } from '../button.component';
@Component({
selector: 'app-v3-icon-button',
selector: 'app-icon-button',
templateUrl: './icon-button.component.html',
styleUrls: ['../button.component.scss'],
})
export class IconButtonV3Component {
export class IconButtonComponent {
/** Icon name */
@Input({ required: true }) iconName: string;
......@@ -15,7 +15,7 @@ export class IconButtonV3Component {
@Input() type: 'submit' | 'button' | 'reset' = 'button';
/** What variant should the button be ? */
@Input({ required: true }) variant: ButtonTypeV3;
@Input({ required: true }) variant: ButtonType;
/** Affects the height of the button */
@Input() size?: 'small' | 'medium' = 'small';
......
<button type="button" tabindex="-1" [ngClass]="{ selected: isChecked }" (click)="clicked()">
<app-v3-checkbox [checked]="isChecked" />
<app-checkbox [checked]="isChecked" />
<svg *ngIf="iconSvg" aria-hidden="true" class="icon" [ngClass]="iconType">
<use [attr.xlink:href]="'assets/form/sprite.svg#' + iconSvg" />
......
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { componentWrapperDecorator, moduleMetadata } from '@storybook/angular';
import { CheckboxV3Component } from '../v3/checkbox/checkbox.component';
import { CheckboxComponent } from '../checkbox/checkbox.component';
import { CheckboxFormComponent } from './checkbox-form.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
......@@ -11,7 +11,7 @@ const meta: Meta<CheckboxFormComponent> = {
tags: ['autodocs'],
decorators: [
moduleMetadata({
declarations: [CheckboxV3Component],
declarations: [CheckboxComponent],
imports: [CommonModule],
}),
],
......
import { Component, EventEmitter, Input, Output } from '@angular/core';
@Component({
selector: 'app-v3-checkbox',
selector: 'app-checkbox',
templateUrl: './checkbox.component.html',
styleUrls: ['./checkbox.component.scss'],
})
export class CheckboxV3Component {
export class CheckboxComponent {
/** HTML id associated with for */
@Input() id: string;
......
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
import { CheckboxV3Component } from './checkbox.component';
import { SvgIconComponent } from '../svg-icon/svg-icon.component';
import { CheckboxComponent } from './checkbox.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
const meta: Meta<CheckboxV3Component> = {
const meta: Meta<CheckboxComponent> = {
title: 'Components/Checkbox',
component: CheckboxV3Component,
component: CheckboxComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
......@@ -19,7 +19,7 @@ const meta: Meta<CheckboxV3Component> = {
};
export default meta;
type Story = StoryObj<CheckboxV3Component>;
type Story = StoryObj<CheckboxComponent>;
export const CheckBoxSmall: Story = {
args: {
......
......@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
import { SvgIconComponent } from '../svg-icon/svg-icon.component';
import { CollapseContentComponent } from './collapse-content/collapse-content.component';
import { CollapseHeaderComponent } from './collapse-header/collapse-header.component';
import { CollapseComponent } from './collapse.component';
......
<app-v3-modal
<app-modal
[opened]="opened"
[validateLabel]="'Valider'"
[singleButton]="true"
......@@ -61,4 +61,4 @@
de vos interlocuteurs de la Métropole de Lyon.
</p>
</form>
</app-v3-modal>
</app-modal>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment