Skip to content
This repository has been archived by the owner on Mar 23, 2022. It is now read-only.

Commit

Permalink
Merge pull request #313 from RaenonX-DL/dev
Browse files Browse the repository at this point in the history
v2.15.0-beta.1 Release
  • Loading branch information
RaenonX authored Sep 23, 2021
2 parents 04114d7 + 4f2796d commit 8e54a44
Show file tree
Hide file tree
Showing 54 changed files with 1,382 additions and 109 deletions.
3 changes: 3 additions & 0 deletions .azure/variables/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ variables:
- name: NEXT_PUBLIC_DEPOT_ROOT
value: https://raw.githubusercontent.com/RaenonX-DL/dragalia-data-depot/main
readonly: true
- name: NEXT_PUBLIC_AUDIO_ROOT
value: https://raw.githubusercontent.com/RaenonX-DL/dragalia-data-audio/main
readonly: true
- name: NEXT_PUBLIC_GA_ID
value: G-796E69CFJG
readonly: true
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Name | Required/Optional | Description
`NEXT_PUBLIC_API_ROOT` | Required | Root URL of the backend. This should **not** end with a slash (`/`).
`NEXT_PUBLIC_RESOURCE_ROOT` | Required | Root URL of the exported resources. This should **not** end with a slash (`/`).
`NEXT_PUBLIC_DEPOT_ROOT` | Required | Root URL of the data depot. This should **not** end with a slash (`/`).
`NEXT_PUBLIC_AUDIO_ROOT` | Required | Root URL of the audio depot. This should **not** end with a slash (`/`).

For the [current deployed website][front-site], `NEXT_PUBLIC_API_ROOT` is `https://dl-back.raenonx.cc`.

Expand All @@ -53,12 +54,17 @@ In general,
`NEXT_PUBLIC_RESOURCE_ROOT` is `https://raw.githubusercontent.com/RaenonX-DL/dragalia-site-resources/main`,
where stores the parsed data.

- Check https://github.com/RaenonX-DL/dragalia-site-resources for all available resources.
> Check https://github.com/RaenonX-DL/dragalia-site-resources for all available resources.
`NEXT_PUBLIC_DEPOT_ROOT` is `https://raw.githubusercontent.com/RaenonX-DL/dragalia-data-depot/main`,
where stores the dumped game assets.

- Check https://github.com/RaenonX-DL/dragalia-data-depot for all available resources.
> Check https://github.com/RaenonX-DL/dragalia-data-depot for all available resources.
`NEXT_PUBLIC_AUDIO_ROOT` is `https://raw.githubusercontent.com/RaenonX-DL/dragalia-data-audio/main`,
where stores the dumped audio files.

> Check https://github.com/RaenonX-DL/dragalia-data-audio for all available resources.
[front-repo]: https://github.com/RaenonX-DL/dragalia-site-front
[front-site]: https://dl.raenonx.cc
Expand Down
105 changes: 84 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dragalia-site-front",
"description": "Frontend of Dragalia Lost info website by OM.",
"repository": "https://github.com/RaenonX-DL/dragalia-site-front",
"version": "2.14.2",
"version": "2.15.0-beta.1",
"engines": {
"node": "14.x",
"npm": "^7.12.0"
Expand All @@ -28,7 +28,8 @@
"@reduxjs/toolkit": "^1.6.1",
"bootstrap": "^4.6.0",
"color": "^4.0.1",
"fastify": "^3.21.0",
"decimal.js": "^10.3.1",
"fastify": "^3.21.5",
"mathjs": "^9.4.4",
"mongodb": "^3.7.0",
"newrelic": "^8.3.0",
Expand All @@ -37,6 +38,7 @@
"node-fetch": "^2.6.2",
"pm2": "^5.1.1",
"react": "^17.0.2",
"react-audio-player": "^0.17.0",
"react-bootstrap": "^1.6.3",
"react-dom": "^17.0.2",
"react-markdown": "^6.0.3",
Expand Down Expand Up @@ -70,7 +72,7 @@
"eslint-config-next": "^11.1.2",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-jest-dom": "^3.9.0",
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-react": "^7.26.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-testing-library": "^4.12.2",
"eslint-plugin-unused-imports": "^1.1.4",
Expand Down
4 changes: 0 additions & 4 deletions pages/[lang]/story.ts

This file was deleted.

4 changes: 4 additions & 0 deletions pages/[lang]/story/event/[id].ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import {Constructing} from '../../../../src/components/pages/constructing';


export default Constructing;
4 changes: 4 additions & 0 deletions pages/[lang]/story/main/[id].ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import {Constructing} from '../../../../src/components/pages/constructing';


export default Constructing;
4 changes: 4 additions & 0 deletions pages/[lang]/story/unit/[id].ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import {UnitStory} from '../../../../src/components/pages/gameData/story/main';


export default UnitStory;
4 changes: 4 additions & 0 deletions pages/[lang]/tier/[id].ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import {TierNoteUnit} from '../../../src/components/pages/tier/unit/main';


export default TierNoteUnit;
2 changes: 1 addition & 1 deletion src/api-def
7 changes: 7 additions & 0 deletions src/components/elements/common/ads/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,10 @@ export const AdsUnitKeyPointInfo = () => (
testId="ads-unit-key-point-info"
/>
);

export const AdsStory = () => (
<AdsUnitDisplay
slot="2966927859"
testId="ads-story"
/>
);
6 changes: 6 additions & 0 deletions src/components/elements/common/icons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,9 @@ export const IconClipboard = () => <i className="bi bi-clipboard"/>;
export const IconRadar = () => <i className="bi bi-bullseye"/>;

export const IconNotes = () => <i className="bi bi-card-text"/>;

export const IconPlay = () => <i className="bi bi-play-fill"/>;

export const IconPause = () => <i className="bi bi-pause-fill"/>;

export const IconStop = () => <i className="bi bi-stop-fill"/>;
2 changes: 1 addition & 1 deletion src/components/elements/gameData/unit/filter/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export const UnitFilter = <S extends string,
</Col>
<Col xs="auto" className="text-right">
<Button variant="outline-info" type="submit" disabled={disabled}>
{disabled ? <Spinner animation="grow"/> : t((t) => t.misc.search)}
{disabled ? <Spinner animation="grow" size="sm"/> : t((t) => t.misc.search)}
</Button>
</Col>
</Form.Row>
Expand Down
Loading

0 comments on commit 8e54a44

Please sign in to comment.