Traders Single Restyle ( Match Existing Boss Single ) #1033

AllanOcelot · 2025-01-14T19:12:50Z

Traders Single Restyle - matching existing boss single work

The traders single page now follows the conventions of the boss single design
Traders and Boss page now use one stylesheet /styles/singleEntity.css , for consistent styling
Spacing has been improved between the header and the "table content" - to be 30px each, again, for consistency.
Fixed bug where Box-Shadow was not being applied
Added a "Type" pill to the title section, for to visually aid the user , what page they are on.

Examples 📸

Boss page

Trader page

Trader page ( @ 1024px )

Trader page ( @ 324px )

Notes:

The trader does not have any properties, I am unsure if this is because they do not exist on the backend.
I think visually they would make the page feel better. I would suggest "Unlocked At Start" , "Trades In ( currencies ) " , "Services" . This work is not covered by this PR.

src/pages/boss/index.js

src/pages/trader/index.js

Co-authored-by: Anton Shebukov <[email protected]>

AllanOcelot · 2025-01-14T20:53:24Z

@Shebuka - Translation strings added in, thank you!

Shebuka · 2025-01-14T22:13:53Z

Great work on the traders @AllanOcelot ! 👍

Can you reduce/remove the min height requirement? I think it will look better without all the empty space after the bio.

AllanOcelot · 2025-01-14T22:31:38Z

Good idea - I've reduced it down to 260px

Razzmatazzz · 2025-01-20T13:57:52Z

.deploy to development

github-actions · 2025-01-20T13:58:09Z

⚠️ Cannot proceed with deployment

reviewDecision: REVIEW_REQUIRED

All deployments from forks must have the required reviews before they can proceed. Please ensure this PR has been reviewed and approved before trying again.

Razzmatazzz · 2025-01-20T13:59:01Z

.deploy

github-actions · 2025-01-20T13:59:21Z

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to production (branch: 56f8cb5b6fd462506fed794b71be965ffe7783d2)

You can watch the progress here 🔗

Details

{
  "type": "branch",
  "environment": {
    "name": "production",
    "url": "https://tarkov.dev"
  },
  "deployment": {
    "timestamp": "2025-01-20T13:59:21.651Z",
    "logs": "https://github.com/the-hideout/tarkov-dev/actions/runs/12869607800"
  },
  "git": {
    "branch": "56f8cb5b6fd462506fed794b71be965ffe7783d2",
    "commit": "56f8cb5b6fd462506fed794b71be965ffe7783d2",
    "verified": false
  },
  "context": {
    "actor": "Razzmatazzz",
    "noop": false,
    "fork": true,
    "comment": {
      "created_at": "2025-01-20T13:59:01Z",
      "updated_at": "2025-01-20T13:59:01Z",
      "body": ".deploy",
      "html_url": "https://github.com/the-hideout/tarkov-dev/pull/1033#issuecomment-2602498981"
    }
  },
  "parameters": {
    "raw": null,
    "parsed": null
  }
}

github-actions · 2025-01-20T14:00:47Z

Deployment Results ❌

Razzmatazzz had a failure when deploying branch 56f8cb5b6fd462506fed794b71be965ffe7783d2 to production

Details

{
  "status": "failure",
  "environment": {
    "name": "production",
    "url": "https://tarkov.dev"
  },
  "deployment": {
    "id": 2126240238,
    "timestamp": "2025-01-20T14:00:47.683Z",
    "logs": "https://github.com/the-hideout/tarkov-dev/actions/runs/12869607800",
    "duration": 86
  },
  "git": {
    "branch": "56f8cb5b6fd462506fed794b71be965ffe7783d2",
    "commit": "56f8cb5b6fd462506fed794b71be965ffe7783d2",
    "verified": false
  },
  "context": {
    "actor": "Razzmatazzz",
    "noop": false,
    "fork": true
  },
  "reviews": {
    "count": 1,
    "decision": "APPROVED"
  },
  "parameters": {
    "raw": null,
    "parsed": null
  }
}

Razzmatazzz · 2025-01-20T18:16:41Z

.deploy

github-actions · 2025-01-20T18:16:58Z

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to production (branch: 8d2a956d72b2ddccfac572bbedb30b33fc30f87c)

You can watch the progress here 🔗

Details

