Skip to content

Commit

Permalink
feat: change of folder name, images
Browse files Browse the repository at this point in the history
  • Loading branch information
cfuisat committed Jul 12, 2023
1 parent ce66ac9 commit 534d5f5
Show file tree
Hide file tree
Showing 54 changed files with 54 additions and 63 deletions.
54 changes: 27 additions & 27 deletions ui/cip-1694/package-lock.json

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

Binary file added ui/cip-1694/public/static/brazil-cip-1694.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ui/cip-1694/public/static/ci-1694-tokyo.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions ui/cip-1694/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from "react";
import { BrowserRouter as Router } from "react-router-dom";
import "./App.scss";
import Content from "./components/layout/Content/Content";
import Footer from "./components/layout/Footer/Footer";
import Header from "./components/layout/Header/Header";
import Content from "./components/common/Content/Content";
import Footer from "./components/common/Footer/Footer";
import Header from "./components/common/Header/Header";
import { Toaster } from "react-hot-toast";

function App() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions ui/cip-1694/src/components/IntroSlides/IntroSlides.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ const QuestionStyle = styled("div")(({ theme }) => ({

const HeroStyleImg = styled("img")(({ theme }) => ({
top: 0,
width: 500,
height: 500,
width: 600,
height: 700,
objectFit: "cover",
borderRadius: 16,
[theme.breakpoints.up("md")]: {
maxWidth: 420,
maxWidth: 450,
},
}));

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { PageRouter } from "../../../commons/routes";
import { PageRouter } from "../../../common/routes";
import { Box, Container } from "@mui/material";
import CssBaseline from "@mui/material/CssBaseline";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function Footer() {
>
<Container maxWidth="lg">
<Typography variant="body1">
Cardano Ballot V2
CIP-1694 Voting Application.
</Typography>
<Copyright />
</Container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export default function Header() {
onDisconnect={() => {
disconnect();
setWalletIcon("");

}}
alwaysVisibleWallets={["flint"]}
supportedWallets={[
Expand Down
8 changes: 4 additions & 4 deletions ui/cip-1694/src/index.scss
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
@import "commons/styles/colors.scss";
@import "common/styles/colors.scss";

@font-face {
font-family: "Roboto Bold";
font-style: normal;
font-weight: 700;
src: url(./commons/resources/fonts/Roboto-Bold.ttf) format("ttf");
src: url(./common/resources/fonts/Roboto-Bold.ttf) format("ttf");
}

@font-face {
font-family: "Roboto Regular";
font-style: normal;
font-weight: 500;
src: url(./commons/resources/fonts/Roboto-Regular.ttf) format("ttf");
src: url(./common/resources/fonts/Roboto-Regular.ttf) format("ttf");
}

@font-face {
font-family: "Roboto Light";
font-style: normal;
font-weight: 400;
src: url(./commons/resources/fonts/Roboto-Light.ttf) format("ttf");
src: url(./common/resources/fonts/Roboto-Light.ttf) format("ttf");
}

:root {
Expand Down
2 changes: 1 addition & 1 deletion ui/cip-1694/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { createRoot } from "react-dom/client";
import CssBaseline from '@mui/material/CssBaseline';
import { ThemeProvider } from '@mui/material/styles';
import theme from './commons/styles/theme';
import theme from './common/styles/theme';
import App from "./App";
import reportWebVitals from "./reportWebVitals";
import "./index.scss";
Expand Down
18 changes: 4 additions & 14 deletions ui/cip-1694/src/pages/Introduction/Introduction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,20 @@ import { SlideItem } from "../../components/IntroSlides/IntroSlides.types";
const Introduction = () => {
const items: SlideItem[] = [
{
"image": "/static/cardano-summit-hero.jpeg",
"image": "/static/cip-1694-community-workshop.jpeg",
"title": "What is CIP-1694 voting?",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magnaaliqua. Sit amet justo donec enim diam vulputate."
},
{
"image": "/static/cardano-summit-hero.jpeg",
"image": "/static/brazil-cip-1694.jpeg",
"title": "What is CIP-1694 voting?",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magnaaliqua. Sit amet justo donec enim diam vulputate."
},
{
"image": "/static/cardano-summit-hero.jpeg",
"image": "/static/ci-1694-tokyo.jpeg",
"title": "What is CIP-1694 voting?",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magnaaliqua. Sit amet justo donec enim diam vulputate."
},
{
"image": "/static/cardano-summit-hero.jpeg",
"title": "What is CIP-1694 voting?",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magnaaliqua. Sit amet justo donec enim diam vulputate."
},
{
"image": "/static/cardano-summit-hero.jpeg",
"title": "What is CIP-1694 voting?",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magnaaliqua. Sit amet justo donec enim diam vulputate."
},
}
];

return <IntroSlides items={items} />;
Expand Down
10 changes: 5 additions & 5 deletions ui/cip-1694/src/pages/Vote/Vote.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import toast from "react-hot-toast";
import CountDownTimer from "../../components/CountDownTimer/CountDownTimer";
import OptionCard from "../../components/OptionCard/OptionCard";
import { OptionItem } from "../../components/OptionCard/OptionCard.types";
import SidePage from "../../components/layout/SidePage/SidePage";
import { buildCanonicalVoteInputJson } from "../../commons/utils/voteUtils";
import { voteService } from "../../commons/api/voteService";
import SidePage from "../../components/common/SidePage/SidePage";
import { buildCanonicalVoteInputJson } from "../../common/utils/voteUtils";
import { voteService } from "../../common/api/voteService";
import VoteReceipt from "./VoteReceipt";
import "./Vote.scss";
import { EVENT_ID } from "../../commons/constants/appConstants";
import { useToggle } from "../../commons/hooks/useToggle";
import { EVENT_ID } from "../../common/constants/appConstants";
import { useToggle } from "../../common/hooks/useToggle";
import ConnectWalletModal from "../../components/ConnectWalletModal/ConnectWalletModal";

const items: OptionItem[] = [
Expand Down
8 changes: 4 additions & 4 deletions ui/cip-1694/src/pages/Vote/VoteReceipt.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const VoteReceipt = () => {
<ListItemIcon>
<StarIcon sx={{ color: "orange" }} />
</ListItemIcon>
<ListItemText primary="Get Access Token and Store in session" />
<ListItemText primary="Access Token, Session storage, Redux persistance" />
</ListItemButton>
</ListItem>

Expand All @@ -72,7 +72,7 @@ const VoteReceipt = () => {
<ListItemIcon>
<StarIcon sx={{ color: "orange" }} />
</ListItemIcon>
<ListItemText primary="Poll Stats Implementation" />
<ListItemText primary="Leaderboard and Winning results" />
</ListItemButton>
</ListItem>
<ListItem disablePadding>
Expand All @@ -88,7 +88,7 @@ const VoteReceipt = () => {
<ListItemIcon>
<StarIcon sx={{ color: "orange" }} />
</ListItemIcon>
<ListItemText primary="Verification App" />
<ListItemText primary="On-Chain Verification App" />
</ListItemButton>
</ListItem>

Expand Down Expand Up @@ -116,7 +116,7 @@ const VoteReceipt = () => {
xs={6}
>
<Typography variant="subtitle1">
Your digital Receipt goes here...
In future, digital Receipt goes here...
</Typography>
</Grid>
</Grid>
Expand Down

0 comments on commit 534d5f5

Please sign in to comment.