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

fix: Removed Hardcoded Locales and Improved Error Handlings #2125

Merged
merged 10 commits into from
Jul 2, 2024
+723 −210
Merged

fix: Removed Hardcoded Locales and Improved Error Handlings #2125

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a305c59
Ready to merge
vijayaragavanInterIkea Nov 7, 2023
d53b695
Added package lock
vijayaragavanInterIkea Nov 7, 2023
756ef7e
Added babel profile package
vijayaragavanInterIkea Nov 7, 2023
dd9d16f
Added env false
vijayaragavanInterIkea Nov 7, 2023
b351f2d
Added env false
vijayaragavanInterIkea Nov 7, 2023
d30866d
Removed cross-env
vijayaragavanInterIkea Nov 7, 2023
b364a06
Worked on Error Handling and Fixed some bugs regarding locales
vijayaragavan462 Jun 17, 2024
09dac9a
Added Error Handlings And Fixed the Hardcoded Locales
vijayaragavan462 Jun 17, 2024
2c6b2ea
Done all the suggestions requested and removed the config file.
vijayaragavan462 Jul 1, 2024
13c25ad
I reverted the file that was wrongly deleted before and deleted the c…
vijayaragavan462 Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions .circleci/config.yml
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like you removed the wrong file

This file was deleted.

90 changes: 90 additions & 0 deletions .contentful/.circleci/config.yml
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file needs to be removed

Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
version: 2.1

orbs:
node: circleci/node@5.0.2

jobs:
apps-checks:
docker:
- image: cimg/base:stable
resource_class: medium+
steps:
- checkout
- node/install
- run:
name: Install root dependencies
command: npm install
- run:
name: Install apps dependencies
command: npm run install-apps
- run:
name: Build apps
command: npm run build-apps
- run:
name: Test apps
command: npm run test-apps

deploy-staging:
docker:
- image: cimg/base:stable
resource_class: medium+
steps:
- checkout
- node/install
- run:
name: Install root dependencies
command: npm install
- run:
name: Install apps dependencies
command: npm run install-apps:deploy
- run:
name: Build apps
command: npm run build-apps:deploy
- run:
name: Deploy staging
command: npm run deploy:staging

deploy-prod:
docker:
- image: cimg/base:stable
resource_class: medium+
steps:
- checkout
- node/install
- run:
name: Install root dependencies
command: npm install
- run:
name: Install apps dependencies
command: npm run install-apps:deploy
- run:
name: Build apps
command: npm run build-apps:deploy
- run:
name: Deploy production
command: npm run deploy:production

workflows:
version: 2
apps-ci-pipeline:
jobs:
- apps-checks:
filters:
branches:
ignore:
- main
- production
- deploy-staging:
context:
- marketplace-partner-apps-staging
filters:
branches:
only:
- main
- deploy-prod:
context:
- marketplace-partner-apps-production
filters:
branches:
only:
- production
480 changes: 480 additions & 0 deletions apps/imageHotspotCreator/src/Assets/MissingField.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 1 addition & 14 deletions apps/imageHotspotCreator/src/components/Creator/createHotspot.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
width:100%;
padding: 10px;
background-color: #ffffff;
/* border: 1px solid rgb(206, 206, 206); */
align-items: center;
justify-content: flex-start;
border-radius: 4px;
Expand All @@ -59,7 +58,6 @@
display: flex;
color: black;
height: 10px;
/* position: absolute; */
cursor: pointer;
align-items: center;
right: -7px;
Expand Down Expand Up @@ -90,7 +88,6 @@

.hotspot_image_logo{
display: flex;
/* border-radius: 5px; */
height: 15px;
width: 15px;
background-color: burlywood;
Expand All @@ -116,7 +113,6 @@
max-height: 100%;
width: 60%;
padding: 20px;
/* border-right: 1px dotted black; */
box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px, rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;
}

Expand All @@ -125,7 +121,6 @@
justify-content: space-between;
height: 40px;
align-items: center;
/* border: 1px solid rgb(206, 206, 206); */
background-color: #ffffff;
border-radius: 4px;
padding: 10px;
Expand All @@ -142,15 +137,12 @@
display: flex;
color: black;
font-weight: bold;
/* width: 78%; */
/* height: 100%; */
align-items: center;
}

.add_hotspot_button{
display: flex;
align-items: center;
/* width: 22%; */
color: black;
gap: 10px;
justify-content: center;
Expand All @@ -166,7 +158,6 @@
height: 85%;
align-items: center;
justify-content: center;
/* width: 100%; */
}

.editable_image{
Expand All @@ -181,15 +172,13 @@

.imageSection{
width: 45%;
/* border: 1px solid gray; */
display: flex;
flex-direction: column;
padding: 10px;
border-right: 1.5px solid gray;
}

.imageContainer{
/* height: 80%; */
height: 70%;
width: 100%;
display: flex;
Expand All @@ -210,7 +199,6 @@
}

.imageDetailContainer{
/* margin-top: 20px; */
display: flex;
gap: 20px;
height: 100%;
Expand Down Expand Up @@ -270,7 +258,6 @@ object-fit: contain;
width: 50%;
height: 100%;
border: none;
/* background-color: rgb(232 232 232); */
}

.buttonSection{
Expand Down Expand Up @@ -298,4 +285,4 @@ object-fit: contain;
padding: 10px;
text-align: center;
height: 100%;
}
}
Loading