From 81cdcd743511893cd99cee24093f4393c9282f59 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Date: Mon, 14 Oct 2024 15:08:25 +0200 Subject: [PATCH] feat(project): Fix things after merge with Actor page and make project list public --- symfony/config/packages/security.yaml | 1 + symfony/migrations/Version20241011133459.php | 125 ------------------ ...08150316.php => Version20241011202727.php} | 16 +-- symfony/src/Entity/Actor.php | 2 - symfony/src/Entity/Project.php | 3 - symfony/src/Entity/Thematic.php | 1 - vue/src/assets/styles/global/app.scss | 19 +-- .../components/generic-components/Chip.vue | 5 - .../content/{ThematicChip.vue => Chip.vue} | 13 +- .../{ => content}/ChipList.vue | 10 +- .../generic-components/global/BasicCard.vue | 22 ++- .../generic-components/global/Card.vue | 83 ------------ .../generic-components/global/InfoCard.vue | 106 ++++++++------- .../generic-components/global/LikeButton.vue | 2 +- .../generic-components/global/ShareButton.vue | 6 +- .../views-components/actors/ActorCard.vue | 37 ++++-- .../views-components/actors/ActorProfile.vue | 5 +- .../views-components/projects/ProjectCard.vue | 18 +-- .../projects/ProjectFilterModal.vue | 2 +- vue/src/stores/projectStore.ts | 4 +- vue/src/stores/thematicStore.ts | 2 +- 21 files changed, 144 insertions(+), 338 deletions(-) delete mode 100644 symfony/migrations/Version20241011133459.php rename symfony/migrations/{Version20241008150316.php => Version20241011202727.php} (82%) delete mode 100644 vue/src/components/generic-components/Chip.vue rename vue/src/components/generic-components/content/{ThematicChip.vue => Chip.vue} (68%) rename vue/src/components/generic-components/{ => content}/ChipList.vue (67%) delete mode 100644 vue/src/components/generic-components/global/Card.vue diff --git a/symfony/config/packages/security.yaml b/symfony/config/packages/security.yaml index 51910e6..a027a30 100644 --- a/symfony/config/packages/security.yaml +++ b/symfony/config/packages/security.yaml @@ -44,6 +44,7 @@ security: - { path: ^/auth, roles: PUBLIC_ACCESS } - { path: ^/api/users, roles: PUBLIC_ACCESS, methods: [POST]} - { path: ^/api/actors, roles: PUBLIC_ACCESS, methods: [GET] } + - { path: ^/api/projects, roles: PUBLIC_ACCESS, methods: [GET] } - { path: ^/api/actor_expertises, roles: PUBLIC_ACCESS, methods: [GET] } - { path: ^/api/thematics, roles: PUBLIC_ACCESS, methods: [GET] } - { path: ^/api/administrative_scopes, roles: PUBLIC_ACCESS, methods: [GET] } diff --git a/symfony/migrations/Version20241011133459.php b/symfony/migrations/Version20241011133459.php deleted file mode 100644 index f141a65..0000000 --- a/symfony/migrations/Version20241011133459.php +++ /dev/null @@ -1,125 +0,0 @@ ->>>>>>> 8aaadabfadebacf93843df1f5860f9b93048b707:symfony/migrations/Version20241008150316.php -{ - public function getDescription(): string - { - return ''; - } - - public function up(Schema $schema): void - { - // this up() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE SEQUENCE actor_expertise_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE SEQUENCE administrative_scope_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE SEQUENCE project_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE SEQUENCE thematic_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE SEQUENCE "user_id_seq" INCREMENT BY 1 MINVALUE 1 START 1'); -<<<<<<<< HEAD:symfony/migrations/Version20241011133459.php - $this->addSql('CREATE TABLE actor (id UUID NOT NULL, created_by_id INT NOT NULL, name VARCHAR(255) NOT NULL, acronym VARCHAR(255) NOT NULL, is_validated BOOLEAN NOT NULL, category VARCHAR(255) NOT NULL, creation_date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, last_update TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, description TEXT NOT NULL, office_name VARCHAR(255) DEFAULT NULL, office_address VARCHAR(255) DEFAULT NULL, contact_name VARCHAR(255) DEFAULT NULL, contact_position VARCHAR(255) DEFAULT NULL, website VARCHAR(255) DEFAULT NULL, phone VARCHAR(255) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, logo VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id))'); -======== - $this->addSql('CREATE TABLE actor (id UUID NOT NULL, created_by_id INT NOT NULL, name VARCHAR(255) NOT NULL, acronym VARCHAR(255) NOT NULL, is_validated BOOLEAN NOT NULL, category VARCHAR(255) NOT NULL, description TEXT NOT NULL, office_name VARCHAR(255) DEFAULT NULL, office_address VARCHAR(255) DEFAULT NULL, contact_name VARCHAR(255) DEFAULT NULL, contact_position VARCHAR(255) DEFAULT NULL, website VARCHAR(255) DEFAULT NULL, phone VARCHAR(255) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, logo VARCHAR(255) DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))'); ->>>>>>>> 8aaadabfadebacf93843df1f5860f9b93048b707:symfony/migrations/Version20241008150316.php - $this->addSql('CREATE INDEX IDX_447556F9B03A8386 ON actor (created_by_id)'); - $this->addSql('COMMENT ON COLUMN actor.id IS \'(DC2Type:uuid)\''); - $this->addSql('CREATE TABLE actor_actor_expertise (actor_id UUID NOT NULL, actor_expertise_id INT NOT NULL, PRIMARY KEY(actor_id, actor_expertise_id))'); - $this->addSql('CREATE INDEX IDX_4A438EAD10DAF24A ON actor_actor_expertise (actor_id)'); - $this->addSql('CREATE INDEX IDX_4A438EAD916905AC ON actor_actor_expertise (actor_expertise_id)'); - $this->addSql('COMMENT ON COLUMN actor_actor_expertise.actor_id IS \'(DC2Type:uuid)\''); - $this->addSql('CREATE TABLE actor_thematic (actor_id UUID NOT NULL, thematic_id INT NOT NULL, PRIMARY KEY(actor_id, thematic_id))'); - $this->addSql('CREATE INDEX IDX_D159A26410DAF24A ON actor_thematic (actor_id)'); - $this->addSql('CREATE INDEX IDX_D159A2642395FCED ON actor_thematic (thematic_id)'); - $this->addSql('COMMENT ON COLUMN actor_thematic.actor_id IS \'(DC2Type:uuid)\''); - $this->addSql('CREATE TABLE actor_administrative_scope (actor_id UUID NOT NULL, administrative_scope_id INT NOT NULL, PRIMARY KEY(actor_id, administrative_scope_id))'); - $this->addSql('CREATE INDEX IDX_65EBE3CC10DAF24A ON actor_administrative_scope (actor_id)'); - $this->addSql('CREATE INDEX IDX_65EBE3CCC1892E43 ON actor_administrative_scope (administrative_scope_id)'); - $this->addSql('COMMENT ON COLUMN actor_administrative_scope.actor_id IS \'(DC2Type:uuid)\''); - $this->addSql('CREATE TABLE actor_expertise (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE TABLE administrative_scope (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); -<<<<<<<< HEAD:symfony/migrations/Version20241011133459.php - $this->addSql('CREATE TABLE project (id INT NOT NULL, actor_id UUID NOT NULL, name VARCHAR(255) NOT NULL, location VARCHAR(255) NOT NULL, coords geometry(POINT, 0) NOT NULL, status VARCHAR(255) NOT NULL, description TEXT DEFAULT NULL, images JSON DEFAULT NULL, partners JSON DEFAULT NULL, intervention_zone VARCHAR(255) NOT NULL, project_manager_name VARCHAR(255) DEFAULT NULL, project_manager_position VARCHAR(255) DEFAULT NULL, project_manager_email VARCHAR(255) DEFAULT NULL, project_manager_tel VARCHAR(255) DEFAULT NULL, project_manager_photo VARCHAR(255) DEFAULT NULL, website VARCHAR(255) DEFAULT NULL, logo VARCHAR(255) DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))'); -======== - $this->addSql('CREATE TABLE project (id INT NOT NULL, actor_id UUID NOT NULL, title VARCHAR(255) NOT NULL, location VARCHAR(255) NOT NULL, coords geometry(POINT, 0) NOT NULL, status VARCHAR(255) NOT NULL, description TEXT DEFAULT NULL, images JSON DEFAULT NULL, partners JSON DEFAULT NULL, intervention_zone VARCHAR(255) NOT NULL, project_manager_name VARCHAR(255) DEFAULT NULL, project_manager_position VARCHAR(255) DEFAULT NULL, project_manager_email VARCHAR(255) DEFAULT NULL, project_manager_tel VARCHAR(255) DEFAULT NULL, project_manager_photo VARCHAR(255) DEFAULT NULL, website VARCHAR(255) DEFAULT NULL, logo VARCHAR(255) DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))'); ->>>>>>>> 8aaadabfadebacf93843df1f5860f9b93048b707:symfony/migrations/Version20241008150316.php - $this->addSql('CREATE INDEX IDX_2FB3D0EE10DAF24A ON project (actor_id)'); - $this->addSql('COMMENT ON COLUMN project.actor_id IS \'(DC2Type:uuid)\''); - $this->addSql('CREATE TABLE project_thematic (project_id INT NOT NULL, thematic_id INT NOT NULL, PRIMARY KEY(project_id, thematic_id))'); - $this->addSql('CREATE INDEX IDX_415254A9166D1F9C ON project_thematic (project_id)'); - $this->addSql('CREATE INDEX IDX_415254A92395FCED ON project_thematic (thematic_id)'); - $this->addSql('CREATE TABLE financed_projects_actors (project_id INT NOT NULL, actor_id UUID NOT NULL, PRIMARY KEY(project_id, actor_id))'); - $this->addSql('CREATE INDEX IDX_50C6B8EC166D1F9C ON financed_projects_actors (project_id)'); - $this->addSql('CREATE INDEX IDX_50C6B8EC10DAF24A ON financed_projects_actors (actor_id)'); - $this->addSql('COMMENT ON COLUMN financed_projects_actors.actor_id IS \'(DC2Type:uuid)\''); - $this->addSql('CREATE TABLE contracted_projects_actors (project_id INT NOT NULL, actor_id UUID NOT NULL, PRIMARY KEY(project_id, actor_id))'); - $this->addSql('CREATE INDEX IDX_E73AB790166D1F9C ON contracted_projects_actors (project_id)'); - $this->addSql('CREATE INDEX IDX_E73AB79010DAF24A ON contracted_projects_actors (actor_id)'); - $this->addSql('COMMENT ON COLUMN contracted_projects_actors.actor_id IS \'(DC2Type:uuid)\''); - $this->addSql('CREATE TABLE thematic (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE TABLE "user" (id INT NOT NULL, first_name VARCHAR(255) NOT NULL, last_name VARCHAR(255) NOT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, password VARCHAR(255) NOT NULL, is_validated BOOLEAN NOT NULL, requested_roles JSON DEFAULT NULL, organisation VARCHAR(255) DEFAULT NULL, position VARCHAR(255) DEFAULT NULL, phone VARCHAR(20) DEFAULT NULL, sign_up_message TEXT DEFAULT NULL, PRIMARY KEY(id))'); - $this->addSql('ALTER TABLE actor ADD CONSTRAINT FK_447556F9B03A8386 FOREIGN KEY (created_by_id) REFERENCES "user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE actor_actor_expertise ADD CONSTRAINT FK_4A438EAD10DAF24A FOREIGN KEY (actor_id) REFERENCES actor (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE actor_actor_expertise ADD CONSTRAINT FK_4A438EAD916905AC FOREIGN KEY (actor_expertise_id) REFERENCES actor_expertise (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE actor_thematic ADD CONSTRAINT FK_D159A26410DAF24A FOREIGN KEY (actor_id) REFERENCES actor (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE actor_thematic ADD CONSTRAINT FK_D159A2642395FCED FOREIGN KEY (thematic_id) REFERENCES thematic (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE actor_administrative_scope ADD CONSTRAINT FK_65EBE3CC10DAF24A FOREIGN KEY (actor_id) REFERENCES actor (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE actor_administrative_scope ADD CONSTRAINT FK_65EBE3CCC1892E43 FOREIGN KEY (administrative_scope_id) REFERENCES administrative_scope (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE project ADD CONSTRAINT FK_2FB3D0EE10DAF24A FOREIGN KEY (actor_id) REFERENCES actor (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE project_thematic ADD CONSTRAINT FK_415254A9166D1F9C FOREIGN KEY (project_id) REFERENCES project (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE project_thematic ADD CONSTRAINT FK_415254A92395FCED FOREIGN KEY (thematic_id) REFERENCES thematic (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE financed_projects_actors ADD CONSTRAINT FK_50C6B8EC166D1F9C FOREIGN KEY (project_id) REFERENCES project (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE financed_projects_actors ADD CONSTRAINT FK_50C6B8EC10DAF24A FOREIGN KEY (actor_id) REFERENCES actor (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE contracted_projects_actors ADD CONSTRAINT FK_E73AB790166D1F9C FOREIGN KEY (project_id) REFERENCES project (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - $this->addSql('ALTER TABLE contracted_projects_actors ADD CONSTRAINT FK_E73AB79010DAF24A FOREIGN KEY (actor_id) REFERENCES actor (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE SCHEMA public'); - $this->addSql('DROP SEQUENCE actor_expertise_id_seq CASCADE'); - $this->addSql('DROP SEQUENCE administrative_scope_id_seq CASCADE'); - $this->addSql('DROP SEQUENCE project_id_seq CASCADE'); - $this->addSql('DROP SEQUENCE thematic_id_seq CASCADE'); - $this->addSql('DROP SEQUENCE "user_id_seq" CASCADE'); - $this->addSql('ALTER TABLE actor DROP CONSTRAINT FK_447556F9B03A8386'); - $this->addSql('ALTER TABLE actor_actor_expertise DROP CONSTRAINT FK_4A438EAD10DAF24A'); - $this->addSql('ALTER TABLE actor_actor_expertise DROP CONSTRAINT FK_4A438EAD916905AC'); - $this->addSql('ALTER TABLE actor_thematic DROP CONSTRAINT FK_D159A26410DAF24A'); - $this->addSql('ALTER TABLE actor_thematic DROP CONSTRAINT FK_D159A2642395FCED'); - $this->addSql('ALTER TABLE actor_administrative_scope DROP CONSTRAINT FK_65EBE3CC10DAF24A'); - $this->addSql('ALTER TABLE actor_administrative_scope DROP CONSTRAINT FK_65EBE3CCC1892E43'); - $this->addSql('ALTER TABLE project DROP CONSTRAINT FK_2FB3D0EE10DAF24A'); - $this->addSql('ALTER TABLE project_thematic DROP CONSTRAINT FK_415254A9166D1F9C'); - $this->addSql('ALTER TABLE project_thematic DROP CONSTRAINT FK_415254A92395FCED'); - $this->addSql('ALTER TABLE financed_projects_actors DROP CONSTRAINT FK_50C6B8EC166D1F9C'); - $this->addSql('ALTER TABLE financed_projects_actors DROP CONSTRAINT FK_50C6B8EC10DAF24A'); - $this->addSql('ALTER TABLE contracted_projects_actors DROP CONSTRAINT FK_E73AB790166D1F9C'); - $this->addSql('ALTER TABLE contracted_projects_actors DROP CONSTRAINT FK_E73AB79010DAF24A'); - $this->addSql('DROP TABLE actor'); - $this->addSql('DROP TABLE actor_actor_expertise'); - $this->addSql('DROP TABLE actor_thematic'); - $this->addSql('DROP TABLE actor_administrative_scope'); - $this->addSql('DROP TABLE actor_expertise'); - $this->addSql('DROP TABLE administrative_scope'); - $this->addSql('DROP TABLE project'); - $this->addSql('DROP TABLE project_thematic'); - $this->addSql('DROP TABLE financed_projects_actors'); - $this->addSql('DROP TABLE contracted_projects_actors'); - $this->addSql('DROP TABLE thematic'); - $this->addSql('DROP TABLE "user"'); - } -} diff --git a/symfony/migrations/Version20241008150316.php b/symfony/migrations/Version20241011202727.php similarity index 82% rename from symfony/migrations/Version20241008150316.php rename to symfony/migrations/Version20241011202727.php index f141a65..7e8018c 100644 --- a/symfony/migrations/Version20241008150316.php +++ b/symfony/migrations/Version20241011202727.php @@ -10,11 +10,7 @@ /** * Auto-generated Migration: Please modify to your needs! */ -<<<<<<<< HEAD:symfony/migrations/Version20241011133459.php -final class Version20241011133459 extends AbstractMigration -======== -final class Version20241008150316 extends AbstractMigration ->>>>>>>> 8aaadabfadebacf93843df1f5860f9b93048b707:symfony/migrations/Version20241008150316.php +final class Version20241011202727 extends AbstractMigration { public function getDescription(): string { @@ -29,11 +25,7 @@ public function up(Schema $schema): void $this->addSql('CREATE SEQUENCE project_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); $this->addSql('CREATE SEQUENCE thematic_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); $this->addSql('CREATE SEQUENCE "user_id_seq" INCREMENT BY 1 MINVALUE 1 START 1'); -<<<<<<<< HEAD:symfony/migrations/Version20241011133459.php - $this->addSql('CREATE TABLE actor (id UUID NOT NULL, created_by_id INT NOT NULL, name VARCHAR(255) NOT NULL, acronym VARCHAR(255) NOT NULL, is_validated BOOLEAN NOT NULL, category VARCHAR(255) NOT NULL, creation_date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, last_update TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, description TEXT NOT NULL, office_name VARCHAR(255) DEFAULT NULL, office_address VARCHAR(255) DEFAULT NULL, contact_name VARCHAR(255) DEFAULT NULL, contact_position VARCHAR(255) DEFAULT NULL, website VARCHAR(255) DEFAULT NULL, phone VARCHAR(255) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, logo VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id))'); -======== $this->addSql('CREATE TABLE actor (id UUID NOT NULL, created_by_id INT NOT NULL, name VARCHAR(255) NOT NULL, acronym VARCHAR(255) NOT NULL, is_validated BOOLEAN NOT NULL, category VARCHAR(255) NOT NULL, description TEXT NOT NULL, office_name VARCHAR(255) DEFAULT NULL, office_address VARCHAR(255) DEFAULT NULL, contact_name VARCHAR(255) DEFAULT NULL, contact_position VARCHAR(255) DEFAULT NULL, website VARCHAR(255) DEFAULT NULL, phone VARCHAR(255) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, logo VARCHAR(255) DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))'); ->>>>>>>> 8aaadabfadebacf93843df1f5860f9b93048b707:symfony/migrations/Version20241008150316.php $this->addSql('CREATE INDEX IDX_447556F9B03A8386 ON actor (created_by_id)'); $this->addSql('COMMENT ON COLUMN actor.id IS \'(DC2Type:uuid)\''); $this->addSql('CREATE TABLE actor_actor_expertise (actor_id UUID NOT NULL, actor_expertise_id INT NOT NULL, PRIMARY KEY(actor_id, actor_expertise_id))'); @@ -50,11 +42,7 @@ public function up(Schema $schema): void $this->addSql('COMMENT ON COLUMN actor_administrative_scope.actor_id IS \'(DC2Type:uuid)\''); $this->addSql('CREATE TABLE actor_expertise (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); $this->addSql('CREATE TABLE administrative_scope (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); -<<<<<<<< HEAD:symfony/migrations/Version20241011133459.php $this->addSql('CREATE TABLE project (id INT NOT NULL, actor_id UUID NOT NULL, name VARCHAR(255) NOT NULL, location VARCHAR(255) NOT NULL, coords geometry(POINT, 0) NOT NULL, status VARCHAR(255) NOT NULL, description TEXT DEFAULT NULL, images JSON DEFAULT NULL, partners JSON DEFAULT NULL, intervention_zone VARCHAR(255) NOT NULL, project_manager_name VARCHAR(255) DEFAULT NULL, project_manager_position VARCHAR(255) DEFAULT NULL, project_manager_email VARCHAR(255) DEFAULT NULL, project_manager_tel VARCHAR(255) DEFAULT NULL, project_manager_photo VARCHAR(255) DEFAULT NULL, website VARCHAR(255) DEFAULT NULL, logo VARCHAR(255) DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))'); -======== - $this->addSql('CREATE TABLE project (id INT NOT NULL, actor_id UUID NOT NULL, title VARCHAR(255) NOT NULL, location VARCHAR(255) NOT NULL, coords geometry(POINT, 0) NOT NULL, status VARCHAR(255) NOT NULL, description TEXT DEFAULT NULL, images JSON DEFAULT NULL, partners JSON DEFAULT NULL, intervention_zone VARCHAR(255) NOT NULL, project_manager_name VARCHAR(255) DEFAULT NULL, project_manager_position VARCHAR(255) DEFAULT NULL, project_manager_email VARCHAR(255) DEFAULT NULL, project_manager_tel VARCHAR(255) DEFAULT NULL, project_manager_photo VARCHAR(255) DEFAULT NULL, website VARCHAR(255) DEFAULT NULL, logo VARCHAR(255) DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))'); ->>>>>>>> 8aaadabfadebacf93843df1f5860f9b93048b707:symfony/migrations/Version20241008150316.php $this->addSql('CREATE INDEX IDX_2FB3D0EE10DAF24A ON project (actor_id)'); $this->addSql('COMMENT ON COLUMN project.actor_id IS \'(DC2Type:uuid)\''); $this->addSql('CREATE TABLE project_thematic (project_id INT NOT NULL, thematic_id INT NOT NULL, PRIMARY KEY(project_id, thematic_id))'); @@ -69,7 +57,7 @@ public function up(Schema $schema): void $this->addSql('CREATE INDEX IDX_E73AB79010DAF24A ON contracted_projects_actors (actor_id)'); $this->addSql('COMMENT ON COLUMN contracted_projects_actors.actor_id IS \'(DC2Type:uuid)\''); $this->addSql('CREATE TABLE thematic (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE TABLE "user" (id INT NOT NULL, first_name VARCHAR(255) NOT NULL, last_name VARCHAR(255) NOT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, password VARCHAR(255) NOT NULL, is_validated BOOLEAN NOT NULL, requested_roles JSON DEFAULT NULL, organisation VARCHAR(255) DEFAULT NULL, position VARCHAR(255) DEFAULT NULL, phone VARCHAR(20) DEFAULT NULL, sign_up_message TEXT DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE TABLE "user" (id INT NOT NULL, first_name VARCHAR(255) NOT NULL, last_name VARCHAR(255) NOT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, password VARCHAR(255) DEFAULT NULL, is_validated BOOLEAN NOT NULL, requested_roles JSON DEFAULT NULL, organisation VARCHAR(255) DEFAULT NULL, position VARCHAR(255) DEFAULT NULL, phone VARCHAR(20) DEFAULT NULL, sign_up_message TEXT DEFAULT NULL, PRIMARY KEY(id))'); $this->addSql('ALTER TABLE actor ADD CONSTRAINT FK_447556F9B03A8386 FOREIGN KEY (created_by_id) REFERENCES "user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); $this->addSql('ALTER TABLE actor_actor_expertise ADD CONSTRAINT FK_4A438EAD10DAF24A FOREIGN KEY (actor_id) REFERENCES actor (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); $this->addSql('ALTER TABLE actor_actor_expertise ADD CONSTRAINT FK_4A438EAD916905AC FOREIGN KEY (actor_expertise_id) REFERENCES actor_expertise (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); diff --git a/symfony/src/Entity/Actor.php b/symfony/src/Entity/Actor.php index 71718bc..e33bbd6 100644 --- a/symfony/src/Entity/Actor.php +++ b/symfony/src/Entity/Actor.php @@ -6,7 +6,6 @@ use App\Enum\ActorCategory; use ApiPlatform\Metadata\Get; use ApiPlatform\Metadata\Put; -use App\Enum\ActorCategory; use ApiPlatform\Metadata\Post; use App\Entity\ActorExpertise; use App\Model\Enums\UserRoles; @@ -22,7 +21,6 @@ use ApiPlatform\Metadata\GetCollection; use App\Entity\Trait\TimestampableEntity; use Doctrine\Common\Collections\Collection; -use Symfony\Bundle\SecurityBundle\Security; use App\Services\State\Provider\ActorProvider; use App\Services\State\Processor\ActorProcessor; use Doctrine\Common\Collections\ArrayCollection; diff --git a/symfony/src/Entity/Project.php b/symfony/src/Entity/Project.php index a9dc436..e0b4d90 100644 --- a/symfony/src/Entity/Project.php +++ b/symfony/src/Entity/Project.php @@ -2,14 +2,11 @@ namespace App\Entity; -use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GetCollection; -use App\Entity\Trait\TimestampableEntity; use App\Enum\AdministrativeScope; use App\Enum\Status; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping as ORM; -use App\Enum\AdministrativeScopes; use ApiPlatform\Metadata\ApiResource; use App\Repository\ProjectRepository; use App\Entity\Trait\TimestampableEntity; diff --git a/symfony/src/Entity/Thematic.php b/symfony/src/Entity/Thematic.php index 1632bf1..407e607 100644 --- a/symfony/src/Entity/Thematic.php +++ b/symfony/src/Entity/Thematic.php @@ -6,7 +6,6 @@ use ApiPlatform\Metadata\Delete; use Doctrine\ORM\Mapping as ORM; use ApiPlatform\Metadata\ApiResource; -use ApiPlatform\Metadata\GetCollection; use App\Repository\ThematicRepository; use ApiPlatform\Metadata\GetCollection; use Doctrine\Common\Collections\Collection; diff --git a/vue/src/assets/styles/global/app.scss b/vue/src/assets/styles/global/app.scss index d087acd..94c27aa 100644 --- a/vue/src/assets/styles/global/app.scss +++ b/vue/src/assets/styles/global/app.scss @@ -101,13 +101,14 @@ a:-webkit-any-link { text-decoration: none; } -.CardShadow { - background-color: white; - box-shadow: 0px 2px 0px rgb(var(--v-theme-main-blue)); - border: 0.5px solid rgb(var(--v-theme-main-blue)); -} -.CardShadow:hover { - box-shadow: 0px 4px 0px rgb(var(--v-theme-main-blue)); - border: 2px solid rgb(var(--v-theme-main-blue)); +.Card { + background: white; + box-shadow: 0px 0px 0px 1px rgb(var(--v-theme-main-blue)), 0px 2px 0px 1px rgb(var(--v-theme-main-blue)); + transition: all .1s ease-in; + border: none; cursor: pointer; -} + + &:hover, &[active="true"] { + box-shadow: 0px 0px 0px 2px rgb(var(--v-theme-main-blue)), 0px 4px 0px 2px rgb(var(--v-theme-main-blue)); + } +} \ No newline at end of file diff --git a/vue/src/components/generic-components/Chip.vue b/vue/src/components/generic-components/Chip.vue deleted file mode 100644 index 2656cd3..0000000 --- a/vue/src/components/generic-components/Chip.vue +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/vue/src/components/generic-components/content/ThematicChip.vue b/vue/src/components/generic-components/content/Chip.vue similarity index 68% rename from vue/src/components/generic-components/content/ThematicChip.vue rename to vue/src/components/generic-components/content/Chip.vue index f9d05bc..f031783 100644 --- a/vue/src/components/generic-components/content/ThematicChip.vue +++ b/vue/src/components/generic-components/content/Chip.vue @@ -1,21 +1,22 @@ +}) + \ No newline at end of file diff --git a/vue/src/components/generic-components/global/Card.vue b/vue/src/components/generic-components/global/Card.vue deleted file mode 100644 index 25f34c8..0000000 --- a/vue/src/components/generic-components/global/Card.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - - - \ No newline at end of file diff --git a/vue/src/components/generic-components/global/InfoCard.vue b/vue/src/components/generic-components/global/InfoCard.vue index 59970bd..6de1b7a 100644 --- a/vue/src/components/generic-components/global/InfoCard.vue +++ b/vue/src/components/generic-components/global/InfoCard.vue @@ -1,74 +1,82 @@ \ No newline at end of file diff --git a/vue/src/components/generic-components/global/LikeButton.vue b/vue/src/components/generic-components/global/LikeButton.vue index d2d31fb..41933ae 100644 --- a/vue/src/components/generic-components/global/LikeButton.vue +++ b/vue/src/components/generic-components/global/LikeButton.vue @@ -1,6 +1,6 @@ diff --git a/vue/src/components/generic-components/global/ShareButton.vue b/vue/src/components/generic-components/global/ShareButton.vue index 57aad91..b2e8696 100644 --- a/vue/src/components/generic-components/global/ShareButton.vue +++ b/vue/src/components/generic-components/global/ShareButton.vue @@ -1,14 +1,14 @@