Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/beta' into fix-login-redirect
Browse files Browse the repository at this point in the history
* origin/beta:
  chore(patch): release 1.3.0-beta.17 on beta channel [skip ci]
  fix: correct login redirect issues in supabase implemetation (#274)
  chore(minor): release 1.3.0-beta.16 on beta channel [skip ci]
  feat: Added Reports History component to Reports Page (#272)
  • Loading branch information
0-vortex committed Aug 28, 2022
2 parents 6b25aaf + 288cc9e commit 20d7d65
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 8 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@

> All notable changes to this project will be documented in this file
## [1.3.0-beta.17](https://github.com/open-sauced/insights/compare/v1.3.0-beta.16...v1.3.0-beta.17) (2022-08-26)


### 🐛 Bug Fixes

* correct login redirect issues in supabase implemetation ([#274](https://github.com/open-sauced/insights/issues/274)) ([8fcd81e](https://github.com/open-sauced/insights/commit/8fcd81edf65ad7454ca1bba619b0880533ab6693))

## [1.3.0-beta.16](https://github.com/open-sauced/insights/compare/v1.3.0-beta.15...v1.3.0-beta.16) (2022-08-26)


### 🍕 Features

* Added Reports History component to Reports Page ([#272](https://github.com/open-sauced/insights/issues/272)) ([c6a56f6](https://github.com/open-sauced/insights/commit/c6a56f6b66df43fd731ce23d91674734a65f3003))

## [1.3.0-beta.15](https://github.com/open-sauced/insights/compare/v1.3.0-beta.14...v1.3.0-beta.15) (2022-08-26)


Expand Down
2 changes: 1 addition & 1 deletion components/molecules/ReportsHistory/reports-history.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const ReportsHistory = ({ reportList }: ReportsHistoryProps): JSX.Element => {
const heading = <Title level={5} className="!text-light-slate-9 uppercase">
<div className="flex justify-between w-full gap-2">
<div className="w-2/5 text-xs font-semibold text-slate-400 tracking-wide uppercase">
report date
report name
</div>
<div className="w-1/5 text-xs font-semibold text-slate-400 tracking-wide uppercase">
issue date
Expand Down
26 changes: 23 additions & 3 deletions components/organisms/Reports/reports.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
import Title from "components/atoms/Typography/title";
import ReportsHistory from "components/molecules/ReportsHistory/reports-history";
import SelectReportsFilter from "components/molecules/SelectReportsFilter/select-reports-filter";
import { Report } from "interfaces/report-type";

const Reports = (): JSX.Element => {

const reportList: Report[] = [
{
reportName: "Top Ten",
reportDate: "Jun 3, 2022",
reportFormat: "CSV",
isGenerated: true
},
{
reportName: "Top Five",
reportDate: "Jun 3, 2022",
reportFormat: "CSV",
isGenerated: false
}
];

return (
<section className="w-full py-4 px-8 flex justify-center">
<div className="max-w-4xl">
<Title className="!font-medium relative !text-left " level={3}>
<Title className="!font-medium relative" level={3}>
Contributions Insights
</Title>
<hr className="border-light-slate-6 my-4" />
Expand All @@ -16,11 +34,13 @@ const Reports = (): JSX.Element => {
}}
/>
</div>
<Title className="!font-medium relative mt-16 !text-left " level={3}>
<Title className="!font-medium relative mt-16" level={3}>
Download History
</Title>
<hr className="border-light-slate-6 my-4" />
{/* Download History goes here */}
<div>
<ReportsHistory reportList={reportList}/>
</div>
</div>
</section>
);
Expand Down
2 changes: 1 addition & 1 deletion layouts/filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const FilterLayout = ({children}: {children: React.ReactNode}) => {
/>
</div>

<main className="flex w-full flex-1 flex-col items-center text-center px-3 md:px-16 py-8">
<main className="flex w-full flex-1 flex-col items-center px-3 md:px-16 py-8">
{children}
</main>
</div>
Expand Down
4 changes: 2 additions & 2 deletions npm-shrinkwrap.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@open-sauced/insights",
"description": "🍕The dashboard for open source discovery.",
"keywords": [],
"version": "1.3.0-beta.15",
"version": "1.3.0-beta.17",
"author": "TED Vortex <ted.vortex@gmail.com>",
"private": true,
"license": "MIT",
Expand Down

0 comments on commit 20d7d65

Please sign in to comment.