{
  "type": "branch",
  "environment": {
    "name": "production",
    "url": "https://tarkov.dev"
  },
  "deployment": {
    "timestamp": "2025-01-20T18:16:58.551Z",
    "logs": "https://github.com/the-hideout/tarkov-dev/actions/runs/12873732383"
  },
  "git": {
    "branch": "8d2a956d72b2ddccfac572bbedb30b33fc30f87c",
    "commit": "8d2a956d72b2ddccfac572bbedb30b33fc30f87c",
    "verified": true
  },
  "context": {
    "actor": "Razzmatazzz",
    "noop": false,
    "fork": true,
    "comment": {
      "created_at": "2025-01-20T18:16:41Z",
      "updated_at": "2025-01-20T18:16:41Z",
      "body": ".deploy",
      "html_url": "https://github.com/the-hideout/tarkov-dev/pull/1033#issuecomment-2603025437"
    }
  },
  "parameters": {
    "raw": null,
    "parsed": null
  }
}

github-actions · 2025-01-20T18:19:49Z

Deployment Results ❌

Razzmatazzz had a failure when deploying branch 8d2a956d72b2ddccfac572bbedb30b33fc30f87c to production

Details

{
  "status": "failure",
  "environment": {
    "name": "production",
    "url": "https://tarkov.dev"
  },
  "deployment": {
    "id": 2127026579,
    "timestamp": "2025-01-20T18:19:49.535Z",
    "logs": "https://github.com/the-hideout/tarkov-dev/actions/runs/12873732383",
    "duration": 171
  },
  "git": {
    "branch": "8d2a956d72b2ddccfac572bbedb30b33fc30f87c",
    "commit": "8d2a956d72b2ddccfac572bbedb30b33fc30f87c",
    "verified": true
  },
  "context": {
    "actor": "Razzmatazzz",
    "noop": false,
    "fork": true
  },
  "reviews": {
    "count": 2,
    "decision": "APPROVED"
  },
  "parameters": {
    "raw": null,
    "parsed": null
  }
}

Razzmatazzz · 2025-01-20T18:20:47Z

@AllanOcelot Something with this PR is throwing errors when creating a production build. See the deploy log here: https://github.com/the-hideout/tarkov-dev/actions/runs/12873732383/job/35891843633

AllanOcelot · 2025-01-20T19:07:32Z

@Razzmatazzz it looks like webpack is complaining about double imports, likely because traders and bosses now share a common file. I'll fix shortly

AllanOcelot · 2025-01-20T19:15:10Z

EntityStyles is now imported at the bottom of our app.css, webpack was complaining in build ( rightly ) about not being able to chunk the repeating imports.
FIX: Some class definitions were incorrect "class=" instead of "ClassName"

No visual changes with this patch, build process completes with no errors on local build.

Razzmatazzz · 2025-01-21T00:03:39Z

.deploy

github-actions · 2025-01-21T00:03:56Z

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to production (branch: 6a48172e6e3f39f0d77e09b1c6c16a7e1046b978)

You can watch the progress here 🔗

Details

{
  "type": "branch",
  "environment": {
    "name": "production",
    "url": "https://tarkov.dev"
  },
  "deployment": {
    "timestamp": "2025-01-21T00:03:55.830Z",
    "logs": "https://github.com/the-hideout/tarkov-dev/actions/runs/12877490869"
  },
  "git": {
    "branch": "6a48172e6e3f39f0d77e09b1c6c16a7e1046b978",
    "commit": "6a48172e6e3f39f0d77e09b1c6c16a7e1046b978",
    "verified": false
  },
  "context": {
    "actor": "Razzmatazzz",
    "noop": false,
    "fork": true,
    "comment": {
      "created_at": "2025-01-21T00:03:39Z",
      "updated_at": "2025-01-21T00:03:39Z",
      "body": ".deploy",
      "html_url": "https://github.com/the-hideout/tarkov-dev/pull/1033#issuecomment-2603384025"
    }
  },
  "parameters": {
    "raw": null,
    "parsed": null
  }
}

github-actions · 2025-01-21T00:05:42Z

Deployment Results ✅

Razzmatazzz successfully deployed branch 6a48172e6e3f39f0d77e09b1c6c16a7e1046b978 to production

Details

{
  "status": "success",
  "environment": {
    "name": "production",
    "url": "https://tarkov.dev"
  },
  "deployment": {
    "id": 2127681520,
    "timestamp": "2025-01-21T00:05:42.323Z",
    "logs": "https://github.com/the-hideout/tarkov-dev/actions/runs/12877490869",
    "duration": 106
  },
  "git": {
    "branch": "6a48172e6e3f39f0d77e09b1c6c16a7e1046b978",
    "commit": "6a48172e6e3f39f0d77e09b1c6c16a7e1046b978",
    "verified": false
  },
  "context": {
    "actor": "Razzmatazzz",
    "noop": false,
    "fork": true
  },
  "reviews": {
    "count": 1,
    "decision": "APPROVED"
  },
  "parameters": {
    "raw": null,
    "parsed": null
  }
}

Environment URL: tarkov.dev

AllanOcelot added 6 commits January 14, 2025 18:30

- initial wip commit

0ff11e7

- fix, box shadow was not correct

806dfa4

- Style "type" tag

b09e089

ADD: singleEntity stylesheet for bosses ans trader single to use

dfe95fc

SingleEntity: on mobile, stack title elements

11ed1db

- Boss now uses singleEntity.css

6f26d5c

AllanOcelot requested a review from a team as a code owner January 14, 2025 19:12

Shebuka reviewed Jan 14, 2025

View reviewed changes

src/pages/boss/index.js Outdated Show resolved Hide resolved

src/pages/trader/index.js Outdated Show resolved Hide resolved

AllanOcelot and others added 2 commits January 14, 2025 20:52

Update src/pages/boss/index.js -> Add translation

57da9fc

Co-authored-by: Anton Shebukov <[email protected]>

Update src/pages/trader/index.js -> Add translation to tag

00bed0c

Co-authored-by: Anton Shebukov <[email protected]>

- Tweak: Reduce content min-height to 260px

56f8cb5

Razzmatazzz previously approved these changes Jan 20, 2025

View reviewed changes

github-actions bot had a problem deploying to production January 20, 2025 13:59 Failure

Shebuka previously approved these changes Jan 20, 2025

View reviewed changes

AllanOcelot and others added 2 commits January 20, 2025 17:52

Merge branch 'main' into traders_restyle

1e60709

Merge branch 'main' into traders_restyle

8d2a956

github-actions bot had a problem deploying to production January 20, 2025 18:16 Failure

Fix: Globally import shared entity css, fix react bugs. build passes.

6a48172

AllanOcelot dismissed stale reviews from Shebuka and Razzmatazzz via 6a48172 January 20, 2025 19:13

Razzmatazzz approved these changes Jan 21, 2025

View reviewed changes

github-actions bot temporarily deployed to production January 21, 2025 00:03 Inactive

Razzmatazzz merged commit 4b93f9e into the-hideout:main Jan 21, 2025
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Traders Single Restyle ( Match Existing Boss Single ) #1033

Traders Single Restyle ( Match Existing Boss Single ) #1033

AllanOcelot commented Jan 14, 2025

AllanOcelot commented Jan 14, 2025

Shebuka commented Jan 14, 2025

AllanOcelot commented Jan 14, 2025

Razzmatazzz commented Jan 20, 2025

github-actions bot commented Jan 20, 2025

Razzmatazzz commented Jan 20, 2025

github-actions bot commented Jan 20, 2025

github-actions bot commented Jan 20, 2025

Razzmatazzz commented Jan 20, 2025

github-actions bot commented Jan 20, 2025

github-actions bot commented Jan 20, 2025

Razzmatazzz commented Jan 20, 2025

AllanOcelot commented Jan 20, 2025

AllanOcelot commented Jan 20, 2025

Razzmatazzz commented Jan 21, 2025

github-actions bot commented Jan 21, 2025

github-actions bot commented Jan 21, 2025

Traders Single Restyle ( Match Existing Boss Single ) #1033

Traders Single Restyle ( Match Existing Boss Single ) #1033

Conversation

AllanOcelot commented Jan 14, 2025

Traders Single Restyle - matching existing boss single work

Examples 📸

Boss page

Trader page

Trader page ( @ 1024px )

Trader page ( @ 324px )

Notes:

AllanOcelot commented Jan 14, 2025

Shebuka commented Jan 14, 2025

AllanOcelot commented Jan 14, 2025

Razzmatazzz commented Jan 20, 2025

github-actions bot commented Jan 20, 2025

⚠️ Cannot proceed with deployment

Razzmatazzz commented Jan 20, 2025

github-actions bot commented Jan 20, 2025

Deployment Triggered 🚀

github-actions bot commented Jan 20, 2025

Deployment Results ❌

Razzmatazzz commented Jan 20, 2025

github-actions bot commented Jan 20, 2025

Deployment Triggered 🚀

github-actions bot commented Jan 20, 2025

Deployment Results ❌

Razzmatazzz commented Jan 20, 2025

AllanOcelot commented Jan 20, 2025

AllanOcelot commented Jan 20, 2025

Razzmatazzz commented Jan 21, 2025

github-actions bot commented Jan 21, 2025

Deployment Triggered 🚀

github-actions bot commented Jan 21, 2025

Deployment Results ✅